From 073e797e2b6955f7ba7758d89e6d42eaeb74673f Mon Sep 17 00:00:00 2001 From: William McBrine Date: Sun, 23 Jul 2006 22:58:57 +0000 Subject: [PATCH] SP->cursor was not really used. --- curses.h | 3 +-- dos/pdcscrn.c | 5 ++--- os2/pdcscrn.c | 5 ++--- pdcurses/initscr.c | 4 +--- win32/pdcscrn.c | 5 ++--- x11/pdcscrn.c | 5 ++--- 6 files changed, 10 insertions(+), 17 deletions(-) diff --git a/curses.h b/curses.h index 20c25431..14150bc6 100644 --- a/curses.h +++ b/curses.h @@ -15,7 +15,7 @@ * See the file maintain.er for details of the current maintainer. * ************************************************************************/ -/* $Id: curses.h,v 1.198 2006/07/23 19:32:48 wmcbrine Exp $ */ +/* $Id: curses.h,v 1.199 2006/07/23 22:58:57 wmcbrine Exp $ */ /*----------------------------------------------------------------------* * PDCurses * @@ -591,7 +591,6 @@ typedef struct chtype blank; /* Background character */ int cursrow; /* position of physical cursor */ int curscol; /* position of physical cursor */ - int cursor; /* Current Cursor definition */ int visibility; /* Visibility of cursor */ int orig_emulation; /* Original cursor emulation value */ int orig_cursor; /* Original cursor size */ diff --git a/dos/pdcscrn.c b/dos/pdcscrn.c index e894451e..a15a8d78 100644 --- a/dos/pdcscrn.c +++ b/dos/pdcscrn.c @@ -24,7 +24,7 @@ # include #endif -RCSID("$Id: pdcscrn.c,v 1.34 2006/07/17 02:20:48 wmcbrine Exp $"); +RCSID("$Id: pdcscrn.c,v 1.35 2006/07/23 22:58:57 wmcbrine Exp $"); Regs regs; /* used in various other modules */ @@ -132,7 +132,6 @@ int PDC_scr_open(int argc, char **argv) SP->video_seg = 0xb000; /* Base screen segment addr */ SP->video_ofs = 0x0; /* Base screen segment ofs */ SP->video_page = 0; /* Current Video Page */ - SP->cursor = PDC_get_cursor_mode(); SP->adapter = PDC_query_adapter_type(); SP->scrnmode = PDC_get_scrn_mode(); @@ -141,7 +140,7 @@ int PDC_scr_open(int argc, char **argv) SP->lines = PDC_get_rows(); SP->cols = PDC_get_columns(); - SP->orig_cursor = SP->cursor; + SP->orig_cursor = PDC_get_cursor_mode(); SP->orgcbr = PDC_get_ctrl_break(); /* If the environment variable PDCURSES_BIOS is set, the DOS diff --git a/os2/pdcscrn.c b/os2/pdcscrn.c index 5f9b790c..a8bdf98e 100644 --- a/os2/pdcscrn.c +++ b/os2/pdcscrn.c @@ -20,7 +20,7 @@ #include #include -RCSID("$Id: pdcscrn.c,v 1.30 2006/07/17 02:20:48 wmcbrine Exp $"); +RCSID("$Id: pdcscrn.c,v 1.31 2006/07/23 22:58:57 wmcbrine Exp $"); #ifdef EMXVIDEO static unsigned char *saved_screen = NULL; @@ -150,7 +150,6 @@ int PDC_scr_open(int argc, char **argv) PDC_get_cursor_pos(&SP->cursrow, &SP->curscol); - SP->cursor = PDC_get_cursor_mode(); #ifdef EMXVIDEO SP->tahead = -1; #endif @@ -177,7 +176,7 @@ int PDC_scr_open(int argc, char **argv) SP->orig_font = SP->font = PDC_get_font(); SP->lines = PDC_get_rows(); SP->cols = PDC_get_columns(); - SP->orig_cursor = SP->cursor; + SP->orig_cursor = PDC_get_cursor_mode(); SP->orgcbr = PDC_get_ctrl_break(); SP->sizeable = TRUE; diff --git a/pdcurses/initscr.c b/pdcurses/initscr.c index f63c862c..17895722 100644 --- a/pdcurses/initscr.c +++ b/pdcurses/initscr.c @@ -38,7 +38,7 @@ # undef wnoutrefresh #endif -RCSID("$Id: initscr.c,v 1.60 2006/07/23 19:32:48 wmcbrine Exp $"); +RCSID("$Id: initscr.c,v 1.61 2006/07/23 22:58:57 wmcbrine Exp $"); const char *_curses_notice = "PDCurses 3.0 - Public Domain 2006"; @@ -292,8 +292,6 @@ int endwin(void) PDC_set_font(SP->orig_font); resize_term(PDC_get_rows(), PDC_get_columns()); } - - SP->cursor = SP->orig_cursor; #endif #if defined(DOS) || defined(OS2) diff --git a/win32/pdcscrn.c b/win32/pdcscrn.c index 45ddd13a..ee2856e5 100644 --- a/win32/pdcscrn.c +++ b/win32/pdcscrn.c @@ -19,7 +19,7 @@ #define INCLUDE_WINDOWS_H #include -RCSID("$Id: pdcscrn.c,v 1.40 2006/07/17 02:20:48 wmcbrine Exp $"); +RCSID("$Id: pdcscrn.c,v 1.41 2006/07/23 22:58:57 wmcbrine Exp $"); #define PDC_RESTORE_NONE 0 #define PDC_RESTORE_BUFFER 1 @@ -268,10 +268,9 @@ int PDC_scr_open(int argc, char **argv) PDC_get_cursor_pos(&SP->cursrow, &SP->curscol); - SP->cursor = PDC_get_cursor_mode(); SP->adapter = PDC_query_adapter_type(); - SP->orig_cursor = SP->cursor; + SP->orig_cursor = PDC_get_cursor_mode(); SP->orgcbr = PDC_get_ctrl_break(); diff --git a/x11/pdcscrn.c b/x11/pdcscrn.c index 0f4f39c4..61668ec0 100644 --- a/x11/pdcscrn.c +++ b/x11/pdcscrn.c @@ -17,7 +17,7 @@ #include "pdcx11.h" -RCSID("$Id: pdcscrn.c,v 1.28 2006/07/17 02:20:48 wmcbrine Exp $"); +RCSID("$Id: pdcscrn.c,v 1.29 2006/07/23 22:58:57 wmcbrine Exp $"); bool GLOBAL_sb_on = FALSE; bool GLOBAL_slk_on = FALSE; @@ -74,9 +74,8 @@ int PDC_scr_open(int argc, char **argv) return ERR; SP->cursrow = SP->curscol = 0; - SP->cursor = 0; SP->adapter = 0; - SP->orig_cursor = SP->cursor; + SP->orig_cursor = 0; SP->orig_attr = FALSE; SP->orgcbr = 0; SP->sb_on = sb_started;