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.338 by ayin, Tue Jul 31 17:39:39 2007 UTC vs.
Revision 1.405 by ayin, Thu Feb 14 23:51:46 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.
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
203 203
204 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
206 206
207 if (y >= 0) 207 if (y >= 0)
208 { 208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
221 ch = *chr++; 221 ch = *chr++;
222 222
223 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
226# if !UNICODE3 226# if !UNICODE_3
227 if (ch >= 0x10000) 227 if (ch >= 0x10000)
228 ch = 0xfffd; 228 ch = 0xfffd;
229# endif 229# endif
230 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231 231
… …
302 302
303void 303void
304rxvt_term::key_press (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
305{ 305{
306 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 307 KeySym keysym;
309 int valid_keysym; 308 int valid_keysym;
310 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
311 310
312#if ISO_14755 311#if ISO_14755
… …
548#endif 547#endif
549 548
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 550 {
552 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553 newlen = 1; 553 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
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
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
554 switch (keysym) 584 switch (keysym)
555 { 585 {
556#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
557 case XK_BackSpace: 587 case XK_BackSpace:
558 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
563 } 593 }
564 else 594 else
565 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
566 break; 596 break;
567#endif 597#endif
568#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete: 599 case XK_Delete:
580 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
581 break; 601 break;
582#endif 602#endif
583 case XK_Tab: 603 case XK_Tab:
584 if (shft) 604 if (shft)
585 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
595#endif 615#endif
596 newlen = 0; 616 newlen = 0;
597 } 617 }
598 break; 618 break;
599 619
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
630 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
632 break; 636 break;
633 637
634#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior: 639 case XK_Prior:
646 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
647 break; 641 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next: 642 case XK_Next:
659 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
660 break; 644 break;
661#endif 645#endif
662 case XK_KP_Enter: 646 case XK_KP_Enter:
663 /* allow shift to override */ 647 /* allow shift to override */
664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
665 { 649 {
666 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
667 break; 651 break;
668 } 652 }
669 653
… …
681 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
682 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
683 } 667 }
684 break; 668 break;
685 669
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
712 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */ 694 /* allow shift to override */
717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
718 { 696 {
719 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
721 } 699 }
722 else 700 else
… …
728 706
729 case XK_Find: 707 case XK_Find:
730 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
731 break; 709 break;
732 710
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert: 711 case XK_Insert:
744 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
745 break; 713 break;
746#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove: 715 case DXK_Remove:
… …
751 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
752 break; 720 break;
753 case XK_Select: 721 case XK_Select:
754 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
755 break; 723 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End: 724 case XK_End:
767 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
768 break; 726 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home: 727 case XK_Home:
780 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
781 break; 729 break;
782 730
783#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
1035void 983void
1036rxvt_term::flush () 984rxvt_term::flush ()
1037{ 985{
1038 flush_ev.stop (); 986 flush_ev.stop ();
1039 987
1040#ifdef ENABLE_TRANSPARENCY 988#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
1042 { 990 {
1043 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
1044 scr_clear ();
1045 scr_touch (false); 992 scr_touch (false);
1046 } 993 }
1047#endif 994#endif
1048 995
1049 if (want_refresh) 996 if (want_refresh)
… …
1094 } 1041 }
1095 1042
1096 display->flush (); 1043 display->flush ();
1097} 1044}
1098 1045
1046/* checks wether a refresh is requested and starts the refresh timer */
1099void 1047void
1100rxvt_term::check_cb (check_watcher &w) 1048rxvt_term::refresh_check ()
1101{ 1049{
1102 make_current (); 1050 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1103 1052
1104 display->flush (); 1053 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108} 1054}
1109 1055
1110void 1056void
1111rxvt_term::flush_cb (time_watcher &w) 1057rxvt_term::flush_cb (ev::timer &w, int revents)
1112{ 1058{
1113 make_current (); 1059 make_current ();
1114 1060
1115 refresh_count = 0; 1061 refresh_count = 0;
1116 flush (); 1062 flush ();
1117} 1063}
1118 1064
1119#ifdef CURSOR_BLINK 1065#ifdef CURSOR_BLINK
1120void 1066void
1121rxvt_term::cursor_blink_cb (time_watcher &w) 1067rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1122{ 1068{
1123 hidden_cursor = !hidden_cursor; 1069 hidden_cursor = !hidden_cursor;
1124 want_refresh = 1; 1070 want_refresh = 1;
1125 1071 refresh_check ();
1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1127} 1072}
1128#endif 1073#endif
1129 1074
1130#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1131void 1076void
1132rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133{ 1078{
1134 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1135 { 1080 {
1136 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1137 want_refresh = 1; 1082 want_refresh = 1;
1138 w.start (w.at + TEXT_BLINK_INTERVAL); 1083 refresh_check ();
1139 } 1084 }
1085 else
1086 w.stop ();
1140} 1087}
1141#endif 1088#endif
1142 1089
1143#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144void 1091void
1145rxvt_term::cont_scroll_cb (time_watcher &w) 1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146{ 1093{
1147 if ((scrollbar_isUp() || scrollbar_isDn()) && 1094 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1148 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1095 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1149 { 1096 {
1150 want_refresh = 1; 1097 want_refresh = 1;
1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1098 refresh_check ();
1152 } 1099 }
1100 else
1101 w.stop ();
1153} 1102}
1154#endif 1103#endif
1155 1104
1156#ifdef SELECTION_SCROLLING 1105#ifdef SELECTION_SCROLLING
1157void 1106void
1158rxvt_term::sel_scroll_cb (time_watcher &w) 1107rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159{ 1108{
1160 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1109 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161 { 1110 {
1162 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1111 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163 want_refresh = 1; 1112 want_refresh = 1;
1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 refresh_check ();
1165 } 1114 }
1115 else
1116 w.stop ();
1166} 1117}
1167#endif 1118#endif
1168 1119
1169#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1120#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170void 1121void
1171rxvt_term::slip_wheel_cb (time_watcher &w) 1122rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172{ 1123{
1173 if (mouse_slip_wheel_speed == 0 1124 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1175 : scr_page (UP, mouse_slip_wheel_speed))
1176 { 1125 {
1177 if (view_start == top_row || view_start == 0)
1178 mouse_slip_wheel_speed = 0;
1179
1180 want_refresh = 1; 1126 want_refresh = 1;
1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1127 refresh_check ();
1128 }
1129
1130 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1131 {
1132 mouse_slip_wheel_speed = 0;
1133 w.stop ();
1182 } 1134 }
1183} 1135}
1184#endif 1136#endif
1185 1137
1186#if LINUX_YIELD_HACK 1138#if LINUX_YIELD_HACK
1187static struct event_handler 1139static struct event_handler
1188{ 1140{
1189 check_watcher yield_ev; 1141 ev::prepare yield_ev;
1190 1142
1191 void yield_cb (check_watcher &w) 1143 void yield_cb (ev::prepare &w, int revents)
1192 { 1144 {
1193 // this should really be sched_yield(), but the linux guys thought 1145 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than 1146 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is 1147 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS. 1148 // allowed by the sus... as is returning ENOSYS.
… …
1247 1199
1248 return false; 1200 return false;
1249} 1201}
1250 1202
1251void 1203void
1252rxvt_term::pty_cb (io_watcher &w, short revents) 1204rxvt_term::pty_cb (ev::io &w, int revents)
1253{ 1205{
1254 make_current (); 1206 make_current ();
1255 1207
1256 if (revents & EVENT_READ) 1208 if (revents & ev::READ)
1257 // loop, but don't allow a single term to monopolize us 1209 // loop, but don't allow a single term to monopolize us
1258 while (pty_fill ()) 1210 while (pty_fill ())
1259 if (cmd_parse ()) 1211 if (cmd_parse ())
1260 break; 1212 break;
1261 1213
1262 if (revents & EVENT_WRITE) 1214 if (revents & ev::WRITE)
1263 pty_write (); 1215 pty_write ();
1216
1217 refresh_check ();
1264} 1218}
1265 1219
1266void 1220void
1267rxvt_term::pointer_unblank () 1221rxvt_term::pointer_unblank ()
1268{ 1222{
… …
1271 1225
1272#ifdef POINTER_BLANK 1226#ifdef POINTER_BLANK
1273 hidden_pointer = 0; 1227 hidden_pointer = 0;
1274 1228
1275 if (option (Opt_pointerBlank)) 1229 if (option (Opt_pointerBlank))
1276 pointer_ev.start (NOW + pointerBlankDelay); 1230 pointer_ev.start (pointerBlankDelay);
1277#endif 1231#endif
1278} 1232}
1279 1233
1280#ifdef POINTER_BLANK 1234#ifdef POINTER_BLANK
1281void 1235void
… …
1289 1243
1290 hidden_pointer = 1; 1244 hidden_pointer = 1;
1291} 1245}
1292 1246
1293void 1247void
1294rxvt_term::pointer_cb (time_watcher &w) 1248rxvt_term::pointer_cb (ev::timer &w, int revents)
1295{ 1249{
1296 make_current (); 1250 make_current ();
1297 1251
1298 pointer_blank (); 1252 pointer_blank ();
1299} 1253}
… …
1302void 1256void
1303rxvt_term::mouse_report (XButtonEvent &ev) 1257rxvt_term::mouse_report (XButtonEvent &ev)
1304{ 1258{
1305 int button_number, key_state = 0; 1259 int button_number, key_state = 0;
1306 int x, y; 1260 int x, y;
1261 int code = 32;
1307 1262
1308 x = ev.x; 1263 x = Pixel2Col (ev.x);
1309 y = ev.y; 1264 y = Pixel2Row (ev.y);
1310 pixel_position (&x, &y); 1265 if (ev.type == MotionNotify)
1266 {
1267 if (x == mouse_row && y == mouse_col)
1268 return;
1269 mouse_row = x;
1270 mouse_col = y;
1271 code += 32;
1272 }
1311 1273
1312 if (MEvent.button == AnyButton) 1274 if (MEvent.button == AnyButton)
1313 button_number = 3; 1275 button_number = 3;
1314 else 1276 else
1315 { 1277 {
… …
1361 x + 1, 1323 x + 1,
1362 y + 1); 1324 y + 1);
1363#endif 1325#endif
1364 1326
1365 tt_printf ("\033[M%c%c%c", 1327 tt_printf ("\033[M%c%c%c",
1366 (32 + button_number + key_state), 1328 (code + button_number + key_state),
1367 (32 + x + 1), 1329 (32 + x + 1),
1368 (32 + y + 1)); 1330 (32 + y + 1));
1369} 1331}
1370 1332
1371/*{{{ process an X event */ 1333/*{{{ process an X event */
… …
1475 && ev.xfocus.mode != NotifyGrab) 1437 && ev.xfocus.mode != NotifyGrab)
1476 focus_out (); 1438 focus_out ();
1477 break; 1439 break;
1478 1440
1479 case ConfigureNotify: 1441 case ConfigureNotify:
1442 /*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,
1444 szHint.width, szHint.height);*/
1480 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent[0])
1481 { 1446 {
1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483 ; 1448 ;
1484 1449
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1450 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 { 1451 {
1487 seen_resize = 1; 1452 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1453 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND 1454 }
1490 if (!option (Opt_transparent) && bgPixmap.auto_resize) 1455 else
1456 {
1457#ifdef HAVE_BG_PIXMAP
1458 if (bgPixmap.window_position_sensitive ())
1491 { 1459 {
1460 if (mapped)
1461 update_background ();
1492 resize_pixmap (); 1462 else
1493 scr_touch (true); 1463 bgPixmap.invalidate ();
1494 } 1464 }
1495#endif 1465#endif
1496 } 1466 }
1497 1467
1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1468 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499
1500#ifdef ENABLE_TRANSPARENCY
1501 if (option (Opt_transparent))
1502 check_our_parents ();
1503#endif
1504 } 1469 }
1505 break; 1470 break;
1506 1471
1507 case PropertyNotify: 1472 case PropertyNotify:
1508 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1473 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1524 case SelectionRequest: 1489 case SelectionRequest:
1525 selection_send (ev.xselectionrequest); 1490 selection_send (ev.xselectionrequest);
1526 break; 1491 break;
1527 1492
1528 case MapNotify: 1493 case MapNotify:
1494#ifdef HAVE_BG_PIXMAP
1495 /* This is needed spcifically to fix the case of no window manager or a
1496 * non-reparenting window manager. In those cases we never get first
1497 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1498 * care of multiplicity of ConfigureNotify events arriwing while WM does
1499 * reparenting.
1500 * We should not render background immidiately, as there could be several
1501 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1502 * by scheduling background redraw as soon as we can, but giving a short
1503 * bit of time for ConfigureNotifies to arrive.
1504 * We should render background PRIOR to drawing any text, but AFTER all
1505 * of ConfigureNotifys for the best results.
1506 */
1507 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1508 update_background_ev.start (0.025);
1509#endif
1529 mapped = 1; 1510 mapped = 1;
1530#ifdef TEXT_BLINK 1511#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1512 text_blink_ev.start ();
1532#endif 1513#endif
1533 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1514 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1534 break; 1515 break;
1535 1516
1536 case UnmapNotify: 1517 case UnmapNotify:
… …
1538#ifdef TEXT_BLINK 1519#ifdef TEXT_BLINK
1539 text_blink_ev.stop (); 1520 text_blink_ev.stop ();
1540#endif 1521#endif
1541 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1522 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break; 1523 break;
1543
1544#ifdef ENABLE_TRANSPARENCY
1545 case ReparentNotify:
1546 rootwin_cb (ev);
1547 break;
1548#endif /* ENABLE_TRANSPARENCY */
1549 1524
1550 case GraphicsExpose: 1525 case GraphicsExpose:
1551 case Expose: 1526 case Expose:
1552 if (ev.xany.window == vt) 1527 if (ev.xany.window == vt)
1553 { 1528 {
1554 do 1529 do
1530 {
1555 scr_expose (ev.xexpose.x, ev.xexpose.y, 1531 scr_expose (ev.xexpose.x, ev.xexpose.y,
1556 ev.xexpose.width, ev.xexpose.height, False); 1532 ev.xexpose.width, ev.xexpose.height, False);
1533 }
1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1534 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1558 1535
1559 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1536 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1560 1537
1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1538 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1539 {
1562 scr_expose (ev.xexpose.x, ev.xexpose.y, 1540 scr_expose (ev.xexpose.x, ev.xexpose.y,
1563 ev.xexpose.width, ev.xexpose.height, False); 1541 ev.xexpose.width, ev.xexpose.height, False);
1542 }
1564 1543
1565 want_refresh = 1; 1544 want_refresh = 1;
1566 } 1545 }
1567 else 1546 else
1568 { 1547 {
… …
1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1572 ; 1551 ;
1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1552 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1574 ; 1553 ;
1575 1554
1576 if (isScrollbarWindow (ev.xany.window)) 1555 if (scrollBar.state && ev.xany.window == scrollBar.win)
1577 { 1556 {
1578 scrollBar.setIdle (); 1557 scrollBar.state = STATE_IDLE;
1579 scrollbar_show (0); 1558 scrollbar_show (0);
1580 } 1559 }
1581
1582#ifdef ENABLE_TRANSPARENCY
1583 if (am_transparent && ev.xany.window == parent[0])
1584 XClearWindow (dpy, ev.xany.window);
1585#endif
1586 } 1560 }
1587 break; 1561 break;
1588 1562
1589 case MotionNotify: 1563 case MotionNotify:
1590#ifdef POINTER_BLANK 1564#ifdef POINTER_BLANK
1591 if (hidden_pointer) 1565 if (hidden_pointer)
1592 pointer_unblank (); 1566 pointer_unblank ();
1593#endif 1567#endif
1568 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1569 || priv_modes & PrivMode_MouseAnyEvent)
1570 mouse_report (ev.xbutton);
1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1595 break; 1572 break;
1596 1573
1597 if (ev.xany.window == vt) 1574 if (ev.xany.window == vt)
1598 { 1575 {
… …
1632 int dist; 1609 int dist;
1633 1610
1634 /* don't clobber the current delay if we are 1611 /* don't clobber the current delay if we are
1635 * already in the middle of scrolling. 1612 * already in the middle of scrolling.
1636 */ 1613 */
1637 if (!sel_scroll_ev.active) 1614 if (!sel_scroll_ev.is_active ())
1638 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1615 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1639 1616
1640 /* save the event params so we can highlight 1617 /* save the event params so we can highlight
1641 * the selection in the pending-scroll loop 1618 * the selection in the pending-scroll loop
1642 */ 1619 */
1643 selection_save_x = ev.xbutton.x; 1620 selection_save_x = ev.xbutton.x;
… …
1665 else 1642 else
1666 { 1643 {
1667 /* we are within the text window, so we 1644 /* we are within the text window, so we
1668 * shouldn't be scrolling 1645 * shouldn't be scrolling
1669 */ 1646 */
1670 if (sel_scroll_ev.active)
1671 sel_scroll_ev.stop(); 1647 sel_scroll_ev.stop();
1672 } 1648 }
1673#endif 1649#endif
1674#ifdef MOUSE_THRESHOLD 1650#ifdef MOUSE_THRESHOLD
1675 } 1651 }
1676#endif 1652#endif
1677 } 1653 }
1678 } 1654 }
1679 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1655 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1680 { 1656 {
1681 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1657 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1682 MotionNotify, &ev)) 1658 MotionNotify, &ev))
1683 ; 1659 ;
1684 1660
… …
1702 { 1678 {
1703 hidden_cursor = 0; 1679 hidden_cursor = 0;
1704 want_refresh = 1; 1680 want_refresh = 1;
1705 } 1681 }
1706 1682
1707 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1683 cursor_blink_ev.again ();
1708 } 1684 }
1709#endif 1685#endif
1710 1686
1711#if defined(POINTER_BLANK) 1687#if defined(POINTER_BLANK)
1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1688 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1719 1695
1720 if (ev.type == KeyPress && hidden_pointer == 0) 1696 if (ev.type == KeyPress && hidden_pointer == 0)
1721 pointer_blank (); 1697 pointer_blank ();
1722 } 1698 }
1723#endif 1699#endif
1700
1701 refresh_check ();
1724} 1702}
1725 1703
1726void 1704void
1727rxvt_term::focus_in () 1705rxvt_term::focus_in ()
1728{ 1706{
… …
1740 XSetICFocus (Input_Context); 1718 XSetICFocus (Input_Context);
1741 } 1719 }
1742#endif 1720#endif
1743#if CURSOR_BLINK 1721#if CURSOR_BLINK
1744 if (option (Opt_cursorBlink)) 1722 if (option (Opt_cursorBlink))
1745 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1723 cursor_blink_ev.again ();
1746#endif 1724#endif
1747#if OFF_FOCUS_FADING 1725#if OFF_FOCUS_FADING
1748 if (rs[Rs_fade]) 1726 if (rs[Rs_fade])
1749 { 1727 {
1750 pix_colors = pix_colors_focused; 1728 pix_colors = pix_colors_focused;
… …
1752 } 1730 }
1753#endif 1731#endif
1754#if ENABLE_FRILLS 1732#if ENABLE_FRILLS
1755 if (option (Opt_urgentOnBell)) 1733 if (option (Opt_urgentOnBell))
1756 { 1734 {
1757 XWMHints *h;
1758
1759 h = XGetWMHints(dpy, parent[0]); 1735 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1760 if (h != NULL)
1761 { 1736 {
1762 h->flags &= ~XUrgencyHint; 1737 h->flags &= ~XUrgencyHint;
1763 XSetWMHints(dpy, parent[0], h); 1738 XSetWMHints (dpy, parent[0], h);
1764 } 1739 }
1765 } 1740 }
1766#endif 1741#endif
1767 } 1742 }
1768} 1743}
… …
1791 XUnsetICFocus (Input_Context); 1766 XUnsetICFocus (Input_Context);
1792#endif 1767#endif
1793#if CURSOR_BLINK 1768#if CURSOR_BLINK
1794 if (option (Opt_cursorBlink)) 1769 if (option (Opt_cursorBlink))
1795 cursor_blink_ev.stop (); 1770 cursor_blink_ev.stop ();
1771
1796 hidden_cursor = 0; 1772 hidden_cursor = 0;
1797#endif 1773#endif
1798#if OFF_FOCUS_FADING 1774#if OFF_FOCUS_FADING
1799 if (rs[Rs_fade]) 1775 if (rs[Rs_fade])
1800 { 1776 {
… …
1834 case PropertyNotify: 1810 case PropertyNotify:
1835 /* 1811 /*
1836 * if user used some Esetroot compatible prog to set the root bg, 1812 * if user used some Esetroot compatible prog to set the root bg,
1837 * use the property to determine the pixmap. We use it later on. 1813 * use the property to determine the pixmap. We use it later on.
1838 */ 1814 */
1839 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1815 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1816 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841 return; 1817 {
1818 bgPixmap.set_root_pixmap ();
1819 update_background ();
1820 }
1842 1821
1843 /* FALLTHROUGH */
1844 case ReparentNotify:
1845 if (option (Opt_transparent))
1846 check_our_parents ();
1847 break; 1822 break;
1848 } 1823 }
1849# endif 1824# endif
1825
1826 refresh_check ();
1850} 1827}
1851#endif 1828#endif
1852 1829
1853void 1830void
1854rxvt_term::button_press (XButtonEvent &ev) 1831rxvt_term::button_press (XButtonEvent &ev)
… …
1909 mouse_report (ev); 1886 mouse_report (ev);
1910 } 1887 }
1911#else 1888#else
1912 MEvent.button = ev.button; 1889 MEvent.button = ev.button;
1913 mouse_report (ev); 1890 mouse_report (ev);
1914#endif /* MOUSE_REPORT_DOUBLECLICK */ 1891#endif /* MOUSE_REPORT_DOUBLECLICK */
1915 1892
1916 } 1893 }
1917 else 1894 else
1918 { 1895 {
1919 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
… …
1967 } 1944 }
1968 1945
1969 /* 1946 /*
1970 * Scrollbar window processing of button press 1947 * Scrollbar window processing of button press
1971 */ 1948 */
1972 if (isScrollbarWindow (ev.window)) 1949 if (scrollBar.state && ev.window == scrollBar.win)
1973 { 1950 {
1974 scrollBar.setIdle (); 1951 page_dirn direction = NO_DIR;
1952
1953 if (scrollBar.upButton (ev.y))
1954 direction = UP; /* up */
1955 else if (scrollBar.dnButton (ev.y))
1956 direction = DN; /* down */
1957
1958 scrollBar.state = STATE_IDLE;
1975 /* 1959 /*
1976 * Rxvt-style scrollbar: 1960 * Rxvt-style scrollbar:
1977 * move up if mouse is above slider 1961 * move up if mouse is above slider
1978 * move dn if mouse is below slider 1962 * move dn if mouse is below slider
1979 * 1963 *
… …
1988 /* 1972 /*
1989 * Mouse report disabled scrollbar: 1973 * Mouse report disabled scrollbar:
1990 * arrow buttons - send up/down 1974 * arrow buttons - send up/down
1991 * click on scrollbar - send pageup/down 1975 * click on scrollbar - send pageup/down
1992 */ 1976 */
1993 if ((scrollBar.style == R_SB_NEXT 1977 if (direction == UP)
1994 && scrollbarnext_upButton (ev.y))
1995 || (scrollBar.style == R_SB_RXVT
1996 && scrollbarrxvt_upButton (ev.y)))
1997 tt_printf ("\033[A"); 1978 tt_printf ("\033[A");
1998 else if ((scrollBar.style == R_SB_NEXT 1979 else if (direction == DN)
1999 && scrollbarnext_dnButton (ev.y))
2000 || (scrollBar.style == R_SB_RXVT
2001 && scrollbarrxvt_dnButton (ev.y)))
2002 tt_printf ("\033[B"); 1980 tt_printf ("\033[B");
2003 else 1981 else
2004 switch (ev.button) 1982 switch (ev.button)
2005 { 1983 {
2006 case Button2: 1984 case Button2:
… …
2013 tt_printf ("\033[5~"); 1991 tt_printf ("\033[5~");
2014 break; 1992 break;
2015 } 1993 }
2016 } 1994 }
2017 else 1995 else
2018#endif /* NO_SCROLLBAR_REPORT */ 1996#endif /* NO_SCROLLBAR_REPORT */
2019
2020 {
2021 char upordown = 0;
2022
2023 if (scrollBar.style == R_SB_NEXT)
2024 { 1997 {
2025 if (scrollbarnext_upButton (ev.y)) 1998 if (direction != NO_DIR)
2026 upordown = -1; /* up */
2027 else if (scrollbarnext_dnButton (ev.y))
2028 upordown = 1; /* down */
2029 }
2030 else if (scrollBar.style == R_SB_RXVT)
2031 {
2032 if (scrollbarrxvt_upButton (ev.y))
2033 upordown = -1; /* up */
2034 else if (scrollbarrxvt_dnButton (ev.y))
2035 upordown = 1; /* down */
2036 }
2037 if (upordown)
2038 { 1999 {
2039#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2001 if (!cont_scroll_ev.is_active ())
2040 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2002 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2041#endif 2003#endif
2042 if (scr_page (upordown < 0 ? UP : DN, 1)) 2004 if (scr_page (direction, 1))
2043 { 2005 {
2044 if (upordown < 0) 2006 if (direction == UP)
2045 scrollBar.setUp (); 2007 scrollBar.state = STATE_UP;
2046 else 2008 else
2047 scrollBar.setDn (); 2009 scrollBar.state = STATE_DOWN;
2048 } 2010 }
2049 } 2011 }
2050 else 2012 else
2051 switch (ev.button) 2013 switch (ev.button)
2052 { 2014 {
2053 case Button2: 2015 case Button2:
2054 switch (scrollbar_align) 2016 switch (scrollBar.align)
2055 { 2017 {
2056 case R_SB_ALIGN_TOP: 2018 case R_SB_ALIGN_TOP:
2057 csrO = 0; 2019 csrO = 0;
2058 break; 2020 break;
2059 case R_SB_ALIGN_CENTRE: 2021 case R_SB_ALIGN_CENTRE:
… …
2067 if (scrollBar.style == R_SB_XTERM 2029 if (scrollBar.style == R_SB_XTERM
2068 || scrollbar_above_slider (ev.y) 2030 || scrollbar_above_slider (ev.y)
2069 || scrollbar_below_slider (ev.y)) 2031 || scrollbar_below_slider (ev.y))
2070 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2032 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2071 2033
2072 scrollBar.setMotion (); 2034 scrollBar.state = STATE_MOTION;
2073 break; 2035 break;
2074 2036
2075 case Button1: 2037 case Button1:
2076 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2038 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2077 csrO = ev.y - scrollBar.top; 2039 csrO = ev.y - scrollBar.top;
2078 /* FALLTHROUGH */ 2040 /* FALLTHROUGH */
2079 2041
2080 case Button3: 2042 case Button3:
2081 if (scrollBar.style != R_SB_XTERM) 2043 if (scrollBar.style != R_SB_XTERM)
… …
2091 scr_page (DN, nrow - 1); 2053 scr_page (DN, nrow - 1);
2092# else 2054# else
2093 scr_page (DN, nrow / 4); 2055 scr_page (DN, nrow / 4);
2094# endif 2056# endif
2095 else 2057 else
2096 scrollBar.setMotion (); 2058 scrollBar.state = STATE_MOTION;
2097 } 2059 }
2098 else 2060 else
2099 { 2061 {
2100 scr_page ((ev.button == Button1 ? DN : UP), 2062 scr_page ((ev.button == Button1 ? DN : UP),
2101 (nrow 2063 (nrow
… …
2118 2080
2119 csrO = 0; /* reset csr Offset */ 2081 csrO = 0; /* reset csr Offset */
2120 if (!bypass_keystate) 2082 if (!bypass_keystate)
2121 reportmode = !! (priv_modes & PrivMode_mouse_report); 2083 reportmode = !! (priv_modes & PrivMode_mouse_report);
2122 2084
2123 if (scrollbar_isUpDn ()) 2085 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2124 { 2086 {
2125 scrollBar.setIdle (); 2087 scrollBar.state = STATE_IDLE;
2126 scrollbar_show (0); 2088 scrollbar_show (0);
2127 } 2089 }
2128 2090
2129#ifdef SELECTION_SCROLLING 2091#ifdef SELECTION_SCROLLING
2130 if (sel_scroll_ev.active)
2131 sel_scroll_ev.stop(); 2092 sel_scroll_ev.stop();
2132#endif 2093#endif
2133 2094
2134 if (ev.window == vt) 2095 if (ev.window == vt)
2135 { 2096 {
2136 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2097 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2160 mouse_report (ev); 2121 mouse_report (ev);
2161 } 2122 }
2162#else /* MOUSE_REPORT_DOUBLECLICK */ 2123#else /* MOUSE_REPORT_DOUBLECLICK */
2163 MEvent.button = AnyButton; 2124 MEvent.button = AnyButton;
2164 mouse_report (ev); 2125 mouse_report (ev);
2165#endif /* MOUSE_REPORT_DOUBLECLICK */ 2126#endif /* MOUSE_REPORT_DOUBLECLICK */
2166 return; 2127 return;
2167 } 2128 }
2168 2129
2169 /* 2130 /*
2170 * dumb hack to compensate for the failure of click-and-drag 2131 * dumb hack to compensate for the failure of click-and-drag
… …
2208 { 2169 {
2209 mouse_slip_wheel_speed += v ? -1 : 1; 2170 mouse_slip_wheel_speed += v ? -1 : 1;
2210 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2171 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2211 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2172 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2212 2173
2213 if (slip_wheel_ev.at < NOW) 2174 if (!slip_wheel_ev.is_active ())
2214 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2175 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2215
2216 slip_wheel_ev.start ();
2217 } 2176 }
2218 else 2177 else
2178# endif
2219 { 2179 {
2220# endif
2221 scr_page (v, i); 2180 scr_page (v, i);
2222 scrollbar_show (1); 2181 scrollbar_show (1);
2223# ifdef MOUSE_SLIP_WHEELING
2224 } 2182 }
2225# endif
2226 } 2183 }
2227 break; 2184 break;
2228#endif 2185#endif
2229 } 2186 }
2230 } 2187 }
… …
2289 2246
2290 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2247 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2291 { 2248 {
2292 refresh_count = 0; 2249 refresh_count = 0;
2293 2250
2294 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2251 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2295 { 2252 {
2296 refreshnow = true; 2253 refreshnow = true;
2297 ch = NOCHAR; 2254 ch = NOCHAR;
2298 break; 2255 break;
2299 } 2256 }
… …
2510 } 2467 }
2511 } 2468 }
2512 2469
2513 pclose_printer (fd); 2470 pclose_printer (fd);
2514} 2471}
2515#endif /* PRINTPIPE */ 2472#endif /* PRINTPIPE */
2516/*}}} */ 2473/*}}} */
2517 2474
2518/* *INDENT-OFF* */ 2475/* *INDENT-OFF* */
2519enum { 2476enum {
2520 C1_40 = 0x40, 2477 C1_40 = 0x40,
… …
2806rxvt_term::process_csi_seq () 2763rxvt_term::process_csi_seq ()
2807{ 2764{
2808 unicode_t ch, priv, i; 2765 unicode_t ch, priv, i;
2809 unsigned int nargs, p; 2766 unsigned int nargs, p;
2810 int n, ndef; 2767 int n, ndef;
2811 int arg[ESC_ARGS]; 2768 int arg[ESC_ARGS] = { };
2812 2769
2813 memset (arg, 0, sizeof (arg));
2814 nargs = 0; 2770 nargs = 0;
2815 2771
2816 priv = 0; 2772 priv = 0;
2817 ch = cmd_getc (); 2773 ch = cmd_getc ();
2818 if (ch >= '<' && ch <= '?') 2774 if (ch >= '<' && ch <= '?')
2775 {
2819 { /* '<' '=' '>' '?' */ 2776 /* '<' '=' '>' '?' */
2820 priv = ch; 2777 priv = ch;
2821 ch = cmd_getc (); 2778 ch = cmd_getc ();
2822 } 2779 }
2823 2780
2824 /* read any numerical arguments */ 2781 /* read any numerical arguments */
… …
2867 { 2824 {
2868 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2825 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2869 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2826 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2870 // 2827 //
2871 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2828 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2872 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2829 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2873 // that we do not support xterm mouse reporting (should be 95 when we do). 2830 // versions.
2874 // 2831 //
2875 tt_printf ("\033[>%d;94;0c", 'U'); 2832 tt_printf ("\033[>%d;95;0c", 'U');
2876 } 2833 }
2877 break; 2834 break;
2835
2878 case '?': 2836 case '?':
2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2837 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2880 process_terminal_mode (ch, priv, nargs, arg); 2838 process_terminal_mode (ch, priv, nargs, arg);
2881 break; 2839 break;
2882 } 2840 }
… …
3398 *buf++ = '\0'; 3356 *buf++ = '\0';
3399 3357
3400 process_color_seq (op, color, name, resp); 3358 process_color_seq (op, color, name, resp);
3401 } 3359 }
3402 break; 3360 break;
3361 case Rxvt_restoreFG:
3403 case XTerm_Color00: 3362 case XTerm_Color00:
3404 process_color_seq (op, Color_fg, str, resp); 3363 process_color_seq (op, Color_fg, str, resp);
3405 break; 3364 break;
3365 case Rxvt_restoreBG:
3406 case XTerm_Color01: 3366 case XTerm_Color01:
3407 process_color_seq (op, Color_bg, str, resp); 3367 process_color_seq (op, Color_bg, str, resp);
3408 break; 3368 break;
3409#ifndef NO_CURSORCOLOR 3369#ifndef NO_CURSORCOLOR
3410 case XTerm_Color_cursor: 3370 case XTerm_Color_cursor:
… …
3431 break; 3391 break;
3432 case URxvt_Color_IT: 3392 case URxvt_Color_IT:
3433 process_color_seq (op, Color_IT, str, resp); 3393 process_color_seq (op, Color_IT, str, resp);
3434 break; 3394 break;
3435#endif 3395#endif
3436#if ENABLE_TRANSPARENCY && TINTING 3396#if ENABLE_TRANSPARENCY
3437 case URxvt_Color_tint: 3397 case URxvt_Color_tint:
3438 process_color_seq (op, Color_tint, str, resp); 3398 process_color_seq (op, Color_tint, str, resp);
3399 {
3400 bool changed = false;
3439 3401
3440 check_our_parents (); 3402 if (ISSET_PIXCOLOR (Color_tint))
3403 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3404 else
3405 changed = bgPixmap.unset_tint ();
3441 3406
3442 if (am_transparent) 3407 if (changed)
3443 want_full_refresh = want_refresh = 1; 3408 update_background ();
3409 }
3444 3410
3445 break; 3411 break;
3446#endif 3412#endif
3447 3413
3414#if BG_IMAGE_FROM_FILE
3448 case Rxvt_Pixmap: 3415 case Rxvt_Pixmap:
3449 { 3416 if (!strcmp (str, "?"))
3450 if (*str != ';')
3451 { 3417 {
3452#if XPM_BACKGROUND 3418 char str[256];
3453 scale_pixmap (""); /* reset to default scaling */ 3419
3454 set_bgPixmap (str); /* change pixmap */ 3420 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3455 scr_touch (true); 3421 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3456#endif 3422 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3423 process_xterm_seq (XTerm_title, str, CHAR_ST);
3457 } 3424 }
3458 3425 else
3426 {
3459 int changed = 0; 3427 int changed = 0;
3460 3428
3461 while ((str = strchr (str, ';')) != NULL) 3429 if (*str != ';')
3462 { 3430 {
3431 /* reset to default scaling :*/
3432 bgPixmap.unset_geometry ();
3433 if (bgPixmap.set_file (str)) /* change pixmap */
3434 changed++;
3435 str = strchr (str, ';');
3436 if (str == NULL)
3437 bgPixmap.set_defaultGeometry ();
3438 }
3439
3440 while (str)
3441 {
3463 str++; 3442 str++;
3464#if XPM_BACKGROUND 3443 if (bgPixmap.set_geometry (str))
3465 changed += scale_pixmap (str); 3444 changed++;
3466#endif 3445 str = strchr (str, ';');
3467 } 3446 }
3468 3447
3469 if (changed) 3448 if (changed)
3470 { 3449 update_background ();
3471#ifdef XPM_BACKGROUND
3472 resize_pixmap ();
3473 scr_touch (true);
3474#endif
3475 } 3450 }
3476#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3477 if (option (Opt_transparent))
3478 check_our_parents ();
3479#endif
3480 }
3481 break; 3451 break;
3482 3452#endif
3483 case Rxvt_restoreFG:
3484 set_window_color (Color_fg, str);
3485 break;
3486 case Rxvt_restoreBG:
3487 set_window_color (Color_bg, str);
3488 break;
3489 3453
3490 case XTerm_logfile: 3454 case XTerm_logfile:
3491 // TODO, when secure mode? 3455 // TODO, when secure mode?
3492 break; 3456 break;
3493 3457
… …
3608{ 3572{
3609 unsigned int i, j; 3573 unsigned int i, j;
3610 int state; 3574 int state;
3611 3575
3612 static const struct 3576 static const struct
3613 { 3577 {
3614 const int argval; 3578 const int argval;
3615 const unsigned long bit; 3579 const unsigned long bit;
3616 }
3617
3618 argtopriv[] = { 3580 } argtopriv[] = {
3619 { 1, PrivMode_aplCUR }, 3581 { 1, PrivMode_aplCUR },
3620 { 2, PrivMode_vt52 }, 3582 { 2, PrivMode_vt52 },
3621 { 3, PrivMode_132 }, 3583 { 3, PrivMode_132 },
3622 { 4, PrivMode_smoothScroll }, 3584 { 4, PrivMode_smoothScroll },
3623 { 5, PrivMode_rVideo }, 3585 { 5, PrivMode_rVideo },
… …
3639 { 66, PrivMode_aplKP }, 3601 { 66, PrivMode_aplKP },
3640#ifndef NO_BACKSPACE_KEY 3602#ifndef NO_BACKSPACE_KEY
3641 { 67, PrivMode_BackSpace }, 3603 { 67, PrivMode_BackSpace },
3642#endif 3604#endif
3643 { 1000, PrivMode_MouseX11 }, 3605 { 1000, PrivMode_MouseX11 },
3644 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3606 { 1002, PrivMode_MouseBtnEvent },
3645 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3607 { 1003, PrivMode_MouseAnyEvent },
3646 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3647 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3608 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3648 { 1011, PrivMode_Keypress }, // rxvt extension 3609 { 1011, PrivMode_Keypress }, // rxvt extension
3649 // 1035 enable modifiers for alt, numlock NYI 3610 // 1035 enable modifiers for alt, numlock NYI
3650 // 1036 send ESC for meta keys NYI 3611 // 1036 send ESC for meta keys NYI
3651 // 1037 send DEL for keypad delete NYI 3612 // 1037 send DEL for keypad delete NYI
3652 { 1047, PrivMode_Screen }, 3613 { 1047, PrivMode_Screen },
3653 // 1048 save and restore cursor 3614 // 1048 save and restore cursor
3654 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3615 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3655 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3616 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3617 { 2004, PrivMode_BracketPaste },
3656 }; 3618 };
3657 3619
3658 if (nargs == 0) 3620 if (nargs == 0)
3659 return; 3621 return;
3660 3622
… …
3708 */ 3670 */
3709 PrivMode (1, PrivMode_vt52); 3671 PrivMode (1, PrivMode_vt52);
3710 break; 3672 break;
3711 case 3: /* 80/132 */ 3673 case 3: /* 80/132 */
3712 if (priv_modes & PrivMode_132OK) 3674 if (priv_modes & PrivMode_132OK)
3675 {
3676 scr_poweron ();
3713 set_widthheight (((state ? 132 : 80) * fwidth), height); 3677 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3678 }
3714 break; 3679 break;
3715 case 4: /* smooth scrolling */ 3680 case 4: /* smooth scrolling */
3716 set_option (Opt_jumpScroll, !state); 3681 set_option (Opt_jumpScroll, !state);
3717 break; 3682 break;
3718 case 5: /* reverse video */ 3683 case 5: /* reverse video */
… …
3725 scr_autowrap (state); 3690 scr_autowrap (state);
3726 break; 3691 break;
3727 /* case 8: - auto repeat, can't do on a per window basis */ 3692 /* case 8: - auto repeat, can't do on a per window basis */
3728 case 9: /* X10 mouse reporting */ 3693 case 9: /* X10 mouse reporting */
3729 if (state) /* orthogonal */ 3694 if (state) /* orthogonal */
3730 priv_modes &= ~PrivMode_MouseX11; 3695 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3731 break; 3696 break;
3732#ifdef scrollBar_esc 3697#ifdef scrollBar_esc
3733 case scrollBar_esc: 3698 case scrollBar_esc:
3734 if (scrollbar_mapping (state)) 3699 if (scrollbar_mapping (state))
3735 { 3700 {
… …
3748 break; 3713 break;
3749 /* case 66: - application key pad */ 3714 /* case 66: - application key pad */
3750 /* case 67: - backspace key */ 3715 /* case 67: - backspace key */
3751 case 1000: /* X11 mouse reporting */ 3716 case 1000: /* X11 mouse reporting */
3752 if (state) /* orthogonal */ 3717 if (state) /* orthogonal */
3753 priv_modes &= ~PrivMode_MouseX10; 3718 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3754 break; 3719 break;
3755#if 0
3756 case 1001: 3720 case 1002:
3757 break; /* X11 mouse highlighting */ 3721 case 1003:
3758#endif 3722 if (state)
3723 {
3724 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3725 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3726 vt_emask_mouse = PointerMotionMask;
3727 }
3728 else
3729 vt_emask_mouse = NoEventMask;
3730 vt_select_input ();
3731 break;
3759 case 1010: /* scroll to bottom on TTY output inhibit */ 3732 case 1010: /* scroll to bottom on TTY output inhibit */
3760 set_option (Opt_scrollTtyOutput, !state); 3733 set_option (Opt_scrollTtyOutput, !state);
3761 break; 3734 break;
3762 case 1011: /* scroll to bottom on key press */ 3735 case 1011: /* scroll to bottom on key press */
3763 set_option (Opt_scrollTtyKeypress, state); 3736 set_option (Opt_scrollTtyKeypress, state);
… …
3940rxvt_term::process_graphics () 3913rxvt_term::process_graphics ()
3941{ 3914{
3942 unicode_t ch, cmd = cmd_getc (); 3915 unicode_t ch, cmd = cmd_getc ();
3943 3916
3944 if (cmd == 'Q') 3917 if (cmd == 'Q')
3918 {
3945 { /* query graphics */ 3919 /* query graphics */
3946 tt_printf ("\033G0\012"); /* no graphics */ 3920 tt_printf ("\033G0\012"); /* no graphics */
3947 return; 3921 return;
3948 } 3922 }
3949 /* swallow other graphics sequences until terminating ':' */ 3923 /* swallow other graphics sequences until terminating ':' */
3950 do 3924 do
… …
4000 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3974 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4001 3975
4002 memcpy (v_buffer + v_buflen, data, len); 3976 memcpy (v_buffer + v_buflen, data, len);
4003 v_buflen += len; 3977 v_buflen += len;
4004 3978
4005 pty_ev.set (EVENT_READ | EVENT_WRITE); 3979 pty_ev.set (ev::READ | ev::WRITE);
4006} 3980}
4007 3981
4008void rxvt_term::pty_write () 3982void rxvt_term::pty_write ()
4009{ 3983{
4010 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3984 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4015 3989
4016 if (v_buflen == 0) 3990 if (v_buflen == 0)
4017 { 3991 {
4018 free (v_buffer); 3992 free (v_buffer);
4019 v_buffer = 0; 3993 v_buffer = 0;
4020 v_buflen = 0;
4021 3994
4022 pty_ev.set (EVENT_READ); 3995 pty_ev.set (ev::READ);
4023 return; 3996 return;
4024 } 3997 }
4025 3998
4026 memmove (v_buffer, v_buffer + written, v_buflen); 3999 memmove (v_buffer, v_buffer + written, v_buflen);
4027 } 4000 }
4028 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4001 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4029 pty_ev.set (EVENT_READ); 4002 pty_ev.set (ev::READ);
4030} 4003}
4031 4004
4032/*----------------------- end-of-file (C source) -----------------------*/ 4005/*----------------------- end-of-file (C source) -----------------------*/
4033 4006

Diff Legend

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