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.448 by sf-exg, Sat Apr 17 23:00:45 2010 UTC vs.
Revision 1.477 by root, Mon Feb 21 07:41:00 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-2007 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)
… …
1251{ 1251{
1252 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1253 int x, y; 1253 int x, y;
1254 int code = 32; 1254 int code = 32;
1255 1255
1256 x = Pixel2Col (ev.x); 1256 x = Pixel2Col (ev.x) + 1;
1257 y = Pixel2Row (ev.y); 1257 y = Pixel2Row (ev.y) + 1;
1258
1258 if (ev.type == MotionNotify) 1259 if (ev.type == MotionNotify)
1259 { 1260 {
1260 if (x == mouse_row && y == mouse_col) 1261 if (x == mouse_row && y == mouse_col)
1261 return; 1262 return;
1263
1262 mouse_row = x; 1264 mouse_row = x;
1263 mouse_col = y; 1265 mouse_col = y;
1264 code += 32; 1266 code += 32;
1265 } 1267 }
1266 1268
… …
1269 else 1271 else
1270 { 1272 {
1271 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1272 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1273 if (button_number >= 3) 1275 if (button_number >= 3)
1274 button_number += (64 - 3); 1276 button_number += 64 - 3;
1275 } 1277 }
1276 1278
1277 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1278 { 1280 {
1279 /* 1281 /*
… …
1311 fputc ('A', stderr); 1313 fputc ('A', stderr);
1312 if (key_state & 32) 1314 if (key_state & 32)
1313 fputc ('2', stderr); 1315 fputc ('2', stderr);
1314 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1315 button_number, 1317 button_number,
1316 x + 1, 1318 x,
1317 y + 1); 1319 y);
1318#endif 1320#endif
1319 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
1320 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1321 (code + button_number + key_state), 1336 code + button_number + key_state,
1322 (32 + x + 1), 1337 32 + x,
1323 (32 + y + 1)); 1338 32 + y);
1324} 1339}
1325 1340
1326/*{{{ process an X event */ 1341/*{{{ process an X event */
1327void 1342void
1328rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
… …
1430 && ev.xfocus.mode != NotifyGrab) 1445 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1446 focus_out ();
1432 break; 1447 break;
1433 1448
1434 case ConfigureNotify: 1449 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]) 1450 if (ev.xconfigure.window == parent[0])
1439 { 1451 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 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
1442 1473
1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1475 {
1445 seen_resize = 1; 1476 seen_resize = 1;
1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1478 }
1448 else 1479 else
1449 { 1480 {
1450#ifdef HAVE_BG_PIXMAP 1481#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ()) 1482 if (moved)
1452 { 1483 {
1453 if (mapped) 1484 if (mapped)
1454 update_background (); 1485 update_background ();
1455 else 1486 else
1456 bgPixmap.invalidate (); 1487 bg_invalidate ();
1457 } 1488 }
1458#endif 1489#endif
1459 } 1490 }
1460 1491
1461 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1462 } 1493 }
1463 break; 1494 break;
1464 1495
1465 case PropertyNotify: 1496 case PropertyNotify:
1466 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 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; 1498 break;
1472 1499
1473 case SelectionClear: 1500 case SelectionClear:
1474 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1501 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1475 break; 1502 break;
1476 1503
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: 1504 case SelectionRequest:
1483 selection_send (ev.xselectionrequest); 1505 selection_send (ev.xselectionrequest);
1484 break; 1506 break;
1485 1507
1486 case MapNotify: 1508 case MapNotify:
1487#ifdef HAVE_BG_PIXMAP 1509#ifdef HAVE_BG_PIXMAP
1488 /* 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
1489 * non-reparenting window manager. In those cases we never get first 1511 * non-reparenting window manager. In those cases we never get first
1490 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1512 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1491 * care of multiplicity of ConfigureNotify events arriwing while WM does 1513 * care of multiplicity of ConfigureNotify events arriving while WM does
1492 * reparenting. 1514 * reparenting.
1493 * We should not render background immidiately, as there could be several 1515 * 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 1516 * 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 1517 * by scheduling background redraw as soon as we can, but giving a short
1496 * bit of time for ConfigureNotifies to arrive. 1518 * bit of time for ConfigureNotifies to arrive.
1497 * 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
1498 * of ConfigureNotifys for the best results. 1520 * of ConfigureNotifys for the best results.
1499 */ 1521 */
1500 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1522 if (!(bg_flags & BG_IS_VALID))
1501 update_background_ev.start (0.025); 1523 update_background_ev.start (0.025);
1502#endif 1524#endif
1503 mapped = 1; 1525 mapped = 1;
1504#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1505 text_blink_ev.start (); 1527 text_blink_ev.start ();
… …
1520 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1521 { 1543 {
1522 do 1544 do
1523 { 1545 {
1524 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1525 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1526 } 1548 }
1527 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1528 1550
1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1530 1552
1531 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1532 { 1554 {
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1535 } 1557 }
1536 1558
1537 want_refresh = 1; 1559 want_refresh = 1;
1538 } 1560 }
1539 else 1561 else
… …
1820 * 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.
1821 */ 1843 */
1822 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1823 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1824 { 1846 {
1825 bgPixmap.set_root_pixmap (); 1847 bg_set_root_pixmap ();
1826 update_background (); 1848 update_background ();
1827 } 1849 }
1828 1850
1829 break; 1851 break;
1830 } 1852 }
… …
1869 /* save the xbutton state (for ButtonRelease) */ 1891 /* save the xbutton state (for ButtonRelease) */
1870 MEvent.state = ev.state; 1892 MEvent.state = ev.state;
1871#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1872 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1873 { 1895 {
1874 /* same button, within alloted time */ 1896 /* same button, within allowed time */
1875 MEvent.clicks++; 1897 MEvent.clicks++;
1876 1898
1877 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1878 { 1900 {
1879 /* only report double clicks */ 1901 /* only report double clicks */
… …
2663 2685
2664 /* 8.3.87: NEXT LINE */ 2686 /* 8.3.87: NEXT LINE */
2665 case C1_NEL: /* ESC E */ 2687 case C1_NEL: /* ESC E */
2666 { 2688 {
2667 wchar_t nlcr[] = { C0_LF, C0_CR }; 2689 wchar_t nlcr[] = { C0_LF, C0_CR };
2668 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2669 } 2691 }
2670 break; 2692 break;
2671 2693
2672 /* kidnapped escape sequence: Should be 8.3.48 */ 2694 /* kidnapped escape sequence: Should be 8.3.48 */
2673 case C1_ESA: /* ESC G */ 2695 case C1_ESA: /* ESC G */
… …
2742 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2764 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 , 2765 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 2766 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2745}; 2767};
2746 2768
2747#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2769#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2748 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2770 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2749 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2771 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2750#define get_byte_array_bit(array, bit) \ 2772#define get_byte_array_bit(array, bit) \
2751 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2773 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2752 2774
2753const unsigned char csi_defaults[] = 2775static const unsigned char csi_defaults[] =
2754 { 2776 {
2755 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2777 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, */ 2778 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, */ 2779 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, [, \, ], ^, _, */ 2780 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2847 { 2869 {
2848 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2870 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2849 scr_soft_reset (); 2871 scr_soft_reset ();
2850 2872
2851 static const int pm_h[] = { 7, 25 }; 2873 static const int pm_h[] = { 7, 25 };
2852 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2874 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2853 2875
2854 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2876 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); 2877 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2856 } 2878 }
2857 break; 2879 break;
2858 } 2880 }
2859 2881
2860 return; 2882 return;
… …
3231 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3253 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3232 */ 3254 */
3233void 3255void
3234rxvt_term::process_dcs_seq () 3256rxvt_term::process_dcs_seq ()
3235{ 3257{
3236 char *s;
3237 unicode_t eh;
3238
3239 /* 3258 /*
3240 * Not handled yet 3259 * Not handled yet
3241 */ 3260 */
3261
3262 unicode_t eh;
3242 s = get_to_st (eh); 3263 char *s = get_to_st (eh);
3243 if (s) 3264 if (s)
3244 free (s); 3265 free (s);
3245 3266
3246 return; 3267 return;
3247} 3268}
… …
3251 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3272 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3252 */ 3273 */
3253void 3274void
3254rxvt_term::process_osc_seq () 3275rxvt_term::process_osc_seq ()
3255{ 3276{
3256 unicode_t ch, eh;
3257 int arg; 3277 int arg;
3258 3278
3259 ch = cmd_getc (); 3279 unicode_t ch = cmd_getc ();
3260 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3280 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3261 arg = arg * 10 + (ch - '0'); 3281 arg = arg * 10 + (ch - '0');
3262 3282
3263 if (ch == ';') 3283 if (ch == ';')
3264 { 3284 {
3285 unicode_t eh;
3265 char *s = get_to_st (eh); 3286 char *s = get_to_st (eh);
3266 3287
3267 if (s) 3288 if (s)
3268 { 3289 {
3269 process_xterm_seq (arg, s, eh); 3290 process_xterm_seq (arg, s, eh);
… …
3398 break; 3419 break;
3399#ifdef OPTION_HC 3420#ifdef OPTION_HC
3400 case XTerm_Color_HC: 3421 case XTerm_Color_HC:
3401 process_color_seq (op, Color_HC, str, resp); 3422 process_color_seq (op, Color_HC, str, resp);
3402 break; 3423 break;
3424 case XTerm_Color_HTC:
3425 process_color_seq (op, Color_HTC, str, resp);
3426 break;
3403#endif 3427#endif
3404#ifndef NO_BOLD_UNDERLINE_REVERSE 3428#ifndef NO_BOLD_UNDERLINE_REVERSE
3405 case Rxvt_Color_BD:
3406 case URxvt_Color_BD: 3429 case URxvt_Color_BD:
3407 process_color_seq (op, Color_BD, str, resp); 3430 process_color_seq (op, Color_BD, str, resp);
3408 break; 3431 break;
3409 case Rxvt_Color_UL:
3410 case URxvt_Color_UL: 3432 case URxvt_Color_UL:
3411 process_color_seq (op, Color_UL, str, resp); 3433 process_color_seq (op, Color_UL, str, resp);
3412 break; 3434 break;
3413 case URxvt_Color_IT: 3435 case URxvt_Color_IT:
3414 process_color_seq (op, Color_IT, str, resp); 3436 process_color_seq (op, Color_IT, str, resp);
… …
3422 process_color_seq (op, Color_tint, str, resp); 3444 process_color_seq (op, Color_tint, str, resp);
3423 { 3445 {
3424 bool changed = false; 3446 bool changed = false;
3425 3447
3426 if (ISSET_PIXCOLOR (Color_tint)) 3448 if (ISSET_PIXCOLOR (Color_tint))
3427 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3449 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3428 else
3429 changed = bgPixmap.unset_tint ();
3430 3450
3431 if (changed) 3451 if (changed)
3432 update_background (); 3452 update_background ();
3433 } 3453 }
3434 3454
… …
3440 if (!strcmp (str, "?")) 3460 if (!strcmp (str, "?"))
3441 { 3461 {
3442 char str[256]; 3462 char str[256];
3443 3463
3444 sprintf (str, "[%dx%d+%d+%d]", 3464 sprintf (str, "[%dx%d+%d+%d]",
3445 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3465 min (h_scale, 32767), min (v_scale, 32767),
3446 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3466 min (h_align, 32767), min (v_align, 32767));
3447 process_xterm_seq (XTerm_title, str, CHAR_ST); 3467 process_xterm_seq (XTerm_title, str, CHAR_ST);
3448 } 3468 }
3449 else 3469 else
3450 { 3470 {
3451 int changed = 0; 3471 int changed = 0;
3452 3472
3453 if (*str != ';') 3473 if (*str != ';')
3454 { 3474 {
3455 /* reset to default scaling :*/
3456 bgPixmap.unset_geometry ();
3457 if (bgPixmap.set_file (str)) /* change pixmap */ 3475 if (bg_set_file (str)) /* change pixmap */
3476 {
3458 changed++; 3477 changed++;
3459 str = strchr (str, ';'); 3478 str = strchr (str, ';');
3460 if (str == NULL) 3479 if (str == NULL)
3461 bgPixmap.set_defaultGeometry (); 3480 bg_set_default_geometry ();
3481 else
3482 bg_set_geometry (str+1);
3483 }
3462 } 3484 }
3463 3485 else
3464 while (str)
3465 { 3486 {
3466 str++; 3487 str++;
3467 if (bgPixmap.set_geometry (str)) 3488 if (bg_set_geometry (str, true))
3468 changed++; 3489 changed++;
3469 str = strchr (str, ';');
3470 } 3490 }
3471 3491
3472 if (changed) 3492 if (changed)
3493 {
3494 if (bg_window_position_sensitive ())
3495 {
3496 int x, y;
3497 get_window_origin (x, y);
3498 bg_set_position (x, y);
3499 }
3473 update_background (); 3500 update_background ();
3501 }
3474 } 3502 }
3475 break; 3503 break;
3476#endif 3504#endif
3477 3505
3478 case XTerm_logfile: 3506 case XTerm_logfile:
… …
3581 { 3609 {
3582 if (mode == 'r') 3610 if (mode == 'r')
3583 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3611 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3584 else 3612 else
3585 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3613 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3614
3586 set_privmode (bit, state); 3615 set_privmode (bit, state);
3587 } 3616 }
3588 3617
3589 return state; 3618 return state;
3590} 3619}
… …
3609 { 6, PrivMode_relOrigin }, // DECOM 3638 { 6, PrivMode_relOrigin }, // DECOM
3610 { 7, PrivMode_Autowrap }, // DECAWM 3639 { 7, PrivMode_Autowrap }, // DECAWM
3611 // 8, auto-repeat keys // DECARM 3640 // 8, auto-repeat keys // DECARM
3612 { 9, PrivMode_MouseX10 }, 3641 { 9, PrivMode_MouseX10 },
3613 // 18 end FF to printer after print screen 3642 // 18 end FF to printer after print screen
3614 // 19 Print screen prints full screen/scorll region 3643 // 19 Print screen prints full screen/scroll region
3615 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3644 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3616#ifdef scrollBar_esc 3645#ifdef scrollBar_esc
3617 { scrollBar_esc, PrivMode_scrollBar }, 3646 { scrollBar_esc, PrivMode_scrollBar },
3618#endif 3647#endif
3619 { 35, PrivMode_ShiftKeys }, // rxvt extension 3648 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3628 { 67, PrivMode_BackSpace }, // DECBKM 3657 { 67, PrivMode_BackSpace }, // DECBKM
3629#endif 3658#endif
3630 { 1000, PrivMode_MouseX11 }, 3659 { 1000, PrivMode_MouseX11 },
3631 { 1002, PrivMode_MouseBtnEvent }, 3660 { 1002, PrivMode_MouseBtnEvent },
3632 { 1003, PrivMode_MouseAnyEvent }, 3661 { 1003, PrivMode_MouseAnyEvent },
3662#if ENABLE_FRILLS
3663 { 1005, PrivMode_ExtModeMouse },
3664#endif
3633 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3665 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3634 { 1011, PrivMode_Keypress }, // rxvt extension 3666 { 1011, PrivMode_Keypress }, // rxvt extension
3667#if ENABLE_FRILLS
3668 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3669#endif
3635 // 1035 enable modifiers for alt, numlock NYI 3670 // 1035 enable modifiers for alt, numlock NYI
3636 // 1036 send ESC for meta keys NYI 3671 // 1036 send ESC for meta keys NYI
3637 // 1037 send DEL for keypad delete NYI 3672 // 1037 send DEL for keypad delete NYI
3638 { 1047, PrivMode_Screen }, 3673 { 1047, PrivMode_Screen },
3639 // 1048 save and restore cursor 3674 // 1048 save and restore cursor, implemented in code
3640 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3675 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3641 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3676 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3642 { 2004, PrivMode_BracketPaste }, 3677 { 2004, PrivMode_BracketPaste },
3643 }; 3678 };
3644 3679
… …
3654 for (i = 0; i < nargs; i++) 3689 for (i = 0; i < nargs; i++)
3655 { 3690 {
3656 state = -1; 3691 state = -1;
3657 3692
3658 /* basic handling */ 3693 /* basic handling */
3659 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3694 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3660 if (argtopriv[j].argval == arg[i]) 3695 if (argtopriv[j].argval == arg[i])
3661 { 3696 {
3662 state = privcases (mode, argtopriv[j].bit); 3697 state = privcases (mode, argtopriv[j].bit);
3663 break; 3698 break;
3664 } 3699 }
… …
3742 case 1003: 3777 case 1003:
3743 if (state) 3778 if (state)
3744 { 3779 {
3745 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3780 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3746 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3781 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3782 mouse_row = mouse_col = 0;
3747 vt_emask_mouse = PointerMotionMask; 3783 vt_emask_mouse = PointerMotionMask;
3748 } 3784 }
3749 else 3785 else
3750 vt_emask_mouse = NoEventMask; 3786 vt_emask_mouse = NoEventMask;
3751 3787
… …
3977 4013
3978/* ---------------------------------------------------------------------- */ 4014/* ---------------------------------------------------------------------- */
3979/* Write data to the pty as typed by the user, pasted with the mouse, 4015/* Write data to the pty as typed by the user, pasted with the mouse,
3980 * or generated by us in response to a query ESC sequence. 4016 * or generated by us in response to a query ESC sequence.
3981 */ 4017 */
3982const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4018static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3983 4019
3984void 4020void
3985rxvt_term::tt_write (const char *data, unsigned int len) 4021rxvt_term::tt_write (const char *data, unsigned int len)
3986{ 4022{
3987 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4023 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3999 4035
4000 data += written; 4036 data += written;
4001 len -= written; 4037 len -= written;
4002 } 4038 }
4003 4039
4004 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4040 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4005 4041
4006 memcpy (v_buffer + v_buflen, data, len); 4042 memcpy (v_buffer + v_buflen, data, len);
4007 v_buflen += len; 4043 v_buflen += len;
4008 4044
4009 pty_ev.set (ev::READ | ev::WRITE); 4045 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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