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.428 by root, Wed Nov 5 16:17:23 2008 UTC vs.
Revision 1.483 by sf-exg, Tue Apr 26 16:19:45 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
… …
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.
1132 // since the linux guys additionally thought that breaking the only 1107 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool, 1108 // known workaround against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best. 1109 // we just nanosleep a bit and hope for the best.
1135 1110
1136 struct timespec ts = { 0, 1000 }; 1111 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0); 1112 nanosleep (&ts, 0);
1138 1113
… …
1144 { 1119 {
1145 } 1120 }
1146} event_handler; 1121} event_handler;
1147#endif 1122#endif
1148 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
1149bool 1157bool
1150rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1151{ 1159{
1152 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 cmdbuf_reify ();
1153 1161
1154 if (CBUFSIZ == n) 1162 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1155 { 1163
1156 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1164 if (!avail)
1157 n = 0;
1158 } 1165 {
1159 1166 // 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; 1167 cmdbuf_ptr = cmdbuf_base;
1162 cmdbuf_endp = cmdbuf_ptr + n; 1168 cmdbuf_endp = cmdbuf_ptr;
1169 avail = CBUFSIZ;
1170 }
1163 1171
1164 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1172 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1165 1173
1166 if (r > 0) 1174 if (r > 0)
1167 { 1175 {
1168 cmdbuf_endp += r; 1176 cmdbuf_endp += r;
1169 return true; 1177 return true;
… …
1243{ 1251{
1244 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1245 int x, y; 1253 int x, y;
1246 int code = 32; 1254 int code = 32;
1247 1255
1248 x = Pixel2Col (ev.x); 1256 x = Pixel2Col (ev.x) + 1;
1249 y = Pixel2Row (ev.y); 1257 y = Pixel2Row (ev.y) + 1;
1258
1250 if (ev.type == MotionNotify) 1259 if (ev.type == MotionNotify)
1251 { 1260 {
1252 if (x == mouse_row && y == mouse_col) 1261 if (x == mouse_row && y == mouse_col)
1253 return; 1262 return;
1263
1254 mouse_row = x; 1264 mouse_row = x;
1255 mouse_col = y; 1265 mouse_col = y;
1256 code += 32; 1266 code += 32;
1257 } 1267 }
1258 1268
… …
1261 else 1271 else
1262 { 1272 {
1263 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1264 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1265 if (button_number >= 3) 1275 if (button_number >= 3)
1266 button_number += (64 - 3); 1276 button_number += 64 - 3;
1267 } 1277 }
1268 1278
1269 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1270 { 1280 {
1271 /* 1281 /*
… …
1303 fputc ('A', stderr); 1313 fputc ('A', stderr);
1304 if (key_state & 32) 1314 if (key_state & 32)
1305 fputc ('2', stderr); 1315 fputc ('2', stderr);
1306 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1307 button_number, 1317 button_number,
1308 x + 1, 1318 x,
1309 y + 1); 1319 y);
1310#endif 1320#endif
1311 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
1312 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1313 (code + button_number + key_state), 1336 code + button_number + key_state,
1314 (32 + x + 1), 1337 32 + x,
1315 (32 + y + 1)); 1338 32 + y);
1316} 1339}
1317 1340
1318/*{{{ process an X event */ 1341/*{{{ process an X event */
1319void 1342void
1320rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
… …
1422 && ev.xfocus.mode != NotifyGrab) 1445 && ev.xfocus.mode != NotifyGrab)
1423 focus_out (); 1446 focus_out ();
1424 break; 1447 break;
1425 1448
1426 case ConfigureNotify: 1449 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]) 1450 if (ev.xconfigure.window == parent)
1431 { 1451 {
1432 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1433 ; 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
1434 1473
1435 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1436 { 1475 {
1437 seen_resize = 1; 1476 seen_resize = 1;
1438 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1439 } 1478 }
1440 else 1479 else
1441 { 1480 {
1442#ifdef HAVE_BG_PIXMAP 1481#ifdef HAVE_BG_PIXMAP
1443 if (bgPixmap.window_position_sensitive ()) 1482 if (moved)
1444 { 1483 {
1445 if (mapped) 1484 if (mapped)
1446 update_background (); 1485 update_background ();
1447 else 1486 else
1448 bgPixmap.invalidate (); 1487 bg_invalidate ();
1449 } 1488 }
1450#endif 1489#endif
1451 } 1490 }
1452 1491
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1493 }
1455 break; 1494 break;
1456 1495
1457 case PropertyNotify: 1496 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 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; 1498 break;
1464 1499
1465 case SelectionClear: 1500 case SelectionClear:
1466 selection_clear (); 1501 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; 1502 break;
1473 1503
1474 case SelectionRequest: 1504 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1505 selection_send (ev.xselectionrequest);
1476 break; 1506 break;
1477 1507
1478 case MapNotify: 1508 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP 1509#ifdef HAVE_BG_PIXMAP
1480 /* 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
1481 * non-reparenting window manager. In those cases we never get first 1511 * non-reparenting window manager. In those cases we never get first
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1512 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does 1513 * care of multiplicity of ConfigureNotify events arriving while WM does
1484 * reparenting. 1514 * reparenting.
1485 * We should not render background immidiately, as there could be several 1515 * 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 1516 * 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 1517 * by scheduling background redraw as soon as we can, but giving a short
1488 * bit of time for ConfigureNotifies to arrive. 1518 * bit of time for ConfigureNotifies to arrive.
1489 * 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
1490 * of ConfigureNotifys for the best results. 1520 * of ConfigureNotifys for the best results.
1491 */ 1521 */
1492 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1522 if (!(bg_flags & BG_IS_VALID))
1493 update_background_ev.start (0.025); 1523 update_background_ev.start (0.025);
1494#endif 1524#endif
1495 mapped = 1; 1525 mapped = 1;
1496#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1497 text_blink_ev.start (); 1527 text_blink_ev.start ();
… …
1512 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1513 { 1543 {
1514 do 1544 do
1515 { 1545 {
1516 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1517 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1518 } 1548 }
1519 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1520 1550
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522 1552
1523 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1524 { 1554 {
1525 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1526 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1527 } 1557 }
1528 1558
1529 want_refresh = 1; 1559 want_refresh = 1;
1530 } 1560 }
1531 else 1561 else
… …
1684#endif 1714#endif
1685 1715
1686 refresh_check (); 1716 refresh_check ();
1687} 1717}
1688 1718
1719#if ENABLE_FRILLS
1689void 1720void
1690rxvt_term::set_urgency (bool enable) 1721rxvt_term::set_urgency (bool enable)
1691{ 1722{
1692 if (enable == urgency_hint) 1723 if (enable == urgency_hint)
1693 return; 1724 return;
1694 1725
1695 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1726 if (XWMHints *h = XGetWMHints (dpy, parent))
1696 { 1727 {
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h); 1729 XSetWMHints (dpy, parent, h);
1699 urgency_hint = enable; 1730 urgency_hint = enable;
1700 } 1731 }
1701} 1732}
1733#endif
1702 1734
1703void 1735void
1704rxvt_term::focus_in () 1736rxvt_term::focus_in ()
1705{ 1737{
1706 if (!focus) 1738 if (!focus)
… …
1810 * 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.
1811 */ 1843 */
1812 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1813 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1814 { 1846 {
1815 bgPixmap.set_root_pixmap (); 1847 bg_set_root_pixmap ();
1816 update_background (); 1848 update_background ();
1817 } 1849 }
1818 1850
1819 break; 1851 break;
1820 } 1852 }
… …
1859 /* save the xbutton state (for ButtonRelease) */ 1891 /* save the xbutton state (for ButtonRelease) */
1860 MEvent.state = ev.state; 1892 MEvent.state = ev.state;
1861#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1862 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1863 { 1895 {
1864 /* same button, within alloted time */ 1896 /* same button, within allowed time */
1865 MEvent.clicks++; 1897 MEvent.clicks++;
1866 1898
1867 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1868 { 1900 {
1869 /* only report double clicks */ 1901 /* only report double clicks */
… …
2140 selection_make (ev.time); 2172 selection_make (ev.time);
2141 break; 2173 break;
2142 2174
2143 case Button2: 2175 case Button2:
2144 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?
2145 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2146 break; 2178 break;
2147 2179
2148#ifdef MOUSE_WHEEL 2180#ifdef MOUSE_WHEEL
2149 case Button4: 2181 case Button4:
2150 case Button5: 2182 case Button5:
… …
2334 break; 2366 break;
2335 } 2367 }
2336 2368
2337 if (len == (size_t)-1) 2369 if (len == (size_t)-1)
2338 { 2370 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2371 mbstate.reset (); // reset now undefined conversion state
2340 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
2341 } 2373 }
2342 2374
2343 // assume wchar == unicode 2375 // assume wchar == unicode
2344 cmdbuf_ptr += len; 2376 cmdbuf_ptr += len;
… …
2357 : NOCHAR; 2389 : NOCHAR;
2358} 2390}
2359 2391
2360static class out_of_input out_of_input; 2392static class out_of_input out_of_input;
2361 2393
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 2394wchar_t
2368rxvt_term::cmd_getc () THROW ((class out_of_input)) 2395rxvt_term::cmd_getc () THROW ((class out_of_input))
2369{ 2396{
2370 wchar_t c = next_char (); 2397 wchar_t c = next_char ();
2371 2398
… …
2653 2680
2654 /* 8.3.87: NEXT LINE */ 2681 /* 8.3.87: NEXT LINE */
2655 case C1_NEL: /* ESC E */ 2682 case C1_NEL: /* ESC E */
2656 { 2683 {
2657 wchar_t nlcr[] = { C0_LF, C0_CR }; 2684 wchar_t nlcr[] = { C0_LF, C0_CR };
2658 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2685 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2659 } 2686 }
2660 break; 2687 break;
2661 2688
2662 /* kidnapped escape sequence: Should be 8.3.48 */ 2689 /* kidnapped escape sequence: Should be 8.3.48 */
2663 case C1_ESA: /* ESC G */ 2690 case C1_ESA: /* ESC G */
2664 process_graphics (); 2691 // used by original rxvt for rob nations own graphics mode
2692 if (cmd_getc () == 'Q')
2693 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2665 break; 2694 break;
2666 2695
2667 /* 8.3.63: CHARACTER TABULATION SET */ 2696 /* 8.3.63: CHARACTER TABULATION SET */
2668 case C1_HTS: /* ESC H */ 2697 case C1_HTS: /* ESC H */
2669 scr_set_tab (1); 2698 scr_set_tab (1);
… …
2732 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2761 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 , 2762 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 2763 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2735}; 2764};
2736 2765
2737#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2766#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2738 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2767 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2739 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2768 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2740#define get_byte_array_bit(array, bit) \ 2769#define get_byte_array_bit(array, bit) \
2741 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2770 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2742 2771
2743const unsigned char csi_defaults[] = 2772static const unsigned char csi_defaults[] =
2744 { 2773 {
2745 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2774 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, */ 2775 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, */ 2776 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, [, \, ], ^, _, */ 2777 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2837 { 2866 {
2838 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2867 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2839 scr_soft_reset (); 2868 scr_soft_reset ();
2840 2869
2841 static const int pm_h[] = { 7, 25 }; 2870 static const int pm_h[] = { 7, 25 };
2842 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2871 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2843 2872
2844 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2873 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); 2874 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2846 } 2875 }
2847 break; 2876 break;
2848 } 2877 }
2849 2878
2850 return; 2879 return;
… …
3088 { 3117 {
3089 /* 3118 /*
3090 * commands 3119 * commands
3091 */ 3120 */
3092 case 1: /* deiconify window */ 3121 case 1: /* deiconify window */
3093 XMapWindow (dpy, parent[0]); 3122 XMapWindow (dpy, parent);
3094 break; 3123 break;
3095 case 2: /* iconify window */ 3124 case 2: /* iconify window */
3096 XIconifyWindow (dpy, parent[0], display->screen); 3125 XIconifyWindow (dpy, parent, display->screen);
3097 break; 3126 break;
3098 case 3: /* set position (pixels) */ 3127 case 3: /* set position (pixels) */
3099 XMoveWindow (dpy, parent[0], args[1], args[2]); 3128 XMoveWindow (dpy, parent, args[1], args[2]);
3100 break; 3129 break;
3101 case 4: /* set size (pixels) */ 3130 case 4: /* set size (pixels) */
3102 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3103 break; 3132 break;
3104 case 5: /* raise window */ 3133 case 5: /* raise window */
3105 XRaiseWindow (dpy, parent[0]); 3134 XRaiseWindow (dpy, parent);
3106 break; 3135 break;
3107 case 6: /* lower window */ 3136 case 6: /* lower window */
3108 XLowerWindow (dpy, parent[0]); 3137 XLowerWindow (dpy, parent);
3109 break; 3138 break;
3110 case 7: /* refresh window */ 3139 case 7: /* refresh window */
3111 scr_touch (true); 3140 scr_touch (true);
3112 break; 3141 break;
3113 case 8: /* set size (chars) */ 3142 case 8: /* set size (chars) */
… …
3124 3153
3125 /* 3154 /*
3126 * reports - some output format copied from XTerm 3155 * reports - some output format copied from XTerm
3127 */ 3156 */
3128 case 11: /* report window state */ 3157 case 11: /* report window state */
3129 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3130 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3131 break; 3160 break;
3132 case 13: /* report window position */ 3161 case 13: /* report window position */
3133 XGetWindowAttributes (dpy, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent, &wattr);
3134 XTranslateCoordinates (dpy, parent[0], wattr.root, 3163 XTranslateCoordinates (dpy, parent, wattr.root,
3135 -wattr.border_width, -wattr.border_width, 3164 -wattr.border_width, -wattr.border_width,
3136 &x, &y, &wdummy); 3165 &x, &y, &wdummy);
3137 tt_printf ("\033[3;%d;%dt", x, y); 3166 tt_printf ("\033[3;%d;%dt", x, y);
3138 break; 3167 break;
3139 case 14: /* report window size (pixels) */ 3168 case 14: /* report window size (pixels) */
3140 XGetWindowAttributes (dpy, parent[0], &wattr); 3169 XGetWindowAttributes (dpy, parent, &wattr);
3141 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3142 break; 3171 break;
3143 case 18: /* report text area size (chars) */ 3172 case 18: /* report text area size (chars) */
3144 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3173 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3145 break; 3174 break;
… …
3147 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3176 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3148 break; 3177 break;
3149 case 20: /* report icon label */ 3178 case 20: /* report icon label */
3150 { 3179 {
3151 char *s; 3180 char *s;
3152 XGetIconName (dpy, parent[0], &s); 3181 XGetIconName (dpy, parent, &s);
3153 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3182 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3154 XFree (s); 3183 XFree (s);
3155 } 3184 }
3156 break; 3185 break;
3157 case 21: /* report window title */ 3186 case 21: /* report window title */
3158 { 3187 {
3159 char *s; 3188 char *s;
3160 XFetchName (dpy, parent[0], &s); 3189 XFetchName (dpy, parent, &s);
3161 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3190 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3162 XFree (s); 3191 XFree (s);
3163 } 3192 }
3164 break; 3193 break;
3165 } 3194 }
… …
3221 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3222 */ 3251 */
3223void 3252void
3224rxvt_term::process_dcs_seq () 3253rxvt_term::process_dcs_seq ()
3225{ 3254{
3226 char *s;
3227 unicode_t eh;
3228
3229 /* 3255 /*
3230 * Not handled yet 3256 * Not handled yet
3231 */ 3257 */
3258
3259 unicode_t eh;
3232 s = get_to_st (eh); 3260 char *s = get_to_st (eh);
3233 if (s) 3261 if (s)
3234 free (s); 3262 free (s);
3235 3263
3236 return; 3264 return;
3237} 3265}
… …
3241 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3269 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3242 */ 3270 */
3243void 3271void
3244rxvt_term::process_osc_seq () 3272rxvt_term::process_osc_seq ()
3245{ 3273{
3246 unicode_t ch, eh;
3247 int arg; 3274 int arg;
3248 3275
3249 ch = cmd_getc (); 3276 unicode_t ch = cmd_getc ();
3250 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3277 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3251 arg = arg * 10 + (ch - '0'); 3278 arg = arg * 10 + (ch - '0');
3252 3279
3253 if (ch == ';') 3280 if (ch == ';')
3254 { 3281 {
3282 unicode_t eh;
3255 char *s = get_to_st (eh); 3283 char *s = get_to_st (eh);
3256 3284
3257 if (s) 3285 if (s)
3258 { 3286 {
3259 process_xterm_seq (arg, s, eh); 3287 process_xterm_seq (arg, s, eh);
… …
3283 3311
3284/* 3312/*
3285 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3313 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3286 */ 3314 */
3287void 3315void
3288rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3316rxvt_term::process_xterm_seq (int op, char *str, char resp)
3289{ 3317{
3290 int color; 3318 int color;
3291 char *buf, *name; 3319 char *buf, *name;
3292 bool query = str[0] == '?' && !str[1]; 3320 bool query = str[0] == '?' && !str[1];
3293 int saveop = op; 3321 int saveop = op;
… …
3320 unsigned long bytes_after; 3348 unsigned long bytes_after;
3321 unsigned char *value = 0; 3349 unsigned char *value = 0;
3322 const char *str = ""; 3350 const char *str = "";
3323 3351
3324 if (prop 3352 if (prop
3325 && XGetWindowProperty (dpy, parent[0], 3353 && XGetWindowProperty (dpy, parent,
3326 prop, 0, 1<<16, 0, AnyPropertyType, 3354 prop, 0, 1<<16, 0, AnyPropertyType,
3327 &actual_type, &actual_format, 3355 &actual_type, &actual_format,
3328 &nitems, &bytes_after, &value) == Success 3356 &nitems, &bytes_after, &value) == Success
3329 && actual_type != None 3357 && actual_type != None
3330 && actual_format == 8) 3358 && actual_format == 8)
… …
3334 3362
3335 XFree (value); 3363 XFree (value);
3336 } 3364 }
3337 else 3365 else
3338 { 3366 {
3339 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3367 char *eq = strchr (str, '=');
3340 3368
3341 if (eq) 3369 if (eq)
3342 { 3370 {
3343 *eq = 0; 3371 *eq = 0;
3344 set_utf8_property (display->atom (str), eq + 1); 3372 set_utf8_property (display->atom (str), eq + 1);
3345 } 3373 }
3346 else 3374 else
3347 XDeleteProperty (dpy, parent[0], 3375 XDeleteProperty (dpy, parent,
3348 display->atom (str)); 3376 display->atom (str));
3349 } 3377 }
3350 break; 3378 break;
3351 3379
3352 case XTerm_Color: 3380 case XTerm_Color:
… …
3384 process_color_seq (op, Color_pointer_fg, str, resp); 3412 process_color_seq (op, Color_pointer_fg, str, resp);
3385 break; 3413 break;
3386 case XTerm_Color_pointer_bg: 3414 case XTerm_Color_pointer_bg:
3387 process_color_seq (op, Color_pointer_bg, str, resp); 3415 process_color_seq (op, Color_pointer_bg, str, resp);
3388 break; 3416 break;
3417#ifdef OPTION_HC
3418 case XTerm_Color_HC:
3419 process_color_seq (op, Color_HC, str, resp);
3420 break;
3421 case XTerm_Color_HTC:
3422 process_color_seq (op, Color_HTC, str, resp);
3423 break;
3424#endif
3389#ifndef NO_BOLD_UNDERLINE_REVERSE 3425#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: 3426 case URxvt_Color_BD:
3395 process_color_seq (op, Color_BD, str, resp); 3427 process_color_seq (op, Color_BD, str, resp);
3396 break; 3428 break;
3397 case Rxvt_Color_UL:
3398 case URxvt_Color_UL: 3429 case URxvt_Color_UL:
3399 process_color_seq (op, Color_UL, str, resp); 3430 process_color_seq (op, Color_UL, str, resp);
3400 break; 3431 break;
3401 case URxvt_Color_IT: 3432 case URxvt_Color_IT:
3402 process_color_seq (op, Color_IT, str, resp); 3433 process_color_seq (op, Color_IT, str, resp);
… …
3410 process_color_seq (op, Color_tint, str, resp); 3441 process_color_seq (op, Color_tint, str, resp);
3411 { 3442 {
3412 bool changed = false; 3443 bool changed = false;
3413 3444
3414 if (ISSET_PIXCOLOR (Color_tint)) 3445 if (ISSET_PIXCOLOR (Color_tint))
3415 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3446 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3416 else
3417 changed = bgPixmap.unset_tint ();
3418 3447
3419 if (changed) 3448 if (changed)
3420 update_background (); 3449 update_background ();
3421 } 3450 }
3422 3451
… …
3427 case Rxvt_Pixmap: 3456 case Rxvt_Pixmap:
3428 if (!strcmp (str, "?")) 3457 if (!strcmp (str, "?"))
3429 { 3458 {
3430 char str[256]; 3459 char str[256];
3431 3460
3432 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3461 sprintf (str, "[%dx%d+%d+%d]",
3433 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3462 min (h_scale, 32767), min (v_scale, 32767),
3434 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3463 min (h_align, 32767), min (v_align, 32767));
3435 process_xterm_seq (XTerm_title, str, CHAR_ST); 3464 process_xterm_seq (XTerm_title, str, CHAR_ST);
3436 } 3465 }
3437 else 3466 else
3438 { 3467 {
3439 int changed = 0; 3468 int changed = 0;
3440 3469
3441 if (*str != ';') 3470 if (*str != ';')
3442 { 3471 {
3443 /* reset to default scaling :*/
3444 bgPixmap.unset_geometry ();
3445 if (bgPixmap.set_file (str)) /* change pixmap */ 3472 if (bg_set_file (str)) /* change pixmap */
3473 {
3446 changed++; 3474 changed++;
3447 str = strchr (str, ';'); 3475 str = strchr (str, ';');
3448 if (str == NULL) 3476 if (str == NULL)
3449 bgPixmap.set_defaultGeometry (); 3477 bg_set_default_geometry ();
3478 else
3479 bg_set_geometry (str+1);
3480 }
3450 } 3481 }
3451 3482 else
3452 while (str)
3453 { 3483 {
3454 str++; 3484 str++;
3455 if (bgPixmap.set_geometry (str)) 3485 if (bg_set_geometry (str, true))
3456 changed++; 3486 changed++;
3457 str = strchr (str, ';');
3458 } 3487 }
3459 3488
3460 if (changed) 3489 if (changed)
3490 {
3491 if (bg_window_position_sensitive ())
3492 {
3493 int x, y;
3494 get_window_origin (x, y);
3495 bg_set_position (x, y);
3496 }
3461 update_background (); 3497 update_background ();
3498 }
3462 } 3499 }
3463 break; 3500 break;
3464#endif 3501#endif
3465 3502
3466 case XTerm_logfile: 3503 case XTerm_logfile:
… …
3569 { 3606 {
3570 if (mode == 'r') 3607 if (mode == 'r')
3571 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3572 else 3609 else
3573 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3610 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3611
3574 set_privmode (bit, state); 3612 set_privmode (bit, state);
3575 } 3613 }
3576 3614
3577 return state; 3615 return state;
3578} 3616}
… …
3597 { 6, PrivMode_relOrigin }, // DECOM 3635 { 6, PrivMode_relOrigin }, // DECOM
3598 { 7, PrivMode_Autowrap }, // DECAWM 3636 { 7, PrivMode_Autowrap }, // DECAWM
3599 // 8, auto-repeat keys // DECARM 3637 // 8, auto-repeat keys // DECARM
3600 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
3601 // 18 end FF to printer after print screen 3639 // 18 end FF to printer after print screen
3602 // 19 Print screen prints full screen/scorll region 3640 // 19 Print screen prints full screen/scroll region
3603 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3604#ifdef scrollBar_esc 3642#ifdef scrollBar_esc
3605 { scrollBar_esc, PrivMode_scrollBar }, 3643 { scrollBar_esc, PrivMode_scrollBar },
3606#endif 3644#endif
3607 { 35, PrivMode_ShiftKeys }, // rxvt extension 3645 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3616 { 67, PrivMode_BackSpace }, // DECBKM 3654 { 67, PrivMode_BackSpace }, // DECBKM
3617#endif 3655#endif
3618 { 1000, PrivMode_MouseX11 }, 3656 { 1000, PrivMode_MouseX11 },
3619 { 1002, PrivMode_MouseBtnEvent }, 3657 { 1002, PrivMode_MouseBtnEvent },
3620 { 1003, PrivMode_MouseAnyEvent }, 3658 { 1003, PrivMode_MouseAnyEvent },
3659#if ENABLE_FRILLS
3660 { 1005, PrivMode_ExtModeMouse },
3661#endif
3621 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3662 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3622 { 1011, PrivMode_Keypress }, // rxvt extension 3663 { 1011, PrivMode_Keypress }, // rxvt extension
3664#if ENABLE_FRILLS
3665 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3666#endif
3623 // 1035 enable modifiers for alt, numlock NYI 3667 // 1035 enable modifiers for alt, numlock NYI
3624 // 1036 send ESC for meta keys NYI 3668 // 1036 send ESC for meta keys NYI
3625 // 1037 send DEL for keypad delete NYI 3669 // 1037 send DEL for keypad delete NYI
3626 { 1047, PrivMode_Screen }, 3670 { 1047, PrivMode_Screen },
3627 // 1048 save and restore cursor 3671 // 1048 save and restore cursor, implemented in code
3628 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3672 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3629 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3673 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3630 { 2004, PrivMode_BracketPaste }, 3674 { 2004, PrivMode_BracketPaste },
3631 }; 3675 };
3632 3676
… …
3642 for (i = 0; i < nargs; i++) 3686 for (i = 0; i < nargs; i++)
3643 { 3687 {
3644 state = -1; 3688 state = -1;
3645 3689
3646 /* basic handling */ 3690 /* basic handling */
3647 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3691 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3648 if (argtopriv[j].argval == arg[i]) 3692 if (argtopriv[j].argval == arg[i])
3649 { 3693 {
3650 state = privcases (mode, argtopriv[j].bit); 3694 state = privcases (mode, argtopriv[j].bit);
3651 break; 3695 break;
3652 } 3696 }
… …
3730 case 1003: 3774 case 1003:
3731 if (state) 3775 if (state)
3732 { 3776 {
3733 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3777 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3734 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3778 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3779 mouse_row = mouse_col = 0;
3735 vt_emask_mouse = PointerMotionMask; 3780 vt_emask_mouse = PointerMotionMask;
3736 } 3781 }
3737 else 3782 else
3738 vt_emask_mouse = NoEventMask; 3783 vt_emask_mouse = NoEventMask;
3739 3784
… …
3751 scr_erase_screen (2); 3796 scr_erase_screen (2);
3752 3797
3753 scr_change_screen (state); 3798 scr_change_screen (state);
3754 break; 3799 break;
3755 case 1049: /* secondary screen w/ clearing first */ 3800 case 1049: /* secondary screen w/ clearing first */
3801 if (option (Opt_secondaryScreen))
3756 if (state) 3802 if (state)
3757 scr_cursor (SAVE); 3803 scr_cursor (SAVE);
3758 3804
3759 scr_change_screen (state); 3805 scr_change_screen (state);
3760 3806
3807 if (option (Opt_secondaryScreen))
3761 if (state) 3808 if (state)
3762 scr_erase_screen (2); 3809 scr_erase_screen (2);
3763 else 3810 else
3764 scr_cursor (RESTORE); 3811 scr_cursor (RESTORE);
3765 break; 3812 break;
3766 default: 3813 default:
3767 break; 3814 break;
3768 } 3815 }
3769 } 3816 }
… …
3922 } 3969 }
3923 } 3970 }
3924} 3971}
3925/*}}} */ 3972/*}}} */
3926 3973
3927/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3928void
3929rxvt_term::process_graphics ()
3930{
3931 unicode_t ch, cmd = cmd_getc ();
3932
3933 if (cmd == 'Q')
3934 {
3935 /* query graphics */
3936 tt_printf ("\033G0\012"); /* no graphics */
3937 return;
3938 }
3939 /* swallow other graphics sequences until terminating ':' */
3940 do
3941 ch = cmd_getc ();
3942 while (ch != ':');
3943}
3944/*}}} */
3945
3946/* ------------------------------------------------------------------------- */ 3974/* ------------------------------------------------------------------------- */
3947 3975
3948/* 3976/*
3949 * Send printf () formatted output to the command. 3977 * Send printf () formatted output to the command.
3950 * Only use for small amounts of data. 3978 * Only use for small amounts of data.
… …
3963 3991
3964/* ---------------------------------------------------------------------- */ 3992/* ---------------------------------------------------------------------- */
3965/* Write data to the pty as typed by the user, pasted with the mouse, 3993/* Write data to the pty as typed by the user, pasted with the mouse,
3966 * or generated by us in response to a query ESC sequence. 3994 * or generated by us in response to a query ESC sequence.
3967 */ 3995 */
3968const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3996static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3969 3997
3970void 3998void
3971rxvt_term::tt_write (const char *data, unsigned int len) 3999rxvt_term::tt_write (const char *data, unsigned int len)
3972{ 4000{
3973 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4001 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3978 4006
3979 if (v_buflen == 0) 4007 if (v_buflen == 0)
3980 { 4008 {
3981 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4009 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3982 4010
4011 max_it (written, 0);
4012
3983 if ((unsigned int)written == len) 4013 if (written == len)
3984 return; 4014 return;
3985 4015
3986 data += written; 4016 data += written;
3987 len -= written; 4017 len -= written;
3988 } 4018 }
3989 4019
3990 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4020 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3991 4021
3992 memcpy (v_buffer + v_buflen, data, len); 4022 memcpy (v_buffer + v_buflen, data, len);
3993 v_buflen += len; 4023 v_buflen += len;
3994 4024
3995 pty_ev.set (ev::READ | ev::WRITE); 4025 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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