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.380 by root, Fri Dec 14 02:33:03 2007 UTC vs.
Revision 1.409 by ayin, Sat Feb 16 15:39:20 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#endif
382 case XK_Help:
383 param = 28;
384 break;
385 case XK_Menu:
386 param = 29;
387 break;
388 }
389 return param;
390}
391
302void 392void
303rxvt_term::key_press (XKeyEvent &ev) 393rxvt_term::key_press (XKeyEvent &ev)
304{ 394{
305 int ctrl, meta, shft, len; 395 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 396 KeySym keysym;
308 int valid_keysym; 397 int valid_keysym;
309 char kbuf[KBUFSZ]; 398 char kbuf[KBUFSZ];
310 399
311#if ISO_14755 400#if ISO_14755
… …
546 } 635 }
547#endif 636#endif
548 637
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 638 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 639 {
551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 640 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553 newlen = 1; 641 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 642
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 643 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 { 644 {
586#ifndef NO_BACKSPACE_KEY 645#ifndef NO_BACKSPACE_KEY
587 case XK_BackSpace: 646 case XK_BackSpace:
588 if (priv_modes & PrivMode_HaveBackSpace) 647 if (priv_modes & PrivMode_HaveBackSpace)
589 { 648 {
… …
633 } 692 }
634 else if (priv_modes & PrivMode_aplCUR) 693 else if (priv_modes & PrivMode_aplCUR)
635 kbuf[1] = 'O'; 694 kbuf[1] = 'O';
636 break; 695 break;
637 696
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: 697 case XK_KP_Enter:
647 /* allow shift to override */ 698 /* allow shift to override */
648 if (kp) 699 if (kp)
649 { 700 {
650 strcpy (kbuf, "\033OM"); 701 strcpy (kbuf, "\033OM");
… …
702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 753 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703 kbuf[1] = '\0'; 754 kbuf[1] = '\0';
704 } 755 }
705 break; 756 break;
706 757
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: 758 case XK_End:
725 strcpy (kbuf, KS_END); 759 strcpy (kbuf, KS_END);
726 break; 760 break;
727 case XK_Home: 761 case XK_Home:
728 strcpy (kbuf, KS_HOME); 762 strcpy (kbuf, KS_HOME);
729 break; 763 break;
730 764
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: 765 default:
766 {
767 int param = map_function_key (keysym);
768 if (param > 0)
769 sprintf (kbuf,"\033[%d~", param);
770 else
787 newlen = 0; 771 newlen = 0;
772 }
788 break; 773 break;
789 } 774 }
790 775
791 if (newlen) 776 if (newlen)
792 len = strlen (kbuf); 777 len = strlen (kbuf);
793 }
794 778
795 /* 779 /*
796 * Pass meta for all function keys, if 'meta' option set 780 * Pass meta for all function keys, if 'meta' option set
797 */ 781 */
798#ifdef META8_OPTION 782#ifdef META8_OPTION
… …
1041 } 1025 }
1042 1026
1043 display->flush (); 1027 display->flush ();
1044} 1028}
1045 1029
1030/* checks wether a refresh is requested and starts the refresh timer */
1046void 1031void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1032rxvt_term::refresh_check ()
1048{ 1033{
1049 make_current ();
1050
1051 display->flush ();
1052
1053 if (want_refresh && !flush_ev.is_active ()) 1034 if (want_refresh && !flush_ev.is_active ())
1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1036
1037 display->flush ();
1055} 1038}
1056 1039
1057void 1040void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1041rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1042{
… …
1067void 1050void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1051rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1052{
1070 hidden_cursor = !hidden_cursor; 1053 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1054 want_refresh = 1;
1055 refresh_check ();
1072} 1056}
1073#endif 1057#endif
1074 1058
1075#ifdef TEXT_BLINK 1059#ifdef TEXT_BLINK
1076void 1060void
… …
1078{ 1062{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1063 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1064 {
1081 hidden_text = !hidden_text; 1065 hidden_text = !hidden_text;
1082 want_refresh = 1; 1066 want_refresh = 1;
1067 refresh_check ();
1083 } 1068 }
1084 else 1069 else
1085 w.stop (); 1070 w.stop ();
1086} 1071}
1087#endif 1072#endif
1088 1073
1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1090void 1075void
1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1092{ 1077{
1093 if ((scrollbar_isUp () || scrollbar_isDn ()) 1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1094 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1080 {
1095 want_refresh = 1; 1081 want_refresh = 1;
1082 refresh_check ();
1083 }
1096 else 1084 else
1097 w.stop (); 1085 w.stop ();
1098} 1086}
1099#endif 1087#endif
1100 1088
… …
1104{ 1092{
1105 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1093 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1106 { 1094 {
1107 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1095 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1108 want_refresh = 1; 1096 want_refresh = 1;
1097 refresh_check ();
1109 } 1098 }
1110 else 1099 else
1111 w.stop (); 1100 w.stop ();
1112} 1101}
1113#endif 1102#endif
… …
1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1104#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1116void 1105void
1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1106rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1118{ 1107{
1119 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1108 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1109 {
1120 want_refresh = 1; 1110 want_refresh = 1;
1111 refresh_check ();
1112 }
1121 1113
1122 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0) 1114 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1123 { 1115 {
1124 mouse_slip_wheel_speed = 0; 1116 mouse_slip_wheel_speed = 0;
1125 w.stop (); 1117 w.stop ();
… …
1203 if (cmd_parse ()) 1195 if (cmd_parse ())
1204 break; 1196 break;
1205 1197
1206 if (revents & ev::WRITE) 1198 if (revents & ev::WRITE)
1207 pty_write (); 1199 pty_write ();
1200
1201 refresh_check ();
1208} 1202}
1209 1203
1210void 1204void
1211rxvt_term::pointer_unblank () 1205rxvt_term::pointer_unblank ()
1212{ 1206{
… …
1427 && ev.xfocus.mode != NotifyGrab) 1421 && ev.xfocus.mode != NotifyGrab)
1428 focus_out (); 1422 focus_out ();
1429 break; 1423 break;
1430 1424
1431 case ConfigureNotify: 1425 case ConfigureNotify:
1432 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1426 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1433 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1427 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1434 szHint.width, szHint.height); */ 1428 szHint.width, szHint.height);*/
1435 if (ev.xconfigure.window == parent[0]) 1429 if (ev.xconfigure.window == parent[0])
1436 { 1430 {
1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1431 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1438 ; 1432 ;
1439 1433
… …
1444 } 1438 }
1445 else 1439 else
1446 { 1440 {
1447#ifdef HAVE_BG_PIXMAP 1441#ifdef HAVE_BG_PIXMAP
1448 if (bgPixmap.window_position_sensitive ()) 1442 if (bgPixmap.window_position_sensitive ())
1443 {
1444 if (mapped)
1449 update_background (); 1445 update_background ();
1446 else
1447 bgPixmap.invalidate ();
1448 }
1450#endif 1449#endif
1451 } 1450 }
1451
1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1453 } 1453 }
1454 break; 1454 break;
1455 1455
1456 case PropertyNotify: 1456 case PropertyNotify:
… …
1473 case SelectionRequest: 1473 case SelectionRequest:
1474 selection_send (ev.xselectionrequest); 1474 selection_send (ev.xselectionrequest);
1475 break; 1475 break;
1476 1476
1477 case MapNotify: 1477 case MapNotify:
1478#ifdef HAVE_BG_PIXMAP
1479 /* This is needed spcifically to fix the case of no window manager or a
1480 * non-reparenting window manager. In those cases we never get first
1481 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1482 * care of multiplicity of ConfigureNotify events arriwing while WM does
1483 * reparenting.
1484 * We should not render background immidiately, as there could be several
1485 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1486 * by scheduling background redraw as soon as we can, but giving a short
1487 * bit of time for ConfigureNotifies to arrive.
1488 * We should render background PRIOR to drawing any text, but AFTER all
1489 * of ConfigureNotifys for the best results.
1490 */
1491 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1492 update_background_ev.start (0.025);
1493#endif
1478 mapped = 1; 1494 mapped = 1;
1479#ifdef TEXT_BLINK 1495#ifdef TEXT_BLINK
1480 text_blink_ev.start (); 1496 text_blink_ev.start ();
1481#endif 1497#endif
1482 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1506 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1522 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1507 { 1523 {
1508 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1509 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1510 } 1526 }
1527
1511 want_refresh = 1; 1528 want_refresh = 1;
1512 } 1529 }
1513 else 1530 else
1514 { 1531 {
1515 XEvent unused_event; 1532 XEvent unused_event;
… …
1517 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1534 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1518 ; 1535 ;
1519 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1520 ; 1537 ;
1521 1538
1522 if (isScrollbarWindow (ev.xany.window)) 1539 if (scrollBar.state && ev.xany.window == scrollBar.win)
1523 { 1540 {
1524 scrollBar.setIdle (); 1541 scrollBar.state = STATE_IDLE;
1525 scrollbar_show (0); 1542 scrollbar_show (0);
1526 } 1543 }
1527 } 1544 }
1528 break; 1545 break;
1529 1546
… …
1617#ifdef MOUSE_THRESHOLD 1634#ifdef MOUSE_THRESHOLD
1618 } 1635 }
1619#endif 1636#endif
1620 } 1637 }
1621 } 1638 }
1622 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1639 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1623 { 1640 {
1624 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1641 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1625 MotionNotify, &ev)) 1642 MotionNotify, &ev))
1626 ; 1643 ;
1627 1644
… …
1662 1679
1663 if (ev.type == KeyPress && hidden_pointer == 0) 1680 if (ev.type == KeyPress && hidden_pointer == 0)
1664 pointer_blank (); 1681 pointer_blank ();
1665 } 1682 }
1666#endif 1683#endif
1684
1685 refresh_check ();
1667} 1686}
1668 1687
1669void 1688void
1670rxvt_term::focus_in () 1689rxvt_term::focus_in ()
1671{ 1690{
… …
1781 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1800 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1782 { 1801 {
1783 bgPixmap.set_root_pixmap (); 1802 bgPixmap.set_root_pixmap ();
1784 update_background (); 1803 update_background ();
1785 } 1804 }
1805
1786 break; 1806 break;
1787 } 1807 }
1788# endif 1808# endif
1809
1810 refresh_check ();
1789} 1811}
1790#endif 1812#endif
1791 1813
1792void 1814void
1793rxvt_term::button_press (XButtonEvent &ev) 1815rxvt_term::button_press (XButtonEvent &ev)
… …
1906 } 1928 }
1907 1929
1908 /* 1930 /*
1909 * Scrollbar window processing of button press 1931 * Scrollbar window processing of button press
1910 */ 1932 */
1911 if (isScrollbarWindow (ev.window)) 1933 if (scrollBar.state && ev.window == scrollBar.win)
1912 { 1934 {
1913 scrollBar.setIdle (); 1935 page_dirn direction = NO_DIR;
1936
1937 if (scrollBar.upButton (ev.y))
1938 direction = UP; /* up */
1939 else if (scrollBar.dnButton (ev.y))
1940 direction = DN; /* down */
1941
1942 scrollBar.state = STATE_IDLE;
1914 /* 1943 /*
1915 * Rxvt-style scrollbar: 1944 * Rxvt-style scrollbar:
1916 * move up if mouse is above slider 1945 * move up if mouse is above slider
1917 * move dn if mouse is below slider 1946 * move dn if mouse is below slider
1918 * 1947 *
… …
1927 /* 1956 /*
1928 * Mouse report disabled scrollbar: 1957 * Mouse report disabled scrollbar:
1929 * arrow buttons - send up/down 1958 * arrow buttons - send up/down
1930 * click on scrollbar - send pageup/down 1959 * click on scrollbar - send pageup/down
1931 */ 1960 */
1932 if ((scrollBar.style == R_SB_NEXT 1961 if (direction == UP)
1933 && scrollbarnext_upButton (ev.y))
1934 || (scrollBar.style == R_SB_RXVT
1935 && scrollbarrxvt_upButton (ev.y)))
1936 tt_printf ("\033[A"); 1962 tt_printf ("\033[A");
1937 else if ((scrollBar.style == R_SB_NEXT 1963 else if (direction == DN)
1938 && scrollbarnext_dnButton (ev.y))
1939 || (scrollBar.style == R_SB_RXVT
1940 && scrollbarrxvt_dnButton (ev.y)))
1941 tt_printf ("\033[B"); 1964 tt_printf ("\033[B");
1942 else 1965 else
1943 switch (ev.button) 1966 switch (ev.button)
1944 { 1967 {
1945 case Button2: 1968 case Button2:
… …
1953 break; 1976 break;
1954 } 1977 }
1955 } 1978 }
1956 else 1979 else
1957#endif /* NO_SCROLLBAR_REPORT */ 1980#endif /* NO_SCROLLBAR_REPORT */
1958
1959 {
1960 char upordown = 0;
1961
1962 if (scrollBar.style == R_SB_NEXT)
1963 { 1981 {
1964 if (scrollbarnext_upButton (ev.y)) 1982 if (direction != NO_DIR)
1965 upordown = -1; /* up */
1966 else if (scrollbarnext_dnButton (ev.y))
1967 upordown = 1; /* down */
1968 }
1969 else if (scrollBar.style == R_SB_RXVT)
1970 {
1971 if (scrollbarrxvt_upButton (ev.y))
1972 upordown = -1; /* up */
1973 else if (scrollbarrxvt_dnButton (ev.y))
1974 upordown = 1; /* down */
1975 }
1976
1977 if (upordown)
1978 { 1983 {
1979#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1984#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1980 if (!cont_scroll_ev.is_active ()) 1985 if (!cont_scroll_ev.is_active ())
1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1986 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1982#endif 1987#endif
1983 if (scr_page (upordown < 0 ? UP : DN, 1)) 1988 if (scr_page (direction, 1))
1984 { 1989 {
1985 if (upordown < 0) 1990 if (direction == UP)
1986 scrollBar.setUp (); 1991 scrollBar.state = STATE_UP;
1987 else 1992 else
1988 scrollBar.setDn (); 1993 scrollBar.state = STATE_DOWN;
1989 } 1994 }
1990 } 1995 }
1991 else 1996 else
1992 switch (ev.button) 1997 switch (ev.button)
1993 { 1998 {
1994 case Button2: 1999 case Button2:
1995 switch (scrollbar_align) 2000 switch (scrollBar.align)
1996 { 2001 {
1997 case R_SB_ALIGN_TOP: 2002 case R_SB_ALIGN_TOP:
1998 csrO = 0; 2003 csrO = 0;
1999 break; 2004 break;
2000 case R_SB_ALIGN_CENTRE: 2005 case R_SB_ALIGN_CENTRE:
… …
2008 if (scrollBar.style == R_SB_XTERM 2013 if (scrollBar.style == R_SB_XTERM
2009 || scrollbar_above_slider (ev.y) 2014 || scrollbar_above_slider (ev.y)
2010 || scrollbar_below_slider (ev.y)) 2015 || scrollbar_below_slider (ev.y))
2011 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2016 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2012 2017
2013 scrollBar.setMotion (); 2018 scrollBar.state = STATE_MOTION;
2014 break; 2019 break;
2015 2020
2016 case Button1: 2021 case Button1:
2017 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2022 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2018 csrO = ev.y - scrollBar.top; 2023 csrO = ev.y - scrollBar.top;
2019 /* FALLTHROUGH */ 2024 /* FALLTHROUGH */
2020 2025
2021 case Button3: 2026 case Button3:
2022 if (scrollBar.style != R_SB_XTERM) 2027 if (scrollBar.style != R_SB_XTERM)
… …
2032 scr_page (DN, nrow - 1); 2037 scr_page (DN, nrow - 1);
2033# else 2038# else
2034 scr_page (DN, nrow / 4); 2039 scr_page (DN, nrow / 4);
2035# endif 2040# endif
2036 else 2041 else
2037 scrollBar.setMotion (); 2042 scrollBar.state = STATE_MOTION;
2038 } 2043 }
2039 else 2044 else
2040 { 2045 {
2041 scr_page ((ev.button == Button1 ? DN : UP), 2046 scr_page ((ev.button == Button1 ? DN : UP),
2042 (nrow 2047 (nrow
… …
2059 2064
2060 csrO = 0; /* reset csr Offset */ 2065 csrO = 0; /* reset csr Offset */
2061 if (!bypass_keystate) 2066 if (!bypass_keystate)
2062 reportmode = !! (priv_modes & PrivMode_mouse_report); 2067 reportmode = !! (priv_modes & PrivMode_mouse_report);
2063 2068
2064 if (scrollbar_isUpDn ()) 2069 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2065 { 2070 {
2066 scrollBar.setIdle (); 2071 scrollBar.state = STATE_IDLE;
2067 scrollbar_show (0); 2072 scrollbar_show (0);
2068 } 2073 }
2069 2074
2070#ifdef SELECTION_SCROLLING 2075#ifdef SELECTION_SCROLLING
2071 sel_scroll_ev.stop(); 2076 sel_scroll_ev.stop();
… …
2152 2157
2153 if (!slip_wheel_ev.is_active ()) 2158 if (!slip_wheel_ev.is_active ())
2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2159 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2155 } 2160 }
2156 else 2161 else
2162# endif
2157 { 2163 {
2158# endif
2159 scr_page (v, i); 2164 scr_page (v, i);
2160 scrollbar_show (1); 2165 scrollbar_show (1);
2161# ifdef MOUSE_SLIP_WHEELING
2162 } 2166 }
2163# endif
2164 } 2167 }
2165 break; 2168 break;
2166#endif 2169#endif
2167 } 2170 }
2168 } 2171 }
… …
2811 // versions. 2814 // versions.
2812 // 2815 //
2813 tt_printf ("\033[>%d;95;0c", 'U'); 2816 tt_printf ("\033[>%d;95;0c", 'U');
2814 } 2817 }
2815 break; 2818 break;
2819
2816 case '?': 2820 case '?':
2817 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2821 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2818 process_terminal_mode (ch, priv, nargs, arg); 2822 process_terminal_mode (ch, priv, nargs, arg);
2819 break; 2823 break;
2820 } 2824 }
… …
3336 *buf++ = '\0'; 3340 *buf++ = '\0';
3337 3341
3338 process_color_seq (op, color, name, resp); 3342 process_color_seq (op, color, name, resp);
3339 } 3343 }
3340 break; 3344 break;
3345 case Rxvt_restoreFG:
3341 case XTerm_Color00: 3346 case XTerm_Color00:
3342 process_color_seq (op, Color_fg, str, resp); 3347 process_color_seq (op, Color_fg, str, resp);
3343 break; 3348 break;
3349 case Rxvt_restoreBG:
3344 case XTerm_Color01: 3350 case XTerm_Color01:
3345 process_color_seq (op, Color_bg, str, resp); 3351 process_color_seq (op, Color_bg, str, resp);
3346 break; 3352 break;
3347#ifndef NO_CURSORCOLOR 3353#ifndef NO_CURSORCOLOR
3348 case XTerm_Color_cursor: 3354 case XTerm_Color_cursor:
… …
3374#if ENABLE_TRANSPARENCY 3380#if ENABLE_TRANSPARENCY
3375 case URxvt_Color_tint: 3381 case URxvt_Color_tint:
3376 process_color_seq (op, Color_tint, str, resp); 3382 process_color_seq (op, Color_tint, str, resp);
3377 { 3383 {
3378 bool changed = false; 3384 bool changed = false;
3385
3379 if (ISSET_PIXCOLOR (Color_tint)) 3386 if (ISSET_PIXCOLOR (Color_tint))
3380 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3387 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3381 else 3388 else
3382 changed = bgPixmap.unset_tint (); 3389 changed = bgPixmap.unset_tint ();
3390
3383 if (changed) 3391 if (changed)
3384 update_background (); 3392 update_background ();
3385 } 3393 }
3386 3394
3387 break; 3395 break;
… …
3410 changed++; 3418 changed++;
3411 str = strchr (str, ';'); 3419 str = strchr (str, ';');
3412 if (str == NULL) 3420 if (str == NULL)
3413 bgPixmap.set_defaultGeometry (); 3421 bgPixmap.set_defaultGeometry ();
3414 } 3422 }
3423
3415 while (str) 3424 while (str)
3416 { 3425 {
3417 str++; 3426 str++;
3418 if (bgPixmap.set_geometry (str)) 3427 if (bgPixmap.set_geometry (str))
3419 changed++; 3428 changed++;
3420 str = strchr (str, ';'); 3429 str = strchr (str, ';');
3421 } 3430 }
3431
3422 if (changed) 3432 if (changed)
3423 update_background (); 3433 update_background ();
3424 } 3434 }
3425 break; 3435 break;
3426#endif 3436#endif
3427
3428 case Rxvt_restoreFG:
3429 set_window_color (Color_fg, str);
3430 break;
3431 case Rxvt_restoreBG:
3432 set_window_color (Color_bg, str);
3433 break;
3434 3437
3435 case XTerm_logfile: 3438 case XTerm_logfile:
3436 // TODO, when secure mode? 3439 // TODO, when secure mode?
3437 break; 3440 break;
3438 3441
… …
3593 // 1037 send DEL for keypad delete NYI 3596 // 1037 send DEL for keypad delete NYI
3594 { 1047, PrivMode_Screen }, 3597 { 1047, PrivMode_Screen },
3595 // 1048 save and restore cursor 3598 // 1048 save and restore cursor
3596 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3599 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3597 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3601 { 2004, PrivMode_BracketPaste },
3598 }; 3602 };
3599 3603
3600 if (nargs == 0) 3604 if (nargs == 0)
3601 return; 3605 return;
3602 3606
… …
3650 */ 3654 */
3651 PrivMode (1, PrivMode_vt52); 3655 PrivMode (1, PrivMode_vt52);
3652 break; 3656 break;
3653 case 3: /* 80/132 */ 3657 case 3: /* 80/132 */
3654 if (priv_modes & PrivMode_132OK) 3658 if (priv_modes & PrivMode_132OK)
3659 {
3660 scr_poweron ();
3655 set_widthheight (((state ? 132 : 80) * fwidth), height); 3661 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3662 }
3656 break; 3663 break;
3657 case 4: /* smooth scrolling */ 3664 case 4: /* smooth scrolling */
3658 set_option (Opt_jumpScroll, !state); 3665 set_option (Opt_jumpScroll, !state);
3659 break; 3666 break;
3660 case 5: /* reverse video */ 3667 case 5: /* reverse video */

Diff Legend

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