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.439 by sf-exg, Wed Feb 10 16:05:42 2010 UTC vs.
Revision 1.478 by root, Thu Feb 24 12:42: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
… …
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
… …
288} 288}
289 289
290static int 290static int
291hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
292{ 292{
293 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
294 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
295 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
296 { 296 {
297 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
298 298
… …
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
… …
1137 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1138 // that giving a process calling sched_yield () less cpu time than 1137 // that giving a process calling sched_yield () less cpu time than
1139 // ones with high nice levels is a useful thing to do. It surely is is 1138 // ones with high nice levels is a useful thing to do. It surely is is
1140 // allowed by the sus... as is returning ENOSYS. 1139 // allowed by the sus... as is returning ENOSYS.
1141 // since the linux guys additionally thought that breaking the only 1140 // since the linux guys additionally thought that breaking the only
1142 // known workaroudn against their unusable sched_yield hack is cool, 1141 // known workaround against their unusable sched_yield hack is cool,
1143 // we just nanosleep a bit and hope for the best. 1142 // we just nanosleep a bit and hope for the best.
1144 1143
1145 struct timespec ts = { 0, 1000 }; 1144 struct timespec ts = { 0, 1000 };
1146 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1147 1146
… …
1159rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1160{ 1159{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1162 1161
1163 if (CBUFSIZ == n) 1162 if (CBUFSIZ == n)
1164 { 1163 n = 0; // normally this indicates a "too long" command sequence - just drop the data we have
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1166 n = 0;
1167 }
1168 1164
1169 memmove (cmdbuf_base, cmdbuf_ptr, n); 1165 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1166 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1167 cmdbuf_endp = cmdbuf_ptr + n;
1172 1168
… …
1252{ 1248{
1253 int button_number, key_state = 0; 1249 int button_number, key_state = 0;
1254 int x, y; 1250 int x, y;
1255 int code = 32; 1251 int code = 32;
1256 1252
1257 x = Pixel2Col (ev.x); 1253 x = Pixel2Col (ev.x) + 1;
1258 y = Pixel2Row (ev.y); 1254 y = Pixel2Row (ev.y) + 1;
1255
1259 if (ev.type == MotionNotify) 1256 if (ev.type == MotionNotify)
1260 { 1257 {
1261 if (x == mouse_row && y == mouse_col) 1258 if (x == mouse_row && y == mouse_col)
1262 return; 1259 return;
1260
1263 mouse_row = x; 1261 mouse_row = x;
1264 mouse_col = y; 1262 mouse_col = y;
1265 code += 32; 1263 code += 32;
1266 } 1264 }
1267 1265
… …
1270 else 1268 else
1271 { 1269 {
1272 button_number = MEvent.button - Button1; 1270 button_number = MEvent.button - Button1;
1273 /* add 0x3D for wheel events, like xterm does */ 1271 /* add 0x3D for wheel events, like xterm does */
1274 if (button_number >= 3) 1272 if (button_number >= 3)
1275 button_number += (64 - 3); 1273 button_number += 64 - 3;
1276 } 1274 }
1277 1275
1278 if (priv_modes & PrivMode_MouseX10) 1276 if (priv_modes & PrivMode_MouseX10)
1279 { 1277 {
1280 /* 1278 /*
… …
1312 fputc ('A', stderr); 1310 fputc ('A', stderr);
1313 if (key_state & 32) 1311 if (key_state & 32)
1314 fputc ('2', stderr); 1312 fputc ('2', stderr);
1315 fprintf (stderr, "]: <%d>, %d/%d\n", 1313 fprintf (stderr, "]: <%d>, %d/%d\n",
1316 button_number, 1314 button_number,
1317 x + 1, 1315 x,
1318 y + 1); 1316 y);
1319#endif 1317#endif
1320 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
1321 tt_printf ("\033[M%c%c%c", 1332 tt_printf ("\033[M%c%c%c",
1322 (code + button_number + key_state), 1333 code + button_number + key_state,
1323 (32 + x + 1), 1334 32 + x,
1324 (32 + y + 1)); 1335 32 + y);
1325} 1336}
1326 1337
1327/*{{{ process an X event */ 1338/*{{{ process an X event */
1328void 1339void
1329rxvt_term::x_cb (XEvent &ev) 1340rxvt_term::x_cb (XEvent &ev)
… …
1431 && ev.xfocus.mode != NotifyGrab) 1442 && ev.xfocus.mode != NotifyGrab)
1432 focus_out (); 1443 focus_out ();
1433 break; 1444 break;
1434 1445
1435 case ConfigureNotify: 1446 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]) 1447 if (ev.xconfigure.window == parent[0])
1440 { 1448 {
1441 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1449 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1442 ; 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
1443 1470
1444 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1445 { 1472 {
1446 seen_resize = 1; 1473 seen_resize = 1;
1447 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1448 } 1475 }
1449 else 1476 else
1450 { 1477 {
1451#ifdef HAVE_BG_PIXMAP 1478#ifdef HAVE_BG_PIXMAP
1452 if (bgPixmap.window_position_sensitive ()) 1479 if (moved)
1453 { 1480 {
1454 if (mapped) 1481 if (mapped)
1455 update_background (); 1482 update_background ();
1456 else 1483 else
1457 bgPixmap.invalidate (); 1484 bg_invalidate ();
1458 } 1485 }
1459#endif 1486#endif
1460 } 1487 }
1461 1488
1462 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1489 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 } 1490 }
1464 break; 1491 break;
1465 1492
1466 case PropertyNotify: 1493 case PropertyNotify:
1467 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1494 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; 1495 break;
1473 1496
1474 case SelectionClear: 1497 case SelectionClear:
1475 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1498 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1476 break; 1499 break;
1477 1500
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: 1501 case SelectionRequest:
1484 selection_send (ev.xselectionrequest); 1502 selection_send (ev.xselectionrequest);
1485 break; 1503 break;
1486 1504
1487 case MapNotify: 1505 case MapNotify:
1488#ifdef HAVE_BG_PIXMAP 1506#ifdef HAVE_BG_PIXMAP
1489 /* 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
1490 * non-reparenting window manager. In those cases we never get first 1508 * non-reparenting window manager. In those cases we never get first
1491 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1509 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1492 * care of multiplicity of ConfigureNotify events arriwing while WM does 1510 * care of multiplicity of ConfigureNotify events arriving while WM does
1493 * reparenting. 1511 * reparenting.
1494 * We should not render background immidiately, as there could be several 1512 * 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 1513 * 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 1514 * by scheduling background redraw as soon as we can, but giving a short
1497 * bit of time for ConfigureNotifies to arrive. 1515 * bit of time for ConfigureNotifies to arrive.
1498 * 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
1499 * of ConfigureNotifys for the best results. 1517 * of ConfigureNotifys for the best results.
1500 */ 1518 */
1501 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1519 if (!(bg_flags & BG_IS_VALID))
1502 update_background_ev.start (0.025); 1520 update_background_ev.start (0.025);
1503#endif 1521#endif
1504 mapped = 1; 1522 mapped = 1;
1505#ifdef TEXT_BLINK 1523#ifdef TEXT_BLINK
1506 text_blink_ev.start (); 1524 text_blink_ev.start ();
… …
1521 if (ev.xany.window == vt) 1539 if (ev.xany.window == vt)
1522 { 1540 {
1523 do 1541 do
1524 { 1542 {
1525 scr_expose (ev.xexpose.x, ev.xexpose.y, 1543 scr_expose (ev.xexpose.x, ev.xexpose.y,
1526 ev.xexpose.width, ev.xexpose.height, False); 1544 ev.xexpose.width, ev.xexpose.height, false);
1527 } 1545 }
1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1546 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1529 1547
1530 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1531 1549
1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1550 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1533 { 1551 {
1534 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1535 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1536 } 1554 }
1537 1555
1538 want_refresh = 1; 1556 want_refresh = 1;
1539 } 1557 }
1540 else 1558 else
… …
1821 * 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.
1822 */ 1840 */
1823 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1841 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1842 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1825 { 1843 {
1826 bgPixmap.set_root_pixmap (); 1844 bg_set_root_pixmap ();
1827 update_background (); 1845 update_background ();
1828 } 1846 }
1829 1847
1830 break; 1848 break;
1831 } 1849 }
… …
1870 /* save the xbutton state (for ButtonRelease) */ 1888 /* save the xbutton state (for ButtonRelease) */
1871 MEvent.state = ev.state; 1889 MEvent.state = ev.state;
1872#ifdef MOUSE_REPORT_DOUBLECLICK 1890#ifdef MOUSE_REPORT_DOUBLECLICK
1873 if (ev.button == MEvent.button && clickintime) 1891 if (ev.button == MEvent.button && clickintime)
1874 { 1892 {
1875 /* same button, within alloted time */ 1893 /* same button, within allowed time */
1876 MEvent.clicks++; 1894 MEvent.clicks++;
1877 1895
1878 if (MEvent.clicks > 1) 1896 if (MEvent.clicks > 1)
1879 { 1897 {
1880 /* only report double clicks */ 1898 /* only report double clicks */
… …
2151 selection_make (ev.time); 2169 selection_make (ev.time);
2152 break; 2170 break;
2153 2171
2154 case Button2: 2172 case Button2:
2155 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?
2156 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2174 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2157 break; 2175 break;
2158 2176
2159#ifdef MOUSE_WHEEL 2177#ifdef MOUSE_WHEEL
2160 case Button4: 2178 case Button4:
2161 case Button5: 2179 case Button5:
… …
2664 2682
2665 /* 8.3.87: NEXT LINE */ 2683 /* 8.3.87: NEXT LINE */
2666 case C1_NEL: /* ESC E */ 2684 case C1_NEL: /* ESC E */
2667 { 2685 {
2668 wchar_t nlcr[] = { C0_LF, C0_CR }; 2686 wchar_t nlcr[] = { C0_LF, C0_CR };
2669 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2687 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2670 } 2688 }
2671 break; 2689 break;
2672 2690
2673 /* kidnapped escape sequence: Should be 8.3.48 */ 2691 /* kidnapped escape sequence: Should be 8.3.48 */
2674 case C1_ESA: /* ESC G */ 2692 case C1_ESA: /* ESC G */
… …
2743 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2761 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2744 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2762 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2745 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2763 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2746}; 2764};
2747 2765
2748#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2766#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2749 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2767 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2750 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2768 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2751#define get_byte_array_bit(array, bit) \ 2769#define get_byte_array_bit(array, bit) \
2752 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2770 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2753 2771
2754const unsigned char csi_defaults[] = 2772static const unsigned char csi_defaults[] =
2755 { 2773 {
2756 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2774 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2757 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2775 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2758 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2776 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2759 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2777 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2848 { 2866 {
2849 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2867 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2850 scr_soft_reset (); 2868 scr_soft_reset ();
2851 2869
2852 static const int pm_h[] = { 7, 25 }; 2870 static const int pm_h[] = { 7, 25 };
2853 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2871 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2854 2872
2855 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2873 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2856 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2874 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2857 } 2875 }
2858 break; 2876 break;
2859 } 2877 }
2860 2878
2861 return; 2879 return;
… …
3232 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3233 */ 3251 */
3234void 3252void
3235rxvt_term::process_dcs_seq () 3253rxvt_term::process_dcs_seq ()
3236{ 3254{
3237 char *s;
3238 unicode_t eh;
3239
3240 /* 3255 /*
3241 * Not handled yet 3256 * Not handled yet
3242 */ 3257 */
3258
3259 unicode_t eh;
3243 s = get_to_st (eh); 3260 char *s = get_to_st (eh);
3244 if (s) 3261 if (s)
3245 free (s); 3262 free (s);
3246 3263
3247 return; 3264 return;
3248} 3265}
… …
3252 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3269 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3253 */ 3270 */
3254void 3271void
3255rxvt_term::process_osc_seq () 3272rxvt_term::process_osc_seq ()
3256{ 3273{
3257 unicode_t ch, eh;
3258 int arg; 3274 int arg;
3259 3275
3260 ch = cmd_getc (); 3276 unicode_t ch = cmd_getc ();
3261 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3277 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3262 arg = arg * 10 + (ch - '0'); 3278 arg = arg * 10 + (ch - '0');
3263 3279
3264 if (ch == ';') 3280 if (ch == ';')
3265 { 3281 {
3282 unicode_t eh;
3266 char *s = get_to_st (eh); 3283 char *s = get_to_st (eh);
3267 3284
3268 if (s) 3285 if (s)
3269 { 3286 {
3270 process_xterm_seq (arg, s, eh); 3287 process_xterm_seq (arg, s, eh);
… …
3395 process_color_seq (op, Color_pointer_fg, str, resp); 3412 process_color_seq (op, Color_pointer_fg, str, resp);
3396 break; 3413 break;
3397 case XTerm_Color_pointer_bg: 3414 case XTerm_Color_pointer_bg:
3398 process_color_seq (op, Color_pointer_bg, str, resp); 3415 process_color_seq (op, Color_pointer_bg, str, resp);
3399 break; 3416 break;
3417#ifdef OPTION_HC
3418 case XTerm_Color_HC:
3419 process_color_seq (op, Color_HC, str, resp);
3420 break;
3421 case XTerm_Color_HTC:
3422 process_color_seq (op, Color_HTC, str, resp);
3423 break;
3424#endif
3400#ifndef NO_BOLD_UNDERLINE_REVERSE 3425#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: 3426 case URxvt_Color_BD:
3406 process_color_seq (op, Color_BD, str, resp); 3427 process_color_seq (op, Color_BD, str, resp);
3407 break; 3428 break;
3408 case Rxvt_Color_UL:
3409 case URxvt_Color_UL: 3429 case URxvt_Color_UL:
3410 process_color_seq (op, Color_UL, str, resp); 3430 process_color_seq (op, Color_UL, str, resp);
3411 break; 3431 break;
3412 case URxvt_Color_IT: 3432 case URxvt_Color_IT:
3413 process_color_seq (op, Color_IT, str, resp); 3433 process_color_seq (op, Color_IT, str, resp);
… …
3421 process_color_seq (op, Color_tint, str, resp); 3441 process_color_seq (op, Color_tint, str, resp);
3422 { 3442 {
3423 bool changed = false; 3443 bool changed = false;
3424 3444
3425 if (ISSET_PIXCOLOR (Color_tint)) 3445 if (ISSET_PIXCOLOR (Color_tint))
3426 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3446 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3427 else
3428 changed = bgPixmap.unset_tint ();
3429 3447
3430 if (changed) 3448 if (changed)
3431 update_background (); 3449 update_background ();
3432 } 3450 }
3433 3451
… …
3439 if (!strcmp (str, "?")) 3457 if (!strcmp (str, "?"))
3440 { 3458 {
3441 char str[256]; 3459 char str[256];
3442 3460
3443 sprintf (str, "[%dx%d+%d+%d]", 3461 sprintf (str, "[%dx%d+%d+%d]",
3444 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3462 min (h_scale, 32767), min (v_scale, 32767),
3445 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3463 min (h_align, 32767), min (v_align, 32767));
3446 process_xterm_seq (XTerm_title, str, CHAR_ST); 3464 process_xterm_seq (XTerm_title, str, CHAR_ST);
3447 } 3465 }
3448 else 3466 else
3449 { 3467 {
3450 int changed = 0; 3468 int changed = 0;
3451 3469
3452 if (*str != ';') 3470 if (*str != ';')
3453 { 3471 {
3454 /* reset to default scaling :*/
3455 bgPixmap.unset_geometry ();
3456 if (bgPixmap.set_file (str)) /* change pixmap */ 3472 if (bg_set_file (str)) /* change pixmap */
3473 {
3457 changed++; 3474 changed++;
3458 str = strchr (str, ';'); 3475 str = strchr (str, ';');
3459 if (str == NULL) 3476 if (str == NULL)
3460 bgPixmap.set_defaultGeometry (); 3477 bg_set_default_geometry ();
3478 else
3479 bg_set_geometry (str+1);
3480 }
3461 } 3481 }
3462 3482 else
3463 while (str)
3464 { 3483 {
3465 str++; 3484 str++;
3466 if (bgPixmap.set_geometry (str)) 3485 if (bg_set_geometry (str, true))
3467 changed++; 3486 changed++;
3468 str = strchr (str, ';');
3469 } 3487 }
3470 3488
3471 if (changed) 3489 if (changed)
3490 {
3491 if (bg_window_position_sensitive ())
3492 {
3493 int x, y;
3494 get_window_origin (x, y);
3495 bg_set_position (x, y);
3496 }
3472 update_background (); 3497 update_background ();
3498 }
3473 } 3499 }
3474 break; 3500 break;
3475#endif 3501#endif
3476 3502
3477 case XTerm_logfile: 3503 case XTerm_logfile:
… …
3580 { 3606 {
3581 if (mode == 'r') 3607 if (mode == 'r')
3582 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3583 else 3609 else
3584 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3610 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3611
3585 set_privmode (bit, state); 3612 set_privmode (bit, state);
3586 } 3613 }
3587 3614
3588 return state; 3615 return state;
3589} 3616}
… …
3608 { 6, PrivMode_relOrigin }, // DECOM 3635 { 6, PrivMode_relOrigin }, // DECOM
3609 { 7, PrivMode_Autowrap }, // DECAWM 3636 { 7, PrivMode_Autowrap }, // DECAWM
3610 // 8, auto-repeat keys // DECARM 3637 // 8, auto-repeat keys // DECARM
3611 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
3612 // 18 end FF to printer after print screen 3639 // 18 end FF to printer after print screen
3613 // 19 Print screen prints full screen/scorll region 3640 // 19 Print screen prints full screen/scroll region
3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3615#ifdef scrollBar_esc 3642#ifdef scrollBar_esc
3616 { scrollBar_esc, PrivMode_scrollBar }, 3643 { scrollBar_esc, PrivMode_scrollBar },
3617#endif 3644#endif
3618 { 35, PrivMode_ShiftKeys }, // rxvt extension 3645 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3627 { 67, PrivMode_BackSpace }, // DECBKM 3654 { 67, PrivMode_BackSpace }, // DECBKM
3628#endif 3655#endif
3629 { 1000, PrivMode_MouseX11 }, 3656 { 1000, PrivMode_MouseX11 },
3630 { 1002, PrivMode_MouseBtnEvent }, 3657 { 1002, PrivMode_MouseBtnEvent },
3631 { 1003, PrivMode_MouseAnyEvent }, 3658 { 1003, PrivMode_MouseAnyEvent },
3659#if ENABLE_FRILLS
3660 { 1005, PrivMode_ExtModeMouse },
3661#endif
3632 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3662 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3633 { 1011, PrivMode_Keypress }, // rxvt extension 3663 { 1011, PrivMode_Keypress }, // rxvt extension
3664#if ENABLE_FRILLS
3665 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3666#endif
3634 // 1035 enable modifiers for alt, numlock NYI 3667 // 1035 enable modifiers for alt, numlock NYI
3635 // 1036 send ESC for meta keys NYI 3668 // 1036 send ESC for meta keys NYI
3636 // 1037 send DEL for keypad delete NYI 3669 // 1037 send DEL for keypad delete NYI
3637 { 1047, PrivMode_Screen }, 3670 { 1047, PrivMode_Screen },
3638 // 1048 save and restore cursor 3671 // 1048 save and restore cursor, implemented in code
3639 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3672 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3640 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3673 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3641 { 2004, PrivMode_BracketPaste }, 3674 { 2004, PrivMode_BracketPaste },
3642 }; 3675 };
3643 3676
… …
3653 for (i = 0; i < nargs; i++) 3686 for (i = 0; i < nargs; i++)
3654 { 3687 {
3655 state = -1; 3688 state = -1;
3656 3689
3657 /* basic handling */ 3690 /* basic handling */
3658 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3691 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3659 if (argtopriv[j].argval == arg[i]) 3692 if (argtopriv[j].argval == arg[i])
3660 { 3693 {
3661 state = privcases (mode, argtopriv[j].bit); 3694 state = privcases (mode, argtopriv[j].bit);
3662 break; 3695 break;
3663 } 3696 }
… …
3741 case 1003: 3774 case 1003:
3742 if (state) 3775 if (state)
3743 { 3776 {
3744 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3777 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3745 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3778 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3779 mouse_row = mouse_col = 0;
3746 vt_emask_mouse = PointerMotionMask; 3780 vt_emask_mouse = PointerMotionMask;
3747 } 3781 }
3748 else 3782 else
3749 vt_emask_mouse = NoEventMask; 3783 vt_emask_mouse = NoEventMask;
3750 3784
… …
3976 4010
3977/* ---------------------------------------------------------------------- */ 4011/* ---------------------------------------------------------------------- */
3978/* Write data to the pty as typed by the user, pasted with the mouse, 4012/* 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. 4013 * or generated by us in response to a query ESC sequence.
3980 */ 4014 */
3981const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4015static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3982 4016
3983void 4017void
3984rxvt_term::tt_write (const char *data, unsigned int len) 4018rxvt_term::tt_write (const char *data, unsigned int len)
3985{ 4019{
3986 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4020 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3998 4032
3999 data += written; 4033 data += written;
4000 len -= written; 4034 len -= written;
4001 } 4035 }
4002 4036
4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4037 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4004 4038
4005 memcpy (v_buffer + v_buflen, data, len); 4039 memcpy (v_buffer + v_buflen, data, len);
4006 v_buflen += len; 4040 v_buflen += len;
4007 4041
4008 pty_ev.set (ev::READ | ev::WRITE); 4042 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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