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.431 by root, Tue Feb 24 11:51:51 2009 UTC vs.
Revision 1.482 by sf-exg, Thu Apr 7 12:19:40 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
… …
1691rxvt_term::set_urgency (bool enable) 1721rxvt_term::set_urgency (bool enable)
1692{ 1722{
1693 if (enable == urgency_hint) 1723 if (enable == urgency_hint)
1694 return; 1724 return;
1695 1725
1696 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1726 if (XWMHints *h = XGetWMHints (dpy, parent))
1697 { 1727 {
1698 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1699 XSetWMHints (dpy, parent[0], h); 1729 XSetWMHints (dpy, parent, h);
1700 urgency_hint = enable; 1730 urgency_hint = enable;
1701 } 1731 }
1702} 1732}
1703#endif 1733#endif
1704 1734
… …
1812 * 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.
1813 */ 1843 */
1814 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1815 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1816 { 1846 {
1817 bgPixmap.set_root_pixmap (); 1847 bg_set_root_pixmap ();
1818 update_background (); 1848 update_background ();
1819 } 1849 }
1820 1850
1821 break; 1851 break;
1822 } 1852 }
… …
1861 /* save the xbutton state (for ButtonRelease) */ 1891 /* save the xbutton state (for ButtonRelease) */
1862 MEvent.state = ev.state; 1892 MEvent.state = ev.state;
1863#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1864 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1865 { 1895 {
1866 /* same button, within alloted time */ 1896 /* same button, within allowed time */
1867 MEvent.clicks++; 1897 MEvent.clicks++;
1868 1898
1869 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1870 { 1900 {
1871 /* only report double clicks */ 1901 /* only report double clicks */
… …
2142 selection_make (ev.time); 2172 selection_make (ev.time);
2143 break; 2173 break;
2144 2174
2145 case Button2: 2175 case Button2:
2146 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?
2147 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2148 break; 2178 break;
2149 2179
2150#ifdef MOUSE_WHEEL 2180#ifdef MOUSE_WHEEL
2151 case Button4: 2181 case Button4:
2152 case Button5: 2182 case Button5:
… …
2655 2685
2656 /* 8.3.87: NEXT LINE */ 2686 /* 8.3.87: NEXT LINE */
2657 case C1_NEL: /* ESC E */ 2687 case C1_NEL: /* ESC E */
2658 { 2688 {
2659 wchar_t nlcr[] = { C0_LF, C0_CR }; 2689 wchar_t nlcr[] = { C0_LF, C0_CR };
2660 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2661 } 2691 }
2662 break; 2692 break;
2663 2693
2664 /* kidnapped escape sequence: Should be 8.3.48 */ 2694 /* kidnapped escape sequence: Should be 8.3.48 */
2665 case C1_ESA: /* ESC G */ 2695 case C1_ESA: /* ESC G */
2666 process_graphics (); 2696 // used by original rxvt for rob nations own graphics mode
2697 if (cmd_getc () == 'Q')
2698 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2667 break; 2699 break;
2668 2700
2669 /* 8.3.63: CHARACTER TABULATION SET */ 2701 /* 8.3.63: CHARACTER TABULATION SET */
2670 case C1_HTS: /* ESC H */ 2702 case C1_HTS: /* ESC H */
2671 scr_set_tab (1); 2703 scr_set_tab (1);
… …
2734 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2766 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2735 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2767 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2736 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2768 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2737}; 2769};
2738 2770
2739#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2771#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2740 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2772 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2741 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2773 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2742#define get_byte_array_bit(array, bit) \ 2774#define get_byte_array_bit(array, bit) \
2743 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2775 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2744 2776
2745const unsigned char csi_defaults[] = 2777static const unsigned char csi_defaults[] =
2746 { 2778 {
2747 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2779 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2748 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2780 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2749 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2781 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2750 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2782 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2839 { 2871 {
2840 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2872 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2841 scr_soft_reset (); 2873 scr_soft_reset ();
2842 2874
2843 static const int pm_h[] = { 7, 25 }; 2875 static const int pm_h[] = { 7, 25 };
2844 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2876 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2845 2877
2846 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2878 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2847 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2879 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2848 } 2880 }
2849 break; 2881 break;
2850 } 2882 }
2851 2883
2852 return; 2884 return;
… …
3090 { 3122 {
3091 /* 3123 /*
3092 * commands 3124 * commands
3093 */ 3125 */
3094 case 1: /* deiconify window */ 3126 case 1: /* deiconify window */
3095 XMapWindow (dpy, parent[0]); 3127 XMapWindow (dpy, parent);
3096 break; 3128 break;
3097 case 2: /* iconify window */ 3129 case 2: /* iconify window */
3098 XIconifyWindow (dpy, parent[0], display->screen); 3130 XIconifyWindow (dpy, parent, display->screen);
3099 break; 3131 break;
3100 case 3: /* set position (pixels) */ 3132 case 3: /* set position (pixels) */
3101 XMoveWindow (dpy, parent[0], args[1], args[2]); 3133 XMoveWindow (dpy, parent, args[1], args[2]);
3102 break; 3134 break;
3103 case 4: /* set size (pixels) */ 3135 case 4: /* set size (pixels) */
3104 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3136 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3105 break; 3137 break;
3106 case 5: /* raise window */ 3138 case 5: /* raise window */
3107 XRaiseWindow (dpy, parent[0]); 3139 XRaiseWindow (dpy, parent);
3108 break; 3140 break;
3109 case 6: /* lower window */ 3141 case 6: /* lower window */
3110 XLowerWindow (dpy, parent[0]); 3142 XLowerWindow (dpy, parent);
3111 break; 3143 break;
3112 case 7: /* refresh window */ 3144 case 7: /* refresh window */
3113 scr_touch (true); 3145 scr_touch (true);
3114 break; 3146 break;
3115 case 8: /* set size (chars) */ 3147 case 8: /* set size (chars) */
… …
3126 3158
3127 /* 3159 /*
3128 * reports - some output format copied from XTerm 3160 * reports - some output format copied from XTerm
3129 */ 3161 */
3130 case 11: /* report window state */ 3162 case 11: /* report window state */
3131 XGetWindowAttributes (dpy, parent[0], &wattr); 3163 XGetWindowAttributes (dpy, parent, &wattr);
3132 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3164 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3133 break; 3165 break;
3134 case 13: /* report window position */ 3166 case 13: /* report window position */
3135 XGetWindowAttributes (dpy, parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent, &wattr);
3136 XTranslateCoordinates (dpy, parent[0], wattr.root, 3168 XTranslateCoordinates (dpy, parent, wattr.root,
3137 -wattr.border_width, -wattr.border_width, 3169 -wattr.border_width, -wattr.border_width,
3138 &x, &y, &wdummy); 3170 &x, &y, &wdummy);
3139 tt_printf ("\033[3;%d;%dt", x, y); 3171 tt_printf ("\033[3;%d;%dt", x, y);
3140 break; 3172 break;
3141 case 14: /* report window size (pixels) */ 3173 case 14: /* report window size (pixels) */
3142 XGetWindowAttributes (dpy, parent[0], &wattr); 3174 XGetWindowAttributes (dpy, parent, &wattr);
3143 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3175 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3144 break; 3176 break;
3145 case 18: /* report text area size (chars) */ 3177 case 18: /* report text area size (chars) */
3146 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3178 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3147 break; 3179 break;
… …
3149 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3181 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3150 break; 3182 break;
3151 case 20: /* report icon label */ 3183 case 20: /* report icon label */
3152 { 3184 {
3153 char *s; 3185 char *s;
3154 XGetIconName (dpy, parent[0], &s); 3186 XGetIconName (dpy, parent, &s);
3155 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3187 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3156 XFree (s); 3188 XFree (s);
3157 } 3189 }
3158 break; 3190 break;
3159 case 21: /* report window title */ 3191 case 21: /* report window title */
3160 { 3192 {
3161 char *s; 3193 char *s;
3162 XFetchName (dpy, parent[0], &s); 3194 XFetchName (dpy, parent, &s);
3163 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3195 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3164 XFree (s); 3196 XFree (s);
3165 } 3197 }
3166 break; 3198 break;
3167 } 3199 }
… …
3223 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3255 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3224 */ 3256 */
3225void 3257void
3226rxvt_term::process_dcs_seq () 3258rxvt_term::process_dcs_seq ()
3227{ 3259{
3228 char *s;
3229 unicode_t eh;
3230
3231 /* 3260 /*
3232 * Not handled yet 3261 * Not handled yet
3233 */ 3262 */
3263
3264 unicode_t eh;
3234 s = get_to_st (eh); 3265 char *s = get_to_st (eh);
3235 if (s) 3266 if (s)
3236 free (s); 3267 free (s);
3237 3268
3238 return; 3269 return;
3239} 3270}
… …
3243 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3274 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3244 */ 3275 */
3245void 3276void
3246rxvt_term::process_osc_seq () 3277rxvt_term::process_osc_seq ()
3247{ 3278{
3248 unicode_t ch, eh;
3249 int arg; 3279 int arg;
3250 3280
3251 ch = cmd_getc (); 3281 unicode_t ch = cmd_getc ();
3252 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3282 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3253 arg = arg * 10 + (ch - '0'); 3283 arg = arg * 10 + (ch - '0');
3254 3284
3255 if (ch == ';') 3285 if (ch == ';')
3256 { 3286 {
3287 unicode_t eh;
3257 char *s = get_to_st (eh); 3288 char *s = get_to_st (eh);
3258 3289
3259 if (s) 3290 if (s)
3260 { 3291 {
3261 process_xterm_seq (arg, s, eh); 3292 process_xterm_seq (arg, s, eh);
… …
3285 3316
3286/* 3317/*
3287 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3318 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3288 */ 3319 */
3289void 3320void
3290rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3321rxvt_term::process_xterm_seq (int op, char *str, char resp)
3291{ 3322{
3292 int color; 3323 int color;
3293 char *buf, *name; 3324 char *buf, *name;
3294 bool query = str[0] == '?' && !str[1]; 3325 bool query = str[0] == '?' && !str[1];
3295 int saveop = op; 3326 int saveop = op;
… …
3322 unsigned long bytes_after; 3353 unsigned long bytes_after;
3323 unsigned char *value = 0; 3354 unsigned char *value = 0;
3324 const char *str = ""; 3355 const char *str = "";
3325 3356
3326 if (prop 3357 if (prop
3327 && XGetWindowProperty (dpy, parent[0], 3358 && XGetWindowProperty (dpy, parent,
3328 prop, 0, 1<<16, 0, AnyPropertyType, 3359 prop, 0, 1<<16, 0, AnyPropertyType,
3329 &actual_type, &actual_format, 3360 &actual_type, &actual_format,
3330 &nitems, &bytes_after, &value) == Success 3361 &nitems, &bytes_after, &value) == Success
3331 && actual_type != None 3362 && actual_type != None
3332 && actual_format == 8) 3363 && actual_format == 8)
… …
3336 3367
3337 XFree (value); 3368 XFree (value);
3338 } 3369 }
3339 else 3370 else
3340 { 3371 {
3341 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3372 char *eq = strchr (str, '=');
3342 3373
3343 if (eq) 3374 if (eq)
3344 { 3375 {
3345 *eq = 0; 3376 *eq = 0;
3346 set_utf8_property (display->atom (str), eq + 1); 3377 set_utf8_property (display->atom (str), eq + 1);
3347 } 3378 }
3348 else 3379 else
3349 XDeleteProperty (dpy, parent[0], 3380 XDeleteProperty (dpy, parent,
3350 display->atom (str)); 3381 display->atom (str));
3351 } 3382 }
3352 break; 3383 break;
3353 3384
3354 case XTerm_Color: 3385 case XTerm_Color:
… …
3386 process_color_seq (op, Color_pointer_fg, str, resp); 3417 process_color_seq (op, Color_pointer_fg, str, resp);
3387 break; 3418 break;
3388 case XTerm_Color_pointer_bg: 3419 case XTerm_Color_pointer_bg:
3389 process_color_seq (op, Color_pointer_bg, str, resp); 3420 process_color_seq (op, Color_pointer_bg, str, resp);
3390 break; 3421 break;
3422#ifdef OPTION_HC
3423 case XTerm_Color_HC:
3424 process_color_seq (op, Color_HC, str, resp);
3425 break;
3426 case XTerm_Color_HTC:
3427 process_color_seq (op, Color_HTC, str, resp);
3428 break;
3429#endif
3391#ifndef NO_BOLD_UNDERLINE_REVERSE 3430#ifndef NO_BOLD_UNDERLINE_REVERSE
3392 case XTerm_Color_RV:
3393 process_color_seq (op, Color_RV, str, resp);
3394 break;
3395 case Rxvt_Color_BD:
3396 case URxvt_Color_BD: 3431 case URxvt_Color_BD:
3397 process_color_seq (op, Color_BD, str, resp); 3432 process_color_seq (op, Color_BD, str, resp);
3398 break; 3433 break;
3399 case Rxvt_Color_UL:
3400 case URxvt_Color_UL: 3434 case URxvt_Color_UL:
3401 process_color_seq (op, Color_UL, str, resp); 3435 process_color_seq (op, Color_UL, str, resp);
3402 break; 3436 break;
3403 case URxvt_Color_IT: 3437 case URxvt_Color_IT:
3404 process_color_seq (op, Color_IT, str, resp); 3438 process_color_seq (op, Color_IT, str, resp);
… …
3412 process_color_seq (op, Color_tint, str, resp); 3446 process_color_seq (op, Color_tint, str, resp);
3413 { 3447 {
3414 bool changed = false; 3448 bool changed = false;
3415 3449
3416 if (ISSET_PIXCOLOR (Color_tint)) 3450 if (ISSET_PIXCOLOR (Color_tint))
3417 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3451 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3418 else
3419 changed = bgPixmap.unset_tint ();
3420 3452
3421 if (changed) 3453 if (changed)
3422 update_background (); 3454 update_background ();
3423 } 3455 }
3424 3456
… …
3429 case Rxvt_Pixmap: 3461 case Rxvt_Pixmap:
3430 if (!strcmp (str, "?")) 3462 if (!strcmp (str, "?"))
3431 { 3463 {
3432 char str[256]; 3464 char str[256];
3433 3465
3434 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3466 sprintf (str, "[%dx%d+%d+%d]",
3435 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3467 min (h_scale, 32767), min (v_scale, 32767),
3436 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3468 min (h_align, 32767), min (v_align, 32767));
3437 process_xterm_seq (XTerm_title, str, CHAR_ST); 3469 process_xterm_seq (XTerm_title, str, CHAR_ST);
3438 } 3470 }
3439 else 3471 else
3440 { 3472 {
3441 int changed = 0; 3473 int changed = 0;
3442 3474
3443 if (*str != ';') 3475 if (*str != ';')
3444 { 3476 {
3445 /* reset to default scaling :*/
3446 bgPixmap.unset_geometry ();
3447 if (bgPixmap.set_file (str)) /* change pixmap */ 3477 if (bg_set_file (str)) /* change pixmap */
3478 {
3448 changed++; 3479 changed++;
3449 str = strchr (str, ';'); 3480 str = strchr (str, ';');
3450 if (str == NULL) 3481 if (str == NULL)
3451 bgPixmap.set_defaultGeometry (); 3482 bg_set_default_geometry ();
3483 else
3484 bg_set_geometry (str+1);
3485 }
3452 } 3486 }
3453 3487 else
3454 while (str)
3455 { 3488 {
3456 str++; 3489 str++;
3457 if (bgPixmap.set_geometry (str)) 3490 if (bg_set_geometry (str, true))
3458 changed++; 3491 changed++;
3459 str = strchr (str, ';');
3460 } 3492 }
3461 3493
3462 if (changed) 3494 if (changed)
3495 {
3496 if (bg_window_position_sensitive ())
3497 {
3498 int x, y;
3499 get_window_origin (x, y);
3500 bg_set_position (x, y);
3501 }
3463 update_background (); 3502 update_background ();
3503 }
3464 } 3504 }
3465 break; 3505 break;
3466#endif 3506#endif
3467 3507
3468 case XTerm_logfile: 3508 case XTerm_logfile:
… …
3571 { 3611 {
3572 if (mode == 'r') 3612 if (mode == 'r')
3573 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3613 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3574 else 3614 else
3575 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3615 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3616
3576 set_privmode (bit, state); 3617 set_privmode (bit, state);
3577 } 3618 }
3578 3619
3579 return state; 3620 return state;
3580} 3621}
… …
3599 { 6, PrivMode_relOrigin }, // DECOM 3640 { 6, PrivMode_relOrigin }, // DECOM
3600 { 7, PrivMode_Autowrap }, // DECAWM 3641 { 7, PrivMode_Autowrap }, // DECAWM
3601 // 8, auto-repeat keys // DECARM 3642 // 8, auto-repeat keys // DECARM
3602 { 9, PrivMode_MouseX10 }, 3643 { 9, PrivMode_MouseX10 },
3603 // 18 end FF to printer after print screen 3644 // 18 end FF to printer after print screen
3604 // 19 Print screen prints full screen/scorll region 3645 // 19 Print screen prints full screen/scroll region
3605 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3646 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3606#ifdef scrollBar_esc 3647#ifdef scrollBar_esc
3607 { scrollBar_esc, PrivMode_scrollBar }, 3648 { scrollBar_esc, PrivMode_scrollBar },
3608#endif 3649#endif
3609 { 35, PrivMode_ShiftKeys }, // rxvt extension 3650 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3618 { 67, PrivMode_BackSpace }, // DECBKM 3659 { 67, PrivMode_BackSpace }, // DECBKM
3619#endif 3660#endif
3620 { 1000, PrivMode_MouseX11 }, 3661 { 1000, PrivMode_MouseX11 },
3621 { 1002, PrivMode_MouseBtnEvent }, 3662 { 1002, PrivMode_MouseBtnEvent },
3622 { 1003, PrivMode_MouseAnyEvent }, 3663 { 1003, PrivMode_MouseAnyEvent },
3664#if ENABLE_FRILLS
3665 { 1005, PrivMode_ExtModeMouse },
3666#endif
3623 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3667 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3624 { 1011, PrivMode_Keypress }, // rxvt extension 3668 { 1011, PrivMode_Keypress }, // rxvt extension
3669#if ENABLE_FRILLS
3670 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3671#endif
3625 // 1035 enable modifiers for alt, numlock NYI 3672 // 1035 enable modifiers for alt, numlock NYI
3626 // 1036 send ESC for meta keys NYI 3673 // 1036 send ESC for meta keys NYI
3627 // 1037 send DEL for keypad delete NYI 3674 // 1037 send DEL for keypad delete NYI
3628 { 1047, PrivMode_Screen }, 3675 { 1047, PrivMode_Screen },
3629 // 1048 save and restore cursor 3676 // 1048 save and restore cursor, implemented in code
3630 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3677 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3631 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3678 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3632 { 2004, PrivMode_BracketPaste }, 3679 { 2004, PrivMode_BracketPaste },
3633 }; 3680 };
3634 3681
… …
3644 for (i = 0; i < nargs; i++) 3691 for (i = 0; i < nargs; i++)
3645 { 3692 {
3646 state = -1; 3693 state = -1;
3647 3694
3648 /* basic handling */ 3695 /* basic handling */
3649 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3696 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3650 if (argtopriv[j].argval == arg[i]) 3697 if (argtopriv[j].argval == arg[i])
3651 { 3698 {
3652 state = privcases (mode, argtopriv[j].bit); 3699 state = privcases (mode, argtopriv[j].bit);
3653 break; 3700 break;
3654 } 3701 }
… …
3732 case 1003: 3779 case 1003:
3733 if (state) 3780 if (state)
3734 { 3781 {
3735 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3782 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3736 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3783 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3784 mouse_row = mouse_col = 0;
3737 vt_emask_mouse = PointerMotionMask; 3785 vt_emask_mouse = PointerMotionMask;
3738 } 3786 }
3739 else 3787 else
3740 vt_emask_mouse = NoEventMask; 3788 vt_emask_mouse = NoEventMask;
3741 3789
… …
3926 } 3974 }
3927 } 3975 }
3928} 3976}
3929/*}}} */ 3977/*}}} */
3930 3978
3931/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3932void
3933rxvt_term::process_graphics ()
3934{
3935 unicode_t ch, cmd = cmd_getc ();
3936
3937 if (cmd == 'Q')
3938 {
3939 /* query graphics */
3940 tt_printf ("\033G0\012"); /* no graphics */
3941 return;
3942 }
3943 /* swallow other graphics sequences until terminating ':' */
3944 do
3945 ch = cmd_getc ();
3946 while (ch != ':');
3947}
3948/*}}} */
3949
3950/* ------------------------------------------------------------------------- */ 3979/* ------------------------------------------------------------------------- */
3951 3980
3952/* 3981/*
3953 * Send printf () formatted output to the command. 3982 * Send printf () formatted output to the command.
3954 * Only use for small amounts of data. 3983 * Only use for small amounts of data.
… …
3967 3996
3968/* ---------------------------------------------------------------------- */ 3997/* ---------------------------------------------------------------------- */
3969/* Write data to the pty as typed by the user, pasted with the mouse, 3998/* Write data to the pty as typed by the user, pasted with the mouse,
3970 * or generated by us in response to a query ESC sequence. 3999 * or generated by us in response to a query ESC sequence.
3971 */ 4000 */
3972const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4001static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3973 4002
3974void 4003void
3975rxvt_term::tt_write (const char *data, unsigned int len) 4004rxvt_term::tt_write (const char *data, unsigned int len)
3976{ 4005{
3977 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4006 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3982 4011
3983 if (v_buflen == 0) 4012 if (v_buflen == 0)
3984 { 4013 {
3985 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4014 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3986 4015
4016 max_it (written, 0);
4017
3987 if ((unsigned int)written == len) 4018 if (written == len)
3988 return; 4019 return;
3989 4020
3990 data += written; 4021 data += written;
3991 len -= written; 4022 len -= written;
3992 } 4023 }
3993 4024
3994 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4025 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3995 4026
3996 memcpy (v_buffer + v_buflen, data, len); 4027 memcpy (v_buffer + v_buflen, data, len);
3997 v_buflen += len; 4028 v_buflen += len;
3998 4029
3999 pty_ev.set (ev::READ | ev::WRITE); 4030 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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