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.383 by root, Fri Dec 14 06:29:28 2007 UTC vs.
Revision 1.410 by ayin, Sat Feb 16 15:48:36 2008 UTC

… …
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 <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
339static inline int
340map_function_key (KeySym keysym)
341{
342 int param = 0;
343
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
345 {
346 param = 11 + keysym - XK_F1;
347 if (keysym >= XK_F17)
348 param += 4;
349 else if (keysym >= XK_F15)
350 param += 3;
351 else if (keysym >= XK_F11)
352 param += 2;
353 else if (keysym >= XK_F6)
354 param += 1;
355 }
356 else
357 switch (keysym)
358 {
359 case XK_Find:
360 param = 1;
361 break;
362 case XK_Insert:
363 param = 2;
364 break;
365#ifdef DXK_Remove
366 case DXK_Remove:
367#endif
368 case XK_Execute:
369 param = 3;
370 break;
371 case XK_Select:
372 param = 4;
373 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior:
376 param = 5;
377 break;
378 case XK_Next:
379 param = 6;
380 break;
381 case XK_Home:
382 param = 7;
383 break;
384 case XK_End:
385 param = 8;
386 break;
387#endif
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
302void 398void
303rxvt_term::key_press (XKeyEvent &ev) 399rxvt_term::key_press (XKeyEvent &ev)
304{ 400{
305 int ctrl, meta, shft, len; 401 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 402 KeySym keysym;
308 int valid_keysym; 403 int valid_keysym;
309 char kbuf[KBUFSZ]; 404 char kbuf[KBUFSZ];
310 405
311#if ISO_14755 406#if ISO_14755
… …
546 } 641 }
547#endif 642#endif
548 643
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 645 {
551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553 newlen = 1; 647 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 648
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 649 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 { 650 {
586#ifndef NO_BACKSPACE_KEY 651#ifndef NO_BACKSPACE_KEY
587 case XK_BackSpace: 652 case XK_BackSpace:
588 if (priv_modes & PrivMode_HaveBackSpace) 653 if (priv_modes & PrivMode_HaveBackSpace)
589 { 654 {
… …
633 } 698 }
634 else if (priv_modes & PrivMode_aplCUR) 699 else if (priv_modes & PrivMode_aplCUR)
635 kbuf[1] = 'O'; 700 kbuf[1] = 'O';
636 break; 701 break;
637 702
638#ifndef UNSHIFTED_SCROLLKEYS
639 case XK_Prior:
640 strcpy (kbuf, "\033[5~");
641 break;
642 case XK_Next:
643 strcpy (kbuf, "\033[6~");
644 break;
645#endif
646 case XK_KP_Enter: 703 case XK_KP_Enter:
647 /* allow shift to override */ 704 /* allow shift to override */
648 if (kp) 705 if (kp)
649 { 706 {
650 strcpy (kbuf, "\033OM"); 707 strcpy (kbuf, "\033OM");
… …
702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703 kbuf[1] = '\0'; 760 kbuf[1] = '\0';
704 } 761 }
705 break; 762 break;
706 763
707 case XK_Find:
708 strcpy (kbuf, "\033[1~");
709 break;
710
711 case XK_Insert:
712 strcpy (kbuf, "\033[2~");
713 break;
714#ifdef DXK_Remove /* support for DEC remove like key */
715 case DXK_Remove:
716 /* FALLTHROUGH */
717#endif
718 case XK_Execute:
719 strcpy (kbuf, "\033[3~");
720 break;
721 case XK_Select:
722 strcpy (kbuf, "\033[4~");
723 break;
724 case XK_End:
725 strcpy (kbuf, KS_END);
726 break;
727 case XK_Home:
728 strcpy (kbuf, KS_HOME);
729 break;
730
731#define FKEY(n, fkey) \
732 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
733
734 case XK_F1: /* "\033[11~" */
735 case XK_F2: /* "\033[12~" */
736 case XK_F3: /* "\033[13~" */
737 case XK_F4: /* "\033[14~" */
738 case XK_F5: /* "\033[15~" */
739 FKEY (11, XK_F1);
740 break;
741 case XK_F6: /* "\033[17~" */
742 case XK_F7: /* "\033[18~" */
743 case XK_F8: /* "\033[19~" */
744 case XK_F9: /* "\033[20~" */
745 case XK_F10: /* "\033[21~" */
746 FKEY (17, XK_F6);
747 break;
748 case XK_F11: /* "\033[23~" */
749 case XK_F12: /* "\033[24~" */
750 case XK_F13: /* "\033[25~" */
751 case XK_F14: /* "\033[26~" */
752 FKEY (23, XK_F11);
753 break;
754 case XK_F15: /* "\033[28~" */
755 case XK_F16: /* "\033[29~" */
756 FKEY (28, XK_F15);
757 break;
758 case XK_Help: /* "\033[28~" */
759 FKEY (28, XK_Help);
760 break;
761 case XK_Menu: /* "\033[29~" */
762 FKEY (29, XK_Menu);
763 break;
764 case XK_F17: /* "\033[31~" */
765 case XK_F18: /* "\033[32~" */
766 case XK_F19: /* "\033[33~" */
767 case XK_F20: /* "\033[34~" */
768 case XK_F21: /* "\033[35~" */
769 case XK_F22: /* "\033[36~" */
770 case XK_F23: /* "\033[37~" */
771 case XK_F24: /* "\033[38~" */
772 case XK_F25: /* "\033[39~" */
773 case XK_F26: /* "\033[40~" */
774 case XK_F27: /* "\033[41~" */
775 case XK_F28: /* "\033[42~" */
776 case XK_F29: /* "\033[43~" */
777 case XK_F30: /* "\033[44~" */
778 case XK_F31: /* "\033[45~" */
779 case XK_F32: /* "\033[46~" */
780 case XK_F33: /* "\033[47~" */
781 case XK_F34: /* "\033[48~" */
782 case XK_F35: /* "\033[49~" */
783 FKEY (31, XK_F17);
784 break;
785#undef FKEY
786 default: 764 default:
765 {
766 int param = map_function_key (keysym);
767 if (param > 0)
768 sprintf (kbuf,"\033[%d~", param);
769 else
787 newlen = 0; 770 newlen = 0;
771 }
788 break; 772 break;
789 } 773 }
790 774
791 if (newlen) 775 if (newlen)
792 len = strlen (kbuf); 776 len = strlen (kbuf);
793 }
794 777
795 /* 778 /*
796 * Pass meta for all function keys, if 'meta' option set 779 * Pass meta for all function keys, if 'meta' option set
797 */ 780 */
798#ifdef META8_OPTION 781#ifdef META8_OPTION
… …
1078{ 1061{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1062 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1063 {
1081 hidden_text = !hidden_text; 1064 hidden_text = !hidden_text;
1082 want_refresh = 1; 1065 want_refresh = 1;
1083 refresh_check (); 1066 refresh_check ();
1084 } 1067 }
1085 else 1068 else
1086 w.stop (); 1069 w.stop ();
1087} 1070}
1088#endif 1071#endif
1089 1072
1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1091void 1074void
1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1093{ 1076{
1094 if ((scrollbar_isUp () || scrollbar_isDn ()) 1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1095 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1096 { 1079 {
1097 want_refresh = 1; 1080 want_refresh = 1;
1098 refresh_check (); 1081 refresh_check ();
1099 } 1082 }
1100 else 1083 else
… …
1437 && ev.xfocus.mode != NotifyGrab) 1420 && ev.xfocus.mode != NotifyGrab)
1438 focus_out (); 1421 focus_out ();
1439 break; 1422 break;
1440 1423
1441 case ConfigureNotify: 1424 case ConfigureNotify:
1442 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1443 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1444 szHint.width, szHint.height); */ 1427 szHint.width, szHint.height);*/
1445 if (ev.xconfigure.window == parent[0]) 1428 if (ev.xconfigure.window == parent[0])
1446 { 1429 {
1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448 ; 1431 ;
1449 1432
… …
1454 } 1437 }
1455 else 1438 else
1456 { 1439 {
1457#ifdef HAVE_BG_PIXMAP 1440#ifdef HAVE_BG_PIXMAP
1458 if (bgPixmap.window_position_sensitive ()) 1441 if (bgPixmap.window_position_sensitive ())
1442 {
1443 if (mapped)
1459 update_background (); 1444 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1460#endif 1448#endif
1461 } 1449 }
1450
1462 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 } 1452 }
1464 break; 1453 break;
1465 1454
1466 case PropertyNotify: 1455 case PropertyNotify:
… …
1483 case SelectionRequest: 1472 case SelectionRequest:
1484 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1485 break; 1474 break;
1486 1475
1487 case MapNotify: 1476 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a
1479 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does
1482 * reparenting.
1483 * We should not render background immidiately, as there could be several
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1485 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results.
1489 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1491 update_background_ev.start (0.025);
1492#endif
1488 mapped = 1; 1493 mapped = 1;
1489#ifdef TEXT_BLINK 1494#ifdef TEXT_BLINK
1490 text_blink_ev.start (); 1495 text_blink_ev.start ();
1491#endif 1496#endif
1492 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1497 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1528 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1533 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1529 ; 1534 ;
1530 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1531 ; 1536 ;
1532 1537
1533 if (isScrollbarWindow (ev.xany.window)) 1538 if (scrollBar.state && ev.xany.window == scrollBar.win)
1534 { 1539 {
1535 scrollBar.setIdle (); 1540 scrollBar.state = STATE_IDLE;
1536 scrollbar_show (0); 1541 scrollbar_show (0);
1537 } 1542 }
1538 } 1543 }
1539 break; 1544 break;
1540 1545
… …
1628#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1629 } 1634 }
1630#endif 1635#endif
1631 } 1636 }
1632 } 1637 }
1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1634 { 1639 {
1635 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1636 MotionNotify, &ev)) 1641 MotionNotify, &ev))
1637 ; 1642 ;
1638 1643
… …
1794 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1795 { 1800 {
1796 bgPixmap.set_root_pixmap (); 1801 bgPixmap.set_root_pixmap ();
1797 update_background (); 1802 update_background ();
1798 } 1803 }
1804
1799 break; 1805 break;
1800 } 1806 }
1801# endif 1807# endif
1802 1808
1803 refresh_check (); 1809 refresh_check ();
… …
1921 } 1927 }
1922 1928
1923 /* 1929 /*
1924 * Scrollbar window processing of button press 1930 * Scrollbar window processing of button press
1925 */ 1931 */
1926 if (isScrollbarWindow (ev.window)) 1932 if (scrollBar.state && ev.window == scrollBar.win)
1927 { 1933 {
1928 scrollBar.setIdle (); 1934 page_dirn direction = NO_DIR;
1935
1936 if (scrollBar.upButton (ev.y))
1937 direction = UP; /* up */
1938 else if (scrollBar.dnButton (ev.y))
1939 direction = DN; /* down */
1940
1941 scrollBar.state = STATE_IDLE;
1929 /* 1942 /*
1930 * Rxvt-style scrollbar: 1943 * Rxvt-style scrollbar:
1931 * move up if mouse is above slider 1944 * move up if mouse is above slider
1932 * move dn if mouse is below slider 1945 * move dn if mouse is below slider
1933 * 1946 *
… …
1942 /* 1955 /*
1943 * Mouse report disabled scrollbar: 1956 * Mouse report disabled scrollbar:
1944 * arrow buttons - send up/down 1957 * arrow buttons - send up/down
1945 * click on scrollbar - send pageup/down 1958 * click on scrollbar - send pageup/down
1946 */ 1959 */
1947 if ((scrollBar.style == R_SB_NEXT 1960 if (direction == UP)
1948 && scrollbarnext_upButton (ev.y))
1949 || (scrollBar.style == R_SB_RXVT
1950 && scrollbarrxvt_upButton (ev.y)))
1951 tt_printf ("\033[A"); 1961 tt_printf ("\033[A");
1952 else if ((scrollBar.style == R_SB_NEXT 1962 else if (direction == DN)
1953 && scrollbarnext_dnButton (ev.y))
1954 || (scrollBar.style == R_SB_RXVT
1955 && scrollbarrxvt_dnButton (ev.y)))
1956 tt_printf ("\033[B"); 1963 tt_printf ("\033[B");
1957 else 1964 else
1958 switch (ev.button) 1965 switch (ev.button)
1959 { 1966 {
1960 case Button2: 1967 case Button2:
… …
1968 break; 1975 break;
1969 } 1976 }
1970 } 1977 }
1971 else 1978 else
1972#endif /* NO_SCROLLBAR_REPORT */ 1979#endif /* NO_SCROLLBAR_REPORT */
1973
1974 {
1975 char upordown = 0;
1976
1977 if (scrollBar.style == R_SB_NEXT)
1978 { 1980 {
1979 if (scrollbarnext_upButton (ev.y)) 1981 if (direction != NO_DIR)
1980 upordown = -1; /* up */
1981 else if (scrollbarnext_dnButton (ev.y))
1982 upordown = 1; /* down */
1983 }
1984 else if (scrollBar.style == R_SB_RXVT)
1985 {
1986 if (scrollbarrxvt_upButton (ev.y))
1987 upordown = -1; /* up */
1988 else if (scrollbarrxvt_dnButton (ev.y))
1989 upordown = 1; /* down */
1990 }
1991
1992 if (upordown)
1993 { 1982 {
1994#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1983#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1995 if (!cont_scroll_ev.is_active ()) 1984 if (!cont_scroll_ev.is_active ())
1996 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1985 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1997#endif 1986#endif
1998 if (scr_page (upordown < 0 ? UP : DN, 1)) 1987 if (scr_page (direction, 1))
1999 { 1988 {
2000 if (upordown < 0) 1989 if (direction == UP)
2001 scrollBar.setUp (); 1990 scrollBar.state = STATE_UP;
2002 else 1991 else
2003 scrollBar.setDn (); 1992 scrollBar.state = STATE_DOWN;
2004 } 1993 }
2005 } 1994 }
2006 else 1995 else
2007 switch (ev.button) 1996 switch (ev.button)
2008 { 1997 {
2009 case Button2: 1998 case Button2:
2010 switch (scrollbar_align) 1999 switch (scrollBar.align)
2011 { 2000 {
2012 case R_SB_ALIGN_TOP: 2001 case R_SB_ALIGN_TOP:
2013 csrO = 0; 2002 csrO = 0;
2014 break; 2003 break;
2015 case R_SB_ALIGN_CENTRE: 2004 case R_SB_ALIGN_CENTRE:
… …
2023 if (scrollBar.style == R_SB_XTERM 2012 if (scrollBar.style == R_SB_XTERM
2024 || scrollbar_above_slider (ev.y) 2013 || scrollbar_above_slider (ev.y)
2025 || scrollbar_below_slider (ev.y)) 2014 || scrollbar_below_slider (ev.y))
2026 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2027 2016
2028 scrollBar.setMotion (); 2017 scrollBar.state = STATE_MOTION;
2029 break; 2018 break;
2030 2019
2031 case Button1: 2020 case Button1:
2032 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2021 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2033 csrO = ev.y - scrollBar.top; 2022 csrO = ev.y - scrollBar.top;
2034 /* FALLTHROUGH */ 2023 /* FALLTHROUGH */
2035 2024
2036 case Button3: 2025 case Button3:
2037 if (scrollBar.style != R_SB_XTERM) 2026 if (scrollBar.style != R_SB_XTERM)
… …
2047 scr_page (DN, nrow - 1); 2036 scr_page (DN, nrow - 1);
2048# else 2037# else
2049 scr_page (DN, nrow / 4); 2038 scr_page (DN, nrow / 4);
2050# endif 2039# endif
2051 else 2040 else
2052 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
2053 } 2042 }
2054 else 2043 else
2055 { 2044 {
2056 scr_page ((ev.button == Button1 ? DN : UP), 2045 scr_page ((ev.button == Button1 ? DN : UP),
2057 (nrow 2046 (nrow
… …
2074 2063
2075 csrO = 0; /* reset csr Offset */ 2064 csrO = 0; /* reset csr Offset */
2076 if (!bypass_keystate) 2065 if (!bypass_keystate)
2077 reportmode = !! (priv_modes & PrivMode_mouse_report); 2066 reportmode = !! (priv_modes & PrivMode_mouse_report);
2078 2067
2079 if (scrollbar_isUpDn ()) 2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2080 { 2069 {
2081 scrollBar.setIdle (); 2070 scrollBar.state = STATE_IDLE;
2082 scrollbar_show (0); 2071 scrollbar_show (0);
2083 } 2072 }
2084 2073
2085#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
2086 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
… …
2167 2156
2168 if (!slip_wheel_ev.is_active ()) 2157 if (!slip_wheel_ev.is_active ())
2169 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2158 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2170 } 2159 }
2171 else 2160 else
2161# endif
2172 { 2162 {
2173# endif
2174 scr_page (v, i); 2163 scr_page (v, i);
2175 scrollbar_show (1); 2164 scrollbar_show (1);
2176# ifdef MOUSE_SLIP_WHEELING
2177 } 2165 }
2178# endif
2179 } 2166 }
2180 break; 2167 break;
2181#endif 2168#endif
2182 } 2169 }
2183 } 2170 }
… …
2826 // versions. 2813 // versions.
2827 // 2814 //
2828 tt_printf ("\033[>%d;95;0c", 'U'); 2815 tt_printf ("\033[>%d;95;0c", 'U');
2829 } 2816 }
2830 break; 2817 break;
2818
2831 case '?': 2819 case '?':
2832 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2833 process_terminal_mode (ch, priv, nargs, arg); 2821 process_terminal_mode (ch, priv, nargs, arg);
2834 break; 2822 break;
2835 } 2823 }
… …
3351 *buf++ = '\0'; 3339 *buf++ = '\0';
3352 3340
3353 process_color_seq (op, color, name, resp); 3341 process_color_seq (op, color, name, resp);
3354 } 3342 }
3355 break; 3343 break;
3344 case Rxvt_restoreFG:
3356 case XTerm_Color00: 3345 case XTerm_Color00:
3357 process_color_seq (op, Color_fg, str, resp); 3346 process_color_seq (op, Color_fg, str, resp);
3358 break; 3347 break;
3348 case Rxvt_restoreBG:
3359 case XTerm_Color01: 3349 case XTerm_Color01:
3360 process_color_seq (op, Color_bg, str, resp); 3350 process_color_seq (op, Color_bg, str, resp);
3361 break; 3351 break;
3362#ifndef NO_CURSORCOLOR 3352#ifndef NO_CURSORCOLOR
3363 case XTerm_Color_cursor: 3353 case XTerm_Color_cursor:
… …
3389#if ENABLE_TRANSPARENCY 3379#if ENABLE_TRANSPARENCY
3390 case URxvt_Color_tint: 3380 case URxvt_Color_tint:
3391 process_color_seq (op, Color_tint, str, resp); 3381 process_color_seq (op, Color_tint, str, resp);
3392 { 3382 {
3393 bool changed = false; 3383 bool changed = false;
3384
3394 if (ISSET_PIXCOLOR (Color_tint)) 3385 if (ISSET_PIXCOLOR (Color_tint))
3395 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3386 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3396 else 3387 else
3397 changed = bgPixmap.unset_tint (); 3388 changed = bgPixmap.unset_tint ();
3389
3398 if (changed) 3390 if (changed)
3399 update_background (); 3391 update_background ();
3400 } 3392 }
3401 3393
3402 break; 3394 break;
… …
3425 changed++; 3417 changed++;
3426 str = strchr (str, ';'); 3418 str = strchr (str, ';');
3427 if (str == NULL) 3419 if (str == NULL)
3428 bgPixmap.set_defaultGeometry (); 3420 bgPixmap.set_defaultGeometry ();
3429 } 3421 }
3422
3430 while (str) 3423 while (str)
3431 { 3424 {
3432 str++; 3425 str++;
3433 if (bgPixmap.set_geometry (str)) 3426 if (bgPixmap.set_geometry (str))
3434 changed++; 3427 changed++;
3435 str = strchr (str, ';'); 3428 str = strchr (str, ';');
3436 } 3429 }
3430
3437 if (changed) 3431 if (changed)
3438 update_background (); 3432 update_background ();
3439 } 3433 }
3440 break; 3434 break;
3441#endif 3435#endif
3442
3443 case Rxvt_restoreFG:
3444 set_window_color (Color_fg, str);
3445 break;
3446 case Rxvt_restoreBG:
3447 set_window_color (Color_bg, str);
3448 break;
3449 3436
3450 case XTerm_logfile: 3437 case XTerm_logfile:
3451 // TODO, when secure mode? 3438 // TODO, when secure mode?
3452 break; 3439 break;
3453 3440
… …
3608 // 1037 send DEL for keypad delete NYI 3595 // 1037 send DEL for keypad delete NYI
3609 { 1047, PrivMode_Screen }, 3596 { 1047, PrivMode_Screen },
3610 // 1048 save and restore cursor 3597 // 1048 save and restore cursor
3611 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3598 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3612 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3599 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3600 { 2004, PrivMode_BracketPaste },
3613 }; 3601 };
3614 3602
3615 if (nargs == 0) 3603 if (nargs == 0)
3616 return; 3604 return;
3617 3605
… …
3665 */ 3653 */
3666 PrivMode (1, PrivMode_vt52); 3654 PrivMode (1, PrivMode_vt52);
3667 break; 3655 break;
3668 case 3: /* 80/132 */ 3656 case 3: /* 80/132 */
3669 if (priv_modes & PrivMode_132OK) 3657 if (priv_modes & PrivMode_132OK)
3658 {
3659 scr_poweron ();
3670 set_widthheight (((state ? 132 : 80) * fwidth), height); 3660 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3661 }
3671 break; 3662 break;
3672 case 4: /* smooth scrolling */ 3663 case 4: /* smooth scrolling */
3673 set_option (Opt_jumpScroll, !state); 3664 set_option (Opt_jumpScroll, !state);
3674 break; 3665 break;
3675 case 5: /* reverse video */ 3666 case 5: /* reverse video */

Diff Legend

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