From acdb6e36817f56eecde0b4582bcc460356b700c2 Mon Sep 17 00:00:00 2001 From: William McBrine Date: Sat, 8 Jul 2006 00:21:41 +0000 Subject: [PATCH] Things that don't need to be in pdcx11.h. To Do: Most of the rest are only shared between pdcx11.c and process/x11.c. --- x11/pdcx11.c | 29 ++++++++++++++++++----------- x11/pdcx11.h | 27 ++------------------------- x11/process/x11.c | 7 ++++++- 3 files changed, 26 insertions(+), 37 deletions(-) diff --git a/x11/pdcx11.c b/x11/pdcx11.c index 8136a848..c60e5fe2 100644 --- a/x11/pdcx11.c +++ b/x11/pdcx11.c @@ -20,7 +20,7 @@ #include #include -RCSID("$Id: pdcx11.c,v 1.71 2006/07/07 16:20:28 wmcbrine Exp $"); +RCSID("$Id: pdcx11.c,v 1.72 2006/07/08 00:21:41 wmcbrine Exp $"); AppData app_data; @@ -35,6 +35,14 @@ AppData app_data; #include "big_icon.xbm" #include "little_icon.xbm" +void XCursesPasteSelection(Widget, XButtonEvent *); +void XCursesHandleString(Widget, XEvent *, String *, Cardinal *); +void XCursesKeyPress(Widget, XEvent *, String *, Cardinal *); +void XCursesModifierPress(Widget, XEvent *, String *, Cardinal *); +void XCursesButton(Widget, XEvent *, String *, Cardinal *); +void XCursesRequestorCallbackForPaste(Widget, XtPointer, Atom *, Atom *, + XtPointer, unsigned long *, int *); + struct XCursesKey { int keycode; @@ -410,7 +418,7 @@ int state_mask[8] = Atom wm_atom[2]; char *XCursesClassName = "XCurses"; XtAppContext app_context; -Widget topLevel, drawing, d1, scrollBox, scrollVert, scrollHoriz; +Widget topLevel, drawing, scrollBox, scrollVert, scrollHoriz; int ReceivedMapNotify = 0; Boolean mouse_selection = False; chtype *tmpsel = NULL; @@ -873,8 +881,6 @@ char *defaultTranslations = ": XCursesButton()" }; -int xerror(); - #ifdef PDCDEBUG void XCsay(const char *msg) { @@ -968,6 +974,14 @@ RETSIGTYPE XCursesSigwinchHandler(int signo) #endif } +static void makeXY(int x, int y, int fontwidth, int fontheight, + int *xpos, int *ypos) +{ + *xpos = (x * fontwidth) + XCURSESBORDERWIDTH; + *ypos = XCURSESNORMALFONTINFO->ascent + (y * fontheight) + + XCURSESBORDERWIDTH; +} + static int XCursesNewPacket(chtype attr, bool rev, int len, int col, int row, #ifdef UNICODE XChar2b *text) @@ -1139,13 +1153,6 @@ void get_GC(Display *display, Window win, GC *gc, XFontStruct *font_info, XSetFunction(display, *gc, GXxor); } -void makeXY(int x, int y, int fontwidth, int fontheight, int *xpos, int *ypos) -{ - *xpos = (x * fontwidth) + XCURSESBORDERWIDTH; - *ypos = XCURSESNORMALFONTINFO->ascent + (y * fontheight) + - XCURSESBORDERWIDTH; -} - int get_colors(void) { XC_LOG(("in get_colors\n")); diff --git a/x11/pdcx11.h b/x11/pdcx11.h index 90ce729c..49803592 100644 --- a/x11/pdcx11.h +++ b/x11/pdcx11.h @@ -15,7 +15,7 @@ * See the file maintain.er for details of the current maintainer. * ************************************************************************/ -/* $Id: pdcx11.h,v 1.32 2006/07/07 16:20:28 wmcbrine Exp $ */ +/* $Id: pdcx11.h,v 1.33 2006/07/08 00:21:41 wmcbrine Exp $ */ #define CURSES_LIBRARY 1 #ifdef HAVE_CONFIG_H @@ -279,40 +279,23 @@ extern AppData app_data; void dummy_function(void); void get_GC(Display *, Window, GC *, XFontStruct *, int, int, bool); -void makeXY(int, int, int, int, int *, int *); int get_colors(void); -void start_event_handler(void); -int XCursesTransformLine(int, int, chtype, int, int, int, char *); int XCursesDisplayText(const chtype *, int, int, int, bool); void XCursesDisplayScreen(bool); void XCursesDisplayCursor(int, int, int, int); int XCurses_display_cursor(int, int, int, int, int); -void XCursesStructureNotify(Widget, XtPointer, XEvent *, Boolean *); void XCursesEnterLeaveWindow(Widget, XtPointer, XEvent *, Boolean *); -void XCursesPasteSelection(Widget, XButtonEvent *); -void XCursesHandleString(Widget, XEvent *, String *, Cardinal *); -void XCursesKeyPress(Widget, XEvent *, String *, Cardinal *); -void XCursesModifierPress(Widget, XEvent *, String *, Cardinal *); -void XCursesButton(Widget, XEvent *, String *, Cardinal *); Boolean XCursesConvertProc(Widget, Atom *, Atom *, Atom *, XtPointer *, unsigned long *, int *); void XCursesLoseOwnership(Widget, Atom *); -void XCursesRequestorCallbackForPaste(Widget, XtPointer, Atom *, Atom *, - XtPointer, unsigned long *, int *); -void XCursesRequestorCallbackForGetSelection(Widget, XtPointer, Atom *, Atom *, - XtPointer, unsigned long *, int *); -RETSIGTYPE XCursesSignalHandler(int); void XCursesEndwin(void); void XCursesExitCursesProcess(int, char *); void XCursesExitXCursesProcess(int, int, char *); void SelectionOff(void); -void SelectionOn(int, int); -void SelectionExtend(int, int); -void SelectionSet(void); int write_socket(int, const char *, int); int read_socket(int, char *, int); @@ -367,15 +350,11 @@ extern char *defaultTranslations; extern XtActionsRec XCursesActions[PDC_NUMBER_XCURSES_ACTIONS]; extern char *XCursesClassName; extern XtAppContext app_context; -extern Widget topLevel, drawing, d1, scrollBox, scrollVert, scrollHoriz; +extern Widget topLevel, drawing, scrollBox, scrollVert, scrollHoriz; extern int ReceivedMapNotify; extern Boolean mouse_selection; extern chtype *tmpsel; extern unsigned long tmpsel_length; -extern int selection_start_x; -extern int selection_start_y; -extern int selection_end_x; -extern int selection_end_y; extern Pixmap icon_bitmap; #ifdef HAVE_XPM_H extern Pixmap icon_pixmap; @@ -385,7 +364,6 @@ extern XtResource app_resources[PDC_NUMBER_APP_RESOURCES]; extern XrmOptionDescRec options[PDC_NUMBER_OPTIONS]; extern char global_display_name[100]; extern Bool after_first_curses_request; -extern int colors[(2 * MAX_COLORS) + 2]; extern int windowEntered; extern int visible_cursor; extern Bool vertical_cursor; @@ -400,7 +378,6 @@ signal_handler XCursesSetSignal(int, signal_handler); void XCursesGetIcon(void); int XCursesRefreshScrollbar(void); void XCursesSendKeyToCurses(unsigned long, MOUSE_STATUS *); -void XCursesButton(Widget, XEvent *, String *, Cardinal *); void XCursesCursorBlink(XtPointer unused, XtIntervalId *id); void Scroll_up_down(Widget w, XtPointer client_data, XtPointer call_data); void Scroll_left_right(Widget w, XtPointer client_data, XtPointer call_data); diff --git a/x11/process/x11.c b/x11/process/x11.c index 7cea2fb0..63d7594b 100644 --- a/x11/process/x11.c +++ b/x11/process/x11.c @@ -19,12 +19,17 @@ #include -RCSID("$Id: x11.c,v 1.48 2006/07/02 19:03:59 wmcbrine Exp $"); +RCSID("$Id: x11.c,v 1.49 2006/07/08 00:21:41 wmcbrine Exp $"); int visible_cursor = 0; int windowEntered = 1; static char *XCursesProgramName; +void XCursesStructureNotify(Widget, XtPointer, XEvent *, Boolean *); +void XCursesRequestorCallbackForGetSelection(Widget, XtPointer, Atom *, Atom *, + XtPointer, unsigned long *, int *); +RETSIGTYPE XCursesSignalHandler(int); + void XCursesExitXCursesProcess(int rc, int sig, char *msg) { if (rc || sig)