From 403ecb9d31229b23ec1b0ec33efc07e23e4f7ac7 Mon Sep 17 00:00:00 2001 From: William McBrine Date: Fri, 21 Jul 2006 17:43:13 +0000 Subject: [PATCH] Stuff that doesn't need to be in pdcx11.h anymore. --- x11/pdcx11.h | 194 +--------------------------------------------- x11/x11.c | 212 +++++++++++++++++++++++++++++++++------------------ 2 files changed, 137 insertions(+), 269 deletions(-) diff --git a/x11/pdcx11.h b/x11/pdcx11.h index 04dc4556..6cfec29e 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.42 2006/07/21 04:07:05 wmcbrine Exp $ */ +/* $Id: pdcx11.h,v 1.43 2006/07/21 17:43:13 wmcbrine Exp $ */ #define CURSES_LIBRARY 1 #ifdef HAVE_CONFIG_H @@ -41,10 +41,6 @@ #include #include -#ifndef XPOINTER_TYPEDEFED -typedef char * XPointer; -#endif - #ifdef TIME_WITH_SYS_TIME # include # include @@ -85,18 +81,6 @@ typedef char * XPointer; # include #endif -#ifdef HAVE_DECKEYSYM_H -# include -#endif - -#ifdef HAVE_SUNKEYSYM_H -# include -#endif - -#ifdef HAVE_XPM_H -# include -#endif - #include #define XCURSCR_Y_SIZE (XCursesLINES * XCursesCOLS * sizeof(chtype)) @@ -113,86 +97,6 @@ typedef char * XPointer; #define XCURSCR_LENGTH_OFF (XCURSCR_START_OFF + XCURSCR_START_SIZE) #define XCURSCR_ATRTAB_OFF (XCURSCR_LENGTH_OFF + XCURSCR_LENGTH_SIZE) -#define XtNlines "lines" -#define XtCLines "Lines" -#define XtNcols "cols" -#define XtCCols "Cols" - -#define XtCNormalFont "NormalFont" -#define XtNnormalFont "normalFont" -#define XtCItalicFont "ItalicFont" -#define XtNitalicFont "italicFont" - -#define XtCPointer "Pointer" -#define XtNpointer "pointer" - -#define XtCShmmin "Shmmin" -#define XtNshmmin "shmmin" - -#define XtCComposeKey "ComposeKey" -#define XtNcomposeKey "composeKey" - -#define XtCClickPeriod "ClickPeriod" -#define XtNclickPeriod "clickPeriod" - -#define XtCDoubleClickPeriod "DoubleClickPeriod" -#define XtNdoubleClickPeriod "doubleClickPeriod" - -#define XtCScrollbarWidth "ScrollbarWidth" -#define XtNscrollbarWidth "scrollbarWidth" - -#define XtCCursorBlinkRate "CursorBlinkRate" -#define XtNcursorBlinkRate "cursorBlinkRate" - -#define XtCPointerForeColor "PointerForeColor" -#define XtNpointerForeColor "pointerForeColor" -#define XtCPointerBackColor "PointerBackColor" -#define XtNpointerBackColor "pointerBackColor" - -#define XtNcursorColor "cursorColor" -#define XtCCursorColor "CursorColor" - -#define XtNtextCursor "textCursor" -#define XtCTextCursor "TextCursor" - -#define XtNcolorBlack "colorBlack" -#define XtCColorBlack "ColorBlack" -#define XtNcolorRed "colorRed" -#define XtCColorRed "ColorRed" -#define XtNcolorGreen "colorGreen" -#define XtCColorGreen "ColorGreen" -#define XtNcolorYellow "colorYellow" -#define XtCColorYellow "ColorYellow" -#define XtNcolorBlue "colorBlue" -#define XtCColorBlue "ColorBlue" -#define XtNcolorMagenta "colorMagenta" -#define XtCColorMagenta "ColorMagenta" -#define XtNcolorCyan "colorCyan" -#define XtCColorCyan "ColorCyan" -#define XtNcolorWhite "colorWhite" -#define XtCColorWhite "ColorWhite" - -#define XtNcolorBoldBlack "colorBoldBlack" -#define XtCColorBoldBlack "ColorBoldBlack" -#define XtNcolorBoldRed "colorBoldRed" -#define XtCColorBoldRed "ColorBoldRed" -#define XtNcolorBoldGreen "colorBoldGreen" -#define XtCColorBoldGreen "ColorBoldGreen" -#define XtNcolorBoldYellow "colorBoldYellow" -#define XtCColorBoldYellow "ColorBoldYellow" -#define XtNcolorBoldBlue "colorBoldBlue" -#define XtCColorBoldBlue "ColorBoldBlue" -#define XtNcolorBoldMagenta "colorBoldMagenta" -#define XtCColorBoldMagenta "ColorBoldMagenta" -#define XtNcolorBoldCyan "colorBoldCyan" -#define XtCColorBoldCyan "ColorBoldCyan" -#define XtNcolorBoldWhite "colorBoldWhite" -#define XtCColorBoldWhite "ColorBoldWhite" - -#ifndef MAX_PATH -# define MAX_PATH 256 -#endif - typedef struct { int lines; @@ -236,70 +140,20 @@ typedef struct extern AppData app_data; -#define XCURSESNORMALFONTINFO app_data.normalfont -#define XCURSESITALICFONTINFO app_data.italicfont -#define XCURSESLINES app_data.lines -#define XCURSESCOLS app_data.cols -#define XCURSESBITMAPFILE app_data.bitmapFile -#ifdef HAVE_XPM_H -# define XCURSESPIXMAPFILE app_data.pixmapFile -#endif -#define XCURSESCOMPOSEKEY app_data.composeKey -#define XCURSESPOINTER app_data.pointer -#define XCURSESPOINTERFORECOLOR app_data.pointerForeColor -#define XCURSESPOINTERBACKCOLOR app_data.pointerBackColor -#define XCURSESCURSORCOLOR app_data.cursorColor #define XCURSESSHMMIN app_data.shmmin -#define XCURSESBORDERWIDTH app_data.borderWidth -#define XCURSESBORDERCOLOR app_data.borderColor -#define XCURSESDOUBLECLICKPERIOD app_data.doubleClickPeriod -#define XCURSESCLICKPERIOD app_data.clickPeriod -#define XCURSESSCROLLBARWIDTH app_data.scrollbarWidth -#define XCURSESCURSORBLINKRATE app_data.cursorBlinkRate -#define XCURSESGEOMETRY app_data.geometry -#define XCURSESTEXTCURSOR app_data.textCursor - -#define XCURSESDISPLAY (XtDisplay(drawing)) -#define XCURSESWIN (XtWindow(drawing)) #define XCLOGMSG (XCursesProcess ? " X" : "CURSES") -#define MAX_COLORS 8 /* maximum of "normal" colours */ -#define COLOR_CURSOR 16 /* colour of cursor - 1 more than 2 * MAX_COLORS */ -#define COLOR_BORDER 17 /* colour of border - 2 more than 2 * MAX_COLORS */ - -#ifdef HAVE_XPM_H -# define PDC_NUMBER_OPTIONS 33 -#define PDC_NUMBER_APP_RESOURCES 35 -#else -# define PDC_NUMBER_OPTIONS 32 -# define PDC_NUMBER_APP_RESOURCES 34 -#endif -#define PDC_NUMBER_XCURSES_ACTIONS 5 - void get_line_lock(int); void release_line_lock(int); -void get_GC(Display *, Window, GC *, XFontStruct *, int, int, bool); -int get_colors(void); - -int XCursesDisplayText(const chtype *, int, int, int, bool); -void XCursesDisplayCursor(int, int, int, int); int PDC_display_cursor(int, int, int, int, int); -void XCursesEnterLeaveWindow(Widget, XtPointer, XEvent *, Boolean *); -Boolean XCursesConvertProc(Widget, Atom *, Atom *, Atom *, XtPointer *, - unsigned long *, int *); -void XCursesLoseOwnership(Widget, Atom *); -void XCursesEndwin(void); void XCursesExitCursesProcess(int, char *); -void XCursesExitXCursesProcess(int, int, char *); int XCursesInstruct(int); int XCursesInstructAndWait(int); int XCursesInitscr(int, char **); -void SelectionOff(void); - int write_socket(int, const char *, int); int read_socket(int, char *, int); int write_display_socket_int(int); @@ -333,58 +187,12 @@ extern int display_sockets[2]; extern int key_sockets[2]; extern int exit_sock; -extern GC normal_gc, block_cursor_gc, rect_cursor_gc, italic_gc, border_gc; -extern int XCursesFontHeight, XCursesFontWidth; -extern int XCursesFontAscent, XCursesFontDescent; -extern int XCursesWindowWidth, XCursesWindowHeight; -extern int resizeXCursesWindowWidth, resizeXCursesWindowHeight; -extern char *bitmap_file; -#ifdef HAVE_XPM_H -extern char *pixmap_file; -#endif extern MOUSE_STATUS Trapped_Mouse_status; -extern KeySym compose_key; -extern int compose_mask; -extern int state_mask[8]; -extern Atom wm_atom[2]; -extern XtTranslations XCursesTranslations; -extern char *defaultTranslations; -extern XtActionsRec XCursesActions[PDC_NUMBER_XCURSES_ACTIONS]; -extern char *XCursesClassName; -extern XtAppContext app_context; -extern Widget topLevel, drawing, scrollBox, scrollVert, scrollHoriz; -extern int ReceivedMapNotify; -extern Boolean mouse_selection; -extern chtype *tmpsel; -extern unsigned long tmpsel_length; -extern Pixmap icon_bitmap; -#ifdef HAVE_XPM_H -extern Pixmap icon_pixmap; -extern Pixmap icon_pixmap_mask; -#endif -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 windowEntered; -extern int visible_cursor; -extern Bool vertical_cursor; typedef RETSIGTYPE (*signal_handler)(); -void XCursesNonmaskable(Widget w, XtPointer client_data, XEvent *event, - Boolean *continue_to_dispatch); -void XCursesExpose(Widget w, XtPointer client_data, XEvent *event, - Boolean *continue_to_dispatch); signal_handler XCursesSetSignal(int, signal_handler); -void XCursesGetIcon(void); -int XCursesRefreshScrollbar(void); void XCursesSendKeyToCurses(unsigned long, MOUSE_STATUS *); -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); -void Thumb_up_down(Widget w, XtPointer client_data, XtPointer call_data); -void Thumb_left_right(Widget w, XtPointer client_data, XtPointer call_data); #ifdef PDCDEBUG void XCsay(const char *msg); diff --git a/x11/x11.c b/x11/x11.c index 50b1b6f0..007a4c53 100644 --- a/x11/x11.c +++ b/x11/x11.c @@ -17,10 +17,30 @@ #include "pdcx11.h" +#ifdef HAVE_DECKEYSYM_H +# include +#endif + +#ifdef HAVE_SUNKEYSYM_H +# include +#endif + +#ifdef HAVE_XPM_H +# include +#endif + #include #include -RCSID("$Id: x11.c,v 1.1 2006/07/21 15:28:18 wmcbrine Exp $"); +RCSID("$Id: x11.c,v 1.2 2006/07/21 17:43:13 wmcbrine Exp $"); + +#ifndef XPOINTER_TYPEDEFED +typedef char * XPointer; +#endif + +#ifndef MAX_PATH +# define MAX_PATH 256 +#endif AppData app_data; @@ -30,22 +50,62 @@ AppData app_data; # define PDC_SCROLLBAR_TYPE float #endif +#define MAX_COLORS 8 /* maximum of "normal" colours */ +#define COLOR_CURSOR 16 /* colour of cursor - 1 more than 2 * MAX_COLORS */ +#define COLOR_BORDER 17 /* colour of border - 2 more than 2 * MAX_COLORS */ + +#ifdef HAVE_XPM_H +# define PDC_NUMBER_OPTIONS 33 +#define PDC_NUMBER_APP_RESOURCES 35 +#else +# define PDC_NUMBER_OPTIONS 32 +# define PDC_NUMBER_APP_RESOURCES 34 +#endif +#define PDC_NUMBER_XCURSES_ACTIONS 5 + +#define XCURSESNORMALFONTINFO app_data.normalfont +#define XCURSESITALICFONTINFO app_data.italicfont +#define XCURSESLINES app_data.lines +#define XCURSESCOLS app_data.cols +#define XCURSESBITMAPFILE app_data.bitmapFile +#ifdef HAVE_XPM_H +# define XCURSESPIXMAPFILE app_data.pixmapFile +#endif +#define XCURSESCOMPOSEKEY app_data.composeKey +#define XCURSESPOINTER app_data.pointer +#define XCURSESPOINTERFORECOLOR app_data.pointerForeColor +#define XCURSESPOINTERBACKCOLOR app_data.pointerBackColor +#define XCURSESCURSORCOLOR app_data.cursorColor +#define XCURSESBORDERWIDTH app_data.borderWidth +#define XCURSESBORDERCOLOR app_data.borderColor +#define XCURSESDOUBLECLICKPERIOD app_data.doubleClickPeriod +#define XCURSESCLICKPERIOD app_data.clickPeriod +#define XCURSESSCROLLBARWIDTH app_data.scrollbarWidth +#define XCURSESCURSORBLINKRATE app_data.cursorBlinkRate +#define XCURSESTEXTCURSOR app_data.textCursor + +#define XCURSESDISPLAY (XtDisplay(drawing)) +#define XCURSESWIN (XtWindow(drawing)) + /* Default icons for XCurses applications. */ #include "big_icon.xbm" #include "little_icon.xbm" -void XCursesPasteSelection(Widget, XButtonEvent *); +void SelectionOff(void); +void XCursesButton(Widget, XEvent *, String *, Cardinal *); +void XCursesDisplayCursor(int, int, int, int); +void XCursesExitXCursesProcess(int, int, char *); 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 *); -void XCursesStructureNotify(Widget, XtPointer, XEvent *, Boolean *); +void XCursesPasteSelection(Widget, XButtonEvent *); void XCursesRequestorCallbackForGetSelection(Widget, XtPointer, Atom *, Atom *, XtPointer, unsigned long *, int *); +void XCursesRequestorCallbackForPaste(Widget, XtPointer, Atom *, Atom *, + XtPointer, unsigned long *, int *); RETSIGTYPE XCursesSignalHandler(int); +void XCursesStructureNotify(Widget, XtPointer, XEvent *, Boolean *); struct XCursesKey { @@ -443,8 +503,8 @@ static char *XCursesProgramName; XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = { { - XtNlines, - XtCLines, + "lines", + "Lines", XtRInt, sizeof(int), XtOffsetOf(AppData, lines), @@ -453,8 +513,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNcols, - XtCCols, + "cols", + "Cols", XtRInt, sizeof(int), XtOffsetOf(AppData, cols), @@ -463,8 +523,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNcursorColor, - XtCCursorColor, + "cursorColor", + "CursorColor", XtRPixel, sizeof(Pixel), XtOffsetOf(AppData, cursorColor), @@ -473,8 +533,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNcolorBlack, - XtCColorBlack, + "colorBlack", + "ColorBlack", XtRPixel, sizeof(Pixel), XtOffsetOf(AppData, colorBlack), @@ -483,8 +543,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNcolorRed, - XtCColorRed, + "colorRed", + "ColorRed", XtRPixel, sizeof(Pixel), XtOffsetOf(AppData, colorRed), @@ -493,8 +553,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNcolorGreen, - XtCColorGreen, + "colorGreen", + "ColorGreen", XtRPixel, sizeof(Pixel), XtOffsetOf(AppData, colorGreen), @@ -503,8 +563,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNcolorYellow, - XtCColorYellow, + "colorYellow", + "ColorYellow", XtRPixel, sizeof(Pixel), XtOffsetOf(AppData, colorYellow), @@ -513,8 +573,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNcolorBlue, - XtCColorBlue, + "colorBlue", + "ColorBlue", XtRPixel, sizeof(Pixel), XtOffsetOf(AppData, colorBlue), @@ -523,8 +583,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNcolorMagenta, - XtCColorMagenta, + "colorMagenta", + "ColorMagenta", XtRPixel, sizeof(Pixel), XtOffsetOf(AppData, colorMagenta), @@ -533,8 +593,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNcolorCyan, - XtCColorCyan, + "colorCyan", + "ColorCyan", XtRPixel, sizeof(Pixel), XtOffsetOf(AppData, colorCyan), @@ -543,8 +603,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNcolorWhite, - XtCColorWhite, + "colorWhite", + "ColorWhite", XtRPixel, sizeof(Pixel), XtOffsetOf(AppData, colorWhite), @@ -553,8 +613,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNcolorBoldBlack, - XtCColorBoldBlack, + "colorBoldBlack", + "ColorBoldBlack", XtRPixel, sizeof(Pixel), XtOffsetOf(AppData, colorBoldBlack), @@ -563,8 +623,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNcolorBoldRed, - XtCColorBoldRed, + "colorBoldRed", + "ColorBoldRed", XtRPixel, sizeof(Pixel), XtOffsetOf(AppData, colorBoldRed), @@ -573,8 +633,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNcolorBoldGreen, - XtCColorBoldGreen, + "colorBoldGreen", + "ColorBoldGreen", XtRPixel, sizeof(Pixel), XtOffsetOf(AppData, colorBoldGreen), @@ -583,8 +643,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNcolorBoldYellow, - XtCColorBoldYellow, + "colorBoldYellow", + "ColorBoldYellow", XtRPixel, sizeof(Pixel), XtOffsetOf(AppData, colorBoldYellow), @@ -593,8 +653,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNcolorBoldBlue, - XtCColorBoldBlue, + "colorBoldBlue", + "ColorBoldBlue", XtRPixel, sizeof(Pixel), XtOffsetOf(AppData, colorBoldBlue), @@ -603,8 +663,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNcolorBoldMagenta, - XtCColorBoldMagenta, + "colorBoldMagenta", + "ColorBoldMagenta", XtRPixel, sizeof(Pixel), XtOffsetOf(AppData, colorBoldMagenta), @@ -613,8 +673,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNcolorBoldCyan, - XtCColorBoldCyan, + "colorBoldCyan", + "ColorBoldCyan", XtRPixel, sizeof(Pixel), XtOffsetOf(AppData, colorBoldCyan), @@ -623,8 +683,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNcolorBoldWhite, - XtCColorBoldWhite, + "colorBoldWhite", + "ColorBoldWhite", XtRPixel, sizeof(Pixel), XtOffsetOf(AppData, colorBoldWhite), @@ -633,8 +693,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNnormalFont, - XtCNormalFont, + "normalFont", + "NormalFont", XtRFontStruct, sizeof(XFontStruct), XtOffsetOf(AppData, normalfont), @@ -648,8 +708,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNitalicFont, - XtCItalicFont, + "italicFont", + "ItalicFont", XtRFontStruct, sizeof(XFontStruct), XtOffsetOf(AppData, italicfont), @@ -663,8 +723,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNbitmap, - XtCBitmap, + "bitmap", + "Bitmap", XtRString, MAX_PATH, XtOffsetOf(AppData, bitmapFile), @@ -674,8 +734,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = #ifdef HAVE_XPM_H { - XtNpixmap, - XtCPixmap, + "pixmap", + "Pixmap", XtRString, MAX_PATH, XtOffsetOf(AppData, pixmapFile), @@ -685,8 +745,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = #endif { - XtNcomposeKey, - XtCComposeKey, + "composeKey", + "ComposeKey", XtRString, MAX_PATH, XtOffsetOf(AppData, composeKey), @@ -695,8 +755,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNpointer, - XtCPointer, + "pointer", + "Pointer", XtRCursor, sizeof(Cursor), XtOffsetOf(AppData, pointer), @@ -705,8 +765,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNpointerForeColor, - XtCPointerForeColor, + "pointerForeColor", + "PointerForeColor", XtRPixel, sizeof(Pixel), XtOffsetOf(AppData, pointerForeColor), @@ -715,8 +775,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNpointerBackColor, - XtCPointerBackColor, + "pointerBackColor", + "PointerBackColor", XtRPixel, sizeof(Pixel), XtOffsetOf(AppData, pointerBackColor), @@ -725,8 +785,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNshmmin, - XtCShmmin, + "shmmin", + "Shmmin", XtRInt, sizeof(int), XtOffsetOf(AppData, shmmin), @@ -735,8 +795,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNborderWidth, - XtCBorderWidth, + "borderWidth", + "BorderWidth", XtRInt, sizeof(int), XtOffsetOf(AppData, borderWidth), @@ -745,8 +805,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNborderColor, - XtCBorderColor, + "borderColor", + "BorderColor", XtRPixel, sizeof(Pixel), XtOffsetOf(AppData, borderColor), @@ -755,8 +815,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNdoubleClickPeriod, - XtCDoubleClickPeriod, + "doubleClickPeriod", + "DoubleClickPeriod", XtRInt, sizeof(int), XtOffsetOf(AppData, doubleClickPeriod), @@ -765,8 +825,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNclickPeriod, - XtCClickPeriod, + "clickPeriod", + "ClickPeriod", XtRInt, sizeof(int), XtOffsetOf(AppData, clickPeriod), @@ -775,8 +835,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNscrollbarWidth, - XtCScrollbarWidth, + "scrollbarWidth", + "ScrollbarWidth", XtRInt, sizeof(int), XtOffsetOf(AppData, scrollbarWidth), @@ -785,8 +845,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNcursorBlinkRate, - XtCCursorBlinkRate, + "cursorBlinkRate", + "CursorBlinkRate", XtRInt, sizeof(int), XtOffsetOf(AppData, cursorBlinkRate), @@ -795,8 +855,8 @@ XtResource app_resources[PDC_NUMBER_APP_RESOURCES] = }, { - XtNtextCursor, - XtCTextCursor, + "textCursor", + "TextCursor", XtRString, MAX_PATH, XtOffsetOf(AppData, textCursor),