From 7c2f2f13d18d12be4f9fe1dc52c706eef11fceb6 Mon Sep 17 00:00:00 2001 From: William McBrine Date: Mon, 2 Sep 2019 19:53:55 -0400 Subject: [PATCH] Functions, XC_ -> PDC_ --- x11/pdcdisp.c | 20 ++++++++++---------- x11/pdckbd.c | 2 +- x11/pdcscrn.c | 10 +++++----- x11/pdcsetsc.c | 2 +- x11/pdcx11.h | 10 +++++----- x11/sb.c | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/x11/pdcdisp.c b/x11/pdcdisp.c index 00c84466..a0928ba1 100644 --- a/x11/pdcdisp.c +++ b/x11/pdcdisp.c @@ -155,18 +155,18 @@ static void _display_cursor(int old_row, int old_x, int new_row, int new_x) new_row, new_x)); } -void XC_redraw_cursor(void) +void PDC_redraw_cursor(void) { _display_cursor(SP->cursrow, SP->curscol, SP->cursrow, SP->curscol); } -void XC_blink_text(XtPointer unused, XtIntervalId *id) +void PDC_blink_text(XtPointer unused, XtIntervalId *id) { int row; int j, k; chtype *ch; - PDC_LOG(("XC_blink_text() - called:\n")); + PDC_LOG(("PDC_blink_text() - called:\n")); pdc_blinked_off = !pdc_blinked_off; @@ -189,11 +189,11 @@ void XC_blink_text(XtPointer unused, XtIntervalId *id) } } - XC_redraw_cursor(); + PDC_redraw_cursor(); if ((SP->termattrs & A_BLINK) || !pdc_blinked_off) XtAppAddTimeOut(pdc_app_context, pdc_app_data.textBlinkRate, - XC_blink_text, NULL); + PDC_blink_text, NULL); } static void _toggle_cursor(void) @@ -212,7 +212,7 @@ static void _toggle_cursor(void) int save_visibility = SP->visibility; SP->visibility = 0; - XC_redraw_cursor(); + PDC_redraw_cursor(); SP->visibility = save_visibility; pdc_visible_cursor = FALSE; } @@ -220,7 +220,7 @@ static void _toggle_cursor(void) { /* Cursor currently OFF, turn it on */ - XC_redraw_cursor(); + PDC_redraw_cursor(); pdc_visible_cursor = TRUE; } } @@ -243,13 +243,13 @@ int PDC_display_cursor(int oldrow, int oldcol, int newrow, int newcol, return OK; } -void XC_blink_cursor(XtPointer unused, XtIntervalId *id) +void PDC_blink_cursor(XtPointer unused, XtIntervalId *id) { - PDC_LOG(("XC_blink_cursor() - called:\n")); + PDC_LOG(("PDC_blink_cursor() - called:\n")); _toggle_cursor(); XtAppAddTimeOut(pdc_app_context, pdc_app_data.cursorBlinkRate, - XC_blink_cursor, NULL); + PDC_blink_cursor, NULL); } /* position hardware cursor at (y, x) */ diff --git a/x11/pdckbd.c b/x11/pdckbd.c index 3fe165a3..f35480c1 100644 --- a/x11/pdckbd.c +++ b/x11/pdckbd.c @@ -551,7 +551,7 @@ static void _dummy_handler(Widget w, XtPointer client_data, { } -int XC_kb_setup(void) +int PDC_kb_setup(void) { Xim = XOpenIM(XCURSESDISPLAY, NULL, NULL, NULL); diff --git a/x11/pdcscrn.c b/x11/pdcscrn.c index 5d5bf83d..b78b4918 100644 --- a/x11/pdcscrn.c +++ b/x11/pdcscrn.c @@ -329,7 +329,7 @@ static void _display_screen(void) for (row = 0; row < SP->lines; row++) PDC_transform_line(row, 0, COLS, curscr->_y[row]); - XC_redraw_cursor(); + PDC_redraw_cursor(); } static void _handle_expose(Widget w, XtPointer client_data, XEvent *event, @@ -389,7 +389,7 @@ static void _handle_enter_leave(Widget w, XtPointer client_data, /* Display the cursor so it stays on while the window is not current */ - XC_redraw_cursor(); + PDC_redraw_cursor(); break; default: @@ -552,7 +552,7 @@ int PDC_scr_open(int argc, char **argv) /* Create a widget in which to draw */ - if (!XC_scrollbar_init(argv[0])) + if (!PDC_scrollbar_init(argv[0])) { pdc_drawing = pdc_toplevel; @@ -590,7 +590,7 @@ int PDC_scr_open(int argc, char **argv) if (pdc_app_data.cursorBlinkRate) XtAppAddTimeOut(pdc_app_context, pdc_app_data.cursorBlinkRate, - XC_blink_cursor, NULL); + PDC_blink_cursor, NULL); XtRealizeWidget(pdc_toplevel); @@ -625,7 +625,7 @@ int PDC_scr_open(int argc, char **argv) _pointer_setup(); - if (ERR == XC_kb_setup()) + if (ERR == PDC_kb_setup()) return ERR; while (!exposed) diff --git a/x11/pdcsetsc.c b/x11/pdcsetsc.c index 36ec226a..dcab8c81 100644 --- a/x11/pdcsetsc.c +++ b/x11/pdcsetsc.c @@ -76,7 +76,7 @@ int PDC_set_blink(bool blinkon) SP->termattrs |= A_BLINK; pdc_blinked_off = FALSE; XtAppAddTimeOut(pdc_app_context, pdc_app_data.textBlinkRate, - XC_blink_text, NULL); + PDC_blink_text, NULL); } } else diff --git a/x11/pdcx11.h b/x11/pdcx11.h index 6efd96f3..21d9d308 100644 --- a/x11/pdcx11.h +++ b/x11/pdcx11.h @@ -75,8 +75,8 @@ extern bool pdc_vertical_cursor, pdc_visible_cursor; int PDC_display_cursor(int, int, int, int, int); -void XC_blink_cursor(XtPointer, XtIntervalId *); -void XC_blink_text(XtPointer, XtIntervalId *); -int XC_kb_setup(void); -void XC_redraw_cursor(void); -bool XC_scrollbar_init(const char *); +void PDC_blink_cursor(XtPointer, XtIntervalId *); +void PDC_blink_text(XtPointer, XtIntervalId *); +int PDC_kb_setup(void); +void PDC_redraw_cursor(void); +bool PDC_scrollbar_init(const char *); diff --git a/x11/sb.c b/x11/sb.c index 32fc0f35..f5a893f6 100644 --- a/x11/sb.c +++ b/x11/sb.c @@ -151,7 +151,7 @@ static void _thumb_left_right(Widget w, XtPointer client_data, (double)(viewport_x / total_x)); } -bool XC_scrollbar_init(const char *program_name) +bool PDC_scrollbar_init(const char *program_name) { if (pdc_app_data.scrollbarWidth && sb_started) {