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.414 by ayin, Tue Feb 19 10:47:03 2008 UTC vs.
Revision 1.481 by root, Thu Mar 24 17:34:28 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
… …
282} 288}
283 289
284static int 290static int
285hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
286{ 292{
287 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
290 { 296 {
291 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
292 298
… …
416 */ 422 */
417 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
420 426
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 set_privmode (PrivMode_aplKP, !numlock_state);
425 }
426
427 kbuf[0] = 0; 427 kbuf[0] = 0;
428 428
429#ifdef USE_XIM 429#ifdef USE_XIM
430 if (Input_Context) 430 if (Input_Context)
431 { 431 {
… …
505#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 507#else
508 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
509#endif 509#endif
510 max_it (lnsppg, 1);
511
510 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
511 { 513 {
512 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
513 return; 515 return;
514 } 516 }
… …
579 } 581 }
580 } 582 }
581 583
582#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 585 // ISO 14755 support
584 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 587 {
586 int hv; 588 int hv;
587 589
588 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 621 scr_overlay_off ();
620# endif 622# endif
621 iso14755buf = 0; 623 iso14755buf = 0;
622 } 624 }
623 } 625 }
626 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
627 { 630 {
628 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 632# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 { 648 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1; 650 unsigned int newlen = 1;
648 651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
649 switch (translate_keypad (keysym, kp)) 655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
650 { 658 {
651#ifndef NO_BACKSPACE_KEY 659#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace: 660 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace) 661 if (priv_modes & PrivMode_HaveBackSpace)
654 { 662 {
… …
881 commit_iso14755 (); 889 commit_iso14755 ();
882 890
883 return; 891 return;
884 } 892 }
885 893
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887 if (i[0] == keysym) 895 if (i[0] == keysym)
888 { 896 {
889 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 (); 898 commit_iso14755 ();
891 899
… …
928 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
930#endif 938#endif
931} 939}
932 940
933#if defined (KEYSYM_RESOURCE)
934unsigned int
935rxvt_term::cmd_write (const char *str, unsigned int count)
936{
937 unsigned int n, s;
938
939 n = cmdbuf_ptr - cmdbuf_base;
940 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
941
942 if (n > 0 && s < count)
943 {
944 memmove (cmdbuf_base, cmdbuf_ptr,
945 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
946 cmdbuf_ptr = cmdbuf_base;
947 cmdbuf_endp -= n;
948 s += n;
949 }
950
951 if (count > s)
952 {
953 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
954 count = s;
955 }
956
957 for (; count--;)
958 *cmdbuf_endp++ = *str++;
959
960 cmd_parse ();
961
962 return 0;
963}
964#endif
965
966void 941void
967rxvt_term::flush () 942rxvt_term::flush ()
968{ 943{
969 flush_ev.stop (); 944 flush_ev.stop ();
970 945
971#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_BG_PIXMAP
972 if (bgPixmap.check_clearChanged ()) 947 if (bg_flags & BG_NEEDS_REFRESH)
973 { 948 {
974// scr_clear (true); This needs to be researched further! 949 bg_flags &= ~BG_NEEDS_REFRESH;
975 scr_touch (false); 950 scr_touch (false);
976 } 951 }
977#endif 952#endif
978 953
979 if (want_refresh) 954 if (want_refresh)
… …
1024 } 999 }
1025 1000
1026 display->flush (); 1001 display->flush ();
1027} 1002}
1028 1003
1029/* checks wether a refresh is requested and starts the refresh timer */ 1004/* checks whether a refresh is requested and starts the refresh timer */
1030void 1005void
1031rxvt_term::refresh_check () 1006rxvt_term::refresh_check ()
1032{ 1007{
1033 if (want_refresh && !flush_ev.is_active ()) 1008 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1127 { 1102 {
1128 // this should really be sched_yield(), but the linux guys thought 1103 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1104 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is 1105 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1106 // allowed by the sus... as is returning ENOSYS.
1107 // since the linux guys additionally thought that breaking the only
1108 // known workaround against their unusable sched_yield hack is cool,
1109 // we just nanosleep a bit and hope for the best.
1132 1110
1133 struct timespec ts = { 0, 0 }; 1111 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1112 nanosleep (&ts, 0);
1135 1113
1136 w.stop (); 1114 w.stop ();
1137 } 1115 }
1138 1116
… …
1141 { 1119 {
1142 } 1120 }
1143} event_handler; 1121} event_handler;
1144#endif 1122#endif
1145 1123
1124/* make sure all the cmd data is at beginning of cmdbuf */
1125void
1126rxvt_term::cmdbuf_reify ()
1127{
1128 if (cmdbuf_ptr == cmdbuf_base)
1129 return;
1130
1131 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1132
1133 memmove (cmdbuf_base, cmdbuf_ptr, used);
1134 cmdbuf_ptr = cmdbuf_base;
1135 cmdbuf_endp = cmdbuf_ptr + used;
1136
1137}
1138
1139#if defined (KEYSYM_RESOURCE)
1140void
1141rxvt_term::cmdbuf_append (const char *str, size_t count)
1142{
1143 cmdbuf_reify ();
1144
1145 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1146
1147 if (count > avail)
1148 return;
1149
1150 memcpy (cmdbuf_endp, str, count);
1151 cmdbuf_endp += count;
1152
1153 cmd_parse ();
1154}
1155#endif
1156
1146bool 1157bool
1147rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1148{ 1159{
1149 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 cmdbuf_reify ();
1150 1161
1151 if (CBUFSIZ == n) 1162 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1152 { 1163
1153 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1164 if (!avail)
1154 n = 0;
1155 } 1165 {
1156 1166 // normally this indicates a "too long" command sequence - just drop the data we have
1157 memmove (cmdbuf_base, cmdbuf_ptr, n);
1158 cmdbuf_ptr = cmdbuf_base; 1167 cmdbuf_ptr = cmdbuf_base;
1159 cmdbuf_endp = cmdbuf_ptr + n; 1168 cmdbuf_endp = cmdbuf_ptr;
1169 avail = CBUFSIZ;
1170 }
1160 1171
1161 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1172 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1162 1173
1163 if (r > 0) 1174 if (r > 0)
1164 { 1175 {
1165 cmdbuf_endp += r; 1176 cmdbuf_endp += r;
1166 return true; 1177 return true;
… …
1188{ 1199{
1189 make_current (); 1200 make_current ();
1190 1201
1191 if (revents & ev::READ) 1202 if (revents & ev::READ)
1192 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1193 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1194 if (cmd_parse ()) 1205 cmd_parse ();
1195 break;
1196 1206
1197 if (revents & ev::WRITE) 1207 if (revents & ev::WRITE)
1198 pty_write (); 1208 pty_write ();
1199 1209
1200 refresh_check (); 1210 refresh_check ();
… …
1241{ 1251{
1242 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1243 int x, y; 1253 int x, y;
1244 int code = 32; 1254 int code = 32;
1245 1255
1246 x = Pixel2Col (ev.x); 1256 x = Pixel2Col (ev.x) + 1;
1247 y = Pixel2Row (ev.y); 1257 y = Pixel2Row (ev.y) + 1;
1258
1248 if (ev.type == MotionNotify) 1259 if (ev.type == MotionNotify)
1249 { 1260 {
1250 if (x == mouse_row && y == mouse_col) 1261 if (x == mouse_row && y == mouse_col)
1251 return; 1262 return;
1263
1252 mouse_row = x; 1264 mouse_row = x;
1253 mouse_col = y; 1265 mouse_col = y;
1254 code += 32; 1266 code += 32;
1255 } 1267 }
1256 1268
… …
1259 else 1271 else
1260 { 1272 {
1261 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1262 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1263 if (button_number >= 3) 1275 if (button_number >= 3)
1264 button_number += (64 - 3); 1276 button_number += 64 - 3;
1265 } 1277 }
1266 1278
1267 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1268 { 1280 {
1269 /* 1281 /*
… …
1301 fputc ('A', stderr); 1313 fputc ('A', stderr);
1302 if (key_state & 32) 1314 if (key_state & 32)
1303 fputc ('2', stderr); 1315 fputc ('2', stderr);
1304 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1305 button_number, 1317 button_number,
1306 x + 1, 1318 x,
1307 y + 1); 1319 y);
1308#endif 1320#endif
1309 1321
1322#if ENABLE_FRILLS
1323 if (priv_modes & PrivMode_ExtMouseRight)
1324 tt_printf ("\033[%d;%d;%dM",
1325 code + button_number + key_state,
1326 x,
1327 y);
1328 else if (priv_modes & PrivMode_ExtModeMouse)
1329 tt_printf ("\033[M%c%lc%lc",
1330 code + button_number + key_state,
1331 wint_t (32 + x),
1332 wint_t (32 + y));
1333 else
1334#endif
1310 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1311 (code + button_number + key_state), 1336 code + button_number + key_state,
1312 (32 + x + 1), 1337 32 + x,
1313 (32 + y + 1)); 1338 32 + y);
1314} 1339}
1315 1340
1316/*{{{ process an X event */ 1341/*{{{ process an X event */
1317void 1342void
1318rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
… …
1420 && ev.xfocus.mode != NotifyGrab) 1445 && ev.xfocus.mode != NotifyGrab)
1421 focus_out (); 1446 focus_out ();
1422 break; 1447 break;
1423 1448
1424 case ConfigureNotify: 1449 case ConfigureNotify:
1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427 szHint.width, szHint.height);*/
1428 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent[0])
1429 { 1451 {
1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ; 1453 ;
1454
1455#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ())
1458 {
1459 int x, y;
1460 if (ev.xconfigure.send_event)
1461 {
1462 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y;
1464 }
1465 else
1466 get_window_origin (x, y);
1467
1468 if (bg_set_position (x, y)
1469 || !(bg_flags & BG_IS_VALID))
1470 moved = true;
1471 }
1472#endif
1432 1473
1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1475 {
1435 seen_resize = 1; 1476 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1478 }
1438 else 1479 else
1439 { 1480 {
1440#ifdef HAVE_BG_PIXMAP 1481#ifdef HAVE_BG_PIXMAP
1441 if (bgPixmap.window_position_sensitive ()) 1482 if (moved)
1442 { 1483 {
1443 if (mapped) 1484 if (mapped)
1444 update_background (); 1485 update_background ();
1445 else 1486 else
1446 bgPixmap.invalidate (); 1487 bg_invalidate ();
1447 } 1488 }
1448#endif 1489#endif
1449 } 1490 }
1450 1491
1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1452 } 1493 }
1453 break; 1494 break;
1454 1495
1455 case PropertyNotify: 1496 case PropertyNotify:
1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460
1461 break; 1498 break;
1462 1499
1463 case SelectionClear: 1500 case SelectionClear:
1464 selection_clear (); 1501 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465 break;
1466
1467 case SelectionNotify:
1468 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470 break; 1502 break;
1471 1503
1472 case SelectionRequest: 1504 case SelectionRequest:
1473 selection_send (ev.xselectionrequest); 1505 selection_send (ev.xselectionrequest);
1474 break; 1506 break;
1475 1507
1476 case MapNotify: 1508 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP 1509#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a 1510 /* This is needed specifically to fix the case of no window manager or a
1479 * non-reparenting window manager. In those cases we never get first 1511 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1512 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does 1513 * care of multiplicity of ConfigureNotify events arriving while WM does
1482 * reparenting. 1514 * reparenting.
1483 * We should not render background immidiately, as there could be several 1515 * We should not render background immediately, as there could be several
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1516 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1485 * by scheduling background redraw as soon as we can, but giving a short 1517 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive. 1518 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all 1519 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results. 1520 * of ConfigureNotifys for the best results.
1489 */ 1521 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1522 if (!(bg_flags & BG_IS_VALID))
1491 update_background_ev.start (0.025); 1523 update_background_ev.start (0.025);
1492#endif 1524#endif
1493 mapped = 1; 1525 mapped = 1;
1494#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1495 text_blink_ev.start (); 1527 text_blink_ev.start ();
… …
1510 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1511 { 1543 {
1512 do 1544 do
1513 { 1545 {
1514 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1515 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1516 } 1548 }
1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1518 1550
1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1520 1552
1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 { 1554 {
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1525 } 1557 }
1526 1558
1527 want_refresh = 1; 1559 want_refresh = 1;
1528 } 1560 }
1529 else 1561 else
… …
1682#endif 1714#endif
1683 1715
1684 refresh_check (); 1716 refresh_check ();
1685} 1717}
1686 1718
1719#if ENABLE_FRILLS
1720void
1721rxvt_term::set_urgency (bool enable)
1722{
1723 if (enable == urgency_hint)
1724 return;
1725
1726 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1727 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent[0], h);
1730 urgency_hint = enable;
1731 }
1732}
1733#endif
1734
1687void 1735void
1688rxvt_term::focus_in () 1736rxvt_term::focus_in ()
1689{ 1737{
1690 if (!focus) 1738 if (!focus)
1691 { 1739 {
1692 focus = 1; 1740 focus = 1;
1693 want_refresh = 1; 1741 want_refresh = 1;
1694
1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696 1742
1697#if USE_XIM 1743#if USE_XIM
1698 if (Input_Context != NULL) 1744 if (Input_Context != NULL)
1699 { 1745 {
1700 IMSetPosition (); 1746 IMSetPosition ();
… …
1712 scr_recolour (); 1758 scr_recolour ();
1713 } 1759 }
1714#endif 1760#endif
1715#if ENABLE_FRILLS 1761#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell)) 1762 if (option (Opt_urgentOnBell))
1717 { 1763 set_urgency (0);
1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1719 {
1720 h->flags &= ~XUrgencyHint;
1721 XSetWMHints (dpy, parent[0], h);
1722 }
1723 }
1724#endif 1764#endif
1765
1766 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1725 } 1767 }
1726} 1768}
1727 1769
1728void 1770void
1729rxvt_term::focus_out () 1771rxvt_term::focus_out ()
… …
1731 if (focus) 1773 if (focus)
1732 { 1774 {
1733 focus = 0; 1775 focus = 0;
1734 want_refresh = 1; 1776 want_refresh = 1;
1735 1777
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1778#if ENABLE_FRILLS
1737 1779 if (option (Opt_urgentOnBell))
1780 set_urgency (0);
1781#endif
1738#if ENABLE_FRILLS || ISO_14755 1782#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1783 if (iso14755buf)
1740 { 1784 {
1741 iso14755buf = 0; 1785 iso14755buf = 0;
1742# if ISO_14755 1786# if ISO_14755
… …
1759 { 1803 {
1760 pix_colors = pix_colors_unfocused; 1804 pix_colors = pix_colors_unfocused;
1761 scr_recolour (); 1805 scr_recolour ();
1762 } 1806 }
1763#endif 1807#endif
1808
1809 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764 } 1810 }
1765} 1811}
1766 1812
1767void 1813void
1768rxvt_term::update_fade_color (unsigned int idx) 1814rxvt_term::update_fade_color (unsigned int idx)
… …
1796 * use the property to determine the pixmap. We use it later on. 1842 * use the property to determine the pixmap. We use it later on.
1797 */ 1843 */
1798 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1800 { 1846 {
1801 bgPixmap.set_root_pixmap (); 1847 bg_set_root_pixmap ();
1802 update_background (); 1848 update_background ();
1803 } 1849 }
1804 1850
1805 break; 1851 break;
1806 } 1852 }
… …
1845 /* save the xbutton state (for ButtonRelease) */ 1891 /* save the xbutton state (for ButtonRelease) */
1846 MEvent.state = ev.state; 1892 MEvent.state = ev.state;
1847#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1848 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1849 { 1895 {
1850 /* same button, within alloted time */ 1896 /* same button, within allowed time */
1851 MEvent.clicks++; 1897 MEvent.clicks++;
1852 1898
1853 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1854 { 1900 {
1855 /* only report double clicks */ 1901 /* only report double clicks */
… …
2126 selection_make (ev.time); 2172 selection_make (ev.time);
2127 break; 2173 break;
2128 2174
2129 case Button2: 2175 case Button2:
2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2176 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2178 break;
2133 2179
2134#ifdef MOUSE_WHEEL 2180#ifdef MOUSE_WHEEL
2135 case Button4: 2181 case Button4:
2136 case Button5: 2182 case Button5:
… …
2170 } 2216 }
2171} 2217}
2172 2218
2173/*}}} */ 2219/*}}} */
2174 2220
2175bool 2221void
2176rxvt_term::cmd_parse () 2222rxvt_term::cmd_parse ()
2177{ 2223{
2178 bool flag = false;
2179 wchar_t ch = NOCHAR; 2224 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2225 char *seq_begin; // remember start of esc-sequence here
2181 2226
2182 for (;;) 2227 for (;;)
2183 { 2228 {
2184 if (ch == NOCHAR) 2229 if (expect_false (ch == NOCHAR))
2185 { 2230 {
2186 seq_begin = cmdbuf_ptr; 2231 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2232 ch = next_char ();
2188 2233
2189 if (ch == NOCHAR) 2234 if (ch == NOCHAR)
2190 break; 2235 break;
2191 } 2236 }
2192 2237
2193 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2238 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2194 { 2239 {
2195 if (!seen_input) 2240 if (expect_false (!seen_input))
2196 { 2241 {
2197 seen_input = 1; 2242 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2243 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2244 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2245 // some window managers resize the window early, and these programs
… …
2213 wchar_t *str = buf; 2258 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2259 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2260
2216 for (;;) 2261 for (;;)
2217 { 2262 {
2218 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2263 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219 break; 2264 break;
2220 2265
2221 *str++ = ch; 2266 *str++ = ch;
2222 2267
2223 if (ch == C0_LF || str >= eol) 2268 if (expect_false (ch == C0_LF || str >= eol))
2224 { 2269 {
2225 if (ch == C0_LF) 2270 if (ch == C0_LF)
2226 nlines++; 2271 nlines++;
2227 2272
2228 refresh_count++; 2273 refresh_count++;
… …
2277 * What the heck we'll cheat and only refresh less than every page-full. 2322 * What the heck we'll cheat and only refresh less than every page-full.
2278 * if skipScroll is enabled. 2323 * if skipScroll is enabled.
2279 */ 2324 */
2280 if (refreshnow) 2325 if (refreshnow)
2281 { 2326 {
2282 flag = true;
2283 scr_refresh (); 2327 scr_refresh ();
2284 want_refresh = 1; 2328 want_refresh = 1;
2285 } 2329 }
2286
2287 } 2330 }
2288 else 2331 else
2289 { 2332 {
2290 try 2333 try
2291 { 2334 {
… …
2299 } 2342 }
2300 2343
2301 ch = NOCHAR; 2344 ch = NOCHAR;
2302 } 2345 }
2303 } 2346 }
2304
2305 return flag;
2306} 2347}
2307 2348
2308// read the next character 2349// read the next character
2309wchar_t 2350wchar_t
2310rxvt_term::next_char () NOTHROW 2351rxvt_term::next_char () NOTHROW
2311{ 2352{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2353 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2354 {
2314 // assume 7-bit to be ascii ALWAYS 2355 // assume 7-bit to be ascii ALWAYS
2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2356 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316 return *cmdbuf_ptr++; 2357 return *cmdbuf_ptr++;
2317 2358
2318 wchar_t wc; 2359 wchar_t wc;
2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2360 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320 2361
… …
2324 cmdbuf_ptr = cmdbuf_endp; 2365 cmdbuf_ptr = cmdbuf_endp;
2325 break; 2366 break;
2326 } 2367 }
2327 2368
2328 if (len == (size_t)-1) 2369 if (len == (size_t)-1)
2370 {
2371 mbstate.reset (); // reset now undefined conversion state
2329 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2372 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2373 }
2330 2374
2331 // assume wchar == unicode 2375 // assume wchar == unicode
2332 cmdbuf_ptr += len; 2376 cmdbuf_ptr += len;
2333 return wc & UNICODE_MASK; 2377 return wc & UNICODE_MASK;
2334 } 2378 }
… …
2378/*----------------------------------------------------------------------*/ 2422/*----------------------------------------------------------------------*/
2379#ifdef PRINTPIPE 2423#ifdef PRINTPIPE
2380FILE * 2424FILE *
2381rxvt_term::popen_printer () 2425rxvt_term::popen_printer ()
2382{ 2426{
2383 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2427 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2384 2428
2385 if (stream == NULL) 2429 if (stream == NULL)
2386 rxvt_warn ("can't open printer pipe, not printing.\n"); 2430 rxvt_warn ("can't open printer pipe, not printing.\n");
2387 2431
2388 return stream; 2432 return stream;
… …
2399 * simulate attached vt100 printer 2443 * simulate attached vt100 printer
2400 */ 2444 */
2401void 2445void
2402rxvt_term::process_print_pipe () 2446rxvt_term::process_print_pipe ()
2403{ 2447{
2404 int done; 2448 FILE *fd = popen_printer ();
2405 FILE *fd;
2406 2449
2407 if ((fd = popen_printer ()) == NULL) 2450 if (!fd)
2408 return; 2451 return;
2409 2452
2410 /* 2453 /*
2411 * Send all input to the printer until either ESC[4i or ESC[?4i 2454 * Send all input to the printer until either ESC[4i or ESC[?4i
2412 * is received. 2455 * is received.
2413 */ 2456 */
2414 for (done = 0; !done;) 2457 for (int done = 0; !done; )
2415 { 2458 {
2416 unsigned char buf[8]; 2459 unsigned char buf[8];
2417 unicode_t ch; 2460 unicode_t ch;
2418 unsigned int i, len; 2461 unsigned int i, len;
2419 2462
… …
2642 2685
2643 /* 8.3.87: NEXT LINE */ 2686 /* 8.3.87: NEXT LINE */
2644 case C1_NEL: /* ESC E */ 2687 case C1_NEL: /* ESC E */
2645 { 2688 {
2646 wchar_t nlcr[] = { C0_LF, C0_CR }; 2689 wchar_t nlcr[] = { C0_LF, C0_CR };
2647 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2648 } 2691 }
2649 break; 2692 break;
2650 2693
2651 /* kidnapped escape sequence: Should be 8.3.48 */ 2694 /* kidnapped escape sequence: Should be 8.3.48 */
2652 case C1_ESA: /* ESC G */ 2695 case C1_ESA: /* ESC G */
2653 process_graphics (); 2696 // used by original rxvt for rob nations own graphics mode
2697 if (cmd_getc () == 'Q')
2698 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2654 break; 2699 break;
2655 2700
2656 /* 8.3.63: CHARACTER TABULATION SET */ 2701 /* 8.3.63: CHARACTER TABULATION SET */
2657 case C1_HTS: /* ESC H */ 2702 case C1_HTS: /* ESC H */
2658 scr_set_tab (1); 2703 scr_set_tab (1);
… …
2677 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2722 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2678 case C1_SCI: /* ESC Z */ 2723 case C1_SCI: /* ESC Z */
2679 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2724 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2680 break; /* steal obsolete ESC [ c */ 2725 break; /* steal obsolete ESC [ c */
2681 2726
2682 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2727 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2683 case C1_CSI: /* ESC [ */ 2728 case C1_CSI: /* ESC [ */
2684 process_csi_seq (); 2729 process_csi_seq ();
2685 break; 2730 break;
2686 2731
2687 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2732 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2688 case C1_OSC: /* ESC ] */ 2733 case C1_OSC: /* ESC ] */
2689 process_osc_seq (); 2734 process_osc_seq ();
2690 break; 2735 break;
2691 2736
2692 /* 8.3.106: RESET TO INITIAL STATE */ 2737 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2693 case 'c': 2738 case 'c':
2694 mbstate.reset (); 2739 mbstate.reset ();
2695 scr_poweron (); 2740 scr_poweron ();
2696 scrollBar.show (1); 2741 scrollBar.show (1);
2697 break; 2742 break;
… …
2721 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2766 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2722 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2767 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2723 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2768 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2724}; 2769};
2725 2770
2726#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2771#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2727 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2772 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2728 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2773 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2729#define get_byte_array_bit(array, bit) \ 2774#define get_byte_array_bit(array, bit) \
2730 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2775 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2731 2776
2732const unsigned char csi_defaults[] = 2777static const unsigned char csi_defaults[] =
2733 { 2778 {
2734 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2779 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2735 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2780 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2736 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2781 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2737 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2782 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2752 2797
2753 nargs = 0; 2798 nargs = 0;
2754 2799
2755 priv = 0; 2800 priv = 0;
2756 ch = cmd_getc (); 2801 ch = cmd_getc ();
2757 if (ch >= '<' && ch <= '?') 2802 if ((ch >= '<' && ch <= '?') || ch == '!')
2758 { 2803 {
2759 /* '<' '=' '>' '?' */ 2804 /* '<' '=' '>' '?' '!' */
2760 priv = ch; 2805 priv = ch;
2761 ch = cmd_getc (); 2806 ch = cmd_getc ();
2762 } 2807 }
2763 2808
2764 /* read any numerical arguments */ 2809 /* read any numerical arguments */
… …
2818 2863
2819 case '?': 2864 case '?':
2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2865 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2821 process_terminal_mode (ch, priv, nargs, arg); 2866 process_terminal_mode (ch, priv, nargs, arg);
2822 break; 2867 break;
2868
2869 case '!':
2870 if (ch == CSI_70)
2871 {
2872 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2873 scr_soft_reset ();
2874
2875 static const int pm_h[] = { 7, 25 };
2876 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2877
2878 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2879 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2823 } 2880 }
2881 break;
2882 }
2883
2824 return; 2884 return;
2825 } 2885 }
2826 2886
2827 switch (ch) 2887 switch (ch)
2828 { 2888 {
… …
3195 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3255 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3196 */ 3256 */
3197void 3257void
3198rxvt_term::process_dcs_seq () 3258rxvt_term::process_dcs_seq ()
3199{ 3259{
3200 char *s;
3201 unicode_t eh;
3202
3203 /* 3260 /*
3204 * Not handled yet 3261 * Not handled yet
3205 */ 3262 */
3263
3264 unicode_t eh;
3206 s = get_to_st (eh); 3265 char *s = get_to_st (eh);
3207 if (s) 3266 if (s)
3208 free (s); 3267 free (s);
3209 3268
3210 return; 3269 return;
3211} 3270}
… …
3215 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3274 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3216 */ 3275 */
3217void 3276void
3218rxvt_term::process_osc_seq () 3277rxvt_term::process_osc_seq ()
3219{ 3278{
3220 unicode_t ch, eh;
3221 int arg; 3279 int arg;
3222 3280
3223 ch = cmd_getc (); 3281 unicode_t ch = cmd_getc ();
3224 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3282 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3225 arg = arg * 10 + (ch - '0'); 3283 arg = arg * 10 + (ch - '0');
3226 3284
3227 if (ch == ';') 3285 if (ch == ';')
3228 { 3286 {
3287 unicode_t eh;
3229 char *s = get_to_st (eh); 3288 char *s = get_to_st (eh);
3230 3289
3231 if (s) 3290 if (s)
3232 { 3291 {
3233 process_xterm_seq (arg, s, eh); 3292 process_xterm_seq (arg, s, eh);
… …
3257 3316
3258/* 3317/*
3259 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3318 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3260 */ 3319 */
3261void 3320void
3262rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3321rxvt_term::process_xterm_seq (int op, char *str, char resp)
3263{ 3322{
3264 int color; 3323 int color;
3265 char *buf, *name; 3324 char *buf, *name;
3266 bool query = str[0] == '?' && !str[1]; 3325 bool query = str[0] == '?' && !str[1];
3267 int saveop = op; 3326 int saveop = op;
… …
3308 3367
3309 XFree (value); 3368 XFree (value);
3310 } 3369 }
3311 else 3370 else
3312 { 3371 {
3313 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3372 char *eq = strchr (str, '=');
3314 3373
3315 if (eq) 3374 if (eq)
3316 { 3375 {
3317 *eq = 0; 3376 *eq = 0;
3318 set_utf8_property (display->atom (str), eq + 1); 3377 set_utf8_property (display->atom (str), eq + 1);
… …
3358 process_color_seq (op, Color_pointer_fg, str, resp); 3417 process_color_seq (op, Color_pointer_fg, str, resp);
3359 break; 3418 break;
3360 case XTerm_Color_pointer_bg: 3419 case XTerm_Color_pointer_bg:
3361 process_color_seq (op, Color_pointer_bg, str, resp); 3420 process_color_seq (op, Color_pointer_bg, str, resp);
3362 break; 3421 break;
3422#ifdef OPTION_HC
3423 case XTerm_Color_HC:
3424 process_color_seq (op, Color_HC, str, resp);
3425 break;
3426 case XTerm_Color_HTC:
3427 process_color_seq (op, Color_HTC, str, resp);
3428 break;
3429#endif
3363#ifndef NO_BOLD_UNDERLINE_REVERSE 3430#ifndef NO_BOLD_UNDERLINE_REVERSE
3364 case XTerm_Color_RV:
3365 process_color_seq (op, Color_RV, str, resp);
3366 break;
3367 case Rxvt_Color_BD:
3368 case URxvt_Color_BD: 3431 case URxvt_Color_BD:
3369 process_color_seq (op, Color_BD, str, resp); 3432 process_color_seq (op, Color_BD, str, resp);
3370 break; 3433 break;
3371 case Rxvt_Color_UL:
3372 case URxvt_Color_UL: 3434 case URxvt_Color_UL:
3373 process_color_seq (op, Color_UL, str, resp); 3435 process_color_seq (op, Color_UL, str, resp);
3374 break; 3436 break;
3375 case URxvt_Color_IT: 3437 case URxvt_Color_IT:
3376 process_color_seq (op, Color_IT, str, resp); 3438 process_color_seq (op, Color_IT, str, resp);
3377 break; 3439 break;
3378#endif 3440#endif
3441 case URxvt_Color_border:
3442 process_color_seq (op, Color_border, str, resp);
3443 break;
3379#if ENABLE_TRANSPARENCY 3444#if ENABLE_TRANSPARENCY
3380 case URxvt_Color_tint: 3445 case URxvt_Color_tint:
3381 process_color_seq (op, Color_tint, str, resp); 3446 process_color_seq (op, Color_tint, str, resp);
3382 { 3447 {
3383 bool changed = false; 3448 bool changed = false;
3384 3449
3385 if (ISSET_PIXCOLOR (Color_tint)) 3450 if (ISSET_PIXCOLOR (Color_tint))
3386 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3451 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3387 else
3388 changed = bgPixmap.unset_tint ();
3389 3452
3390 if (changed) 3453 if (changed)
3391 update_background (); 3454 update_background ();
3392 } 3455 }
3393 3456
… …
3398 case Rxvt_Pixmap: 3461 case Rxvt_Pixmap:
3399 if (!strcmp (str, "?")) 3462 if (!strcmp (str, "?"))
3400 { 3463 {
3401 char str[256]; 3464 char str[256];
3402 3465
3403 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3466 sprintf (str, "[%dx%d+%d+%d]",
3404 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3467 min (h_scale, 32767), min (v_scale, 32767),
3405 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3468 min (h_align, 32767), min (v_align, 32767));
3406 process_xterm_seq (XTerm_title, str, CHAR_ST); 3469 process_xterm_seq (XTerm_title, str, CHAR_ST);
3407 } 3470 }
3408 else 3471 else
3409 { 3472 {
3410 int changed = 0; 3473 int changed = 0;
3411 3474
3412 if (*str != ';') 3475 if (*str != ';')
3413 { 3476 {
3414 /* reset to default scaling :*/
3415 bgPixmap.unset_geometry ();
3416 if (bgPixmap.set_file (str)) /* change pixmap */ 3477 if (bg_set_file (str)) /* change pixmap */
3478 {
3417 changed++; 3479 changed++;
3418 str = strchr (str, ';'); 3480 str = strchr (str, ';');
3419 if (str == NULL) 3481 if (str == NULL)
3420 bgPixmap.set_defaultGeometry (); 3482 bg_set_default_geometry ();
3483 else
3484 bg_set_geometry (str+1);
3485 }
3421 } 3486 }
3422 3487 else
3423 while (str)
3424 { 3488 {
3425 str++; 3489 str++;
3426 if (bgPixmap.set_geometry (str)) 3490 if (bg_set_geometry (str, true))
3427 changed++; 3491 changed++;
3428 str = strchr (str, ';');
3429 } 3492 }
3430 3493
3431 if (changed) 3494 if (changed)
3495 {
3496 if (bg_window_position_sensitive ())
3497 {
3498 int x, y;
3499 get_window_origin (x, y);
3500 bg_set_position (x, y);
3501 }
3432 update_background (); 3502 update_background ();
3503 }
3433 } 3504 }
3434 break; 3505 break;
3435#endif 3506#endif
3436 3507
3437 case XTerm_logfile: 3508 case XTerm_logfile:
… …
3507 break; 3578 break;
3508#endif 3579#endif
3509 3580
3510#if ENABLE_PERL 3581#if ENABLE_PERL
3511 case URxvt_perl: 3582 case URxvt_perl:
3512 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3583 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3513 ; // no responses yet
3514 break; 3584 break;
3515#endif 3585#endif
3516 } 3586 }
3517} 3587}
3518/*----------------------------------------------------------------------*/ 3588/*----------------------------------------------------------------------*/
… …
3541 { 3611 {
3542 if (mode == 'r') 3612 if (mode == 'r')
3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3613 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3544 else 3614 else
3545 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3615 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3616
3546 set_privmode (bit, state); 3617 set_privmode (bit, state);
3547 } 3618 }
3548 3619
3549 return state; 3620 return state;
3550} 3621}
… …
3559 static const struct 3630 static const struct
3560 { 3631 {
3561 const int argval; 3632 const int argval;
3562 const unsigned long bit; 3633 const unsigned long bit;
3563 } argtopriv[] = { 3634 } argtopriv[] = {
3564 { 1, PrivMode_aplCUR }, 3635 { 1, PrivMode_aplCUR }, // DECCKM
3565 { 2, PrivMode_vt52 }, 3636 { 2, PrivMode_vt52 },
3566 { 3, PrivMode_132 }, 3637 { 3, PrivMode_132 }, // DECCOLM
3567 { 4, PrivMode_smoothScroll }, 3638 { 4, PrivMode_smoothScroll }, // DECSCLM
3568 { 5, PrivMode_rVideo }, 3639 { 5, PrivMode_rVideo }, // DECSCNM
3569 { 6, PrivMode_relOrigin }, 3640 { 6, PrivMode_relOrigin }, // DECOM
3570 { 7, PrivMode_Autowrap }, 3641 { 7, PrivMode_Autowrap }, // DECAWM
3571 // 8, bi-directional support mode 3642 // 8, auto-repeat keys // DECARM
3572 { 9, PrivMode_MouseX10 }, 3643 { 9, PrivMode_MouseX10 },
3573 // 18, 19 printing-related 3644 // 18 end FF to printer after print screen
3645 // 19 Print screen prints full screen/scroll region
3574 { 25, PrivMode_VisibleCursor }, 3646 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3575#ifdef scrollBar_esc 3647#ifdef scrollBar_esc
3576 { scrollBar_esc, PrivMode_scrollBar }, 3648 { scrollBar_esc, PrivMode_scrollBar },
3577#endif 3649#endif
3578 { 35, PrivMode_ShiftKeys }, // rxvt extension 3650 { 35, PrivMode_ShiftKeys }, // rxvt extension
3651 // 38, tektronix mode // DECTEK
3579 { 40, PrivMode_132OK }, 3652 { 40, PrivMode_132OK },
3580 // 41 xterm more fixes NYI 3653 // 41 xterm more fixes NYI
3581 // 45 margin bell NYI 3654 // 45 margin bell NYI
3582 // 46 start logging 3655 // 46 start logging
3583 { 47, PrivMode_Screen }, 3656 { 47, PrivMode_Screen },
3584 { 66, PrivMode_aplKP }, 3657 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3585#ifndef NO_BACKSPACE_KEY 3658#ifndef NO_BACKSPACE_KEY
3586 { 67, PrivMode_BackSpace }, 3659 { 67, PrivMode_BackSpace }, // DECBKM
3587#endif 3660#endif
3588 { 1000, PrivMode_MouseX11 }, 3661 { 1000, PrivMode_MouseX11 },
3589 { 1002, PrivMode_MouseBtnEvent }, 3662 { 1002, PrivMode_MouseBtnEvent },
3590 { 1003, PrivMode_MouseAnyEvent }, 3663 { 1003, PrivMode_MouseAnyEvent },
3664#if ENABLE_FRILLS
3665 { 1005, PrivMode_ExtModeMouse },
3666#endif
3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3667 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3592 { 1011, PrivMode_Keypress }, // rxvt extension 3668 { 1011, PrivMode_Keypress }, // rxvt extension
3669#if ENABLE_FRILLS
3670 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3671#endif
3593 // 1035 enable modifiers for alt, numlock NYI 3672 // 1035 enable modifiers for alt, numlock NYI
3594 // 1036 send ESC for meta keys NYI 3673 // 1036 send ESC for meta keys NYI
3595 // 1037 send DEL for keypad delete NYI 3674 // 1037 send DEL for keypad delete NYI
3596 { 1047, PrivMode_Screen }, 3675 { 1047, PrivMode_Screen },
3597 // 1048 save and restore cursor 3676 // 1048 save and restore cursor, implemented in code
3598 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3677 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3599 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3678 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3600 { 2004, PrivMode_BracketPaste }, 3679 { 2004, PrivMode_BracketPaste },
3601 }; 3680 };
3602 3681
… …
3612 for (i = 0; i < nargs; i++) 3691 for (i = 0; i < nargs; i++)
3613 { 3692 {
3614 state = -1; 3693 state = -1;
3615 3694
3616 /* basic handling */ 3695 /* basic handling */
3617 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3696 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3618 if (argtopriv[j].argval == arg[i]) 3697 if (argtopriv[j].argval == arg[i])
3619 { 3698 {
3620 state = privcases (mode, argtopriv[j].bit); 3699 state = privcases (mode, argtopriv[j].bit);
3621 break; 3700 break;
3622 } 3701 }
… …
3630 3709
3631 scr_touch (true); 3710 scr_touch (true);
3632 break; 3711 break;
3633#endif 3712#endif
3634 case 1048: /* alternative cursor save */ 3713 case 1048: /* alternative cursor save */
3635 case 1049:
3636 if (option (Opt_secondaryScreen)) 3714 if (option (Opt_secondaryScreen))
3637 if (mode == 0) 3715 if (mode == 0)
3638 scr_cursor (RESTORE); 3716 scr_cursor (RESTORE);
3639 else if (mode == 1) 3717 else if (mode == 1)
3640 scr_cursor (SAVE); 3718 scr_cursor (SAVE);
… …
3653 */ 3731 */
3654 set_privmode (PrivMode_vt52, 1); 3732 set_privmode (PrivMode_vt52, 1);
3655 break; 3733 break;
3656 case 3: /* 80/132 */ 3734 case 3: /* 80/132 */
3657 if (priv_modes & PrivMode_132OK) 3735 if (priv_modes & PrivMode_132OK)
3658 {
3659 scr_poweron ();
3660 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3736 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3661 }
3662 break; 3737 break;
3663 case 4: /* smooth scrolling */ 3738 case 4: /* smooth scrolling */
3664 set_option (Opt_jumpScroll, !state); 3739 set_option (Opt_jumpScroll, !state);
3665 break; 3740 break;
3666 case 5: /* reverse video */ 3741 case 5: /* reverse video */
… …
3704 case 1003: 3779 case 1003:
3705 if (state) 3780 if (state)
3706 { 3781 {
3707 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3782 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3708 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3783 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3784 mouse_row = mouse_col = 0;
3709 vt_emask_mouse = PointerMotionMask; 3785 vt_emask_mouse = PointerMotionMask;
3710 } 3786 }
3711 else 3787 else
3712 vt_emask_mouse = NoEventMask; 3788 vt_emask_mouse = NoEventMask;
3789
3713 vt_select_input (); 3790 vt_select_input ();
3714 break; 3791 break;
3715 case 1010: /* scroll to bottom on TTY output inhibit */ 3792 case 1010: /* scroll to bottom on TTY output inhibit */
3716 set_option (Opt_scrollTtyOutput, !state); 3793 set_option (Opt_scrollTtyOutput, !state);
3717 break; 3794 break;
3718 case 1011: /* scroll to bottom on key press */ 3795 case 1011: /* scroll to bottom on key press */
3719 set_option (Opt_scrollTtyKeypress, state); 3796 set_option (Opt_scrollTtyKeypress, state);
3720 break; 3797 break;
3721 case 1047: /* secondary screen w/ clearing last */ 3798 case 1047: /* secondary screen w/ clearing last */
3722 if (option (Opt_secondaryScreen)) 3799 if (option (Opt_secondaryScreen))
3723 if (current_screen != PRIMARY) 3800 if (!state)
3724 scr_erase_screen (2); 3801 scr_erase_screen (2);
3802
3725 scr_change_screen (state); 3803 scr_change_screen (state);
3726 break; 3804 break;
3727 case 1049: /* secondary screen w/ clearing first */ 3805 case 1049: /* secondary screen w/ clearing first */
3806 if (option (Opt_secondaryScreen))
3807 if (state)
3808 scr_cursor (SAVE);
3809
3728 scr_change_screen (state); 3810 scr_change_screen (state);
3811
3729 if (option (Opt_secondaryScreen)) 3812 if (option (Opt_secondaryScreen))
3730 if (current_screen != PRIMARY) 3813 if (state)
3731 scr_erase_screen (2); 3814 scr_erase_screen (2);
3815 else
3816 scr_cursor (RESTORE);
3732 break; 3817 break;
3733 default: 3818 default:
3734 break; 3819 break;
3735 } 3820 }
3736 } 3821 }
… …
3889 } 3974 }
3890 } 3975 }
3891} 3976}
3892/*}}} */ 3977/*}}} */
3893 3978
3894/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3895void
3896rxvt_term::process_graphics ()
3897{
3898 unicode_t ch, cmd = cmd_getc ();
3899
3900 if (cmd == 'Q')
3901 {
3902 /* query graphics */
3903 tt_printf ("\033G0\012"); /* no graphics */
3904 return;
3905 }
3906 /* swallow other graphics sequences until terminating ':' */
3907 do
3908 ch = cmd_getc ();
3909 while (ch != ':');
3910}
3911/*}}} */
3912
3913/* ------------------------------------------------------------------------- */ 3979/* ------------------------------------------------------------------------- */
3914 3980
3915/* 3981/*
3916 * Send printf () formatted output to the command. 3982 * Send printf () formatted output to the command.
3917 * Only use for small amounts of data. 3983 * Only use for small amounts of data.
… …
3930 3996
3931/* ---------------------------------------------------------------------- */ 3997/* ---------------------------------------------------------------------- */
3932/* Write data to the pty as typed by the user, pasted with the mouse, 3998/* Write data to the pty as typed by the user, pasted with the mouse,
3933 * or generated by us in response to a query ESC sequence. 3999 * or generated by us in response to a query ESC sequence.
3934 */ 4000 */
3935const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4001static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3936 4002
3937void 4003void
3938rxvt_term::tt_write (const char *data, unsigned int len) 4004rxvt_term::tt_write (const char *data, unsigned int len)
3939{ 4005{
3940 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4006 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3945 4011
3946 if (v_buflen == 0) 4012 if (v_buflen == 0)
3947 { 4013 {
3948 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4014 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3949 4015
4016 max_it (written, 0);
4017
3950 if ((unsigned int)written == len) 4018 if (written == len)
3951 return; 4019 return;
3952 4020
3953 data += written; 4021 data += written;
3954 len -= written; 4022 len -= written;
3955 } 4023 }
3956 4024
3957 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4025 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3958 4026
3959 memcpy (v_buffer + v_buflen, data, len); 4027 memcpy (v_buffer + v_buflen, data, len);
3960 v_buflen += len; 4028 v_buflen += len;
3961 4029
3962 pty_ev.set (ev::READ | ev::WRITE); 4030 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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