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.350 by ayin, Sat Sep 8 20:48:31 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.
… …
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
… …
547#endif 547#endif
548 548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 550 {
551 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
552 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
553 switch (keysym) 584 switch (keysym)
554 { 585 {
555#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
556 case XK_BackSpace: 587 case XK_BackSpace:
557 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
559 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
560 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
561 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
562 } 593 }
563 else 594 else
564 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
565 break; 596 break;
566#endif 597#endif
567#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
568# ifdef XK_KP_Delete
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: 599 case XK_Delete:
579 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
580 break; 601 break;
581#endif 602#endif
582 case XK_Tab: 603 case XK_Tab:
583 if (shft) 604 if (shft)
584 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
594#endif 615#endif
595 newlen = 0; 616 newlen = 0;
596 } 617 }
597 break; 618 break;
598 619
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" */ 620 case XK_Up: /* "\033[A" */
616 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
617 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
618 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
619 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
629 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
630 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
631 break; 636 break;
632 637
633#ifndef UNSHIFTED_SCROLLKEYS 638#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: 639 case XK_Prior:
645 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
646 break; 641 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: 642 case XK_Next:
658 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
659 break; 644 break;
660#endif 645#endif
661 case XK_KP_Enter: 646 case XK_KP_Enter:
662 /* allow shift to override */ 647 /* allow shift to override */
663 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
664 { 649 {
665 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
666 break; 651 break;
667 } 652 }
668 653
… …
680 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
681 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
682 } 667 }
683 break; 668 break;
684 669
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" */ 670 case XK_KP_F1: /* "\033OP" */
692 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
693 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
694 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
695 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
711 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
712 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
713 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
714 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
715 /* allow shift to override */ 694 /* allow shift to override */
716 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
717 { 696 {
718 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
719 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
720 } 699 }
721 else 700 else
… …
727 706
728 case XK_Find: 707 case XK_Find:
729 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
730 break; 709 break;
731 710
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: 711 case XK_Insert:
743 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
744 break; 713 break;
745#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
746 case DXK_Remove: 715 case DXK_Remove:
… …
750 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
751 break; 720 break;
752 case XK_Select: 721 case XK_Select:
753 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
754 break; 723 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: 724 case XK_End:
766 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
767 break; 726 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: 727 case XK_Home:
779 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
780 break; 729 break;
781 730
782#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
1034void 983void
1035rxvt_term::flush () 984rxvt_term::flush ()
1036{ 985{
1037 flush_ev.stop (); 986 flush_ev.stop ();
1038 987
1039#ifdef ENABLE_TRANSPARENCY 988#ifdef HAVE_BG_PIXMAP
1040 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
1041 { 990 {
1042 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
1043 scr_clear ();
1044 scr_touch (false); 992 scr_touch (false);
1045 } 993 }
1046#endif 994#endif
1047 995
1048 if (want_refresh) 996 if (want_refresh)
… …
1093 } 1041 }
1094 1042
1095 display->flush (); 1043 display->flush ();
1096} 1044}
1097 1045
1046/* checks wether a refresh is requested and starts the refresh timer */
1098void 1047void
1099rxvt_term::check_cb (check_watcher &w) 1048rxvt_term::refresh_check ()
1100{ 1049{
1101 make_current (); 1050 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102 1052
1103 display->flush (); 1053 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107} 1054}
1108 1055
1109void 1056void
1110rxvt_term::flush_cb (time_watcher &w) 1057rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1058{
1112 make_current (); 1059 make_current ();
1113 1060
1114 refresh_count = 0; 1061 refresh_count = 0;
1115 flush (); 1062 flush ();
1116} 1063}
1117 1064
1118#ifdef CURSOR_BLINK 1065#ifdef CURSOR_BLINK
1119void 1066void
1120rxvt_term::cursor_blink_cb (time_watcher &w) 1067rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1068{
1122 hidden_cursor = !hidden_cursor; 1069 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1070 want_refresh = 1;
1124 1071 refresh_check ();
1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1126} 1072}
1127#endif 1073#endif
1128 1074
1129#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1130void 1076void
1131rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132{ 1078{
1133 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1134 { 1080 {
1135 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1136 want_refresh = 1; 1082 want_refresh = 1;
1137 w.start (w.at + TEXT_BLINK_INTERVAL); 1083 refresh_check ();
1138 } 1084 }
1085 else
1086 w.stop ();
1139} 1087}
1140#endif 1088#endif
1141 1089
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1091void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1093{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1094 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1095 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1148 { 1096 {
1149 want_refresh = 1; 1097 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1098 refresh_check ();
1151 } 1099 }
1100 else
1101 w.stop ();
1152} 1102}
1153#endif 1103#endif
1154 1104
1155#ifdef SELECTION_SCROLLING 1105#ifdef SELECTION_SCROLLING
1156void 1106void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1107rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1108{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1109 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160 { 1110 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1111 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1112 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 refresh_check ();
1164 } 1114 }
1115 else
1116 w.stop ();
1165} 1117}
1166#endif 1118#endif
1167 1119
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1120#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1121void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1122rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1123{
1172 if (mouse_slip_wheel_speed == 0 1124 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 { 1125 {
1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1179 want_refresh = 1; 1126 want_refresh = 1;
1180 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 ();
1181 } 1134 }
1182} 1135}
1183#endif 1136#endif
1184 1137
1185#if LINUX_YIELD_HACK 1138#if LINUX_YIELD_HACK
1186static struct event_handler 1139static struct event_handler
1187{ 1140{
1188 check_watcher yield_ev; 1141 ev::prepare yield_ev;
1189 1142
1190 void yield_cb (check_watcher &w) 1143 void yield_cb (ev::prepare &w, int revents)
1191 { 1144 {
1192 // this should really be sched_yield(), but the linux guys thought 1145 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than 1146 // 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 1147 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS. 1148 // allowed by the sus... as is returning ENOSYS.
… …
1246 1199
1247 return false; 1200 return false;
1248} 1201}
1249 1202
1250void 1203void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1204rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1205{
1253 make_current (); 1206 make_current ();
1254 1207
1255 if (revents & EVENT_READ) 1208 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1209 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1210 while (pty_fill ())
1258 if (cmd_parse ()) 1211 if (cmd_parse ())
1259 break; 1212 break;
1260 1213
1261 if (revents & EVENT_WRITE) 1214 if (revents & ev::WRITE)
1262 pty_write (); 1215 pty_write ();
1216
1217 refresh_check ();
1263} 1218}
1264 1219
1265void 1220void
1266rxvt_term::pointer_unblank () 1221rxvt_term::pointer_unblank ()
1267{ 1222{
… …
1270 1225
1271#ifdef POINTER_BLANK 1226#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1227 hidden_pointer = 0;
1273 1228
1274 if (option (Opt_pointerBlank)) 1229 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1230 pointer_ev.start (pointerBlankDelay);
1276#endif 1231#endif
1277} 1232}
1278 1233
1279#ifdef POINTER_BLANK 1234#ifdef POINTER_BLANK
1280void 1235void
… …
1288 1243
1289 hidden_pointer = 1; 1244 hidden_pointer = 1;
1290} 1245}
1291 1246
1292void 1247void
1293rxvt_term::pointer_cb (time_watcher &w) 1248rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1249{
1295 make_current (); 1250 make_current ();
1296 1251
1297 pointer_blank (); 1252 pointer_blank ();
1298} 1253}
… …
1301void 1256void
1302rxvt_term::mouse_report (XButtonEvent &ev) 1257rxvt_term::mouse_report (XButtonEvent &ev)
1303{ 1258{
1304 int button_number, key_state = 0; 1259 int button_number, key_state = 0;
1305 int x, y; 1260 int x, y;
1261 int code = 32;
1306 1262
1307 x = ev.x; 1263 x = Pixel2Col (ev.x);
1308 y = ev.y; 1264 y = Pixel2Row (ev.y);
1309 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 }
1310 1273
1311 if (MEvent.button == AnyButton) 1274 if (MEvent.button == AnyButton)
1312 button_number = 3; 1275 button_number = 3;
1313 else 1276 else
1314 { 1277 {
… …
1360 x + 1, 1323 x + 1,
1361 y + 1); 1324 y + 1);
1362#endif 1325#endif
1363 1326
1364 tt_printf ("\033[M%c%c%c", 1327 tt_printf ("\033[M%c%c%c",
1365 (32 + button_number + key_state), 1328 (code + button_number + key_state),
1366 (32 + x + 1), 1329 (32 + x + 1),
1367 (32 + y + 1)); 1330 (32 + y + 1));
1368} 1331}
1369 1332
1370/*{{{ process an X event */ 1333/*{{{ process an X event */
… …
1474 && ev.xfocus.mode != NotifyGrab) 1437 && ev.xfocus.mode != NotifyGrab)
1475 focus_out (); 1438 focus_out ();
1476 break; 1439 break;
1477 1440
1478 case ConfigureNotify: 1441 case ConfigureNotify:
1479/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1442 /*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, 1443 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481 szHint.width, szHint.height);*/ 1444 szHint.width, szHint.height);*/
1482 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent[0])
1483 { 1446 {
1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
… …
1489 seen_resize = 1; 1452 seen_resize = 1;
1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1453 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491 } 1454 }
1492 else 1455 else
1493 { 1456 {
1494#ifdef ENABLE_TRANSPARENCY 1457#ifdef HAVE_BG_PIXMAP
1495 if (option (Opt_transparent)) 1458 if (bgPixmap.window_position_sensitive ())
1459 {
1460 if (mapped)
1496 update_background (); 1461 update_background ();
1462 else
1463 bgPixmap.invalidate ();
1464 }
1497#endif 1465#endif
1498 } 1466 }
1467
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1468 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500 } 1469 }
1501 break; 1470 break;
1502 1471
1503 case PropertyNotify: 1472 case PropertyNotify:
… …
1520 case SelectionRequest: 1489 case SelectionRequest:
1521 selection_send (ev.xselectionrequest); 1490 selection_send (ev.xselectionrequest);
1522 break; 1491 break;
1523 1492
1524 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
1525 mapped = 1; 1510 mapped = 1;
1526#ifdef TEXT_BLINK 1511#ifdef TEXT_BLINK
1527 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1512 text_blink_ev.start ();
1528#endif 1513#endif
1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1514 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530 break; 1515 break;
1531 1516
1532 case UnmapNotify: 1517 case UnmapNotify:
… …
1534#ifdef TEXT_BLINK 1519#ifdef TEXT_BLINK
1535 text_blink_ev.stop (); 1520 text_blink_ev.stop ();
1536#endif 1521#endif
1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1522 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 break; 1523 break;
1539
1540#ifdef ENABLE_TRANSPARENCY
1541 case ReparentNotify:
1542 rootwin_cb (ev);
1543 break;
1544#endif /* ENABLE_TRANSPARENCY */
1545 1524
1546 case GraphicsExpose: 1525 case GraphicsExpose:
1547 case Expose: 1526 case Expose:
1548 if (ev.xany.window == vt) 1527 if (ev.xany.window == vt)
1549 { 1528 {
1550 do 1529 do
1530 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1531 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1532 ev.xexpose.width, ev.xexpose.height, False);
1533 }
1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1534 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1554 1535
1555 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1536 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1556 1537
1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1538 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1539 {
1558 scr_expose (ev.xexpose.x, ev.xexpose.y, 1540 scr_expose (ev.xexpose.x, ev.xexpose.y,
1559 ev.xexpose.width, ev.xexpose.height, False); 1541 ev.xexpose.width, ev.xexpose.height, False);
1542 }
1560 1543
1561 want_refresh = 1; 1544 want_refresh = 1;
1562 } 1545 }
1563 else 1546 else
1564 { 1547 {
… …
1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1568 ; 1551 ;
1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1552 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1570 ; 1553 ;
1571 1554
1572 if (isScrollbarWindow (ev.xany.window)) 1555 if (scrollBar.state && ev.xany.window == scrollBar.win)
1573 { 1556 {
1574 scrollBar.setIdle (); 1557 scrollBar.state = STATE_IDLE;
1575 scrollbar_show (0); 1558 scrollbar_show (0);
1576 } 1559 }
1577 } 1560 }
1578 break; 1561 break;
1579 1562
1580 case MotionNotify: 1563 case MotionNotify:
1581#ifdef POINTER_BLANK 1564#ifdef POINTER_BLANK
1582 if (hidden_pointer) 1565 if (hidden_pointer)
1583 pointer_unblank (); 1566 pointer_unblank ();
1584#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);
1585 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1586 break; 1572 break;
1587 1573
1588 if (ev.xany.window == vt) 1574 if (ev.xany.window == vt)
1589 { 1575 {
… …
1623 int dist; 1609 int dist;
1624 1610
1625 /* don't clobber the current delay if we are 1611 /* don't clobber the current delay if we are
1626 * already in the middle of scrolling. 1612 * already in the middle of scrolling.
1627 */ 1613 */
1628 if (!sel_scroll_ev.active) 1614 if (!sel_scroll_ev.is_active ())
1629 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1615 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1630 1616
1631 /* save the event params so we can highlight 1617 /* save the event params so we can highlight
1632 * the selection in the pending-scroll loop 1618 * the selection in the pending-scroll loop
1633 */ 1619 */
1634 selection_save_x = ev.xbutton.x; 1620 selection_save_x = ev.xbutton.x;
… …
1656 else 1642 else
1657 { 1643 {
1658 /* we are within the text window, so we 1644 /* we are within the text window, so we
1659 * shouldn't be scrolling 1645 * shouldn't be scrolling
1660 */ 1646 */
1661 if (sel_scroll_ev.active)
1662 sel_scroll_ev.stop(); 1647 sel_scroll_ev.stop();
1663 } 1648 }
1664#endif 1649#endif
1665#ifdef MOUSE_THRESHOLD 1650#ifdef MOUSE_THRESHOLD
1666 } 1651 }
1667#endif 1652#endif
1668 } 1653 }
1669 } 1654 }
1670 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1655 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1671 { 1656 {
1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1657 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1673 MotionNotify, &ev)) 1658 MotionNotify, &ev))
1674 ; 1659 ;
1675 1660
… …
1693 { 1678 {
1694 hidden_cursor = 0; 1679 hidden_cursor = 0;
1695 want_refresh = 1; 1680 want_refresh = 1;
1696 } 1681 }
1697 1682
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1683 cursor_blink_ev.again ();
1699 } 1684 }
1700#endif 1685#endif
1701 1686
1702#if defined(POINTER_BLANK) 1687#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1688 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1710 1695
1711 if (ev.type == KeyPress && hidden_pointer == 0) 1696 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank (); 1697 pointer_blank ();
1713 } 1698 }
1714#endif 1699#endif
1700
1701 refresh_check ();
1715} 1702}
1716 1703
1717void 1704void
1718rxvt_term::focus_in () 1705rxvt_term::focus_in ()
1719{ 1706{
… …
1731 XSetICFocus (Input_Context); 1718 XSetICFocus (Input_Context);
1732 } 1719 }
1733#endif 1720#endif
1734#if CURSOR_BLINK 1721#if CURSOR_BLINK
1735 if (option (Opt_cursorBlink)) 1722 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1723 cursor_blink_ev.again ();
1737#endif 1724#endif
1738#if OFF_FOCUS_FADING 1725#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1726 if (rs[Rs_fade])
1740 { 1727 {
1741 pix_colors = pix_colors_focused; 1728 pix_colors = pix_colors_focused;
… …
1743 } 1730 }
1744#endif 1731#endif
1745#if ENABLE_FRILLS 1732#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell)) 1733 if (option (Opt_urgentOnBell))
1747 { 1734 {
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]); 1735 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1751 if (h != NULL)
1752 { 1736 {
1753 h->flags &= ~XUrgencyHint; 1737 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h); 1738 XSetWMHints (dpy, parent[0], h);
1755 } 1739 }
1756 } 1740 }
1757#endif 1741#endif
1758 } 1742 }
1759} 1743}
… …
1782 XUnsetICFocus (Input_Context); 1766 XUnsetICFocus (Input_Context);
1783#endif 1767#endif
1784#if CURSOR_BLINK 1768#if CURSOR_BLINK
1785 if (option (Opt_cursorBlink)) 1769 if (option (Opt_cursorBlink))
1786 cursor_blink_ev.stop (); 1770 cursor_blink_ev.stop ();
1771
1787 hidden_cursor = 0; 1772 hidden_cursor = 0;
1788#endif 1773#endif
1789#if OFF_FOCUS_FADING 1774#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade]) 1775 if (rs[Rs_fade])
1791 { 1776 {
… …
1831 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1816 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1832 { 1817 {
1833 bgPixmap.set_root_pixmap (); 1818 bgPixmap.set_root_pixmap ();
1834 update_background (); 1819 update_background ();
1835 } 1820 }
1821
1836 break; 1822 break;
1837 } 1823 }
1838# endif 1824# endif
1825
1826 refresh_check ();
1839} 1827}
1840#endif 1828#endif
1841 1829
1842void 1830void
1843rxvt_term::button_press (XButtonEvent &ev) 1831rxvt_term::button_press (XButtonEvent &ev)
… …
1898 mouse_report (ev); 1886 mouse_report (ev);
1899 } 1887 }
1900#else 1888#else
1901 MEvent.button = ev.button; 1889 MEvent.button = ev.button;
1902 mouse_report (ev); 1890 mouse_report (ev);
1903#endif /* MOUSE_REPORT_DOUBLECLICK */ 1891#endif /* MOUSE_REPORT_DOUBLECLICK */
1904 1892
1905 } 1893 }
1906 else 1894 else
1907 { 1895 {
1908 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
… …
1956 } 1944 }
1957 1945
1958 /* 1946 /*
1959 * Scrollbar window processing of button press 1947 * Scrollbar window processing of button press
1960 */ 1948 */
1961 if (isScrollbarWindow (ev.window)) 1949 if (scrollBar.state && ev.window == scrollBar.win)
1962 { 1950 {
1963 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;
1964 /* 1959 /*
1965 * Rxvt-style scrollbar: 1960 * Rxvt-style scrollbar:
1966 * move up if mouse is above slider 1961 * move up if mouse is above slider
1967 * move dn if mouse is below slider 1962 * move dn if mouse is below slider
1968 * 1963 *
… …
1977 /* 1972 /*
1978 * Mouse report disabled scrollbar: 1973 * Mouse report disabled scrollbar:
1979 * arrow buttons - send up/down 1974 * arrow buttons - send up/down
1980 * click on scrollbar - send pageup/down 1975 * click on scrollbar - send pageup/down
1981 */ 1976 */
1982 if ((scrollBar.style == R_SB_NEXT 1977 if (direction == UP)
1983 && scrollbarnext_upButton (ev.y))
1984 || (scrollBar.style == R_SB_RXVT
1985 && scrollbarrxvt_upButton (ev.y)))
1986 tt_printf ("\033[A"); 1978 tt_printf ("\033[A");
1987 else if ((scrollBar.style == R_SB_NEXT 1979 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"); 1980 tt_printf ("\033[B");
1992 else 1981 else
1993 switch (ev.button) 1982 switch (ev.button)
1994 { 1983 {
1995 case Button2: 1984 case Button2:
… …
2002 tt_printf ("\033[5~"); 1991 tt_printf ("\033[5~");
2003 break; 1992 break;
2004 } 1993 }
2005 } 1994 }
2006 else 1995 else
2007#endif /* NO_SCROLLBAR_REPORT */ 1996#endif /* NO_SCROLLBAR_REPORT */
2008
2009 {
2010 char upordown = 0;
2011
2012 if (scrollBar.style == R_SB_NEXT)
2013 { 1997 {
2014 if (scrollbarnext_upButton (ev.y)) 1998 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 { 1999 {
2028#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2001 if (!cont_scroll_ev.is_active ())
2029 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2002 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2030#endif 2003#endif
2031 if (scr_page (upordown < 0 ? UP : DN, 1)) 2004 if (scr_page (direction, 1))
2032 { 2005 {
2033 if (upordown < 0) 2006 if (direction == UP)
2034 scrollBar.setUp (); 2007 scrollBar.state = STATE_UP;
2035 else 2008 else
2036 scrollBar.setDn (); 2009 scrollBar.state = STATE_DOWN;
2037 } 2010 }
2038 } 2011 }
2039 else 2012 else
2040 switch (ev.button) 2013 switch (ev.button)
2041 { 2014 {
2042 case Button2: 2015 case Button2:
2043 switch (scrollbar_align) 2016 switch (scrollBar.align)
2044 { 2017 {
2045 case R_SB_ALIGN_TOP: 2018 case R_SB_ALIGN_TOP:
2046 csrO = 0; 2019 csrO = 0;
2047 break; 2020 break;
2048 case R_SB_ALIGN_CENTRE: 2021 case R_SB_ALIGN_CENTRE:
… …
2056 if (scrollBar.style == R_SB_XTERM 2029 if (scrollBar.style == R_SB_XTERM
2057 || scrollbar_above_slider (ev.y) 2030 || scrollbar_above_slider (ev.y)
2058 || scrollbar_below_slider (ev.y)) 2031 || scrollbar_below_slider (ev.y))
2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2032 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2060 2033
2061 scrollBar.setMotion (); 2034 scrollBar.state = STATE_MOTION;
2062 break; 2035 break;
2063 2036
2064 case Button1: 2037 case Button1:
2065 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2038 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2066 csrO = ev.y - scrollBar.top; 2039 csrO = ev.y - scrollBar.top;
2067 /* FALLTHROUGH */ 2040 /* FALLTHROUGH */
2068 2041
2069 case Button3: 2042 case Button3:
2070 if (scrollBar.style != R_SB_XTERM) 2043 if (scrollBar.style != R_SB_XTERM)
… …
2080 scr_page (DN, nrow - 1); 2053 scr_page (DN, nrow - 1);
2081# else 2054# else
2082 scr_page (DN, nrow / 4); 2055 scr_page (DN, nrow / 4);
2083# endif 2056# endif
2084 else 2057 else
2085 scrollBar.setMotion (); 2058 scrollBar.state = STATE_MOTION;
2086 } 2059 }
2087 else 2060 else
2088 { 2061 {
2089 scr_page ((ev.button == Button1 ? DN : UP), 2062 scr_page ((ev.button == Button1 ? DN : UP),
2090 (nrow 2063 (nrow
… …
2107 2080
2108 csrO = 0; /* reset csr Offset */ 2081 csrO = 0; /* reset csr Offset */
2109 if (!bypass_keystate) 2082 if (!bypass_keystate)
2110 reportmode = !! (priv_modes & PrivMode_mouse_report); 2083 reportmode = !! (priv_modes & PrivMode_mouse_report);
2111 2084
2112 if (scrollbar_isUpDn ()) 2085 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2113 { 2086 {
2114 scrollBar.setIdle (); 2087 scrollBar.state = STATE_IDLE;
2115 scrollbar_show (0); 2088 scrollbar_show (0);
2116 } 2089 }
2117 2090
2118#ifdef SELECTION_SCROLLING 2091#ifdef SELECTION_SCROLLING
2119 if (sel_scroll_ev.active)
2120 sel_scroll_ev.stop(); 2092 sel_scroll_ev.stop();
2121#endif 2093#endif
2122 2094
2123 if (ev.window == vt) 2095 if (ev.window == vt)
2124 { 2096 {
2125 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)))
… …
2149 mouse_report (ev); 2121 mouse_report (ev);
2150 } 2122 }
2151#else /* MOUSE_REPORT_DOUBLECLICK */ 2123#else /* MOUSE_REPORT_DOUBLECLICK */
2152 MEvent.button = AnyButton; 2124 MEvent.button = AnyButton;
2153 mouse_report (ev); 2125 mouse_report (ev);
2154#endif /* MOUSE_REPORT_DOUBLECLICK */ 2126#endif /* MOUSE_REPORT_DOUBLECLICK */
2155 return; 2127 return;
2156 } 2128 }
2157 2129
2158 /* 2130 /*
2159 * dumb hack to compensate for the failure of click-and-drag 2131 * dumb hack to compensate for the failure of click-and-drag
… …
2197 { 2169 {
2198 mouse_slip_wheel_speed += v ? -1 : 1; 2170 mouse_slip_wheel_speed += v ? -1 : 1;
2199 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2171 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2200 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2172 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2201 2173
2202 if (slip_wheel_ev.at < NOW) 2174 if (!slip_wheel_ev.is_active ())
2203 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2175 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2204
2205 slip_wheel_ev.start ();
2206 } 2176 }
2207 else 2177 else
2178# endif
2208 { 2179 {
2209# endif
2210 scr_page (v, i); 2180 scr_page (v, i);
2211 scrollbar_show (1); 2181 scrollbar_show (1);
2212# ifdef MOUSE_SLIP_WHEELING
2213 } 2182 }
2214# endif
2215 } 2183 }
2216 break; 2184 break;
2217#endif 2185#endif
2218 } 2186 }
2219 } 2187 }
… …
2278 2246
2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2247 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2280 { 2248 {
2281 refresh_count = 0; 2249 refresh_count = 0;
2282 2250
2283 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2251 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2284 { 2252 {
2285 refreshnow = true; 2253 refreshnow = true;
2286 ch = NOCHAR; 2254 ch = NOCHAR;
2287 break; 2255 break;
2288 } 2256 }
… …
2499 } 2467 }
2500 } 2468 }
2501 2469
2502 pclose_printer (fd); 2470 pclose_printer (fd);
2503} 2471}
2504#endif /* PRINTPIPE */ 2472#endif /* PRINTPIPE */
2505/*}}} */ 2473/*}}} */
2506 2474
2507/* *INDENT-OFF* */ 2475/* *INDENT-OFF* */
2508enum { 2476enum {
2509 C1_40 = 0x40, 2477 C1_40 = 0x40,
… …
2802 nargs = 0; 2770 nargs = 0;
2803 2771
2804 priv = 0; 2772 priv = 0;
2805 ch = cmd_getc (); 2773 ch = cmd_getc ();
2806 if (ch >= '<' && ch <= '?') 2774 if (ch >= '<' && ch <= '?')
2775 {
2807 { /* '<' '=' '>' '?' */ 2776 /* '<' '=' '>' '?' */
2808 priv = ch; 2777 priv = ch;
2809 ch = cmd_getc (); 2778 ch = cmd_getc ();
2810 } 2779 }
2811 2780
2812 /* read any numerical arguments */ 2781 /* read any numerical arguments */
… …
2855 { 2824 {
2856 // 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,
2857 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2826 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2858 // 2827 //
2859 // 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
2860 // 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
2861 // that we do not support xterm mouse reporting (should be 95 when we do). 2830 // versions.
2862 // 2831 //
2863 tt_printf ("\033[>%d;94;0c", 'U'); 2832 tt_printf ("\033[>%d;95;0c", 'U');
2864 } 2833 }
2865 break; 2834 break;
2835
2866 case '?': 2836 case '?':
2867 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2837 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2868 process_terminal_mode (ch, priv, nargs, arg); 2838 process_terminal_mode (ch, priv, nargs, arg);
2869 break; 2839 break;
2870 } 2840 }
… …
3386 *buf++ = '\0'; 3356 *buf++ = '\0';
3387 3357
3388 process_color_seq (op, color, name, resp); 3358 process_color_seq (op, color, name, resp);
3389 } 3359 }
3390 break; 3360 break;
3361 case Rxvt_restoreFG:
3391 case XTerm_Color00: 3362 case XTerm_Color00:
3392 process_color_seq (op, Color_fg, str, resp); 3363 process_color_seq (op, Color_fg, str, resp);
3393 break; 3364 break;
3365 case Rxvt_restoreBG:
3394 case XTerm_Color01: 3366 case XTerm_Color01:
3395 process_color_seq (op, Color_bg, str, resp); 3367 process_color_seq (op, Color_bg, str, resp);
3396 break; 3368 break;
3397#ifndef NO_CURSORCOLOR 3369#ifndef NO_CURSORCOLOR
3398 case XTerm_Color_cursor: 3370 case XTerm_Color_cursor:
… …
3424#if ENABLE_TRANSPARENCY 3396#if ENABLE_TRANSPARENCY
3425 case URxvt_Color_tint: 3397 case URxvt_Color_tint:
3426 process_color_seq (op, Color_tint, str, resp); 3398 process_color_seq (op, Color_tint, str, resp);
3427 { 3399 {
3428 bool changed = false; 3400 bool changed = false;
3401
3429 if (ISSET_PIXCOLOR (Color_tint)) 3402 if (ISSET_PIXCOLOR (Color_tint))
3430 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3403 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3431 else 3404 else
3432 changed = bgPixmap.unset_tint (); 3405 changed = bgPixmap.unset_tint ();
3406
3433 if (changed) 3407 if (changed)
3434 update_background (); 3408 update_background ();
3435 } 3409 }
3436 3410
3437 break; 3411 break;
3438#endif 3412#endif
3439 3413
3440#if XPM_BACKGROUND 3414#if BG_IMAGE_FROM_FILE
3441 case Rxvt_Pixmap: 3415 case Rxvt_Pixmap:
3442 if (!strcmp (str, "?")) 3416 if (!strcmp (str, "?"))
3443 { 3417 {
3444 char str[256]; 3418 char str[256];
3445 3419
… …
3460 changed++; 3434 changed++;
3461 str = strchr (str, ';'); 3435 str = strchr (str, ';');
3462 if (str == NULL) 3436 if (str == NULL)
3463 bgPixmap.set_defaultGeometry (); 3437 bgPixmap.set_defaultGeometry ();
3464 } 3438 }
3439
3465 while (str) 3440 while (str)
3466 { 3441 {
3467 str++; 3442 str++;
3468 if (bgPixmap.set_geometry (str)) 3443 if (bgPixmap.set_geometry (str))
3469 changed++; 3444 changed++;
3470 str = strchr (str, ';'); 3445 str = strchr (str, ';');
3471 } 3446 }
3447
3472 if (changed) 3448 if (changed)
3473 update_background (); 3449 update_background ();
3474 } 3450 }
3475 break; 3451 break;
3476#endif 3452#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 3453
3485 case XTerm_logfile: 3454 case XTerm_logfile:
3486 // TODO, when secure mode? 3455 // TODO, when secure mode?
3487 break; 3456 break;
3488 3457
… …
3632 { 66, PrivMode_aplKP }, 3601 { 66, PrivMode_aplKP },
3633#ifndef NO_BACKSPACE_KEY 3602#ifndef NO_BACKSPACE_KEY
3634 { 67, PrivMode_BackSpace }, 3603 { 67, PrivMode_BackSpace },
3635#endif 3604#endif
3636 { 1000, PrivMode_MouseX11 }, 3605 { 1000, PrivMode_MouseX11 },
3637 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3606 { 1002, PrivMode_MouseBtnEvent },
3638 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3607 { 1003, PrivMode_MouseAnyEvent },
3639 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3608 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3641 { 1011, PrivMode_Keypress }, // rxvt extension 3609 { 1011, PrivMode_Keypress }, // rxvt extension
3642 // 1035 enable modifiers for alt, numlock NYI 3610 // 1035 enable modifiers for alt, numlock NYI
3643 // 1036 send ESC for meta keys NYI 3611 // 1036 send ESC for meta keys NYI
3644 // 1037 send DEL for keypad delete NYI 3612 // 1037 send DEL for keypad delete NYI
3645 { 1047, PrivMode_Screen }, 3613 { 1047, PrivMode_Screen },
3646 // 1048 save and restore cursor 3614 // 1048 save and restore cursor
3647 { 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 */
3648 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3616 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3617 { 2004, PrivMode_BracketPaste },
3649 }; 3618 };
3650 3619
3651 if (nargs == 0) 3620 if (nargs == 0)
3652 return; 3621 return;
3653 3622
… …
3701 */ 3670 */
3702 PrivMode (1, PrivMode_vt52); 3671 PrivMode (1, PrivMode_vt52);
3703 break; 3672 break;
3704 case 3: /* 80/132 */ 3673 case 3: /* 80/132 */
3705 if (priv_modes & PrivMode_132OK) 3674 if (priv_modes & PrivMode_132OK)
3675 {
3676 scr_poweron ();
3706 set_widthheight (((state ? 132 : 80) * fwidth), height); 3677 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3678 }
3707 break; 3679 break;
3708 case 4: /* smooth scrolling */ 3680 case 4: /* smooth scrolling */
3709 set_option (Opt_jumpScroll, !state); 3681 set_option (Opt_jumpScroll, !state);
3710 break; 3682 break;
3711 case 5: /* reverse video */ 3683 case 5: /* reverse video */
… …
3718 scr_autowrap (state); 3690 scr_autowrap (state);
3719 break; 3691 break;
3720 /* 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 */
3721 case 9: /* X10 mouse reporting */ 3693 case 9: /* X10 mouse reporting */
3722 if (state) /* orthogonal */ 3694 if (state) /* orthogonal */
3723 priv_modes &= ~PrivMode_MouseX11; 3695 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3724 break; 3696 break;
3725#ifdef scrollBar_esc 3697#ifdef scrollBar_esc
3726 case scrollBar_esc: 3698 case scrollBar_esc:
3727 if (scrollbar_mapping (state)) 3699 if (scrollbar_mapping (state))
3728 { 3700 {
… …
3741 break; 3713 break;
3742 /* case 66: - application key pad */ 3714 /* case 66: - application key pad */
3743 /* case 67: - backspace key */ 3715 /* case 67: - backspace key */
3744 case 1000: /* X11 mouse reporting */ 3716 case 1000: /* X11 mouse reporting */
3745 if (state) /* orthogonal */ 3717 if (state) /* orthogonal */
3746 priv_modes &= ~PrivMode_MouseX10; 3718 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3747 break; 3719 break;
3748#if 0
3749 case 1001: 3720 case 1002:
3750 break; /* X11 mouse highlighting */ 3721 case 1003:
3751#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;
3752 case 1010: /* scroll to bottom on TTY output inhibit */ 3732 case 1010: /* scroll to bottom on TTY output inhibit */
3753 set_option (Opt_scrollTtyOutput, !state); 3733 set_option (Opt_scrollTtyOutput, !state);
3754 break; 3734 break;
3755 case 1011: /* scroll to bottom on key press */ 3735 case 1011: /* scroll to bottom on key press */
3756 set_option (Opt_scrollTtyKeypress, state); 3736 set_option (Opt_scrollTtyKeypress, state);
… …
3933rxvt_term::process_graphics () 3913rxvt_term::process_graphics ()
3934{ 3914{
3935 unicode_t ch, cmd = cmd_getc (); 3915 unicode_t ch, cmd = cmd_getc ();
3936 3916
3937 if (cmd == 'Q') 3917 if (cmd == 'Q')
3918 {
3938 { /* query graphics */ 3919 /* query graphics */
3939 tt_printf ("\033G0\012"); /* no graphics */ 3920 tt_printf ("\033G0\012"); /* no graphics */
3940 return; 3921 return;
3941 } 3922 }
3942 /* swallow other graphics sequences until terminating ':' */ 3923 /* swallow other graphics sequences until terminating ':' */
3943 do 3924 do
… …
3993 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3974 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3994 3975
3995 memcpy (v_buffer + v_buflen, data, len); 3976 memcpy (v_buffer + v_buflen, data, len);
3996 v_buflen += len; 3977 v_buflen += len;
3997 3978
3998 pty_ev.set (EVENT_READ | EVENT_WRITE); 3979 pty_ev.set (ev::READ | ev::WRITE);
3999} 3980}
4000 3981
4001void rxvt_term::pty_write () 3982void rxvt_term::pty_write ()
4002{ 3983{
4003 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));
… …
4008 3989
4009 if (v_buflen == 0) 3990 if (v_buflen == 0)
4010 { 3991 {
4011 free (v_buffer); 3992 free (v_buffer);
4012 v_buffer = 0; 3993 v_buffer = 0;
4013 v_buflen = 0;
4014 3994
4015 pty_ev.set (EVENT_READ); 3995 pty_ev.set (ev::READ);
4016 return; 3996 return;
4017 } 3997 }
4018 3998
4019 memmove (v_buffer, v_buffer + written, v_buflen); 3999 memmove (v_buffer, v_buffer + written, v_buflen);
4020 } 4000 }
4021 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4001 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4022 pty_ev.set (EVENT_READ); 4002 pty_ev.set (ev::READ);
4023} 4003}
4024 4004
4025/*----------------------- end-of-file (C source) -----------------------*/ 4005/*----------------------- end-of-file (C source) -----------------------*/
4026 4006

Diff Legend

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