ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.487 by sf-exg, Sat Apr 30 13:11:34 2011 UTC vs.
Revision 1.529 by sf-exg, Sun Dec 30 15:05:19 2012 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 wchar_t *chr, *alloc, ch2, **fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169 169
… …
181 181
182 alloc = 0; 182 alloc = 0;
183 chr = &ch2; 183 chr = &ch2;
184 len = 1; 184 len = 1;
185 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 189
187 char attr[80]; // plenty 190 char attr[80]; // plenty
188 191
189 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190 (int)r, 193 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 207 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 209 }
207 210
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
210 212
211 if (y >= 0) 213 if (y >= 0)
212 { 214 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
254 delete [] alloc; 258 delete [] alloc;
255# endif 259# endif
256} 260}
257#endif 261#endif
258 262
259void 263void ecb_cold
260rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
261{ 265{
262 wchar_t ch = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
263 267
264 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
… …
282 } 286 }
283 287
284 iso14755buf = 0; 288 iso14755buf = 0;
285} 289}
286 290
287static int 291static int ecb_cold
288hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
289{ 293{
290 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
291 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
292 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
… …
301 305
302 return -1; 306 return -1;
303} 307}
304#endif 308#endif
305 309
306static inline KeySym 310static inline KeySym ecb_cold
307translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
308{ 312{
309#ifdef XK_KP_Home 313#ifdef XK_KP_Home
310 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
311 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
… …
337# endif 341# endif
338#endif 342#endif
339 return keysym; 343 return keysym;
340} 344}
341 345
342static inline int 346static inline int ecb_cold
343map_function_key (KeySym keysym) 347map_function_key (KeySym keysym)
344{ 348{
345 int param = 0; 349 int param = 0;
346 350
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
396 break; 400 break;
397 } 401 }
398 return param; 402 return param;
399} 403}
400 404
401void 405void ecb_cold
402rxvt_term::key_press (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
403{ 407{
404 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
405 KeySym keysym; 409 KeySym keysym;
406 int valid_keysym; 410 int valid_keysym;
… …
421 ctrl = ev.state & ControlMask; 425 ctrl = ev.state & ControlMask;
422 meta = ev.state & ModMetaMask; 426 meta = ev.state & ModMetaMask;
423 427
424 kbuf[0] = 0; 428 kbuf[0] = 0;
425 429
426#ifdef USE_XIM 430#if USE_XIM
427 if (Input_Context) 431 if (Input_Context)
428 { 432 {
429 Status status_return; 433 Status status_return;
430 434
431#if 0 435#if 0
… …
776 } 780 }
777 781
778 if (newlen) 782 if (newlen)
779 len = strlen (kbuf); 783 len = strlen (kbuf);
780 784
785 if (len > 0)
786 {
781 /* 787 /*
788 * pass Shift/Control indicators for function keys ending with `~'
789 *
790 * eg,
791 * Prior = "ESC[5~"
792 * Shift+Prior = "ESC[5$"
793 * Ctrl+Prior = "ESC[5^"
794 * Ctrl+Shift+Prior = "ESC[5@"
795 */
796 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
797 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
798
799 /*
782 * Pass meta for all function keys, if 'meta' option set 800 * Pass meta for all function keys, if 'meta' option set
783 */ 801 */
784#ifdef META8_OPTION 802#ifdef META8_OPTION
785 if (meta && (meta_char == 0x80) && len > 0) 803 if (meta && (meta_char == 0x80))
786 kbuf[len - 1] |= 0x80; 804 kbuf[len - 1] |= 0x80;
787#endif 805#endif
806 }
788 807
789 } 808 }
790 else if (ctrl && keysym == XK_minus) 809 else if (ctrl && keysym == XK_minus)
791 { 810 {
792 len = 1; 811 len = 1;
… …
826 { 845 {
827 view_start = 0; 846 view_start = 0;
828 want_refresh = 1; 847 want_refresh = 1;
829 } 848 }
830 849
831 /*
832 * these modifications only affect the static keybuffer
833 * pass Shift/Control indicators for function keys ending with `~'
834 *
835 * eg,
836 * Prior = "ESC[5~"
837 * Shift+Prior = "ESC[5$"
838 * Ctrl+Prior = "ESC[5^"
839 * Ctrl+Shift+Prior = "ESC[5@"
840 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
841 */
842 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
843 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
844
845 /* escape prefix */ 850 /* escape prefix */
846 if (meta 851 if (meta
847#ifdef META8_OPTION 852#ifdef META8_OPTION
848 && meta_char == C0_ESC 853 && meta_char == C0_ESC
849#endif 854#endif
… …
854 } 859 }
855 860
856 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
857} 862}
858 863
859void 864void ecb_cold
860rxvt_term::key_release (XKeyEvent &ev) 865rxvt_term::key_release (XKeyEvent &ev)
861{ 866{
862#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
863 KeySym keysym; 868 KeySym keysym;
864 869
… …
936void 941void
937rxvt_term::flush () 942rxvt_term::flush ()
938{ 943{
939 flush_ev.stop (); 944 flush_ev.stop ();
940 945
941#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_IMG
942 if (bg_flags & BG_NEEDS_REFRESH) 947 if (bg_flags & BG_NEEDS_REFRESH)
943 { 948 {
944 bg_flags &= ~BG_NEEDS_REFRESH; 949 bg_flags &= ~BG_NEEDS_REFRESH;
945 scr_touch (false); 950 scr_touch (false);
946 } 951 }
… …
986 while (row < end_row); 991 while (row < end_row);
987 } 992 }
988 993
989 scr_refresh (); 994 scr_refresh ();
990 scrollBar.show (1); 995 scrollBar.show (1);
991#ifdef USE_XIM 996#if USE_XIM
992 IMSendSpot (); 997 im_send_spot ();
993#endif 998#endif
994 } 999 }
995 1000
996 display->flush (); 1001 display->flush ();
997} 1002}
… …
1015 flush (); 1020 flush ();
1016} 1021}
1017 1022
1018#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1019void 1024void
1025rxvt_term::cursor_blink_reset ()
1026{
1027 if (hidden_cursor)
1028 {
1029 hidden_cursor = 0;
1030 want_refresh = 1;
1031 }
1032
1033 if (option (Opt_cursorBlink))
1034 cursor_blink_ev.again ();
1035 else
1036 cursor_blink_ev.stop ();
1037}
1038
1039void
1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1021{ 1041{
1022 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1023 want_refresh = 1; 1043 want_refresh = 1;
1024 refresh_check (); 1044 refresh_check ();
… …
1042 1062
1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1044void 1064void
1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1046{ 1066{
1047 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1048 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1049 { 1069 {
1050 want_refresh = 1; 1070 want_refresh = 1;
1051 refresh_check (); 1071 refresh_check ();
1052 } 1072 }
1053 else 1073 else
… …
1203 pty_write (); 1223 pty_write ();
1204 1224
1205 refresh_check (); 1225 refresh_check ();
1206} 1226}
1207 1227
1208void 1228void ecb_cold
1209rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1210{ 1230{
1211 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1212 recolour_cursor (); 1232 recolour_cursor ();
1213 1233
… …
1218 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1219#endif 1239#endif
1220} 1240}
1221 1241
1222#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1223void 1243void ecb_cold
1224rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1225{ 1245{
1226 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1227 return; 1247 return;
1228 1248
… …
1230 XFlush (dpy); 1250 XFlush (dpy);
1231 1251
1232 hidden_pointer = 1; 1252 hidden_pointer = 1;
1233} 1253}
1234 1254
1235void 1255void ecb_cold
1236rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1237{ 1257{
1238 make_current (); 1258 make_current ();
1239 1259
1240 pointer_blank (); 1260 pointer_blank ();
… …
1332 32 + x, 1352 32 + x,
1333 32 + y); 1353 32 + y);
1334} 1354}
1335 1355
1336/*{{{ process an X event */ 1356/*{{{ process an X event */
1337void 1357void ecb_hot
1338rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1339{ 1359{
1340 make_current (); 1360 make_current ();
1341 1361
1342 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1445 if (ev.xconfigure.window == parent) 1465 if (ev.xconfigure.window == parent)
1446 { 1466 {
1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448 ; 1468 ;
1449 1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472 bool moved = false;
1450#ifdef HAVE_BG_PIXMAP 1473#ifdef HAVE_BG_PIXMAP
1451 bool moved = false;
1452 if (bg_window_position_sensitive ()) 1474 if (bg_window_position_sensitive ())
1453 { 1475 {
1476 want_position_change = true;
1477 if (!(bg_flags & BG_IS_VALID))
1478 moved = true;
1479 }
1480#endif
1481
1482 if (want_position_change)
1483 {
1454 int x, y; 1484 int x, y;
1485
1455 if (ev.xconfigure.send_event) 1486 if (ev.xconfigure.send_event)
1456 { 1487 {
1457 x = ev.xconfigure.x; 1488 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y; 1489 y = ev.xconfigure.y;
1459 } 1490 }
1460 else 1491 else
1461 get_window_origin (x, y); 1492 get_window_origin (x, y);
1462 1493
1463 if (bg_set_position (x, y) 1494 if (x != parent_x || y != parent_y)
1464 || !(bg_flags & BG_IS_VALID)) 1495 {
1496 parent_x = x;
1497 parent_y = y;
1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1465 moved = true; 1499 moved = true;
1500 }
1466 } 1501 }
1467#endif
1468 1502
1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1470 { 1504 {
1471 seen_resize = 1; 1505 seen_resize = 1;
1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1473 } 1507 }
1474 else 1508 else
1475 { 1509 {
1476#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1477 if (moved) 1511 if (moved)
1478 {
1479 if (mapped)
1480 update_background (); 1512 update_background ();
1481 else
1482 bg_invalidate ();
1483 }
1484#endif 1513#endif
1485 } 1514 }
1486 1515
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488 } 1517 }
… …
1500 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1501 break; 1530 break;
1502 1531
1503 case MapNotify: 1532 case MapNotify:
1504#ifdef HAVE_BG_PIXMAP 1533#ifdef HAVE_BG_PIXMAP
1505 /* This is needed specifically to fix the case of no window manager or a 1534 // This is needed at startup for the case of no window manager
1506 * non-reparenting window manager. In those cases we never get first 1535 // or a non-reparenting window manager and also because we
1507 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1536 // defer bg image updates if the window is not mapped. The
1508 * care of multiplicity of ConfigureNotify events arriving while WM does 1537 // short delay is to optimize for multiple ConfigureNotify
1509 * reparenting. 1538 // events at startup when the window manager reparents the
1510 * We should not render background immediately, as there could be several 1539 // window, so as to perform the computation after we have
1511 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1540 // received all of them.
1512 * by scheduling background redraw as soon as we can, but giving a short
1513 * bit of time for ConfigureNotifies to arrive.
1514 * We should render background PRIOR to drawing any text, but AFTER all
1515 * of ConfigureNotifys for the best results.
1516 */
1517 if (!(bg_flags & BG_IS_VALID)) 1541 if (!(bg_flags & BG_IS_VALID))
1518 update_background_ev.start (0.025); 1542 update_background_ev.start (0.025);
1519#endif 1543#endif
1520 mapped = 1; 1544 mapped = 1;
1521#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
… …
1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1587 ;
1564 1588
1565 if (scrollBar.state && ev.xany.window == scrollBar.win) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1590 {
1567 scrollBar.state = STATE_IDLE; 1591 scrollBar.state = SB_STATE_IDLE;
1568 scrollBar.show (0); 1592 scrollBar.show (0);
1569 } 1593 }
1570 } 1594 }
1571 break; 1595 break;
1572 1596
… …
1638 dist = int_bwidth - ev.xbutton.y; 1662 dist = int_bwidth - ev.xbutton.y;
1639 } 1663 }
1640 else 1664 else
1641 { 1665 {
1642 scroll_selection_dir = DN; 1666 scroll_selection_dir = DN;
1643 dist = ev.xbutton.y - (int_bwidth + height); 1667 dist = ev.xbutton.y - (int_bwidth + vt_height);
1644 } 1668 }
1645 1669
1646 scroll_selection_lines = Pixel2Height (dist) 1670 scroll_selection_lines = Pixel2Height (dist)
1647 / SELECTION_SCROLL_LINE_SPEEDUP 1671 / SELECTION_SCROLL_LINE_SPEEDUP
1648 + 1; 1672 + 1;
… …
1660#ifdef MOUSE_THRESHOLD 1684#ifdef MOUSE_THRESHOLD
1661 } 1685 }
1662#endif 1686#endif
1663 } 1687 }
1664 } 1688 }
1665 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1689 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1666 { 1690 {
1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1691 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1668 MotionNotify, &ev)) 1692 MotionNotify, &ev))
1669 ; 1693 ;
1670 1694
1671 XQueryPointer (dpy, scrollBar.win, 1695 XQueryPointer (dpy, scrollBar.win,
1672 &unused_root, &unused_child, 1696 &unused_root, &unused_child,
1673 &unused_root_x, &unused_root_y, 1697 &unused_root_x, &unused_root_y,
1674 &ev.xbutton.x, &ev.xbutton.y, 1698 &ev.xbutton.x, &ev.xbutton.y,
1675 &unused_mask); 1699 &unused_mask);
1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1700 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1677 scrollBar.size ()); 1701 scrollBar.size ());
1678 want_refresh = 1; 1702 want_refresh = 1;
1679 scrollBar.show (1); 1703 scrollBar.show (1);
1680 } 1704 }
1681 break; 1705 break;
1682 } 1706 }
1683 1707
1684#if defined(CURSOR_BLINK) 1708#if defined(CURSOR_BLINK)
1685 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1709 if (ev.type == KeyPress)
1686 {
1687 if (hidden_cursor)
1688 {
1689 hidden_cursor = 0;
1690 want_refresh = 1;
1691 }
1692
1693 cursor_blink_ev.again (); 1710 cursor_blink_reset ();
1694 }
1695#endif 1711#endif
1696 1712
1697#if defined(POINTER_BLANK) 1713#if defined(POINTER_BLANK)
1698 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1714 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1699 { 1715 {
… …
1710 1726
1711 refresh_check (); 1727 refresh_check ();
1712} 1728}
1713 1729
1714#if ENABLE_FRILLS 1730#if ENABLE_FRILLS
1715void 1731void ecb_cold
1716rxvt_term::set_urgency (bool enable) 1732rxvt_term::set_urgency (bool enable)
1717{ 1733{
1718 if (enable == urgency_hint) 1734 if (enable == urgency_hint)
1719 return; 1735 return;
1720 1736
1721 if (XWMHints *h = XGetWMHints (dpy, parent)) 1737 if (XWMHints *h = XGetWMHints (dpy, parent))
1722 { 1738 {
1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1739 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724 XSetWMHints (dpy, parent, h); 1740 XSetWMHints (dpy, parent, h);
1725 urgency_hint = enable; 1741 urgency_hint = enable;
1742 XFree (h);
1726 } 1743 }
1727} 1744}
1728#endif 1745#endif
1729 1746
1730void 1747void ecb_cold
1731rxvt_term::focus_in () 1748rxvt_term::focus_in ()
1732{ 1749{
1733 if (!focus) 1750 if (!focus)
1734 { 1751 {
1735 focus = 1; 1752 focus = 1;
1736 want_refresh = 1; 1753 want_refresh = 1;
1737 1754
1738#if USE_XIM 1755#if USE_XIM
1739 if (Input_Context != NULL) 1756 if (Input_Context != NULL)
1740 { 1757 {
1741 IMSetPosition (); 1758 im_set_position ();
1742 XSetICFocus (Input_Context); 1759 XSetICFocus (Input_Context);
1743 } 1760 }
1744#endif 1761#endif
1745#if CURSOR_BLINK 1762#if CURSOR_BLINK
1746 if (option (Opt_cursorBlink)) 1763 if (option (Opt_cursorBlink))
… …
1760 1777
1761 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1778 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1762 } 1779 }
1763} 1780}
1764 1781
1765void 1782void ecb_cold
1766rxvt_term::focus_out () 1783rxvt_term::focus_out ()
1767{ 1784{
1768 if (focus) 1785 if (focus)
1769 { 1786 {
1770 focus = 0; 1787 focus = 0;
… …
1803 1820
1804 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1821 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1805 } 1822 }
1806} 1823}
1807 1824
1808void 1825void ecb_cold
1809rxvt_term::update_fade_color (unsigned int idx) 1826rxvt_term::update_fade_color (unsigned int idx)
1810{ 1827{
1811#if OFF_FOCUS_FADING 1828#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade]) 1829 if (rs[Rs_fade])
1813 { 1830 {
… …
1816 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1833 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817 } 1834 }
1818#endif 1835#endif
1819} 1836}
1820 1837
1821#if ENABLE_TRANSPARENCY || ENABLE_PERL 1838#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1822void 1839void ecb_hot
1823rxvt_term::rootwin_cb (XEvent &ev) 1840rxvt_term::rootwin_cb (XEvent &ev)
1824{ 1841{
1825 make_current (); 1842 make_current ();
1826 1843
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1844 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1845 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829 return; 1846 return;
1830 1847
1831# if ENABLE_TRANSPARENCY
1832 switch (ev.type) 1848 switch (ev.type)
1833 { 1849 {
1834 case PropertyNotify: 1850 case PropertyNotify:
1835 /* 1851 /*
1836 * if user used some Esetroot compatible prog to set the root bg, 1852 * if user used some Esetroot compatible prog to set the root bg,
1837 * use the property to determine the pixmap. We use it later on. 1853 * use the property to determine the pixmap. We use it later on.
1838 */ 1854 */
1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1855 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1856 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841 { 1857 {
1858#if BG_IMAGE_FROM_ROOT
1842 bg_set_root_pixmap (); 1859 bg_set_root_pixmap ();
1843 update_background (); 1860 update_background ();
1861#endif
1862#if ENABLE_PERL
1863 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1864#endif
1844 } 1865 }
1845 1866
1846 break; 1867 break;
1847 } 1868 }
1848# endif
1849 1869
1850 refresh_check (); 1870 refresh_check ();
1851} 1871}
1852#endif 1872#endif
1853 1873
… …
1977 if (scrollBar.upButton (ev.y)) 1997 if (scrollBar.upButton (ev.y))
1978 direction = UP; /* up */ 1998 direction = UP; /* up */
1979 else if (scrollBar.dnButton (ev.y)) 1999 else if (scrollBar.dnButton (ev.y))
1980 direction = DN; /* down */ 2000 direction = DN; /* down */
1981 2001
1982 scrollBar.state = STATE_IDLE; 2002 scrollBar.state = SB_STATE_IDLE;
1983 /* 2003 /*
1984 * Rxvt-style scrollbar: 2004 * Rxvt-style scrollbar:
1985 * move up if mouse is above slider 2005 * move up if mouse is above slider
1986 * move dn if mouse is below slider 2006 * move dn if mouse is below slider
1987 * 2007 *
… …
2026 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2046 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2027#endif 2047#endif
2028 if (scr_page (direction, 1)) 2048 if (scr_page (direction, 1))
2029 { 2049 {
2030 if (direction == UP) 2050 if (direction == UP)
2031 scrollBar.state = STATE_UP; 2051 scrollBar.state = SB_STATE_UP;
2032 else 2052 else
2033 scrollBar.state = STATE_DOWN; 2053 scrollBar.state = SB_STATE_DOWN;
2034 } 2054 }
2035 } 2055 }
2036 else 2056 else
2037 switch (ev.button) 2057 switch (ev.button)
2038 { 2058 {
2039 case Button2: 2059 case Button2:
2040 switch (scrollBar.align) 2060 switch (scrollBar.align)
2041 { 2061 {
2042 case R_SB_ALIGN_TOP: 2062 case SB_ALIGN_TOP:
2043 csrO = 0; 2063 csrO = 0;
2044 break; 2064 break;
2045 case R_SB_ALIGN_CENTRE: 2065 case SB_ALIGN_CENTRE:
2046 csrO = (scrollBar.bot - scrollBar.top) / 2; 2066 csrO = (scrollBar.bot - scrollBar.top) / 2;
2047 break; 2067 break;
2048 case R_SB_ALIGN_BOTTOM: 2068 case SB_ALIGN_BOTTOM:
2049 csrO = scrollBar.bot - scrollBar.top; 2069 csrO = scrollBar.bot - scrollBar.top;
2050 break; 2070 break;
2051 } 2071 }
2052 2072
2053 if (scrollBar.style == R_SB_XTERM 2073 if (scrollBar.style == SB_STYLE_XTERM
2054 || scrollbar_above_slider (ev.y) 2074 || scrollBar.above_slider (ev.y)
2055 || scrollbar_below_slider (ev.y)) 2075 || scrollBar.below_slider (ev.y))
2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2076 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2057 2077
2058 scrollBar.state = STATE_MOTION; 2078 scrollBar.state = SB_STATE_MOTION;
2059 break; 2079 break;
2060 2080
2061 case Button1: 2081 case Button1:
2062 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2082 if (scrollBar.align == SB_ALIGN_CENTRE)
2063 csrO = ev.y - scrollBar.top; 2083 csrO = ev.y - scrollBar.top;
2064 /* FALLTHROUGH */ 2084 /* FALLTHROUGH */
2065 2085
2066 case Button3: 2086 case Button3:
2067 if (scrollBar.style != R_SB_XTERM) 2087 if (scrollBar.style != SB_STYLE_XTERM)
2068 { 2088 {
2069 if (scrollbar_above_slider (ev.y)) 2089 if (scrollBar.above_slider (ev.y))
2070# ifdef RXVT_SCROLL_FULL 2090# ifdef RXVT_SCROLL_FULL
2071 scr_page (UP, nrow - 1); 2091 scr_page (UP, nrow - 1);
2072# else 2092# else
2073 scr_page (UP, nrow / 4); 2093 scr_page (UP, nrow / 4);
2074# endif 2094# endif
2075 else if (scrollbar_below_slider (ev.y)) 2095 else if (scrollBar.below_slider (ev.y))
2076# ifdef RXVT_SCROLL_FULL 2096# ifdef RXVT_SCROLL_FULL
2077 scr_page (DN, nrow - 1); 2097 scr_page (DN, nrow - 1);
2078# else 2098# else
2079 scr_page (DN, nrow / 4); 2099 scr_page (DN, nrow / 4);
2080# endif 2100# endif
2081 else 2101 else
2082 scrollBar.state = STATE_MOTION; 2102 scrollBar.state = SB_STATE_MOTION;
2083 } 2103 }
2084 else 2104 else
2085 { 2105 {
2086 scr_page ((ev.button == Button1 ? DN : UP), 2106 scr_page ((ev.button == Button1 ? DN : UP),
2087 (nrow 2107 (nrow
2088 * scrollbar_position (ev.y) 2108 * scrollBar.position (ev.y)
2089 / scrollBar.size ())); 2109 / scrollBar.size ()));
2090 } 2110 }
2091 2111
2092 break; 2112 break;
2093 } 2113 }
… …
2104 2124
2105 csrO = 0; /* reset csr Offset */ 2125 csrO = 0; /* reset csr Offset */
2106 if (!bypass_keystate) 2126 if (!bypass_keystate)
2107 reportmode = !! (priv_modes & PrivMode_mouse_report); 2127 reportmode = !! (priv_modes & PrivMode_mouse_report);
2108 2128
2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2129 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2110 { 2130 {
2111 scrollBar.state = STATE_IDLE; 2131 scrollBar.state = SB_STATE_IDLE;
2112 scrollBar.show (0); 2132 scrollBar.show (0);
2113 } 2133 }
2114 2134
2115#ifdef SELECTION_SCROLLING 2135#ifdef SELECTION_SCROLLING
2116 sel_scroll_ev.stop(); 2136 sel_scroll_ev.stop();
… …
2166 case Button3: 2186 case Button3:
2167 selection_make (ev.time); 2187 selection_make (ev.time);
2168 break; 2188 break;
2169 2189
2170 case Button2: 2190 case Button2:
2171 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2191 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2192 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2173 break; 2193 break;
2174 2194
2175#ifdef MOUSE_WHEEL 2195#ifdef MOUSE_WHEEL
2176 case Button4: 2196 case Button4:
… …
2211 } 2231 }
2212} 2232}
2213 2233
2214/*}}} */ 2234/*}}} */
2215 2235
2216void 2236void ecb_hot
2217rxvt_term::cmd_parse () 2237rxvt_term::cmd_parse ()
2218{ 2238{
2219 wchar_t ch = NOCHAR; 2239 wchar_t ch = NOCHAR;
2220 char *seq_begin; // remember start of esc-sequence here 2240 char *seq_begin; // remember start of esc-sequence here
2221 2241
2222 for (;;) 2242 for (;;)
2223 { 2243 {
2224 if (expect_false (ch == NOCHAR)) 2244 if (ecb_unlikely (ch == NOCHAR))
2225 { 2245 {
2226 seq_begin = cmdbuf_ptr; 2246 seq_begin = cmdbuf_ptr;
2227 ch = next_char (); 2247 ch = next_char ();
2228 2248
2229 if (ch == NOCHAR) 2249 if (ch == NOCHAR)
2230 break; 2250 break;
2231 } 2251 }
2232 2252
2233 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2253 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2234 { 2254 {
2235 if (expect_false (!seen_input)) 2255 if (ecb_unlikely (!seen_input))
2236 { 2256 {
2237 seen_input = 1; 2257 seen_input = 1;
2238 // many badly-written programs (e.g. jed) contain a race condition: 2258 // many badly-written programs (e.g. jed) contain a race condition:
2239 // they first read the screensize and then install a SIGWINCH handler. 2259 // they first read the screensize and then install a SIGWINCH handler.
2240 // some window managers resize the window early, and these programs 2260 // some window managers resize the window early, and these programs
… …
2253 wchar_t *str = buf; 2273 wchar_t *str = buf;
2254 wchar_t *eol = str + min (ncol, UBUFSIZ); 2274 wchar_t *eol = str + min (ncol, UBUFSIZ);
2255 2275
2256 for (;;) 2276 for (;;)
2257 { 2277 {
2258 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2278 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2259 break; 2279 break;
2260 2280
2261 *str++ = ch; 2281 *str++ = ch;
2262 2282
2263 if (expect_false (ch == C0_LF || str >= eol)) 2283 if (ecb_unlikely (ch == C0_LF || str >= eol))
2264 { 2284 {
2265 if (ch == C0_LF) 2285 if (ch == C0_LF)
2266 nlines++; 2286 nlines++;
2267 2287
2268 refresh_count++; 2288 refresh_count++;
… …
2340 } 2360 }
2341 } 2361 }
2342} 2362}
2343 2363
2344// read the next character 2364// read the next character
2345wchar_t 2365wchar_t ecb_hot
2346rxvt_term::next_char () NOTHROW 2366rxvt_term::next_char () NOTHROW
2347{ 2367{
2348 while (cmdbuf_ptr < cmdbuf_endp) 2368 while (cmdbuf_ptr < cmdbuf_endp)
2349 { 2369 {
2350 // assume 7-bit to be ascii ALWAYS 2370 // assume 7-bit to be ascii ALWAYS
2351 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2371 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2352 return *cmdbuf_ptr++; 2372 return *cmdbuf_ptr++;
2353 2373
2354 wchar_t wc; 2374 wchar_t wc;
2355 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2375 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2356 2376
… …
2362 } 2382 }
2363 2383
2364 if (len == (size_t)-1) 2384 if (len == (size_t)-1)
2365 { 2385 {
2366 mbstate.reset (); // reset now undefined conversion state 2386 mbstate.reset (); // reset now undefined conversion state
2387 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2388 // in which case we "erroneously" return the next byte which might be valid.
2367 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2389 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2368 } 2390 }
2369 2391
2370 // assume wchar == unicode 2392 // assume wchar == unicode
2371 cmdbuf_ptr += len; 2393 cmdbuf_ptr += len;
… …
2374 2396
2375 return NOCHAR; 2397 return NOCHAR;
2376} 2398}
2377 2399
2378// read the next octet 2400// read the next octet
2379uint32_t 2401uint32_t ecb_hot
2380rxvt_term::next_octet () NOTHROW 2402rxvt_term::next_octet () NOTHROW
2381{ 2403{
2382 return cmdbuf_ptr < cmdbuf_endp 2404 return cmdbuf_ptr < cmdbuf_endp
2383 ? (unsigned char)*cmdbuf_ptr++ 2405 ? (unsigned char)*cmdbuf_ptr++
2384 : NOCHAR; 2406 : NOCHAR;
2385} 2407}
2386 2408
2387static class out_of_input out_of_input; 2409static class out_of_input out_of_input;
2388 2410
2389wchar_t 2411wchar_t ecb_hot
2390rxvt_term::cmd_getc () THROW ((class out_of_input)) 2412rxvt_term::cmd_getc () THROW ((class out_of_input))
2391{ 2413{
2392 wchar_t c = next_char (); 2414 wchar_t c = next_char ();
2393 2415
2394 if (c == NOCHAR) 2416 if (c == NOCHAR)
2395 throw out_of_input; 2417 throw out_of_input;
2396 2418
2397 return c; 2419 return c;
2398} 2420}
2399 2421
2400uint32_t 2422uint32_t ecb_hot
2401rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2423rxvt_term::cmd_get8 () THROW ((class out_of_input))
2402{ 2424{
2403 uint32_t c = next_octet (); 2425 uint32_t c = next_octet ();
2404 2426
2405 if (c == NOCHAR) 2427 if (c == NOCHAR)
… …
2409} 2431}
2410 2432
2411/*{{{ print pipe */ 2433/*{{{ print pipe */
2412/*----------------------------------------------------------------------*/ 2434/*----------------------------------------------------------------------*/
2413#ifdef PRINTPIPE 2435#ifdef PRINTPIPE
2414FILE * 2436FILE * ecb_cold
2415rxvt_term::popen_printer () 2437rxvt_term::popen_printer ()
2416{ 2438{
2417 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2439 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2418 2440
2419 if (stream == NULL) 2441 if (stream == NULL)
2420 rxvt_warn ("can't open printer pipe, not printing.\n"); 2442 rxvt_warn ("can't open printer pipe, not printing.\n");
2421 2443
2422 return stream; 2444 return stream;
2423} 2445}
2424 2446
2425int 2447int ecb_cold
2426rxvt_term::pclose_printer (FILE *stream) 2448rxvt_term::pclose_printer (FILE *stream)
2427{ 2449{
2428 fflush (stream); 2450 fflush (stream);
2429 return pclose (stream); 2451 return pclose (stream);
2430} 2452}
2431 2453
2432/* 2454/*
2433 * simulate attached vt100 printer 2455 * simulate attached vt100 printer
2434 */ 2456 */
2435void 2457void ecb_cold
2436rxvt_term::process_print_pipe () 2458rxvt_term::process_print_pipe ()
2437{ 2459{
2438 FILE *fd = popen_printer (); 2460 FILE *fd = popen_printer ();
2439 2461
2440 if (!fd) 2462 if (!fd)
… …
2495 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2517 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2496 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2518 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2497}; 2519};
2498 2520
2499/*{{{ process non-printing single characters */ 2521/*{{{ process non-printing single characters */
2500void 2522void ecb_hot
2501rxvt_term::process_nonprinting (unicode_t ch) 2523rxvt_term::process_nonprinting (unicode_t ch)
2502{ 2524{
2503 switch (ch) 2525 switch (ch)
2504 { 2526 {
2505 case C0_ESC: 2527 case C0_ESC:
… …
2551} 2573}
2552/*}}} */ 2574/*}}} */
2553 2575
2554 2576
2555/*{{{ process VT52 escape sequences */ 2577/*{{{ process VT52 escape sequences */
2556void 2578void ecb_cold
2557rxvt_term::process_escape_vt52 (unicode_t ch) 2579rxvt_term::process_escape_vt52 (unicode_t ch)
2558{ 2580{
2559 int row, col; 2581 int row, col;
2560 2582
2561 switch (ch) 2583 switch (ch)
… …
2595 break; 2617 break;
2596 case 'Z': /* identify the terminal type */ 2618 case 'Z': /* identify the terminal type */
2597 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2619 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2598 break; 2620 break;
2599 case '<': /* turn off VT52 mode */ 2621 case '<': /* turn off VT52 mode */
2600 set_privmode (PrivMode_vt52, 0); 2622 priv_modes &= ~PrivMode_vt52;
2601 break; 2623 break;
2602 case 'F': /* use special graphics character set */ 2624 case 'F': /* use special graphics character set */
2603 case 'G': /* use regular character set */ 2625 case 'G': /* use regular character set */
2604 /* unimplemented */ 2626 /* unimplemented */
2605 break; 2627 break;
… …
2611} 2633}
2612/*}}} */ 2634/*}}} */
2613 2635
2614 2636
2615/*{{{ process escape sequences */ 2637/*{{{ process escape sequences */
2616void 2638void ecb_hot
2617rxvt_term::process_escape_seq () 2639rxvt_term::process_escape_seq ()
2618{ 2640{
2619 unicode_t ch = cmd_getc (); 2641 unicode_t ch = cmd_getc ();
2620 2642
2621 if (priv_modes & PrivMode_vt52) 2643 if (priv_modes & PrivMode_vt52)
… …
2656#if !ENABLE_MINIMAL 2678#if !ENABLE_MINIMAL
2657 case '9': 2679 case '9':
2658 scr_forwardindex (); 2680 scr_forwardindex ();
2659 break; 2681 break;
2660#endif 2682#endif
2683 // DECPAM/DECPNM
2661 case '=': 2684 case '=':
2685 priv_modes |= PrivMode_aplKP;
2686 break;
2662 case '>': 2687 case '>':
2663 set_privmode (PrivMode_aplKP, ch == '='); 2688 priv_modes &= ~PrivMode_aplKP;
2664 break; 2689 break;
2665 2690
2666 case C1_40: 2691 case C1_40:
2667 cmd_getc (); 2692 cmd_getc ();
2668 break; 2693 break;
… …
2672 2697
2673 /* 8.3.87: NEXT LINE */ 2698 /* 8.3.87: NEXT LINE */
2674 case C1_NEL: /* ESC E */ 2699 case C1_NEL: /* ESC E */
2675 { 2700 {
2676 wchar_t nlcr[] = { C0_LF, C0_CR }; 2701 wchar_t nlcr[] = { C0_LF, C0_CR };
2677 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2702 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2678 } 2703 }
2679 break; 2704 break;
2680 2705
2681 /* kidnapped escape sequence: Should be 8.3.48 */ 2706 /* kidnapped escape sequence: Should be 8.3.48 */
2682 case C1_ESA: /* ESC G */ 2707 case C1_ESA: /* ESC G */
… …
2770 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2795 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2771 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2796 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2772 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2797 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2773 }; 2798 };
2774 2799
2775void 2800void ecb_hot
2776rxvt_term::process_csi_seq () 2801rxvt_term::process_csi_seq ()
2777{ 2802{
2778 unicode_t ch, priv, i; 2803 unicode_t ch, priv, i;
2779 unsigned int nargs, p; 2804 unsigned int nargs, p;
2780 int n, ndef; 2805 int n, ndef;
… …
2858 scr_soft_reset (); 2883 scr_soft_reset ();
2859 2884
2860 static const int pm_h[] = { 7, 25 }; 2885 static const int pm_h[] = { 7, 25 };
2861 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2886 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2862 2887
2863 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2888 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2864 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2889 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2865 } 2890 }
2866 break; 2891 break;
2867 } 2892 }
2868 2893
2869 return; 2894 return;
… …
2887 } 2912 }
2888 break; 2913 break;
2889#endif 2914#endif
2890 2915
2891 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2916 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2892 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2917 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2893 arg[0] = -arg[0]; 2918 arg[0] = -arg[0];
2894 /* FALLTHROUGH */ 2919 /* FALLTHROUGH */
2895 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2920 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2896 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2921 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2897 scr_gotorc (arg[0], 0, RELATIVE); 2922 scr_gotorc (arg[0], 0, RELATIVE);
2898 break; 2923 break;
2899 2924
2900 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2925 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2901 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2926 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3134 break; 3159 break;
3135 3160
3136 //case 9: NYI, TODO, restore maximized window or maximize window 3161 //case 9: NYI, TODO, restore maximized window or maximize window
3137 default: 3162 default:
3138 if (args[0] >= 24) /* set height (chars) */ 3163 if (args[0] >= 24) /* set height (chars) */
3139 set_widthheight ((unsigned int)width, 3164 set_widthheight ((unsigned int)vt_width,
3140 (unsigned int) (args[1] * fheight)); 3165 (unsigned int) (args[1] * fheight));
3141 break; 3166 break;
3142 3167
3143 /* 3168 /*
3144 * reports - some output format copied from XTerm 3169 * reports - some output format copied from XTerm
… …
3423 break; 3448 break;
3424#endif 3449#endif
3425 case URxvt_Color_border: 3450 case URxvt_Color_border:
3426 process_color_seq (op, Color_border, str, resp); 3451 process_color_seq (op, Color_border, str, resp);
3427 break; 3452 break;
3428#if ENABLE_TRANSPARENCY 3453
3454#if BG_IMAGE_FROM_ROOT
3429 case URxvt_Color_tint: 3455 case URxvt_Color_tint:
3430 process_color_seq (op, Color_tint, str, resp); 3456 process_color_seq (op, Color_tint, str, resp);
3431 { 3457 {
3432 bool changed = false; 3458 bool changed = false;
3433 3459
3434 if (ISSET_PIXCOLOR (Color_tint)) 3460 if (ISSET_PIXCOLOR (Color_tint))
3435 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3461 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3436 3462
3437 if (changed) 3463 if (changed)
3438 update_background (); 3464 update_background ();
3439 } 3465 }
3440 3466
… …
3444#if BG_IMAGE_FROM_FILE 3470#if BG_IMAGE_FROM_FILE
3445 case Rxvt_Pixmap: 3471 case Rxvt_Pixmap:
3446 if (!strcmp (str, "?")) 3472 if (!strcmp (str, "?"))
3447 { 3473 {
3448 char str[256]; 3474 char str[256];
3475 int h_scale = fimage.h_scale;
3476 int v_scale = fimage.v_scale;
3477 int h_align = fimage.h_align;
3478 int v_align = fimage.v_align;
3449 3479
3450 sprintf (str, "[%dx%d+%d+%d]", 3480 sprintf (str, "[%dx%d+%d+%d]",
3451 min (h_scale, 32767), min (v_scale, 32767), 3481 h_scale, v_scale,
3452 min (h_align, 32767), min (v_align, 32767)); 3482 h_align, v_align);
3453 process_xterm_seq (XTerm_title, str, CHAR_ST); 3483 process_xterm_seq (XTerm_title, str, CHAR_ST);
3454 } 3484 }
3455 else 3485 else
3456 { 3486 {
3457 int changed = 0; 3487 bool changed = false;
3458 3488
3459 if (*str != ';') 3489 if (*str != ';')
3460 { 3490 {
3461 if (bg_set_file (str)) /* change pixmap */ 3491 try
3462 { 3492 {
3493 fimage.set_file_geometry (this, str);
3463 changed++; 3494 changed = true;
3464 str = strchr (str, ';');
3465 if (str == NULL)
3466 bg_set_default_geometry ();
3467 else 3495 }
3468 bg_set_geometry (str+1); 3496 catch (const class rxvt_failure_exception &e)
3497 {
3469 } 3498 }
3470 } 3499 }
3471 else 3500 else
3472 { 3501 {
3473 str++; 3502 str++;
3474 if (bg_set_geometry (str, true)) 3503 if (fimage.set_geometry (str, true))
3475 changed++; 3504 changed = true;
3476 } 3505 }
3477 3506
3478 if (changed) 3507 if (changed)
3479 { 3508 {
3480 if (bg_window_position_sensitive ()) 3509 if (bg_window_position_sensitive ())
3481 { 3510 {
3482 int x, y; 3511 int x, y;
3483 get_window_origin (x, y); 3512 get_window_origin (x, y);
3484 bg_set_position (x, y); 3513 parent_x = x;
3514 parent_y = y;
3485 } 3515 }
3486 update_background (); 3516 update_background ();
3487 } 3517 }
3488 } 3518 }
3489 break; 3519 break;
… …
3579 * 's' = save 3609 * 's' = save
3580 * 'r' = restore 3610 * 'r' = restore
3581 * 't' = toggle 3611 * 't' = toggle
3582 * so no need for fancy checking 3612 * so no need for fancy checking
3583 */ 3613 */
3584int 3614int ecb_cold
3585rxvt_term::privcases (int mode, unsigned long bit) 3615rxvt_term::privcases (int mode, unsigned long bit)
3586{ 3616{
3587 int state; 3617 int state;
3588 3618
3589 if (mode == 's') 3619 if (mode == 's')
3590 { 3620 {
3591 SavedModes |= (priv_modes & bit); 3621 if (priv_modes & bit)
3622 SavedModes |= bit;
3623 else
3624 SavedModes &= ~bit;
3592 return -1; 3625 return -1;
3593 } 3626 }
3594 else 3627 else
3595 { 3628 {
3596 if (mode == 'r') 3629 if (mode == 'r')
3597 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3630 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3598 else 3631 else
3599 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3632 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3600 3633
3601 set_privmode (bit, state); 3634 if (state)
3635 priv_modes |= bit;
3636 else
3637 priv_modes &= ~bit;
3602 } 3638 }
3603 3639
3604 return state; 3640 return state;
3605} 3641}
3606 3642
3607/* we're not using priv _yet_ */ 3643/* we're not using priv _yet_ */
3608void 3644void
3609rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3645rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3610{ 3646{
3611 unsigned int i, j; 3647 unsigned int i, j;
3612 int state; 3648 int state;
3613 3649
3614 static const struct 3650 static const struct
3615 { 3651 {
3616 const int argval; 3652 const int argval;
3617 const unsigned long bit; 3653 const unsigned long bit;
3618 } argtopriv[] = { 3654 } argtopriv[] = {
3619 { 1, PrivMode_aplCUR }, // DECCKM 3655 { 1, PrivMode_aplCUR }, // DECCKM
3620 { 2, PrivMode_vt52 }, 3656 { 2, PrivMode_vt52 }, // DECANM
3621 { 3, PrivMode_132 }, // DECCOLM 3657 { 3, PrivMode_132 }, // DECCOLM
3622 { 4, PrivMode_smoothScroll }, // DECSCLM 3658 { 4, PrivMode_smoothScroll }, // DECSCLM
3623 { 5, PrivMode_rVideo }, // DECSCNM 3659 { 5, PrivMode_rVideo }, // DECSCNM
3624 { 6, PrivMode_relOrigin }, // DECOM 3660 { 6, PrivMode_relOrigin }, // DECOM
3625 { 7, PrivMode_Autowrap }, // DECAWM 3661 { 7, PrivMode_Autowrap }, // DECAWM
3626 // 8, auto-repeat keys // DECARM 3662 // 8, auto-repeat keys // DECARM
3627 { 9, PrivMode_MouseX10 }, 3663 { 9, PrivMode_MouseX10 },
3628 // 18 end FF to printer after print screen 3664 // 18 end FF to printer after print screen
3629 // 19 Print screen prints full screen/scroll region 3665 // 19 Print screen prints full screen/scroll region
3630 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3666 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3631#ifdef scrollBar_esc 3667#ifdef scrollBar_esc
3632 { scrollBar_esc, PrivMode_scrollBar }, 3668 { scrollBar_esc, PrivMode_scrollBar },
3633#endif 3669#endif
3634 { 35, PrivMode_ShiftKeys }, // rxvt extension 3670 { 35, PrivMode_ShiftKeys }, // rxvt extension
3635 // 38, tektronix mode // DECTEK 3671 // 38, tektronix mode // DECTEK
3636 { 40, PrivMode_132OK }, 3672 { 40, PrivMode_132OK },
3637 // 41 xterm more fixes NYI 3673 // 41 xterm more fixes NYI
3638 // 45 margin bell NYI 3674 // 45 margin bell NYI
3639 // 46 start logging 3675 // 46 start logging
3640 { 47, PrivMode_Screen }, 3676 { 47, PrivMode_Screen },
3641 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3677 { 66, PrivMode_aplKP }, // DECNKM
3642#ifndef NO_BACKSPACE_KEY 3678#ifndef NO_BACKSPACE_KEY
3643 { 67, PrivMode_BackSpace }, // DECBKM 3679 { 67, PrivMode_BackSpace }, // DECBKM
3644#endif 3680#endif
3645 { 1000, PrivMode_MouseX11 }, 3681 { 1000, PrivMode_MouseX11 },
3646 { 1002, PrivMode_MouseBtnEvent }, 3682 { 1002, PrivMode_MouseBtnEvent },
… …
3675 for (i = 0; i < nargs; i++) 3711 for (i = 0; i < nargs; i++)
3676 { 3712 {
3677 state = -1; 3713 state = -1;
3678 3714
3679 /* basic handling */ 3715 /* basic handling */
3680 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3716 for (j = 0; j < ecb_array_length (argtopriv); j++)
3681 if (argtopriv[j].argval == arg[i]) 3717 if (argtopriv[j].argval == arg[i])
3682 { 3718 {
3683 state = privcases (mode, argtopriv[j].bit); 3719 state = privcases (mode, argtopriv[j].bit);
3684 break; 3720 break;
3685 } 3721 }
… …
3711 case 2: /* VT52 mode */ 3747 case 2: /* VT52 mode */
3712 /* oddball mode. should be set regardless of set/reset 3748 /* oddball mode. should be set regardless of set/reset
3713 * parameter. Return from VT52 mode with an ESC < from 3749 * parameter. Return from VT52 mode with an ESC < from
3714 * within VT52 mode 3750 * within VT52 mode
3715 */ 3751 */
3716 set_privmode (PrivMode_vt52, 1); 3752 priv_modes |= PrivMode_vt52;
3717 break; 3753 break;
3718 case 3: /* 80/132 */ 3754 case 3: /* 80/132 */
3719 if (priv_modes & PrivMode_132OK) 3755 if (priv_modes & PrivMode_132OK)
3720 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3756 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3721 break; 3757 break;
… …
3736 if (state) /* orthogonal */ 3772 if (state) /* orthogonal */
3737 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3773 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3738 break; 3774 break;
3739#ifdef scrollBar_esc 3775#ifdef scrollBar_esc
3740 case scrollBar_esc: 3776 case scrollBar_esc:
3741 if (scrollBar.map (state)) 3777 scrollBar.map (state);
3742 {
3743 resize_all_windows (0, 0, 0); 3778 resize_all_windows (0, 0, 0);
3744 scr_touch (true); 3779 scr_touch (true);
3745 }
3746 break; 3780 break;
3747#endif 3781#endif
3748 case 25: /* visible/invisible cursor */ 3782 case 25: /* visible/invisible cursor */
3749 scr_cursor_visible (state); 3783 scr_cursor_visible (state);
3750 break; 3784 break;
… …
3805 } 3839 }
3806} 3840}
3807/*}}} */ 3841/*}}} */
3808 3842
3809/*{{{ process sgr sequences */ 3843/*{{{ process sgr sequences */
3810void 3844void ecb_hot
3811rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3845rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3812{ 3846{
3813 unsigned int i; 3847 unsigned int i;
3814 short rendset; 3848 short rendset;
3815 int rendstyle; 3849 int rendstyle;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines