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.366 by ayin, Thu Nov 15 11:36:15 2007 UTC vs.
Revision 1.408 by ayin, Sat Feb 16 13:36:10 2008 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-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * 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
33 * 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
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 201
201 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
202 203
203 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
205 206
206 if (y >= 0) 207 if (y >= 0)
207 { 208 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
220 ch = *chr++; 221 ch = *chr++;
221 222
222 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
225# if !UNICODE3 226# if !UNICODE_3
226 if (ch >= 0x10000) 227 if (ch >= 0x10000)
227 ch = 0xfffd; 228 ch = 0xfffd;
228# endif 229# endif
229 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
230 231
… …
278 } 279 }
279 280
280 iso14755buf = 0; 281 iso14755buf = 0;
281} 282}
282 283
283int 284static int
284rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
285{ 286{
286 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
289 { 290 {
… …
297 298
298 return -1; 299 return -1;
299} 300}
300#endif 301#endif
301 302
303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
302void 339void
303rxvt_term::key_press (XKeyEvent &ev) 340rxvt_term::key_press (XKeyEvent &ev)
304{ 341{
305 int ctrl, meta, shft, len; 342 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 343 KeySym keysym;
308 int valid_keysym; 344 int valid_keysym;
309 char kbuf[KBUFSZ]; 345 char kbuf[KBUFSZ];
310 346
311#if ISO_14755 347#if ISO_14755
… …
546 } 582 }
547#endif 583#endif
548 584
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 585 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 586 {
551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 587 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553 newlen = 1; 588 unsigned int newlen = 1;
554#ifdef XK_KP_Home
555 static const KeySym keypadtrans[] = {
556 XK_KP_7, // XK_KP_Home
557 XK_KP_4, // XK_KP_Left
558 XK_KP_8, // XK_KP_Up
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 };
571 589
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 590 switch (translate_keypad (keysym, kp))
573 {
574 unsigned int index = keysym - XK_KP_Home;
575 keysym = kp ? keypadtrans[index] : XK_Home + index;
576 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
584 switch (keysym)
585 { 591 {
586#ifndef NO_BACKSPACE_KEY 592#ifndef NO_BACKSPACE_KEY
587 case XK_BackSpace: 593 case XK_BackSpace:
588 if (priv_modes & PrivMode_HaveBackSpace) 594 if (priv_modes & PrivMode_HaveBackSpace)
589 { 595 {
… …
788 break; 794 break;
789 } 795 }
790 796
791 if (newlen) 797 if (newlen)
792 len = strlen (kbuf); 798 len = strlen (kbuf);
793 }
794 799
795 /* 800 /*
796 * Pass meta for all function keys, if 'meta' option set 801 * Pass meta for all function keys, if 'meta' option set
797 */ 802 */
798#ifdef META8_OPTION 803#ifdef META8_OPTION
… …
1041 } 1046 }
1042 1047
1043 display->flush (); 1048 display->flush ();
1044} 1049}
1045 1050
1051/* checks wether a refresh is requested and starts the refresh timer */
1046void 1052void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1053rxvt_term::refresh_check ()
1048{ 1054{
1049 make_current (); 1055 if (want_refresh && !flush_ev.is_active ())
1056 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050 1057
1051 display->flush (); 1058 display->flush ();
1052
1053 if (want_refresh && !flush_ev.active)
1054 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1055} 1059}
1056 1060
1057void 1061void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1062rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1063{
… …
1067void 1071void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1072rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1073{
1070 hidden_cursor = !hidden_cursor; 1074 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1075 want_refresh = 1;
1076 refresh_check ();
1072} 1077}
1073#endif 1078#endif
1074 1079
1075#ifdef TEXT_BLINK 1080#ifdef TEXT_BLINK
1076void 1081void
… …
1078{ 1083{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1084 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1085 {
1081 hidden_text = !hidden_text; 1086 hidden_text = !hidden_text;
1082 want_refresh = 1; 1087 want_refresh = 1;
1088 refresh_check ();
1083 } 1089 }
1090 else
1091 w.stop ();
1084} 1092}
1085#endif 1093#endif
1086 1094
1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1095#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1088void 1096void
1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1097rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1090{ 1098{
1091 if ((scrollbar_isUp() || scrollbar_isDn()) && 1099 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1092 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1100 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1101 {
1093 want_refresh = 1; 1102 want_refresh = 1;
1103 refresh_check ();
1104 }
1094 else 1105 else
1095 w.stop (); 1106 w.stop ();
1096} 1107}
1097#endif 1108#endif
1098 1109
… …
1102{ 1113{
1103 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1114 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1104 { 1115 {
1105 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1116 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1106 want_refresh = 1; 1117 want_refresh = 1;
1118 refresh_check ();
1107 } 1119 }
1108 else 1120 else
1109 w.stop (); 1121 w.stop ();
1110} 1122}
1111#endif 1123#endif
1112 1124
1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1125#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1114void 1126void
1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1127rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1116{ 1128{
1117 if (mouse_slip_wheel_speed == 0 1129 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1118 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1119 : scr_page (UP, mouse_slip_wheel_speed))
1120 { 1130 {
1121 if (view_start == top_row || view_start == 0)
1122 mouse_slip_wheel_speed = 0;
1123
1124 want_refresh = 1; 1131 want_refresh = 1;
1132 refresh_check ();
1133 }
1134
1135 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1125 } 1136 {
1126 else 1137 mouse_slip_wheel_speed = 0;
1127 w.stop (); 1138 w.stop ();
1139 }
1128} 1140}
1129#endif 1141#endif
1130 1142
1131#if LINUX_YIELD_HACK 1143#if LINUX_YIELD_HACK
1132static struct event_handler 1144static struct event_handler
… …
1204 if (cmd_parse ()) 1216 if (cmd_parse ())
1205 break; 1217 break;
1206 1218
1207 if (revents & ev::WRITE) 1219 if (revents & ev::WRITE)
1208 pty_write (); 1220 pty_write ();
1221
1222 refresh_check ();
1209} 1223}
1210 1224
1211void 1225void
1212rxvt_term::pointer_unblank () 1226rxvt_term::pointer_unblank ()
1213{ 1227{
… …
1428 && ev.xfocus.mode != NotifyGrab) 1442 && ev.xfocus.mode != NotifyGrab)
1429 focus_out (); 1443 focus_out ();
1430 break; 1444 break;
1431 1445
1432 case ConfigureNotify: 1446 case ConfigureNotify:
1433 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1447 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1434 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1448 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1435 szHint.width, szHint.height); */ 1449 szHint.width, szHint.height);*/
1436 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent[0])
1437 { 1451 {
1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439 ; 1453 ;
1440 1454
… …
1445 } 1459 }
1446 else 1460 else
1447 { 1461 {
1448#ifdef HAVE_BG_PIXMAP 1462#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ()) 1463 if (bgPixmap.window_position_sensitive ())
1464 {
1465 if (mapped)
1450 update_background (); 1466 update_background ();
1467 else
1468 bgPixmap.invalidate ();
1469 }
1451#endif 1470#endif
1452 } 1471 }
1472
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1473 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1474 }
1455 break; 1475 break;
1456 1476
1457 case PropertyNotify: 1477 case PropertyNotify:
… …
1474 case SelectionRequest: 1494 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1476 break; 1496 break;
1477 1497
1478 case MapNotify: 1498 case MapNotify:
1499#ifdef HAVE_BG_PIXMAP
1500 /* This is needed spcifically to fix the case of no window manager or a
1501 * non-reparenting window manager. In those cases we never get first
1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1503 * care of multiplicity of ConfigureNotify events arriwing while WM does
1504 * reparenting.
1505 * We should not render background immidiately, as there could be several
1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1507 * by scheduling background redraw as soon as we can, but giving a short
1508 * bit of time for ConfigureNotifies to arrive.
1509 * We should render background PRIOR to drawing any text, but AFTER all
1510 * of ConfigureNotifys for the best results.
1511 */
1512 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1513 update_background_ev.start (0.025);
1514#endif
1479 mapped = 1; 1515 mapped = 1;
1480#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1481 text_blink_ev.start (TEXT_BLINK_INTERVAL); 1517 text_blink_ev.start ();
1482#endif 1518#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break; 1520 break;
1485 1521
1486 case UnmapNotify: 1522 case UnmapNotify:
… …
1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 { 1544 {
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1511 } 1547 }
1548
1512 want_refresh = 1; 1549 want_refresh = 1;
1513 } 1550 }
1514 else 1551 else
1515 { 1552 {
1516 XEvent unused_event; 1553 XEvent unused_event;
… …
1518 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1519 ; 1556 ;
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1521 ; 1558 ;
1522 1559
1523 if (isScrollbarWindow (ev.xany.window)) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1524 { 1561 {
1525 scrollBar.setIdle (); 1562 scrollBar.state = STATE_IDLE;
1526 scrollbar_show (0); 1563 scrollbar_show (0);
1527 } 1564 }
1528 } 1565 }
1529 break; 1566 break;
1530 1567
… …
1577 int dist; 1614 int dist;
1578 1615
1579 /* don't clobber the current delay if we are 1616 /* don't clobber the current delay if we are
1580 * already in the middle of scrolling. 1617 * already in the middle of scrolling.
1581 */ 1618 */
1582 if (!sel_scroll_ev.active) 1619 if (!sel_scroll_ev.is_active ())
1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1620 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1584 1621
1585 /* save the event params so we can highlight 1622 /* save the event params so we can highlight
1586 * the selection in the pending-scroll loop 1623 * the selection in the pending-scroll loop
1587 */ 1624 */
… …
1610 else 1647 else
1611 { 1648 {
1612 /* we are within the text window, so we 1649 /* we are within the text window, so we
1613 * shouldn't be scrolling 1650 * shouldn't be scrolling
1614 */ 1651 */
1615 if (sel_scroll_ev.active)
1616 sel_scroll_ev.stop(); 1652 sel_scroll_ev.stop();
1617 } 1653 }
1618#endif 1654#endif
1619#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1620 } 1656 }
1621#endif 1657#endif
1622 } 1658 }
1623 } 1659 }
1624 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1625 { 1661 {
1626 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1627 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1628 ; 1664 ;
1629 1665
… …
1664 1700
1665 if (ev.type == KeyPress && hidden_pointer == 0) 1701 if (ev.type == KeyPress && hidden_pointer == 0)
1666 pointer_blank (); 1702 pointer_blank ();
1667 } 1703 }
1668#endif 1704#endif
1705
1706 refresh_check ();
1669} 1707}
1670 1708
1671void 1709void
1672rxvt_term::focus_in () 1710rxvt_term::focus_in ()
1673{ 1711{
… …
1685 XSetICFocus (Input_Context); 1723 XSetICFocus (Input_Context);
1686 } 1724 }
1687#endif 1725#endif
1688#if CURSOR_BLINK 1726#if CURSOR_BLINK
1689 if (option (Opt_cursorBlink)) 1727 if (option (Opt_cursorBlink))
1690 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL); 1728 cursor_blink_ev.again ();
1691#endif 1729#endif
1692#if OFF_FOCUS_FADING 1730#if OFF_FOCUS_FADING
1693 if (rs[Rs_fade]) 1731 if (rs[Rs_fade])
1694 { 1732 {
1695 pix_colors = pix_colors_focused; 1733 pix_colors = pix_colors_focused;
… …
1783 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1821 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1784 { 1822 {
1785 bgPixmap.set_root_pixmap (); 1823 bgPixmap.set_root_pixmap ();
1786 update_background (); 1824 update_background ();
1787 } 1825 }
1826
1788 break; 1827 break;
1789 } 1828 }
1790# endif 1829# endif
1830
1831 refresh_check ();
1791} 1832}
1792#endif 1833#endif
1793 1834
1794void 1835void
1795rxvt_term::button_press (XButtonEvent &ev) 1836rxvt_term::button_press (XButtonEvent &ev)
… …
1908 } 1949 }
1909 1950
1910 /* 1951 /*
1911 * Scrollbar window processing of button press 1952 * Scrollbar window processing of button press
1912 */ 1953 */
1913 if (isScrollbarWindow (ev.window)) 1954 if (scrollBar.state && ev.window == scrollBar.win)
1914 { 1955 {
1915 scrollBar.setIdle (); 1956 page_dirn direction = NO_DIR;
1957
1958 if (scrollBar.upButton (ev.y))
1959 direction = UP; /* up */
1960 else if (scrollBar.dnButton (ev.y))
1961 direction = DN; /* down */
1962
1963 scrollBar.state = STATE_IDLE;
1916 /* 1964 /*
1917 * Rxvt-style scrollbar: 1965 * Rxvt-style scrollbar:
1918 * move up if mouse is above slider 1966 * move up if mouse is above slider
1919 * move dn if mouse is below slider 1967 * move dn if mouse is below slider
1920 * 1968 *
… …
1929 /* 1977 /*
1930 * Mouse report disabled scrollbar: 1978 * Mouse report disabled scrollbar:
1931 * arrow buttons - send up/down 1979 * arrow buttons - send up/down
1932 * click on scrollbar - send pageup/down 1980 * click on scrollbar - send pageup/down
1933 */ 1981 */
1934 if ((scrollBar.style == R_SB_NEXT 1982 if (direction == UP)
1935 && scrollbarnext_upButton (ev.y))
1936 || (scrollBar.style == R_SB_RXVT
1937 && scrollbarrxvt_upButton (ev.y)))
1938 tt_printf ("\033[A"); 1983 tt_printf ("\033[A");
1939 else if ((scrollBar.style == R_SB_NEXT 1984 else if (direction == DN)
1940 && scrollbarnext_dnButton (ev.y))
1941 || (scrollBar.style == R_SB_RXVT
1942 && scrollbarrxvt_dnButton (ev.y)))
1943 tt_printf ("\033[B"); 1985 tt_printf ("\033[B");
1944 else 1986 else
1945 switch (ev.button) 1987 switch (ev.button)
1946 { 1988 {
1947 case Button2: 1989 case Button2:
… …
1955 break; 1997 break;
1956 } 1998 }
1957 } 1999 }
1958 else 2000 else
1959#endif /* NO_SCROLLBAR_REPORT */ 2001#endif /* NO_SCROLLBAR_REPORT */
1960
1961 {
1962 char upordown = 0;
1963
1964 if (scrollBar.style == R_SB_NEXT)
1965 { 2002 {
1966 if (scrollbarnext_upButton (ev.y)) 2003 if (direction != NO_DIR)
1967 upordown = -1; /* up */
1968 else if (scrollbarnext_dnButton (ev.y))
1969 upordown = 1; /* down */
1970 }
1971 else if (scrollBar.style == R_SB_RXVT)
1972 {
1973 if (scrollbarrxvt_upButton (ev.y))
1974 upordown = -1; /* up */
1975 else if (scrollbarrxvt_dnButton (ev.y))
1976 upordown = 1; /* down */
1977 }
1978 if (upordown)
1979 { 2004 {
1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2005#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2006 if (!cont_scroll_ev.is_active ())
1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2007 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1982#endif 2008#endif
1983 if (scr_page (upordown < 0 ? UP : DN, 1)) 2009 if (scr_page (direction, 1))
1984 { 2010 {
1985 if (upordown < 0) 2011 if (direction == UP)
1986 scrollBar.setUp (); 2012 scrollBar.state = STATE_UP;
1987 else 2013 else
1988 scrollBar.setDn (); 2014 scrollBar.state = STATE_DOWN;
1989 } 2015 }
1990 } 2016 }
1991 else 2017 else
1992 switch (ev.button) 2018 switch (ev.button)
1993 { 2019 {
1994 case Button2: 2020 case Button2:
1995 switch (scrollbar_align) 2021 switch (scrollBar.align)
1996 { 2022 {
1997 case R_SB_ALIGN_TOP: 2023 case R_SB_ALIGN_TOP:
1998 csrO = 0; 2024 csrO = 0;
1999 break; 2025 break;
2000 case R_SB_ALIGN_CENTRE: 2026 case R_SB_ALIGN_CENTRE:
… …
2008 if (scrollBar.style == R_SB_XTERM 2034 if (scrollBar.style == R_SB_XTERM
2009 || scrollbar_above_slider (ev.y) 2035 || scrollbar_above_slider (ev.y)
2010 || scrollbar_below_slider (ev.y)) 2036 || scrollbar_below_slider (ev.y))
2011 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2037 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2012 2038
2013 scrollBar.setMotion (); 2039 scrollBar.state = STATE_MOTION;
2014 break; 2040 break;
2015 2041
2016 case Button1: 2042 case Button1:
2017 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2043 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2018 csrO = ev.y - scrollBar.top; 2044 csrO = ev.y - scrollBar.top;
2019 /* FALLTHROUGH */ 2045 /* FALLTHROUGH */
2020 2046
2021 case Button3: 2047 case Button3:
2022 if (scrollBar.style != R_SB_XTERM) 2048 if (scrollBar.style != R_SB_XTERM)
… …
2032 scr_page (DN, nrow - 1); 2058 scr_page (DN, nrow - 1);
2033# else 2059# else
2034 scr_page (DN, nrow / 4); 2060 scr_page (DN, nrow / 4);
2035# endif 2061# endif
2036 else 2062 else
2037 scrollBar.setMotion (); 2063 scrollBar.state = STATE_MOTION;
2038 } 2064 }
2039 else 2065 else
2040 { 2066 {
2041 scr_page ((ev.button == Button1 ? DN : UP), 2067 scr_page ((ev.button == Button1 ? DN : UP),
2042 (nrow 2068 (nrow
… …
2059 2085
2060 csrO = 0; /* reset csr Offset */ 2086 csrO = 0; /* reset csr Offset */
2061 if (!bypass_keystate) 2087 if (!bypass_keystate)
2062 reportmode = !! (priv_modes & PrivMode_mouse_report); 2088 reportmode = !! (priv_modes & PrivMode_mouse_report);
2063 2089
2064 if (scrollbar_isUpDn ()) 2090 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2065 { 2091 {
2066 scrollBar.setIdle (); 2092 scrollBar.state = STATE_IDLE;
2067 scrollbar_show (0); 2093 scrollbar_show (0);
2068 } 2094 }
2069 2095
2070#ifdef SELECTION_SCROLLING 2096#ifdef SELECTION_SCROLLING
2071 if (sel_scroll_ev.active)
2072 sel_scroll_ev.stop(); 2097 sel_scroll_ev.stop();
2073#endif 2098#endif
2074 2099
2075 if (ev.window == vt) 2100 if (ev.window == vt)
2076 { 2101 {
2077 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2102 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2149 { 2174 {
2150 mouse_slip_wheel_speed += v ? -1 : 1; 2175 mouse_slip_wheel_speed += v ? -1 : 1;
2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2176 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2177 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2153 2178
2179 if (!slip_wheel_ev.is_active ())
2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2180 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2155 } 2181 }
2156 else 2182 else
2183# endif
2157 { 2184 {
2158# endif
2159 scr_page (v, i); 2185 scr_page (v, i);
2160 scrollbar_show (1); 2186 scrollbar_show (1);
2161# ifdef MOUSE_SLIP_WHEELING
2162 } 2187 }
2163# endif
2164 } 2188 }
2165 break; 2189 break;
2166#endif 2190#endif
2167 } 2191 }
2168 } 2192 }
… …
2227 2251
2228 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2252 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2229 { 2253 {
2230 refresh_count = 0; 2254 refresh_count = 0;
2231 2255
2232 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.) 2256 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2233 { 2257 {
2234 refreshnow = true; 2258 refreshnow = true;
2235 ch = NOCHAR; 2259 ch = NOCHAR;
2236 break; 2260 break;
2237 } 2261 }
… …
2751 nargs = 0; 2775 nargs = 0;
2752 2776
2753 priv = 0; 2777 priv = 0;
2754 ch = cmd_getc (); 2778 ch = cmd_getc ();
2755 if (ch >= '<' && ch <= '?') 2779 if (ch >= '<' && ch <= '?')
2780 {
2756 { /* '<' '=' '>' '?' */ 2781 /* '<' '=' '>' '?' */
2757 priv = ch; 2782 priv = ch;
2758 ch = cmd_getc (); 2783 ch = cmd_getc ();
2759 } 2784 }
2760 2785
2761 /* read any numerical arguments */ 2786 /* read any numerical arguments */
… …
2810 // versions. 2835 // versions.
2811 // 2836 //
2812 tt_printf ("\033[>%d;95;0c", 'U'); 2837 tt_printf ("\033[>%d;95;0c", 'U');
2813 } 2838 }
2814 break; 2839 break;
2840
2815 case '?': 2841 case '?':
2816 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2817 process_terminal_mode (ch, priv, nargs, arg); 2843 process_terminal_mode (ch, priv, nargs, arg);
2818 break; 2844 break;
2819 } 2845 }
… …
3335 *buf++ = '\0'; 3361 *buf++ = '\0';
3336 3362
3337 process_color_seq (op, color, name, resp); 3363 process_color_seq (op, color, name, resp);
3338 } 3364 }
3339 break; 3365 break;
3366 case Rxvt_restoreFG:
3340 case XTerm_Color00: 3367 case XTerm_Color00:
3341 process_color_seq (op, Color_fg, str, resp); 3368 process_color_seq (op, Color_fg, str, resp);
3342 break; 3369 break;
3370 case Rxvt_restoreBG:
3343 case XTerm_Color01: 3371 case XTerm_Color01:
3344 process_color_seq (op, Color_bg, str, resp); 3372 process_color_seq (op, Color_bg, str, resp);
3345 break; 3373 break;
3346#ifndef NO_CURSORCOLOR 3374#ifndef NO_CURSORCOLOR
3347 case XTerm_Color_cursor: 3375 case XTerm_Color_cursor:
… …
3373#if ENABLE_TRANSPARENCY 3401#if ENABLE_TRANSPARENCY
3374 case URxvt_Color_tint: 3402 case URxvt_Color_tint:
3375 process_color_seq (op, Color_tint, str, resp); 3403 process_color_seq (op, Color_tint, str, resp);
3376 { 3404 {
3377 bool changed = false; 3405 bool changed = false;
3406
3378 if (ISSET_PIXCOLOR (Color_tint)) 3407 if (ISSET_PIXCOLOR (Color_tint))
3379 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3408 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3380 else 3409 else
3381 changed = bgPixmap.unset_tint (); 3410 changed = bgPixmap.unset_tint ();
3411
3382 if (changed) 3412 if (changed)
3383 update_background (); 3413 update_background ();
3384 } 3414 }
3385 3415
3386 break; 3416 break;
… …
3409 changed++; 3439 changed++;
3410 str = strchr (str, ';'); 3440 str = strchr (str, ';');
3411 if (str == NULL) 3441 if (str == NULL)
3412 bgPixmap.set_defaultGeometry (); 3442 bgPixmap.set_defaultGeometry ();
3413 } 3443 }
3444
3414 while (str) 3445 while (str)
3415 { 3446 {
3416 str++; 3447 str++;
3417 if (bgPixmap.set_geometry (str)) 3448 if (bgPixmap.set_geometry (str))
3418 changed++; 3449 changed++;
3419 str = strchr (str, ';'); 3450 str = strchr (str, ';');
3420 } 3451 }
3452
3421 if (changed) 3453 if (changed)
3422 update_background (); 3454 update_background ();
3423 } 3455 }
3424 break; 3456 break;
3425#endif 3457#endif
3426
3427 case Rxvt_restoreFG:
3428 set_window_color (Color_fg, str);
3429 break;
3430 case Rxvt_restoreBG:
3431 set_window_color (Color_bg, str);
3432 break;
3433 3458
3434 case XTerm_logfile: 3459 case XTerm_logfile:
3435 // TODO, when secure mode? 3460 // TODO, when secure mode?
3436 break; 3461 break;
3437 3462
… …
3581 { 66, PrivMode_aplKP }, 3606 { 66, PrivMode_aplKP },
3582#ifndef NO_BACKSPACE_KEY 3607#ifndef NO_BACKSPACE_KEY
3583 { 67, PrivMode_BackSpace }, 3608 { 67, PrivMode_BackSpace },
3584#endif 3609#endif
3585 { 1000, PrivMode_MouseX11 }, 3610 { 1000, PrivMode_MouseX11 },
3586 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3587 { 1002, PrivMode_MouseBtnEvent }, 3611 { 1002, PrivMode_MouseBtnEvent },
3588 { 1003, PrivMode_MouseAnyEvent }, 3612 { 1003, PrivMode_MouseAnyEvent },
3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3613 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3590 { 1011, PrivMode_Keypress }, // rxvt extension 3614 { 1011, PrivMode_Keypress }, // rxvt extension
3591 // 1035 enable modifiers for alt, numlock NYI 3615 // 1035 enable modifiers for alt, numlock NYI
… …
3593 // 1037 send DEL for keypad delete NYI 3617 // 1037 send DEL for keypad delete NYI
3594 { 1047, PrivMode_Screen }, 3618 { 1047, PrivMode_Screen },
3595 // 1048 save and restore cursor 3619 // 1048 save and restore cursor
3596 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3620 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3597 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3621 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3622 { 2004, PrivMode_BracketPaste },
3598 }; 3623 };
3599 3624
3600 if (nargs == 0) 3625 if (nargs == 0)
3601 return; 3626 return;
3602 3627
… …
3650 */ 3675 */
3651 PrivMode (1, PrivMode_vt52); 3676 PrivMode (1, PrivMode_vt52);
3652 break; 3677 break;
3653 case 3: /* 80/132 */ 3678 case 3: /* 80/132 */
3654 if (priv_modes & PrivMode_132OK) 3679 if (priv_modes & PrivMode_132OK)
3680 {
3681 scr_poweron ();
3655 set_widthheight (((state ? 132 : 80) * fwidth), height); 3682 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3683 }
3656 break; 3684 break;
3657 case 4: /* smooth scrolling */ 3685 case 4: /* smooth scrolling */
3658 set_option (Opt_jumpScroll, !state); 3686 set_option (Opt_jumpScroll, !state);
3659 break; 3687 break;
3660 case 5: /* reverse video */ 3688 case 5: /* reverse video */
… …
3692 /* case 67: - backspace key */ 3720 /* case 67: - backspace key */
3693 case 1000: /* X11 mouse reporting */ 3721 case 1000: /* X11 mouse reporting */
3694 if (state) /* orthogonal */ 3722 if (state) /* orthogonal */
3695 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3723 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3696 break; 3724 break;
3697#if 0
3698 case 1001:
3699 break; /* X11 mouse highlighting */
3700#endif
3701 case 1002: 3725 case 1002:
3702 case 1003: 3726 case 1003:
3703 if (state) 3727 if (state)
3704 { 3728 {
3705 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3729 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
… …
3894rxvt_term::process_graphics () 3918rxvt_term::process_graphics ()
3895{ 3919{
3896 unicode_t ch, cmd = cmd_getc (); 3920 unicode_t ch, cmd = cmd_getc ();
3897 3921
3898 if (cmd == 'Q') 3922 if (cmd == 'Q')
3923 {
3899 { /* query graphics */ 3924 /* query graphics */
3900 tt_printf ("\033G0\012"); /* no graphics */ 3925 tt_printf ("\033G0\012"); /* no graphics */
3901 return; 3926 return;
3902 } 3927 }
3903 /* swallow other graphics sequences until terminating ':' */ 3928 /* swallow other graphics sequences until terminating ':' */
3904 do 3929 do

Diff Legend

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