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.235 by root, Wed Jan 4 20:43:37 2006 UTC vs.
Revision 1.348 by sasha, Thu Aug 16 21:26:20 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * 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 33 * 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 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
64 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 67
72#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
73 69
74#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
99 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
100 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
101 97
102 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
104 XK_ISO_Lock, 0x21eb,
105 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
106 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
107 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
108 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
109 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 142 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 143 return;
149 144
150 for (;;) 145 for (;;)
151 { 146 {
152 const line_t &l = ROW(y - view_start); 147 const line_t &l = ROW(y + view_start);
153 148
154 text_t t = l.t[x]; 149 text_t t = l.t[x];
155 150
156 if (t != NOCHAR || !x) 151 if (t != NOCHAR || !x)
157 { 152 {
… …
230# if !UNICODE3 225# if !UNICODE3
231 if (ch >= 0x10000) 226 if (ch >= 0x10000)
232 ch = 0xfffd; 227 ch = 0xfffd;
233# endif 228# endif
234 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
236 } 233 }
237 234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
238 scr_overlay_set (0, len , attr); 240 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 241 scr_overlay_set (0, len + 1, fname);
240 242
241 free (fname); 243 free (fname);
242 244
… …
295 297
296 return -1; 298 return -1;
297} 299}
298#endif 300#endif
299 301
300/*{{{ Convert the keypress event into a string */
301void 302void
302rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
303{ 304{
304 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
305 unsigned int newlen; 306 unsigned int newlen;
306 KeySym keysym; 307 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 308 int valid_keysym;
311 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
312 315
313 /* 316 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
316 * 319 *
… …
443 scr_move_to (0, 1); 446 scr_move_to (0, 1);
444 return; 447 return;
445 } 448 }
446 else if (keysym == XK_End) 449 else if (keysym == XK_End)
447 { 450 {
448 scr_move_to (1, 0); 451 scr_move_to (1, 1);
449 return; 452 return;
450 } 453 }
451 } 454 }
452#endif 455#endif
453 } 456 }
… …
464 { 467 {
465 switch (keysym) 468 switch (keysym)
466 { 469 {
467 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
470 return; 473 return;
471#if TODO 474#if TODO
472 /* rxvt extras */ 475 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 477 change_font (FONT_UP);
… …
493 { 496 {
494 commit_iso14755 (); 497 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
496# if ISO_14755 499# if ISO_14755
497 iso14755_51 (0); 500 iso14755_51 (0);
501# endif
502 return;
503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
498# endif 509# endif
499 return; 510 return;
500 } 511 }
501 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
502 { 513 {
… …
507# endif 518# endif
508 return; 519 return;
509 } 520 }
510 else 521 else
511 { 522 {
512# if ENABLE_OVERLAY 523# if ISO_14755
513 scr_overlay_off (); 524 scr_overlay_off ();
514# endif 525# endif
515 iso14755buf = 0; 526 iso14755buf = 0;
516 } 527 }
517 } 528 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
521 { 532 {
522 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 534# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 537# endif
527 } 538 }
528#endif 539#endif
529 540
530#ifdef PRINTPIPE 541#ifdef PRINTPIPE
531 if (keysym == XK_Print) 542 if (keysym == XK_Print)
532 { 543 {
533 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
534 return; 545 return;
… …
716 727
717 case XK_Find: 728 case XK_Find:
718 strcpy (kbuf, "\033[1~"); 729 strcpy (kbuf, "\033[1~");
719 break; 730 break;
720 731
721#ifdef XK_KP_End 732#ifdef XK_KP_Insert
722 case XK_KP_Insert: 733 case XK_KP_Insert:
723 /* allow shift to override */ 734 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 { 736 {
726 strcpy (kbuf, "\033Op"); 737 strcpy (kbuf, "\033Op");
… …
867#endif 878#endif
868 /* nil */ ; 879 /* nil */ ;
869 } 880 }
870 } 881 }
871 882
883 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
884 return;
885
872 if (len <= 0) 886 if (len <= 0)
873 return; /* not mapped */ 887 return; /* not mapped */
874 888
875 if (OPTION (Opt_scrollTtyKeypress)) 889 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 890 if (view_start)
877 { 891 {
878 view_start = 0; 892 view_start = 0;
879 want_refresh = 1; 893 want_refresh = 1;
880 } 894 }
… …
902 { 916 {
903 const char ch = C0_ESC; 917 const char ch = C0_ESC;
904 tt_write (&ch, 1); 918 tt_write (&ch, 1);
905 } 919 }
906 920
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 921 tt_write (kbuf, (unsigned int)len);
918} 922}
919/*}}} */
920 923
924void
925rxvt_term::key_release (XKeyEvent &ev)
926{
927#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
928 KeySym keysym;
929
930 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
931#endif
932
933#if ENABLE_FRILLS || ISO_14755
934 // ISO 14755 support
935 if (iso14755buf)
936 if (iso14755buf & ISO_14755_52)
937 {
938# if ISO_14755
939 scr_overlay_off ();
940# endif
941# if ISO_14755
942 // iso14755 part 5.2 handling: release time
943 // first: controls
944 if ((ev.state & ControlMask)
945 && ((keysym >= 0x40 && keysym <= 0x5f)
946 || (keysym >= 0x61 && keysym <= 0x7f)))
947 {
948 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
949 commit_iso14755 ();
950
951 return;
952 }
953
954 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
955 if (i[0] == keysym)
956 {
957 iso14755buf = ISO_14755_51 | i[1];
958 commit_iso14755 ();
959
960 return;
961 }
962
963 scr_bell ();
964# endif
965 iso14755buf = 0;
966
967 return;
968 }
969 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
970 {
971# if ISO_14755
972 scr_overlay_off ();
973# endif
974 if (iso14755buf & ISO_14755_51)
975 commit_iso14755 ();
976#if ISO_14755
977 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
978 {
979 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
980
981 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
982 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
983 }
984# endif
985 else
986 iso14755buf = 0;
987 }
988#endif
989
990 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
991 return;
992
993#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
994 if (!(ev.state & ControlMask))
995 slip_wheel_ev.stop ();
996 else if (keysym == XK_Control_L || keysym == XK_Control_R)
997 mouse_slip_wheel_speed = 0;
998#endif
999}
1000
921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1001#if defined (KEYSYM_RESOURCE)
922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
923/* attempt to `write' count to the input buffer */
924unsigned int 1002unsigned int
925rxvt_term::cmd_write (const char *str, unsigned int count) 1003rxvt_term::cmd_write (const char *str, unsigned int count)
926{ 1004{
927 unsigned int n, s; 1005 unsigned int n, s;
928 1006
… …
956void 1034void
957rxvt_term::flush () 1035rxvt_term::flush ()
958{ 1036{
959 flush_ev.stop (); 1037 flush_ev.stop ();
960 1038
961#ifdef TRANSPARENT 1039#ifdef ENABLE_TRANSPARENCY
962 if (want_full_refresh) 1040 if (want_full_refresh)
963 { 1041 {
964 want_full_refresh = 0; 1042 want_full_refresh = 0;
965 scr_clear (); 1043 scr_clear ();
966 scr_touch (false); 1044 scr_touch (false);
967 } 1045 }
968#endif 1046#endif
969 1047
970 if (want_refresh) 1048 if (want_refresh)
971 { 1049 {
1050 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1051 {
1052 int row = view_start;
1053 int end_row = row + nrow;
1054
1055 while (row > top_row && ROW (row - 1).is_longer ())
1056 --row;
1057
1058 do
1059 {
1060 int start_row = row;
1061 line_t *l;
1062
1063 do
1064 {
1065 l = &ROW (row++);
1066
1067 if (!(l->f & LINE_FILTERED))
1068 {
1069 // line not filtered, mark it as filtered
1070 l->f |= LINE_FILTERED;
1071 while (l->is_longer ())
1072 {
1073 l = &ROW (row++);
1074 l->f |= LINE_FILTERED;
1075 }
1076
1077 // and filter it
1078 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1079
1080 break;
1081 }
1082 }
1083 while (l->is_longer () && row < end_row);
1084 }
1085 while (row < end_row);
1086 }
1087
972 scr_refresh (refresh_type); 1088 scr_refresh ();
973 scrollbar_show (1); 1089 scrollbar_show (1);
974#ifdef USE_XIM 1090#ifdef USE_XIM
975 IMSendSpot (); 1091 IMSendSpot ();
976#endif 1092#endif
977 } 1093 }
… …
980} 1096}
981 1097
982void 1098void
983rxvt_term::check_cb (check_watcher &w) 1099rxvt_term::check_cb (check_watcher &w)
984{ 1100{
985 SET_R (this); 1101 make_current ();
986 SET_LOCALE (locale);
987 1102
988 display->flush (); 1103 display->flush ();
989 1104
990 if (want_refresh && !flush_ev.active) 1105 if (want_refresh && !flush_ev.active)
991 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
992} 1107}
993 1108
994void 1109void
995rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (time_watcher &w)
996{ 1111{
997 SET_R (this); 1112 make_current ();
998 SET_LOCALE (locale);
999 1113
1000 refresh_limit = 1;
1001 refresh_count = 0; 1114 refresh_count = 0;
1002 flush (); 1115 flush ();
1003} 1116}
1004 1117
1005#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
… …
1007rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (time_watcher &w)
1008{ 1121{
1009 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
1010 want_refresh = 1; 1123 want_refresh = 1;
1011 1124
1012 w.start (w.at + BLINK_INTERVAL); 1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1013} 1126}
1014#endif 1127#endif
1015 1128
1016#ifdef TEXT_BLINK 1129#ifdef TEXT_BLINK
1017void 1130void
… …
1031rxvt_term::cont_scroll_cb (time_watcher &w) 1144rxvt_term::cont_scroll_cb (time_watcher &w)
1032{ 1145{
1033 if ((scrollbar_isUp() || scrollbar_isDn()) && 1146 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1034 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1147 scr_page (scrollbar_isUp() ? UP : DN, 1))
1035 { 1148 {
1036 refresh_type |= SMOOTH_REFRESH;
1037 want_refresh = 1; 1149 want_refresh = 1;
1038 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1039 } 1151 }
1040} 1152}
1041#endif 1153#endif
… …
1045rxvt_term::sel_scroll_cb (time_watcher &w) 1157rxvt_term::sel_scroll_cb (time_watcher &w)
1046{ 1158{
1047 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1159 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1048 { 1160 {
1049 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1161 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1050 refresh_type |= SMOOTH_REFRESH;
1051 want_refresh = 1; 1162 want_refresh = 1;
1052 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1053 } 1164 }
1054} 1165}
1055#endif 1166#endif
… …
1060{ 1171{
1061 if (mouse_slip_wheel_speed == 0 1172 if (mouse_slip_wheel_speed == 0
1062 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1063 : scr_page (UP, mouse_slip_wheel_speed)) 1174 : scr_page (UP, mouse_slip_wheel_speed))
1064 { 1175 {
1065 if (view_start == nsaved || 1176 if (view_start == top_row || view_start == 0)
1066 view_start == 0)
1067 mouse_slip_wheel_speed = 0; 1177 mouse_slip_wheel_speed = 0;
1068 1178
1069 refresh_type |= SMOOTH_REFRESH;
1070 want_refresh = 1; 1179 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1072 } 1181 }
1073} 1182}
1074#endif 1183#endif
1075 1184
1076#if HAVE_SCHED_YIELD 1185#if LINUX_YIELD_HACK
1077static struct event_handler 1186static struct event_handler
1078{ 1187{
1079 check_watcher cw_yield; 1188 check_watcher yield_ev;
1080 1189
1081 void yield (check_watcher &w) 1190 void yield_cb (check_watcher &w)
1082 { 1191 {
1083 sched_yield (); 1192 // this should really be sched_yield(), but the linux guys thought
1193 // 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
1195 // allowed by the sus... as is returning ENOSYS.
1196
1197 struct timespec ts = { 0, 0 };
1198 nanosleep (&ts, 0);
1199
1084 w.stop (); 1200 w.stop ();
1085 } 1201 }
1086 1202
1087 event_handler () 1203 event_handler ()
1088 : cw_yield (this, &event_handler::yield) 1204 : yield_ev (this, &event_handler::yield_cb)
1089 { 1205 {
1090 } 1206 }
1091} event_handler; 1207} event_handler;
1092#endif 1208#endif
1093 1209
… …
1104 1220
1105 memmove (cmdbuf_base, cmdbuf_ptr, n); 1221 memmove (cmdbuf_base, cmdbuf_ptr, n);
1106 cmdbuf_ptr = cmdbuf_base; 1222 cmdbuf_ptr = cmdbuf_base;
1107 cmdbuf_endp = cmdbuf_ptr + n; 1223 cmdbuf_endp = cmdbuf_ptr + n;
1108 1224
1109 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1225 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1110 1226
1111 if (r > 0) 1227 if (r > 0)
1112 { 1228 {
1113 cmdbuf_endp += r; 1229 cmdbuf_endp += r;
1114 return true; 1230 return true;
1115 } 1231 }
1116 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1232 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1117 { 1233 {
1118#if HAVE_SCHED_YIELD 1234#if LINUX_YIELD_HACK
1119 if (display->is_local) 1235 if (display->is_local)
1120 event_handler.cw_yield.start (); 1236 event_handler.yield_ev.start ();
1121#endif 1237#endif
1122 } 1238 }
1123 else 1239 else
1124 { 1240 {
1125 pty_ev.stop (); 1241 pty_ev.stop ();
1126 1242
1127 if (!OPTION (Opt_hold)) 1243 if (!option (Opt_hold))
1128 destroy (); 1244 destroy ();
1129 } 1245 }
1130 1246
1131 return false; 1247 return false;
1132} 1248}
1133 1249
1134void 1250void
1135rxvt_term::pty_cb (io_watcher &w, short revents) 1251rxvt_term::pty_cb (io_watcher &w, short revents)
1136{ 1252{
1137 SET_R (this); 1253 make_current ();
1138 SET_LOCALE (locale);
1139 1254
1140 if (revents & EVENT_READ) 1255 if (revents & EVENT_READ)
1141 // loop, but don't allow a single term to monopolize us 1256 // loop, but don't allow a single term to monopolize us
1142 while (pty_fill ()) 1257 while (pty_fill ())
1143 if (cmd_parse ()) 1258 if (cmd_parse ())
… …
1148} 1263}
1149 1264
1150void 1265void
1151rxvt_term::pointer_unblank () 1266rxvt_term::pointer_unblank ()
1152{ 1267{
1153 XDefineCursor (display->display, vt, TermWin_cursor); 1268 XDefineCursor (dpy, vt, TermWin_cursor);
1154 recolour_cursor (); 1269 recolour_cursor ();
1155 1270
1156#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1157 hidden_pointer = 0; 1272 hidden_pointer = 0;
1158 1273
1159 if (OPTION (Opt_pointerBlank)) 1274 if (option (Opt_pointerBlank))
1160 pointer_ev.start (NOW + pointerBlankDelay); 1275 pointer_ev.start (NOW + pointerBlankDelay);
1161#endif 1276#endif
1162} 1277}
1163 1278
1164#ifdef POINTER_BLANK 1279#ifdef POINTER_BLANK
1165void 1280void
1166rxvt_term::pointer_blank () 1281rxvt_term::pointer_blank ()
1167{ 1282{
1168 if (! OPTION (Opt_pointerBlank)) 1283 if (!option (Opt_pointerBlank))
1169 return; 1284 return;
1170 1285
1171 XDefineCursor (display->display, vt, display->blank_cursor); 1286 XDefineCursor (dpy, vt, display->blank_cursor);
1172 XFlush (display->display); 1287 XFlush (dpy);
1173 1288
1174 hidden_pointer = 1; 1289 hidden_pointer = 1;
1175} 1290}
1176 1291
1177void 1292void
1178rxvt_term::pointer_cb (time_watcher &w) 1293rxvt_term::pointer_cb (time_watcher &w)
1179{ 1294{
1180 SET_R (this); 1295 make_current ();
1181 SET_LOCALE (locale);
1182 1296
1183 pointer_blank (); 1297 pointer_blank ();
1184} 1298}
1185#endif 1299#endif
1186 1300
… …
1251 (32 + button_number + key_state), 1365 (32 + button_number + key_state),
1252 (32 + x + 1), 1366 (32 + x + 1),
1253 (32 + y + 1)); 1367 (32 + y + 1));
1254} 1368}
1255 1369
1256#ifdef USING_W11LIB
1257void
1258rxvt_W11_process_x_event (XEvent *ev)
1259{
1260 rxvt_t *r = rxvt_get_r ();
1261
1262 x_cb (*ev);
1263}
1264#endif
1265
1266/*{{{ process an X event */ 1370/*{{{ process an X event */
1267void 1371void
1268rxvt_term::x_cb (XEvent &ev) 1372rxvt_term::x_cb (XEvent &ev)
1269{ 1373{
1270 dDisp; 1374 make_current ();
1271 1375
1272 SET_R (this); 1376 dLocal (Display *, dpy);
1273 SET_LOCALE (locale);
1274 1377
1275#if defined(CURSOR_BLINK) 1378 if (ev.xany.window == vt
1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1379 && SHOULD_INVOKE (HOOK_X_EVENT)
1277 { 1380 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1278 if (hidden_cursor) 1381 return;
1279 {
1280 hidden_cursor = 0;
1281 want_refresh = 1;
1282 }
1283 1382
1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1383 // for XQueryPointer
1285 }
1286#endif
1287
1288#if defined(POINTER_BLANK)
1289 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1290 {
1291 if (ev.type == MotionNotify
1292 || ev.type == ButtonPress
1293 || ev.type == ButtonRelease)
1294 if (hidden_pointer)
1295 pointer_unblank ();
1296
1297 if (ev.type == KeyPress && hidden_pointer == 0)
1298 pointer_blank ();
1299 }
1300#endif
1301
1302 Window unused_root, unused_child; 1384 Window unused_root, unused_child;
1303 int unused_root_x, unused_root_y; 1385 int unused_root_x, unused_root_y;
1304 unsigned int unused_mask; 1386 unsigned int unused_mask;
1305 1387
1306 switch (ev.type) 1388 switch (ev.type)
1307 { 1389 {
1308 case KeyPress: 1390 case KeyPress:
1309#if ISO_14755 1391 key_press (ev.xkey);
1310 if (!(iso14755buf & ISO_14755_52))
1311#endif
1312 lookup_key (ev.xkey);
1313
1314 break; 1392 break;
1315 1393
1316 case KeyRelease: 1394 case KeyRelease:
1317 { 1395 key_release (ev.xkey);
1318#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1319 KeySym ks;
1320
1321 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1322#endif
1323
1324#if ENABLE_FRILLS || ISO_14755
1325 // ISO 14755 support
1326 if (iso14755buf)
1327 if (iso14755buf & ISO_14755_52)
1328 {
1329# if ENABLE_OVERLAY
1330 scr_overlay_off ();
1331# endif
1332# if ISO_14755
1333 // iso14755 part 5.2 handling: release time
1334 // first: controls
1335 if ((ev.xkey.state & ControlMask)
1336 && ((ks >= 0x40 && ks <= 0x5f)
1337 || (ks >= 0x61 && ks <= 0x7f)))
1338 {
1339 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1340 commit_iso14755 ();
1341 return; // case-break;
1342 }
1343
1344 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1345 if (i[0] == ks)
1346 {
1347 iso14755buf = ISO_14755_51 | i[1];
1348 commit_iso14755 ();
1349 return; // case-break;
1350 }
1351
1352 scr_bell ();
1353# endif
1354 iso14755buf = 0;
1355 break;
1356 }
1357 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1358 {
1359# if ENABLE_OVERLAY
1360 scr_overlay_off ();
1361# endif
1362 if (iso14755buf & ISO_14755_51)
1363 commit_iso14755 ();
1364#if ISO_14755
1365 else if (iso14755buf & ISO_14755_STARTED)
1366 {
1367 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1368
1369 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1370 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1371 }
1372# endif
1373 else
1374 iso14755buf = 0;
1375 }
1376#endif
1377
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop ();
1381 else if (ks == XK_Control_L || ks == XK_Control_R)
1382 mouse_slip_wheel_speed = 0;
1383#endif
1384 break; 1396 break;
1385 }
1386 1397
1387 case ButtonPress: 1398 case ButtonPress:
1388 button_press (ev.xbutton); 1399 button_press (ev.xbutton);
1389 break; 1400 break;
1390 1401
… …
1392 button_release (ev.xbutton); 1403 button_release (ev.xbutton);
1393 break; 1404 break;
1394 1405
1395 case ClientMessage: 1406 case ClientMessage:
1396 if (ev.xclient.format == 32 1407 if (ev.xclient.format == 32
1397 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1408 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1398 { 1409 {
1410 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1411 {
1412 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1413 {
1399 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1414 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1415 {
1416 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1400 destroy (); 1417 destroy ();
1418 }
1401#if ENABLE_EWMH 1419#if ENABLE_EWMH
1402 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1403 XSendEvent (disp, ev.xclient.window = display->root, 1421 XSendEvent (dpy, ev.xclient.window = display->root,
1404 False, SubstructureRedirectMask | SubstructureNotifyMask, 1422 False, SubstructureRedirectMask | SubstructureNotifyMask,
1405 &ev); 1423 &ev);
1424#endif
1425 }
1426 }
1427#if ENABLE_XEMBED
1428 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1429 {
1430 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1431 focus_in ();
1432 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1433 focus_out ();
1434 }
1406#endif 1435#endif
1407 } 1436 }
1408#if ENABLE_XEMBED
1409 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1410 {
1411 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1412 focus_in ();
1413 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1414 focus_out ();
1415 }
1416#endif
1417#ifdef OFFIX_DND
1418 /* OffiX Dnd (drag 'n' drop) protocol */
1419 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1420 && (ev.xclient.data.l[0] == DndFile
1421 || ev.xclient.data.l[0] == DndDir
1422 || ev.xclient.data.l[0] == DndLink))
1423 {
1424 /* Get Dnd data */
1425 Atom ActualType;
1426 int ActualFormat;
1427 unsigned char *data;
1428 unsigned long Size, RemainingBytes;
1429
1430 XGetWindowProperty (disp, display->root,
1431 xa[XA_DNDSELECTION],
1432 0L, 1000000L,
1433 False, AnyPropertyType,
1434 &ActualType, &ActualFormat,
1435 &Size, &RemainingBytes,
1436 &data);
1437 set_string_property (XA_CUT_BUFFER0, data);
1438 XFree (data);
1439 selection_paste (display->root, XA_CUT_BUFFER0, true);
1440 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1441 }
1442#endif /* OFFIX_DND */
1443 break;
1444
1445 case MappingNotify:
1446 XRefreshKeyboardMapping (&ev.xmapping);
1447 break; 1437 break;
1448 1438
1449 /* 1439 /*
1450 * XXX: this is not the _current_ arrangement 1440 * XXX: this is not the _current_ arrangement
1451 * Here's my conclusion: 1441 * Here's my conclusion:
… …
1470 break; 1460 break;
1471 } 1461 }
1472 break; 1462 break;
1473 1463
1474 case FocusIn: 1464 case FocusIn:
1465 if (ev.xfocus.detail != NotifyInferior
1466 && ev.xfocus.detail != NotifyPointer
1467 && ev.xfocus.mode != NotifyGrab)
1475 focus_in (); 1468 focus_in ();
1476 break; 1469 break;
1477 1470
1478 case FocusOut: 1471 case FocusOut:
1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1479 focus_out (); 1475 focus_out ();
1480 break; 1476 break;
1481 1477
1482 case ConfigureNotify: 1478 case ConfigureNotify:
1479/* 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,
1481 szHint.width, szHint.height);*/
1483 if (ev.xconfigure.window == parent[0]) 1482 if (ev.xconfigure.window == parent[0])
1484 { 1483 {
1485 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1486 ; 1485 ;
1487 1486
1488 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1489 { 1488 {
1490 seen_resize = 1; 1489 seen_resize = 1;
1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1492 } 1491 }
1493 1492 else
1494#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1493 {
1494#ifdef ENABLE_TRANSPARENCY
1495 if (OPTION (Opt_transparent)) 1495 if (option (Opt_transparent))
1496 check_our_parents (); 1496 update_background ();
1497#endif 1497#endif
1498 }
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1498 } 1500 }
1499 break; 1501 break;
1500 1502
1501 case PropertyNotify: 1503 case PropertyNotify:
1504 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1502 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1505 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1503 && ev.xproperty.state == PropertyNewValue) 1506 && ev.xproperty.state == PropertyNewValue)
1504 selection_property (ev.xproperty.window, ev.xproperty.atom); 1507 selection_property (ev.xproperty.window, ev.xproperty.atom);
1505 1508
1506 break; 1509 break;
1507 1510
1508 case SelectionClear: 1511 case SelectionClear:
1509 selection_clear (); 1512 selection_clear ();
… …
1514 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1517 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1515 break; 1518 break;
1516 1519
1517 case SelectionRequest: 1520 case SelectionRequest:
1518 selection_send (ev.xselectionrequest); 1521 selection_send (ev.xselectionrequest);
1522 break;
1523
1524 case MapNotify:
1525 mapped = 1;
1526#ifdef TEXT_BLINK
1527 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1528#endif
1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1519 break; 1530 break;
1520 1531
1521 case UnmapNotify: 1532 case UnmapNotify:
1522 mapped = 0; 1533 mapped = 0;
1523#ifdef TEXT_BLINK 1534#ifdef TEXT_BLINK
1524 text_blink_ev.stop (); 1535 text_blink_ev.stop ();
1525#endif 1536#endif
1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1538 break;
1527 1539
1528 case MapNotify:
1529 mapped = 1;
1530#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1532#endif
1533 break;
1534
1535#ifdef TRANSPARENT 1540#ifdef ENABLE_TRANSPARENCY
1536 case ReparentNotify: 1541 case ReparentNotify:
1537 rootwin_cb (ev); 1542 rootwin_cb (ev);
1538 break; 1543 break;
1539#endif /* TRANSPARENT */ 1544#endif /* ENABLE_TRANSPARENCY */
1540 1545
1541 case GraphicsExpose: 1546 case GraphicsExpose:
1542 case Expose: 1547 case Expose:
1543 if (ev.xany.window == vt) 1548 if (ev.xany.window == vt)
1544 { 1549 {
1545 do 1550 do
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1548 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1549 1554
1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1555 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1551 1556
1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1553 scr_expose (ev.xexpose.x, ev.xexpose.y, 1558 scr_expose (ev.xexpose.x, ev.xexpose.y,
1554 ev.xexpose.width, ev.xexpose.height, False); 1559 ev.xexpose.width, ev.xexpose.height, False);
1555 1560
1556 scr_refresh (refresh_type); 1561 want_refresh = 1;
1557 } 1562 }
1558 else 1563 else
1559 { 1564 {
1560 XEvent unused_event; 1565 XEvent unused_event;
1561 1566
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1563 ; 1568 ;
1564 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1565 ; 1570 ;
1566 1571
1567 if (isScrollbarWindow (ev.xany.window)) 1572 if (isScrollbarWindow (ev.xany.window))
1568 { 1573 {
1569 scrollBar.setIdle (); 1574 scrollBar.setIdle ();
1570 scrollbar_show (0); 1575 scrollbar_show (0);
1571 } 1576 }
1572#ifdef MENUBAR
1573 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1574 menubar_expose ();
1575#endif
1576
1577#ifdef TRANSPARENT
1578 if (am_transparent && ev.xany.window == parent[0])
1579 XClearWindow (disp, ev.xany.window);
1580#endif
1581 } 1577 }
1582 break; 1578 break;
1583 1579
1584 case MotionNotify: 1580 case MotionNotify:
1585#ifdef POINTER_BLANK 1581#ifdef POINTER_BLANK
1586 if (hidden_pointer) 1582 if (hidden_pointer)
1587 pointer_unblank (); 1583 pointer_unblank ();
1588#endif 1584#endif
1589#if MENUBAR
1590 if (isMenuBarWindow (ev.xany.window))
1591 {
1592 menubar_control (ev.xbutton);
1593 break;
1594 }
1595#endif
1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1585 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1597 break; 1586 break;
1598 1587
1599 if (ev.xany.window == vt) 1588 if (ev.xany.window == vt)
1600 { 1589 {
1590 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1591 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1592 ; // nop
1601 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1593 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1602 { 1594 {
1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1595 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1604 ; 1596 ;
1605 1597
1606 XQueryPointer (disp, vt, 1598 XQueryPointer (dpy, vt,
1607 &unused_root, &unused_child, 1599 &unused_root, &unused_child,
1608 &unused_root_x, &unused_root_y, 1600 &unused_root_x, &unused_root_y,
1609 &ev.xbutton.x, &ev.xbutton.y, 1601 &ev.xbutton.x, &ev.xbutton.y,
1610 &ev.xbutton.state); 1602 &ev.xbutton.state);
1611#ifdef MOUSE_THRESHOLD 1603#ifdef MOUSE_THRESHOLD
… …
1675#endif 1667#endif
1676 } 1668 }
1677 } 1669 }
1678 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1670 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1679 { 1671 {
1680 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1681 MotionNotify, &ev)) 1673 MotionNotify, &ev))
1682 ; 1674 ;
1683 1675
1684 XQueryPointer (disp, scrollBar.win, 1676 XQueryPointer (dpy, scrollBar.win,
1685 &unused_root, &unused_child, 1677 &unused_root, &unused_child,
1686 &unused_root_x, &unused_root_y, 1678 &unused_root_x, &unused_root_y,
1687 &ev.xbutton.x, &ev.xbutton.y, 1679 &ev.xbutton.x, &ev.xbutton.y,
1688 &unused_mask); 1680 &unused_mask);
1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1690 scrollbar_size ()); 1682 scrollbar_size ());
1691 scr_refresh (refresh_type);
1692 refresh_limit = 0; 1683 want_refresh = 1;
1693 scrollbar_show (1); 1684 scrollbar_show (1);
1694 } 1685 }
1695 break; 1686 break;
1696 } 1687 }
1688
1689#if defined(CURSOR_BLINK)
1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1691 {
1692 if (hidden_cursor)
1693 {
1694 hidden_cursor = 0;
1695 want_refresh = 1;
1696 }
1697
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699 }
1700#endif
1701
1702#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 {
1705 if (ev.type == MotionNotify
1706 || ev.type == ButtonPress
1707 || ev.type == ButtonRelease)
1708 if (hidden_pointer)
1709 pointer_unblank ();
1710
1711 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank ();
1713 }
1714#endif
1697} 1715}
1698 1716
1699void 1717void
1700rxvt_term::focus_in () 1718rxvt_term::focus_in ()
1701{ 1719{
1702 if (!focus) 1720 if (!focus)
1703 { 1721 {
1704 focus = 1; 1722 focus = 1;
1705 want_refresh = 1; 1723 want_refresh = 1;
1706 1724
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1708 1726
1709#if USE_XIM 1727#if USE_XIM
1710 if (Input_Context != NULL) 1728 if (Input_Context != NULL)
1711 { 1729 {
1712 IMSetStatusPosition (); 1730 IMSetPosition ();
1713 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1714 } 1732 }
1715#endif 1733#endif
1716#if CURSOR_BLINK 1734#if CURSOR_BLINK
1717 if (OPTION (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719#endif 1737#endif
1720#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1721 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1722 { 1740 {
1723 pix_colors = pix_colors_focused; 1741 pix_colors = pix_colors_focused;
1724 scr_recolour (); 1742 scr_recolour ();
1725 } 1743 }
1726#endif 1744#endif
1745#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell))
1747 {
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]);
1751 if (h != NULL)
1752 {
1753 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h);
1755 }
1756 }
1757#endif
1727 } 1758 }
1728} 1759}
1729 1760
1730void 1761void
1731rxvt_term::focus_out () 1762rxvt_term::focus_out ()
… …
1733 if (focus) 1764 if (focus)
1734 { 1765 {
1735 focus = 0; 1766 focus = 0;
1736 want_refresh = 1; 1767 want_refresh = 1;
1737 1768
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1769 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739 1770
1740#if ENABLE_FRILLS || ISO_14755 1771#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf) 1772 if (iso14755buf)
1742 { 1773 {
1743 iso14755buf = 0; 1774 iso14755buf = 0;
1744# if ENABLE_OVERLAY 1775# if ISO_14755
1745 scr_overlay_off (); 1776 scr_overlay_off ();
1746# endif 1777# endif
1747 } 1778 }
1748#endif 1779#endif
1749#if USE_XIM 1780#if USE_XIM
1750 if (Input_Context != NULL) 1781 if (Input_Context != NULL)
1751 XUnsetICFocus (Input_Context); 1782 XUnsetICFocus (Input_Context);
1752#endif 1783#endif
1753#if CURSOR_BLINK 1784#if CURSOR_BLINK
1754 if (OPTION (Opt_cursorBlink)) 1785 if (option (Opt_cursorBlink))
1755 cursor_blink_ev.stop (); 1786 cursor_blink_ev.stop ();
1756 hidden_cursor = 0; 1787 hidden_cursor = 0;
1757#endif 1788#endif
1758#if OFF_FOCUS_FADING 1789#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade]) 1790 if (rs[Rs_fade])
… …
1763 } 1794 }
1764#endif 1795#endif
1765 } 1796 }
1766} 1797}
1767 1798
1768#if TRANSPARENT 1799void
1800rxvt_term::update_fade_color (unsigned int idx)
1801{
1802#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade])
1804 {
1805 rgba c;
1806 pix_colors [Color_fade].get (c);
1807 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1808 }
1809#endif
1810}
1811
1812#if ENABLE_TRANSPARENCY || ENABLE_PERL
1769void 1813void
1770rxvt_term::rootwin_cb (XEvent &ev) 1814rxvt_term::rootwin_cb (XEvent &ev)
1771{ 1815{
1772 SET_R (this); 1816 make_current ();
1773 SET_LOCALE (locale);
1774 1817
1818 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1819 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1820 return;
1821
1822# if ENABLE_TRANSPARENCY
1775 switch (ev.type) 1823 switch (ev.type)
1776 { 1824 {
1777 case PropertyNotify: 1825 case PropertyNotify:
1778 /* 1826 /*
1779 * if user used some Esetroot compatible prog to set the root bg, 1827 * if user used some Esetroot compatible prog to set the root bg,
1780 * use the property to determine the pixmap. We use it later on. 1828 * use the property to determine the pixmap. We use it later on.
1781 */ 1829 */
1782 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1830 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1783 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1831 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1784 return; 1832 {
1785 1833 bgPixmap.set_root_pixmap ();
1786 /* FALLTHROUGH */ 1834 update_background ();
1787 case ReparentNotify: 1835 }
1788 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1789 want_refresh = want_full_refresh = 1;
1790 break; 1836 break;
1791 } 1837 }
1838# endif
1792} 1839}
1793#endif 1840#endif
1794 1841
1795void 1842void
1796rxvt_term::button_press (XButtonEvent &ev) 1843rxvt_term::button_press (XButtonEvent &ev)
… …
1805 /* 1852 /*
1806 * VT window processing of button press 1853 * VT window processing of button press
1807 */ 1854 */
1808 if (ev.window == vt) 1855 if (ev.window == vt)
1809 { 1856 {
1857 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1858 return;
1859
1810#if ISO_14755 1860#if ISO_14755
1811 // 5.4 1861 // 5.4
1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1862 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1813 { 1863 {
1814 iso14755_54 (ev.x, ev.y); 1864 iso14755_54 (ev.x, ev.y);
… …
1826#ifdef MOUSE_REPORT_DOUBLECLICK 1876#ifdef MOUSE_REPORT_DOUBLECLICK
1827 if (ev.button == MEvent.button && clickintime) 1877 if (ev.button == MEvent.button && clickintime)
1828 { 1878 {
1829 /* same button, within alloted time */ 1879 /* same button, within alloted time */
1830 MEvent.clicks++; 1880 MEvent.clicks++;
1881
1831 if (MEvent.clicks > 1) 1882 if (MEvent.clicks > 1)
1832 { 1883 {
1833 /* only report double clicks */ 1884 /* only report double clicks */
1834 MEvent.clicks = 2; 1885 MEvent.clicks = 2;
1835 mouse_report (ev); 1886 mouse_report (ev);
… …
1855 else 1906 else
1856 { 1907 {
1857 if (ev.button != MEvent.button) 1908 if (ev.button != MEvent.button)
1858 MEvent.clicks = 0; 1909 MEvent.clicks = 0;
1859 1910
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1861 switch (ev.button) 1911 switch (ev.button)
1862 { 1912 {
1863 case Button1: 1913 case Button1:
1864 /* allow meta + click to select rectangular areas */ 1914 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */ 1915 /* should be done in screen.C */
1866#if ENABLE_FRILLS 1916#if ENABLE_FRILLS
1867 selection.rect = !!(ev.state & ModMetaMask); 1917 selection.rect = !!(ev.state & ModMetaMask);
1868#else 1918#else
1869 selection.rect = false; 1919 selection.rect = false;
1870#endif 1920#endif
1871 1921
1872 /* allow shift+left click to extend selection */ 1922 /* allow shift+left click to extend selection */
1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1923 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1874 { 1924 {
1875 if (MEvent.button == Button1 && clickintime) 1925 if (MEvent.button == Button1 && clickintime)
1876 selection_rotate (ev.x, ev.y); 1926 selection_rotate (ev.x, ev.y);
1877 else 1927 else
1878 selection_extend (ev.x, ev.y, 1); 1928 selection_extend (ev.x, ev.y, 1);
1879 } 1929 }
1880 else 1930 else
1881 { 1931 {
1882 if (MEvent.button == Button1 && clickintime) 1932 if (MEvent.button == Button1 && clickintime)
1883 MEvent.clicks++; 1933 MEvent.clicks++;
1884 else 1934 else
1885 MEvent.clicks = 1; 1935 MEvent.clicks = 1;
1886 1936
1887 selection_click (MEvent.clicks, ev.x, ev.y); 1937 selection_click (MEvent.clicks, ev.x, ev.y);
1888 } 1938 }
1889 1939
1890 MEvent.button = Button1; 1940 MEvent.button = Button1;
1891 break; 1941 break;
1892 1942
1893 case Button3: 1943 case Button3:
1894 if (MEvent.button == Button3 && clickintime) 1944 if (MEvent.button == Button3 && clickintime)
1895 selection_rotate (ev.x, ev.y); 1945 selection_rotate (ev.x, ev.y);
1896 else 1946 else
1897 selection_extend (ev.x, ev.y, 1); 1947 selection_extend (ev.x, ev.y, 1);
1898 1948
1899 MEvent.button = Button3; 1949 MEvent.button = Button3;
1900 break; 1950 break;
1901 } 1951 }
1902 } 1952 }
1903 1953
1904 MEvent.time = ev.time; 1954 MEvent.time = ev.time;
1905 return; 1955 return;
1906 } 1956 }
1907 1957
… …
2043 } 2093 }
2044 2094
2045 break; 2095 break;
2046 } 2096 }
2047 } 2097 }
2098
2048 return; 2099 return;
2049 } 2100 }
2050#if MENUBAR
2051 /*
2052 * Menubar window processing of button press
2053 */
2054 if (isMenuBarWindow (ev.window))
2055 menubar_control (ev);
2056#endif
2057} 2101}
2058 2102
2059void 2103void
2060rxvt_term::button_release (XButtonEvent &ev) 2104rxvt_term::button_release (XButtonEvent &ev)
2061{ 2105{
… …
2067 2111
2068 if (scrollbar_isUpDn ()) 2112 if (scrollbar_isUpDn ())
2069 { 2113 {
2070 scrollBar.setIdle (); 2114 scrollBar.setIdle ();
2071 scrollbar_show (0); 2115 scrollbar_show (0);
2072#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2073 refresh_type &= ~SMOOTH_REFRESH;
2074#endif
2075 } 2116 }
2076 2117
2077#ifdef SELECTION_SCROLLING 2118#ifdef SELECTION_SCROLLING
2078 if (sel_scroll_ev.active) 2119 if (sel_scroll_ev.active)
2079 sel_scroll_ev.stop(); 2120 sel_scroll_ev.stop();
2080#endif 2121#endif
2081 2122
2082 if (ev.window == vt) 2123 if (ev.window == vt)
2083 { 2124 {
2125 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2126 return;
2127
2084#if ISO_14755 2128#if ISO_14755
2085 // 5.4 2129 // 5.4
2086 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2130 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2087 return; 2131 return;
2088#endif 2132#endif
2133
2089 if (reportmode) 2134 if (reportmode)
2090 { 2135 {
2091 /* mouse report from vt window */ 2136 /* mouse report from vt window */
2092 /* don't report release of wheel "buttons" */ 2137 /* don't report release of wheel "buttons" */
2093 if (ev.button >= 4) 2138 if (ev.button >= 4)
… …
2123 { 2168 {
2124 case Button1: 2169 case Button1:
2125 case Button3: 2170 case Button3:
2126 selection_make (ev.time); 2171 selection_make (ev.time);
2127 break; 2172 break;
2173
2128 case Button2: 2174 case Button2:
2129 selection_request (ev.time, ev.x, ev.y); 2175 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2130 break; 2177 break;
2178
2131#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2132 case Button4: 2180 case Button4:
2133 case Button5: 2181 case Button5:
2134 { 2182 {
2135 int i; 2183 int i;
… …
2137 2185
2138 v = ev.button == Button4 ? UP : DN; 2186 v = ev.button == Button4 ? UP : DN;
2139 2187
2140 if (ev.state & ShiftMask) 2188 if (ev.state & ShiftMask)
2141 i = 1; 2189 i = 1;
2142 else if (OPTION (Opt_mouseWheelScrollPage)) 2190 else if (option (Opt_mouseWheelScrollPage))
2143 i = nrow - 1; 2191 i = nrow - 1;
2144 else 2192 else
2145 i = 5; 2193 i = 5;
2146 2194
2147# ifdef MOUSE_SLIP_WHEELING 2195# ifdef MOUSE_SLIP_WHEELING
… …
2157 slip_wheel_ev.start (); 2205 slip_wheel_ev.start ();
2158 } 2206 }
2159 else 2207 else
2160 { 2208 {
2161# endif 2209# endif
2162# ifdef JUMP_MOUSE_WHEEL
2163 scr_page (v, i); 2210 scr_page (v, i);
2164 scr_refresh (SMOOTH_REFRESH);
2165 scrollbar_show (1); 2211 scrollbar_show (1);
2166# else
2167 while (i--)
2168 {
2169 scr_page (v, 1);
2170 scr_refresh (SMOOTH_REFRESH);
2171 scrollbar_show (1);
2172 }
2173# endif
2174# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
2175 } 2213 }
2176#endif 2214# endif
2177 } 2215 }
2178 break; 2216 break;
2179#endif 2217#endif
2180 } 2218 }
2181 } 2219 }
2182#ifdef MENUBAR
2183 else if (isMenuBarWindow (ev.window))
2184 menubar_control (ev);
2185#endif
2186} 2220}
2187
2188#ifdef TRANSPARENT
2189#if TINTING
2190/* taken from aterm-0.4.2 */
2191
2192typedef uint32_t RUINT32T;
2193
2194void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2195{
2196 int sh_r, sh_g, sh_b;
2197 RUINT32T mask_r, mask_g, mask_b;
2198 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2199 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2200 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2201 int i;
2202
2203 Visual *visual = display->visual;
2204
2205 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2206
2207 /* for convenience */
2208 mask_r = visual->red_mask;
2209 mask_g = visual->green_mask;
2210 mask_b = visual->blue_mask;
2211
2212 /* boring lookup table pre-initialization */
2213 switch (srcImage->bits_per_pixel) {
2214 case 15:
2215 if ((mask_r != 0x7c00) ||
2216 (mask_g != 0x03e0) ||
2217 (mask_b != 0x001f))
2218 return;
2219 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2220 lookup_r = lookup;
2221 lookup_g = lookup+32;
2222 lookup_b = lookup+32+32;
2223 sh_r = 10;
2224 sh_g = 5;
2225 sh_b = 0;
2226 break;
2227 case 16:
2228 if ((mask_r != 0xf800) ||
2229 (mask_g != 0x07e0) ||
2230 (mask_b != 0x001f))
2231 return;
2232 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2233 lookup_r = lookup;
2234 lookup_g = lookup+32;
2235 lookup_b = lookup+32+64;
2236 sh_r = 11;
2237 sh_g = 5;
2238 sh_b = 0;
2239 break;
2240 case 24:
2241 if ((mask_r != 0xff0000) ||
2242 (mask_g != 0x00ff00) ||
2243 (mask_b != 0x0000ff))
2244 return;
2245 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2246 lookup_r = lookup;
2247 lookup_g = lookup+256;
2248 lookup_b = lookup+256+256;
2249 sh_r = 16;
2250 sh_g = 8;
2251 sh_b = 0;
2252 break;
2253 case 32:
2254 if ((mask_r != 0xff0000) ||
2255 (mask_g != 0x00ff00) ||
2256 (mask_b != 0x0000ff))
2257 return;
2258 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2259 lookup_r = lookup;
2260 lookup_g = lookup+256;
2261 lookup_b = lookup+256+256;
2262 sh_r = 16;
2263 sh_g = 8;
2264 sh_b = 0;
2265 break;
2266 default:
2267 return; /* we do not support this color depth */
2268 }
2269
2270 /* prepare limits for color transformation (each channel is handled separately) */
2271 if (shade < 0) {
2272 shade = -shade;
2273 if (shade < 0) shade = 0;
2274 if (shade > 100) shade = 100;
2275
2276 lower_lim_r = 65535-rm;
2277 lower_lim_g = 65535-gm;
2278 lower_lim_b = 65535-bm;
2279
2280 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2281 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2282 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2283
2284 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2285 } else {
2286 if (shade < 0) shade = 0;
2287 if (shade > 100) shade = 100;
2288
2289 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2290
2291 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2292 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2293 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2294 }
2295
2296 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2297 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2298 {
2299 unsigned int tmp;
2300
2301 tmp = lower_lim_r;
2302 lower_lim_r = lower_lim_b;
2303 lower_lim_b = tmp;
2304
2305 tmp = upper_lim_r;
2306 upper_lim_r = upper_lim_b;
2307 upper_lim_b = tmp;
2308 }
2309
2310 /* fill our lookup tables */
2311 for (i = 0; i <= mask_r>>sh_r; i++)
2312 {
2313 RUINT32T tmp;
2314 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2315 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2316 lookup_r[i] = (tmp/65535)<<sh_r;
2317 }
2318 for (i = 0; i <= mask_g>>sh_g; i++)
2319 {
2320 RUINT32T tmp;
2321 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2322 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2323 lookup_g[i] = (tmp/65535)<<sh_g;
2324 }
2325 for (i = 0; i <= mask_b>>sh_b; i++)
2326 {
2327 RUINT32T tmp;
2328 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2329 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2330 lookup_b[i] = (tmp/65535)<<sh_b;
2331 }
2332
2333 /* apply table to input image (replacing colors by newly calculated ones) */
2334 switch (srcImage->bits_per_pixel)
2335 {
2336 case 15:
2337 {
2338 unsigned short *p1, *pf, *p, *pl;
2339 p1 = (unsigned short *) srcImage->data;
2340 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2341 while (p1 < pf)
2342 {
2343 p = p1;
2344 pl = p1 + srcImage->width;
2345 for (; p < pl; p++)
2346 {
2347 *p = lookup_r[(*p & 0x7c00)>>10] |
2348 lookup_g[(*p & 0x03e0)>> 5] |
2349 lookup_b[(*p & 0x001f)];
2350 }
2351 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2352 }
2353 break;
2354 }
2355 case 16:
2356 {
2357 unsigned short *p1, *pf, *p, *pl;
2358 p1 = (unsigned short *) srcImage->data;
2359 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2360 while (p1 < pf)
2361 {
2362 p = p1;
2363 pl = p1 + srcImage->width;
2364 for (; p < pl; p++)
2365 {
2366 *p = lookup_r[(*p & 0xf800)>>11] |
2367 lookup_g[(*p & 0x07e0)>> 5] |
2368 lookup_b[(*p & 0x001f)];
2369 }
2370 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2371 }
2372 break;
2373 }
2374 case 24:
2375 {
2376 unsigned char *p1, *pf, *p, *pl;
2377 p1 = (unsigned char *) srcImage->data;
2378 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2379 while (p1 < pf)
2380 {
2381 p = p1;
2382 pl = p1 + srcImage->width * 3;
2383 for (; p < pl; p += 3)
2384 {
2385 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2386 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2387 p[2] = lookup_r[(p[2] & 0x0000ff)];
2388 }
2389 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2390 }
2391 break;
2392 }
2393 case 32:
2394 {
2395 RUINT32T *p1, *pf, *p, *pl;
2396 p1 = (RUINT32T *) srcImage->data;
2397 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2398
2399 while (p1 < pf)
2400 {
2401 p = p1;
2402 pl = p1 + srcImage->width;
2403 for (; p < pl; p++)
2404 {
2405 *p = lookup_r[(*p & 0xff0000)>>16] |
2406 lookup_g[(*p & 0x00ff00)>> 8] |
2407 lookup_b[(*p & 0x0000ff)] |
2408 (*p & ~0xffffff);
2409 }
2410 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2411 }
2412 break;
2413 }
2414 }
2415
2416 free (lookup);
2417}
2418#endif
2419
2420/*
2421 * Check our parents are still who we think they are.
2422 * Do transparency updates if required
2423 */
2424int
2425rxvt_term::check_our_parents ()
2426{
2427 int i, pchanged, aformat, have_pixmap, rootdepth;
2428 unsigned long nitems, bytes_after;
2429 Atom atype;
2430 unsigned char *prop = NULL;
2431 Window root, oldp, *list;
2432 Pixmap rootpixmap = None;
2433 XWindowAttributes wattr, wrootattr;
2434 dDisp;
2435
2436 pchanged = 0;
2437
2438 if (!OPTION (Opt_transparent))
2439 return pchanged; /* Don't try any more */
2440
2441 XGetWindowAttributes (disp, display->root, &wrootattr);
2442 rootdepth = wrootattr.depth;
2443
2444 XGetWindowAttributes (disp, parent[0], &wattr);
2445
2446 if (rootdepth != wattr.depth)
2447 {
2448 if (am_transparent)
2449 {
2450 pchanged = 1;
2451 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2452 am_transparent = am_pixmap_trans = 0;
2453 }
2454
2455 return pchanged; /* Don't try any more */
2456 }
2457
2458 /* Get all X ops out of the queue so that our information is up-to-date. */
2459 XSync (disp, False);
2460
2461 /*
2462 * Make the frame window set by the window manager have
2463 * the root background. Some window managers put multiple nested frame
2464 * windows for each client, so we have to take care about that.
2465 */
2466 i = (xa[XA_XROOTPMAP_ID]
2467 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2469 &nitems, &bytes_after, &prop) == Success);
2470
2471 if (!i || prop == NULL)
2472 i = (xa[XA_ESETROOT_PMAP_ID]
2473 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2474 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2475 &nitems, &bytes_after, &prop) == Success);
2476
2477 if (!i || prop == NULL
2478#if TINTING
2479 || !rs[Rs_color + Color_tint]
2480#endif
2481 )
2482 have_pixmap = 0;
2483 else
2484 {
2485 have_pixmap = 1;
2486 rootpixmap = *(Pixmap *)prop;
2487 XFree (prop);
2488 }
2489
2490 if (have_pixmap)
2491 {
2492 /*
2493 * Copy display->root pixmap transparency
2494 */
2495 int sx, sy, nx, ny;
2496 unsigned int nw, nh;
2497 Window cr;
2498 XImage *image;
2499 GC gc;
2500 XGCValues gcvalue;
2501
2502 XTranslateCoordinates (disp, parent[0], display->root,
2503 0, 0, &sx, &sy, &cr);
2504 nw = (unsigned int)szHint.width;
2505 nh = (unsigned int)szHint.height;
2506 nx = ny = 0;
2507
2508 if (sx < 0)
2509 {
2510 nw += sx;
2511 nx = -sx;
2512 sx = 0;
2513 }
2514
2515 if (sy < 0)
2516 {
2517 nh += sy;
2518 ny = -sy;
2519 sy = 0;
2520 }
2521
2522 min_it (nw, (unsigned int) (wrootattr.width - sx));
2523 min_it (nh, (unsigned int) (wrootattr.height - sy));
2524
2525 XSync (disp, False);
2526 allowedxerror = -1;
2527 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2528
2529 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2530 /* XXX: may need a delay here? */
2531 allowedxerror = 0;
2532
2533 if (image == NULL)
2534 {
2535 if (am_transparent && am_pixmap_trans)
2536 {
2537 pchanged = 1;
2538 if (pixmap != None)
2539 {
2540 XFreePixmap (disp, pixmap);
2541 pixmap = None;
2542 }
2543 }
2544
2545 am_pixmap_trans = 0;
2546 }
2547 else
2548 {
2549 if (pixmap != None)
2550 XFreePixmap (disp, pixmap);
2551
2552#if TINTING
2553 if (ISSET_PIXCOLOR (Color_tint))
2554 {
2555 unsigned short rm, gm, bm;
2556 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2557
2558 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2559
2560 ShadeXImage (display, image, shade, rm, gm, bm);
2561 }
2562#endif
2563
2564 pixmap = XCreatePixmap (disp, vt,
2565 szHint.width, szHint.height, image->depth);
2566 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2567 XPutImage (disp, pixmap, gc, image, 0, 0,
2568 nx, ny, image->width, image->height);
2569 XFreeGC (disp, gc);
2570 XDestroyImage (image);
2571 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2572 XClearWindow (disp, parent[0]);
2573
2574 if (!am_transparent || !am_pixmap_trans)
2575 pchanged = 1;
2576
2577 am_transparent = am_pixmap_trans = 1;
2578 }
2579 }
2580
2581 if (am_pixmap_trans)
2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2583 else
2584 {
2585 unsigned int n;
2586 /*
2587 * InheritPixmap transparency
2588 */
2589 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2590 {
2591 oldp = parent[i];
2592 XQueryTree (disp, parent[i - 1], &root,
2593 &parent[i], &list, &n);
2594 XFree (list);
2595
2596 if (parent[i] == display->root)
2597 {
2598 if (oldp != None)
2599 pchanged = 1;
2600
2601 break;
2602 }
2603
2604 if (oldp != parent[i])
2605 pchanged = 1;
2606 }
2607
2608 n = 0;
2609
2610 if (pchanged)
2611 {
2612 for (; n < (unsigned int)i; n++)
2613 {
2614 XGetWindowAttributes (disp, parent[n], &wattr);
2615 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2616 {
2617 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2618 break;
2619 }
2620 }
2621 }
2622
2623 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2624 {
2625 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2626 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2627 am_transparent = 0;
2628 /* XXX: also turn off Opt_transparent? */
2629 }
2630 else
2631 {
2632#if WAIT_FOR_WM
2633 /* wait (an arbitrary period) for the WM to do its thing
2634 * needed for fvwm2.2.2 (and before?) */
2635 sleep (1);
2636#endif
2637 for (n = 0; n < (unsigned int)i; n++)
2638 {
2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2640 XClearWindow (disp, parent[n]);
2641 }
2642
2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2644 am_transparent = 1;
2645 }
2646
2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648 parent[i] = None;
2649 }
2650
2651 if (scrollBar.win)
2652 {
2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2654 scrollBar.setIdle ();
2655 scrollbar_show (0);
2656 }
2657
2658 if (am_transparent)
2659 {
2660 want_refresh = want_full_refresh = 1;
2661 if (am_pixmap_trans)
2662 flush ();
2663 }
2664
2665 return pchanged;
2666}
2667#endif
2668 2221
2669/*}}} */ 2222/*}}} */
2670 2223
2671bool 2224bool
2672rxvt_term::cmd_parse () 2225rxvt_term::cmd_parse ()
2673{ 2226{
2674 bool flag = false; 2227 bool flag = false;
2675 unicode_t ch = NOCHAR; 2228 wchar_t ch = NOCHAR;
2676 char *seq_begin; // remember start of esc-sequence here 2229 char *seq_begin; // remember start of esc-sequence here
2677 2230
2678 for (;;) 2231 for (;;)
2679 { 2232 {
2680 if (ch == NOCHAR) 2233 if (ch == NOCHAR)
2681 { 2234 {
2682 seq_begin = cmdbuf_ptr; 2235 seq_begin = cmdbuf_ptr;
2683 ch = next_char (); 2236 ch = next_char ();
2684 }
2685 2237
2686 if (ch == NOCHAR) // TODO: improve 2238 if (ch == NOCHAR)
2687 break; 2239 break;
2240 }
2688 2241
2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2242 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2690 { 2243 {
2691 if (!seen_input) 2244 if (!seen_input)
2692 { 2245 {
… …
2701 if (seen_resize && cmd_pid) 2254 if (seen_resize && cmd_pid)
2702 kill (-cmd_pid, SIGWINCH); 2255 kill (-cmd_pid, SIGWINCH);
2703 } 2256 }
2704 2257
2705 /* Read a text string from the input buffer */ 2258 /* Read a text string from the input buffer */
2706 unicode_t buf[UBUFSIZ]; 2259 wchar_t buf[UBUFSIZ];
2707 bool refreshnow = false; 2260 bool refreshnow = false;
2708 int nlines = 0; 2261 int nlines = 0;
2709 unicode_t *str = buf; 2262 wchar_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ); 2263 wchar_t *eol = str + min (ncol, UBUFSIZ);
2711 2264
2712 for (;;) 2265 for (;;)
2713 { 2266 {
2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2267 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2715 break; 2268 break;
… …
2721 if (ch == C0_LF) 2274 if (ch == C0_LF)
2722 nlines++; 2275 nlines++;
2723 2276
2724 refresh_count++; 2277 refresh_count++;
2725 2278
2726 if (!OPTION (Opt_jumpScroll) 2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2727 || (refresh_count >= refresh_limit * (nrow - 1)))
2728 { 2280 {
2729 refreshnow = true;
2730 refresh_count = 0; 2281 refresh_count = 0;
2282
2283 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2284 {
2285 refreshnow = true;
2731 ch = NOCHAR; 2286 ch = NOCHAR;
2732 break; 2287 break;
2288 }
2733 } 2289 }
2734 2290
2735 // scr_add_lines only works for nlines <= nrow - 1. 2291 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2292 if (nlines >= nrow - 1)
2737 { 2293 {
2294 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2295 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2738 scr_add_lines (buf, nlines, str - buf); 2296 scr_add_lines (buf, str - buf, nlines);
2297
2739 nlines = 0; 2298 nlines = 0;
2740 str = buf; 2299 str = buf;
2741 eol = str + min (ncol, UBUFSIZ); 2300 eol = str + min (ncol, UBUFSIZ);
2742 } 2301 }
2743 2302
… …
2756 2315
2757 seq_begin = cmdbuf_ptr; 2316 seq_begin = cmdbuf_ptr;
2758 ch = next_char (); 2317 ch = next_char ();
2759 } 2318 }
2760 2319
2320 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2321 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2761 scr_add_lines (buf, nlines, str - buf); 2322 scr_add_lines (buf, str - buf, nlines);
2762 2323
2763 /* 2324 /*
2764 * If there have been a lot of new lines, then update the screen 2325 * If there have been a lot of new lines, then update the screen
2765 * What the heck I'll cheat and only refresh less than every page-full. 2326 * What the heck we'll cheat and only refresh less than every page-full.
2766 * the number of pages between refreshes is refresh_limit, which 2327 * if skipScroll is enabled.
2767 * is incremented here because we must be doing flat-out scrolling.
2768 */ 2328 */
2769 if (refreshnow) 2329 if (refreshnow)
2770 { 2330 {
2771 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2772 refresh_limit++;
2773 else
2774 {
2775 flag = true; 2331 flag = true;
2776 scr_refresh (refresh_type); 2332 scr_refresh ();
2777 flush_ev.stop (); 2333 want_refresh = 1;
2778 }
2779 } 2334 }
2780 2335
2781 } 2336 }
2782 else 2337 else
2783 { 2338 {
… …
2797 } 2352 }
2798 2353
2799 return flag; 2354 return flag;
2800} 2355}
2801 2356
2802// read the next octet
2803unicode_t
2804rxvt_term::next_octet ()
2805{
2806 return cmdbuf_ptr < cmdbuf_endp
2807 ? *cmdbuf_ptr++
2808 : NOCHAR;
2809}
2810
2811// read the next character 2357// read the next character
2812unicode_t 2358wchar_t
2813rxvt_term::next_char () 2359rxvt_term::next_char () NOTHROW
2814{ 2360{
2815 while (cmdbuf_ptr < cmdbuf_endp) 2361 while (cmdbuf_ptr < cmdbuf_endp)
2816 { 2362 {
2817 // assume 7-bit to be ascii ALWAYS 2363 // assume 7-bit to be ascii ALWAYS
2818 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2364 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2827 cmdbuf_ptr = cmdbuf_endp; 2373 cmdbuf_ptr = cmdbuf_endp;
2828 break; 2374 break;
2829 } 2375 }
2830 2376
2831 if (len == (size_t)-1) 2377 if (len == (size_t)-1)
2832 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2378 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2833 2379
2834 // assume wchar == unicode 2380 // assume wchar == unicode
2835 cmdbuf_ptr += len; 2381 cmdbuf_ptr += len;
2836 return wc & UNICODE_MASK; 2382 return wc & UNICODE_MASK;
2837 } 2383 }
2838 2384
2839 return NOCHAR; 2385 return NOCHAR;
2840} 2386}
2387
2388// read the next octet
2389uint32_t
2390rxvt_term::next_octet () NOTHROW
2391{
2392 return cmdbuf_ptr < cmdbuf_endp
2393 ? (unsigned char)*cmdbuf_ptr++
2394 : NOCHAR;
2395}
2396
2397static class out_of_input out_of_input;
2841 2398
2842/* rxvt_cmd_getc () - Return next input character */ 2399/* rxvt_cmd_getc () - Return next input character */
2843/* 2400/*
2844 * Return the next input character after first passing any keyboard input 2401 * Return the next input character after first passing any keyboard input
2845 * to the command. 2402 * to the command.
2846 */ 2403 */
2847unicode_t 2404wchar_t
2848rxvt_term::cmd_getc () 2405rxvt_term::cmd_getc () THROW ((class out_of_input))
2849{ 2406{
2850 unicode_t c = next_char (); 2407 wchar_t c = next_char ();
2851 2408
2852 if (c == NOCHAR) 2409 if (c == NOCHAR)
2853 throw out_of_input; 2410 throw out_of_input;
2854 2411
2855 return c; 2412 return c;
2856} 2413}
2857 2414
2858unicode_t 2415uint32_t
2859rxvt_term::cmd_get8 () 2416rxvt_term::cmd_get8 () THROW ((class out_of_input))
2860{ 2417{
2861 unicode_t c = next_octet (); 2418 uint32_t c = next_octet ();
2862 2419
2863 if (c == NOCHAR) 2420 if (c == NOCHAR)
2864 throw out_of_input; 2421 throw out_of_input;
2865 2422
2866 return c; 2423 return c;
… …
2930 { 2487 {
2931 if ((buf[len++] = cmd_getc ()) == 'i') 2488 if ((buf[len++] = cmd_getc ()) == 'i')
2932 break; /* done = 1 */ 2489 break; /* done = 1 */
2933 } 2490 }
2934 } 2491 }
2935 2492
2936 for (i = 0; i < len; i++) 2493 for (i = 0; i < len; i++)
2937 if (putc (buf[i], fd) == EOF) 2494 if (putc (buf[i], fd) == EOF)
2938 { 2495 {
2939 done = 1; 2496 done = 1;
2940 break; 2497 break;
… …
3002 process_dcs_seq (); 2559 process_dcs_seq ();
3003 break; 2560 break;
3004 case 0x9b: /* CSI */ 2561 case 0x9b: /* CSI */
3005 process_csi_seq (); 2562 process_csi_seq ();
3006 break; 2563 break;
3007 case 0x9d: /* CSI */ 2564 case 0x9d: /* OSC */
3008 process_osc_seq (); 2565 process_osc_seq ();
3009 break; 2566 break;
3010#endif 2567#endif
3011 } 2568 }
3012} 2569}
… …
3102 scr_charset_set (2, (unsigned int)cmd_getc ()); 2659 scr_charset_set (2, (unsigned int)cmd_getc ());
3103 break; 2660 break;
3104 case '+': 2661 case '+':
3105 scr_charset_set (3, (unsigned int)cmd_getc ()); 2662 scr_charset_set (3, (unsigned int)cmd_getc ());
3106 break; 2663 break;
3107#if ENABLE_FRILLS 2664#if !ENABLE_MINIMAL
3108 case '6': 2665 case '6':
3109 scr_backindex (); 2666 scr_backindex ();
3110 break; 2667 break;
3111#endif 2668#endif
3112 case '7': 2669 case '7':
3113 scr_cursor (SAVE); 2670 scr_cursor (SAVE);
3114 break; 2671 break;
3115 case '8': 2672 case '8':
3116 scr_cursor (RESTORE); 2673 scr_cursor (RESTORE);
3117 break; 2674 break;
3118#if ENABLE_FRILLS 2675#if !ENABLE_MINIMAL
3119 case '9': 2676 case '9':
3120 scr_forwardindex (); 2677 scr_forwardindex ();
3121 break; 2678 break;
3122#endif 2679#endif
3123 case '=': 2680 case '=':
… …
3133 break; 2690 break;
3134 2691
3135 /* 8.3.87: NEXT LINE */ 2692 /* 8.3.87: NEXT LINE */
3136 case C1_NEL: /* ESC E */ 2693 case C1_NEL: /* ESC E */
3137 { 2694 {
3138 unicode_t nlcr[] = { C0_LF, C0_CR }; 2695 wchar_t nlcr[] = { C0_LF, C0_CR };
3139 scr_add_lines (nlcr, 1, 2); 2696 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3140 } 2697 }
3141 break; 2698 break;
3142 2699
3143 /* kidnapped escape sequence: Should be 8.3.48 */ 2700 /* kidnapped escape sequence: Should be 8.3.48 */
3144 case C1_ESA: /* ESC G */ 2701 case C1_ESA: /* ESC G */
… …
3240 unicode_t ch, priv, i; 2797 unicode_t ch, priv, i;
3241 unsigned int nargs, p; 2798 unsigned int nargs, p;
3242 int n, ndef; 2799 int n, ndef;
3243 int arg[ESC_ARGS]; 2800 int arg[ESC_ARGS];
3244 2801
3245 for (nargs = ESC_ARGS; nargs > 0;) 2802 memset (arg, 0, sizeof (arg));
3246 arg[--nargs] = 0; 2803 nargs = 0;
3247 2804
3248 priv = 0; 2805 priv = 0;
3249 ch = cmd_getc (); 2806 ch = cmd_getc ();
3250 if (ch >= '<' && ch <= '?') 2807 if (ch >= '<' && ch <= '?')
3251 { /* '<' '=' '>' '?' */ 2808 { /* '<' '=' '>' '?' */
… …
3285 ndef = get_byte_array_bit (csi_defaults, i); 2842 ndef = get_byte_array_bit (csi_defaults, i);
3286 for (p = 0; p < nargs; p++) 2843 for (p = 0; p < nargs; p++)
3287 if (arg[p] == -1) 2844 if (arg[p] == -1)
3288 arg[p] = ndef; 2845 arg[p] = ndef;
3289 2846
3290#ifdef DEBUG_CMD
3291 fprintf (stderr, "CSI ");
3292 for (p = 0; p < nargs; p++)
3293 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3294 fprintf (stderr, "%c\n", ch);
3295#endif
3296
3297 /* 2847 /*
3298 * private mode handling 2848 * private mode handling
3299 */ 2849 */
3300 if (priv) 2850 if (priv)
3301 { 2851 {
3302 switch (priv) 2852 switch (priv)
3303 { 2853 {
3304 case '>': 2854 case '>':
3305 if (ch == CSI_DA) /* secondary device attributes */ 2855 if (ch == CSI_DA) /* secondary device attributes */
3306 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2856 {
2857 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2858 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2859 //
2860 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2861 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2862 // that we do not support xterm mouse reporting (should be 95 when we do).
2863 //
2864 tt_printf ("\033[>%d;94;0c", 'U');
2865 }
3307 break; 2866 break;
3308 case '?': 2867 case '?':
3309 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2868 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3310 process_terminal_mode (ch, priv, nargs, arg); 2869 process_terminal_mode (ch, priv, nargs, arg);
3311 break; 2870 break;
… …
3437 break; 2996 break;
3438 case 6: /* CPR requested */ 2997 case 6: /* CPR requested */
3439 scr_report_position (); 2998 scr_report_position ();
3440 break; 2999 break;
3441 case 7: /* unofficial extension */ 3000 case 7: /* unofficial extension */
3442 if (OPTION (Opt_insecure)) 3001 if (option (Opt_insecure))
3443 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3002 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3444 break; 3003 break;
3445 case 8: /* unofficial extension */ 3004 case 8: /* unofficial extension */
3446 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3005 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3447 break; 3006 break;
… …
3514 break; 3073 break;
3515 case CSI_75: 3074 case CSI_75:
3516 scr_cursor (RESTORE); 3075 scr_cursor (RESTORE);
3517 break; 3076 break;
3518 3077
3519#if ENABLE_FRILLS 3078#if !ENABLE_MINIMAL
3520 case CSI_74: 3079 case CSI_74:
3521 process_window_ops (arg, nargs); 3080 process_window_ops (arg, nargs);
3522 break; 3081 break;
3523#endif 3082#endif
3524 3083
… …
3531 break; 3090 break;
3532 } 3091 }
3533} 3092}
3534/*}}} */ 3093/*}}} */
3535 3094
3536#if ENABLE_FRILLS 3095#if !ENABLE_MINIMAL
3537/* ARGSUSED */ 3096/* ARGSUSED */
3538void 3097void
3539rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3098rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3540{ 3099{
3541 int x, y; 3100 int x, y;
3542 XWindowAttributes wattr; 3101 XWindowAttributes wattr;
3543 Window wdummy; 3102 Window wdummy;
3544 dDisp; 3103
3104 dLocal (Display *, dpy);
3545 3105
3546 if (nargs == 0) 3106 if (nargs == 0)
3547 return; 3107 return;
3548 3108
3549 switch (args[0]) 3109 switch (args[0])
3550 { 3110 {
3551 /* 3111 /*
3552 * commands 3112 * commands
3553 */ 3113 */
3554 case 1: /* deiconify window */ 3114 case 1: /* deiconify window */
3555 XMapWindow (disp, parent[0]); 3115 XMapWindow (dpy, parent[0]);
3556 break; 3116 break;
3557 case 2: /* iconify window */ 3117 case 2: /* iconify window */
3558 XIconifyWindow (disp, parent[0], display->screen); 3118 XIconifyWindow (dpy, parent[0], display->screen);
3559 break; 3119 break;
3560 case 3: /* set position (pixels) */ 3120 case 3: /* set position (pixels) */
3561 XMoveWindow (disp, parent[0], args[1], args[2]); 3121 XMoveWindow (dpy, parent[0], args[1], args[2]);
3562 break; 3122 break;
3563 case 4: /* set size (pixels) */ 3123 case 4: /* set size (pixels) */
3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3124 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3565 break; 3125 break;
3566 case 5: /* raise window */ 3126 case 5: /* raise window */
3567 XRaiseWindow (disp, parent[0]); 3127 XRaiseWindow (dpy, parent[0]);
3568 break; 3128 break;
3569 case 6: /* lower window */ 3129 case 6: /* lower window */
3570 XLowerWindow (disp, parent[0]); 3130 XLowerWindow (dpy, parent[0]);
3571 break; 3131 break;
3572 case 7: /* refresh window */ 3132 case 7: /* refresh window */
3573 scr_touch (true); 3133 scr_touch (true);
3574 break; 3134 break;
3575 case 8: /* set size (chars) */ 3135 case 8: /* set size (chars) */
… …
3582 if (args[0] >= 24) /* set height (chars) */ 3142 if (args[0] >= 24) /* set height (chars) */
3583 set_widthheight ((unsigned int)width, 3143 set_widthheight ((unsigned int)width,
3584 (unsigned int) (args[1] * fheight)); 3144 (unsigned int) (args[1] * fheight));
3585 break; 3145 break;
3586 3146
3587
3588 /* 3147 /*
3589 * reports - some output format copied from XTerm 3148 * reports - some output format copied from XTerm
3590 */ 3149 */
3591 case 11: /* report window state */ 3150 case 11: /* report window state */
3592 XGetWindowAttributes (disp, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent[0], &wattr);
3593 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3152 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3594 break; 3153 break;
3595 case 13: /* report window position */ 3154 case 13: /* report window position */
3596 XGetWindowAttributes (disp, parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent[0], &wattr);
3597 XTranslateCoordinates (disp, parent[0], wattr.root, 3156 XTranslateCoordinates (dpy, parent[0], wattr.root,
3598 -wattr.border_width, -wattr.border_width, 3157 -wattr.border_width, -wattr.border_width,
3599 &x, &y, &wdummy); 3158 &x, &y, &wdummy);
3600 tt_printf ("\033[3;%d;%dt", x, y); 3159 tt_printf ("\033[3;%d;%dt", x, y);
3601 break; 3160 break;
3602 case 14: /* report window size (pixels) */ 3161 case 14: /* report window size (pixels) */
3603 XGetWindowAttributes (disp, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent[0], &wattr);
3604 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3163 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3605 break; 3164 break;
3606 case 18: /* report text area size (chars) */ 3165 case 18: /* report text area size (chars) */
3607 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3166 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3608 break; 3167 break;
… …
3610 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3611 break; 3170 break;
3612 case 20: /* report icon label */ 3171 case 20: /* report icon label */
3613 { 3172 {
3614 char *s; 3173 char *s;
3615 XGetIconName (disp, parent[0], &s); 3174 XGetIconName (dpy, parent[0], &s);
3616 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3617 XFree (s); 3176 XFree (s);
3618 } 3177 }
3619 break; 3178 break;
3620 case 21: /* report window title */ 3179 case 21: /* report window title */
3621 { 3180 {
3622 char *s; 3181 char *s;
3623 XFetchName (disp, parent[0], &s); 3182 XFetchName (dpy, parent[0], &s);
3624 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3183 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3625 XFree (s); 3184 XFree (s);
3626 } 3185 }
3627 break; 3186 break;
3628 } 3187 }
3629} 3188}
… …
3656 seen_esc = true; 3215 seen_esc = true;
3657 continue; 3216 continue;
3658 } 3217 }
3659 else if (ch == C0_BEL || ch == CHAR_ST) 3218 else if (ch == C0_BEL || ch == CHAR_ST)
3660 break; 3219 break;
3220 else if (ch == C0_SYN)
3221 ch = cmd_get8 ();
3661 else if (ch < 0x20) 3222 else if (ch < 0x20)
3662 return NULL; /* other control character - exit */ 3223 return NULL; /* other control character - exit */
3663 3224
3664 seen_esc = false; 3225 seen_esc = false;
3665 3226
3666 if (n >= STRING_MAX - 1) 3227 if (n >= STRING_MAX - 1)
3667 // stop at some sane length 3228 // stop at some sane length
3668 return NULL; 3229 return NULL;
3669 3230
3670 if (ch == C0_SYN)
3671 string[n++] = cmd_get8 ();
3672 else
3673 string[n++] = ch; 3231 string[n++] = ch;
3674 } 3232 }
3675 3233
3676 string[n++] = '\0'; 3234 string[n++] = '\0';
3677 3235
3678 ends_how = (ch == 0x5c ? C0_ESC : ch); 3236 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3729void 3287void
3730rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3288rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3731{ 3289{
3732 if (str[0] == '?' && !str[1]) 3290 if (str[0] == '?' && !str[1])
3733 { 3291 {
3734 unsigned short r, g, b; 3292 rgba c;
3735 pix_colors_focused[color].get (display, r, g, b); 3293 pix_colors_focused[color].get (c);
3294
3295#if XFT
3296 if (c.a != rgba::MAX_CC)
3297 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3298 else
3299#endif
3736 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3300 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3737 } 3301 }
3738 else 3302 else
3739 set_window_color (color, str); 3303 set_window_color (color, str);
3740} 3304}
3741 3305
… …
3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3307 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3744 */ 3308 */
3745void 3309void
3746rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3310rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3747{ 3311{
3748 int changed = 0;
3749 int color; 3312 int color;
3750 char *buf, *name; 3313 char *buf, *name;
3751 bool query = str[0] == '?' && !str[1]; 3314 bool query = str[0] == '?' && !str[1];
3752 int saveop = op; 3315 int saveop = op;
3753 dDisp; 3316
3317 dLocal (Display *, dpy);
3754 3318
3755 assert (str != NULL); 3319 assert (str != NULL);
3320
3321 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3322 return;
3323
3756 switch (op) 3324 switch (op)
3757 { 3325 {
3758 case XTerm_name: 3326 case XTerm_name:
3759 set_title (str); 3327 set_title (str);
3760 /* FALLTHROUGH */ 3328 /* FALLTHROUGH */
… …
3774 unsigned long bytes_after; 3342 unsigned long bytes_after;
3775 unsigned char *value = 0; 3343 unsigned char *value = 0;
3776 const char *str = ""; 3344 const char *str = "";
3777 3345
3778 if (prop 3346 if (prop
3779 && XGetWindowProperty (disp, parent[0], 3347 && XGetWindowProperty (dpy, parent[0],
3780 prop, 0, 1<<16, 0, AnyPropertyType, 3348 prop, 0, 1<<16, 0, AnyPropertyType,
3781 &actual_type, &actual_format, 3349 &actual_type, &actual_format,
3782 &nitems, &bytes_after, &value) == Success 3350 &nitems, &bytes_after, &value) == Success
3783 && actual_type != None 3351 && actual_type != None
3784 && actual_format == 8) 3352 && actual_format == 8)
3785 str = (const char *)(value); 3353 str = (const char *)(value);
3786 3354
3787 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3355 tt_printf ("\033]%d;%s%c", op, str, resp);
3788 3356
3789 XFree (value); 3357 XFree (value);
3790 } 3358 }
3791 else 3359 else
3792 { 3360 {
… …
3796 { 3364 {
3797 *eq = 0; 3365 *eq = 0;
3798 set_utf8_property (display->atom (str), eq + 1); 3366 set_utf8_property (display->atom (str), eq + 1);
3799 } 3367 }
3800 else 3368 else
3801 XDeleteProperty (disp, parent[0], 3369 XDeleteProperty (dpy, parent[0],
3802 display->atom (str)); 3370 display->atom (str));
3803 } 3371 }
3804 break; 3372 break;
3805 3373
3806 case XTerm_Color: 3374 case XTerm_Color:
… …
3808 { 3376 {
3809 if ((name = strchr (buf, ';')) == NULL) 3377 if ((name = strchr (buf, ';')) == NULL)
3810 break; 3378 break;
3811 3379
3812 *name++ = '\0'; 3380 *name++ = '\0';
3813 color = atoi (buf); 3381 color = atoi (buf) + minCOLOR;
3814 3382
3815 if (color < 0 || color >= TOTAL_COLORS) 3383 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3816 break; 3384 break;
3817 3385
3818 if ((buf = strchr (name, ';')) != NULL) 3386 if ((buf = strchr (name, ';')) != NULL)
3819 *buf++ = '\0'; 3387 *buf++ = '\0';
3820 3388
3821 if (name[0] == '?' && !name[1]) 3389 process_color_seq (op, color, name, resp);
3822 {
3823 unsigned short r, g, b;
3824 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3825 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3826 }
3827 else
3828 set_window_color (color + minCOLOR, name);
3829 } 3390 }
3830 break; 3391 break;
3831 case XTerm_Color00: 3392 case XTerm_Color00:
3832 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3393 process_color_seq (op, Color_fg, str, resp);
3833 break; 3394 break;
3834 case XTerm_Color01: 3395 case XTerm_Color01:
3835 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3396 process_color_seq (op, Color_bg, str, resp);
3836 break; 3397 break;
3837#ifndef NO_CURSORCOLOR 3398#ifndef NO_CURSORCOLOR
3838 case XTerm_Color_cursor: 3399 case XTerm_Color_cursor:
3839 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3400 process_color_seq (op, Color_cursor, str, resp);
3840 break; 3401 break;
3841#endif 3402#endif
3842 case XTerm_Color_pointer_fg: 3403 case XTerm_Color_pointer_fg:
3843 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3404 process_color_seq (op, Color_pointer_fg, str, resp);
3844 break; 3405 break;
3845 case XTerm_Color_pointer_bg: 3406 case XTerm_Color_pointer_bg:
3846 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3407 process_color_seq (op, Color_pointer_bg, str, resp);
3847 break; 3408 break;
3848#ifndef NO_BOLD_UNDERLINE_REVERSE 3409#ifndef NO_BOLD_UNDERLINE_REVERSE
3849 case XTerm_Color_BD:
3850 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3851 break;
3852 case XTerm_Color_UL:
3853 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3854 break;
3855 case XTerm_Color_RV: 3410 case XTerm_Color_RV:
3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3411 process_color_seq (op, Color_RV, str, resp);
3412 break;
3413 case Rxvt_Color_BD:
3414 case URxvt_Color_BD:
3415 process_color_seq (op, Color_BD, str, resp);
3416 break;
3417 case Rxvt_Color_UL:
3418 case URxvt_Color_UL:
3419 process_color_seq (op, Color_UL, str, resp);
3857 break; 3420 break;
3858 case URxvt_Color_IT: 3421 case URxvt_Color_IT:
3859 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3422 process_color_seq (op, Color_IT, str, resp);
3860 break; 3423 break;
3861#endif 3424#endif
3862#if TRANSPARENT && TINTING 3425#if ENABLE_TRANSPARENCY
3863 case URxvt_Color_tint: 3426 case URxvt_Color_tint:
3864 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3427 process_color_seq (op, Color_tint, str, resp);
3865 check_our_parents (); 3428 {
3866 if (am_transparent) 3429 bool changed = false;
3867 want_full_refresh = want_refresh = 1; 3430 if (ISSET_PIXCOLOR (Color_tint))
3868 break; 3431 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3869#endif 3432 else
3433 changed = bgPixmap.unset_tint ();
3434 if (changed)
3435 update_background ();
3436 }
3870 3437
3438 break;
3439#endif
3440
3441#if XPM_BACKGROUND
3871 case XTerm_Pixmap: 3442 case Rxvt_Pixmap:
3872 if (*str != ';') 3443 if (!strcmp (str, "?"))
3873 { 3444 {
3874#if XPM_BACKGROUND 3445 char str[256];
3875 scale_pixmap (""); /* reset to default scaling */ 3446
3876 set_bgPixmap (str); /* change pixmap */ 3447 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3877#endif 3448 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3878 scr_touch (true); 3449 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3450 process_xterm_seq (XTerm_title, str, CHAR_ST);
3879 } 3451 }
3880 while ((str = strchr (str, ';')) != NULL) 3452 else
3881 { 3453 {
3454 int changed = 0;
3455
3456 if (*str != ';')
3457 {
3458 /* reset to default scaling :*/
3459 bgPixmap.unset_geometry ();
3460 if (bgPixmap.set_file (str)) /* change pixmap */
3461 changed++;
3462 str = strchr (str, ';');
3463 if (str == NULL)
3464 bgPixmap.set_defaultGeometry ();
3465 }
3466 while (str)
3467 {
3882 str++; 3468 str++;
3883#if XPM_BACKGROUND 3469 if (bgPixmap.set_geometry (str))
3884 changed += scale_pixmap (str); 3470 changed++;
3885#endif 3471 str = strchr (str, ';');
3472 }
3473 if (changed)
3474 update_background ();
3886 } 3475 }
3887
3888 if (changed)
3889 {
3890#ifdef XPM_BACKGROUND
3891 resize_pixmap ();
3892#endif
3893 scr_touch (true);
3894 }
3895 break; 3476 break;
3477#endif
3896 3478
3897 case XTerm_restoreFG: 3479 case Rxvt_restoreFG:
3898 set_window_color (Color_fg, str); 3480 set_window_color (Color_fg, str);
3899 break; 3481 break;
3900 case XTerm_restoreBG: 3482 case Rxvt_restoreBG:
3901 set_window_color (Color_bg, str); 3483 set_window_color (Color_bg, str);
3902 break; 3484 break;
3903 3485
3904 case XTerm_logfile: 3486 case XTerm_logfile:
3905 // TODO, when secure mode? 3487 // TODO, when secure mode?
3906 break; 3488 break;
3907 3489
3908#ifdef MENUBAR
3909 case URxvt_Menu:
3910 if (OPTION (Opt_insecure))
3911 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3912 break;
3913#endif
3914#if 0 3490#if 0
3915 case XTerm_dumpscreen: /* no error notices */ 3491 case Rxvt_dumpscreen: /* no error notices */
3916 { 3492 {
3917 int fd; 3493 int fd;
3918 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3494 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3919 { 3495 {
3920 scr_dump (fd); 3496 scr_dump (fd);
… …
3931 case URxvt_italicFont: 3507 case URxvt_italicFont:
3932 case URxvt_boldItalicFont: 3508 case URxvt_boldItalicFont:
3933#endif 3509#endif
3934 if (query) 3510 if (query)
3935 tt_printf ("\33]%d;%-.250s%c", saveop, 3511 tt_printf ("\33]%d;%-.250s%c", saveop,
3936 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3512 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3937 ? fontset[op - URxvt_font]->fontdesc : "", 3513 ? fontset[op - URxvt_font]->fontdesc : "",
3938 resp); 3514 resp);
3939 else 3515 else
3940 { 3516 {
3941 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3517 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3944 allocated.push_back ((void *)res); 3520 allocated.push_back ((void *)res);
3945 set_fonts (); 3521 set_fonts ();
3946 } 3522 }
3947 break; 3523 break;
3948 3524
3949#if ENABLE_FRILLS 3525 case URxvt_version:
3526 if (query)
3527 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3528 op,
3529 rs[Rs_name], VERSION[0], VERSION[2],
3530 resp);
3531 break;
3532
3533#if !ENABLE_MINIMAL
3950 case URxvt_locale: 3534 case URxvt_locale:
3951 if (query) 3535 if (query)
3952 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3536 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3953 else 3537 else
3954 { 3538 {
3955 set_locale (str); 3539 set_locale (str);
3956 pty.set_utf8_mode (enc_utf8); 3540 pty->set_utf8_mode (enc_utf8);
3957 init_xlocale (); 3541 init_xlocale ();
3958 } 3542 }
3959 break; 3543 break;
3960 3544
3961 case URxvt_view_up: 3545 case URxvt_view_up:
… …
3972 break; 3556 break;
3973#endif 3557#endif
3974 3558
3975#if ENABLE_PERL 3559#if ENABLE_PERL
3976 case URxvt_perl: 3560 case URxvt_perl:
3977 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3561 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3978 ; // no responses yet 3562 ; // no responses yet
3979 break; 3563 break;
3980#endif 3564#endif
3981 } 3565 }
3982} 3566}
… …
4014 return state; 3598 return state;
4015} 3599}
4016 3600
4017/* we're not using priv _yet_ */ 3601/* we're not using priv _yet_ */
4018void 3602void
4019rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3603rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4020{ 3604{
4021 unsigned int i, j; 3605 unsigned int i, j;
4022 int state; 3606 int state;
4023 3607
4024 static const struct 3608 static const struct
4025 { 3609 {
4026 const int argval; 3610 const int argval;
4027 const unsigned long bit; 3611 const unsigned long bit;
4028 }
4029
4030 argtopriv[] = { 3612 } argtopriv[] = {
4031 { 1, PrivMode_aplCUR }, 3613 { 1, PrivMode_aplCUR },
4032 { 2, PrivMode_vt52 }, 3614 { 2, PrivMode_vt52 },
4033 { 3, PrivMode_132 }, 3615 { 3, PrivMode_132 },
4034 { 4, PrivMode_smoothScroll }, 3616 { 4, PrivMode_smoothScroll },
4035 { 5, PrivMode_rVideo }, 3617 { 5, PrivMode_rVideo },
4036 { 6, PrivMode_relOrigin }, 3618 { 6, PrivMode_relOrigin },
4037 { 7, PrivMode_Autowrap }, 3619 { 7, PrivMode_Autowrap },
4038 // 8, bi-directional support mode 3620 // 8, bi-directional support mode
4039 { 9, PrivMode_MouseX10 }, 3621 { 9, PrivMode_MouseX10 },
4040#ifdef menuBar_esc
4041 { menuBar_esc, PrivMode_menuBar },
4042#endif
4043 // 18, 19 printing-related 3622 // 18, 19 printing-related
4044 { 25, PrivMode_VisibleCursor }, 3623 { 25, PrivMode_VisibleCursor },
4045#ifdef scrollBar_esc 3624#ifdef scrollBar_esc
4046 { scrollBar_esc, PrivMode_scrollBar }, 3625 { scrollBar_esc, PrivMode_scrollBar },
4047#endif 3626#endif
… …
4094 /* extra handling for values with state unkept */ 3673 /* extra handling for values with state unkept */
4095 switch (arg[i]) 3674 switch (arg[i])
4096 { 3675 {
4097#if ENABLE_STYLES 3676#if ENABLE_STYLES
4098 case 1021: 3677 case 1021:
4099 if (mode) 3678 set_option (Opt_intensityStyles, mode);
4100 SET_OPTION (Opt_intensityStyles);
4101 else
4102 CLR_OPTION (Opt_intensityStyles);
4103 3679
4104 scr_touch (true); 3680 scr_touch (true);
4105 break; 3681 break;
4106#endif 3682#endif
4107 case 1048: /* alternative cursor save */ 3683 case 1048: /* alternative cursor save */
4108 case 1049: 3684 case 1049:
4109 if (OPTION (Opt_secondaryScreen)) 3685 if (option (Opt_secondaryScreen))
4110 if (mode == 0) 3686 if (mode == 0)
4111 scr_cursor (RESTORE); 3687 scr_cursor (RESTORE);
4112 else if (mode == 1) 3688 else if (mode == 1)
4113 scr_cursor (SAVE); 3689 scr_cursor (SAVE);
4114 break; 3690 break;
… …
4129 case 3: /* 80/132 */ 3705 case 3: /* 80/132 */
4130 if (priv_modes & PrivMode_132OK) 3706 if (priv_modes & PrivMode_132OK)
4131 set_widthheight (((state ? 132 : 80) * fwidth), height); 3707 set_widthheight (((state ? 132 : 80) * fwidth), height);
4132 break; 3708 break;
4133 case 4: /* smooth scrolling */ 3709 case 4: /* smooth scrolling */
4134 if (!state) 3710 set_option (Opt_jumpScroll, !state);
4135 SET_OPTION (Opt_jumpScroll);
4136 else
4137 CLR_OPTION (Opt_jumpScroll);
4138 break; 3711 break;
4139 case 5: /* reverse video */ 3712 case 5: /* reverse video */
4140 scr_rvideo_mode (state); 3713 scr_rvideo_mode (state);
4141 break; 3714 break;
4142 case 6: /* relative/absolute origins */ 3715 case 6: /* relative/absolute origins */
… …
4148 /* case 8: - auto repeat, can't do on a per window basis */ 3721 /* case 8: - auto repeat, can't do on a per window basis */
4149 case 9: /* X10 mouse reporting */ 3722 case 9: /* X10 mouse reporting */
4150 if (state) /* orthogonal */ 3723 if (state) /* orthogonal */
4151 priv_modes &= ~PrivMode_MouseX11; 3724 priv_modes &= ~PrivMode_MouseX11;
4152 break; 3725 break;
4153#ifdef menuBar_esc
4154 case menuBar_esc:
4155#ifdef MENUBAR
4156 map_menuBar (state);
4157#endif
4158 break;
4159#endif
4160#ifdef scrollBar_esc 3726#ifdef scrollBar_esc
4161 case scrollBar_esc: 3727 case scrollBar_esc:
4162 if (scrollbar_mapping (state)) 3728 if (scrollbar_mapping (state))
4163 { 3729 {
4164 resize_all_windows (0, 0, 0); 3730 resize_all_windows (0, 0, 0);
… …
4183#if 0 3749#if 0
4184 case 1001: 3750 case 1001:
4185 break; /* X11 mouse highlighting */ 3751 break; /* X11 mouse highlighting */
4186#endif 3752#endif
4187 case 1010: /* scroll to bottom on TTY output inhibit */ 3753 case 1010: /* scroll to bottom on TTY output inhibit */
4188 if (!state) 3754 set_option (Opt_scrollTtyOutput, !state);
4189 SET_OPTION (Opt_scrollTtyOutput);
4190 else
4191 CLR_OPTION (Opt_scrollTtyOutput);
4192 break; 3755 break;
4193 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
4194 if (state) 3757 set_option (Opt_scrollTtyKeypress, state);
4195 SET_OPTION (Opt_scrollTtyKeypress);
4196 else
4197 CLR_OPTION (Opt_scrollTtyKeypress);
4198 break; 3758 break;
4199 case 1047: /* secondary screen w/ clearing last */ 3759 case 1047: /* secondary screen w/ clearing last */
4200 if (OPTION (Opt_secondaryScreen)) 3760 if (option (Opt_secondaryScreen))
4201 if (current_screen != PRIMARY) 3761 if (current_screen != PRIMARY)
4202 scr_erase_screen (2); 3762 scr_erase_screen (2);
4203 scr_change_screen (state); 3763 scr_change_screen (state);
4204 break; 3764 break;
4205 case 1049: /* secondary screen w/ clearing first */ 3765 case 1049: /* secondary screen w/ clearing first */
4206 scr_change_screen (state); 3766 scr_change_screen (state);
4207 if (OPTION (Opt_secondaryScreen)) 3767 if (option (Opt_secondaryScreen))
4208 if (current_screen != PRIMARY) 3768 if (current_screen != PRIMARY)
4209 scr_erase_screen (2); 3769 scr_erase_screen (2);
4210 break; 3770 break;
4211 default: 3771 default:
4212 break; 3772 break;
… …
4340 scr_color (Color_bg, Color_bg); 3900 scr_color (Color_bg, Color_bg);
4341 break; 3901 break;
4342 3902
4343 //case 50: // not variable spacing 3903 //case 50: // not variable spacing
4344 3904
4345#if ENABLE_FRILLS 3905#if !ENABLE_MINIMAL
4346 case 90: 3906 case 90:
4347 case 91: /* set bright fg color */ 3907 case 91: /* set bright fg color */
4348 case 92: 3908 case 92:
4349 case 93: 3909 case 93:
4350 case 94: 3910 case 94:
… …
4412const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3972const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4413 3973
4414void 3974void
4415rxvt_term::tt_write (const char *data, unsigned int len) 3975rxvt_term::tt_write (const char *data, unsigned int len)
4416{ 3976{
3977 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3978 return;
3979
3980 if (pty->pty < 0)
3981 return;
3982
4417 if (v_buflen == 0) 3983 if (v_buflen == 0)
4418 { 3984 {
4419 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3985 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4420 3986
4421 if ((unsigned int)written == len) 3987 if ((unsigned int)written == len)
4422 return; 3988 return;
4423 3989
4424 data += written; 3990 data += written;
… …
4433 pty_ev.set (EVENT_READ | EVENT_WRITE); 3999 pty_ev.set (EVENT_READ | EVENT_WRITE);
4434} 4000}
4435 4001
4436void rxvt_term::pty_write () 4002void rxvt_term::pty_write ()
4437{ 4003{
4438 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4004 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4439 4005
4440 if (written > 0) 4006 if (written > 0)
4441 { 4007 {
4442 v_buflen -= written; 4008 v_buflen -= written;
4443 4009

Diff Legend

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