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.210 by root, Tue Dec 20 20:58:31 2005 UTC vs.
Revision 1.294 by root, Mon Jan 30 20:12:37 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-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.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
57#include <csignal> 63#include <csignal>
58 64
59/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
60 66
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 68
66#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
67 70
68#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
135rxvt_term::iso14755_54 (int x, int y) 138rxvt_term::iso14755_54 (int x, int y)
136{ 139{
137 x = Pixel2Col (x); 140 x = Pixel2Col (x);
138 y = Pixel2Row (y); 141 y = Pixel2Row (y);
139 142
140 if (x < 0 || x >= ncol 143 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= nrow) 144 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 145 return;
143 146
144 for (;;) 147 for (;;)
145 { 148 {
146 const line_t &l = save[y + saveLines - view_start]; 149 const line_t &l = ROW(y + view_start);
147 150
148 text_t t = l.t[x]; 151 text_t t = l.t[x];
149 152
150 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
151 { 154 {
152 iso14755_51 (l.t[x], l.r[x]); 155 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 156 iso14755buf = ISO_14755_54;
154 break; 157 break;
155 } 158 }
156 159
157 x--; 160 x--;
158 } 161 }
159
160} 162}
161#endif
162 163
163#if ENABLE_OVERLAY
164void 164void
165rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 165rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
166{ 166{
167 rxvt_fontset *fs = FONTSET (r); 167 rxvt_fontset *fs = FONTSET (r);
168 rxvt_font *f = (*fs)[fs->find_font (ch)]; 168 rxvt_font *f = (*fs)[fs->find_font (ch)];
169 wchar_t *chr, *alloc, ch2, *fname; 169 wchar_t *chr, *alloc, ch2, *fname;
170 int len; 170 int len;
171 171
172 fname = rxvt_utf8towcs (f->name); 172 fname = rxvt_utf8towcs (f->name);
173 173
174#if ENABLE_COMBINING 174# if ENABLE_COMBINING
175 if (IS_COMPOSE (ch)) 175 if (IS_COMPOSE (ch))
176 { 176 {
177 len = rxvt_composite.expand (ch, 0); 177 len = rxvt_composite.expand (ch, 0);
178 alloc = chr = new wchar_t[len]; 178 alloc = chr = new wchar_t[len];
179 rxvt_composite.expand (ch, chr); 179 rxvt_composite.expand (ch, chr);
180 } 180 }
181 else 181 else
182#endif 182# endif
183 { 183 {
184 ch2 = ch; 184 ch2 = ch;
185 185
186 alloc = 0; 186 alloc = 0;
187 chr = &ch2; 187 chr = &ch2;
188 len = 1; 188 len = 1;
189 } 189 }
190 190
191 char attr[80]; // plenty
192
193 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
194 (int)r,
195 fgcolor_of (r), bgcolor_of (r),
196 r & RS_Bold ? " bold" : "",
197 r & RS_Italic ? " italic" : "",
198 r & RS_Blink ? " blink" : "",
199 r & RS_RVid ? " rvid" : "",
200 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : "");
202
191 int width = wcswidth (fname, wcslen (fname)); 203 int width = wcswidth (fname, wcslen (fname));
192 204
193 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 205 max_it (width, 8+5); // for char + hey
206 max_it (width, strlen (attr));
207
208 if (y >= 0)
209 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
211 x = 0;
212 }
213
214 scr_overlay_new (x, y, width, len + 2);
194 215
195 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 216 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
196 217
197 for (int y = 0; y < len; y++) 218 for (int y = 0; y < len; y++)
198 { 219 {
… …
201 ch = *chr++; 222 ch = *chr++;
202 223
203 sprintf (buf, "%8x", ch); 224 sprintf (buf, "%8x", ch);
204 scr_overlay_set (0, y, buf); 225 scr_overlay_set (0, y, buf);
205 scr_overlay_set (9, y, '='); 226 scr_overlay_set (9, y, '=');
206#if !UNICODE3 227# if !UNICODE3
207 if (ch >= 0x10000) 228 if (ch >= 0x10000)
208 ch = 0xfffd; 229 ch = 0xfffd;
209#endif 230# endif
210 scr_overlay_set (11, y, ch, r); 231 scr_overlay_set (11, y, ch, r);
232
233 if (WCWIDTH (ch) >= 2)
211 scr_overlay_set (12, y, NOCHAR, r); 234 scr_overlay_set (12, y, NOCHAR, r);
212 } 235 }
213 236
237// {
238// char buf[4+4+3+1];
239// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
240// scr_overlay_set (0, 0, buf);
241// }
242 scr_overlay_set (0, len , attr);
214 scr_overlay_set (0, len, fname); 243 scr_overlay_set (0, len + 1, fname);
215 244
216 free (fname); 245 free (fname);
217 246
218#if ENABLE_COMBINING 247# if ENABLE_COMBINING
219 if (alloc) 248 if (alloc)
220 delete [] alloc; 249 delete [] alloc;
221#endif 250# endif
222} 251}
223#endif 252#endif
224 253
225void 254void
226rxvt_term::commit_iso14755 () 255rxvt_term::commit_iso14755 ()
… …
243 mb[0] = ch[0]; 272 mb[0] = ch[0];
244 len = 1; 273 len = 1;
245 } 274 }
246 275
247 if (len > 0) 276 if (len > 0)
248 tt_write ((unsigned char *)mb, len); 277 tt_write (mb, len);
249 else 278 else
250 scr_bell (); 279 scr_bell ();
251 } 280 }
252 281
253 iso14755buf = 0; 282 iso14755buf = 0;
… …
277rxvt_term::lookup_key (XKeyEvent &ev) 306rxvt_term::lookup_key (XKeyEvent &ev)
278{ 307{
279 int ctrl, meta, shft, len; 308 int ctrl, meta, shft, len;
280 unsigned int newlen; 309 unsigned int newlen;
281 KeySym keysym; 310 KeySym keysym;
282#ifdef DEBUG_CMD
283 static int debug_key = 1; /* accessible by a debugger only */
284#endif
285 int valid_keysym; 311 int valid_keysym;
286 unsigned char kbuf[KBUFSZ]; 312 char kbuf[KBUFSZ];
287 313
288 /* 314 /*
289 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 315 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
290 * escape sequence to toggle the Keypad. 316 * escape sequence to toggle the Keypad.
291 * 317 *
… …
309 Status status_return; 335 Status status_return;
310 336
311#if 0 337#if 0
312#ifdef X_HAVE_UTF8_STRING 338#ifdef X_HAVE_UTF8_STRING
313 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 339 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
314 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 340 len = Xutf8LookupString (Input_Context, &ev, kbuf,
315 KBUFSZ, &keysym, &status_return); 341 KBUFSZ, &keysym, &status_return);
316 else 342 else
317#endif 343#endif
318#endif 344#endif
319 { 345 {
… …
356 || status_return == XLookupBoth; 382 || status_return == XLookupBoth;
357 } 383 }
358 else 384 else
359#endif 385#endif
360 { 386 {
361 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 387 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
362 valid_keysym = keysym != NoSymbol; 388 valid_keysym = keysym != NoSymbol;
363 } 389 }
364 390
365 if (valid_keysym) 391 if (valid_keysym)
366 { 392 {
… …
418 scr_move_to (0, 1); 444 scr_move_to (0, 1);
419 return; 445 return;
420 } 446 }
421 else if (keysym == XK_End) 447 else if (keysym == XK_End)
422 { 448 {
423 scr_move_to (1, 0); 449 scr_move_to (1, 1);
424 return; 450 return;
425 } 451 }
426 } 452 }
427#endif 453#endif
428 } 454 }
… …
439 { 465 {
440 switch (keysym) 466 switch (keysym)
441 { 467 {
442 /* normal XTerm key bindings */ 468 /* normal XTerm key bindings */
443 case XK_Insert: /* Shift+Insert = paste mouse selection */ 469 case XK_Insert: /* Shift+Insert = paste mouse selection */
444 selection_request (ev.time, 0, 0); 470 selection_request (ev.time);
445 return; 471 return;
446#if TODO 472#if TODO
447 /* rxvt extras */ 473 /* rxvt extras */
448 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 474 case XK_KP_Add: /* Shift+KP_Add = bigger font */
449 change_font (FONT_UP); 475 change_font (FONT_UP);
… …
830 { 856 {
831#ifdef META8_OPTION 857#ifdef META8_OPTION
832 /* set 8-bit on */ 858 /* set 8-bit on */
833 if (meta && (meta_char == 0x80)) 859 if (meta && (meta_char == 0x80))
834 { 860 {
835 unsigned char *ch; 861 char *ch;
836 862
837 for (ch = kbuf; ch < kbuf + len; ch++) 863 for (ch = kbuf; ch < kbuf + len; ch++)
838 *ch |= 0x80; 864 *ch |= 0x80;
839 865
840 meta = 0; 866 meta = 0;
… …
842#endif 868#endif
843 /* nil */ ; 869 /* nil */ ;
844 } 870 }
845 } 871 }
846 872
873 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
874 return;
875
847 if (len <= 0) 876 if (len <= 0)
848 return; /* not mapped */ 877 return; /* not mapped */
849 878
850 if (options & Opt_scrollTtyKeypress) 879 if (OPTION (Opt_scrollTtyKeypress))
851 if (view_start) 880 if (view_start)
852 { 881 {
853 view_start = 0; 882 view_start = 0;
854 want_refresh = 1; 883 want_refresh = 1;
855 } 884 }
… …
873#ifdef META8_OPTION 902#ifdef META8_OPTION
874 && meta_char == C0_ESC 903 && meta_char == C0_ESC
875#endif 904#endif
876 ) 905 )
877 { 906 {
878 const unsigned char ch = C0_ESC; 907 const char ch = C0_ESC;
879 tt_write (&ch, 1); 908 tt_write (&ch, 1);
880 } 909 }
881 910
882#if defined(DEBUG_CMD)
883 /* Display keyboard buffer contents */
884 unsigned char *p;
885 int i;
886
887 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
888 for (i = 0, p = kbuf; i < len; i++, p++)
889 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
890 fprintf (stderr, "'\n");
891#endif /* DEBUG_CMD */
892 tt_write (kbuf, (unsigned int)len); 911 tt_write (kbuf, (unsigned int)len);
893} 912}
894/*}}} */ 913/*}}} */
895 914
896#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 915#if defined (KEYSYM_RESOURCE)
897/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
898/* attempt to `write' count to the input buffer */
899unsigned int 916unsigned int
900rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 917rxvt_term::cmd_write (const char *str, unsigned int count)
901{ 918{
902 unsigned int n, s; 919 unsigned int n, s;
903 920
904 n = cmdbuf_ptr - cmdbuf_base; 921 n = cmdbuf_ptr - cmdbuf_base;
905 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 922 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
942 } 959 }
943#endif 960#endif
944 961
945 if (want_refresh) 962 if (want_refresh)
946 { 963 {
964 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
965 {
966 int row = view_start;
967 int end_row = row + nrow;
968
969 while (row > top_row && ROW (row - 1).is_longer ())
970 --row;
971
972 do
973 {
974 int start_row = row;
975 line_t *l;
976
977 do
978 {
979 l = &ROW (row++);
980
981 if (!(l->f & LINE_FILTERED))
982 {
983 // line not filtered, mark it as filtered
984 l->f |= LINE_FILTERED;
985 while (l->is_longer ())
986 {
987 l = &ROW (row++);
988 l->f |= LINE_FILTERED;
989 }
990
991 // and filter it
992 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
993
994 break;
995 }
996 }
997 while (l->is_longer () && row < end_row);
998 }
999 while (row < end_row);
1000 }
1001
947 scr_refresh (refresh_type); 1002 scr_refresh ();
948 scrollbar_show (1); 1003 scrollbar_show (1);
949#ifdef USE_XIM 1004#ifdef USE_XIM
950 IMSendSpot (); 1005 IMSendSpot ();
951#endif 1006#endif
952 } 1007 }
… …
955} 1010}
956 1011
957void 1012void
958rxvt_term::check_cb (check_watcher &w) 1013rxvt_term::check_cb (check_watcher &w)
959{ 1014{
960 SET_R (this); 1015 make_current ();
961 SET_LOCALE (locale);
962 1016
963 display->flush (); 1017 display->flush ();
964 1018
965 if (want_refresh && !flush_ev.active) 1019 if (want_refresh && !flush_ev.active)
966 flush_ev.start (NOW + 0.01); 1020 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
967} 1021}
968 1022
969void 1023void
970rxvt_term::flush_cb (time_watcher &w) 1024rxvt_term::flush_cb (time_watcher &w)
971{ 1025{
972 SET_R (this); 1026 make_current ();
973 SET_LOCALE (locale);
974 1027
975 refresh_limit = 1; 1028 refresh_limit = 1;
976 refresh_count = 0; 1029 refresh_count = 0;
977 flush (); 1030 flush ();
978} 1031}
… …
982rxvt_term::cursor_blink_cb (time_watcher &w) 1035rxvt_term::cursor_blink_cb (time_watcher &w)
983{ 1036{
984 hidden_cursor = !hidden_cursor; 1037 hidden_cursor = !hidden_cursor;
985 want_refresh = 1; 1038 want_refresh = 1;
986 1039
987 w.start (w.at + BLINK_INTERVAL); 1040 w.start (w.at + CURSOR_BLINK_INTERVAL);
988} 1041}
989#endif 1042#endif
990 1043
991#ifdef TEXT_BLINK 1044#ifdef TEXT_BLINK
992void 1045void
… …
1006rxvt_term::cont_scroll_cb (time_watcher &w) 1059rxvt_term::cont_scroll_cb (time_watcher &w)
1007{ 1060{
1008 if ((scrollbar_isUp() || scrollbar_isDn()) && 1061 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1009 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1062 scr_page (scrollbar_isUp() ? UP : DN, 1))
1010 { 1063 {
1011 refresh_type |= SMOOTH_REFRESH;
1012 want_refresh = 1; 1064 want_refresh = 1;
1013 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1014 } 1066 }
1015} 1067}
1016#endif 1068#endif
… …
1020rxvt_term::sel_scroll_cb (time_watcher &w) 1072rxvt_term::sel_scroll_cb (time_watcher &w)
1021{ 1073{
1022 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1074 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1023 { 1075 {
1024 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1076 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1025 refresh_type |= SMOOTH_REFRESH;
1026 want_refresh = 1; 1077 want_refresh = 1;
1027 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1078 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1028 } 1079 }
1029} 1080}
1030#endif 1081#endif
… …
1035{ 1086{
1036 if (mouse_slip_wheel_speed == 0 1087 if (mouse_slip_wheel_speed == 0
1037 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1088 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1038 : scr_page (UP, mouse_slip_wheel_speed)) 1089 : scr_page (UP, mouse_slip_wheel_speed))
1039 { 1090 {
1040 if (view_start == nsaved || 1091 if (view_start == top_row || view_start == 0)
1041 view_start == 0)
1042 mouse_slip_wheel_speed = 0; 1092 mouse_slip_wheel_speed = 0;
1043 1093
1044 refresh_type |= SMOOTH_REFRESH;
1045 want_refresh = 1; 1094 want_refresh = 1;
1046 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1047 } 1096 }
1048} 1097}
1049#endif 1098#endif
1050 1099
1100#if HAVE_SCHED_YIELD
1101static struct event_handler
1102{
1103 check_watcher cw_yield;
1104
1105 void yield (check_watcher &w)
1106 {
1107 sched_yield ();
1108 w.stop ();
1109 }
1110
1111 event_handler ()
1112 : cw_yield (this, &event_handler::yield)
1113 {
1114 }
1115} event_handler;
1116#endif
1117
1051bool 1118bool
1052rxvt_term::pty_fill () 1119rxvt_term::pty_fill ()
1053{ 1120{
1054 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1121 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1055 1122
1056 if (CBUFSIZ == n) 1123 if (CBUFSIZ == n)
1057 { 1124 {
1058 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1125 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1059 n = 0; 1126 n = 0;
1060 } 1127 }
1061 1128
1062 memmove (cmdbuf_base, cmdbuf_ptr, n); 1129 memmove (cmdbuf_base, cmdbuf_ptr, n);
1063 cmdbuf_ptr = cmdbuf_base; 1130 cmdbuf_ptr = cmdbuf_base;
1064 cmdbuf_endp = cmdbuf_ptr + n; 1131 cmdbuf_endp = cmdbuf_ptr + n;
1065 1132
1066 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1133 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1067 1134
1068 if (n > 0) 1135 if (r > 0)
1069 { 1136 {
1070 cmdbuf_endp += n; 1137 cmdbuf_endp += r;
1071 return true; 1138 return true;
1072 } 1139 }
1073 else if (n < 0 && errno != EAGAIN) 1140 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1141 {
1142#if HAVE_SCHED_YIELD
1143 if (display->is_local)
1144 event_handler.cw_yield.start ();
1145#endif
1146 }
1147 else
1148 {
1149 pty_ev.stop ();
1150
1151 if (!OPTION (Opt_hold))
1074 destroy (); 1152 destroy ();
1153 }
1075 1154
1076 return false; 1155 return false;
1077} 1156}
1078 1157
1079void 1158void
1080rxvt_term::pty_cb (io_watcher &w, short revents) 1159rxvt_term::pty_cb (io_watcher &w, short revents)
1081{ 1160{
1082 SET_R (this); 1161 make_current ();
1083 SET_LOCALE (locale);
1084 1162
1085 if (revents & EVENT_READ) 1163 if (revents & EVENT_READ)
1086 // loop, but don't allow a single term to monopolize us 1164 // loop, but don't allow a single term to monopolize us
1087 while (pty_fill ()) 1165 while (pty_fill ())
1088 if (cmd_parse ()) 1166 if (cmd_parse ())
… …
1093} 1171}
1094 1172
1095void 1173void
1096rxvt_term::pointer_unblank () 1174rxvt_term::pointer_unblank ()
1097{ 1175{
1098 XDefineCursor (display->display, vt, TermWin_cursor); 1176 XDefineCursor (xdisp, vt, TermWin_cursor);
1099 recolour_cursor (); 1177 recolour_cursor ();
1100 1178
1101#ifdef POINTER_BLANK 1179#ifdef POINTER_BLANK
1102 hidden_pointer = 0; 1180 hidden_pointer = 0;
1103 1181
1104 if (options & Opt_pointerBlank) 1182 if (OPTION (Opt_pointerBlank))
1105 pointer_ev.start (NOW + pointerBlankDelay); 1183 pointer_ev.start (NOW + pointerBlankDelay);
1106#endif 1184#endif
1107} 1185}
1108 1186
1109#ifdef POINTER_BLANK 1187#ifdef POINTER_BLANK
1110void 1188void
1111rxvt_term::pointer_blank () 1189rxvt_term::pointer_blank ()
1112{ 1190{
1113 if (! (options & Opt_pointerBlank)) 1191 if (!OPTION (Opt_pointerBlank))
1114 return; 1192 return;
1115 1193
1116 XDefineCursor (display->display, vt, display->blank_cursor); 1194 XDefineCursor (xdisp, vt, display->blank_cursor);
1117 XFlush (display->display); 1195 XFlush (xdisp);
1118 1196
1119 hidden_pointer = 1; 1197 hidden_pointer = 1;
1120} 1198}
1121 1199
1122void 1200void
1123rxvt_term::pointer_cb (time_watcher &w) 1201rxvt_term::pointer_cb (time_watcher &w)
1124{ 1202{
1125 SET_R (this); 1203 make_current ();
1126 SET_LOCALE (locale);
1127 1204
1128 pointer_blank (); 1205 pointer_blank ();
1129} 1206}
1130#endif 1207#endif
1131 1208
… …
1196 (32 + button_number + key_state), 1273 (32 + button_number + key_state),
1197 (32 + x + 1), 1274 (32 + x + 1),
1198 (32 + y + 1)); 1275 (32 + y + 1));
1199} 1276}
1200 1277
1201#ifdef USING_W11LIB
1202void
1203rxvt_W11_process_x_event (XEvent *ev)
1204{
1205 rxvt_t *r = rxvt_get_r ();
1206
1207 x_cb (*ev);
1208}
1209#endif
1210
1211/*{{{ process an X event */ 1278/*{{{ process an X event */
1212void 1279void
1213rxvt_term::x_cb (XEvent &ev) 1280rxvt_term::x_cb (XEvent &ev)
1214{ 1281{
1215 dDisp; 1282 make_current ();
1216 1283
1217 SET_R (this); 1284 dLocal (Display *, xdisp);
1218 SET_LOCALE (locale);
1219 1285
1220#if defined(CURSOR_BLINK) 1286 if (ev.xany.window == vt
1221 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1287 && SHOULD_INVOKE (HOOK_X_EVENT)
1222 { 1288 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1223 if (hidden_cursor) 1289 return;
1224 {
1225 hidden_cursor = 0;
1226 want_refresh = 1;
1227 }
1228 1290
1229 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1291 // for XQueryPointer
1230 }
1231#endif
1232
1233#if defined(POINTER_BLANK)
1234 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1235 {
1236 if (ev.type == MotionNotify
1237 || ev.type == ButtonPress
1238 || ev.type == ButtonRelease)
1239 if (hidden_pointer)
1240 pointer_unblank ();
1241
1242 if (ev.type == KeyPress && hidden_pointer == 0)
1243 pointer_blank ();
1244 }
1245#endif
1246
1247 Window unused_root, unused_child; 1292 Window unused_root, unused_child;
1248 int unused_root_x, unused_root_y; 1293 int unused_root_x, unused_root_y;
1249 unsigned int unused_mask; 1294 unsigned int unused_mask;
1250 1295
1251 switch (ev.type) 1296 switch (ev.type)
… …
1258 1303
1259 break; 1304 break;
1260 1305
1261 case KeyRelease: 1306 case KeyRelease:
1262 { 1307 {
1263#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1308#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1264 KeySym ks; 1309 KeySym keysym;
1265 1310
1266 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1311 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1267#endif 1312#endif
1268 1313
1269#if ENABLE_FRILLS || ISO_14755 1314#if ENABLE_FRILLS || ISO_14755
1270 // ISO 14755 support 1315 // ISO 14755 support
1271 if (iso14755buf) 1316 if (iso14755buf)
… …
1276# endif 1321# endif
1277# if ISO_14755 1322# if ISO_14755
1278 // iso14755 part 5.2 handling: release time 1323 // iso14755 part 5.2 handling: release time
1279 // first: controls 1324 // first: controls
1280 if ((ev.xkey.state & ControlMask) 1325 if ((ev.xkey.state & ControlMask)
1281 && ((ks >= 0x40 && ks <= 0x5f) 1326 && ((keysym >= 0x40 && keysym <= 0x5f)
1282 || (ks >= 0x61 && ks <= 0x7f))) 1327 || (keysym >= 0x61 && keysym <= 0x7f)))
1283 { 1328 {
1284 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1329 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1285 commit_iso14755 (); 1330 commit_iso14755 ();
1286 return; // case-break; 1331 goto skip_switch;
1287 } 1332 }
1288 1333
1289 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1334 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1290 if (i[0] == ks) 1335 if (i[0] == keysym)
1291 { 1336 {
1292 iso14755buf = ISO_14755_51 | i[1]; 1337 iso14755buf = ISO_14755_51 | i[1];
1293 commit_iso14755 (); 1338 commit_iso14755 ();
1294 return; // case-break; 1339 goto skip_switch;
1295 } 1340 }
1296 1341
1297 scr_bell (); 1342 scr_bell ();
1298# endif 1343# endif
1299 iso14755buf = 0; 1344 iso14755buf = 0;
… …
1318 else 1363 else
1319 iso14755buf = 0; 1364 iso14755buf = 0;
1320 } 1365 }
1321#endif 1366#endif
1322 1367
1368 if (ev.xany.window == vt
1369 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1370 break;
1371
1323#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1372#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1324 if (!(ev.xkey.state & ControlMask)) 1373 if (!(ev.xkey.state & ControlMask))
1325 slip_wheel_ev.stop (); 1374 slip_wheel_ev.stop ();
1326 else if (ks == XK_Control_L || ks == XK_Control_R) 1375 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1327 mouse_slip_wheel_speed = 0; 1376 mouse_slip_wheel_speed = 0;
1328#endif 1377#endif
1329 break; 1378 break;
1330 } 1379 }
1331 1380
… …
1337 button_release (ev.xbutton); 1386 button_release (ev.xbutton);
1338 break; 1387 break;
1339 1388
1340 case ClientMessage: 1389 case ClientMessage:
1341 if (ev.xclient.format == 32 1390 if (ev.xclient.format == 32
1342 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1391 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1343 { 1392 {
1393 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1394 {
1395 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1396 {
1344 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1397 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1398 {
1399 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1345 destroy (); 1400 destroy ();
1401 }
1346#if ENABLE_EWMH 1402#if ENABLE_EWMH
1347 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1403 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1348 XSendEvent (disp, ev.xclient.window = display->root, 1404 XSendEvent (xdisp, ev.xclient.window = display->root,
1349 False, SubstructureRedirectMask | SubstructureNotifyMask, 1405 False, SubstructureRedirectMask | SubstructureNotifyMask,
1350 &ev); 1406 &ev);
1407#endif
1408 }
1409 }
1410#if ENABLE_XEMBED
1411 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1412 {
1413 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1414 focus_in ();
1415 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1416 focus_out ();
1417 }
1351#endif 1418#endif
1352 } 1419 }
1353#if ENABLE_XEMBED
1354 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1355 {
1356 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1357 focus_in ();
1358 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1359 focus_out ();
1360 }
1361#endif
1362#ifdef OFFIX_DND
1363 /* OffiX Dnd (drag 'n' drop) protocol */
1364 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1365 && (ev.xclient.data.l[0] == DndFile
1366 || ev.xclient.data.l[0] == DndDir
1367 || ev.xclient.data.l[0] == DndLink))
1368 {
1369 /* Get Dnd data */
1370 Atom ActualType;
1371 int ActualFormat;
1372 unsigned char *data;
1373 unsigned long Size, RemainingBytes;
1374
1375 XGetWindowProperty (disp, display->root,
1376 xa[XA_DNDSELECTION],
1377 0L, 1000000L,
1378 False, AnyPropertyType,
1379 &ActualType, &ActualFormat,
1380 &Size, &RemainingBytes,
1381 &data);
1382 set_string_property (XA_CUT_BUFFER0, data);
1383 XFree (data);
1384 selection_paste (display->root, XA_CUT_BUFFER0, true);
1385 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1386 }
1387#endif /* OFFIX_DND */
1388 break; 1420 break;
1389 1421
1390 case MappingNotify: 1422 case MappingNotify:
1391 XRefreshKeyboardMapping (&ev.xmapping); 1423 XRefreshKeyboardMapping (&ev.xmapping);
1392 break; 1424 break;
… …
1425 break; 1457 break;
1426 1458
1427 case ConfigureNotify: 1459 case ConfigureNotify:
1428 if (ev.xconfigure.window == parent[0]) 1460 if (ev.xconfigure.window == parent[0])
1429 { 1461 {
1430 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1462 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ; 1463 ;
1432 1464
1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1465 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1434 { 1466 {
1435 seen_resize = 1; 1467 seen_resize = 1;
1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1468 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1437 } 1469 }
1438 1470
1471 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1472
1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1440 if (options & Opt_transparent) 1474 if (OPTION (Opt_transparent))
1441 check_our_parents (); 1475 check_our_parents ();
1442#endif 1476#endif
1443 } 1477 }
1444 break; 1478 break;
1445 1479
1446 case PropertyNotify: 1480 case PropertyNotify:
1481 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1447 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1482 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1448 && ev.xproperty.state == PropertyNewValue) 1483 && ev.xproperty.state == PropertyNewValue)
1449 selection_property (ev.xproperty.window, ev.xproperty.atom); 1484 selection_property (ev.xproperty.window, ev.xproperty.atom);
1450 1485
1451 break; 1486 break;
1452 1487
1453 case SelectionClear: 1488 case SelectionClear:
1454 selection_clear (); 1489 selection_clear ();
… …
1459 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1494 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1460 break; 1495 break;
1461 1496
1462 case SelectionRequest: 1497 case SelectionRequest:
1463 selection_send (ev.xselectionrequest); 1498 selection_send (ev.xselectionrequest);
1499 break;
1500
1501 case MapNotify:
1502 mapped = 1;
1503#ifdef TEXT_BLINK
1504 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1505#endif
1506 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 break; 1507 break;
1465 1508
1466 case UnmapNotify: 1509 case UnmapNotify:
1467 mapped = 0; 1510 mapped = 0;
1468#ifdef TEXT_BLINK 1511#ifdef TEXT_BLINK
1469 text_blink_ev.stop (); 1512 text_blink_ev.stop ();
1470#endif 1513#endif
1471 break; 1514 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1472
1473 case MapNotify:
1474 mapped = 1;
1475#ifdef TEXT_BLINK
1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1477#endif
1478 break; 1515 break;
1479 1516
1480#ifdef TRANSPARENT 1517#ifdef TRANSPARENT
1481 case ReparentNotify: 1518 case ReparentNotify:
1482 rootwin_cb (ev); 1519 rootwin_cb (ev);
… …
1488 if (ev.xany.window == vt) 1525 if (ev.xany.window == vt)
1489 { 1526 {
1490 do 1527 do
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1493 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1530 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1494 1531
1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1532 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1496 1533
1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1534 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1498 scr_expose (ev.xexpose.x, ev.xexpose.y, 1535 scr_expose (ev.xexpose.x, ev.xexpose.y,
1499 ev.xexpose.width, ev.xexpose.height, False); 1536 ev.xexpose.width, ev.xexpose.height, False);
1500 1537
1501 scr_refresh (refresh_type); 1538 want_refresh = 1;
1502 } 1539 }
1503 else 1540 else
1504 { 1541 {
1505 XEvent unused_event; 1542 XEvent unused_event;
1506 1543
1507 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1544 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1508 ; 1545 ;
1509 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1546 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1510 ; 1547 ;
1511 1548
1512 if (isScrollbarWindow (ev.xany.window)) 1549 if (isScrollbarWindow (ev.xany.window))
1513 { 1550 {
1514 scrollBar.setIdle (); 1551 scrollBar.setIdle ();
1515 scrollbar_show (0); 1552 scrollbar_show (0);
1516 } 1553 }
1517#ifdef MENUBAR
1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1519 menubar_expose ();
1520#endif
1521 1554
1522#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1523 if (am_transparent && ev.xany.window == parent[0]) 1556 if (am_transparent && ev.xany.window == parent[0])
1524 XClearWindow (disp, ev.xany.window); 1557 XClearWindow (xdisp, ev.xany.window);
1525#endif 1558#endif
1526 } 1559 }
1527 break; 1560 break;
1528 1561
1529 case MotionNotify: 1562 case MotionNotify:
1530#ifdef POINTER_BLANK 1563#ifdef POINTER_BLANK
1531 if (hidden_pointer) 1564 if (hidden_pointer)
1532 pointer_unblank (); 1565 pointer_unblank ();
1533#endif 1566#endif
1534#if MENUBAR
1535 if (isMenuBarWindow (ev.xany.window))
1536 {
1537 menubar_control (ev.xbutton);
1538 break;
1539 }
1540#endif
1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1542 break; 1568 break;
1543 1569
1544 if (ev.xany.window == vt) 1570 if (ev.xany.window == vt)
1545 { 1571 {
1572 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1573 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1574 ; // nop
1546 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1575 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1547 { 1576 {
1548 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1577 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1549 ; 1578 ;
1550 1579
1551 XQueryPointer (disp, vt, 1580 XQueryPointer (xdisp, vt,
1552 &unused_root, &unused_child, 1581 &unused_root, &unused_child,
1553 &unused_root_x, &unused_root_y, 1582 &unused_root_x, &unused_root_y,
1554 &ev.xbutton.x, &ev.xbutton.y, 1583 &ev.xbutton.x, &ev.xbutton.y,
1555 &ev.xbutton.state); 1584 &ev.xbutton.state);
1556#ifdef MOUSE_THRESHOLD 1585#ifdef MOUSE_THRESHOLD
… …
1601 } 1630 }
1602 1631
1603 scroll_selection_lines = Pixel2Height (dist) 1632 scroll_selection_lines = Pixel2Height (dist)
1604 / SELECTION_SCROLL_LINE_SPEEDUP 1633 / SELECTION_SCROLL_LINE_SPEEDUP
1605 + 1; 1634 + 1;
1606 MIN_IT (scroll_selection_lines, 1635 min_it (scroll_selection_lines,
1607 SELECTION_SCROLL_MAX_LINES); 1636 SELECTION_SCROLL_MAX_LINES);
1608 } 1637 }
1609 else 1638 else
1610 { 1639 {
1611 /* we are within the text window, so we 1640 /* we are within the text window, so we
… …
1620#endif 1649#endif
1621 } 1650 }
1622 } 1651 }
1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1652 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1624 { 1653 {
1625 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1654 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1626 MotionNotify, &ev)) 1655 MotionNotify, &ev))
1627 ; 1656 ;
1628 1657
1629 XQueryPointer (disp, scrollBar.win, 1658 XQueryPointer (xdisp, scrollBar.win,
1630 &unused_root, &unused_child, 1659 &unused_root, &unused_child,
1631 &unused_root_x, &unused_root_y, 1660 &unused_root_x, &unused_root_y,
1632 &ev.xbutton.x, &ev.xbutton.y, 1661 &ev.xbutton.x, &ev.xbutton.y,
1633 &unused_mask); 1662 &unused_mask);
1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1663 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1635 scrollbar_size ()); 1664 scrollbar_size ());
1636 scr_refresh (refresh_type); 1665 want_refresh = 1;
1637 refresh_limit = 0; 1666 refresh_limit = 0;
1638 scrollbar_show (1); 1667 scrollbar_show (1);
1639 } 1668 }
1640 break; 1669 break;
1641 } 1670 }
1671
1672skip_switch: ;
1673
1674#if defined(CURSOR_BLINK)
1675 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1676 {
1677 if (hidden_cursor)
1678 {
1679 hidden_cursor = 0;
1680 want_refresh = 1;
1681 }
1682
1683 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1684 }
1685#endif
1686
1687#if defined(POINTER_BLANK)
1688 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1689 {
1690 if (ev.type == MotionNotify
1691 || ev.type == ButtonPress
1692 || ev.type == ButtonRelease)
1693 if (hidden_pointer)
1694 pointer_unblank ();
1695
1696 if (ev.type == KeyPress && hidden_pointer == 0)
1697 pointer_blank ();
1698 }
1699#endif
1642} 1700}
1643 1701
1644void 1702void
1645rxvt_term::focus_in () 1703rxvt_term::focus_in ()
1646{ 1704{
1647 if (!focus) 1705 if (!focus)
1648 { 1706 {
1649 focus = 1; 1707 focus = 1;
1650 want_refresh = 1; 1708 want_refresh = 1;
1709
1710 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1711
1651#if USE_XIM 1712#if USE_XIM
1652 if (Input_Context != NULL) 1713 if (Input_Context != NULL)
1653 { 1714 {
1654 IMSetStatusPosition (); 1715 IMSetStatusPosition ();
1655 XSetICFocus (Input_Context); 1716 XSetICFocus (Input_Context);
1656 } 1717 }
1657#endif 1718#endif
1658#if CURSOR_BLINK 1719#if CURSOR_BLINK
1659 if (options & Opt_cursorBlink) 1720 if (OPTION (Opt_cursorBlink))
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1721 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1661#endif 1722#endif
1662#if OFF_FOCUS_FADING 1723#if OFF_FOCUS_FADING
1663 if (rs[Rs_fade]) 1724 if (rs[Rs_fade])
1664 { 1725 {
1665 pix_colors = pix_colors_focused; 1726 pix_colors = pix_colors_focused;
… …
1675 if (focus) 1736 if (focus)
1676 { 1737 {
1677 focus = 0; 1738 focus = 0;
1678 want_refresh = 1; 1739 want_refresh = 1;
1679 1740
1741 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1742
1680#if ENABLE_FRILLS || ISO_14755 1743#if ENABLE_FRILLS || ISO_14755
1744 if (iso14755buf)
1745 {
1681 iso14755buf = 0; 1746 iso14755buf = 0;
1682#endif
1683#if ENABLE_OVERLAY 1747# if ENABLE_OVERLAY
1684 scr_overlay_off (); 1748 scr_overlay_off ();
1749# endif
1750 }
1685#endif 1751#endif
1686#if USE_XIM 1752#if USE_XIM
1687 if (Input_Context != NULL) 1753 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context); 1754 XUnsetICFocus (Input_Context);
1689#endif 1755#endif
1690#if CURSOR_BLINK 1756#if CURSOR_BLINK
1691 if (options & Opt_cursorBlink) 1757 if (OPTION (Opt_cursorBlink))
1692 cursor_blink_ev.stop (); 1758 cursor_blink_ev.stop ();
1693 hidden_cursor = 0; 1759 hidden_cursor = 0;
1694#endif 1760#endif
1695#if OFF_FOCUS_FADING 1761#if OFF_FOCUS_FADING
1696 if (rs[Rs_fade]) 1762 if (rs[Rs_fade])
… …
1704 1770
1705#if TRANSPARENT 1771#if TRANSPARENT
1706void 1772void
1707rxvt_term::rootwin_cb (XEvent &ev) 1773rxvt_term::rootwin_cb (XEvent &ev)
1708{ 1774{
1709 SET_R (this); 1775 make_current ();
1710 SET_LOCALE (locale);
1711 1776
1712 switch (ev.type) 1777 switch (ev.type)
1713 { 1778 {
1714 case PropertyNotify: 1779 case PropertyNotify:
1715 /* 1780 /*
… …
1720 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1785 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1721 return; 1786 return;
1722 1787
1723 /* FALLTHROUGH */ 1788 /* FALLTHROUGH */
1724 case ReparentNotify: 1789 case ReparentNotify:
1725 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1790 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1726 want_refresh = want_full_refresh = 1; 1791 want_refresh = want_full_refresh = 1;
1727 break; 1792 break;
1728 } 1793 }
1729} 1794}
1730#endif 1795#endif
… …
1733rxvt_term::button_press (XButtonEvent &ev) 1798rxvt_term::button_press (XButtonEvent &ev)
1734{ 1799{
1735 int reportmode = 0, clickintime; 1800 int reportmode = 0, clickintime;
1736 1801
1737 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1802 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1803
1738 if (!bypass_keystate) 1804 if (!bypass_keystate)
1739 reportmode = !! (priv_modes & PrivMode_mouse_report); 1805 reportmode = !! (priv_modes & PrivMode_mouse_report);
1740 1806
1741 /* 1807 /*
1742 * VT window processing of button press 1808 * VT window processing of button press
1743 */ 1809 */
1744 if (ev.window == vt) 1810 if (ev.window == vt)
1745 { 1811 {
1812 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1813 return;
1814
1746#if ISO_14755 1815#if ISO_14755
1747 // 5.4 1816 // 5.4
1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1749 { 1818 {
1750 iso14755_54 (ev.x, ev.y); 1819 iso14755_54 (ev.x, ev.y);
… …
1762#ifdef MOUSE_REPORT_DOUBLECLICK 1831#ifdef MOUSE_REPORT_DOUBLECLICK
1763 if (ev.button == MEvent.button && clickintime) 1832 if (ev.button == MEvent.button && clickintime)
1764 { 1833 {
1765 /* same button, within alloted time */ 1834 /* same button, within alloted time */
1766 MEvent.clicks++; 1835 MEvent.clicks++;
1836
1767 if (MEvent.clicks > 1) 1837 if (MEvent.clicks > 1)
1768 { 1838 {
1769 /* only report double clicks */ 1839 /* only report double clicks */
1770 MEvent.clicks = 2; 1840 MEvent.clicks = 2;
1771 mouse_report (ev); 1841 mouse_report (ev);
… …
1803#else 1873#else
1804 selection.rect = false; 1874 selection.rect = false;
1805#endif 1875#endif
1806 1876
1807 /* allow shift+left click to extend selection */ 1877 /* allow shift+left click to extend selection */
1808 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1878 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1809 { 1879 {
1810 if (MEvent.button == Button1 && clickintime) 1880 if (MEvent.button == Button1 && clickintime)
1811 selection_rotate (ev.x, ev.y); 1881 selection_rotate (ev.x, ev.y);
1812 else 1882 else
1813 selection_extend (ev.x, ev.y, 1); 1883 selection_extend (ev.x, ev.y, 1);
… …
1978 } 2048 }
1979 2049
1980 break; 2050 break;
1981 } 2051 }
1982 } 2052 }
2053
1983 return; 2054 return;
1984 } 2055 }
1985#if MENUBAR
1986 /*
1987 * Menubar window processing of button press
1988 */
1989 if (isMenuBarWindow (ev.window))
1990 menubar_control (ev);
1991#endif
1992} 2056}
1993 2057
1994void 2058void
1995rxvt_term::button_release (XButtonEvent &ev) 2059rxvt_term::button_release (XButtonEvent &ev)
1996{ 2060{
… …
2002 2066
2003 if (scrollbar_isUpDn ()) 2067 if (scrollbar_isUpDn ())
2004 { 2068 {
2005 scrollBar.setIdle (); 2069 scrollBar.setIdle ();
2006 scrollbar_show (0); 2070 scrollbar_show (0);
2007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2008 refresh_type &= ~SMOOTH_REFRESH;
2009#endif
2010 } 2071 }
2011 2072
2012#ifdef SELECTION_SCROLLING 2073#ifdef SELECTION_SCROLLING
2013 if (sel_scroll_ev.active) 2074 if (sel_scroll_ev.active)
2014 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2015#endif 2076#endif
2016 2077
2017 if (ev.window == vt) 2078 if (ev.window == vt)
2018 { 2079 {
2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2081 return;
2082
2019#if ISO_14755 2083#if ISO_14755
2020 // 5.4 2084 // 5.4
2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2022 return; 2086 return;
2023#endif 2087#endif
2088
2024 if (reportmode) 2089 if (reportmode)
2025 { 2090 {
2026 /* mouse report from vt window */ 2091 /* mouse report from vt window */
2027 /* don't report release of wheel "buttons" */ 2092 /* don't report release of wheel "buttons" */
2028 if (ev.button >= 4) 2093 if (ev.button >= 4)
… …
2058 { 2123 {
2059 case Button1: 2124 case Button1:
2060 case Button3: 2125 case Button3:
2061 selection_make (ev.time); 2126 selection_make (ev.time);
2062 break; 2127 break;
2128
2063 case Button2: 2129 case Button2:
2064 selection_request (ev.time, ev.x, ev.y); 2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2065 break; 2132 break;
2133
2066#ifdef MOUSE_WHEEL 2134#ifdef MOUSE_WHEEL
2067 case Button4: 2135 case Button4:
2068 case Button5: 2136 case Button5:
2069 { 2137 {
2070 int i; 2138 int i;
… …
2072 2140
2073 v = ev.button == Button4 ? UP : DN; 2141 v = ev.button == Button4 ? UP : DN;
2074 2142
2075 if (ev.state & ShiftMask) 2143 if (ev.state & ShiftMask)
2076 i = 1; 2144 i = 1;
2077 else if (options & Opt_mouseWheelScrollPage) 2145 else if (OPTION (Opt_mouseWheelScrollPage))
2078 i = nrow - 1; 2146 i = nrow - 1;
2079 else 2147 else
2080 i = 5; 2148 i = 5;
2081 2149
2082# ifdef MOUSE_SLIP_WHEELING 2150# ifdef MOUSE_SLIP_WHEELING
… …
2092 slip_wheel_ev.start (); 2160 slip_wheel_ev.start ();
2093 } 2161 }
2094 else 2162 else
2095 { 2163 {
2096# endif 2164# endif
2097# ifdef JUMP_MOUSE_WHEEL
2098 scr_page (v, i); 2165 scr_page (v, i);
2099 scr_refresh (SMOOTH_REFRESH);
2100 scrollbar_show (1); 2166 scrollbar_show (1);
2101# else
2102 while (i--)
2103 {
2104 scr_page (v, 1);
2105 scr_refresh (SMOOTH_REFRESH);
2106 scrollbar_show (1);
2107 }
2108# endif
2109# ifdef MOUSE_SLIP_WHEELING 2167# ifdef MOUSE_SLIP_WHEELING
2110 } 2168 }
2111#endif 2169# endif
2112 } 2170 }
2113 break; 2171 break;
2114#endif 2172#endif
2115 } 2173 }
2116 } 2174 }
2117#ifdef MENUBAR
2118 else if (isMenuBarWindow (ev.window))
2119 menubar_control (ev);
2120#endif
2121} 2175}
2122 2176
2123#ifdef TRANSPARENT 2177#ifdef TRANSPARENT
2124#if TINTING 2178#if TINTING
2125/* taken from aterm-0.4.2 */ 2179/* taken from aterm-0.4.2 */
2126 2180
2127typedef uint32_t RUINT32T; 2181typedef uint32_t RUINT32T;
2128 2182
2129void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2183void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2130{ 2184{
2131 int sh_r, sh_g, sh_b; 2185 int sh_r, sh_g, sh_b;
2132 RUINT32T mask_r, mask_g, mask_b; 2186 RUINT32T mask_r, mask_g, mask_b;
2133 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2187 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2134 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2188 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2135 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2189 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2136 int i; 2190 int i;
2137 2191
2138 Visual *visual = display->visual; 2192 Visual *visual = term->visual;
2139 2193
2140 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2194 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2141 2195
2142 /* for convenience */ 2196 /* for convenience */
2143 mask_r = visual->red_mask; 2197 mask_r = visual->red_mask;
… …
2364 Atom atype; 2418 Atom atype;
2365 unsigned char *prop = NULL; 2419 unsigned char *prop = NULL;
2366 Window root, oldp, *list; 2420 Window root, oldp, *list;
2367 Pixmap rootpixmap = None; 2421 Pixmap rootpixmap = None;
2368 XWindowAttributes wattr, wrootattr; 2422 XWindowAttributes wattr, wrootattr;
2369 dDisp;
2370 2423
2371 pchanged = 0; 2424 pchanged = 0;
2372 2425
2373 if (!(options & Opt_transparent)) 2426 if (!OPTION (Opt_transparent))
2374 return pchanged; /* Don't try any more */ 2427 return pchanged; /* Don't try any more */
2375 2428
2376 XGetWindowAttributes (disp, display->root, &wrootattr); 2429 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2377 rootdepth = wrootattr.depth; 2430 rootdepth = wrootattr.depth;
2378 2431
2379 XGetWindowAttributes (disp, parent[0], &wattr); 2432 XGetWindowAttributes (xdisp, parent[0], &wattr);
2380 2433
2381 if (rootdepth != wattr.depth) 2434 if (rootdepth != wattr.depth)
2382 { 2435 {
2383 if (am_transparent) 2436 if (am_transparent)
2384 { 2437 {
2385 pchanged = 1; 2438 pchanged = 1;
2386 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2439 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2387 am_transparent = am_pixmap_trans = 0; 2440 am_transparent = am_pixmap_trans = 0;
2388 } 2441 }
2389 2442
2390 return pchanged; /* Don't try any more */ 2443 return pchanged; /* Don't try any more */
2391 } 2444 }
2392 2445
2393 /* Get all X ops out of the queue so that our information is up-to-date. */ 2446 /* Get all X ops out of the queue so that our information is up-to-date. */
2394 XSync (disp, False); 2447 XSync (xdisp, False);
2395 2448
2396 /* 2449 /*
2397 * Make the frame window set by the window manager have 2450 * Make the frame window set by the window manager have
2398 * the root background. Some window managers put multiple nested frame 2451 * the root background. Some window managers put multiple nested frame
2399 * windows for each client, so we have to take care about that. 2452 * windows for each client, so we have to take care about that.
2400 */ 2453 */
2401 i = (xa[XA_XROOTPMAP_ID] 2454 i = (xa[XA_XROOTPMAP_ID]
2402 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2455 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2403 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2404 &nitems, &bytes_after, &prop) == Success); 2457 &nitems, &bytes_after, &prop) == Success);
2405 2458
2406 if (!i || prop == NULL) 2459 if (!i || prop == NULL)
2407 i = (xa[XA_ESETROOT_PMAP_ID] 2460 i = (xa[XA_ESETROOT_PMAP_ID]
2408 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2461 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2409 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2410 &nitems, &bytes_after, &prop) == Success); 2463 &nitems, &bytes_after, &prop) == Success);
2411 2464
2412 if (!i || prop == NULL 2465 if (!i || prop == NULL
2413#if TINTING 2466#if TINTING
… …
2432 Window cr; 2485 Window cr;
2433 XImage *image; 2486 XImage *image;
2434 GC gc; 2487 GC gc;
2435 XGCValues gcvalue; 2488 XGCValues gcvalue;
2436 2489
2437 XTranslateCoordinates (disp, parent[0], display->root, 2490 XTranslateCoordinates (xdisp, parent[0], display->root,
2438 0, 0, &sx, &sy, &cr); 2491 0, 0, &sx, &sy, &cr);
2439 nw = (unsigned int)szHint.width; 2492 nw = (unsigned int)szHint.width;
2440 nh = (unsigned int)szHint.height; 2493 nh = (unsigned int)szHint.height;
2441 nx = ny = 0; 2494 nx = ny = 0;
2442 2495
… …
2452 nh += sy; 2505 nh += sy;
2453 ny = -sy; 2506 ny = -sy;
2454 sy = 0; 2507 sy = 0;
2455 } 2508 }
2456 2509
2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2510 min_it (nw, (unsigned int) (wrootattr.width - sx));
2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2511 min_it (nh, (unsigned int) (wrootattr.height - sy));
2459 2512
2460 XSync (disp, False); 2513 XSync (xdisp, False);
2461 allowedxerror = -1; 2514 allowedxerror = -1;
2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2515 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2463 2516
2464 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2517 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2465 /* XXX: may need a delay here? */ 2518 /* XXX: may need a delay here? */
2466 allowedxerror = 0; 2519 allowedxerror = 0;
2467 2520
… …
2470 if (am_transparent && am_pixmap_trans) 2523 if (am_transparent && am_pixmap_trans)
2471 { 2524 {
2472 pchanged = 1; 2525 pchanged = 1;
2473 if (pixmap != None) 2526 if (pixmap != None)
2474 { 2527 {
2475 XFreePixmap (disp, pixmap); 2528 XFreePixmap (xdisp, pixmap);
2476 pixmap = None; 2529 pixmap = None;
2477 } 2530 }
2478 } 2531 }
2479 2532
2480 am_pixmap_trans = 0; 2533 am_pixmap_trans = 0;
2481 } 2534 }
2482 else 2535 else
2483 { 2536 {
2484 if (pixmap != None) 2537 if (pixmap != None)
2485 XFreePixmap (disp, pixmap); 2538 XFreePixmap (xdisp, pixmap);
2486 2539
2487#if TINTING 2540#if TINTING
2488 if (ISSET_PIXCOLOR (Color_tint)) 2541 if (ISSET_PIXCOLOR (Color_tint))
2489 { 2542 {
2490 unsigned short rm, gm, bm; 2543 rxvt_rgba c;
2491 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2544 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2492 2545
2493 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2546 pix_colors_focused[Color_tint].get (this, c);
2494 2547
2495 ShadeXImage (display, image, shade, rm, gm, bm); 2548 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2496 } 2549 }
2497#endif 2550#endif
2498 2551
2499 pixmap = XCreatePixmap (disp, vt, 2552 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2500 szHint.width, szHint.height, image->depth);
2501 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2553 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2502 XPutImage (disp, pixmap, gc, image, 0, 0, 2554 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2503 nx, ny, image->width, image->height); 2555 nx, ny, image->width, image->height);
2504 XFreeGC (disp, gc); 2556 XFreeGC (xdisp, gc);
2505 XDestroyImage (image); 2557 XDestroyImage (image);
2506 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2558 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2507 XClearWindow (disp, parent[0]); 2559 XClearWindow (xdisp, parent[0]);
2508 2560
2509 if (!am_transparent || !am_pixmap_trans) 2561 if (!am_transparent || !am_pixmap_trans)
2510 pchanged = 1; 2562 pchanged = 1;
2511 2563
2512 am_transparent = am_pixmap_trans = 1; 2564 am_transparent = am_pixmap_trans = 1;
2513 } 2565 }
2514 } 2566 }
2515 2567
2516 if (am_pixmap_trans) 2568 if (am_pixmap_trans)
2517 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2569 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2518 else 2570 else
2519 { 2571 {
2520 unsigned int n; 2572 unsigned int n;
2521 /* 2573 /*
2522 * InheritPixmap transparency 2574 * InheritPixmap transparency
2523 */ 2575 */
2524 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2525 { 2577 {
2526 oldp = parent[i]; 2578 oldp = parent[i];
2527 XQueryTree (disp, parent[i - 1], &root, 2579 XQueryTree (xdisp, parent[i - 1], &root,
2528 &parent[i], &list, &n); 2580 &parent[i], &list, &n);
2529 XFree (list); 2581 XFree (list);
2530 2582
2531 if (parent[i] == display->root) 2583 if (parent[i] == display->root)
2532 { 2584 {
… …
2544 2596
2545 if (pchanged) 2597 if (pchanged)
2546 { 2598 {
2547 for (; n < (unsigned int)i; n++) 2599 for (; n < (unsigned int)i; n++)
2548 { 2600 {
2549 XGetWindowAttributes (disp, parent[n], &wattr); 2601 XGetWindowAttributes (xdisp, parent[n], &wattr);
2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2602 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2551 { 2603 {
2552 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2604 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2553 break; 2605 break;
2554 } 2606 }
2555 } 2607 }
2556 } 2608 }
2557 2609
2558 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2610 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2559 { 2611 {
2560 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2612 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2561 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2613 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2562 am_transparent = 0; 2614 am_transparent = 0;
2563 /* XXX: also turn off Opt_transparent? */ 2615 /* XXX: also turn off Opt_transparent? */
2564 } 2616 }
2565 else 2617 else
2566 { 2618 {
2567#if WAIT_FOR_WM
2568 /* wait (an arbitrary period) for the WM to do its thing
2569 * needed for fvwm2.2.2 (and before?) */
2570 sleep (1);
2571#endif
2572 for (n = 0; n < (unsigned int)i; n++) 2619 for (n = 0; n < (unsigned int)i; n++)
2573 { 2620 {
2574 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2621 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2575 XClearWindow (disp, parent[n]); 2622 XClearWindow (xdisp, parent[n]);
2576 } 2623 }
2577 2624
2578 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2625 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2579 am_transparent = 1; 2626 am_transparent = 1;
2580 } 2627 }
2581 2628
2582 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2629 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2583 parent[i] = None; 2630 parent[i] = None;
2584 } 2631 }
2585 2632
2586 if (scrollBar.win) 2633 if (scrollBar.win)
2587 { 2634 {
2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2635 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2589 scrollBar.setIdle (); 2636 scrollBar.setIdle ();
2590 scrollbar_show (0); 2637 scrollbar_show (0);
2591 } 2638 }
2592 2639
2593 if (am_transparent) 2640 if (am_transparent)
… …
2605 2652
2606bool 2653bool
2607rxvt_term::cmd_parse () 2654rxvt_term::cmd_parse ()
2608{ 2655{
2609 bool flag = false; 2656 bool flag = false;
2610 unicode_t ch = NOCHAR; 2657 wchar_t ch = NOCHAR;
2611 unsigned char *seq_begin; // remember start of esc-sequence here 2658 char *seq_begin; // remember start of esc-sequence here
2612 2659
2613 for (;;) 2660 for (;;)
2614 { 2661 {
2615 if (ch == NOCHAR) 2662 if (ch == NOCHAR)
2616 { 2663 {
2617 seq_begin = cmdbuf_ptr; 2664 seq_begin = cmdbuf_ptr;
2618 ch = next_char (); 2665 ch = next_char ();
2619 }
2620 2666
2621 if (ch == NOCHAR) // TODO: improve 2667 if (ch == NOCHAR)
2622 break; 2668 break;
2669 }
2623 2670
2624 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2671 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2625 { 2672 {
2626 if (!seen_input) 2673 if (!seen_input)
2627 { 2674 {
… …
2636 if (seen_resize && cmd_pid) 2683 if (seen_resize && cmd_pid)
2637 kill (-cmd_pid, SIGWINCH); 2684 kill (-cmd_pid, SIGWINCH);
2638 } 2685 }
2639 2686
2640 /* Read a text string from the input buffer */ 2687 /* Read a text string from the input buffer */
2641 unicode_t buf[UBUFSIZ]; 2688 wchar_t buf[UBUFSIZ];
2642 bool refreshnow = false; 2689 bool refreshnow = false;
2643 int nlines = 0; 2690 int nlines = 0;
2644 unicode_t *str = buf; 2691 wchar_t *str = buf;
2645 unicode_t *eol = str + min (ncol, UBUFSIZ); 2692 wchar_t *eol = str + min (ncol, UBUFSIZ);
2646 2693
2647 for (;;) 2694 for (;;)
2648 { 2695 {
2649 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2696 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2650 break; 2697 break;
… …
2656 if (ch == C0_LF) 2703 if (ch == C0_LF)
2657 nlines++; 2704 nlines++;
2658 2705
2659 refresh_count++; 2706 refresh_count++;
2660 2707
2661 if (!(options & Opt_jumpScroll) 2708 if (!OPTION (Opt_jumpScroll)
2662 || (refresh_count >= refresh_limit * (nrow - 1))) 2709 || (refresh_count >= refresh_limit * (nrow - 1)))
2663 { 2710 {
2664 refreshnow = true; 2711 refreshnow = true;
2712 refresh_count = 0;
2665 ch = NOCHAR; 2713 ch = NOCHAR;
2666 break; 2714 break;
2667 } 2715 }
2668 2716
2669 // scr_add_lines only works for nlines <= nrow - 1. 2717 // scr_add_lines only works for nlines <= nrow - 1.
2670 if (nlines >= nrow - 1) 2718 if (nlines >= nrow - 1)
2671 { 2719 {
2720 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2721 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2672 scr_add_lines (buf, nlines, str - buf); 2722 scr_add_lines (buf, str - buf, nlines);
2723
2673 nlines = 0; 2724 nlines = 0;
2674 str = buf; 2725 str = buf;
2675 eol = str + min (ncol, UBUFSIZ); 2726 eol = str + min (ncol, UBUFSIZ);
2676 } 2727 }
2677 2728
… …
2690 2741
2691 seq_begin = cmdbuf_ptr; 2742 seq_begin = cmdbuf_ptr;
2692 ch = next_char (); 2743 ch = next_char ();
2693 } 2744 }
2694 2745
2746 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2747 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2695 scr_add_lines (buf, nlines, str - buf); 2748 scr_add_lines (buf, str - buf, nlines);
2696 2749
2697 /* 2750 /*
2698 * If there have been a lot of new lines, then update the screen 2751 * If there have been a lot of new lines, then update the screen
2699 * What the heck I'll cheat and only refresh less than every page-full. 2752 * What the heck I'll cheat and only refresh less than every page-full.
2700 * the number of pages between refreshes is refresh_limit, which 2753 * the number of pages between refreshes is refresh_limit, which
2701 * is incremented here because we must be doing flat-out scrolling. 2754 * is incremented here because we must be doing flat-out scrolling.
2702 */ 2755 */
2703 if (refreshnow) 2756 if (refreshnow)
2704 { 2757 {
2705 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2758 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2706 refresh_limit++; 2759 refresh_limit++;
2707 else 2760 else
2708 { 2761 {
2709 flag = true; 2762 flag = true;
2710 scr_refresh (refresh_type); 2763 scr_refresh ();
2764 want_refresh = 1;
2711 } 2765 }
2712 } 2766 }
2713 2767
2714 } 2768 }
2715 else 2769 else
… …
2730 } 2784 }
2731 2785
2732 return flag; 2786 return flag;
2733} 2787}
2734 2788
2735// read the next octet
2736unicode_t
2737rxvt_term::next_octet ()
2738{
2739 return cmdbuf_ptr < cmdbuf_endp
2740 ? *cmdbuf_ptr++
2741 : NOCHAR;
2742}
2743
2744// read the next character 2789// read the next character
2745unicode_t 2790wchar_t
2746rxvt_term::next_char () 2791rxvt_term::next_char () NOTHROW
2747{ 2792{
2748 while (cmdbuf_ptr < cmdbuf_endp) 2793 while (cmdbuf_ptr < cmdbuf_endp)
2749 { 2794 {
2750 // assume 7-bit to be ascii ALWAYS 2795 // assume 7-bit to be ascii ALWAYS
2751 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2796 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2752 return *cmdbuf_ptr++; 2797 return *cmdbuf_ptr++;
2753 2798
2754 wchar_t wc; 2799 wchar_t wc;
2755 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2800 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2756 2801
2757 if (len == (size_t)-2) 2802 if (len == (size_t)-2)
2758 { 2803 {
2759 // the mbstate stores incomplete sequences. didn't know this :/ 2804 // the mbstate stores incomplete sequences. didn't know this :/
2760 cmdbuf_ptr = cmdbuf_endp; 2805 cmdbuf_ptr = cmdbuf_endp;
2761 break; 2806 break;
2762 } 2807 }
2763 2808
2764 if (len == (size_t)-1) 2809 if (len == (size_t)-1)
2765 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2810 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2766 2811
2767 // assume wchar == unicode 2812 // assume wchar == unicode
2768 cmdbuf_ptr += len; 2813 cmdbuf_ptr += len;
2769 return wc & UNICODE_MASK; 2814 return wc & UNICODE_MASK;
2770 } 2815 }
2771 2816
2772 return NOCHAR; 2817 return NOCHAR;
2773} 2818}
2819
2820// read the next octet
2821uint32_t
2822rxvt_term::next_octet () NOTHROW
2823{
2824 return cmdbuf_ptr < cmdbuf_endp
2825 ? (unsigned char)*cmdbuf_ptr++
2826 : NOCHAR;
2827}
2828
2829static class out_of_input out_of_input;
2774 2830
2775/* rxvt_cmd_getc () - Return next input character */ 2831/* rxvt_cmd_getc () - Return next input character */
2776/* 2832/*
2777 * Return the next input character after first passing any keyboard input 2833 * Return the next input character after first passing any keyboard input
2778 * to the command. 2834 * to the command.
2779 */ 2835 */
2780unicode_t 2836wchar_t
2781rxvt_term::cmd_getc () 2837rxvt_term::cmd_getc () THROW ((class out_of_input))
2782{ 2838{
2783 unicode_t c = next_char (); 2839 wchar_t c = next_char ();
2784 2840
2785 if (c == NOCHAR) 2841 if (c == NOCHAR)
2786 throw out_of_input; 2842 throw out_of_input;
2787 2843
2788 return c; 2844 return c;
2789} 2845}
2790 2846
2791unicode_t 2847uint32_t
2792rxvt_term::cmd_get8 () 2848rxvt_term::cmd_get8 () THROW ((class out_of_input))
2793{ 2849{
2794 unicode_t c = next_octet (); 2850 uint32_t c = next_octet ();
2795 2851
2796 if (c == NOCHAR) 2852 if (c == NOCHAR)
2797 throw out_of_input; 2853 throw out_of_input;
2798 2854
2799 return c; 2855 return c;
… …
2899 case C0_ESC: 2955 case C0_ESC:
2900 process_escape_seq (); 2956 process_escape_seq ();
2901 break; 2957 break;
2902 case C0_ENQ: /* terminal Status */ 2958 case C0_ENQ: /* terminal Status */
2903 if (rs[Rs_answerbackstring]) 2959 if (rs[Rs_answerbackstring])
2904 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2960 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2905 (unsigned int)strlen (rs[Rs_answerbackstring]));
2906 else 2961 else
2907 tt_write ((unsigned char *)VT100_ANS, 2962 tt_write (VT100_ANS, strlen (VT100_ANS));
2908 (unsigned int)strlen (VT100_ANS));
2909 break; 2963 break;
2910 case C0_BEL: /* bell */ 2964 case C0_BEL: /* bell */
2911 scr_bell (); 2965 scr_bell ();
2912 break; 2966 break;
2913 case C0_BS: /* backspace */ 2967 case C0_BS: /* backspace */
… …
3037 scr_charset_set (2, (unsigned int)cmd_getc ()); 3091 scr_charset_set (2, (unsigned int)cmd_getc ());
3038 break; 3092 break;
3039 case '+': 3093 case '+':
3040 scr_charset_set (3, (unsigned int)cmd_getc ()); 3094 scr_charset_set (3, (unsigned int)cmd_getc ());
3041 break; 3095 break;
3042#if ENABLE_FRILLS 3096#if !ENABLE_MINIMAL
3043 case '6': 3097 case '6':
3044 scr_backindex (); 3098 scr_backindex ();
3045 break; 3099 break;
3046#endif 3100#endif
3047 case '7': 3101 case '7':
3048 scr_cursor (SAVE); 3102 scr_cursor (SAVE);
3049 break; 3103 break;
3050 case '8': 3104 case '8':
3051 scr_cursor (RESTORE); 3105 scr_cursor (RESTORE);
3052 break; 3106 break;
3053#if ENABLE_FRILLS 3107#if !ENABLE_MINIMAL
3054 case '9': 3108 case '9':
3055 scr_forwardindex (); 3109 scr_forwardindex ();
3056 break; 3110 break;
3057#endif 3111#endif
3058 case '=': 3112 case '=':
… …
3068 break; 3122 break;
3069 3123
3070 /* 8.3.87: NEXT LINE */ 3124 /* 8.3.87: NEXT LINE */
3071 case C1_NEL: /* ESC E */ 3125 case C1_NEL: /* ESC E */
3072 { 3126 {
3073 unicode_t nlcr[] = { C0_LF, C0_CR }; 3127 wchar_t nlcr[] = { C0_LF, C0_CR };
3074 scr_add_lines (nlcr, 1, 2); 3128 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3075 } 3129 }
3076 break; 3130 break;
3077 3131
3078 /* kidnapped escape sequence: Should be 8.3.48 */ 3132 /* kidnapped escape sequence: Should be 8.3.48 */
3079 case C1_ESA: /* ESC G */ 3133 case C1_ESA: /* ESC G */
… …
3101 process_dcs_seq (); 3155 process_dcs_seq ();
3102 break; 3156 break;
3103 3157
3104 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3158 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3105 case C1_SCI: /* ESC Z */ 3159 case C1_SCI: /* ESC Z */
3106 tt_write ((const unsigned char *)ESCZ_ANSWER, 3160 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3107 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3108 break; /* steal obsolete ESC [ c */ 3161 break; /* steal obsolete ESC [ c */
3109 3162
3110 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3163 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3111 case C1_CSI: /* ESC [ */ 3164 case C1_CSI: /* ESC [ */
3112 process_csi_seq (); 3165 process_csi_seq ();
… …
3221 ndef = get_byte_array_bit (csi_defaults, i); 3274 ndef = get_byte_array_bit (csi_defaults, i);
3222 for (p = 0; p < nargs; p++) 3275 for (p = 0; p < nargs; p++)
3223 if (arg[p] == -1) 3276 if (arg[p] == -1)
3224 arg[p] = ndef; 3277 arg[p] = ndef;
3225 3278
3226#ifdef DEBUG_CMD
3227 fprintf (stderr, "CSI ");
3228 for (p = 0; p < nargs; p++)
3229 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3230 fprintf (stderr, "%c\n", ch);
3231#endif
3232
3233 /* 3279 /*
3234 * private mode handling 3280 * private mode handling
3235 */ 3281 */
3236 if (priv) 3282 if (priv)
3237 { 3283 {
3238 switch (priv) 3284 switch (priv)
3239 { 3285 {
3240 case '>': 3286 case '>':
3241 if (ch == CSI_DA) /* secondary device attributes */ 3287 if (ch == CSI_DA) /* secondary device attributes */
3242 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3288 {
3289 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3290 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3291 //
3292 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3293 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3294 // that we do not support xterm mouse reporting (should be 95 when we do).
3295 //
3296 tt_printf ("\033[>%d;94;0c", 'U');
3297 }
3243 break; 3298 break;
3244 case '?': 3299 case '?':
3245 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3300 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3246 process_terminal_mode (ch, priv, nargs, arg); 3301 process_terminal_mode (ch, priv, nargs, arg);
3247 break; 3302 break;
… …
3356 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3411 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3357 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3412 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3358 break; 3413 break;
3359 3414
3360 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3415 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3361 tt_write ((const unsigned char *)VT100_ANS, 3416 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3362 (unsigned int) (sizeof (VT100_ANS) - 1));
3363 break; 3417 break;
3364 3418
3365 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3419 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3366 process_sgr_mode (nargs, arg); 3420 process_sgr_mode (nargs, arg);
3367 break; 3421 break;
… …
3374 break; 3428 break;
3375 case 6: /* CPR requested */ 3429 case 6: /* CPR requested */
3376 scr_report_position (); 3430 scr_report_position ();
3377 break; 3431 break;
3378 case 7: /* unofficial extension */ 3432 case 7: /* unofficial extension */
3379 if (options & Opt_insecure) 3433 if (OPTION (Opt_insecure))
3380 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3434 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3381 break; 3435 break;
3382 case 8: /* unofficial extension */ 3436 case 8: /* unofficial extension */
3383 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3437 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3384 break; 3438 break;
… …
3451 break; 3505 break;
3452 case CSI_75: 3506 case CSI_75:
3453 scr_cursor (RESTORE); 3507 scr_cursor (RESTORE);
3454 break; 3508 break;
3455 3509
3456#if ENABLE_FRILLS 3510#if !ENABLE_MINIMAL
3457 case CSI_74: 3511 case CSI_74:
3458 process_window_ops (arg, nargs); 3512 process_window_ops (arg, nargs);
3459 break; 3513 break;
3460#endif 3514#endif
3461 3515
… …
3468 break; 3522 break;
3469 } 3523 }
3470} 3524}
3471/*}}} */ 3525/*}}} */
3472 3526
3473#if ENABLE_FRILLS 3527#if !ENABLE_MINIMAL
3474/* ARGSUSED */ 3528/* ARGSUSED */
3475void 3529void
3476rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3530rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3477{ 3531{
3478 int x, y; 3532 int x, y;
3479 XWindowAttributes wattr; 3533 XWindowAttributes wattr;
3480 Window wdummy; 3534 Window wdummy;
3481 dDisp; 3535
3536 dLocal (Display *, xdisp);
3482 3537
3483 if (nargs == 0) 3538 if (nargs == 0)
3484 return; 3539 return;
3485 3540
3486 switch (args[0]) 3541 switch (args[0])
3487 { 3542 {
3488 /* 3543 /*
3489 * commands 3544 * commands
3490 */ 3545 */
3491 case 1: /* deiconify window */ 3546 case 1: /* deiconify window */
3492 XMapWindow (disp, parent[0]); 3547 XMapWindow (xdisp, parent[0]);
3493 break; 3548 break;
3494 case 2: /* iconify window */ 3549 case 2: /* iconify window */
3495 XIconifyWindow (disp, parent[0], display->screen); 3550 XIconifyWindow (xdisp, parent[0], display->screen);
3496 break; 3551 break;
3497 case 3: /* set position (pixels) */ 3552 case 3: /* set position (pixels) */
3498 XMoveWindow (disp, parent[0], args[1], args[2]); 3553 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3499 break; 3554 break;
3500 case 4: /* set size (pixels) */ 3555 case 4: /* set size (pixels) */
3501 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3556 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3502 break; 3557 break;
3503 case 5: /* raise window */ 3558 case 5: /* raise window */
3504 XRaiseWindow (disp, parent[0]); 3559 XRaiseWindow (xdisp, parent[0]);
3505 break; 3560 break;
3506 case 6: /* lower window */ 3561 case 6: /* lower window */
3507 XLowerWindow (disp, parent[0]); 3562 XLowerWindow (xdisp, parent[0]);
3508 break; 3563 break;
3509 case 7: /* refresh window */ 3564 case 7: /* refresh window */
3510 scr_touch (true); 3565 scr_touch (true);
3511 break; 3566 break;
3512 case 8: /* set size (chars) */ 3567 case 8: /* set size (chars) */
… …
3524 3579
3525 /* 3580 /*
3526 * reports - some output format copied from XTerm 3581 * reports - some output format copied from XTerm
3527 */ 3582 */
3528 case 11: /* report window state */ 3583 case 11: /* report window state */
3529 XGetWindowAttributes (disp, parent[0], &wattr); 3584 XGetWindowAttributes (xdisp, parent[0], &wattr);
3530 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3585 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3531 break; 3586 break;
3532 case 13: /* report window position */ 3587 case 13: /* report window position */
3533 XGetWindowAttributes (disp, parent[0], &wattr); 3588 XGetWindowAttributes (xdisp, parent[0], &wattr);
3534 XTranslateCoordinates (disp, parent[0], wattr.root, 3589 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3535 -wattr.border_width, -wattr.border_width, 3590 -wattr.border_width, -wattr.border_width,
3536 &x, &y, &wdummy); 3591 &x, &y, &wdummy);
3537 tt_printf ("\033[3;%d;%dt", x, y); 3592 tt_printf ("\033[3;%d;%dt", x, y);
3538 break; 3593 break;
3539 case 14: /* report window size (pixels) */ 3594 case 14: /* report window size (pixels) */
3540 XGetWindowAttributes (disp, parent[0], &wattr); 3595 XGetWindowAttributes (xdisp, parent[0], &wattr);
3541 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3596 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3542 break; 3597 break;
3543 case 18: /* report text area size (chars) */ 3598 case 18: /* report text area size (chars) */
3544 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3599 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3545 break; 3600 break;
… …
3547 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3602 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3548 break; 3603 break;
3549 case 20: /* report icon label */ 3604 case 20: /* report icon label */
3550 { 3605 {
3551 char *s; 3606 char *s;
3552 XGetIconName (disp, parent[0], &s); 3607 XGetIconName (xdisp, parent[0], &s);
3553 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3608 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3554 XFree (s); 3609 XFree (s);
3555 } 3610 }
3556 break; 3611 break;
3557 case 21: /* report window title */ 3612 case 21: /* report window title */
3558 { 3613 {
3559 char *s; 3614 char *s;
3560 XFetchName (disp, parent[0], &s); 3615 XFetchName (xdisp, parent[0], &s);
3561 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3616 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3562 XFree (s); 3617 XFree (s);
3563 } 3618 }
3564 break; 3619 break;
3565 } 3620 }
3566} 3621}
… …
3569/*----------------------------------------------------------------------*/ 3624/*----------------------------------------------------------------------*/
3570/* 3625/*
3571 * get input up until STRING TERMINATOR (or BEL) 3626 * get input up until STRING TERMINATOR (or BEL)
3572 * ends_how is terminator used. returned input must be free()'d 3627 * ends_how is terminator used. returned input must be free()'d
3573 */ 3628 */
3574unsigned char * 3629char *
3575rxvt_term::get_to_st (unicode_t &ends_how) 3630rxvt_term::get_to_st (unicode_t &ends_how)
3576{ 3631{
3577 unicode_t ch; 3632 unicode_t ch;
3578 bool seen_esc = false; 3633 bool seen_esc = false;
3579 unsigned int n = 0; 3634 unsigned int n = 0;
… …
3612 3667
3613 string[n++] = '\0'; 3668 string[n++] = '\0';
3614 3669
3615 ends_how = (ch == 0x5c ? C0_ESC : ch); 3670 ends_how = (ch == 0x5c ? C0_ESC : ch);
3616 3671
3617 return (unsigned char *)rxvt_wcstombs (string); 3672 return rxvt_wcstombs (string);
3618} 3673}
3619 3674
3620/*----------------------------------------------------------------------*/ 3675/*----------------------------------------------------------------------*/
3621/* 3676/*
3622 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3677 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3623 */ 3678 */
3624void 3679void
3625rxvt_term::process_dcs_seq () 3680rxvt_term::process_dcs_seq ()
3626{ 3681{
3627 unsigned char *s; 3682 char *s;
3628 unicode_t eh; 3683 unicode_t eh;
3629 3684
3630 /* 3685 /*
3631 * Not handled yet 3686 * Not handled yet
3632 */ 3687 */
… …
3651 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3706 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3652 arg = arg * 10 + (ch - '0'); 3707 arg = arg * 10 + (ch - '0');
3653 3708
3654 if (ch == ';') 3709 if (ch == ';')
3655 { 3710 {
3656 unsigned char *s = get_to_st (eh); 3711 char *s = get_to_st (eh);
3657 3712
3658 if (s) 3713 if (s)
3659 { 3714 {
3660 process_xterm_seq (arg, (char *)s, eh); 3715 process_xterm_seq (arg, s, eh);
3661 free (s); 3716 free (s);
3662 } 3717 }
3663 } 3718 }
3664} 3719}
3665 3720
3666void 3721void
3667rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3722rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3668{ 3723{
3669 if (str[0] == '?' && !str[1]) 3724 if (str[0] == '?' && !str[1])
3670 { 3725 {
3671 unsigned short r, g, b; 3726 rxvt_rgba c;
3672 pix_colors_focused[color].get (display, r, g, b); 3727 pix_colors_focused[color].get (this, c);
3728
3729#if XFT
3730 if (c.a != rxvt_rgba::MAX_CC)
3731 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3732 else
3733#endif
3673 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3734 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3674 } 3735 }
3675 else 3736 else
3676 set_window_color (color, str); 3737 set_window_color (color, str);
3677} 3738}
3678 3739
3679/* 3740/*
3680 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3741 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3681 */ 3742 */
3682void 3743void
3683rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3744rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3684{ 3745{
3685 int changed = 0;
3686 int color; 3746 int color;
3687 char *buf, *name; 3747 char *buf, *name;
3688 bool query = str[0] == '?' && !str[1]; 3748 bool query = str[0] == '?' && !str[1];
3689 int saveop = op; 3749 int saveop = op;
3690 dDisp; 3750
3751 dLocal (Display *, xdisp);
3691 3752
3692 assert (str != NULL); 3753 assert (str != NULL);
3693 switch (op) 3754 switch (op)
3694 { 3755 {
3695 case XTerm_name: 3756 case XTerm_name:
… …
3711 unsigned long bytes_after; 3772 unsigned long bytes_after;
3712 unsigned char *value = 0; 3773 unsigned char *value = 0;
3713 const char *str = ""; 3774 const char *str = "";
3714 3775
3715 if (prop 3776 if (prop
3716 && XGetWindowProperty (disp, parent[0], 3777 && XGetWindowProperty (xdisp, parent[0],
3717 prop, 0, 1<<16, 0, AnyPropertyType, 3778 prop, 0, 1<<16, 0, AnyPropertyType,
3718 &actual_type, &actual_format, 3779 &actual_type, &actual_format,
3719 &nitems, &bytes_after, &value) == Success 3780 &nitems, &bytes_after, &value) == Success
3720 && actual_type != None 3781 && actual_type != None
3721 && actual_format == 8) 3782 && actual_format == 8)
3722 str = (const char *)(value); 3783 str = (const char *)(value);
3723 3784
3724 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3785 tt_printf ("\033]%d;%s%c", op, str, resp);
3725 3786
3726 XFree (value); 3787 XFree (value);
3727 } 3788 }
3728 else 3789 else
3729 { 3790 {
… …
3733 { 3794 {
3734 *eq = 0; 3795 *eq = 0;
3735 set_utf8_property (display->atom (str), eq + 1); 3796 set_utf8_property (display->atom (str), eq + 1);
3736 } 3797 }
3737 else 3798 else
3738 XDeleteProperty (disp, parent[0], 3799 XDeleteProperty (xdisp, parent[0],
3739 display->atom (str)); 3800 display->atom (str));
3740 } 3801 }
3741 break; 3802 break;
3742 3803
3743 case XTerm_Color: 3804 case XTerm_Color:
… …
3745 { 3806 {
3746 if ((name = strchr (buf, ';')) == NULL) 3807 if ((name = strchr (buf, ';')) == NULL)
3747 break; 3808 break;
3748 3809
3749 *name++ = '\0'; 3810 *name++ = '\0';
3750 color = atoi (buf); 3811 color = atoi (buf) + minCOLOR;
3751 3812
3752 if (color < 0 || color >= TOTAL_COLORS) 3813 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3753 break; 3814 break;
3754 3815
3755 if ((buf = strchr (name, ';')) != NULL) 3816 if ((buf = strchr (name, ';')) != NULL)
3756 *buf++ = '\0'; 3817 *buf++ = '\0';
3757 3818
3758 if (name[0] == '?' && !name[1]) 3819 process_color_seq (op, color, name, resp);
3759 {
3760 unsigned short r, g, b;
3761 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3762 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3763 }
3764 else
3765 set_window_color (color + minCOLOR, name);
3766 } 3820 }
3767 break; 3821 break;
3768 case XTerm_Color00: 3822 case XTerm_Color00:
3769 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3823 process_color_seq (op, Color_fg, str, resp);
3770 break; 3824 break;
3771 case XTerm_Color01: 3825 case XTerm_Color01:
3772 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3826 process_color_seq (op, Color_bg, str, resp);
3773 break; 3827 break;
3774#ifndef NO_CURSORCOLOR 3828#ifndef NO_CURSORCOLOR
3775 case XTerm_Color_cursor: 3829 case XTerm_Color_cursor:
3776 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3830 process_color_seq (op, Color_cursor, str, resp);
3777 break; 3831 break;
3778#endif 3832#endif
3779 case XTerm_Color_pointer_fg: 3833 case XTerm_Color_pointer_fg:
3780 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3834 process_color_seq (op, Color_pointer_fg, str, resp);
3781 break; 3835 break;
3782 case XTerm_Color_pointer_bg: 3836 case XTerm_Color_pointer_bg:
3783 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3837 process_color_seq (op, Color_pointer_bg, str, resp);
3784 break; 3838 break;
3785#ifndef NO_BOLD_UNDERLINE_REVERSE 3839#ifndef NO_BOLD_UNDERLINE_REVERSE
3786 case XTerm_Color_BD:
3787 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3788 break;
3789 case XTerm_Color_UL:
3790 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3791 break;
3792 case XTerm_Color_RV: 3840 case XTerm_Color_RV:
3793 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3841 process_color_seq (op, Color_RV, str, resp);
3842 break;
3843 case Rxvt_Color_BD:
3844 case URxvt_Color_BD:
3845 process_color_seq (op, Color_BD, str, resp);
3846 break;
3847 case Rxvt_Color_UL:
3848 case URxvt_Color_UL:
3849 process_color_seq (op, Color_UL, str, resp);
3794 break; 3850 break;
3795 case URxvt_Color_IT: 3851 case URxvt_Color_IT:
3796 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3852 process_color_seq (op, Color_IT, str, resp);
3797 break; 3853 break;
3798#endif 3854#endif
3799#if TRANSPARENT && TINTING 3855#if TRANSPARENT && TINTING
3800 case URxvt_Color_tint: 3856 case URxvt_Color_tint:
3801 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3857 process_color_seq (op, Color_tint, str, resp);
3802 check_our_parents (); 3858 check_our_parents ();
3803 if (am_transparent) 3859 if (am_transparent)
3804 want_full_refresh = want_refresh = 1; 3860 want_full_refresh = want_refresh = 1;
3805 break; 3861 break;
3806#endif 3862#endif
3807 3863
3808 case XTerm_Pixmap: 3864 case Rxvt_Pixmap:
3865 {
3809 if (*str != ';') 3866 if (*str != ';')
3810 { 3867 {
3811#if XPM_BACKGROUND 3868#if XPM_BACKGROUND
3812 scale_pixmap (""); /* reset to default scaling */ 3869 scale_pixmap (""); /* reset to default scaling */
3813 set_bgPixmap (str); /* change pixmap */ 3870 set_bgPixmap (str); /* change pixmap */
3814#endif
3815 scr_touch (true); 3871 scr_touch (true);
3872#endif
3816 } 3873 }
3874
3875 int changed = 0;
3876
3817 while ((str = strchr (str, ';')) != NULL) 3877 while ((str = strchr (str, ';')) != NULL)
3818 { 3878 {
3819 str++; 3879 str++;
3820#if XPM_BACKGROUND 3880#if XPM_BACKGROUND
3821 changed += scale_pixmap (str); 3881 changed += scale_pixmap (str);
3822#endif 3882#endif
3823 } 3883 }
3824 3884
3825 if (changed) 3885 if (changed)
3826 { 3886 {
3827#ifdef XPM_BACKGROUND 3887#ifdef XPM_BACKGROUND
3828 resize_pixmap (); 3888 resize_pixmap ();
3829#endif
3830 scr_touch (true); 3889 scr_touch (true);
3890#endif
3831 } 3891 }
3892 }
3832 break; 3893 break;
3833 3894
3834 case XTerm_restoreFG: 3895 case Rxvt_restoreFG:
3835 set_window_color (Color_fg, str); 3896 set_window_color (Color_fg, str);
3836 break; 3897 break;
3837 case XTerm_restoreBG: 3898 case Rxvt_restoreBG:
3838 set_window_color (Color_bg, str); 3899 set_window_color (Color_bg, str);
3839 break; 3900 break;
3840 3901
3841 case XTerm_logfile: 3902 case XTerm_logfile:
3842 // TODO, when secure mode? 3903 // TODO, when secure mode?
3843 break; 3904 break;
3844 3905
3845#ifdef MENUBAR
3846 case URxvt_Menu:
3847 if (options & Opt_insecure)
3848 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3849 break;
3850#endif
3851#if 0 3906#if 0
3852 case XTerm_dumpscreen: /* no error notices */ 3907 case Rxvt_dumpscreen: /* no error notices */
3853 { 3908 {
3854 int fd; 3909 int fd;
3855 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3910 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3856 { 3911 {
3857 scr_dump (fd); 3912 scr_dump (fd);
… …
3868 case URxvt_italicFont: 3923 case URxvt_italicFont:
3869 case URxvt_boldItalicFont: 3924 case URxvt_boldItalicFont:
3870#endif 3925#endif
3871 if (query) 3926 if (query)
3872 tt_printf ("\33]%d;%-.250s%c", saveop, 3927 tt_printf ("\33]%d;%-.250s%c", saveop,
3873 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3928 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3874 ? fontset[op - URxvt_font]->fontdesc : "", 3929 ? fontset[op - URxvt_font]->fontdesc : "",
3875 resp); 3930 resp);
3876 else 3931 else
3877 { 3932 {
3878 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3933 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3881 allocated.push_back ((void *)res); 3936 allocated.push_back ((void *)res);
3882 set_fonts (); 3937 set_fonts ();
3883 } 3938 }
3884 break; 3939 break;
3885 3940
3886#if ENABLE_FRILLS 3941 case URxvt_version:
3942 if (query)
3943 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3944 op,
3945 rs[Rs_name], VERSION[0], VERSION[2],
3946 resp);
3947 break;
3948
3949#if !ENABLE_MINIMAL
3887 case URxvt_locale: 3950 case URxvt_locale:
3888 if (query) 3951 if (query)
3889 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3952 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3890 else 3953 else
3891 { 3954 {
3892 set_locale (str); 3955 set_locale (str);
3893 pty.set_utf8_mode (enc_utf8); 3956 pty->set_utf8_mode (enc_utf8);
3894 init_xlocale (); 3957 init_xlocale ();
3895 } 3958 }
3896 break; 3959 break;
3897 3960
3898 case URxvt_view_up: 3961 case URxvt_view_up:
3899 case URxvt_view_down: 3962 case URxvt_view_down:
3963 {
3900 int lines = atoi (str); 3964 int lines = atoi (str);
3901 3965
3902 if (lines) 3966 if (lines)
3903 scr_page (op == URxvt_view_up ? UP : DN, lines); 3967 scr_page (op == URxvt_view_up ? UP : DN, lines);
3904 else 3968 else
3905 {
3906 scr_erase_savelines (); 3969 scr_erase_savelines ();
3907 } 3970 }
3908 3971
3972 break;
3973#endif
3974
3975#if ENABLE_PERL
3976 case URxvt_perl:
3977 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3978 ; // no responses yet
3909 break; 3979 break;
3910#endif 3980#endif
3911 } 3981 }
3912} 3982}
3913/*----------------------------------------------------------------------*/ 3983/*----------------------------------------------------------------------*/
… …
3944 return state; 4014 return state;
3945} 4015}
3946 4016
3947/* we're not using priv _yet_ */ 4017/* we're not using priv _yet_ */
3948void 4018void
3949rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4019rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3950{ 4020{
3951 unsigned int i, j; 4021 unsigned int i, j;
3952 int state; 4022 int state;
3953 4023
3954 static const struct 4024 static const struct
… …
3965 { 5, PrivMode_rVideo }, 4035 { 5, PrivMode_rVideo },
3966 { 6, PrivMode_relOrigin }, 4036 { 6, PrivMode_relOrigin },
3967 { 7, PrivMode_Autowrap }, 4037 { 7, PrivMode_Autowrap },
3968 // 8, bi-directional support mode 4038 // 8, bi-directional support mode
3969 { 9, PrivMode_MouseX10 }, 4039 { 9, PrivMode_MouseX10 },
3970#ifdef menuBar_esc
3971 { menuBar_esc, PrivMode_menuBar },
3972#endif
3973 // 18, 19 printing-related 4040 // 18, 19 printing-related
3974 { 25, PrivMode_VisibleCursor }, 4041 { 25, PrivMode_VisibleCursor },
3975#ifdef scrollBar_esc 4042#ifdef scrollBar_esc
3976 { scrollBar_esc, PrivMode_scrollBar }, 4043 { scrollBar_esc, PrivMode_scrollBar },
3977#endif 4044#endif
… …
4022 } 4089 }
4023 4090
4024 /* extra handling for values with state unkept */ 4091 /* extra handling for values with state unkept */
4025 switch (arg[i]) 4092 switch (arg[i])
4026 { 4093 {
4094#if ENABLE_STYLES
4095 case 1021:
4096 set_option (Opt_intensityStyles, mode);
4097
4098 scr_touch (true);
4099 break;
4100#endif
4027 case 1048: /* alternative cursor save */ 4101 case 1048: /* alternative cursor save */
4028 case 1049: 4102 case 1049:
4029 if (options & Opt_secondaryScreen) 4103 if (OPTION (Opt_secondaryScreen))
4030 if (mode == 0) 4104 if (mode == 0)
4031 scr_cursor (RESTORE); 4105 scr_cursor (RESTORE);
4032 else if (mode == 1) 4106 else if (mode == 1)
4033 scr_cursor (SAVE); 4107 scr_cursor (SAVE);
4034 break; 4108 break;
… …
4049 case 3: /* 80/132 */ 4123 case 3: /* 80/132 */
4050 if (priv_modes & PrivMode_132OK) 4124 if (priv_modes & PrivMode_132OK)
4051 set_widthheight (((state ? 132 : 80) * fwidth), height); 4125 set_widthheight (((state ? 132 : 80) * fwidth), height);
4052 break; 4126 break;
4053 case 4: /* smooth scrolling */ 4127 case 4: /* smooth scrolling */
4054 if (state)
4055 options &= ~Opt_jumpScroll;
4056 else
4057 options |= Opt_jumpScroll; 4128 set_option (Opt_jumpScroll, !state);
4058 break; 4129 break;
4059 case 5: /* reverse video */ 4130 case 5: /* reverse video */
4060 scr_rvideo_mode (state); 4131 scr_rvideo_mode (state);
4061 break; 4132 break;
4062 case 6: /* relative/absolute origins */ 4133 case 6: /* relative/absolute origins */
… …
4068 /* case 8: - auto repeat, can't do on a per window basis */ 4139 /* case 8: - auto repeat, can't do on a per window basis */
4069 case 9: /* X10 mouse reporting */ 4140 case 9: /* X10 mouse reporting */
4070 if (state) /* orthogonal */ 4141 if (state) /* orthogonal */
4071 priv_modes &= ~PrivMode_MouseX11; 4142 priv_modes &= ~PrivMode_MouseX11;
4072 break; 4143 break;
4073#ifdef menuBar_esc
4074 case menuBar_esc:
4075#ifdef MENUBAR
4076 map_menuBar (state);
4077#endif
4078 break;
4079#endif
4080#ifdef scrollBar_esc 4144#ifdef scrollBar_esc
4081 case scrollBar_esc: 4145 case scrollBar_esc:
4082 if (scrollbar_mapping (state)) 4146 if (scrollbar_mapping (state))
4083 { 4147 {
4084 resize_all_windows (0, 0, 0); 4148 resize_all_windows (0, 0, 0);
… …
4103#if 0 4167#if 0
4104 case 1001: 4168 case 1001:
4105 break; /* X11 mouse highlighting */ 4169 break; /* X11 mouse highlighting */
4106#endif 4170#endif
4107 case 1010: /* scroll to bottom on TTY output inhibit */ 4171 case 1010: /* scroll to bottom on TTY output inhibit */
4108 if (state)
4109 options &= ~Opt_scrollTtyOutput;
4110 else
4111 options |= Opt_scrollTtyOutput; 4172 set_option (Opt_scrollTtyOutput, !state);
4112 break; 4173 break;
4113 case 1011: /* scroll to bottom on key press */ 4174 case 1011: /* scroll to bottom on key press */
4114 if (state)
4115 options |= Opt_scrollTtyKeypress; 4175 set_option (Opt_scrollTtyKeypress, state);
4116 else
4117 options &= ~Opt_scrollTtyKeypress;
4118 break; 4176 break;
4119 case 1047: /* secondary screen w/ clearing last */ 4177 case 1047: /* secondary screen w/ clearing last */
4120 if (options & Opt_secondaryScreen) 4178 if (OPTION (Opt_secondaryScreen))
4121 if (current_screen != PRIMARY) 4179 if (current_screen != PRIMARY)
4122 scr_erase_screen (2); 4180 scr_erase_screen (2);
4123 scr_change_screen (state); 4181 scr_change_screen (state);
4124 break; 4182 break;
4125 case 1049: /* secondary screen w/ clearing first */ 4183 case 1049: /* secondary screen w/ clearing first */
4126 scr_change_screen (state); 4184 scr_change_screen (state);
4127 if (options & Opt_secondaryScreen) 4185 if (OPTION (Opt_secondaryScreen))
4128 if (current_screen != PRIMARY) 4186 if (current_screen != PRIMARY)
4129 scr_erase_screen (2); 4187 scr_erase_screen (2);
4130 break; 4188 break;
4131 default: 4189 default:
4132 break; 4190 break;
… …
4260 scr_color (Color_bg, Color_bg); 4318 scr_color (Color_bg, Color_bg);
4261 break; 4319 break;
4262 4320
4263 //case 50: // not variable spacing 4321 //case 50: // not variable spacing
4264 4322
4265#ifndef NO_BRIGHTCOLOR 4323#if !ENABLE_MINIMAL
4266 case 90: 4324 case 90:
4267 case 91: /* set bright fg color */ 4325 case 91: /* set bright fg color */
4268 case 92: 4326 case 92:
4269 case 93: 4327 case 93:
4270 case 94: 4328 case 94:
… …
4282 case 106: 4340 case 106:
4283 case 107: 4341 case 107:
4284 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4342 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4285 break; 4343 break;
4286#endif 4344#endif
4287
4288 } 4345 }
4289 } 4346 }
4290} 4347}
4291/*}}} */ 4348/*}}} */
4292 4349
… …
4316 */ 4373 */
4317void 4374void
4318rxvt_term::tt_printf (const char *fmt,...) 4375rxvt_term::tt_printf (const char *fmt,...)
4319{ 4376{
4320 va_list arg_ptr; 4377 va_list arg_ptr;
4321 unsigned char buf[256]; 4378 char buf[256];
4322 4379
4323 va_start (arg_ptr, fmt); 4380 va_start (arg_ptr, fmt);
4324 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4381 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4325 va_end (arg_ptr); 4382 va_end (arg_ptr);
4326 tt_write (buf, strlen (buf)); 4383 tt_write (buf, strlen (buf));
… …
4331 * or generated by us in response to a query ESC sequence. 4388 * or generated by us in response to a query ESC sequence.
4332 */ 4389 */
4333const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4390const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4334 4391
4335void 4392void
4336rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4393rxvt_term::tt_write (const char *data, unsigned int len)
4337{ 4394{
4395 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4396 return;
4397
4398 if (pty->pty < 0)
4399 return;
4400
4338 if (v_buflen == 0) 4401 if (v_buflen == 0)
4339 { 4402 {
4340 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4403 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4341 4404
4342 if ((unsigned int)written == len) 4405 if ((unsigned int)written == len)
4343 return; 4406 return;
4344 4407
4345 data += written; 4408 data += written;
4346 len -= written; 4409 len -= written;
4347 } 4410 }
4348 4411
4349 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4412 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4350 4413
4351 memcpy (v_buffer + v_buflen, data, len); 4414 memcpy (v_buffer + v_buflen, data, len);
4352 v_buflen += len; 4415 v_buflen += len;
4353 4416
4354 pty_ev.set (EVENT_READ | EVENT_WRITE); 4417 pty_ev.set (EVENT_READ | EVENT_WRITE);
4355} 4418}
4356 4419
4357void rxvt_term::pty_write () 4420void rxvt_term::pty_write ()
4358{ 4421{
4359 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4422 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4360 4423
4361 if (written > 0) 4424 if (written > 0)
4362 { 4425 {
4363 v_buflen -= written; 4426 v_buflen -= written;
4364 4427
… …
4373 } 4436 }
4374 4437
4375 memmove (v_buffer, v_buffer + written, v_buflen); 4438 memmove (v_buffer, v_buffer + written, v_buflen);
4376 } 4439 }
4377 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4440 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4378 // original code just ignores this... 4441 pty_ev.set (EVENT_READ);
4379 destroy ();
4380} 4442}
4381 4443
4382/*----------------------- end-of-file (C source) -----------------------*/ 4444/*----------------------- end-of-file (C source) -----------------------*/
4383 4445

Diff Legend

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