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.446 by root, Fri Apr 2 19:27:38 2010 UTC vs.
Revision 1.479 by root, Fri Feb 25 07:07:41 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
… …
889 commit_iso14755 (); 889 commit_iso14755 ();
890 890
891 return; 891 return;
892 } 892 }
893 893
894 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
895 if (i[0] == keysym) 895 if (i[0] == keysym)
896 { 896 {
897 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
898 commit_iso14755 (); 898 commit_iso14755 ();
899 899
… …
975rxvt_term::flush () 975rxvt_term::flush ()
976{ 976{
977 flush_ev.stop (); 977 flush_ev.stop ();
978 978
979#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
980 if (bgPixmap.check_clearChanged ()) 980 if (bg_flags & BG_NEEDS_REFRESH)
981 { 981 {
982// scr_clear (true); This needs to be researched further! 982 bg_flags &= ~BG_NEEDS_REFRESH;
983 scr_touch (false); 983 scr_touch (false);
984 } 984 }
985#endif 985#endif
986 986
987 if (want_refresh) 987 if (want_refresh)
… …
1158rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1159{ 1159{
1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1161 1161
1162 if (CBUFSIZ == n) 1162 if (CBUFSIZ == n)
1163 { 1163 n = 0; // normally this indicates a "too long" command sequence - just drop the data we have
1164 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1165 n = 0;
1166 }
1167 1164
1168 memmove (cmdbuf_base, cmdbuf_ptr, n); 1165 memmove (cmdbuf_base, cmdbuf_ptr, n);
1169 cmdbuf_ptr = cmdbuf_base; 1166 cmdbuf_ptr = cmdbuf_base;
1170 cmdbuf_endp = cmdbuf_ptr + n; 1167 cmdbuf_endp = cmdbuf_ptr + n;
1171 1168
… …
1251{ 1248{
1252 int button_number, key_state = 0; 1249 int button_number, key_state = 0;
1253 int x, y; 1250 int x, y;
1254 int code = 32; 1251 int code = 32;
1255 1252
1256 x = Pixel2Col (ev.x); 1253 x = Pixel2Col (ev.x) + 1;
1257 y = Pixel2Row (ev.y); 1254 y = Pixel2Row (ev.y) + 1;
1255
1258 if (ev.type == MotionNotify) 1256 if (ev.type == MotionNotify)
1259 { 1257 {
1260 if (x == mouse_row && y == mouse_col) 1258 if (x == mouse_row && y == mouse_col)
1261 return; 1259 return;
1260
1262 mouse_row = x; 1261 mouse_row = x;
1263 mouse_col = y; 1262 mouse_col = y;
1264 code += 32; 1263 code += 32;
1265 } 1264 }
1266 1265
… …
1269 else 1268 else
1270 { 1269 {
1271 button_number = MEvent.button - Button1; 1270 button_number = MEvent.button - Button1;
1272 /* add 0x3D for wheel events, like xterm does */ 1271 /* add 0x3D for wheel events, like xterm does */
1273 if (button_number >= 3) 1272 if (button_number >= 3)
1274 button_number += (64 - 3); 1273 button_number += 64 - 3;
1275 } 1274 }
1276 1275
1277 if (priv_modes & PrivMode_MouseX10) 1276 if (priv_modes & PrivMode_MouseX10)
1278 { 1277 {
1279 /* 1278 /*
… …
1311 fputc ('A', stderr); 1310 fputc ('A', stderr);
1312 if (key_state & 32) 1311 if (key_state & 32)
1313 fputc ('2', stderr); 1312 fputc ('2', stderr);
1314 fprintf (stderr, "]: <%d>, %d/%d\n", 1313 fprintf (stderr, "]: <%d>, %d/%d\n",
1315 button_number, 1314 button_number,
1316 x + 1, 1315 x,
1317 y + 1); 1316 y);
1318#endif 1317#endif
1319 1318
1319#if ENABLE_FRILLS
1320 if (priv_modes & PrivMode_ExtMouseRight)
1321 tt_printf ("\033[%d;%d;%dM",
1322 code + button_number + key_state,
1323 x,
1324 y);
1325 else if (priv_modes & PrivMode_ExtModeMouse)
1326 tt_printf ("\033[M%c%lc%lc",
1327 code + button_number + key_state,
1328 wint_t (32 + x),
1329 wint_t (32 + y));
1330 else
1331#endif
1320 tt_printf ("\033[M%c%c%c", 1332 tt_printf ("\033[M%c%c%c",
1321 (code + button_number + key_state), 1333 code + button_number + key_state,
1322 (32 + x + 1), 1334 32 + x,
1323 (32 + y + 1)); 1335 32 + y);
1324} 1336}
1325 1337
1326/*{{{ process an X event */ 1338/*{{{ process an X event */
1327void 1339void
1328rxvt_term::x_cb (XEvent &ev) 1340rxvt_term::x_cb (XEvent &ev)
… …
1430 && ev.xfocus.mode != NotifyGrab) 1442 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1443 focus_out ();
1432 break; 1444 break;
1433 1445
1434 case ConfigureNotify: 1446 case ConfigureNotify:
1435 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height);*/
1438 if (ev.xconfigure.window == parent[0]) 1447 if (ev.xconfigure.window == parent[0])
1439 { 1448 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1449 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 1450 ;
1451
1452#ifdef HAVE_BG_PIXMAP
1453 bool moved = false;
1454 if (bg_window_position_sensitive ())
1455 {
1456 int x, y;
1457 if (ev.xconfigure.send_event)
1458 {
1459 x = ev.xconfigure.x;
1460 y = ev.xconfigure.y;
1461 }
1462 else
1463 get_window_origin (x, y);
1464
1465 if (bg_set_position (x, y)
1466 || !(bg_flags & BG_IS_VALID))
1467 moved = true;
1468 }
1469#endif
1442 1470
1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1472 {
1445 seen_resize = 1; 1473 seen_resize = 1;
1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1475 }
1448 else 1476 else
1449 { 1477 {
1450#ifdef HAVE_BG_PIXMAP 1478#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ()) 1479 if (moved)
1452 { 1480 {
1453 if (mapped) 1481 if (mapped)
1454 update_background (); 1482 update_background ();
1455 else 1483 else
1456 bgPixmap.invalidate (); 1484 bg_invalidate ();
1457 } 1485 }
1458#endif 1486#endif
1459 } 1487 }
1460 1488
1461 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1489 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1462 } 1490 }
1463 break; 1491 break;
1464 1492
1465 case PropertyNotify: 1493 case PropertyNotify:
1466 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1494 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1467 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1468 && ev.xproperty.state == PropertyNewValue)
1469 selection_property (ev.xproperty.window, ev.xproperty.atom);
1470
1471 break; 1495 break;
1472 1496
1473 case SelectionClear: 1497 case SelectionClear:
1474 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1498 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1475 break; 1499 break;
1476 1500
1477 case SelectionNotify:
1478 if (selection_wait == Sel_normal)
1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1480 break;
1481
1482 case SelectionRequest: 1501 case SelectionRequest:
1483 selection_send (ev.xselectionrequest); 1502 selection_send (ev.xselectionrequest);
1484 break; 1503 break;
1485 1504
1486 case MapNotify: 1505 case MapNotify:
1487#ifdef HAVE_BG_PIXMAP 1506#ifdef HAVE_BG_PIXMAP
1488 /* This is needed spcifically to fix the case of no window manager or a 1507 /* This is needed specifically to fix the case of no window manager or a
1489 * non-reparenting window manager. In those cases we never get first 1508 * non-reparenting window manager. In those cases we never get first
1490 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1509 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1491 * care of multiplicity of ConfigureNotify events arriwing while WM does 1510 * care of multiplicity of ConfigureNotify events arriving while WM does
1492 * reparenting. 1511 * reparenting.
1493 * We should not render background immidiately, as there could be several 1512 * We should not render background immediately, as there could be several
1494 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1513 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1495 * by scheduling background redraw as soon as we can, but giving a short 1514 * by scheduling background redraw as soon as we can, but giving a short
1496 * bit of time for ConfigureNotifies to arrive. 1515 * bit of time for ConfigureNotifies to arrive.
1497 * We should render background PRIOR to drawing any text, but AFTER all 1516 * We should render background PRIOR to drawing any text, but AFTER all
1498 * of ConfigureNotifys for the best results. 1517 * of ConfigureNotifys for the best results.
1499 */ 1518 */
1500 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1519 if (!(bg_flags & BG_IS_VALID))
1501 update_background_ev.start (0.025); 1520 update_background_ev.start (0.025);
1502#endif 1521#endif
1503 mapped = 1; 1522 mapped = 1;
1504#ifdef TEXT_BLINK 1523#ifdef TEXT_BLINK
1505 text_blink_ev.start (); 1524 text_blink_ev.start ();
… …
1520 if (ev.xany.window == vt) 1539 if (ev.xany.window == vt)
1521 { 1540 {
1522 do 1541 do
1523 { 1542 {
1524 scr_expose (ev.xexpose.x, ev.xexpose.y, 1543 scr_expose (ev.xexpose.x, ev.xexpose.y,
1525 ev.xexpose.width, ev.xexpose.height, False); 1544 ev.xexpose.width, ev.xexpose.height, false);
1526 } 1545 }
1527 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1546 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1528 1547
1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1530 1549
1531 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1550 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1532 { 1551 {
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1535 } 1554 }
1536 1555
1537 want_refresh = 1; 1556 want_refresh = 1;
1538 } 1557 }
1539 else 1558 else
… …
1820 * use the property to determine the pixmap. We use it later on. 1839 * use the property to determine the pixmap. We use it later on.
1821 */ 1840 */
1822 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1841 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1823 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1842 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1824 { 1843 {
1825 bgPixmap.set_root_pixmap (); 1844 bg_set_root_pixmap ();
1826 update_background (); 1845 update_background ();
1827 } 1846 }
1828 1847
1829 break; 1848 break;
1830 } 1849 }
… …
1869 /* save the xbutton state (for ButtonRelease) */ 1888 /* save the xbutton state (for ButtonRelease) */
1870 MEvent.state = ev.state; 1889 MEvent.state = ev.state;
1871#ifdef MOUSE_REPORT_DOUBLECLICK 1890#ifdef MOUSE_REPORT_DOUBLECLICK
1872 if (ev.button == MEvent.button && clickintime) 1891 if (ev.button == MEvent.button && clickintime)
1873 { 1892 {
1874 /* same button, within alloted time */ 1893 /* same button, within allowed time */
1875 MEvent.clicks++; 1894 MEvent.clicks++;
1876 1895
1877 if (MEvent.clicks > 1) 1896 if (MEvent.clicks > 1)
1878 { 1897 {
1879 /* only report double clicks */ 1898 /* only report double clicks */
… …
2150 selection_make (ev.time); 2169 selection_make (ev.time);
2151 break; 2170 break;
2152 2171
2153 case Button2: 2172 case Button2:
2154 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2173 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2155 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2174 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2156 break; 2175 break;
2157 2176
2158#ifdef MOUSE_WHEEL 2177#ifdef MOUSE_WHEEL
2159 case Button4: 2178 case Button4:
2160 case Button5: 2179 case Button5:
… …
2663 2682
2664 /* 8.3.87: NEXT LINE */ 2683 /* 8.3.87: NEXT LINE */
2665 case C1_NEL: /* ESC E */ 2684 case C1_NEL: /* ESC E */
2666 { 2685 {
2667 wchar_t nlcr[] = { C0_LF, C0_CR }; 2686 wchar_t nlcr[] = { C0_LF, C0_CR };
2668 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2687 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2669 } 2688 }
2670 break; 2689 break;
2671 2690
2672 /* kidnapped escape sequence: Should be 8.3.48 */ 2691 /* kidnapped escape sequence: Should be 8.3.48 */
2673 case C1_ESA: /* ESC G */ 2692 case C1_ESA: /* ESC G */
2674 process_graphics (); 2693 // used by original rxvt for rob nations own graphics mode
2694 if (cmd_getc () == 'Q')
2695 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2675 break; 2696 break;
2676 2697
2677 /* 8.3.63: CHARACTER TABULATION SET */ 2698 /* 8.3.63: CHARACTER TABULATION SET */
2678 case C1_HTS: /* ESC H */ 2699 case C1_HTS: /* ESC H */
2679 scr_set_tab (1); 2700 scr_set_tab (1);
… …
2742 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2763 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2743 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2764 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2744 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2765 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2745}; 2766};
2746 2767
2747#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2768#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2748 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2769 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2749 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2770 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2750#define get_byte_array_bit(array, bit) \ 2771#define get_byte_array_bit(array, bit) \
2751 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2772 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2752 2773
2753const unsigned char csi_defaults[] = 2774static const unsigned char csi_defaults[] =
2754 { 2775 {
2755 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2776 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2756 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2777 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2757 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2778 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2758 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2779 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2847 { 2868 {
2848 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2869 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2849 scr_soft_reset (); 2870 scr_soft_reset ();
2850 2871
2851 static const int pm_h[] = { 7, 25 }; 2872 static const int pm_h[] = { 7, 25 };
2852 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2873 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2853 2874
2854 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2875 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2855 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2876 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2856 } 2877 }
2857 break; 2878 break;
2858 } 2879 }
2859 2880
2860 return; 2881 return;
… …
3231 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3252 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3232 */ 3253 */
3233void 3254void
3234rxvt_term::process_dcs_seq () 3255rxvt_term::process_dcs_seq ()
3235{ 3256{
3236 char *s;
3237 unicode_t eh;
3238
3239 /* 3257 /*
3240 * Not handled yet 3258 * Not handled yet
3241 */ 3259 */
3260
3261 unicode_t eh;
3242 s = get_to_st (eh); 3262 char *s = get_to_st (eh);
3243 if (s) 3263 if (s)
3244 free (s); 3264 free (s);
3245 3265
3246 return; 3266 return;
3247} 3267}
… …
3251 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3271 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3252 */ 3272 */
3253void 3273void
3254rxvt_term::process_osc_seq () 3274rxvt_term::process_osc_seq ()
3255{ 3275{
3256 unicode_t ch, eh;
3257 int arg; 3276 int arg;
3258 3277
3259 ch = cmd_getc (); 3278 unicode_t ch = cmd_getc ();
3260 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3279 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3261 arg = arg * 10 + (ch - '0'); 3280 arg = arg * 10 + (ch - '0');
3262 3281
3263 if (ch == ';') 3282 if (ch == ';')
3264 { 3283 {
3284 unicode_t eh;
3265 char *s = get_to_st (eh); 3285 char *s = get_to_st (eh);
3266 3286
3267 if (s) 3287 if (s)
3268 { 3288 {
3269 process_xterm_seq (arg, s, eh); 3289 process_xterm_seq (arg, s, eh);
… …
3394 process_color_seq (op, Color_pointer_fg, str, resp); 3414 process_color_seq (op, Color_pointer_fg, str, resp);
3395 break; 3415 break;
3396 case XTerm_Color_pointer_bg: 3416 case XTerm_Color_pointer_bg:
3397 process_color_seq (op, Color_pointer_bg, str, resp); 3417 process_color_seq (op, Color_pointer_bg, str, resp);
3398 break; 3418 break;
3419#ifdef OPTION_HC
3420 case XTerm_Color_HC:
3421 process_color_seq (op, Color_HC, str, resp);
3422 break;
3423 case XTerm_Color_HTC:
3424 process_color_seq (op, Color_HTC, str, resp);
3425 break;
3426#endif
3399#ifndef NO_BOLD_UNDERLINE_REVERSE 3427#ifndef NO_BOLD_UNDERLINE_REVERSE
3400 case XTerm_Color_RV:
3401 process_color_seq (op, Color_RV, str, resp);
3402 break;
3403 case Rxvt_Color_BD:
3404 case URxvt_Color_BD: 3428 case URxvt_Color_BD:
3405 process_color_seq (op, Color_BD, str, resp); 3429 process_color_seq (op, Color_BD, str, resp);
3406 break; 3430 break;
3407 case Rxvt_Color_UL:
3408 case URxvt_Color_UL: 3431 case URxvt_Color_UL:
3409 process_color_seq (op, Color_UL, str, resp); 3432 process_color_seq (op, Color_UL, str, resp);
3410 break; 3433 break;
3411 case URxvt_Color_IT: 3434 case URxvt_Color_IT:
3412 process_color_seq (op, Color_IT, str, resp); 3435 process_color_seq (op, Color_IT, str, resp);
… …
3420 process_color_seq (op, Color_tint, str, resp); 3443 process_color_seq (op, Color_tint, str, resp);
3421 { 3444 {
3422 bool changed = false; 3445 bool changed = false;
3423 3446
3424 if (ISSET_PIXCOLOR (Color_tint)) 3447 if (ISSET_PIXCOLOR (Color_tint))
3425 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3448 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3426 else
3427 changed = bgPixmap.unset_tint ();
3428 3449
3429 if (changed) 3450 if (changed)
3430 update_background (); 3451 update_background ();
3431 } 3452 }
3432 3453
… …
3438 if (!strcmp (str, "?")) 3459 if (!strcmp (str, "?"))
3439 { 3460 {
3440 char str[256]; 3461 char str[256];
3441 3462
3442 sprintf (str, "[%dx%d+%d+%d]", 3463 sprintf (str, "[%dx%d+%d+%d]",
3443 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3464 min (h_scale, 32767), min (v_scale, 32767),
3444 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3465 min (h_align, 32767), min (v_align, 32767));
3445 process_xterm_seq (XTerm_title, str, CHAR_ST); 3466 process_xterm_seq (XTerm_title, str, CHAR_ST);
3446 } 3467 }
3447 else 3468 else
3448 { 3469 {
3449 int changed = 0; 3470 int changed = 0;
3450 3471
3451 if (*str != ';') 3472 if (*str != ';')
3452 { 3473 {
3453 /* reset to default scaling :*/
3454 bgPixmap.unset_geometry ();
3455 if (bgPixmap.set_file (str)) /* change pixmap */ 3474 if (bg_set_file (str)) /* change pixmap */
3475 {
3456 changed++; 3476 changed++;
3457 str = strchr (str, ';'); 3477 str = strchr (str, ';');
3458 if (str == NULL) 3478 if (str == NULL)
3459 bgPixmap.set_defaultGeometry (); 3479 bg_set_default_geometry ();
3480 else
3481 bg_set_geometry (str+1);
3482 }
3460 } 3483 }
3461 3484 else
3462 while (str)
3463 { 3485 {
3464 str++; 3486 str++;
3465 if (bgPixmap.set_geometry (str)) 3487 if (bg_set_geometry (str, true))
3466 changed++; 3488 changed++;
3467 str = strchr (str, ';');
3468 } 3489 }
3469 3490
3470 if (changed) 3491 if (changed)
3492 {
3493 if (bg_window_position_sensitive ())
3494 {
3495 int x, y;
3496 get_window_origin (x, y);
3497 bg_set_position (x, y);
3498 }
3471 update_background (); 3499 update_background ();
3500 }
3472 } 3501 }
3473 break; 3502 break;
3474#endif 3503#endif
3475 3504
3476 case XTerm_logfile: 3505 case XTerm_logfile:
… …
3579 { 3608 {
3580 if (mode == 'r') 3609 if (mode == 'r')
3581 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3610 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3582 else 3611 else
3583 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3612 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3613
3584 set_privmode (bit, state); 3614 set_privmode (bit, state);
3585 } 3615 }
3586 3616
3587 return state; 3617 return state;
3588} 3618}
… …
3607 { 6, PrivMode_relOrigin }, // DECOM 3637 { 6, PrivMode_relOrigin }, // DECOM
3608 { 7, PrivMode_Autowrap }, // DECAWM 3638 { 7, PrivMode_Autowrap }, // DECAWM
3609 // 8, auto-repeat keys // DECARM 3639 // 8, auto-repeat keys // DECARM
3610 { 9, PrivMode_MouseX10 }, 3640 { 9, PrivMode_MouseX10 },
3611 // 18 end FF to printer after print screen 3641 // 18 end FF to printer after print screen
3612 // 19 Print screen prints full screen/scorll region 3642 // 19 Print screen prints full screen/scroll region
3613 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3643 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3614#ifdef scrollBar_esc 3644#ifdef scrollBar_esc
3615 { scrollBar_esc, PrivMode_scrollBar }, 3645 { scrollBar_esc, PrivMode_scrollBar },
3616#endif 3646#endif
3617 { 35, PrivMode_ShiftKeys }, // rxvt extension 3647 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3626 { 67, PrivMode_BackSpace }, // DECBKM 3656 { 67, PrivMode_BackSpace }, // DECBKM
3627#endif 3657#endif
3628 { 1000, PrivMode_MouseX11 }, 3658 { 1000, PrivMode_MouseX11 },
3629 { 1002, PrivMode_MouseBtnEvent }, 3659 { 1002, PrivMode_MouseBtnEvent },
3630 { 1003, PrivMode_MouseAnyEvent }, 3660 { 1003, PrivMode_MouseAnyEvent },
3661#if ENABLE_FRILLS
3662 { 1005, PrivMode_ExtModeMouse },
3663#endif
3631 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3664 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3632 { 1011, PrivMode_Keypress }, // rxvt extension 3665 { 1011, PrivMode_Keypress }, // rxvt extension
3666#if ENABLE_FRILLS
3667 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3668#endif
3633 // 1035 enable modifiers for alt, numlock NYI 3669 // 1035 enable modifiers for alt, numlock NYI
3634 // 1036 send ESC for meta keys NYI 3670 // 1036 send ESC for meta keys NYI
3635 // 1037 send DEL for keypad delete NYI 3671 // 1037 send DEL for keypad delete NYI
3636 { 1047, PrivMode_Screen }, 3672 { 1047, PrivMode_Screen },
3637 // 1048 save and restore cursor 3673 // 1048 save and restore cursor, implemented in code
3638 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3674 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3639 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3675 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3640 { 2004, PrivMode_BracketPaste }, 3676 { 2004, PrivMode_BracketPaste },
3641 }; 3677 };
3642 3678
… …
3652 for (i = 0; i < nargs; i++) 3688 for (i = 0; i < nargs; i++)
3653 { 3689 {
3654 state = -1; 3690 state = -1;
3655 3691
3656 /* basic handling */ 3692 /* basic handling */
3657 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3693 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3658 if (argtopriv[j].argval == arg[i]) 3694 if (argtopriv[j].argval == arg[i])
3659 { 3695 {
3660 state = privcases (mode, argtopriv[j].bit); 3696 state = privcases (mode, argtopriv[j].bit);
3661 break; 3697 break;
3662 } 3698 }
… …
3740 case 1003: 3776 case 1003:
3741 if (state) 3777 if (state)
3742 { 3778 {
3743 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3779 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3744 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3780 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3781 mouse_row = mouse_col = 0;
3745 vt_emask_mouse = PointerMotionMask; 3782 vt_emask_mouse = PointerMotionMask;
3746 } 3783 }
3747 else 3784 else
3748 vt_emask_mouse = NoEventMask; 3785 vt_emask_mouse = NoEventMask;
3749 3786
… …
3934 } 3971 }
3935 } 3972 }
3936} 3973}
3937/*}}} */ 3974/*}}} */
3938 3975
3939/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3940void
3941rxvt_term::process_graphics ()
3942{
3943 unicode_t ch, cmd = cmd_getc ();
3944
3945 if (cmd == 'Q')
3946 {
3947 /* query graphics */
3948 tt_printf ("\033G0\012"); /* no graphics */
3949 return;
3950 }
3951 /* swallow other graphics sequences until terminating ':' */
3952 do
3953 ch = cmd_getc ();
3954 while (ch != ':');
3955}
3956/*}}} */
3957
3958/* ------------------------------------------------------------------------- */ 3976/* ------------------------------------------------------------------------- */
3959 3977
3960/* 3978/*
3961 * Send printf () formatted output to the command. 3979 * Send printf () formatted output to the command.
3962 * Only use for small amounts of data. 3980 * Only use for small amounts of data.
… …
3975 3993
3976/* ---------------------------------------------------------------------- */ 3994/* ---------------------------------------------------------------------- */
3977/* Write data to the pty as typed by the user, pasted with the mouse, 3995/* Write data to the pty as typed by the user, pasted with the mouse,
3978 * or generated by us in response to a query ESC sequence. 3996 * or generated by us in response to a query ESC sequence.
3979 */ 3997 */
3980const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3998static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3981 3999
3982void 4000void
3983rxvt_term::tt_write (const char *data, unsigned int len) 4001rxvt_term::tt_write (const char *data, unsigned int len)
3984{ 4002{
3985 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4003 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3997 4015
3998 data += written; 4016 data += written;
3999 len -= written; 4017 len -= written;
4000 } 4018 }
4001 4019
4002 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4020 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4003 4021
4004 memcpy (v_buffer + v_buflen, data, len); 4022 memcpy (v_buffer + v_buflen, data, len);
4005 v_buflen += len; 4023 v_buflen += len;
4006 4024
4007 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