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.426 by root, Wed Nov 5 13:49:36 2008 UTC vs.
Revision 1.484 by sf-exg, Fri Apr 29 10:10:20 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 }
… …
567 selection_request (ev.time); 569 selection_request (ev.time);
568 return; 570 return;
569#if TODO 571#if TODO
570 /* rxvt extras */ 572 /* rxvt extras */
571 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 573 case XK_KP_Add: /* Shift+KP_Add = bigger font */
572 change_font (FONT_UP);
573 return; 574 return;
574 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 575 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
575 change_font (FONT_DN);
576 return; 576 return;
577#endif 577#endif
578 } 578 }
579 } 579 }
580 } 580 }
581 581
582#if ENABLE_FRILLS || ISO_14755 582#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 583 // ISO 14755 support
584 if (shft && ctrl) 584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 585 {
586 int hv; 586 int hv;
587 587
588 if (iso14755buf & ISO_14755_51 588 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 589 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 619 scr_overlay_off ();
620# endif 620# endif
621 iso14755buf = 0; 621 iso14755buf = 0;
622 } 622 }
623 } 623 }
624 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 625 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 626 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 627 if (!(iso14755buf & ISO_14755_STARTED))
627 { 628 {
628 iso14755buf |= ISO_14755_STARTED; 629 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 630# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 631 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 { 646 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1; 648 unsigned int newlen = 1;
648 649
650 if (ev.state & ModNumLockMask)
651 kp = false;
652
649 switch (translate_keypad (keysym, kp)) 653 keysym = translate_keypad (keysym, kp);
654
655 switch (keysym)
650 { 656 {
651#ifndef NO_BACKSPACE_KEY 657#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace: 658 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace) 659 if (priv_modes & PrivMode_HaveBackSpace)
654 { 660 {
… …
881 commit_iso14755 (); 887 commit_iso14755 ();
882 888
883 return; 889 return;
884 } 890 }
885 891
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 892 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887 if (i[0] == keysym) 893 if (i[0] == keysym)
888 { 894 {
889 iso14755buf = ISO_14755_51 | i[1]; 895 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 (); 896 commit_iso14755 ();
891 897
… …
928 else if (keysym == XK_Control_L || keysym == XK_Control_R) 934 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0; 935 mouse_slip_wheel_speed = 0;
930#endif 936#endif
931} 937}
932 938
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 939void
967rxvt_term::flush () 940rxvt_term::flush ()
968{ 941{
969 flush_ev.stop (); 942 flush_ev.stop ();
970 943
971#ifdef HAVE_BG_PIXMAP 944#ifdef HAVE_BG_PIXMAP
972 if (bgPixmap.check_clearChanged ()) 945 if (bg_flags & BG_NEEDS_REFRESH)
973 { 946 {
974// scr_clear (true); This needs to be researched further! 947 bg_flags &= ~BG_NEEDS_REFRESH;
975 scr_touch (false); 948 scr_touch (false);
976 } 949 }
977#endif 950#endif
978 951
979 if (want_refresh) 952 if (want_refresh)
… …
1024 } 997 }
1025 998
1026 display->flush (); 999 display->flush ();
1027} 1000}
1028 1001
1029/* checks wether a refresh is requested and starts the refresh timer */ 1002/* checks whether a refresh is requested and starts the refresh timer */
1030void 1003void
1031rxvt_term::refresh_check () 1004rxvt_term::refresh_check ()
1032{ 1005{
1033 if (want_refresh && !flush_ev.is_active ()) 1006 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1007 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1128 // this should really be sched_yield(), but the linux guys thought 1101 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1102 // 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 1103 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1104 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only 1105 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool, 1106 // known workaround against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best. 1107 // we just nanosleep a bit and hope for the best.
1135 1108
1136 struct timespec ts = { 0, 1000 }; 1109 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0); 1110 nanosleep (&ts, 0);
1138 1111
… …
1144 { 1117 {
1145 } 1118 }
1146} event_handler; 1119} event_handler;
1147#endif 1120#endif
1148 1121
1122/* make sure all the cmd data is at beginning of cmdbuf */
1123void
1124rxvt_term::cmdbuf_reify ()
1125{
1126 if (cmdbuf_ptr == cmdbuf_base)
1127 return;
1128
1129 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1130
1131 memmove (cmdbuf_base, cmdbuf_ptr, used);
1132 cmdbuf_ptr = cmdbuf_base;
1133 cmdbuf_endp = cmdbuf_ptr + used;
1134
1135}
1136
1137#if defined (KEYSYM_RESOURCE)
1138void
1139rxvt_term::cmdbuf_append (const char *str, size_t count)
1140{
1141 cmdbuf_reify ();
1142
1143 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1144
1145 if (count > avail)
1146 return;
1147
1148 memcpy (cmdbuf_endp, str, count);
1149 cmdbuf_endp += count;
1150
1151 cmd_parse ();
1152}
1153#endif
1154
1149bool 1155bool
1150rxvt_term::pty_fill () 1156rxvt_term::pty_fill ()
1151{ 1157{
1152 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1158 cmdbuf_reify ();
1153 1159
1154 if (CBUFSIZ == n) 1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1155 { 1161
1156 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1162 if (!avail)
1157 n = 0;
1158 } 1163 {
1159 1164 // normally this indicates a "too long" command sequence - just drop the data we have
1160 memmove (cmdbuf_base, cmdbuf_ptr, n);
1161 cmdbuf_ptr = cmdbuf_base; 1165 cmdbuf_ptr = cmdbuf_base;
1162 cmdbuf_endp = cmdbuf_ptr + n; 1166 cmdbuf_endp = cmdbuf_ptr;
1167 avail = CBUFSIZ;
1168 }
1163 1169
1164 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1170 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1165 1171
1166 if (r > 0) 1172 if (r > 0)
1167 { 1173 {
1168 cmdbuf_endp += r; 1174 cmdbuf_endp += r;
1169 return true; 1175 return true;
… …
1243{ 1249{
1244 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1245 int x, y; 1251 int x, y;
1246 int code = 32; 1252 int code = 32;
1247 1253
1248 x = Pixel2Col (ev.x); 1254 x = Pixel2Col (ev.x) + 1;
1249 y = Pixel2Row (ev.y); 1255 y = Pixel2Row (ev.y) + 1;
1256
1250 if (ev.type == MotionNotify) 1257 if (ev.type == MotionNotify)
1251 { 1258 {
1252 if (x == mouse_row && y == mouse_col) 1259 if (x == mouse_row && y == mouse_col)
1253 return; 1260 return;
1261
1254 mouse_row = x; 1262 mouse_row = x;
1255 mouse_col = y; 1263 mouse_col = y;
1256 code += 32; 1264 code += 32;
1257 } 1265 }
1258 1266
… …
1261 else 1269 else
1262 { 1270 {
1263 button_number = MEvent.button - Button1; 1271 button_number = MEvent.button - Button1;
1264 /* add 0x3D for wheel events, like xterm does */ 1272 /* add 0x3D for wheel events, like xterm does */
1265 if (button_number >= 3) 1273 if (button_number >= 3)
1266 button_number += (64 - 3); 1274 button_number += 64 - 3;
1267 } 1275 }
1268 1276
1269 if (priv_modes & PrivMode_MouseX10) 1277 if (priv_modes & PrivMode_MouseX10)
1270 { 1278 {
1271 /* 1279 /*
… …
1303 fputc ('A', stderr); 1311 fputc ('A', stderr);
1304 if (key_state & 32) 1312 if (key_state & 32)
1305 fputc ('2', stderr); 1313 fputc ('2', stderr);
1306 fprintf (stderr, "]: <%d>, %d/%d\n", 1314 fprintf (stderr, "]: <%d>, %d/%d\n",
1307 button_number, 1315 button_number,
1308 x + 1, 1316 x,
1309 y + 1); 1317 y);
1310#endif 1318#endif
1311 1319
1320#if ENABLE_FRILLS
1321 if (priv_modes & PrivMode_ExtMouseRight)
1322 tt_printf ("\033[%d;%d;%dM",
1323 code + button_number + key_state,
1324 x,
1325 y);
1326 else if (priv_modes & PrivMode_ExtModeMouse)
1327 tt_printf ("\033[M%c%lc%lc",
1328 code + button_number + key_state,
1329 wint_t (32 + x),
1330 wint_t (32 + y));
1331 else
1332#endif
1312 tt_printf ("\033[M%c%c%c", 1333 tt_printf ("\033[M%c%c%c",
1313 (code + button_number + key_state), 1334 code + button_number + key_state,
1314 (32 + x + 1), 1335 32 + x,
1315 (32 + y + 1)); 1336 32 + y);
1316} 1337}
1317 1338
1318/*{{{ process an X event */ 1339/*{{{ process an X event */
1319void 1340void
1320rxvt_term::x_cb (XEvent &ev) 1341rxvt_term::x_cb (XEvent &ev)
… …
1422 && ev.xfocus.mode != NotifyGrab) 1443 && ev.xfocus.mode != NotifyGrab)
1423 focus_out (); 1444 focus_out ();
1424 break; 1445 break;
1425 1446
1426 case ConfigureNotify: 1447 case ConfigureNotify:
1427 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1428 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1429 szHint.width, szHint.height);*/
1430 if (ev.xconfigure.window == parent[0]) 1448 if (ev.xconfigure.window == parent)
1431 { 1449 {
1432 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1450 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1433 ; 1451 ;
1452
1453#ifdef HAVE_BG_PIXMAP
1454 bool moved = false;
1455 if (bg_window_position_sensitive ())
1456 {
1457 int x, y;
1458 if (ev.xconfigure.send_event)
1459 {
1460 x = ev.xconfigure.x;
1461 y = ev.xconfigure.y;
1462 }
1463 else
1464 get_window_origin (x, y);
1465
1466 if (bg_set_position (x, y)
1467 || !(bg_flags & BG_IS_VALID))
1468 moved = true;
1469 }
1470#endif
1434 1471
1435 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1472 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1436 { 1473 {
1437 seen_resize = 1; 1474 seen_resize = 1;
1438 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1475 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1439 } 1476 }
1440 else 1477 else
1441 { 1478 {
1442#ifdef HAVE_BG_PIXMAP 1479#ifdef HAVE_BG_PIXMAP
1443 if (bgPixmap.window_position_sensitive ()) 1480 if (moved)
1444 { 1481 {
1445 if (mapped) 1482 if (mapped)
1446 update_background (); 1483 update_background ();
1447 else 1484 else
1448 bgPixmap.invalidate (); 1485 bg_invalidate ();
1449 } 1486 }
1450#endif 1487#endif
1451 } 1488 }
1452 1489
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1490 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1491 }
1455 break; 1492 break;
1456 1493
1457 case PropertyNotify: 1494 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1495 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1460 && ev.xproperty.state == PropertyNewValue)
1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462
1463 break; 1496 break;
1464 1497
1465 case SelectionClear: 1498 case SelectionClear:
1466 selection_clear (); 1499 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break;
1468
1469 case SelectionNotify:
1470 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1472 break; 1500 break;
1473 1501
1474 case SelectionRequest: 1502 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1503 selection_send (ev.xselectionrequest);
1476 break; 1504 break;
1477 1505
1478 case MapNotify: 1506 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP 1507#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a 1508 /* This is needed specifically to fix the case of no window manager or a
1481 * non-reparenting window manager. In those cases we never get first 1509 * non-reparenting window manager. In those cases we never get first
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1510 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does 1511 * care of multiplicity of ConfigureNotify events arriving while WM does
1484 * reparenting. 1512 * reparenting.
1485 * We should not render background immidiately, as there could be several 1513 * We should not render background immediately, as there could be several
1486 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1514 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1487 * by scheduling background redraw as soon as we can, but giving a short 1515 * by scheduling background redraw as soon as we can, but giving a short
1488 * bit of time for ConfigureNotifies to arrive. 1516 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all 1517 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results. 1518 * of ConfigureNotifys for the best results.
1491 */ 1519 */
1492 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1520 if (!(bg_flags & BG_IS_VALID))
1493 update_background_ev.start (0.025); 1521 update_background_ev.start (0.025);
1494#endif 1522#endif
1495 mapped = 1; 1523 mapped = 1;
1496#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1497 text_blink_ev.start (); 1525 text_blink_ev.start ();
… …
1512 if (ev.xany.window == vt) 1540 if (ev.xany.window == vt)
1513 { 1541 {
1514 do 1542 do
1515 { 1543 {
1516 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1517 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, false);
1518 } 1546 }
1519 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1520 1548
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522 1550
1523 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1524 { 1552 {
1525 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1526 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, false);
1527 } 1555 }
1528 1556
1529 want_refresh = 1; 1557 want_refresh = 1;
1530 } 1558 }
1531 else 1559 else
… …
1684#endif 1712#endif
1685 1713
1686 refresh_check (); 1714 refresh_check ();
1687} 1715}
1688 1716
1717#if ENABLE_FRILLS
1689void 1718void
1690rxvt_term::set_urgency (bool enable) 1719rxvt_term::set_urgency (bool enable)
1691{ 1720{
1692 if (enable == urgency_hint) 1721 if (enable == urgency_hint)
1693 return; 1722 return;
1694 1723
1695 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1696 { 1725 {
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h); 1727 XSetWMHints (dpy, parent, h);
1699 urgency_hint = enable; 1728 urgency_hint = enable;
1700 } 1729 }
1701} 1730}
1731#endif
1702 1732
1703void 1733void
1704rxvt_term::focus_in () 1734rxvt_term::focus_in ()
1705{ 1735{
1706 if (!focus) 1736 if (!focus)
… …
1810 * use the property to determine the pixmap. We use it later on. 1840 * use the property to determine the pixmap. We use it later on.
1811 */ 1841 */
1812 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1842 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1813 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1843 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1814 { 1844 {
1815 bgPixmap.set_root_pixmap (); 1845 bg_set_root_pixmap ();
1816 update_background (); 1846 update_background ();
1817 } 1847 }
1818 1848
1819 break; 1849 break;
1820 } 1850 }
… …
1859 /* save the xbutton state (for ButtonRelease) */ 1889 /* save the xbutton state (for ButtonRelease) */
1860 MEvent.state = ev.state; 1890 MEvent.state = ev.state;
1861#ifdef MOUSE_REPORT_DOUBLECLICK 1891#ifdef MOUSE_REPORT_DOUBLECLICK
1862 if (ev.button == MEvent.button && clickintime) 1892 if (ev.button == MEvent.button && clickintime)
1863 { 1893 {
1864 /* same button, within alloted time */ 1894 /* same button, within allowed time */
1865 MEvent.clicks++; 1895 MEvent.clicks++;
1866 1896
1867 if (MEvent.clicks > 1) 1897 if (MEvent.clicks > 1)
1868 { 1898 {
1869 /* only report double clicks */ 1899 /* only report double clicks */
… …
2140 selection_make (ev.time); 2170 selection_make (ev.time);
2141 break; 2171 break;
2142 2172
2143 case Button2: 2173 case Button2:
2144 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2174 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2145 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2175 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2146 break; 2176 break;
2147 2177
2148#ifdef MOUSE_WHEEL 2178#ifdef MOUSE_WHEEL
2149 case Button4: 2179 case Button4:
2150 case Button5: 2180 case Button5:
… …
2334 break; 2364 break;
2335 } 2365 }
2336 2366
2337 if (len == (size_t)-1) 2367 if (len == (size_t)-1)
2338 { 2368 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2369 mbstate.reset (); // reset now undefined conversion state
2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2370 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 } 2371 }
2342 2372
2343 // assume wchar == unicode 2373 // assume wchar == unicode
2344 cmdbuf_ptr += len; 2374 cmdbuf_ptr += len;
… …
2357 : NOCHAR; 2387 : NOCHAR;
2358} 2388}
2359 2389
2360static class out_of_input out_of_input; 2390static class out_of_input out_of_input;
2361 2391
2362/* rxvt_cmd_getc () - Return next input character */
2363/*
2364 * Return the next input character after first passing any keyboard input
2365 * to the command.
2366 */
2367wchar_t 2392wchar_t
2368rxvt_term::cmd_getc () THROW ((class out_of_input)) 2393rxvt_term::cmd_getc () THROW ((class out_of_input))
2369{ 2394{
2370 wchar_t c = next_char (); 2395 wchar_t c = next_char ();
2371 2396
… …
2653 2678
2654 /* 8.3.87: NEXT LINE */ 2679 /* 8.3.87: NEXT LINE */
2655 case C1_NEL: /* ESC E */ 2680 case C1_NEL: /* ESC E */
2656 { 2681 {
2657 wchar_t nlcr[] = { C0_LF, C0_CR }; 2682 wchar_t nlcr[] = { C0_LF, C0_CR };
2658 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2683 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2659 } 2684 }
2660 break; 2685 break;
2661 2686
2662 /* kidnapped escape sequence: Should be 8.3.48 */ 2687 /* kidnapped escape sequence: Should be 8.3.48 */
2663 case C1_ESA: /* ESC G */ 2688 case C1_ESA: /* ESC G */
2664 process_graphics (); 2689 // used by original rxvt for rob nations own graphics mode
2690 if (cmd_getc () == 'Q')
2691 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2665 break; 2692 break;
2666 2693
2667 /* 8.3.63: CHARACTER TABULATION SET */ 2694 /* 8.3.63: CHARACTER TABULATION SET */
2668 case C1_HTS: /* ESC H */ 2695 case C1_HTS: /* ESC H */
2669 scr_set_tab (1); 2696 scr_set_tab (1);
… …
2732 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2759 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2733 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2760 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2734 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2761 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2735}; 2762};
2736 2763
2737#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2764#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2738 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2739 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2740#define get_byte_array_bit(array, bit) \ 2767#define get_byte_array_bit(array, bit) \
2741 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2768 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2742 2769
2743const unsigned char csi_defaults[] = 2770static const unsigned char csi_defaults[] =
2744 { 2771 {
2745 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2772 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2746 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2773 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2747 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2774 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2748 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2775 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2837 { 2864 {
2838 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2865 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2839 scr_soft_reset (); 2866 scr_soft_reset ();
2840 2867
2841 static const int pm_h[] = { 7, 25 }; 2868 static const int pm_h[] = { 7, 25 };
2842 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2869 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2843 2870
2844 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2871 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2845 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2872 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2846 } 2873 }
2847 break; 2874 break;
2848 } 2875 }
2849 2876
2850 return; 2877 return;
… …
3088 { 3115 {
3089 /* 3116 /*
3090 * commands 3117 * commands
3091 */ 3118 */
3092 case 1: /* deiconify window */ 3119 case 1: /* deiconify window */
3093 XMapWindow (dpy, parent[0]); 3120 XMapWindow (dpy, parent);
3094 break; 3121 break;
3095 case 2: /* iconify window */ 3122 case 2: /* iconify window */
3096 XIconifyWindow (dpy, parent[0], display->screen); 3123 XIconifyWindow (dpy, parent, display->screen);
3097 break; 3124 break;
3098 case 3: /* set position (pixels) */ 3125 case 3: /* set position (pixels) */
3099 XMoveWindow (dpy, parent[0], args[1], args[2]); 3126 XMoveWindow (dpy, parent, args[1], args[2]);
3100 break; 3127 break;
3101 case 4: /* set size (pixels) */ 3128 case 4: /* set size (pixels) */
3102 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3129 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3103 break; 3130 break;
3104 case 5: /* raise window */ 3131 case 5: /* raise window */
3105 XRaiseWindow (dpy, parent[0]); 3132 XRaiseWindow (dpy, parent);
3106 break; 3133 break;
3107 case 6: /* lower window */ 3134 case 6: /* lower window */
3108 XLowerWindow (dpy, parent[0]); 3135 XLowerWindow (dpy, parent);
3109 break; 3136 break;
3110 case 7: /* refresh window */ 3137 case 7: /* refresh window */
3111 scr_touch (true); 3138 scr_touch (true);
3112 break; 3139 break;
3113 case 8: /* set size (chars) */ 3140 case 8: /* set size (chars) */
… …
3124 3151
3125 /* 3152 /*
3126 * reports - some output format copied from XTerm 3153 * reports - some output format copied from XTerm
3127 */ 3154 */
3128 case 11: /* report window state */ 3155 case 11: /* report window state */
3129 XGetWindowAttributes (dpy, parent[0], &wattr); 3156 XGetWindowAttributes (dpy, parent, &wattr);
3130 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3157 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3131 break; 3158 break;
3132 case 13: /* report window position */ 3159 case 13: /* report window position */
3133 XGetWindowAttributes (dpy, parent[0], &wattr); 3160 XGetWindowAttributes (dpy, parent, &wattr);
3134 XTranslateCoordinates (dpy, parent[0], wattr.root, 3161 XTranslateCoordinates (dpy, parent, wattr.root,
3135 -wattr.border_width, -wattr.border_width, 3162 -wattr.border_width, -wattr.border_width,
3136 &x, &y, &wdummy); 3163 &x, &y, &wdummy);
3137 tt_printf ("\033[3;%d;%dt", x, y); 3164 tt_printf ("\033[3;%d;%dt", x, y);
3138 break; 3165 break;
3139 case 14: /* report window size (pixels) */ 3166 case 14: /* report window size (pixels) */
3140 XGetWindowAttributes (dpy, parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent, &wattr);
3141 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3168 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3142 break; 3169 break;
3143 case 18: /* report text area size (chars) */ 3170 case 18: /* report text area size (chars) */
3144 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3171 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3145 break; 3172 break;
… …
3147 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3174 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3148 break; 3175 break;
3149 case 20: /* report icon label */ 3176 case 20: /* report icon label */
3150 { 3177 {
3151 char *s; 3178 char *s;
3152 XGetIconName (dpy, parent[0], &s); 3179 XGetIconName (dpy, parent, &s);
3153 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3180 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3154 XFree (s); 3181 XFree (s);
3155 } 3182 }
3156 break; 3183 break;
3157 case 21: /* report window title */ 3184 case 21: /* report window title */
3158 { 3185 {
3159 char *s; 3186 char *s;
3160 XFetchName (dpy, parent[0], &s); 3187 XFetchName (dpy, parent, &s);
3161 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3188 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3162 XFree (s); 3189 XFree (s);
3163 } 3190 }
3164 break; 3191 break;
3165 } 3192 }
… …
3221 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3248 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3222 */ 3249 */
3223void 3250void
3224rxvt_term::process_dcs_seq () 3251rxvt_term::process_dcs_seq ()
3225{ 3252{
3226 char *s;
3227 unicode_t eh;
3228
3229 /* 3253 /*
3230 * Not handled yet 3254 * Not handled yet
3231 */ 3255 */
3256
3257 unicode_t eh;
3232 s = get_to_st (eh); 3258 char *s = get_to_st (eh);
3233 if (s) 3259 if (s)
3234 free (s); 3260 free (s);
3235 3261
3236 return; 3262 return;
3237} 3263}
… …
3241 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3267 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3242 */ 3268 */
3243void 3269void
3244rxvt_term::process_osc_seq () 3270rxvt_term::process_osc_seq ()
3245{ 3271{
3246 unicode_t ch, eh;
3247 int arg; 3272 int arg;
3248 3273
3249 ch = cmd_getc (); 3274 unicode_t ch = cmd_getc ();
3250 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3275 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3251 arg = arg * 10 + (ch - '0'); 3276 arg = arg * 10 + (ch - '0');
3252 3277
3253 if (ch == ';') 3278 if (ch == ';')
3254 { 3279 {
3280 unicode_t eh;
3255 char *s = get_to_st (eh); 3281 char *s = get_to_st (eh);
3256 3282
3257 if (s) 3283 if (s)
3258 { 3284 {
3259 process_xterm_seq (arg, s, eh); 3285 process_xterm_seq (arg, s, eh);
… …
3283 3309
3284/* 3310/*
3285 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3286 */ 3312 */
3287void 3313void
3288rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3314rxvt_term::process_xterm_seq (int op, char *str, char resp)
3289{ 3315{
3290 int color; 3316 int color;
3291 char *buf, *name; 3317 char *buf, *name;
3292 bool query = str[0] == '?' && !str[1]; 3318 bool query = str[0] == '?' && !str[1];
3293 int saveop = op; 3319 int saveop = op;
… …
3320 unsigned long bytes_after; 3346 unsigned long bytes_after;
3321 unsigned char *value = 0; 3347 unsigned char *value = 0;
3322 const char *str = ""; 3348 const char *str = "";
3323 3349
3324 if (prop 3350 if (prop
3325 && XGetWindowProperty (dpy, parent[0], 3351 && XGetWindowProperty (dpy, parent,
3326 prop, 0, 1<<16, 0, AnyPropertyType, 3352 prop, 0, 1<<16, 0, AnyPropertyType,
3327 &actual_type, &actual_format, 3353 &actual_type, &actual_format,
3328 &nitems, &bytes_after, &value) == Success 3354 &nitems, &bytes_after, &value) == Success
3329 && actual_type != None 3355 && actual_type != None
3330 && actual_format == 8) 3356 && actual_format == 8)
… …
3334 3360
3335 XFree (value); 3361 XFree (value);
3336 } 3362 }
3337 else 3363 else
3338 { 3364 {
3339 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3365 char *eq = strchr (str, '=');
3340 3366
3341 if (eq) 3367 if (eq)
3342 { 3368 {
3343 *eq = 0; 3369 *eq = 0;
3344 set_utf8_property (display->atom (str), eq + 1); 3370 set_utf8_property (display->atom (str), eq + 1);
3345 } 3371 }
3346 else 3372 else
3347 XDeleteProperty (dpy, parent[0], 3373 XDeleteProperty (dpy, parent,
3348 display->atom (str)); 3374 display->atom (str));
3349 } 3375 }
3350 break; 3376 break;
3351 3377
3352 case XTerm_Color: 3378 case XTerm_Color:
… …
3384 process_color_seq (op, Color_pointer_fg, str, resp); 3410 process_color_seq (op, Color_pointer_fg, str, resp);
3385 break; 3411 break;
3386 case XTerm_Color_pointer_bg: 3412 case XTerm_Color_pointer_bg:
3387 process_color_seq (op, Color_pointer_bg, str, resp); 3413 process_color_seq (op, Color_pointer_bg, str, resp);
3388 break; 3414 break;
3415#ifdef OPTION_HC
3416 case XTerm_Color_HC:
3417 process_color_seq (op, Color_HC, str, resp);
3418 break;
3419 case XTerm_Color_HTC:
3420 process_color_seq (op, Color_HTC, str, resp);
3421 break;
3422#endif
3389#ifndef NO_BOLD_UNDERLINE_REVERSE 3423#ifndef NO_BOLD_UNDERLINE_REVERSE
3390 case XTerm_Color_RV:
3391 process_color_seq (op, Color_RV, str, resp);
3392 break;
3393 case Rxvt_Color_BD:
3394 case URxvt_Color_BD: 3424 case URxvt_Color_BD:
3395 process_color_seq (op, Color_BD, str, resp); 3425 process_color_seq (op, Color_BD, str, resp);
3396 break; 3426 break;
3397 case Rxvt_Color_UL:
3398 case URxvt_Color_UL: 3427 case URxvt_Color_UL:
3399 process_color_seq (op, Color_UL, str, resp); 3428 process_color_seq (op, Color_UL, str, resp);
3400 break; 3429 break;
3401 case URxvt_Color_IT: 3430 case URxvt_Color_IT:
3402 process_color_seq (op, Color_IT, str, resp); 3431 process_color_seq (op, Color_IT, str, resp);
3403 break; 3432 break;
3404#endif 3433#endif
3434 case URxvt_Color_border:
3435 process_color_seq (op, Color_border, str, resp);
3436 break;
3405#if ENABLE_TRANSPARENCY 3437#if ENABLE_TRANSPARENCY
3406 case URxvt_Color_tint: 3438 case URxvt_Color_tint:
3407 process_color_seq (op, Color_tint, str, resp); 3439 process_color_seq (op, Color_tint, str, resp);
3408 { 3440 {
3409 bool changed = false; 3441 bool changed = false;
3410 3442
3411 if (ISSET_PIXCOLOR (Color_tint)) 3443 if (ISSET_PIXCOLOR (Color_tint))
3412 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3444 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3413 else
3414 changed = bgPixmap.unset_tint ();
3415 3445
3416 if (changed) 3446 if (changed)
3417 update_background (); 3447 update_background ();
3418 } 3448 }
3419 3449
… …
3424 case Rxvt_Pixmap: 3454 case Rxvt_Pixmap:
3425 if (!strcmp (str, "?")) 3455 if (!strcmp (str, "?"))
3426 { 3456 {
3427 char str[256]; 3457 char str[256];
3428 3458
3429 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3459 sprintf (str, "[%dx%d+%d+%d]",
3430 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3460 min (h_scale, 32767), min (v_scale, 32767),
3431 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3461 min (h_align, 32767), min (v_align, 32767));
3432 process_xterm_seq (XTerm_title, str, CHAR_ST); 3462 process_xterm_seq (XTerm_title, str, CHAR_ST);
3433 } 3463 }
3434 else 3464 else
3435 { 3465 {
3436 int changed = 0; 3466 int changed = 0;
3437 3467
3438 if (*str != ';') 3468 if (*str != ';')
3439 { 3469 {
3440 /* reset to default scaling :*/
3441 bgPixmap.unset_geometry ();
3442 if (bgPixmap.set_file (str)) /* change pixmap */ 3470 if (bg_set_file (str)) /* change pixmap */
3471 {
3443 changed++; 3472 changed++;
3444 str = strchr (str, ';'); 3473 str = strchr (str, ';');
3445 if (str == NULL) 3474 if (str == NULL)
3446 bgPixmap.set_defaultGeometry (); 3475 bg_set_default_geometry ();
3476 else
3477 bg_set_geometry (str+1);
3478 }
3447 } 3479 }
3448 3480 else
3449 while (str)
3450 { 3481 {
3451 str++; 3482 str++;
3452 if (bgPixmap.set_geometry (str)) 3483 if (bg_set_geometry (str, true))
3453 changed++; 3484 changed++;
3454 str = strchr (str, ';');
3455 } 3485 }
3456 3486
3457 if (changed) 3487 if (changed)
3488 {
3489 if (bg_window_position_sensitive ())
3490 {
3491 int x, y;
3492 get_window_origin (x, y);
3493 bg_set_position (x, y);
3494 }
3458 update_background (); 3495 update_background ();
3496 }
3459 } 3497 }
3460 break; 3498 break;
3461#endif 3499#endif
3462 3500
3463 case XTerm_logfile: 3501 case XTerm_logfile:
… …
3566 { 3604 {
3567 if (mode == 'r') 3605 if (mode == 'r')
3568 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3606 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3569 else 3607 else
3570 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3608 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3609
3571 set_privmode (bit, state); 3610 set_privmode (bit, state);
3572 } 3611 }
3573 3612
3574 return state; 3613 return state;
3575} 3614}
… …
3594 { 6, PrivMode_relOrigin }, // DECOM 3633 { 6, PrivMode_relOrigin }, // DECOM
3595 { 7, PrivMode_Autowrap }, // DECAWM 3634 { 7, PrivMode_Autowrap }, // DECAWM
3596 // 8, auto-repeat keys // DECARM 3635 // 8, auto-repeat keys // DECARM
3597 { 9, PrivMode_MouseX10 }, 3636 { 9, PrivMode_MouseX10 },
3598 // 18 end FF to printer after print screen 3637 // 18 end FF to printer after print screen
3599 // 19 Print screen prints full screen/scorll region 3638 // 19 Print screen prints full screen/scroll region
3600 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3639 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3601#ifdef scrollBar_esc 3640#ifdef scrollBar_esc
3602 { scrollBar_esc, PrivMode_scrollBar }, 3641 { scrollBar_esc, PrivMode_scrollBar },
3603#endif 3642#endif
3604 { 35, PrivMode_ShiftKeys }, // rxvt extension 3643 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3613 { 67, PrivMode_BackSpace }, // DECBKM 3652 { 67, PrivMode_BackSpace }, // DECBKM
3614#endif 3653#endif
3615 { 1000, PrivMode_MouseX11 }, 3654 { 1000, PrivMode_MouseX11 },
3616 { 1002, PrivMode_MouseBtnEvent }, 3655 { 1002, PrivMode_MouseBtnEvent },
3617 { 1003, PrivMode_MouseAnyEvent }, 3656 { 1003, PrivMode_MouseAnyEvent },
3657#if ENABLE_FRILLS
3658 { 1005, PrivMode_ExtModeMouse },
3659#endif
3618 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3660 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3619 { 1011, PrivMode_Keypress }, // rxvt extension 3661 { 1011, PrivMode_Keypress }, // rxvt extension
3662#if ENABLE_FRILLS
3663 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3664#endif
3620 // 1035 enable modifiers for alt, numlock NYI 3665 // 1035 enable modifiers for alt, numlock NYI
3621 // 1036 send ESC for meta keys NYI 3666 // 1036 send ESC for meta keys NYI
3622 // 1037 send DEL for keypad delete NYI 3667 // 1037 send DEL for keypad delete NYI
3623 { 1047, PrivMode_Screen }, 3668 { 1047, PrivMode_Screen },
3624 // 1048 save and restore cursor 3669 // 1048 save and restore cursor, implemented in code
3625 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3670 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3626 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3671 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3627 { 2004, PrivMode_BracketPaste }, 3672 { 2004, PrivMode_BracketPaste },
3628 }; 3673 };
3629 3674
… …
3639 for (i = 0; i < nargs; i++) 3684 for (i = 0; i < nargs; i++)
3640 { 3685 {
3641 state = -1; 3686 state = -1;
3642 3687
3643 /* basic handling */ 3688 /* basic handling */
3644 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3689 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3645 if (argtopriv[j].argval == arg[i]) 3690 if (argtopriv[j].argval == arg[i])
3646 { 3691 {
3647 state = privcases (mode, argtopriv[j].bit); 3692 state = privcases (mode, argtopriv[j].bit);
3648 break; 3693 break;
3649 } 3694 }
… …
3657 3702
3658 scr_touch (true); 3703 scr_touch (true);
3659 break; 3704 break;
3660#endif 3705#endif
3661 case 1048: /* alternative cursor save */ 3706 case 1048: /* alternative cursor save */
3662 case 1049:
3663 if (option (Opt_secondaryScreen)) 3707 if (option (Opt_secondaryScreen))
3664 if (mode == 0) 3708 if (mode == 0)
3665 scr_cursor (RESTORE); 3709 scr_cursor (RESTORE);
3666 else if (mode == 1) 3710 else if (mode == 1)
3667 scr_cursor (SAVE); 3711 scr_cursor (SAVE);
… …
3728 case 1003: 3772 case 1003:
3729 if (state) 3773 if (state)
3730 { 3774 {
3731 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3775 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3732 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3776 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3777 mouse_row = mouse_col = 0;
3733 vt_emask_mouse = PointerMotionMask; 3778 vt_emask_mouse = PointerMotionMask;
3734 } 3779 }
3735 else 3780 else
3736 vt_emask_mouse = NoEventMask; 3781 vt_emask_mouse = NoEventMask;
3737 3782
… …
3743 case 1011: /* scroll to bottom on key press */ 3788 case 1011: /* scroll to bottom on key press */
3744 set_option (Opt_scrollTtyKeypress, state); 3789 set_option (Opt_scrollTtyKeypress, state);
3745 break; 3790 break;
3746 case 1047: /* secondary screen w/ clearing last */ 3791 case 1047: /* secondary screen w/ clearing last */
3747 if (option (Opt_secondaryScreen)) 3792 if (option (Opt_secondaryScreen))
3748 if (current_screen != PRIMARY) 3793 if (!state)
3749 scr_erase_screen (2); 3794 scr_erase_screen (2);
3750 3795
3751 scr_change_screen (state); 3796 scr_change_screen (state);
3752 break; 3797 break;
3753 case 1049: /* secondary screen w/ clearing first */ 3798 case 1049: /* secondary screen w/ clearing first */
3799 if (option (Opt_secondaryScreen))
3800 if (state)
3801 scr_cursor (SAVE);
3802
3754 scr_change_screen (state); 3803 scr_change_screen (state);
3804
3755 if (option (Opt_secondaryScreen)) 3805 if (option (Opt_secondaryScreen))
3756 if (current_screen != PRIMARY) 3806 if (state)
3757 scr_erase_screen (2); 3807 scr_erase_screen (2);
3808 else
3809 scr_cursor (RESTORE);
3758 break; 3810 break;
3759 default: 3811 default:
3760 break; 3812 break;
3761 } 3813 }
3762 } 3814 }
… …
3915 } 3967 }
3916 } 3968 }
3917} 3969}
3918/*}}} */ 3970/*}}} */
3919 3971
3920/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3921void
3922rxvt_term::process_graphics ()
3923{
3924 unicode_t ch, cmd = cmd_getc ();
3925
3926 if (cmd == 'Q')
3927 {
3928 /* query graphics */
3929 tt_printf ("\033G0\012"); /* no graphics */
3930 return;
3931 }
3932 /* swallow other graphics sequences until terminating ':' */
3933 do
3934 ch = cmd_getc ();
3935 while (ch != ':');
3936}
3937/*}}} */
3938
3939/* ------------------------------------------------------------------------- */ 3972/* ------------------------------------------------------------------------- */
3940 3973
3941/* 3974/*
3942 * Send printf () formatted output to the command. 3975 * Send printf () formatted output to the command.
3943 * Only use for small amounts of data. 3976 * Only use for small amounts of data.
… …
3956 3989
3957/* ---------------------------------------------------------------------- */ 3990/* ---------------------------------------------------------------------- */
3958/* Write data to the pty as typed by the user, pasted with the mouse, 3991/* Write data to the pty as typed by the user, pasted with the mouse,
3959 * or generated by us in response to a query ESC sequence. 3992 * or generated by us in response to a query ESC sequence.
3960 */ 3993 */
3961const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3994static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3962 3995
3963void 3996void
3964rxvt_term::tt_write (const char *data, unsigned int len) 3997rxvt_term::tt_write (const char *data, unsigned int len)
3965{ 3998{
3966 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3999 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3971 4004
3972 if (v_buflen == 0) 4005 if (v_buflen == 0)
3973 { 4006 {
3974 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4007 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3975 4008
4009 max_it (written, 0);
4010
3976 if ((unsigned int)written == len) 4011 if (written == len)
3977 return; 4012 return;
3978 4013
3979 data += written; 4014 data += written;
3980 len -= written; 4015 len -= written;
3981 } 4016 }
3982 4017
3983 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4018 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3984 4019
3985 memcpy (v_buffer + v_buflen, data, len); 4020 memcpy (v_buffer + v_buflen, data, len);
3986 v_buflen += len; 4021 v_buflen += len;
3987 4022
3988 pty_ev.set (ev::READ | ev::WRITE); 4023 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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