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.442 by sf-exg, Wed Mar 31 09:37:20 2010 UTC vs.
Revision 1.476 by sf-exg, Fri Feb 11 01:24:46 2011 UTC

… …
198 198
199 int width = 0; 199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len); 200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++) 201 for (int i = 0; i < len; i++)
202 { 202 {
203 rxvt_font *f = (*fs)[fs->find_font (chr[i])]; 203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 204 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 206 }
207 207
208 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
… …
421 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
422 */ 422 */
423 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
424 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
426
427 if (numlock_state || (ev.state & ModNumLockMask))
428 {
429 numlock_state = (ev.state & ModNumLockMask);
430 set_privmode (PrivMode_aplKP, !numlock_state);
431 }
432 426
433 kbuf[0] = 0; 427 kbuf[0] = 0;
434 428
435#ifdef USE_XIM 429#ifdef USE_XIM
436 if (Input_Context) 430 if (Input_Context)
… …
653 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
654 { 648 {
655 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
656 unsigned int newlen = 1; 650 unsigned int newlen = 1;
657 651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
658 switch (translate_keypad (keysym, kp)) 655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
659 { 658 {
660#ifndef NO_BACKSPACE_KEY 659#ifndef NO_BACKSPACE_KEY
661 case XK_BackSpace: 660 case XK_BackSpace:
662 if (priv_modes & PrivMode_HaveBackSpace) 661 if (priv_modes & PrivMode_HaveBackSpace)
663 { 662 {
… …
890 commit_iso14755 (); 889 commit_iso14755 ();
891 890
892 return; 891 return;
893 } 892 }
894 893
895 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
896 if (i[0] == keysym) 895 if (i[0] == keysym)
897 { 896 {
898 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
899 commit_iso14755 (); 898 commit_iso14755 ();
900 899
… …
976rxvt_term::flush () 975rxvt_term::flush ()
977{ 976{
978 flush_ev.stop (); 977 flush_ev.stop ();
979 978
980#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
981 if (bgPixmap.check_clearChanged ()) 980 if (bg_flags & BG_NEEDS_REFRESH)
982 { 981 {
983// scr_clear (true); This needs to be researched further! 982 bg_flags &= ~BG_NEEDS_REFRESH;
984 scr_touch (false); 983 scr_touch (false);
985 } 984 }
986#endif 985#endif
987 986
988 if (want_refresh) 987 if (want_refresh)
… …
1033 } 1032 }
1034 1033
1035 display->flush (); 1034 display->flush ();
1036} 1035}
1037 1036
1038/* checks wether a refresh is requested and starts the refresh timer */ 1037/* checks whether a refresh is requested and starts the refresh timer */
1039void 1038void
1040rxvt_term::refresh_check () 1039rxvt_term::refresh_check ()
1041{ 1040{
1042 if (want_refresh && !flush_ev.is_active ()) 1041 if (want_refresh && !flush_ev.is_active ())
1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1252{ 1251{
1253 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1254 int x, y; 1253 int x, y;
1255 int code = 32; 1254 int code = 32;
1256 1255
1257 x = Pixel2Col (ev.x); 1256 x = Pixel2Col (ev.x) + 1;
1258 y = Pixel2Row (ev.y); 1257 y = Pixel2Row (ev.y) + 1;
1258
1259 if (ev.type == MotionNotify) 1259 if (ev.type == MotionNotify)
1260 { 1260 {
1261 if (x == mouse_row && y == mouse_col) 1261 if (x == mouse_row && y == mouse_col)
1262 return; 1262 return;
1263
1263 mouse_row = x; 1264 mouse_row = x;
1264 mouse_col = y; 1265 mouse_col = y;
1265 code += 32; 1266 code += 32;
1266 } 1267 }
1267 1268
… …
1270 else 1271 else
1271 { 1272 {
1272 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1273 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1274 if (button_number >= 3) 1275 if (button_number >= 3)
1275 button_number += (64 - 3); 1276 button_number += 64 - 3;
1276 } 1277 }
1277 1278
1278 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1279 { 1280 {
1280 /* 1281 /*
… …
1312 fputc ('A', stderr); 1313 fputc ('A', stderr);
1313 if (key_state & 32) 1314 if (key_state & 32)
1314 fputc ('2', stderr); 1315 fputc ('2', stderr);
1315 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1316 button_number, 1317 button_number,
1317 x + 1, 1318 x,
1318 y + 1); 1319 y);
1319#endif 1320#endif
1320 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
1321 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1322 (code + button_number + key_state), 1336 code + button_number + key_state,
1323 (32 + x + 1), 1337 32 + x,
1324 (32 + y + 1)); 1338 32 + y);
1325} 1339}
1326 1340
1327/*{{{ process an X event */ 1341/*{{{ process an X event */
1328void 1342void
1329rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
… …
1431 && ev.xfocus.mode != NotifyGrab) 1445 && ev.xfocus.mode != NotifyGrab)
1432 focus_out (); 1446 focus_out ();
1433 break; 1447 break;
1434 1448
1435 case ConfigureNotify: 1449 case ConfigureNotify:
1436 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1437 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1438 szHint.width, szHint.height);*/
1439 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent[0])
1440 { 1451 {
1441 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1442 ; 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
1443 1473
1444 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1445 { 1475 {
1446 seen_resize = 1; 1476 seen_resize = 1;
1447 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1448 } 1478 }
1449 else 1479 else
1450 { 1480 {
1451#ifdef HAVE_BG_PIXMAP 1481#ifdef HAVE_BG_PIXMAP
1452 if (bgPixmap.window_position_sensitive ()) 1482 if (moved)
1453 { 1483 {
1454 if (mapped) 1484 if (mapped)
1455 update_background (); 1485 update_background ();
1456 else 1486 else
1457 bgPixmap.invalidate (); 1487 bg_invalidate ();
1458 } 1488 }
1459#endif 1489#endif
1460 } 1490 }
1461 1491
1462 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 } 1493 }
1464 break; 1494 break;
1465 1495
1466 case PropertyNotify: 1496 case PropertyNotify:
1467 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1468 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1469 && ev.xproperty.state == PropertyNewValue)
1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1471
1472 break; 1498 break;
1473 1499
1474 case SelectionClear: 1500 case SelectionClear:
1475 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1501 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1476 break; 1502 break;
1477 1503
1478 case SelectionNotify:
1479 if (selection_wait == Sel_normal)
1480 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1481 break;
1482
1483 case SelectionRequest: 1504 case SelectionRequest:
1484 selection_send (ev.xselectionrequest); 1505 selection_send (ev.xselectionrequest);
1485 break; 1506 break;
1486 1507
1487 case MapNotify: 1508 case MapNotify:
1488#ifdef HAVE_BG_PIXMAP 1509#ifdef HAVE_BG_PIXMAP
1489 /* 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
1490 * non-reparenting window manager. In those cases we never get first 1511 * non-reparenting window manager. In those cases we never get first
1491 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1512 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1492 * care of multiplicity of ConfigureNotify events arriwing while WM does 1513 * care of multiplicity of ConfigureNotify events arriving while WM does
1493 * reparenting. 1514 * reparenting.
1494 * We should not render background immidiately, as there could be several 1515 * We should not render background immediately, as there could be several
1495 * 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
1496 * 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
1497 * bit of time for ConfigureNotifies to arrive. 1518 * bit of time for ConfigureNotifies to arrive.
1498 * 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
1499 * of ConfigureNotifys for the best results. 1520 * of ConfigureNotifys for the best results.
1500 */ 1521 */
1501 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1522 if (!(bg_flags & BG_IS_VALID))
1502 update_background_ev.start (0.025); 1523 update_background_ev.start (0.025);
1503#endif 1524#endif
1504 mapped = 1; 1525 mapped = 1;
1505#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1506 text_blink_ev.start (); 1527 text_blink_ev.start ();
… …
1521 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1522 { 1543 {
1523 do 1544 do
1524 { 1545 {
1525 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1526 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1527 } 1548 }
1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1529 1550
1530 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1531 1552
1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1533 { 1554 {
1534 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1535 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1536 } 1557 }
1537 1558
1538 want_refresh = 1; 1559 want_refresh = 1;
1539 } 1560 }
1540 else 1561 else
… …
1821 * 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.
1822 */ 1843 */
1823 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1825 { 1846 {
1826 bgPixmap.set_root_pixmap (); 1847 bg_set_root_pixmap ();
1827 update_background (); 1848 update_background ();
1828 } 1849 }
1829 1850
1830 break; 1851 break;
1831 } 1852 }
… …
1870 /* save the xbutton state (for ButtonRelease) */ 1891 /* save the xbutton state (for ButtonRelease) */
1871 MEvent.state = ev.state; 1892 MEvent.state = ev.state;
1872#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1873 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1874 { 1895 {
1875 /* same button, within alloted time */ 1896 /* same button, within allowed time */
1876 MEvent.clicks++; 1897 MEvent.clicks++;
1877 1898
1878 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1879 { 1900 {
1880 /* only report double clicks */ 1901 /* only report double clicks */
… …
2151 selection_make (ev.time); 2172 selection_make (ev.time);
2152 break; 2173 break;
2153 2174
2154 case Button2: 2175 case Button2:
2155 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?
2156 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2157 break; 2178 break;
2158 2179
2159#ifdef MOUSE_WHEEL 2180#ifdef MOUSE_WHEEL
2160 case Button4: 2181 case Button4:
2161 case Button5: 2182 case Button5:
… …
2664 2685
2665 /* 8.3.87: NEXT LINE */ 2686 /* 8.3.87: NEXT LINE */
2666 case C1_NEL: /* ESC E */ 2687 case C1_NEL: /* ESC E */
2667 { 2688 {
2668 wchar_t nlcr[] = { C0_LF, C0_CR }; 2689 wchar_t nlcr[] = { C0_LF, C0_CR };
2669 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2670 } 2691 }
2671 break; 2692 break;
2672 2693
2673 /* kidnapped escape sequence: Should be 8.3.48 */ 2694 /* kidnapped escape sequence: Should be 8.3.48 */
2674 case C1_ESA: /* ESC G */ 2695 case C1_ESA: /* ESC G */
… …
2743 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,
2744 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 ,
2745 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
2746}; 2767};
2747 2768
2748#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2769#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2749 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2770 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2750 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2771 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2751#define get_byte_array_bit(array, bit) \ 2772#define get_byte_array_bit(array, bit) \
2752 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2773 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2753 2774
2754const unsigned char csi_defaults[] = 2775static const unsigned char csi_defaults[] =
2755 { 2776 {
2756 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, */
2757 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, */
2758 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, */
2759 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, [, \, ], ^, _, */
… …
2848 { 2869 {
2849 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2870 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2850 scr_soft_reset (); 2871 scr_soft_reset ();
2851 2872
2852 static const int pm_h[] = { 7, 25 }; 2873 static const int pm_h[] = { 7, 25 };
2853 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 };
2854 2875
2855 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);
2856 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);
2857 } 2878 }
2858 break; 2879 break;
2859 } 2880 }
2860 2881
2861 return; 2882 return;
… …
3232 * 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)'
3233 */ 3254 */
3234void 3255void
3235rxvt_term::process_dcs_seq () 3256rxvt_term::process_dcs_seq ()
3236{ 3257{
3237 char *s;
3238 unicode_t eh;
3239
3240 /* 3258 /*
3241 * Not handled yet 3259 * Not handled yet
3242 */ 3260 */
3261
3262 unicode_t eh;
3243 s = get_to_st (eh); 3263 char *s = get_to_st (eh);
3244 if (s) 3264 if (s)
3245 free (s); 3265 free (s);
3246 3266
3247 return; 3267 return;
3248} 3268}
… …
3252 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3272 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3253 */ 3273 */
3254void 3274void
3255rxvt_term::process_osc_seq () 3275rxvt_term::process_osc_seq ()
3256{ 3276{
3257 unicode_t ch, eh;
3258 int arg; 3277 int arg;
3259 3278
3260 ch = cmd_getc (); 3279 unicode_t ch = cmd_getc ();
3261 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3280 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3262 arg = arg * 10 + (ch - '0'); 3281 arg = arg * 10 + (ch - '0');
3263 3282
3264 if (ch == ';') 3283 if (ch == ';')
3265 { 3284 {
3285 unicode_t eh;
3266 char *s = get_to_st (eh); 3286 char *s = get_to_st (eh);
3267 3287
3268 if (s) 3288 if (s)
3269 { 3289 {
3270 process_xterm_seq (arg, s, eh); 3290 process_xterm_seq (arg, s, eh);
… …
3395 process_color_seq (op, Color_pointer_fg, str, resp); 3415 process_color_seq (op, Color_pointer_fg, str, resp);
3396 break; 3416 break;
3397 case XTerm_Color_pointer_bg: 3417 case XTerm_Color_pointer_bg:
3398 process_color_seq (op, Color_pointer_bg, str, resp); 3418 process_color_seq (op, Color_pointer_bg, str, resp);
3399 break; 3419 break;
3420#ifdef OPTION_HC
3421 case XTerm_Color_HC:
3422 process_color_seq (op, Color_HC, str, resp);
3423 break;
3424 case XTerm_Color_HTC:
3425 process_color_seq (op, Color_HTC, str, resp);
3426 break;
3427#endif
3400#ifndef NO_BOLD_UNDERLINE_REVERSE 3428#ifndef NO_BOLD_UNDERLINE_REVERSE
3401 case XTerm_Color_RV:
3402 process_color_seq (op, Color_RV, str, resp);
3403 break;
3404 case Rxvt_Color_BD:
3405 case URxvt_Color_BD: 3429 case URxvt_Color_BD:
3406 process_color_seq (op, Color_BD, str, resp); 3430 process_color_seq (op, Color_BD, str, resp);
3407 break; 3431 break;
3408 case Rxvt_Color_UL:
3409 case URxvt_Color_UL: 3432 case URxvt_Color_UL:
3410 process_color_seq (op, Color_UL, str, resp); 3433 process_color_seq (op, Color_UL, str, resp);
3411 break; 3434 break;
3412 case URxvt_Color_IT: 3435 case URxvt_Color_IT:
3413 process_color_seq (op, Color_IT, str, resp); 3436 process_color_seq (op, Color_IT, str, resp);
… …
3421 process_color_seq (op, Color_tint, str, resp); 3444 process_color_seq (op, Color_tint, str, resp);
3422 { 3445 {
3423 bool changed = false; 3446 bool changed = false;
3424 3447
3425 if (ISSET_PIXCOLOR (Color_tint)) 3448 if (ISSET_PIXCOLOR (Color_tint))
3426 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3449 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3427 else
3428 changed = bgPixmap.unset_tint ();
3429 3450
3430 if (changed) 3451 if (changed)
3431 update_background (); 3452 update_background ();
3432 } 3453 }
3433 3454
… …
3439 if (!strcmp (str, "?")) 3460 if (!strcmp (str, "?"))
3440 { 3461 {
3441 char str[256]; 3462 char str[256];
3442 3463
3443 sprintf (str, "[%dx%d+%d+%d]", 3464 sprintf (str, "[%dx%d+%d+%d]",
3444 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3465 min (h_scale, 32767), min (v_scale, 32767),
3445 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3466 min (h_align, 32767), min (v_align, 32767));
3446 process_xterm_seq (XTerm_title, str, CHAR_ST); 3467 process_xterm_seq (XTerm_title, str, CHAR_ST);
3447 } 3468 }
3448 else 3469 else
3449 { 3470 {
3450 int changed = 0; 3471 int changed = 0;
3451 3472
3452 if (*str != ';') 3473 if (*str != ';')
3453 { 3474 {
3454 /* reset to default scaling :*/
3455 bgPixmap.unset_geometry ();
3456 if (bgPixmap.set_file (str)) /* change pixmap */ 3475 if (bg_set_file (str)) /* change pixmap */
3476 {
3457 changed++; 3477 changed++;
3458 str = strchr (str, ';'); 3478 str = strchr (str, ';');
3459 if (str == NULL) 3479 if (str == NULL)
3460 bgPixmap.set_defaultGeometry (); 3480 bg_set_default_geometry ();
3481 else
3482 bg_set_geometry (str+1);
3483 }
3461 } 3484 }
3462 3485 else
3463 while (str)
3464 { 3486 {
3465 str++; 3487 str++;
3466 if (bgPixmap.set_geometry (str)) 3488 if (bg_set_geometry (str, true))
3467 changed++; 3489 changed++;
3468 str = strchr (str, ';');
3469 } 3490 }
3470 3491
3471 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 }
3472 update_background (); 3500 update_background ();
3501 }
3473 } 3502 }
3474 break; 3503 break;
3475#endif 3504#endif
3476 3505
3477 case XTerm_logfile: 3506 case XTerm_logfile:
… …
3580 { 3609 {
3581 if (mode == 'r') 3610 if (mode == 'r')
3582 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3611 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3583 else 3612 else
3584 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3613 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3614
3585 set_privmode (bit, state); 3615 set_privmode (bit, state);
3586 } 3616 }
3587 3617
3588 return state; 3618 return state;
3589} 3619}
… …
3608 { 6, PrivMode_relOrigin }, // DECOM 3638 { 6, PrivMode_relOrigin }, // DECOM
3609 { 7, PrivMode_Autowrap }, // DECAWM 3639 { 7, PrivMode_Autowrap }, // DECAWM
3610 // 8, auto-repeat keys // DECARM 3640 // 8, auto-repeat keys // DECARM
3611 { 9, PrivMode_MouseX10 }, 3641 { 9, PrivMode_MouseX10 },
3612 // 18 end FF to printer after print screen 3642 // 18 end FF to printer after print screen
3613 // 19 Print screen prints full screen/scorll region 3643 // 19 Print screen prints full screen/scroll region
3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3644 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3615#ifdef scrollBar_esc 3645#ifdef scrollBar_esc
3616 { scrollBar_esc, PrivMode_scrollBar }, 3646 { scrollBar_esc, PrivMode_scrollBar },
3617#endif 3647#endif
3618 { 35, PrivMode_ShiftKeys }, // rxvt extension 3648 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3627 { 67, PrivMode_BackSpace }, // DECBKM 3657 { 67, PrivMode_BackSpace }, // DECBKM
3628#endif 3658#endif
3629 { 1000, PrivMode_MouseX11 }, 3659 { 1000, PrivMode_MouseX11 },
3630 { 1002, PrivMode_MouseBtnEvent }, 3660 { 1002, PrivMode_MouseBtnEvent },
3631 { 1003, PrivMode_MouseAnyEvent }, 3661 { 1003, PrivMode_MouseAnyEvent },
3662#if ENABLE_FRILLS
3663 { 1005, PrivMode_ExtModeMouse },
3664#endif
3632 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3665 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3633 { 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
3634 // 1035 enable modifiers for alt, numlock NYI 3670 // 1035 enable modifiers for alt, numlock NYI
3635 // 1036 send ESC for meta keys NYI 3671 // 1036 send ESC for meta keys NYI
3636 // 1037 send DEL for keypad delete NYI 3672 // 1037 send DEL for keypad delete NYI
3637 { 1047, PrivMode_Screen }, 3673 { 1047, PrivMode_Screen },
3638 // 1048 save and restore cursor 3674 // 1048 save and restore cursor, implemented in code
3639 { 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 */
3640 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3676 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3641 { 2004, PrivMode_BracketPaste }, 3677 { 2004, PrivMode_BracketPaste },
3642 }; 3678 };
3643 3679
… …
3653 for (i = 0; i < nargs; i++) 3689 for (i = 0; i < nargs; i++)
3654 { 3690 {
3655 state = -1; 3691 state = -1;
3656 3692
3657 /* basic handling */ 3693 /* basic handling */
3658 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3694 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3659 if (argtopriv[j].argval == arg[i]) 3695 if (argtopriv[j].argval == arg[i])
3660 { 3696 {
3661 state = privcases (mode, argtopriv[j].bit); 3697 state = privcases (mode, argtopriv[j].bit);
3662 break; 3698 break;
3663 } 3699 }
… …
3741 case 1003: 3777 case 1003:
3742 if (state) 3778 if (state)
3743 { 3779 {
3744 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3780 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3745 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;
3746 vt_emask_mouse = PointerMotionMask; 3783 vt_emask_mouse = PointerMotionMask;
3747 } 3784 }
3748 else 3785 else
3749 vt_emask_mouse = NoEventMask; 3786 vt_emask_mouse = NoEventMask;
3750 3787
… …
3976 4013
3977/* ---------------------------------------------------------------------- */ 4014/* ---------------------------------------------------------------------- */
3978/* 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,
3979 * or generated by us in response to a query ESC sequence. 4016 * or generated by us in response to a query ESC sequence.
3980 */ 4017 */
3981const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4018static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3982 4019
3983void 4020void
3984rxvt_term::tt_write (const char *data, unsigned int len) 4021rxvt_term::tt_write (const char *data, unsigned int len)
3985{ 4022{
3986 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)))
… …
3998 4035
3999 data += written; 4036 data += written;
4000 len -= written; 4037 len -= written;
4001 } 4038 }
4002 4039
4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4040 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4004 4041
4005 memcpy (v_buffer + v_buflen, data, len); 4042 memcpy (v_buffer + v_buflen, data, len);
4006 v_buflen += len; 4043 v_buflen += len;
4007 4044
4008 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