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.438 by root, Thu Feb 4 21:55:12 2010 UTC vs.
Revision 1.489 by sf-exg, Sat Jul 9 13:40:13 2011 UTC

… …
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-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
162 162
163void 163void
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)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
251#endif 257#endif
252 258
253void 259void
254rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
255{ 261{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 263
261 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
262 { 265 {
263 char mb[16]; 266 char mb[MB_LEN_MAX];
264 int len; 267 int len;
265 268
266 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
269 else 272 else
270 { 273 {
271 mb[0] = ch[0]; 274 mb[0] = ch;
272 len = 1; 275 len = 1;
273 } 276 }
274 277
275 if (len > 0) 278 if (len > 0)
276 tt_write (mb, len); 279 tt_write (mb, len);
… …
282} 285}
283 286
284static int 287static int
285hex_keyval (XKeyEvent &ev) 288hex_keyval (XKeyEvent &ev)
286{ 289{
287 // check wether this event corresponds to a hex digit 290 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 291 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 292 for (int index = 0; index < 8; index++)
290 { 293 {
291 KeySym k = XLookupKeysym (&ev, index); 294 KeySym k = XLookupKeysym (&ev, index);
292 295
… …
415 * Always permit `shift' to override the current setting 418 * Always permit `shift' to override the current setting
416 */ 419 */
417 shft = ev.state & ShiftMask; 420 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
420
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 set_privmode (PrivMode_aplKP, !numlock_state);
425 }
426 423
427 kbuf[0] = 0; 424 kbuf[0] = 0;
428 425
429#ifdef USE_XIM 426#ifdef USE_XIM
430 if (Input_Context) 427 if (Input_Context)
… …
569 selection_request (ev.time); 566 selection_request (ev.time);
570 return; 567 return;
571#if TODO 568#if TODO
572 /* rxvt extras */ 569 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 571 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 573 return;
579#endif 574#endif
580 } 575 }
581 } 576 }
582 } 577 }
… …
647 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
648 { 643 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1; 645 unsigned int newlen = 1;
651 646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
652 switch (translate_keypad (keysym, kp)) 650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
653 { 653 {
654#ifndef NO_BACKSPACE_KEY 654#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace: 655 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace) 656 if (priv_modes & PrivMode_HaveBackSpace)
657 { 657 {
… …
884 commit_iso14755 (); 884 commit_iso14755 ();
885 885
886 return; 886 return;
887 } 887 }
888 888
889 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 889 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
890 if (i[0] == keysym) 890 if (i[0] == keysym)
891 { 891 {
892 iso14755buf = ISO_14755_51 | i[1]; 892 iso14755buf = ISO_14755_51 | i[1];
893 commit_iso14755 (); 893 commit_iso14755 ();
894 894
… …
931 else if (keysym == XK_Control_L || keysym == XK_Control_R) 931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
932 mouse_slip_wheel_speed = 0; 932 mouse_slip_wheel_speed = 0;
933#endif 933#endif
934} 934}
935 935
936#if defined (KEYSYM_RESOURCE)
937unsigned int
938rxvt_term::cmd_write (const char *str, unsigned int count)
939{
940 unsigned int n, s;
941
942 n = cmdbuf_ptr - cmdbuf_base;
943 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
944
945 if (n > 0 && s < count)
946 {
947 memmove (cmdbuf_base, cmdbuf_ptr,
948 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
949 cmdbuf_ptr = cmdbuf_base;
950 cmdbuf_endp -= n;
951 s += n;
952 }
953
954 if (count > s)
955 {
956 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
957 count = s;
958 }
959
960 for (; count--;)
961 *cmdbuf_endp++ = *str++;
962
963 cmd_parse ();
964
965 return 0;
966}
967#endif
968
969void 936void
970rxvt_term::flush () 937rxvt_term::flush ()
971{ 938{
972 flush_ev.stop (); 939 flush_ev.stop ();
973 940
974#ifdef HAVE_BG_PIXMAP 941#ifdef HAVE_BG_PIXMAP
975 if (bgPixmap.check_clearChanged ()) 942 if (bg_flags & BG_NEEDS_REFRESH)
976 { 943 {
977// scr_clear (true); This needs to be researched further! 944 bg_flags &= ~BG_NEEDS_REFRESH;
978 scr_touch (false); 945 scr_touch (false);
979 } 946 }
980#endif 947#endif
981 948
982 if (want_refresh) 949 if (want_refresh)
… …
1020 } 987 }
1021 988
1022 scr_refresh (); 989 scr_refresh ();
1023 scrollBar.show (1); 990 scrollBar.show (1);
1024#ifdef USE_XIM 991#ifdef USE_XIM
1025 IMSendSpot (); 992 im_send_spot ();
1026#endif 993#endif
1027 } 994 }
1028 995
1029 display->flush (); 996 display->flush ();
1030} 997}
1031 998
1032/* checks wether a refresh is requested and starts the refresh timer */ 999/* checks whether a refresh is requested and starts the refresh timer */
1033void 1000void
1034rxvt_term::refresh_check () 1001rxvt_term::refresh_check ()
1035{ 1002{
1036 if (want_refresh && !flush_ev.is_active ()) 1003 if (want_refresh && !flush_ev.is_active ())
1037 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1004 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1131 // this should really be sched_yield(), but the linux guys thought 1098 // this should really be sched_yield(), but the linux guys thought
1132 // that giving a process calling sched_yield () less cpu time than 1099 // that giving a process calling sched_yield () less cpu time than
1133 // ones with high nice levels is a useful thing to do. It surely is is 1100 // ones with high nice levels is a useful thing to do. It surely is is
1134 // allowed by the sus... as is returning ENOSYS. 1101 // allowed by the sus... as is returning ENOSYS.
1135 // since the linux guys additionally thought that breaking the only 1102 // since the linux guys additionally thought that breaking the only
1136 // known workaroudn against their unusable sched_yield hack is cool, 1103 // known workaround against their unusable sched_yield hack is cool,
1137 // we just nanosleep a bit and hope for the best. 1104 // we just nanosleep a bit and hope for the best.
1138 1105
1139 struct timespec ts = { 0, 1000 }; 1106 struct timespec ts = { 0, 1000 };
1140 nanosleep (&ts, 0); 1107 nanosleep (&ts, 0);
1141 1108
… …
1147 { 1114 {
1148 } 1115 }
1149} event_handler; 1116} event_handler;
1150#endif 1117#endif
1151 1118
1119/* make sure all the cmd data is at beginning of cmdbuf */
1120void
1121rxvt_term::cmdbuf_reify ()
1122{
1123 if (cmdbuf_ptr == cmdbuf_base)
1124 return;
1125
1126 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1127
1128 memmove (cmdbuf_base, cmdbuf_ptr, used);
1129 cmdbuf_ptr = cmdbuf_base;
1130 cmdbuf_endp = cmdbuf_ptr + used;
1131
1132}
1133
1134#if defined (KEYSYM_RESOURCE)
1135void
1136rxvt_term::cmdbuf_append (const char *str, size_t count)
1137{
1138 cmdbuf_reify ();
1139
1140 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1141
1142 if (count > avail)
1143 return;
1144
1145 memcpy (cmdbuf_endp, str, count);
1146 cmdbuf_endp += count;
1147
1148 cmd_parse ();
1149}
1150#endif
1151
1152bool 1152bool
1153rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1154{ 1154{
1155 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1156 1156
1157 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1158 { 1158
1159 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1160 n = 0;
1161 } 1160 {
1162 1161 // normally this indicates a "too long" command sequence - just drop the data we have
1163 memmove (cmdbuf_base, cmdbuf_ptr, n);
1164 cmdbuf_ptr = cmdbuf_base; 1162 cmdbuf_ptr = cmdbuf_base;
1165 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1166 1166
1167 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1168 1168
1169 if (r > 0) 1169 if (r > 0)
1170 { 1170 {
1171 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1172 return true; 1172 return true;
… …
1246{ 1246{
1247 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1248 int x, y; 1248 int x, y;
1249 int code = 32; 1249 int code = 32;
1250 1250
1251 x = Pixel2Col (ev.x); 1251 x = Pixel2Col (ev.x) + 1;
1252 y = Pixel2Row (ev.y); 1252 y = Pixel2Row (ev.y) + 1;
1253
1253 if (ev.type == MotionNotify) 1254 if (ev.type == MotionNotify)
1254 { 1255 {
1255 if (x == mouse_row && y == mouse_col) 1256 if (x == mouse_row && y == mouse_col)
1256 return; 1257 return;
1258
1257 mouse_row = x; 1259 mouse_row = x;
1258 mouse_col = y; 1260 mouse_col = y;
1259 code += 32; 1261 code += 32;
1260 } 1262 }
1261 1263
… …
1264 else 1266 else
1265 { 1267 {
1266 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1267 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1268 if (button_number >= 3) 1270 if (button_number >= 3)
1269 button_number += (64 - 3); 1271 button_number += 64 - 3;
1270 } 1272 }
1271 1273
1272 if (priv_modes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1273 { 1275 {
1274 /* 1276 /*
… …
1306 fputc ('A', stderr); 1308 fputc ('A', stderr);
1307 if (key_state & 32) 1309 if (key_state & 32)
1308 fputc ('2', stderr); 1310 fputc ('2', stderr);
1309 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1310 button_number, 1312 button_number,
1311 x + 1, 1313 x,
1312 y + 1); 1314 y);
1313#endif 1315#endif
1314 1316
1317#if ENABLE_FRILLS
1318 if (priv_modes & PrivMode_ExtMouseRight)
1319 tt_printf ("\033[%d;%d;%dM",
1320 code + button_number + key_state,
1321 x,
1322 y);
1323 else if (priv_modes & PrivMode_ExtModeMouse)
1324 tt_printf ("\033[M%c%lc%lc",
1325 code + button_number + key_state,
1326 wint_t (32 + x),
1327 wint_t (32 + y));
1328 else
1329#endif
1315 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
1316 (code + button_number + key_state), 1331 code + button_number + key_state,
1317 (32 + x + 1), 1332 32 + x,
1318 (32 + y + 1)); 1333 32 + y);
1319} 1334}
1320 1335
1321/*{{{ process an X event */ 1336/*{{{ process an X event */
1322void 1337void
1323rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
… …
1425 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1426 focus_out (); 1441 focus_out ();
1427 break; 1442 break;
1428 1443
1429 case ConfigureNotify: 1444 case ConfigureNotify:
1430 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1431 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1432 szHint.width, szHint.height);*/
1433 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1434 { 1446 {
1435 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1436 ; 1448 ;
1449
1450#ifdef HAVE_BG_PIXMAP
1451 bool moved = false;
1452 if (bg_window_position_sensitive ())
1453 {
1454 int x, y;
1455 if (ev.xconfigure.send_event)
1456 {
1457 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y;
1459 }
1460 else
1461 get_window_origin (x, y);
1462
1463 if (bg_set_position (x, y)
1464 || !(bg_flags & BG_IS_VALID))
1465 moved = true;
1466 }
1467#endif
1437 1468
1438 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1439 { 1470 {
1440 seen_resize = 1; 1471 seen_resize = 1;
1441 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1442 } 1473 }
1443 else 1474 else
1444 { 1475 {
1445#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1446 if (bgPixmap.window_position_sensitive ()) 1477 if (moved)
1447 { 1478 {
1448 if (mapped) 1479 if (mapped)
1449 update_background (); 1480 update_background ();
1450 else 1481 else
1451 bgPixmap.invalidate (); 1482 bg_invalidate ();
1452 } 1483 }
1453#endif 1484#endif
1454 } 1485 }
1455 1486
1456 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1457 } 1488 }
1458 break; 1489 break;
1459 1490
1460 case PropertyNotify: 1491 case PropertyNotify:
1461 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1492 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1462 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1463 && ev.xproperty.state == PropertyNewValue)
1464 selection_property (ev.xproperty.window, ev.xproperty.atom);
1465
1466 break; 1493 break;
1467 1494
1468 case SelectionClear: 1495 case SelectionClear:
1469 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1496 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1470 break; 1497 break;
1471 1498
1472 case SelectionNotify:
1473 if (selection_wait == Sel_normal)
1474 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1475 break;
1476
1477 case SelectionRequest: 1499 case SelectionRequest:
1478 selection_send (ev.xselectionrequest); 1500 selection_send (ev.xselectionrequest);
1479 break; 1501 break;
1480 1502
1481 case MapNotify: 1503 case MapNotify:
1482#ifdef HAVE_BG_PIXMAP 1504#ifdef HAVE_BG_PIXMAP
1483 /* This is needed spcifically to fix the case of no window manager or a 1505 /* This is needed specifically to fix the case of no window manager or a
1484 * non-reparenting window manager. In those cases we never get first 1506 * non-reparenting window manager. In those cases we never get first
1485 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1507 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1486 * care of multiplicity of ConfigureNotify events arriwing while WM does 1508 * care of multiplicity of ConfigureNotify events arriving while WM does
1487 * reparenting. 1509 * reparenting.
1488 * We should not render background immidiately, as there could be several 1510 * We should not render background immediately, as there could be several
1489 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1511 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1490 * by scheduling background redraw as soon as we can, but giving a short 1512 * by scheduling background redraw as soon as we can, but giving a short
1491 * bit of time for ConfigureNotifies to arrive. 1513 * bit of time for ConfigureNotifies to arrive.
1492 * We should render background PRIOR to drawing any text, but AFTER all 1514 * We should render background PRIOR to drawing any text, but AFTER all
1493 * of ConfigureNotifys for the best results. 1515 * of ConfigureNotifys for the best results.
1494 */ 1516 */
1495 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1517 if (!(bg_flags & BG_IS_VALID))
1496 update_background_ev.start (0.025); 1518 update_background_ev.start (0.025);
1497#endif 1519#endif
1498 mapped = 1; 1520 mapped = 1;
1499#ifdef TEXT_BLINK 1521#ifdef TEXT_BLINK
1500 text_blink_ev.start (); 1522 text_blink_ev.start ();
… …
1515 if (ev.xany.window == vt) 1537 if (ev.xany.window == vt)
1516 { 1538 {
1517 do 1539 do
1518 { 1540 {
1519 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1520 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, false);
1521 } 1543 }
1522 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1523 1545
1524 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1546 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1525 1547
1526 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1527 { 1549 {
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1550 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1551 ev.xexpose.width, ev.xexpose.height, false);
1530 } 1552 }
1531 1553
1532 want_refresh = 1; 1554 want_refresh = 1;
1533 } 1555 }
1534 else 1556 else
… …
1694rxvt_term::set_urgency (bool enable) 1716rxvt_term::set_urgency (bool enable)
1695{ 1717{
1696 if (enable == urgency_hint) 1718 if (enable == urgency_hint)
1697 return; 1719 return;
1698 1720
1699 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1721 if (XWMHints *h = XGetWMHints (dpy, parent))
1700 { 1722 {
1701 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1702 XSetWMHints (dpy, parent[0], h); 1724 XSetWMHints (dpy, parent, h);
1703 urgency_hint = enable; 1725 urgency_hint = enable;
1704 } 1726 }
1705} 1727}
1706#endif 1728#endif
1707 1729
… …
1714 want_refresh = 1; 1736 want_refresh = 1;
1715 1737
1716#if USE_XIM 1738#if USE_XIM
1717 if (Input_Context != NULL) 1739 if (Input_Context != NULL)
1718 { 1740 {
1719 IMSetPosition (); 1741 im_set_position ();
1720 XSetICFocus (Input_Context); 1742 XSetICFocus (Input_Context);
1721 } 1743 }
1722#endif 1744#endif
1723#if CURSOR_BLINK 1745#if CURSOR_BLINK
1724 if (option (Opt_cursorBlink)) 1746 if (option (Opt_cursorBlink))
… …
1815 * use the property to determine the pixmap. We use it later on. 1837 * use the property to determine the pixmap. We use it later on.
1816 */ 1838 */
1817 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1818 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1819 { 1841 {
1820 bgPixmap.set_root_pixmap (); 1842 bg_set_root_pixmap ();
1821 update_background (); 1843 update_background ();
1822 } 1844 }
1823 1845
1824 break; 1846 break;
1825 } 1847 }
… …
1864 /* save the xbutton state (for ButtonRelease) */ 1886 /* save the xbutton state (for ButtonRelease) */
1865 MEvent.state = ev.state; 1887 MEvent.state = ev.state;
1866#ifdef MOUSE_REPORT_DOUBLECLICK 1888#ifdef MOUSE_REPORT_DOUBLECLICK
1867 if (ev.button == MEvent.button && clickintime) 1889 if (ev.button == MEvent.button && clickintime)
1868 { 1890 {
1869 /* same button, within alloted time */ 1891 /* same button, within allowed time */
1870 MEvent.clicks++; 1892 MEvent.clicks++;
1871 1893
1872 if (MEvent.clicks > 1) 1894 if (MEvent.clicks > 1)
1873 { 1895 {
1874 /* only report double clicks */ 1896 /* only report double clicks */
… …
2145 selection_make (ev.time); 2167 selection_make (ev.time);
2146 break; 2168 break;
2147 2169
2148 case Button2: 2170 case Button2:
2149 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2171 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2150 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2151 break; 2173 break;
2152 2174
2153#ifdef MOUSE_WHEEL 2175#ifdef MOUSE_WHEEL
2154 case Button4: 2176 case Button4:
2155 case Button5: 2177 case Button5:
… …
2197 wchar_t ch = NOCHAR; 2219 wchar_t ch = NOCHAR;
2198 char *seq_begin; // remember start of esc-sequence here 2220 char *seq_begin; // remember start of esc-sequence here
2199 2221
2200 for (;;) 2222 for (;;)
2201 { 2223 {
2202 if (expect_false (ch == NOCHAR)) 2224 if (ecb_unlikely (ch == NOCHAR))
2203 { 2225 {
2204 seq_begin = cmdbuf_ptr; 2226 seq_begin = cmdbuf_ptr;
2205 ch = next_char (); 2227 ch = next_char ();
2206 2228
2207 if (ch == NOCHAR) 2229 if (ch == NOCHAR)
2208 break; 2230 break;
2209 } 2231 }
2210 2232
2211 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2233 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2212 { 2234 {
2213 if (expect_false (!seen_input)) 2235 if (ecb_unlikely (!seen_input))
2214 { 2236 {
2215 seen_input = 1; 2237 seen_input = 1;
2216 // many badly-written programs (e.g. jed) contain a race condition: 2238 // many badly-written programs (e.g. jed) contain a race condition:
2217 // they first read the screensize and then install a SIGWINCH handler. 2239 // they first read the screensize and then install a SIGWINCH handler.
2218 // some window managers resize the window early, and these programs 2240 // some window managers resize the window early, and these programs
… …
2231 wchar_t *str = buf; 2253 wchar_t *str = buf;
2232 wchar_t *eol = str + min (ncol, UBUFSIZ); 2254 wchar_t *eol = str + min (ncol, UBUFSIZ);
2233 2255
2234 for (;;) 2256 for (;;)
2235 { 2257 {
2236 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2258 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2237 break; 2259 break;
2238 2260
2239 *str++ = ch; 2261 *str++ = ch;
2240 2262
2241 if (expect_false (ch == C0_LF || str >= eol)) 2263 if (ecb_unlikely (ch == C0_LF || str >= eol))
2242 { 2264 {
2243 if (ch == C0_LF) 2265 if (ch == C0_LF)
2244 nlines++; 2266 nlines++;
2245 2267
2246 refresh_count++; 2268 refresh_count++;
… …
2324rxvt_term::next_char () NOTHROW 2346rxvt_term::next_char () NOTHROW
2325{ 2347{
2326 while (cmdbuf_ptr < cmdbuf_endp) 2348 while (cmdbuf_ptr < cmdbuf_endp)
2327 { 2349 {
2328 // assume 7-bit to be ascii ALWAYS 2350 // assume 7-bit to be ascii ALWAYS
2329 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2351 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2330 return *cmdbuf_ptr++; 2352 return *cmdbuf_ptr++;
2331 2353
2332 wchar_t wc; 2354 wchar_t wc;
2333 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2355 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2334 2356
… …
2362 : NOCHAR; 2384 : NOCHAR;
2363} 2385}
2364 2386
2365static class out_of_input out_of_input; 2387static class out_of_input out_of_input;
2366 2388
2367/* rxvt_cmd_getc () - Return next input character */
2368/*
2369 * Return the next input character after first passing any keyboard input
2370 * to the command.
2371 */
2372wchar_t 2389wchar_t
2373rxvt_term::cmd_getc () THROW ((class out_of_input)) 2390rxvt_term::cmd_getc () THROW ((class out_of_input))
2374{ 2391{
2375 wchar_t c = next_char (); 2392 wchar_t c = next_char ();
2376 2393
… …
2469 pclose_printer (fd); 2486 pclose_printer (fd);
2470} 2487}
2471#endif /* PRINTPIPE */ 2488#endif /* PRINTPIPE */
2472/*}}} */ 2489/*}}} */
2473 2490
2474/* *INDENT-OFF* */
2475enum { 2491enum {
2476 C1_40 = 0x40, 2492 C1_40 = 0x40,
2477 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2493 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2478 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2494 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2479 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2495 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2480 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2496 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2481}; 2497};
2482/* *INDENT-ON* */
2483 2498
2484/*{{{ process non-printing single characters */ 2499/*{{{ process non-printing single characters */
2485void 2500void
2486rxvt_term::process_nonprinting (unicode_t ch) 2501rxvt_term::process_nonprinting (unicode_t ch)
2487{ 2502{
… …
2609 return; 2624 return;
2610 } 2625 }
2611 2626
2612 switch (ch) 2627 switch (ch)
2613 { 2628 {
2614 /* case 1: do_tek_mode (); break; */
2615 case '#': 2629 case '#':
2616 if (cmd_getc () == '8') 2630 if (cmd_getc () == '8')
2617 scr_E (); 2631 scr_E ();
2618 break; 2632 break;
2619 case '(': 2633 case '(':
… …
2658 2672
2659 /* 8.3.87: NEXT LINE */ 2673 /* 8.3.87: NEXT LINE */
2660 case C1_NEL: /* ESC E */ 2674 case C1_NEL: /* ESC E */
2661 { 2675 {
2662 wchar_t nlcr[] = { C0_LF, C0_CR }; 2676 wchar_t nlcr[] = { C0_LF, C0_CR };
2663 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2677 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2664 } 2678 }
2665 break; 2679 break;
2666 2680
2667 /* kidnapped escape sequence: Should be 8.3.48 */ 2681 /* kidnapped escape sequence: Should be 8.3.48 */
2668 case C1_ESA: /* ESC G */ 2682 case C1_ESA: /* ESC G */
2669 process_graphics (); 2683 // used by original rxvt for rob nations own graphics mode
2684 if (cmd_getc () == 'Q')
2685 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2670 break; 2686 break;
2671 2687
2672 /* 8.3.63: CHARACTER TABULATION SET */ 2688 /* 8.3.63: CHARACTER TABULATION SET */
2673 case C1_HTS: /* ESC H */ 2689 case C1_HTS: /* ESC H */
2674 scr_set_tab (1); 2690 scr_set_tab (1);
… …
2678 case C1_RI: /* ESC M */ 2694 case C1_RI: /* ESC M */
2679 scr_index (DN); 2695 scr_index (DN);
2680 break; 2696 break;
2681 2697
2682 /* 8.3.142: SINGLE-SHIFT TWO */ 2698 /* 8.3.142: SINGLE-SHIFT TWO */
2683 /*case C1_SS2: scr_single_shift (2); break; */ 2699 /* case C1_SS2: break; */
2684 2700
2685 /* 8.3.143: SINGLE-SHIFT THREE */ 2701 /* 8.3.143: SINGLE-SHIFT THREE */
2686 /*case C1_SS3: scr_single_shift (3); break; */ 2702 /* case C1_SS3: break; */
2687 2703
2688 /* 8.3.27: DEVICE CONTROL STRING */ 2704 /* 8.3.27: DEVICE CONTROL STRING */
2689 case C1_DCS: /* ESC P */ 2705 case C1_DCS: /* ESC P */
2690 process_dcs_seq (); 2706 process_dcs_seq ();
2691 break; 2707 break;
… …
2724 } 2740 }
2725} 2741}
2726/*}}} */ 2742/*}}} */
2727 2743
2728/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2744/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2729/* *INDENT-OFF* */
2730enum { 2745enum {
2731 CSI_ICH = 0x40, 2746 CSI_ICH = 0x40,
2732 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2747 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2733 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2748 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2734 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2749 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2737 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2752 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2738 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2753 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2739 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2754 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2740}; 2755};
2741 2756
2742#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2757#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2743 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2758 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2744 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2759 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2745#define get_byte_array_bit(array, bit) \ 2760#define get_byte_array_bit(array, bit) \
2746 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2761 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2747 2762
2748const unsigned char csi_defaults[] = 2763static const unsigned char csi_defaults[] =
2749 { 2764 {
2750 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2765 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2751 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2766 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2752 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2767 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2753 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2768 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2754 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2769 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2755 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2770 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2756 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2771 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2757 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2772 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2758 }; 2773 };
2759/* *INDENT-ON* */
2760 2774
2761void 2775void
2762rxvt_term::process_csi_seq () 2776rxvt_term::process_csi_seq ()
2763{ 2777{
2764 unicode_t ch, priv, i; 2778 unicode_t ch, priv, i;
… …
2842 { 2856 {
2843 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2857 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2844 scr_soft_reset (); 2858 scr_soft_reset ();
2845 2859
2846 static const int pm_h[] = { 7, 25 }; 2860 static const int pm_h[] = { 7, 25 };
2847 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2861 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2848 2862
2849 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2863 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2850 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2864 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2851 } 2865 }
2852 break; 2866 break;
2853 } 2867 }
2854 2868
2855 return; 2869 return;
… …
3074 } 3088 }
3075} 3089}
3076/*}}} */ 3090/*}}} */
3077 3091
3078#if !ENABLE_MINIMAL 3092#if !ENABLE_MINIMAL
3079/* ARGSUSED */
3080void 3093void
3081rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3094rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3082{ 3095{
3083 int x, y; 3096 int x, y;
3084 XWindowAttributes wattr; 3097 XWindowAttributes wattr;
… …
3093 { 3106 {
3094 /* 3107 /*
3095 * commands 3108 * commands
3096 */ 3109 */
3097 case 1: /* deiconify window */ 3110 case 1: /* deiconify window */
3098 XMapWindow (dpy, parent[0]); 3111 XMapWindow (dpy, parent);
3099 break; 3112 break;
3100 case 2: /* iconify window */ 3113 case 2: /* iconify window */
3101 XIconifyWindow (dpy, parent[0], display->screen); 3114 XIconifyWindow (dpy, parent, display->screen);
3102 break; 3115 break;
3103 case 3: /* set position (pixels) */ 3116 case 3: /* set position (pixels) */
3104 XMoveWindow (dpy, parent[0], args[1], args[2]); 3117 XMoveWindow (dpy, parent, args[1], args[2]);
3105 break; 3118 break;
3106 case 4: /* set size (pixels) */ 3119 case 4: /* set size (pixels) */
3107 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3120 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3108 break; 3121 break;
3109 case 5: /* raise window */ 3122 case 5: /* raise window */
3110 XRaiseWindow (dpy, parent[0]); 3123 XRaiseWindow (dpy, parent);
3111 break; 3124 break;
3112 case 6: /* lower window */ 3125 case 6: /* lower window */
3113 XLowerWindow (dpy, parent[0]); 3126 XLowerWindow (dpy, parent);
3114 break; 3127 break;
3115 case 7: /* refresh window */ 3128 case 7: /* refresh window */
3116 scr_touch (true); 3129 scr_touch (true);
3117 break; 3130 break;
3118 case 8: /* set size (chars) */ 3131 case 8: /* set size (chars) */
… …
3129 3142
3130 /* 3143 /*
3131 * reports - some output format copied from XTerm 3144 * reports - some output format copied from XTerm
3132 */ 3145 */
3133 case 11: /* report window state */ 3146 case 11: /* report window state */
3134 XGetWindowAttributes (dpy, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent, &wattr);
3135 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3148 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3136 break; 3149 break;
3137 case 13: /* report window position */ 3150 case 13: /* report window position */
3138 XGetWindowAttributes (dpy, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent, &wattr);
3139 XTranslateCoordinates (dpy, parent[0], wattr.root, 3152 XTranslateCoordinates (dpy, parent, wattr.root,
3140 -wattr.border_width, -wattr.border_width, 3153 -wattr.border_width, -wattr.border_width,
3141 &x, &y, &wdummy); 3154 &x, &y, &wdummy);
3142 tt_printf ("\033[3;%d;%dt", x, y); 3155 tt_printf ("\033[3;%d;%dt", x, y);
3143 break; 3156 break;
3144 case 14: /* report window size (pixels) */ 3157 case 14: /* report window size (pixels) */
3145 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3146 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3159 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3147 break; 3160 break;
3148 case 18: /* report text area size (chars) */ 3161 case 18: /* report text area size (chars) */
3149 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3162 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3150 break; 3163 break;
… …
3152 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3165 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3153 break; 3166 break;
3154 case 20: /* report icon label */ 3167 case 20: /* report icon label */
3155 { 3168 {
3156 char *s; 3169 char *s;
3157 XGetIconName (dpy, parent[0], &s); 3170 XGetIconName (dpy, parent, &s);
3158 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3171 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3159 XFree (s); 3172 XFree (s);
3160 } 3173 }
3161 break; 3174 break;
3162 case 21: /* report window title */ 3175 case 21: /* report window title */
3163 { 3176 {
3164 char *s; 3177 char *s;
3165 XFetchName (dpy, parent[0], &s); 3178 XFetchName (dpy, parent, &s);
3166 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3179 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3167 XFree (s); 3180 XFree (s);
3168 } 3181 }
3169 break; 3182 break;
3170 } 3183 }
… …
3226 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3239 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3227 */ 3240 */
3228void 3241void
3229rxvt_term::process_dcs_seq () 3242rxvt_term::process_dcs_seq ()
3230{ 3243{
3231 char *s;
3232 unicode_t eh;
3233
3234 /* 3244 /*
3235 * Not handled yet 3245 * Not handled yet
3236 */ 3246 */
3247
3248 unicode_t eh;
3237 s = get_to_st (eh); 3249 char *s = get_to_st (eh);
3238 if (s) 3250 if (s)
3239 free (s); 3251 free (s);
3240 3252
3241 return; 3253 return;
3242} 3254}
… …
3246 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3258 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3247 */ 3259 */
3248void 3260void
3249rxvt_term::process_osc_seq () 3261rxvt_term::process_osc_seq ()
3250{ 3262{
3251 unicode_t ch, eh;
3252 int arg; 3263 int arg;
3253 3264
3254 ch = cmd_getc (); 3265 unicode_t ch = cmd_getc ();
3255 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3266 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3256 arg = arg * 10 + (ch - '0'); 3267 arg = arg * 10 + (ch - '0');
3257 3268
3258 if (ch == ';') 3269 if (ch == ';')
3259 { 3270 {
3271 unicode_t eh;
3260 char *s = get_to_st (eh); 3272 char *s = get_to_st (eh);
3261 3273
3262 if (s) 3274 if (s)
3263 { 3275 {
3264 process_xterm_seq (arg, s, eh); 3276 process_xterm_seq (arg, s, eh);
… …
3325 unsigned long bytes_after; 3337 unsigned long bytes_after;
3326 unsigned char *value = 0; 3338 unsigned char *value = 0;
3327 const char *str = ""; 3339 const char *str = "";
3328 3340
3329 if (prop 3341 if (prop
3330 && XGetWindowProperty (dpy, parent[0], 3342 && XGetWindowProperty (dpy, parent,
3331 prop, 0, 1<<16, 0, AnyPropertyType, 3343 prop, 0, 1<<16, 0, AnyPropertyType,
3332 &actual_type, &actual_format, 3344 &actual_type, &actual_format,
3333 &nitems, &bytes_after, &value) == Success 3345 &nitems, &bytes_after, &value) == Success
3334 && actual_type != None 3346 && actual_type != None
3335 && actual_format == 8) 3347 && actual_format == 8)
… …
3347 { 3359 {
3348 *eq = 0; 3360 *eq = 0;
3349 set_utf8_property (display->atom (str), eq + 1); 3361 set_utf8_property (display->atom (str), eq + 1);
3350 } 3362 }
3351 else 3363 else
3352 XDeleteProperty (dpy, parent[0], 3364 XDeleteProperty (dpy, parent,
3353 display->atom (str)); 3365 display->atom (str));
3354 } 3366 }
3355 break; 3367 break;
3356 3368
3357 case XTerm_Color: 3369 case XTerm_Color:
… …
3389 process_color_seq (op, Color_pointer_fg, str, resp); 3401 process_color_seq (op, Color_pointer_fg, str, resp);
3390 break; 3402 break;
3391 case XTerm_Color_pointer_bg: 3403 case XTerm_Color_pointer_bg:
3392 process_color_seq (op, Color_pointer_bg, str, resp); 3404 process_color_seq (op, Color_pointer_bg, str, resp);
3393 break; 3405 break;
3406#ifdef OPTION_HC
3407 case XTerm_Color_HC:
3408 process_color_seq (op, Color_HC, str, resp);
3409 break;
3410 case XTerm_Color_HTC:
3411 process_color_seq (op, Color_HTC, str, resp);
3412 break;
3413#endif
3394#ifndef NO_BOLD_UNDERLINE_REVERSE 3414#ifndef NO_BOLD_UNDERLINE_REVERSE
3395 case XTerm_Color_RV:
3396 process_color_seq (op, Color_RV, str, resp);
3397 break;
3398 case Rxvt_Color_BD:
3399 case URxvt_Color_BD: 3415 case URxvt_Color_BD:
3400 process_color_seq (op, Color_BD, str, resp); 3416 process_color_seq (op, Color_BD, str, resp);
3401 break; 3417 break;
3402 case Rxvt_Color_UL:
3403 case URxvt_Color_UL: 3418 case URxvt_Color_UL:
3404 process_color_seq (op, Color_UL, str, resp); 3419 process_color_seq (op, Color_UL, str, resp);
3405 break; 3420 break;
3406 case URxvt_Color_IT: 3421 case URxvt_Color_IT:
3407 process_color_seq (op, Color_IT, str, resp); 3422 process_color_seq (op, Color_IT, str, resp);
… …
3415 process_color_seq (op, Color_tint, str, resp); 3430 process_color_seq (op, Color_tint, str, resp);
3416 { 3431 {
3417 bool changed = false; 3432 bool changed = false;
3418 3433
3419 if (ISSET_PIXCOLOR (Color_tint)) 3434 if (ISSET_PIXCOLOR (Color_tint))
3420 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3435 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3421 else
3422 changed = bgPixmap.unset_tint ();
3423 3436
3424 if (changed) 3437 if (changed)
3425 update_background (); 3438 update_background ();
3426 } 3439 }
3427 3440
… …
3433 if (!strcmp (str, "?")) 3446 if (!strcmp (str, "?"))
3434 { 3447 {
3435 char str[256]; 3448 char str[256];
3436 3449
3437 sprintf (str, "[%dx%d+%d+%d]", 3450 sprintf (str, "[%dx%d+%d+%d]",
3438 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3451 min (h_scale, 32767), min (v_scale, 32767),
3439 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3452 min (h_align, 32767), min (v_align, 32767));
3440 process_xterm_seq (XTerm_title, str, CHAR_ST); 3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3441 } 3454 }
3442 else 3455 else
3443 { 3456 {
3444 int changed = 0; 3457 int changed = 0;
3445 3458
3446 if (*str != ';') 3459 if (*str != ';')
3447 { 3460 {
3448 /* reset to default scaling :*/
3449 bgPixmap.unset_geometry ();
3450 if (bgPixmap.set_file (str)) /* change pixmap */ 3461 if (bg_set_file (str)) /* change pixmap */
3462 {
3451 changed++; 3463 changed++;
3452 str = strchr (str, ';'); 3464 str = strchr (str, ';');
3453 if (str == NULL) 3465 if (str == NULL)
3454 bgPixmap.set_defaultGeometry (); 3466 bg_set_default_geometry ();
3467 else
3468 bg_set_geometry (str+1);
3469 }
3455 } 3470 }
3456 3471 else
3457 while (str)
3458 { 3472 {
3459 str++; 3473 str++;
3460 if (bgPixmap.set_geometry (str)) 3474 if (bg_set_geometry (str, true))
3461 changed++; 3475 changed++;
3462 str = strchr (str, ';');
3463 } 3476 }
3464 3477
3465 if (changed) 3478 if (changed)
3479 {
3480 if (bg_window_position_sensitive ())
3481 {
3482 int x, y;
3483 get_window_origin (x, y);
3484 bg_set_position (x, y);
3485 }
3466 update_background (); 3486 update_background ();
3487 }
3467 } 3488 }
3468 break; 3489 break;
3469#endif 3490#endif
3470 3491
3471 case XTerm_logfile: 3492 case XTerm_logfile:
… …
3574 { 3595 {
3575 if (mode == 'r') 3596 if (mode == 'r')
3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3597 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3577 else 3598 else
3578 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3599 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3600
3579 set_privmode (bit, state); 3601 set_privmode (bit, state);
3580 } 3602 }
3581 3603
3582 return state; 3604 return state;
3583} 3605}
3584 3606
3585/* we're not using priv _yet_ */ 3607/* we're not using priv _yet_ */
3586void 3608void
3587rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3609rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3588{ 3610{
3589 unsigned int i, j; 3611 unsigned int i, j;
3590 int state; 3612 int state;
3591 3613
3592 static const struct 3614 static const struct
… …
3602 { 6, PrivMode_relOrigin }, // DECOM 3624 { 6, PrivMode_relOrigin }, // DECOM
3603 { 7, PrivMode_Autowrap }, // DECAWM 3625 { 7, PrivMode_Autowrap }, // DECAWM
3604 // 8, auto-repeat keys // DECARM 3626 // 8, auto-repeat keys // DECARM
3605 { 9, PrivMode_MouseX10 }, 3627 { 9, PrivMode_MouseX10 },
3606 // 18 end FF to printer after print screen 3628 // 18 end FF to printer after print screen
3607 // 19 Print screen prints full screen/scorll region 3629 // 19 Print screen prints full screen/scroll region
3608 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3630 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3609#ifdef scrollBar_esc 3631#ifdef scrollBar_esc
3610 { scrollBar_esc, PrivMode_scrollBar }, 3632 { scrollBar_esc, PrivMode_scrollBar },
3611#endif 3633#endif
3612 { 35, PrivMode_ShiftKeys }, // rxvt extension 3634 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3621 { 67, PrivMode_BackSpace }, // DECBKM 3643 { 67, PrivMode_BackSpace }, // DECBKM
3622#endif 3644#endif
3623 { 1000, PrivMode_MouseX11 }, 3645 { 1000, PrivMode_MouseX11 },
3624 { 1002, PrivMode_MouseBtnEvent }, 3646 { 1002, PrivMode_MouseBtnEvent },
3625 { 1003, PrivMode_MouseAnyEvent }, 3647 { 1003, PrivMode_MouseAnyEvent },
3648#if ENABLE_FRILLS
3649 { 1005, PrivMode_ExtModeMouse },
3650#endif
3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3651 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3627 { 1011, PrivMode_Keypress }, // rxvt extension 3652 { 1011, PrivMode_Keypress }, // rxvt extension
3653#if ENABLE_FRILLS
3654 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3655#endif
3628 // 1035 enable modifiers for alt, numlock NYI 3656 // 1035 enable modifiers for alt, numlock NYI
3629 // 1036 send ESC for meta keys NYI 3657 // 1036 send ESC for meta keys NYI
3630 // 1037 send DEL for keypad delete NYI 3658 // 1037 send DEL for keypad delete NYI
3631 { 1047, PrivMode_Screen }, 3659 { 1047, PrivMode_Screen },
3632 // 1048 save and restore cursor 3660 // 1048 save and restore cursor, implemented in code
3633 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3661 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3634 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3662 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3635 { 2004, PrivMode_BracketPaste }, 3663 { 2004, PrivMode_BracketPaste },
3636 }; 3664 };
3637 3665
… …
3647 for (i = 0; i < nargs; i++) 3675 for (i = 0; i < nargs; i++)
3648 { 3676 {
3649 state = -1; 3677 state = -1;
3650 3678
3651 /* basic handling */ 3679 /* basic handling */
3652 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3680 for (j = 0; j < ecb_array_length (argtopriv); j++)
3653 if (argtopriv[j].argval == arg[i]) 3681 if (argtopriv[j].argval == arg[i])
3654 { 3682 {
3655 state = privcases (mode, argtopriv[j].bit); 3683 state = privcases (mode, argtopriv[j].bit);
3656 break; 3684 break;
3657 } 3685 }
… …
3735 case 1003: 3763 case 1003:
3736 if (state) 3764 if (state)
3737 { 3765 {
3738 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3766 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3739 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3767 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3768 mouse_row = mouse_col = 0;
3740 vt_emask_mouse = PointerMotionMask; 3769 vt_emask_mouse = PointerMotionMask;
3741 } 3770 }
3742 else 3771 else
3743 vt_emask_mouse = NoEventMask; 3772 vt_emask_mouse = NoEventMask;
3744 3773
… …
3929 } 3958 }
3930 } 3959 }
3931} 3960}
3932/*}}} */ 3961/*}}} */
3933 3962
3934/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3935void
3936rxvt_term::process_graphics ()
3937{
3938 unicode_t ch, cmd = cmd_getc ();
3939
3940 if (cmd == 'Q')
3941 {
3942 /* query graphics */
3943 tt_printf ("\033G0\012"); /* no graphics */
3944 return;
3945 }
3946 /* swallow other graphics sequences until terminating ':' */
3947 do
3948 ch = cmd_getc ();
3949 while (ch != ':');
3950}
3951/*}}} */
3952
3953/* ------------------------------------------------------------------------- */ 3963/* ------------------------------------------------------------------------- */
3954 3964
3955/* 3965/*
3956 * Send printf () formatted output to the command. 3966 * Send printf () formatted output to the command.
3957 * Only use for small amounts of data. 3967 * Only use for small amounts of data.
… …
3970 3980
3971/* ---------------------------------------------------------------------- */ 3981/* ---------------------------------------------------------------------- */
3972/* Write data to the pty as typed by the user, pasted with the mouse, 3982/* Write data to the pty as typed by the user, pasted with the mouse,
3973 * or generated by us in response to a query ESC sequence. 3983 * or generated by us in response to a query ESC sequence.
3974 */ 3984 */
3975const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3985static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3976 3986
3977void 3987void
3978rxvt_term::tt_write (const char *data, unsigned int len) 3988rxvt_term::tt_write (const char *data, unsigned int len)
3979{ 3989{
3980 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3990 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3985 3995
3986 if (v_buflen == 0) 3996 if (v_buflen == 0)
3987 { 3997 {
3988 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3998 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3989 3999
4000 max_it (written, 0);
4001
3990 if ((unsigned int)written == len) 4002 if (written == len)
3991 return; 4003 return;
3992 4004
3993 data += written; 4005 data += written;
3994 len -= written; 4006 len -= written;
3995 } 4007 }
3996 4008
3997 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4009 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3998 4010
3999 memcpy (v_buffer + v_buflen, data, len); 4011 memcpy (v_buffer + v_buflen, data, len);
4000 v_buflen += len; 4012 v_buflen += len;
4001 4013
4002 pty_ev.set (ev::READ | ev::WRITE); 4014 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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