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.349 by ayin, Sun Aug 26 18:16:52 2007 UTC vs.
Revision 1.406 by ayin, Thu Feb 14 23:53:05 2008 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 201
201 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
202 203
203 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
205 206
206 if (y >= 0) 207 if (y >= 0)
207 { 208 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
220 ch = *chr++; 221 ch = *chr++;
221 222
222 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
225# if !UNICODE3 226# if !UNICODE_3
226 if (ch >= 0x10000) 227 if (ch >= 0x10000)
227 ch = 0xfffd; 228 ch = 0xfffd;
228# endif 229# endif
229 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
230 231
… …
301 302
302void 303void
303rxvt_term::key_press (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
304{ 305{
305 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 307 KeySym keysym;
308 int valid_keysym; 308 int valid_keysym;
309 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310 310
311#if ISO_14755 311#if ISO_14755
… …
546 } 546 }
547#endif 547#endif
548 548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 550 {
551 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
552 unsigned int newlen = 1;
553#ifdef XK_KP_Home
554 static const KeySym keypadtrans[] = {
555 XK_KP_7, // XK_KP_Home
556 XK_KP_4, // XK_KP_Left
557 XK_KP_8, // XK_KP_Up
558 XK_KP_6, // XK_KP_Right
559 XK_KP_2, // XK_KP_Down
560#ifndef UNSHIFTED_SCROLLKEYS
561 XK_KP_9, // XK_KP_Prior
562 XK_KP_3, // XK_KP_Next
563#else
564 XK_Prior,
565 XK_Next,
566#endif
567 XK_KP_1, // XK_KP_End
568 XK_KP_5, // XK_KP_Begin
569 };
570
571 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
551 { 572 {
552 newlen = 1; 573 unsigned int index = keysym - XK_KP_Home;
574 keysym = kp ? keypadtrans[index] : XK_Home + index;
575 }
576 else if (keysym == XK_KP_Insert)
577 keysym = kp ? XK_KP_0 : XK_Insert;
578#ifndef NO_DELETE_KEY
579 else if (keysym == XK_KP_Delete)
580 keysym = kp ? XK_KP_Decimal : XK_Delete;
581#endif
582#endif
553 switch (keysym) 583 switch (keysym)
554 { 584 {
555#ifndef NO_BACKSPACE_KEY 585#ifndef NO_BACKSPACE_KEY
556 case XK_BackSpace: 586 case XK_BackSpace:
557 if (priv_modes & PrivMode_HaveBackSpace) 587 if (priv_modes & PrivMode_HaveBackSpace)
… …
559 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 589 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
560 ^ !!ctrl) ? '\b' : '\177'; 590 ^ !!ctrl) ? '\b' : '\177';
561 kbuf[1] = '\0'; 591 kbuf[1] = '\0';
562 } 592 }
563 else 593 else
564 strcpy (kbuf, key_backspace); 594 strcpy (kbuf, rs[Rs_backspace_key]);
565 break; 595 break;
566#endif 596#endif
567#ifndef NO_DELETE_KEY 597#ifndef NO_DELETE_KEY
568# ifdef XK_KP_Prior
569 case XK_KP_Delete:
570 /* allow shift to override */
571 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
572 {
573 strcpy (kbuf, "\033On");
574 break;
575 }
576 /* FALLTHROUGH */
577# endif
578 case XK_Delete: 598 case XK_Delete:
579 strcpy (kbuf, key_delete); 599 strcpy (kbuf, rs[Rs_delete_key]);
580 break; 600 break;
581#endif 601#endif
582 case XK_Tab: 602 case XK_Tab:
583 if (shft) 603 if (shft)
584 strcpy (kbuf, "\033[Z"); 604 strcpy (kbuf, "\033[Z");
… …
594#endif 614#endif
595 newlen = 0; 615 newlen = 0;
596 } 616 }
597 break; 617 break;
598 618
599#ifdef XK_KP_Left
600 case XK_KP_Up: /* \033Ox or standard */
601 case XK_KP_Down: /* \033Or or standard */
602 case XK_KP_Right: /* \033Ov or standard */
603 case XK_KP_Left: /* \033Ot or standard */
604 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
605 {
606 strcpy (kbuf, "\033OZ");
607 kbuf[2] = "txvr"[keysym - XK_KP_Left];
608 break;
609 }
610 else
611 /* translate to std. cursor key */
612 keysym = XK_Left + (keysym - XK_KP_Left);
613 /* FALLTHROUGH */
614#endif
615 case XK_Up: /* "\033[A" */ 619 case XK_Up: /* "\033[A" */
616 case XK_Down: /* "\033[B" */ 620 case XK_Down: /* "\033[B" */
617 case XK_Right: /* "\033[C" */ 621 case XK_Right: /* "\033[C" */
618 case XK_Left: /* "\033[D" */ 622 case XK_Left: /* "\033[D" */
619 strcpy (kbuf, "\033[Z"); 623 strcpy (kbuf, "\033[Z");
… …
629 else if (priv_modes & PrivMode_aplCUR) 633 else if (priv_modes & PrivMode_aplCUR)
630 kbuf[1] = 'O'; 634 kbuf[1] = 'O';
631 break; 635 break;
632 636
633#ifndef UNSHIFTED_SCROLLKEYS 637#ifndef UNSHIFTED_SCROLLKEYS
634# ifdef XK_KP_Prior
635 case XK_KP_Prior:
636 /* allow shift to override */
637 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
638 {
639 strcpy (kbuf, "\033Oy");
640 break;
641 }
642 /* FALLTHROUGH */
643# endif
644 case XK_Prior: 638 case XK_Prior:
645 strcpy (kbuf, "\033[5~"); 639 strcpy (kbuf, "\033[5~");
646 break; 640 break;
647# ifdef XK_KP_Next
648 case XK_KP_Next:
649 /* allow shift to override */
650 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
651 {
652 strcpy (kbuf, "\033Os");
653 break;
654 }
655 /* FALLTHROUGH */
656# endif
657 case XK_Next: 641 case XK_Next:
658 strcpy (kbuf, "\033[6~"); 642 strcpy (kbuf, "\033[6~");
659 break; 643 break;
660#endif 644#endif
661 case XK_KP_Enter: 645 case XK_KP_Enter:
662 /* allow shift to override */ 646 /* allow shift to override */
663 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 647 if (kp)
664 { 648 {
665 strcpy (kbuf, "\033OM"); 649 strcpy (kbuf, "\033OM");
666 break; 650 break;
667 } 651 }
668 652
… …
680 kbuf[0] = '\015'; 664 kbuf[0] = '\015';
681 kbuf[1] = '\0'; 665 kbuf[1] = '\0';
682 } 666 }
683 break; 667 break;
684 668
685#ifdef XK_KP_Begin
686 case XK_KP_Begin:
687 strcpy (kbuf, "\033Ou");
688 break;
689
690#endif
691 case XK_KP_F1: /* "\033OP" */ 669 case XK_KP_F1: /* "\033OP" */
692 case XK_KP_F2: /* "\033OQ" */ 670 case XK_KP_F2: /* "\033OQ" */
693 case XK_KP_F3: /* "\033OR" */ 671 case XK_KP_F3: /* "\033OR" */
694 case XK_KP_F4: /* "\033OS" */ 672 case XK_KP_F4: /* "\033OS" */
695 strcpy (kbuf, "\033OP"); 673 strcpy (kbuf, "\033OP");
… …
711 case XK_KP_6: /* "\033Ov" : "6" */ 689 case XK_KP_6: /* "\033Ov" : "6" */
712 case XK_KP_7: /* "\033Ow" : "7" */ 690 case XK_KP_7: /* "\033Ow" : "7" */
713 case XK_KP_8: /* "\033Ox" : "8" */ 691 case XK_KP_8: /* "\033Ox" : "8" */
714 case XK_KP_9: /* "\033Oy" : "9" */ 692 case XK_KP_9: /* "\033Oy" : "9" */
715 /* allow shift to override */ 693 /* allow shift to override */
716 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 694 if (kp)
717 { 695 {
718 strcpy (kbuf, "\033Oj"); 696 strcpy (kbuf, "\033Oj");
719 kbuf[2] += (keysym - XK_KP_Multiply); 697 kbuf[2] += (keysym - XK_KP_Multiply);
720 } 698 }
721 else 699 else
… …
727 705
728 case XK_Find: 706 case XK_Find:
729 strcpy (kbuf, "\033[1~"); 707 strcpy (kbuf, "\033[1~");
730 break; 708 break;
731 709
732#ifdef XK_KP_Insert
733 case XK_KP_Insert:
734 /* allow shift to override */
735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
736 {
737 strcpy (kbuf, "\033Op");
738 break;
739 }
740 /* FALLTHROUGH */
741#endif
742 case XK_Insert: 710 case XK_Insert:
743 strcpy (kbuf, "\033[2~"); 711 strcpy (kbuf, "\033[2~");
744 break; 712 break;
745#ifdef DXK_Remove /* support for DEC remove like key */ 713#ifdef DXK_Remove /* support for DEC remove like key */
746 case DXK_Remove: 714 case DXK_Remove:
… …
750 strcpy (kbuf, "\033[3~"); 718 strcpy (kbuf, "\033[3~");
751 break; 719 break;
752 case XK_Select: 720 case XK_Select:
753 strcpy (kbuf, "\033[4~"); 721 strcpy (kbuf, "\033[4~");
754 break; 722 break;
755#ifdef XK_KP_End
756 case XK_KP_End:
757 /* allow shift to override */
758 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
759 {
760 strcpy (kbuf, "\033Oq");
761 break;
762 }
763 /* FALLTHROUGH */
764#endif
765 case XK_End: 723 case XK_End:
766 strcpy (kbuf, KS_END); 724 strcpy (kbuf, KS_END);
767 break; 725 break;
768#ifdef XK_KP_Home
769 case XK_KP_Home:
770 /* allow shift to override */
771 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
772 {
773 strcpy (kbuf, "\033Ow");
774 break;
775 }
776 /* FALLTHROUGH */
777#endif
778 case XK_Home: 726 case XK_Home:
779 strcpy (kbuf, KS_HOME); 727 strcpy (kbuf, KS_HOME);
780 break; 728 break;
781 729
782#define FKEY(n, fkey) \ 730#define FKEY(n, fkey) \
… …
839 break; 787 break;
840 } 788 }
841 789
842 if (newlen) 790 if (newlen)
843 len = strlen (kbuf); 791 len = strlen (kbuf);
844 }
845 792
846 /* 793 /*
847 * Pass meta for all function keys, if 'meta' option set 794 * Pass meta for all function keys, if 'meta' option set
848 */ 795 */
849#ifdef META8_OPTION 796#ifdef META8_OPTION
… …
1034void 981void
1035rxvt_term::flush () 982rxvt_term::flush ()
1036{ 983{
1037 flush_ev.stop (); 984 flush_ev.stop ();
1038 985
1039#ifdef ENABLE_TRANSPARENCY 986#ifdef HAVE_BG_PIXMAP
1040 if (want_full_refresh) 987 if (bgPixmap.check_clearChanged ())
1041 { 988 {
1042 want_full_refresh = 0; 989// scr_clear (true); This needs to be researched further!
1043 scr_clear ();
1044 scr_touch (false); 990 scr_touch (false);
1045 } 991 }
1046#endif 992#endif
1047 993
1048 if (want_refresh) 994 if (want_refresh)
… …
1093 } 1039 }
1094 1040
1095 display->flush (); 1041 display->flush ();
1096} 1042}
1097 1043
1044/* checks wether a refresh is requested and starts the refresh timer */
1098void 1045void
1099rxvt_term::check_cb (check_watcher &w) 1046rxvt_term::refresh_check ()
1100{ 1047{
1101 make_current (); 1048 if (want_refresh && !flush_ev.is_active ())
1049 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102 1050
1103 display->flush (); 1051 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107} 1052}
1108 1053
1109void 1054void
1110rxvt_term::flush_cb (time_watcher &w) 1055rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1056{
1112 make_current (); 1057 make_current ();
1113 1058
1114 refresh_count = 0; 1059 refresh_count = 0;
1115 flush (); 1060 flush ();
1116} 1061}
1117 1062
1118#ifdef CURSOR_BLINK 1063#ifdef CURSOR_BLINK
1119void 1064void
1120rxvt_term::cursor_blink_cb (time_watcher &w) 1065rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1066{
1122 hidden_cursor = !hidden_cursor; 1067 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1068 want_refresh = 1;
1124 1069 refresh_check ();
1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1126} 1070}
1127#endif 1071#endif
1128 1072
1129#ifdef TEXT_BLINK 1073#ifdef TEXT_BLINK
1130void 1074void
1131rxvt_term::text_blink_cb (time_watcher &w) 1075rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132{ 1076{
1133 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1077 if (scr_refresh_rend (RS_Blink, RS_Blink))
1134 { 1078 {
1135 hidden_text = !hidden_text; 1079 hidden_text = !hidden_text;
1136 want_refresh = 1; 1080 want_refresh = 1;
1137 w.start (w.at + TEXT_BLINK_INTERVAL); 1081 refresh_check ();
1138 } 1082 }
1083 else
1084 w.stop ();
1139} 1085}
1140#endif 1086#endif
1141 1087
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1089void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1091{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1092 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1093 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1148 { 1094 {
1149 want_refresh = 1; 1095 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1151 } 1097 }
1098 else
1099 w.stop ();
1152} 1100}
1153#endif 1101#endif
1154 1102
1155#ifdef SELECTION_SCROLLING 1103#ifdef SELECTION_SCROLLING
1156void 1104void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1105rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1106{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1107 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160 { 1108 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1109 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1110 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 refresh_check ();
1164 } 1112 }
1113 else
1114 w.stop ();
1165} 1115}
1166#endif 1116#endif
1167 1117
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1118#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1119void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1120rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1121{
1172 if (mouse_slip_wheel_speed == 0 1122 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174 : scr_page (UP, mouse_slip_wheel_speed))
1175 { 1123 {
1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1179 want_refresh = 1; 1124 want_refresh = 1;
1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1125 refresh_check ();
1126 }
1127
1128 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1129 {
1130 mouse_slip_wheel_speed = 0;
1131 w.stop ();
1181 } 1132 }
1182} 1133}
1183#endif 1134#endif
1184 1135
1185#if LINUX_YIELD_HACK 1136#if LINUX_YIELD_HACK
1186static struct event_handler 1137static struct event_handler
1187{ 1138{
1188 check_watcher yield_ev; 1139 ev::prepare yield_ev;
1189 1140
1190 void yield_cb (check_watcher &w) 1141 void yield_cb (ev::prepare &w, int revents)
1191 { 1142 {
1192 // this should really be sched_yield(), but the linux guys thought 1143 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than 1144 // that giving a process calling sched_yield () less cpu time than
1194 // ones with high nice levels is a useful thing to do. It surely is is 1145 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS. 1146 // allowed by the sus... as is returning ENOSYS.
… …
1246 1197
1247 return false; 1198 return false;
1248} 1199}
1249 1200
1250void 1201void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1202rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1203{
1253 make_current (); 1204 make_current ();
1254 1205
1255 if (revents & EVENT_READ) 1206 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1207 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1208 while (pty_fill ())
1258 if (cmd_parse ()) 1209 if (cmd_parse ())
1259 break; 1210 break;
1260 1211
1261 if (revents & EVENT_WRITE) 1212 if (revents & ev::WRITE)
1262 pty_write (); 1213 pty_write ();
1214
1215 refresh_check ();
1263} 1216}
1264 1217
1265void 1218void
1266rxvt_term::pointer_unblank () 1219rxvt_term::pointer_unblank ()
1267{ 1220{
… …
1270 1223
1271#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1225 hidden_pointer = 0;
1273 1226
1274 if (option (Opt_pointerBlank)) 1227 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1228 pointer_ev.start (pointerBlankDelay);
1276#endif 1229#endif
1277} 1230}
1278 1231
1279#ifdef POINTER_BLANK 1232#ifdef POINTER_BLANK
1280void 1233void
… …
1288 1241
1289 hidden_pointer = 1; 1242 hidden_pointer = 1;
1290} 1243}
1291 1244
1292void 1245void
1293rxvt_term::pointer_cb (time_watcher &w) 1246rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1247{
1295 make_current (); 1248 make_current ();
1296 1249
1297 pointer_blank (); 1250 pointer_blank ();
1298} 1251}
… …
1301void 1254void
1302rxvt_term::mouse_report (XButtonEvent &ev) 1255rxvt_term::mouse_report (XButtonEvent &ev)
1303{ 1256{
1304 int button_number, key_state = 0; 1257 int button_number, key_state = 0;
1305 int x, y; 1258 int x, y;
1259 int code = 32;
1306 1260
1307 x = ev.x; 1261 x = Pixel2Col (ev.x);
1308 y = ev.y; 1262 y = Pixel2Row (ev.y);
1309 pixel_position (&x, &y); 1263 if (ev.type == MotionNotify)
1264 {
1265 if (x == mouse_row && y == mouse_col)
1266 return;
1267 mouse_row = x;
1268 mouse_col = y;
1269 code += 32;
1270 }
1310 1271
1311 if (MEvent.button == AnyButton) 1272 if (MEvent.button == AnyButton)
1312 button_number = 3; 1273 button_number = 3;
1313 else 1274 else
1314 { 1275 {
… …
1360 x + 1, 1321 x + 1,
1361 y + 1); 1322 y + 1);
1362#endif 1323#endif
1363 1324
1364 tt_printf ("\033[M%c%c%c", 1325 tt_printf ("\033[M%c%c%c",
1365 (32 + button_number + key_state), 1326 (code + button_number + key_state),
1366 (32 + x + 1), 1327 (32 + x + 1),
1367 (32 + y + 1)); 1328 (32 + y + 1));
1368} 1329}
1369 1330
1370/*{{{ process an X event */ 1331/*{{{ process an X event */
… …
1474 && ev.xfocus.mode != NotifyGrab) 1435 && ev.xfocus.mode != NotifyGrab)
1475 focus_out (); 1436 focus_out ();
1476 break; 1437 break;
1477 1438
1478 case ConfigureNotify: 1439 case ConfigureNotify:
1479/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1440 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1480 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1441 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481 szHint.width, szHint.height);*/ 1442 szHint.width, szHint.height);*/
1482 if (ev.xconfigure.window == parent[0]) 1443 if (ev.xconfigure.window == parent[0])
1483 { 1444 {
1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1445 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
… …
1489 seen_resize = 1; 1450 seen_resize = 1;
1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1451 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491 } 1452 }
1492 else 1453 else
1493 { 1454 {
1494#ifdef ENABLE_TRANSPARENCY 1455#ifdef HAVE_BG_PIXMAP
1495 if (option (Opt_transparent)) 1456 if (bgPixmap.window_position_sensitive ())
1457 {
1458 if (mapped)
1496 update_background (); 1459 update_background ();
1460 else
1461 bgPixmap.invalidate ();
1462 }
1497#endif 1463#endif
1498 } 1464 }
1465
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500 } 1467 }
1501 break; 1468 break;
1502 1469
1503 case PropertyNotify: 1470 case PropertyNotify:
… …
1520 case SelectionRequest: 1487 case SelectionRequest:
1521 selection_send (ev.xselectionrequest); 1488 selection_send (ev.xselectionrequest);
1522 break; 1489 break;
1523 1490
1524 case MapNotify: 1491 case MapNotify:
1492#ifdef HAVE_BG_PIXMAP
1493 /* This is needed spcifically to fix the case of no window manager or a
1494 * non-reparenting window manager. In those cases we never get first
1495 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1496 * care of multiplicity of ConfigureNotify events arriwing while WM does
1497 * reparenting.
1498 * We should not render background immidiately, as there could be several
1499 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1500 * by scheduling background redraw as soon as we can, but giving a short
1501 * bit of time for ConfigureNotifies to arrive.
1502 * We should render background PRIOR to drawing any text, but AFTER all
1503 * of ConfigureNotifys for the best results.
1504 */
1505 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1506 update_background_ev.start (0.025);
1507#endif
1525 mapped = 1; 1508 mapped = 1;
1526#ifdef TEXT_BLINK 1509#ifdef TEXT_BLINK
1527 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1510 text_blink_ev.start ();
1528#endif 1511#endif
1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530 break; 1513 break;
1531 1514
1532 case UnmapNotify: 1515 case UnmapNotify:
… …
1534#ifdef TEXT_BLINK 1517#ifdef TEXT_BLINK
1535 text_blink_ev.stop (); 1518 text_blink_ev.stop ();
1536#endif 1519#endif
1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1520 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 break; 1521 break;
1539
1540#ifdef ENABLE_TRANSPARENCY
1541 case ReparentNotify:
1542 rootwin_cb (ev);
1543 break;
1544#endif /* ENABLE_TRANSPARENCY */
1545 1522
1546 case GraphicsExpose: 1523 case GraphicsExpose:
1547 case Expose: 1524 case Expose:
1548 if (ev.xany.window == vt) 1525 if (ev.xany.window == vt)
1549 { 1526 {
1550 do 1527 do
1528 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1529 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1530 ev.xexpose.width, ev.xexpose.height, False);
1531 }
1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1554 1533
1555 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1534 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1556 1535
1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1536 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1537 {
1558 scr_expose (ev.xexpose.x, ev.xexpose.y, 1538 scr_expose (ev.xexpose.x, ev.xexpose.y,
1559 ev.xexpose.width, ev.xexpose.height, False); 1539 ev.xexpose.width, ev.xexpose.height, False);
1540 }
1560 1541
1561 want_refresh = 1; 1542 want_refresh = 1;
1562 } 1543 }
1563 else 1544 else
1564 { 1545 {
… …
1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1548 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1568 ; 1549 ;
1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1570 ; 1551 ;
1571 1552
1572 if (isScrollbarWindow (ev.xany.window)) 1553 if (scrollBar.state && ev.xany.window == scrollBar.win)
1573 { 1554 {
1574 scrollBar.setIdle (); 1555 scrollBar.state = STATE_IDLE;
1575 scrollbar_show (0); 1556 scrollbar_show (0);
1576 } 1557 }
1577 } 1558 }
1578 break; 1559 break;
1579 1560
1580 case MotionNotify: 1561 case MotionNotify:
1581#ifdef POINTER_BLANK 1562#ifdef POINTER_BLANK
1582 if (hidden_pointer) 1563 if (hidden_pointer)
1583 pointer_unblank (); 1564 pointer_unblank ();
1584#endif 1565#endif
1566 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1567 || priv_modes & PrivMode_MouseAnyEvent)
1568 mouse_report (ev.xbutton);
1585 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1569 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1586 break; 1570 break;
1587 1571
1588 if (ev.xany.window == vt) 1572 if (ev.xany.window == vt)
1589 { 1573 {
… …
1623 int dist; 1607 int dist;
1624 1608
1625 /* don't clobber the current delay if we are 1609 /* don't clobber the current delay if we are
1626 * already in the middle of scrolling. 1610 * already in the middle of scrolling.
1627 */ 1611 */
1628 if (!sel_scroll_ev.active) 1612 if (!sel_scroll_ev.is_active ())
1629 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1613 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1630 1614
1631 /* save the event params so we can highlight 1615 /* save the event params so we can highlight
1632 * the selection in the pending-scroll loop 1616 * the selection in the pending-scroll loop
1633 */ 1617 */
1634 selection_save_x = ev.xbutton.x; 1618 selection_save_x = ev.xbutton.x;
… …
1656 else 1640 else
1657 { 1641 {
1658 /* we are within the text window, so we 1642 /* we are within the text window, so we
1659 * shouldn't be scrolling 1643 * shouldn't be scrolling
1660 */ 1644 */
1661 if (sel_scroll_ev.active)
1662 sel_scroll_ev.stop(); 1645 sel_scroll_ev.stop();
1663 } 1646 }
1664#endif 1647#endif
1665#ifdef MOUSE_THRESHOLD 1648#ifdef MOUSE_THRESHOLD
1666 } 1649 }
1667#endif 1650#endif
1668 } 1651 }
1669 } 1652 }
1670 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1653 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1671 { 1654 {
1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1655 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1673 MotionNotify, &ev)) 1656 MotionNotify, &ev))
1674 ; 1657 ;
1675 1658
… …
1693 { 1676 {
1694 hidden_cursor = 0; 1677 hidden_cursor = 0;
1695 want_refresh = 1; 1678 want_refresh = 1;
1696 } 1679 }
1697 1680
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1681 cursor_blink_ev.again ();
1699 } 1682 }
1700#endif 1683#endif
1701 1684
1702#if defined(POINTER_BLANK) 1685#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1686 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1710 1693
1711 if (ev.type == KeyPress && hidden_pointer == 0) 1694 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank (); 1695 pointer_blank ();
1713 } 1696 }
1714#endif 1697#endif
1698
1699 refresh_check ();
1715} 1700}
1716 1701
1717void 1702void
1718rxvt_term::focus_in () 1703rxvt_term::focus_in ()
1719{ 1704{
… …
1731 XSetICFocus (Input_Context); 1716 XSetICFocus (Input_Context);
1732 } 1717 }
1733#endif 1718#endif
1734#if CURSOR_BLINK 1719#if CURSOR_BLINK
1735 if (option (Opt_cursorBlink)) 1720 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1721 cursor_blink_ev.again ();
1737#endif 1722#endif
1738#if OFF_FOCUS_FADING 1723#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1724 if (rs[Rs_fade])
1740 { 1725 {
1741 pix_colors = pix_colors_focused; 1726 pix_colors = pix_colors_focused;
… …
1743 } 1728 }
1744#endif 1729#endif
1745#if ENABLE_FRILLS 1730#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell)) 1731 if (option (Opt_urgentOnBell))
1747 { 1732 {
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]); 1733 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1751 if (h != NULL)
1752 { 1734 {
1753 h->flags &= ~XUrgencyHint; 1735 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h); 1736 XSetWMHints (dpy, parent[0], h);
1755 } 1737 }
1756 } 1738 }
1757#endif 1739#endif
1758 } 1740 }
1759} 1741}
… …
1782 XUnsetICFocus (Input_Context); 1764 XUnsetICFocus (Input_Context);
1783#endif 1765#endif
1784#if CURSOR_BLINK 1766#if CURSOR_BLINK
1785 if (option (Opt_cursorBlink)) 1767 if (option (Opt_cursorBlink))
1786 cursor_blink_ev.stop (); 1768 cursor_blink_ev.stop ();
1769
1787 hidden_cursor = 0; 1770 hidden_cursor = 0;
1788#endif 1771#endif
1789#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
1791 { 1774 {
… …
1831 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1832 { 1815 {
1833 bgPixmap.set_root_pixmap (); 1816 bgPixmap.set_root_pixmap ();
1834 update_background (); 1817 update_background ();
1835 } 1818 }
1819
1836 break; 1820 break;
1837 } 1821 }
1838# endif 1822# endif
1823
1824 refresh_check ();
1839} 1825}
1840#endif 1826#endif
1841 1827
1842void 1828void
1843rxvt_term::button_press (XButtonEvent &ev) 1829rxvt_term::button_press (XButtonEvent &ev)
… …
1898 mouse_report (ev); 1884 mouse_report (ev);
1899 } 1885 }
1900#else 1886#else
1901 MEvent.button = ev.button; 1887 MEvent.button = ev.button;
1902 mouse_report (ev); 1888 mouse_report (ev);
1903#endif /* MOUSE_REPORT_DOUBLECLICK */ 1889#endif /* MOUSE_REPORT_DOUBLECLICK */
1904 1890
1905 } 1891 }
1906 else 1892 else
1907 { 1893 {
1908 if (ev.button != MEvent.button) 1894 if (ev.button != MEvent.button)
… …
1956 } 1942 }
1957 1943
1958 /* 1944 /*
1959 * Scrollbar window processing of button press 1945 * Scrollbar window processing of button press
1960 */ 1946 */
1961 if (isScrollbarWindow (ev.window)) 1947 if (scrollBar.state && ev.window == scrollBar.win)
1962 { 1948 {
1963 scrollBar.setIdle (); 1949 page_dirn direction = NO_DIR;
1950
1951 if (scrollBar.upButton (ev.y))
1952 direction = UP; /* up */
1953 else if (scrollBar.dnButton (ev.y))
1954 direction = DN; /* down */
1955
1956 scrollBar.state = STATE_IDLE;
1964 /* 1957 /*
1965 * Rxvt-style scrollbar: 1958 * Rxvt-style scrollbar:
1966 * move up if mouse is above slider 1959 * move up if mouse is above slider
1967 * move dn if mouse is below slider 1960 * move dn if mouse is below slider
1968 * 1961 *
… …
1977 /* 1970 /*
1978 * Mouse report disabled scrollbar: 1971 * Mouse report disabled scrollbar:
1979 * arrow buttons - send up/down 1972 * arrow buttons - send up/down
1980 * click on scrollbar - send pageup/down 1973 * click on scrollbar - send pageup/down
1981 */ 1974 */
1982 if ((scrollBar.style == R_SB_NEXT 1975 if (direction == UP)
1983 && scrollbarnext_upButton (ev.y))
1984 || (scrollBar.style == R_SB_RXVT
1985 && scrollbarrxvt_upButton (ev.y)))
1986 tt_printf ("\033[A"); 1976 tt_printf ("\033[A");
1987 else if ((scrollBar.style == R_SB_NEXT 1977 else if (direction == DN)
1988 && scrollbarnext_dnButton (ev.y))
1989 || (scrollBar.style == R_SB_RXVT
1990 && scrollbarrxvt_dnButton (ev.y)))
1991 tt_printf ("\033[B"); 1978 tt_printf ("\033[B");
1992 else 1979 else
1993 switch (ev.button) 1980 switch (ev.button)
1994 { 1981 {
1995 case Button2: 1982 case Button2:
… …
2002 tt_printf ("\033[5~"); 1989 tt_printf ("\033[5~");
2003 break; 1990 break;
2004 } 1991 }
2005 } 1992 }
2006 else 1993 else
2007#endif /* NO_SCROLLBAR_REPORT */ 1994#endif /* NO_SCROLLBAR_REPORT */
2008
2009 {
2010 char upordown = 0;
2011
2012 if (scrollBar.style == R_SB_NEXT)
2013 { 1995 {
2014 if (scrollbarnext_upButton (ev.y)) 1996 if (direction != NO_DIR)
2015 upordown = -1; /* up */
2016 else if (scrollbarnext_dnButton (ev.y))
2017 upordown = 1; /* down */
2018 }
2019 else if (scrollBar.style == R_SB_RXVT)
2020 {
2021 if (scrollbarrxvt_upButton (ev.y))
2022 upordown = -1; /* up */
2023 else if (scrollbarrxvt_dnButton (ev.y))
2024 upordown = 1; /* down */
2025 }
2026 if (upordown)
2027 { 1997 {
2028#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1998#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1999 if (!cont_scroll_ev.is_active ())
2029 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2000 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2030#endif 2001#endif
2031 if (scr_page (upordown < 0 ? UP : DN, 1)) 2002 if (scr_page (direction, 1))
2032 { 2003 {
2033 if (upordown < 0) 2004 if (direction == UP)
2034 scrollBar.setUp (); 2005 scrollBar.state = STATE_UP;
2035 else 2006 else
2036 scrollBar.setDn (); 2007 scrollBar.state = STATE_DOWN;
2037 } 2008 }
2038 } 2009 }
2039 else 2010 else
2040 switch (ev.button) 2011 switch (ev.button)
2041 { 2012 {
2042 case Button2: 2013 case Button2:
2043 switch (scrollbar_align) 2014 switch (scrollBar.align)
2044 { 2015 {
2045 case R_SB_ALIGN_TOP: 2016 case R_SB_ALIGN_TOP:
2046 csrO = 0; 2017 csrO = 0;
2047 break; 2018 break;
2048 case R_SB_ALIGN_CENTRE: 2019 case R_SB_ALIGN_CENTRE:
… …
2056 if (scrollBar.style == R_SB_XTERM 2027 if (scrollBar.style == R_SB_XTERM
2057 || scrollbar_above_slider (ev.y) 2028 || scrollbar_above_slider (ev.y)
2058 || scrollbar_below_slider (ev.y)) 2029 || scrollbar_below_slider (ev.y))
2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2060 2031
2061 scrollBar.setMotion (); 2032 scrollBar.state = STATE_MOTION;
2062 break; 2033 break;
2063 2034
2064 case Button1: 2035 case Button1:
2065 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2036 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2066 csrO = ev.y - scrollBar.top; 2037 csrO = ev.y - scrollBar.top;
2067 /* FALLTHROUGH */ 2038 /* FALLTHROUGH */
2068 2039
2069 case Button3: 2040 case Button3:
2070 if (scrollBar.style != R_SB_XTERM) 2041 if (scrollBar.style != R_SB_XTERM)
… …
2080 scr_page (DN, nrow - 1); 2051 scr_page (DN, nrow - 1);
2081# else 2052# else
2082 scr_page (DN, nrow / 4); 2053 scr_page (DN, nrow / 4);
2083# endif 2054# endif
2084 else 2055 else
2085 scrollBar.setMotion (); 2056 scrollBar.state = STATE_MOTION;
2086 } 2057 }
2087 else 2058 else
2088 { 2059 {
2089 scr_page ((ev.button == Button1 ? DN : UP), 2060 scr_page ((ev.button == Button1 ? DN : UP),
2090 (nrow 2061 (nrow
… …
2107 2078
2108 csrO = 0; /* reset csr Offset */ 2079 csrO = 0; /* reset csr Offset */
2109 if (!bypass_keystate) 2080 if (!bypass_keystate)
2110 reportmode = !! (priv_modes & PrivMode_mouse_report); 2081 reportmode = !! (priv_modes & PrivMode_mouse_report);
2111 2082
2112 if (scrollbar_isUpDn ()) 2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2113 { 2084 {
2114 scrollBar.setIdle (); 2085 scrollBar.state = STATE_IDLE;
2115 scrollbar_show (0); 2086 scrollbar_show (0);
2116 } 2087 }
2117 2088
2118#ifdef SELECTION_SCROLLING 2089#ifdef SELECTION_SCROLLING
2119 if (sel_scroll_ev.active)
2120 sel_scroll_ev.stop(); 2090 sel_scroll_ev.stop();
2121#endif 2091#endif
2122 2092
2123 if (ev.window == vt) 2093 if (ev.window == vt)
2124 { 2094 {
2125 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2095 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2149 mouse_report (ev); 2119 mouse_report (ev);
2150 } 2120 }
2151#else /* MOUSE_REPORT_DOUBLECLICK */ 2121#else /* MOUSE_REPORT_DOUBLECLICK */
2152 MEvent.button = AnyButton; 2122 MEvent.button = AnyButton;
2153 mouse_report (ev); 2123 mouse_report (ev);
2154#endif /* MOUSE_REPORT_DOUBLECLICK */ 2124#endif /* MOUSE_REPORT_DOUBLECLICK */
2155 return; 2125 return;
2156 } 2126 }
2157 2127
2158 /* 2128 /*
2159 * dumb hack to compensate for the failure of click-and-drag 2129 * dumb hack to compensate for the failure of click-and-drag
… …
2197 { 2167 {
2198 mouse_slip_wheel_speed += v ? -1 : 1; 2168 mouse_slip_wheel_speed += v ? -1 : 1;
2199 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2169 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2200 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2170 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2201 2171
2202 if (slip_wheel_ev.at < NOW) 2172 if (!slip_wheel_ev.is_active ())
2203 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2173 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2204
2205 slip_wheel_ev.start ();
2206 } 2174 }
2207 else 2175 else
2176# endif
2208 { 2177 {
2209# endif
2210 scr_page (v, i); 2178 scr_page (v, i);
2211 scrollbar_show (1); 2179 scrollbar_show (1);
2212# ifdef MOUSE_SLIP_WHEELING
2213 } 2180 }
2214# endif
2215 } 2181 }
2216 break; 2182 break;
2217#endif 2183#endif
2218 } 2184 }
2219 } 2185 }
… …
2278 2244
2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2245 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2280 { 2246 {
2281 refresh_count = 0; 2247 refresh_count = 0;
2282 2248
2283 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2249 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2284 { 2250 {
2285 refreshnow = true; 2251 refreshnow = true;
2286 ch = NOCHAR; 2252 ch = NOCHAR;
2287 break; 2253 break;
2288 } 2254 }
… …
2499 } 2465 }
2500 } 2466 }
2501 2467
2502 pclose_printer (fd); 2468 pclose_printer (fd);
2503} 2469}
2504#endif /* PRINTPIPE */ 2470#endif /* PRINTPIPE */
2505/*}}} */ 2471/*}}} */
2506 2472
2507/* *INDENT-OFF* */ 2473/* *INDENT-OFF* */
2508enum { 2474enum {
2509 C1_40 = 0x40, 2475 C1_40 = 0x40,
… …
2802 nargs = 0; 2768 nargs = 0;
2803 2769
2804 priv = 0; 2770 priv = 0;
2805 ch = cmd_getc (); 2771 ch = cmd_getc ();
2806 if (ch >= '<' && ch <= '?') 2772 if (ch >= '<' && ch <= '?')
2773 {
2807 { /* '<' '=' '>' '?' */ 2774 /* '<' '=' '>' '?' */
2808 priv = ch; 2775 priv = ch;
2809 ch = cmd_getc (); 2776 ch = cmd_getc ();
2810 } 2777 }
2811 2778
2812 /* read any numerical arguments */ 2779 /* read any numerical arguments */
… …
2855 { 2822 {
2856 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2823 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2857 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2824 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2858 // 2825 //
2859 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2826 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2860 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2827 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2861 // that we do not support xterm mouse reporting (should be 95 when we do). 2828 // versions.
2862 // 2829 //
2863 tt_printf ("\033[>%d;94;0c", 'U'); 2830 tt_printf ("\033[>%d;95;0c", 'U');
2864 } 2831 }
2865 break; 2832 break;
2833
2866 case '?': 2834 case '?':
2867 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2835 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2868 process_terminal_mode (ch, priv, nargs, arg); 2836 process_terminal_mode (ch, priv, nargs, arg);
2869 break; 2837 break;
2870 } 2838 }
… …
3386 *buf++ = '\0'; 3354 *buf++ = '\0';
3387 3355
3388 process_color_seq (op, color, name, resp); 3356 process_color_seq (op, color, name, resp);
3389 } 3357 }
3390 break; 3358 break;
3359 case Rxvt_restoreFG:
3391 case XTerm_Color00: 3360 case XTerm_Color00:
3392 process_color_seq (op, Color_fg, str, resp); 3361 process_color_seq (op, Color_fg, str, resp);
3393 break; 3362 break;
3363 case Rxvt_restoreBG:
3394 case XTerm_Color01: 3364 case XTerm_Color01:
3395 process_color_seq (op, Color_bg, str, resp); 3365 process_color_seq (op, Color_bg, str, resp);
3396 break; 3366 break;
3397#ifndef NO_CURSORCOLOR 3367#ifndef NO_CURSORCOLOR
3398 case XTerm_Color_cursor: 3368 case XTerm_Color_cursor:
… …
3424#if ENABLE_TRANSPARENCY 3394#if ENABLE_TRANSPARENCY
3425 case URxvt_Color_tint: 3395 case URxvt_Color_tint:
3426 process_color_seq (op, Color_tint, str, resp); 3396 process_color_seq (op, Color_tint, str, resp);
3427 { 3397 {
3428 bool changed = false; 3398 bool changed = false;
3399
3429 if (ISSET_PIXCOLOR (Color_tint)) 3400 if (ISSET_PIXCOLOR (Color_tint))
3430 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3401 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3431 else 3402 else
3432 changed = bgPixmap.unset_tint (); 3403 changed = bgPixmap.unset_tint ();
3404
3433 if (changed) 3405 if (changed)
3434 update_background (); 3406 update_background ();
3435 } 3407 }
3436 3408
3437 break; 3409 break;
3438#endif 3410#endif
3439 3411
3440#if XPM_BACKGROUND 3412#if BG_IMAGE_FROM_FILE
3441 case Rxvt_Pixmap: 3413 case Rxvt_Pixmap:
3442 if (!strcmp (str, "?")) 3414 if (!strcmp (str, "?"))
3443 { 3415 {
3444 char str[256]; 3416 char str[256];
3445 3417
… …
3460 changed++; 3432 changed++;
3461 str = strchr (str, ';'); 3433 str = strchr (str, ';');
3462 if (str == NULL) 3434 if (str == NULL)
3463 bgPixmap.set_defaultGeometry (); 3435 bgPixmap.set_defaultGeometry ();
3464 } 3436 }
3437
3465 while (str) 3438 while (str)
3466 { 3439 {
3467 str++; 3440 str++;
3468 if (bgPixmap.set_geometry (str)) 3441 if (bgPixmap.set_geometry (str))
3469 changed++; 3442 changed++;
3470 str = strchr (str, ';'); 3443 str = strchr (str, ';');
3471 } 3444 }
3445
3472 if (changed) 3446 if (changed)
3473 update_background (); 3447 update_background ();
3474 } 3448 }
3475 break; 3449 break;
3476#endif 3450#endif
3477
3478 case Rxvt_restoreFG:
3479 set_window_color (Color_fg, str);
3480 break;
3481 case Rxvt_restoreBG:
3482 set_window_color (Color_bg, str);
3483 break;
3484 3451
3485 case XTerm_logfile: 3452 case XTerm_logfile:
3486 // TODO, when secure mode? 3453 // TODO, when secure mode?
3487 break; 3454 break;
3488 3455
… …
3632 { 66, PrivMode_aplKP }, 3599 { 66, PrivMode_aplKP },
3633#ifndef NO_BACKSPACE_KEY 3600#ifndef NO_BACKSPACE_KEY
3634 { 67, PrivMode_BackSpace }, 3601 { 67, PrivMode_BackSpace },
3635#endif 3602#endif
3636 { 1000, PrivMode_MouseX11 }, 3603 { 1000, PrivMode_MouseX11 },
3637 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3604 { 1002, PrivMode_MouseBtnEvent },
3638 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3605 { 1003, PrivMode_MouseAnyEvent },
3639 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3606 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3641 { 1011, PrivMode_Keypress }, // rxvt extension 3607 { 1011, PrivMode_Keypress }, // rxvt extension
3642 // 1035 enable modifiers for alt, numlock NYI 3608 // 1035 enable modifiers for alt, numlock NYI
3643 // 1036 send ESC for meta keys NYI 3609 // 1036 send ESC for meta keys NYI
3644 // 1037 send DEL for keypad delete NYI 3610 // 1037 send DEL for keypad delete NYI
3645 { 1047, PrivMode_Screen }, 3611 { 1047, PrivMode_Screen },
3646 // 1048 save and restore cursor 3612 // 1048 save and restore cursor
3647 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3613 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3648 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3614 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3615 { 2004, PrivMode_BracketPaste },
3649 }; 3616 };
3650 3617
3651 if (nargs == 0) 3618 if (nargs == 0)
3652 return; 3619 return;
3653 3620
… …
3701 */ 3668 */
3702 PrivMode (1, PrivMode_vt52); 3669 PrivMode (1, PrivMode_vt52);
3703 break; 3670 break;
3704 case 3: /* 80/132 */ 3671 case 3: /* 80/132 */
3705 if (priv_modes & PrivMode_132OK) 3672 if (priv_modes & PrivMode_132OK)
3673 {
3674 scr_poweron ();
3706 set_widthheight (((state ? 132 : 80) * fwidth), height); 3675 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3676 }
3707 break; 3677 break;
3708 case 4: /* smooth scrolling */ 3678 case 4: /* smooth scrolling */
3709 set_option (Opt_jumpScroll, !state); 3679 set_option (Opt_jumpScroll, !state);
3710 break; 3680 break;
3711 case 5: /* reverse video */ 3681 case 5: /* reverse video */
… …
3718 scr_autowrap (state); 3688 scr_autowrap (state);
3719 break; 3689 break;
3720 /* case 8: - auto repeat, can't do on a per window basis */ 3690 /* case 8: - auto repeat, can't do on a per window basis */
3721 case 9: /* X10 mouse reporting */ 3691 case 9: /* X10 mouse reporting */
3722 if (state) /* orthogonal */ 3692 if (state) /* orthogonal */
3723 priv_modes &= ~PrivMode_MouseX11; 3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3724 break; 3694 break;
3725#ifdef scrollBar_esc 3695#ifdef scrollBar_esc
3726 case scrollBar_esc: 3696 case scrollBar_esc:
3727 if (scrollbar_mapping (state)) 3697 if (scrollbar_mapping (state))
3728 { 3698 {
… …
3741 break; 3711 break;
3742 /* case 66: - application key pad */ 3712 /* case 66: - application key pad */
3743 /* case 67: - backspace key */ 3713 /* case 67: - backspace key */
3744 case 1000: /* X11 mouse reporting */ 3714 case 1000: /* X11 mouse reporting */
3745 if (state) /* orthogonal */ 3715 if (state) /* orthogonal */
3746 priv_modes &= ~PrivMode_MouseX10; 3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3747 break; 3717 break;
3748#if 0
3749 case 1001: 3718 case 1002:
3750 break; /* X11 mouse highlighting */ 3719 case 1003:
3751#endif 3720 if (state)
3721 {
3722 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3723 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3724 vt_emask_mouse = PointerMotionMask;
3725 }
3726 else
3727 vt_emask_mouse = NoEventMask;
3728 vt_select_input ();
3729 break;
3752 case 1010: /* scroll to bottom on TTY output inhibit */ 3730 case 1010: /* scroll to bottom on TTY output inhibit */
3753 set_option (Opt_scrollTtyOutput, !state); 3731 set_option (Opt_scrollTtyOutput, !state);
3754 break; 3732 break;
3755 case 1011: /* scroll to bottom on key press */ 3733 case 1011: /* scroll to bottom on key press */
3756 set_option (Opt_scrollTtyKeypress, state); 3734 set_option (Opt_scrollTtyKeypress, state);
… …
3933rxvt_term::process_graphics () 3911rxvt_term::process_graphics ()
3934{ 3912{
3935 unicode_t ch, cmd = cmd_getc (); 3913 unicode_t ch, cmd = cmd_getc ();
3936 3914
3937 if (cmd == 'Q') 3915 if (cmd == 'Q')
3916 {
3938 { /* query graphics */ 3917 /* query graphics */
3939 tt_printf ("\033G0\012"); /* no graphics */ 3918 tt_printf ("\033G0\012"); /* no graphics */
3940 return; 3919 return;
3941 } 3920 }
3942 /* swallow other graphics sequences until terminating ':' */ 3921 /* swallow other graphics sequences until terminating ':' */
3943 do 3922 do
… …
3993 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3972 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3994 3973
3995 memcpy (v_buffer + v_buflen, data, len); 3974 memcpy (v_buffer + v_buflen, data, len);
3996 v_buflen += len; 3975 v_buflen += len;
3997 3976
3998 pty_ev.set (EVENT_READ | EVENT_WRITE); 3977 pty_ev.set (ev::READ | ev::WRITE);
3999} 3978}
4000 3979
4001void rxvt_term::pty_write () 3980void rxvt_term::pty_write ()
4002{ 3981{
4003 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3982 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4008 3987
4009 if (v_buflen == 0) 3988 if (v_buflen == 0)
4010 { 3989 {
4011 free (v_buffer); 3990 free (v_buffer);
4012 v_buffer = 0; 3991 v_buffer = 0;
4013 v_buflen = 0;
4014 3992
4015 pty_ev.set (EVENT_READ); 3993 pty_ev.set (ev::READ);
4016 return; 3994 return;
4017 } 3995 }
4018 3996
4019 memmove (v_buffer, v_buffer + written, v_buflen); 3997 memmove (v_buffer, v_buffer + written, v_buflen);
4020 } 3998 }
4021 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3999 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4022 pty_ev.set (EVENT_READ); 4000 pty_ev.set (ev::READ);
4023} 4001}
4024 4002
4025/*----------------------- end-of-file (C source) -----------------------*/ 4003/*----------------------- end-of-file (C source) -----------------------*/
4026 4004

Diff Legend

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