diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2014-05-09 19:56:42 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2014-05-09 19:56:42 +0000 |
| commit | 0abff89ae011fd09403930fb14063b72ba40603a (patch) | |
| tree | 937640dd5f74bcda37512cb4c26e6a80b3150eab /app/xterm/util.c | |
| parent | a85e097bc006d743f42b66432c5c01c546f4535d (diff) | |
Update to xterm 304. With help of shadchin@
tested by ajacoutot@ and shadchin@
Diffstat (limited to 'app/xterm/util.c')
| -rw-r--r-- | app/xterm/util.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/app/xterm/util.c b/app/xterm/util.c index 3b4249dcd..da8d2e4e3 100644 --- a/app/xterm/util.c +++ b/app/xterm/util.c @@ -1,4 +1,4 @@ -/* $XTermId: util.c,v 1.620 2014/01/15 02:02:14 tom Exp $ */ +/* $XTermId: util.c,v 1.624 2014/05/02 20:24:05 tom Exp $ */ /* * Copyright 1999-2013,2014 by Thomas E. Dickey @@ -1384,7 +1384,7 @@ InsertChar(XtermWidget xw, unsigned n) ClearCurBackground(xw, INX2ROW(screen, screen->cur_row), screen->cur_col, - 1, + 1U, n, (unsigned) LineFontWidth(screen, ld)); } @@ -1453,7 +1453,7 @@ DeleteChar(XtermWidget xw, unsigned n) ClearCurBackground(xw, INX2ROW(screen, screen->cur_row), col, - 1, + 1U, n, (unsigned) LineFontWidth(screen, ld)); } @@ -1628,7 +1628,7 @@ ClearInLine2(XtermWidget xw, int flags, int row, int col, unsigned len) ClearCurBackground(xw, INX2ROW(screen, row), col, - 1, + 1U, len, (unsigned) LineFontWidth(screen, ld)); } @@ -1756,6 +1756,8 @@ ClearScreen(XtermWidget xw) TScreen *screen = TScreenOf(xw); int top; + TRACE(("ClearScreen\n")); + if (screen->cursor_state) HideCursor(); @@ -2094,7 +2096,7 @@ scrolling_copy_area(XtermWidget xw, * Returns 1 iff the area where the cursor was got refreshed. */ int -HandleExposure(XtermWidget xw, XEvent * event) +HandleExposure(XtermWidget xw, XEvent *event) { TScreen *screen = TScreenOf(xw); XExposeEvent *reply = (XExposeEvent *) event; @@ -2519,7 +2521,7 @@ reallySwapColors(XtermWidget xw, ToSwap * list, int count) } static void -swapVTwinGCs(XtermWidget xw, VTwin * win) +swapVTwinGCs(XtermWidget xw, VTwin *win) { swapCgs(xw, win, gcNorm, gcNormReverse); swapCgs(xw, win, gcBold, gcBoldReverse); @@ -2598,7 +2600,7 @@ ReverseVideo(XtermWidget xw) TekRepaint(tekWidget); } #endif - ReverseOldColors(); + ReverseOldColors(xw); set_cursor_gcs(xw); update_reversevideo(); TRACE(("...ReverseVideo\n")); @@ -2772,8 +2774,8 @@ getNormXftFont(XtermWidget xw, static int xtermXftDrawString(XtermWidget xw, unsigned flags GCC_UNUSED, - XftColor * color, - XftFont * font, + XftColor *color, + XftFont *font, int x, int y, IChar *text, @@ -3130,8 +3132,8 @@ xtermSetClipRectangles(Display *dpy, static int drawClippedXftString(XtermWidget xw, unsigned flags, - XftFont * font, - XftColor * fg_color, + XftFont *font, + XftColor *fg_color, int x, int y, IChar *text, @@ -3932,7 +3934,7 @@ drawXtermText(XtermWidget xw, * Allocate buffer - workaround for wide-character interfaces. */ void -allocXtermChars(ScrnPtr * buffer, Cardinal length) +allocXtermChars(ScrnPtr *buffer, Cardinal length) { if (*buffer == 0) { *buffer = (ScrnPtr) XtMalloc(length); @@ -4531,7 +4533,7 @@ decode_wcwidth(XtermWidget xw) * which will be mapped into true/false. */ int -extendedBoolean(const char *value, FlagList * table, Cardinal limit) +extendedBoolean(const char *value, const FlagList * table, Cardinal limit) { int result = -1; long check; |