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.216 by root, Tue Dec 27 01:25:42 2005 UTC vs.
Revision 1.302 by root, Tue Jan 31 21:35:39 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
53#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 55# include "keyboard.h"
… …
57#include <csignal> 58#include <csignal>
58 59
59/*----------------------------------------------------------------------*/ 60/*----------------------------------------------------------------------*/
60 61
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 62#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 63
66#if ENABLE_FRILLS || ISO_14755 64#if ENABLE_FRILLS || ISO_14755
67 65
68#define ISO_14755_STARTED 0x80000000UL 66#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 67#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
141 || !IN_RANGE_EXC (y, 0, nrow)) 139 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 140 return;
143 141
144 for (;;) 142 for (;;)
145 { 143 {
146 const line_t &l = ROW(y - view_start); 144 const line_t &l = ROW(y + view_start);
147 145
148 text_t t = l.t[x]; 146 text_t t = l.t[x];
149 147
150 if (t != NOCHAR || !x) 148 if (t != NOCHAR || !x)
151 { 149 {
152 iso14755_51 (l.t[x], l.r[x]); 150 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 151 iso14755buf = ISO_14755_54;
154 break; 152 break;
155 } 153 }
156 154
157 x--; 155 x--;
158 } 156 }
159} 157}
160#endif
161 158
162#if ENABLE_OVERLAY
163void 159void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 160rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 161{
166 rxvt_fontset *fs = FONTSET (r); 162 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 163 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 164 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 165 int len;
170 166
171 fname = rxvt_utf8towcs (f->name); 167 fname = rxvt_utf8towcs (f->name);
172 168
173#if ENABLE_COMBINING 169# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 170 if (IS_COMPOSE (ch))
175 { 171 {
176 len = rxvt_composite.expand (ch, 0); 172 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 173 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 174 rxvt_composite.expand (ch, chr);
179 } 175 }
180 else 176 else
181#endif 177# endif
182 { 178 {
183 ch2 = ch; 179 ch2 = ch;
184 180
185 alloc = 0; 181 alloc = 0;
186 chr = &ch2; 182 chr = &ch2;
… …
189 185
190 char attr[80]; // plenty 186 char attr[80]; // plenty
191 187
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 188 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 189 (int)r,
194 GET_FGCOLOR (r), GET_BGCOLOR (r), 190 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "", 191 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "", 192 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "", 193 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 194 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 195 r & RS_Uline ? " uline" : "",
… …
202 int width = wcswidth (fname, wcslen (fname)); 198 int width = wcswidth (fname, wcslen (fname));
203 199
204 max_it (width, 8+5); // for char + hey 200 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr)); 201 max_it (width, strlen (attr));
206 202
203 if (y >= 0)
204 {
205 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
206 x = 0;
207 }
208
207 scr_overlay_new (0, -1, width, len + 2); 209 scr_overlay_new (x, y, width, len + 2);
208 210
209 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 211 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
210 212
211 for (int y = 0; y < len; y++) 213 for (int y = 0; y < len; y++)
212 { 214 {
… …
215 ch = *chr++; 217 ch = *chr++;
216 218
217 sprintf (buf, "%8x", ch); 219 sprintf (buf, "%8x", ch);
218 scr_overlay_set (0, y, buf); 220 scr_overlay_set (0, y, buf);
219 scr_overlay_set (9, y, '='); 221 scr_overlay_set (9, y, '=');
220#if !UNICODE3 222# if !UNICODE3
221 if (ch >= 0x10000) 223 if (ch >= 0x10000)
222 ch = 0xfffd; 224 ch = 0xfffd;
223#endif 225# endif
224 scr_overlay_set (11, y, ch, r); 226 scr_overlay_set (11, y, ch, r);
227
228 if (WCWIDTH (ch) >= 2)
225 scr_overlay_set (12, y, NOCHAR, r); 229 scr_overlay_set (12, y, NOCHAR, r);
226 } 230 }
227 231
232// {
233// char buf[4+4+3+1];
234// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
235// scr_overlay_set (0, 0, buf);
236// }
228 scr_overlay_set (0, len , attr); 237 scr_overlay_set (0, len , attr);
229 scr_overlay_set (0, len + 1, fname); 238 scr_overlay_set (0, len + 1, fname);
230 239
231 free (fname); 240 free (fname);
232 241
233#if ENABLE_COMBINING 242# if ENABLE_COMBINING
234 if (alloc) 243 if (alloc)
235 delete [] alloc; 244 delete [] alloc;
236#endif 245# endif
237} 246}
238#endif 247#endif
239 248
240void 249void
241rxvt_term::commit_iso14755 () 250rxvt_term::commit_iso14755 ()
… …
258 mb[0] = ch[0]; 267 mb[0] = ch[0];
259 len = 1; 268 len = 1;
260 } 269 }
261 270
262 if (len > 0) 271 if (len > 0)
263 tt_write ((unsigned char *)mb, len); 272 tt_write (mb, len);
264 else 273 else
265 scr_bell (); 274 scr_bell ();
266 } 275 }
267 276
268 iso14755buf = 0; 277 iso14755buf = 0;
… …
292rxvt_term::lookup_key (XKeyEvent &ev) 301rxvt_term::lookup_key (XKeyEvent &ev)
293{ 302{
294 int ctrl, meta, shft, len; 303 int ctrl, meta, shft, len;
295 unsigned int newlen; 304 unsigned int newlen;
296 KeySym keysym; 305 KeySym keysym;
297#ifdef DEBUG_CMD
298 static int debug_key = 1; /* accessible by a debugger only */
299#endif
300 int valid_keysym; 306 int valid_keysym;
301 unsigned char kbuf[KBUFSZ]; 307 char kbuf[KBUFSZ];
302 308
303 /* 309 /*
304 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 310 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
305 * escape sequence to toggle the Keypad. 311 * escape sequence to toggle the Keypad.
306 * 312 *
… …
324 Status status_return; 330 Status status_return;
325 331
326#if 0 332#if 0
327#ifdef X_HAVE_UTF8_STRING 333#ifdef X_HAVE_UTF8_STRING
328 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 334 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
329 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 335 len = Xutf8LookupString (Input_Context, &ev, kbuf,
330 KBUFSZ, &keysym, &status_return); 336 KBUFSZ, &keysym, &status_return);
331 else 337 else
332#endif 338#endif
333#endif 339#endif
334 { 340 {
… …
371 || status_return == XLookupBoth; 377 || status_return == XLookupBoth;
372 } 378 }
373 else 379 else
374#endif 380#endif
375 { 381 {
376 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 382 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
377 valid_keysym = keysym != NoSymbol; 383 valid_keysym = keysym != NoSymbol;
378 } 384 }
379 385
380 if (valid_keysym) 386 if (valid_keysym)
381 { 387 {
… …
433 scr_move_to (0, 1); 439 scr_move_to (0, 1);
434 return; 440 return;
435 } 441 }
436 else if (keysym == XK_End) 442 else if (keysym == XK_End)
437 { 443 {
438 scr_move_to (1, 0); 444 scr_move_to (1, 1);
439 return; 445 return;
440 } 446 }
441 } 447 }
442#endif 448#endif
443 } 449 }
… …
454 { 460 {
455 switch (keysym) 461 switch (keysym)
456 { 462 {
457 /* normal XTerm key bindings */ 463 /* normal XTerm key bindings */
458 case XK_Insert: /* Shift+Insert = paste mouse selection */ 464 case XK_Insert: /* Shift+Insert = paste mouse selection */
459 selection_request (ev.time, 0, 0); 465 selection_request (ev.time);
460 return; 466 return;
461#if TODO 467#if TODO
462 /* rxvt extras */ 468 /* rxvt extras */
463 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 469 case XK_KP_Add: /* Shift+KP_Add = bigger font */
464 change_font (FONT_UP); 470 change_font (FONT_UP);
… …
845 { 851 {
846#ifdef META8_OPTION 852#ifdef META8_OPTION
847 /* set 8-bit on */ 853 /* set 8-bit on */
848 if (meta && (meta_char == 0x80)) 854 if (meta && (meta_char == 0x80))
849 { 855 {
850 unsigned char *ch; 856 char *ch;
851 857
852 for (ch = kbuf; ch < kbuf + len; ch++) 858 for (ch = kbuf; ch < kbuf + len; ch++)
853 *ch |= 0x80; 859 *ch |= 0x80;
854 860
855 meta = 0; 861 meta = 0;
… …
857#endif 863#endif
858 /* nil */ ; 864 /* nil */ ;
859 } 865 }
860 } 866 }
861 867
868 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
869 return;
870
862 if (len <= 0) 871 if (len <= 0)
863 return; /* not mapped */ 872 return; /* not mapped */
864 873
865 if (options & Opt_scrollTtyKeypress) 874 if (OPTION (Opt_scrollTtyKeypress))
866 if (view_start) 875 if (view_start)
867 { 876 {
868 view_start = 0; 877 view_start = 0;
869 want_refresh = 1; 878 want_refresh = 1;
870 } 879 }
… …
888#ifdef META8_OPTION 897#ifdef META8_OPTION
889 && meta_char == C0_ESC 898 && meta_char == C0_ESC
890#endif 899#endif
891 ) 900 )
892 { 901 {
893 const unsigned char ch = C0_ESC; 902 const char ch = C0_ESC;
894 tt_write (&ch, 1); 903 tt_write (&ch, 1);
895 } 904 }
896 905
897#if defined(DEBUG_CMD)
898 /* Display keyboard buffer contents */
899 unsigned char *p;
900 int i;
901
902 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
903 for (i = 0, p = kbuf; i < len; i++, p++)
904 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
905 fprintf (stderr, "'\n");
906#endif /* DEBUG_CMD */
907 tt_write (kbuf, (unsigned int)len); 906 tt_write (kbuf, (unsigned int)len);
908} 907}
909/*}}} */ 908/*}}} */
910 909
911#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 910#if defined (KEYSYM_RESOURCE)
912/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
913/* attempt to `write' count to the input buffer */
914unsigned int 911unsigned int
915rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 912rxvt_term::cmd_write (const char *str, unsigned int count)
916{ 913{
917 unsigned int n, s; 914 unsigned int n, s;
918 915
919 n = cmdbuf_ptr - cmdbuf_base; 916 n = cmdbuf_ptr - cmdbuf_base;
920 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 917 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
957 } 954 }
958#endif 955#endif
959 956
960 if (want_refresh) 957 if (want_refresh)
961 { 958 {
959 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
960 {
961 int row = view_start;
962 int end_row = row + nrow;
963
964 while (row > top_row && ROW (row - 1).is_longer ())
965 --row;
966
967 do
968 {
969 int start_row = row;
970 line_t *l;
971
972 do
973 {
974 l = &ROW (row++);
975
976 if (!(l->f & LINE_FILTERED))
977 {
978 // line not filtered, mark it as filtered
979 l->f |= LINE_FILTERED;
980 while (l->is_longer ())
981 {
982 l = &ROW (row++);
983 l->f |= LINE_FILTERED;
984 }
985
986 // and filter it
987 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
988
989 break;
990 }
991 }
992 while (l->is_longer () && row < end_row);
993 }
994 while (row < end_row);
995 }
996
962 scr_refresh (refresh_type); 997 scr_refresh ();
963 scrollbar_show (1); 998 scrollbar_show (1);
964#ifdef USE_XIM 999#ifdef USE_XIM
965 IMSendSpot (); 1000 IMSendSpot ();
966#endif 1001#endif
967 } 1002 }
… …
970} 1005}
971 1006
972void 1007void
973rxvt_term::check_cb (check_watcher &w) 1008rxvt_term::check_cb (check_watcher &w)
974{ 1009{
975 SET_R (this); 1010 make_current ();
976 SET_LOCALE (locale);
977 1011
978 display->flush (); 1012 display->flush ();
979 1013
980 if (want_refresh && !flush_ev.active) 1014 if (want_refresh && !flush_ev.active)
981 flush_ev.start (NOW + 0.01); 1015 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
982} 1016}
983 1017
984void 1018void
985rxvt_term::flush_cb (time_watcher &w) 1019rxvt_term::flush_cb (time_watcher &w)
986{ 1020{
987 SET_R (this); 1021 make_current ();
988 SET_LOCALE (locale);
989 1022
990 refresh_limit = 1; 1023 refresh_limit = 1;
991 refresh_count = 0; 1024 refresh_count = 0;
992 flush (); 1025 flush ();
993} 1026}
… …
997rxvt_term::cursor_blink_cb (time_watcher &w) 1030rxvt_term::cursor_blink_cb (time_watcher &w)
998{ 1031{
999 hidden_cursor = !hidden_cursor; 1032 hidden_cursor = !hidden_cursor;
1000 want_refresh = 1; 1033 want_refresh = 1;
1001 1034
1002 w.start (w.at + BLINK_INTERVAL); 1035 w.start (w.at + CURSOR_BLINK_INTERVAL);
1003} 1036}
1004#endif 1037#endif
1005 1038
1006#ifdef TEXT_BLINK 1039#ifdef TEXT_BLINK
1007void 1040void
… …
1021rxvt_term::cont_scroll_cb (time_watcher &w) 1054rxvt_term::cont_scroll_cb (time_watcher &w)
1022{ 1055{
1023 if ((scrollbar_isUp() || scrollbar_isDn()) && 1056 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1024 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1057 scr_page (scrollbar_isUp() ? UP : DN, 1))
1025 { 1058 {
1026 refresh_type |= SMOOTH_REFRESH;
1027 want_refresh = 1; 1059 want_refresh = 1;
1028 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1060 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1029 } 1061 }
1030} 1062}
1031#endif 1063#endif
… …
1035rxvt_term::sel_scroll_cb (time_watcher &w) 1067rxvt_term::sel_scroll_cb (time_watcher &w)
1036{ 1068{
1037 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1069 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1038 { 1070 {
1039 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1071 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1040 refresh_type |= SMOOTH_REFRESH;
1041 want_refresh = 1; 1072 want_refresh = 1;
1042 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1073 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1043 } 1074 }
1044} 1075}
1045#endif 1076#endif
… …
1050{ 1081{
1051 if (mouse_slip_wheel_speed == 0 1082 if (mouse_slip_wheel_speed == 0
1052 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1083 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1053 : scr_page (UP, mouse_slip_wheel_speed)) 1084 : scr_page (UP, mouse_slip_wheel_speed))
1054 { 1085 {
1055 if (view_start == nsaved || 1086 if (view_start == top_row || view_start == 0)
1056 view_start == 0)
1057 mouse_slip_wheel_speed = 0; 1087 mouse_slip_wheel_speed = 0;
1058 1088
1059 refresh_type |= SMOOTH_REFRESH;
1060 want_refresh = 1; 1089 want_refresh = 1;
1061 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1062 } 1091 }
1063} 1092}
1064#endif 1093#endif
1065 1094
1095#if LINUX_YIELD_HACK
1096static struct event_handler
1097{
1098 check_watcher yield_ev;
1099
1100 void yield_cb (check_watcher &w)
1101 {
1102 usleep (0);
1103 w.stop ();
1104 }
1105
1106 event_handler ()
1107 : yield_ev (this, &event_handler::yield_cb)
1108 {
1109 }
1110} event_handler;
1111#endif
1112
1066bool 1113bool
1067rxvt_term::pty_fill () 1114rxvt_term::pty_fill ()
1068{ 1115{
1069 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1116 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1070 1117
1071 if (CBUFSIZ == n) 1118 if (CBUFSIZ == n)
1072 { 1119 {
1073 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1120 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1074 n = 0; 1121 n = 0;
1075 } 1122 }
1076 1123
1077 memmove (cmdbuf_base, cmdbuf_ptr, n); 1124 memmove (cmdbuf_base, cmdbuf_ptr, n);
1078 cmdbuf_ptr = cmdbuf_base; 1125 cmdbuf_ptr = cmdbuf_base;
1079 cmdbuf_endp = cmdbuf_ptr + n; 1126 cmdbuf_endp = cmdbuf_ptr + n;
1080 1127
1081 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1128 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1082 1129
1083 if (n > 0) 1130 if (r > 0)
1084 { 1131 {
1085 cmdbuf_endp += n; 1132 cmdbuf_endp += r;
1086 return true; 1133 return true;
1087 } 1134 }
1088 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1135 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1136 {
1137#if LINUX_YIELD_HACK
1138 if (display->is_local)
1139 event_handler.yield_ev.start ();
1140#endif
1141 }
1142 else
1089 { 1143 {
1090 pty_ev.stop (); 1144 pty_ev.stop ();
1091 1145
1092 if (!(options & Opt_hold)) 1146 if (!OPTION (Opt_hold))
1093 destroy (); 1147 destroy ();
1094 } 1148 }
1095 1149
1096 return false; 1150 return false;
1097} 1151}
1098 1152
1099void 1153void
1100rxvt_term::pty_cb (io_watcher &w, short revents) 1154rxvt_term::pty_cb (io_watcher &w, short revents)
1101{ 1155{
1102 SET_R (this); 1156 make_current ();
1103 SET_LOCALE (locale);
1104 1157
1105 if (revents & EVENT_READ) 1158 if (revents & EVENT_READ)
1106 // loop, but don't allow a single term to monopolize us 1159 // loop, but don't allow a single term to monopolize us
1107 while (pty_fill ()) 1160 while (pty_fill ())
1108 if (cmd_parse ()) 1161 if (cmd_parse ())
… …
1113} 1166}
1114 1167
1115void 1168void
1116rxvt_term::pointer_unblank () 1169rxvt_term::pointer_unblank ()
1117{ 1170{
1118 XDefineCursor (display->display, vt, TermWin_cursor); 1171 XDefineCursor (xdisp, vt, TermWin_cursor);
1119 recolour_cursor (); 1172 recolour_cursor ();
1120 1173
1121#ifdef POINTER_BLANK 1174#ifdef POINTER_BLANK
1122 hidden_pointer = 0; 1175 hidden_pointer = 0;
1123 1176
1124 if (options & Opt_pointerBlank) 1177 if (OPTION (Opt_pointerBlank))
1125 pointer_ev.start (NOW + pointerBlankDelay); 1178 pointer_ev.start (NOW + pointerBlankDelay);
1126#endif 1179#endif
1127} 1180}
1128 1181
1129#ifdef POINTER_BLANK 1182#ifdef POINTER_BLANK
1130void 1183void
1131rxvt_term::pointer_blank () 1184rxvt_term::pointer_blank ()
1132{ 1185{
1133 if (! (options & Opt_pointerBlank)) 1186 if (!OPTION (Opt_pointerBlank))
1134 return; 1187 return;
1135 1188
1136 XDefineCursor (display->display, vt, display->blank_cursor); 1189 XDefineCursor (xdisp, vt, display->blank_cursor);
1137 XFlush (display->display); 1190 XFlush (xdisp);
1138 1191
1139 hidden_pointer = 1; 1192 hidden_pointer = 1;
1140} 1193}
1141 1194
1142void 1195void
1143rxvt_term::pointer_cb (time_watcher &w) 1196rxvt_term::pointer_cb (time_watcher &w)
1144{ 1197{
1145 SET_R (this); 1198 make_current ();
1146 SET_LOCALE (locale);
1147 1199
1148 pointer_blank (); 1200 pointer_blank ();
1149} 1201}
1150#endif 1202#endif
1151 1203
… …
1216 (32 + button_number + key_state), 1268 (32 + button_number + key_state),
1217 (32 + x + 1), 1269 (32 + x + 1),
1218 (32 + y + 1)); 1270 (32 + y + 1));
1219} 1271}
1220 1272
1221#ifdef USING_W11LIB
1222void
1223rxvt_W11_process_x_event (XEvent *ev)
1224{
1225 rxvt_t *r = rxvt_get_r ();
1226
1227 x_cb (*ev);
1228}
1229#endif
1230
1231/*{{{ process an X event */ 1273/*{{{ process an X event */
1232void 1274void
1233rxvt_term::x_cb (XEvent &ev) 1275rxvt_term::x_cb (XEvent &ev)
1234{ 1276{
1235 dDisp; 1277 make_current ();
1236 1278
1237 SET_R (this); 1279 dLocal (Display *, xdisp);
1238 SET_LOCALE (locale);
1239 1280
1240#if defined(CURSOR_BLINK) 1281 if (ev.xany.window == vt
1241 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1282 && SHOULD_INVOKE (HOOK_X_EVENT)
1242 { 1283 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1243 if (hidden_cursor) 1284 return;
1244 {
1245 hidden_cursor = 0;
1246 want_refresh = 1;
1247 }
1248 1285
1249 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1286 // for XQueryPointer
1250 }
1251#endif
1252
1253#if defined(POINTER_BLANK)
1254 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1255 {
1256 if (ev.type == MotionNotify
1257 || ev.type == ButtonPress
1258 || ev.type == ButtonRelease)
1259 if (hidden_pointer)
1260 pointer_unblank ();
1261
1262 if (ev.type == KeyPress && hidden_pointer == 0)
1263 pointer_blank ();
1264 }
1265#endif
1266
1267 Window unused_root, unused_child; 1287 Window unused_root, unused_child;
1268 int unused_root_x, unused_root_y; 1288 int unused_root_x, unused_root_y;
1269 unsigned int unused_mask; 1289 unsigned int unused_mask;
1270 1290
1271 switch (ev.type) 1291 switch (ev.type)
… …
1278 1298
1279 break; 1299 break;
1280 1300
1281 case KeyRelease: 1301 case KeyRelease:
1282 { 1302 {
1283#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1303#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1284 KeySym ks; 1304 KeySym keysym;
1285 1305
1286 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1306 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1287#endif 1307#endif
1288 1308
1289#if ENABLE_FRILLS || ISO_14755 1309#if ENABLE_FRILLS || ISO_14755
1290 // ISO 14755 support 1310 // ISO 14755 support
1291 if (iso14755buf) 1311 if (iso14755buf)
… …
1296# endif 1316# endif
1297# if ISO_14755 1317# if ISO_14755
1298 // iso14755 part 5.2 handling: release time 1318 // iso14755 part 5.2 handling: release time
1299 // first: controls 1319 // first: controls
1300 if ((ev.xkey.state & ControlMask) 1320 if ((ev.xkey.state & ControlMask)
1301 && ((ks >= 0x40 && ks <= 0x5f) 1321 && ((keysym >= 0x40 && keysym <= 0x5f)
1302 || (ks >= 0x61 && ks <= 0x7f))) 1322 || (keysym >= 0x61 && keysym <= 0x7f)))
1303 { 1323 {
1304 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1324 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1305 commit_iso14755 (); 1325 commit_iso14755 ();
1306 return; // case-break; 1326 goto skip_switch;
1307 } 1327 }
1308 1328
1309 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1329 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1310 if (i[0] == ks) 1330 if (i[0] == keysym)
1311 { 1331 {
1312 iso14755buf = ISO_14755_51 | i[1]; 1332 iso14755buf = ISO_14755_51 | i[1];
1313 commit_iso14755 (); 1333 commit_iso14755 ();
1314 return; // case-break; 1334 goto skip_switch;
1315 } 1335 }
1316 1336
1317 scr_bell (); 1337 scr_bell ();
1318# endif 1338# endif
1319 iso14755buf = 0; 1339 iso14755buf = 0;
… …
1338 else 1358 else
1339 iso14755buf = 0; 1359 iso14755buf = 0;
1340 } 1360 }
1341#endif 1361#endif
1342 1362
1363 if (ev.xany.window == vt
1364 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1365 break;
1366
1343#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1367#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1344 if (!(ev.xkey.state & ControlMask)) 1368 if (!(ev.xkey.state & ControlMask))
1345 slip_wheel_ev.stop (); 1369 slip_wheel_ev.stop ();
1346 else if (ks == XK_Control_L || ks == XK_Control_R) 1370 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1347 mouse_slip_wheel_speed = 0; 1371 mouse_slip_wheel_speed = 0;
1348#endif 1372#endif
1349 break; 1373 break;
1350 } 1374 }
1351 1375
… …
1357 button_release (ev.xbutton); 1381 button_release (ev.xbutton);
1358 break; 1382 break;
1359 1383
1360 case ClientMessage: 1384 case ClientMessage:
1361 if (ev.xclient.format == 32 1385 if (ev.xclient.format == 32
1362 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1386 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1363 { 1387 {
1388 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1389 {
1390 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1391 {
1364 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1392 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1393 {
1394 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1365 destroy (); 1395 destroy ();
1396 }
1366#if ENABLE_EWMH 1397#if ENABLE_EWMH
1367 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1398 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1368 XSendEvent (disp, ev.xclient.window = display->root, 1399 XSendEvent (xdisp, ev.xclient.window = display->root,
1369 False, SubstructureRedirectMask | SubstructureNotifyMask, 1400 False, SubstructureRedirectMask | SubstructureNotifyMask,
1370 &ev); 1401 &ev);
1402#endif
1403 }
1404 }
1405#if ENABLE_XEMBED
1406 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1407 {
1408 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1409 focus_in ();
1410 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1411 focus_out ();
1412 }
1371#endif 1413#endif
1372 } 1414 }
1373#if ENABLE_XEMBED
1374 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1375 {
1376 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1377 focus_in ();
1378 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1379 focus_out ();
1380 }
1381#endif
1382#ifdef OFFIX_DND
1383 /* OffiX Dnd (drag 'n' drop) protocol */
1384 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1385 && (ev.xclient.data.l[0] == DndFile
1386 || ev.xclient.data.l[0] == DndDir
1387 || ev.xclient.data.l[0] == DndLink))
1388 {
1389 /* Get Dnd data */
1390 Atom ActualType;
1391 int ActualFormat;
1392 unsigned char *data;
1393 unsigned long Size, RemainingBytes;
1394
1395 XGetWindowProperty (disp, display->root,
1396 xa[XA_DNDSELECTION],
1397 0L, 1000000L,
1398 False, AnyPropertyType,
1399 &ActualType, &ActualFormat,
1400 &Size, &RemainingBytes,
1401 &data);
1402 set_string_property (XA_CUT_BUFFER0, data);
1403 XFree (data);
1404 selection_paste (display->root, XA_CUT_BUFFER0, true);
1405 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1406 }
1407#endif /* OFFIX_DND */
1408 break; 1415 break;
1409 1416
1410 case MappingNotify: 1417 case MappingNotify:
1411 XRefreshKeyboardMapping (&ev.xmapping); 1418 XRefreshKeyboardMapping (&ev.xmapping);
1412 break; 1419 break;
… …
1445 break; 1452 break;
1446 1453
1447 case ConfigureNotify: 1454 case ConfigureNotify:
1448 if (ev.xconfigure.window == parent[0]) 1455 if (ev.xconfigure.window == parent[0])
1449 { 1456 {
1450 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1457 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1451 ; 1458 ;
1452 1459
1453 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1454 { 1461 {
1455 seen_resize = 1; 1462 seen_resize = 1;
1456 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1457 } 1464 }
1458 1465
1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1467
1459#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1468#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1460 if (options & Opt_transparent) 1469 if (OPTION (Opt_transparent))
1461 check_our_parents (); 1470 check_our_parents ();
1462#endif 1471#endif
1463 } 1472 }
1464 break; 1473 break;
1465 1474
1466 case PropertyNotify: 1475 case PropertyNotify:
1476 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1467 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1477 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1468 && ev.xproperty.state == PropertyNewValue) 1478 && ev.xproperty.state == PropertyNewValue)
1469 selection_property (ev.xproperty.window, ev.xproperty.atom); 1479 selection_property (ev.xproperty.window, ev.xproperty.atom);
1470 1480
1471 break; 1481 break;
1472 1482
1473 case SelectionClear: 1483 case SelectionClear:
1474 selection_clear (); 1484 selection_clear ();
… …
1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1489 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1480 break; 1490 break;
1481 1491
1482 case SelectionRequest: 1492 case SelectionRequest:
1483 selection_send (ev.xselectionrequest); 1493 selection_send (ev.xselectionrequest);
1494 break;
1495
1496 case MapNotify:
1497 mapped = 1;
1498#ifdef TEXT_BLINK
1499 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1500#endif
1501 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break; 1502 break;
1485 1503
1486 case UnmapNotify: 1504 case UnmapNotify:
1487 mapped = 0; 1505 mapped = 0;
1488#ifdef TEXT_BLINK 1506#ifdef TEXT_BLINK
1489 text_blink_ev.stop (); 1507 text_blink_ev.stop ();
1490#endif 1508#endif
1491 break; 1509 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1492
1493 case MapNotify:
1494 mapped = 1;
1495#ifdef TEXT_BLINK
1496 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1497#endif
1498 break; 1510 break;
1499 1511
1500#ifdef TRANSPARENT 1512#ifdef TRANSPARENT
1501 case ReparentNotify: 1513 case ReparentNotify:
1502 rootwin_cb (ev); 1514 rootwin_cb (ev);
… …
1508 if (ev.xany.window == vt) 1520 if (ev.xany.window == vt)
1509 { 1521 {
1510 do 1522 do
1511 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1512 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1513 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1525 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1514 1526
1515 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1516 1528
1517 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1529 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1518 scr_expose (ev.xexpose.x, ev.xexpose.y, 1530 scr_expose (ev.xexpose.x, ev.xexpose.y,
1519 ev.xexpose.width, ev.xexpose.height, False); 1531 ev.xexpose.width, ev.xexpose.height, False);
1520 1532
1521 scr_refresh (refresh_type); 1533 want_refresh = 1;
1522 } 1534 }
1523 else 1535 else
1524 { 1536 {
1525 XEvent unused_event; 1537 XEvent unused_event;
1526 1538
1527 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1528 ; 1540 ;
1529 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1541 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1530 ; 1542 ;
1531 1543
1532 if (isScrollbarWindow (ev.xany.window)) 1544 if (isScrollbarWindow (ev.xany.window))
1533 { 1545 {
1534 scrollBar.setIdle (); 1546 scrollBar.setIdle ();
1535 scrollbar_show (0); 1547 scrollbar_show (0);
1536 } 1548 }
1537#ifdef MENUBAR
1538 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1539 menubar_expose ();
1540#endif
1541 1549
1542#ifdef TRANSPARENT 1550#ifdef TRANSPARENT
1543 if (am_transparent && ev.xany.window == parent[0]) 1551 if (am_transparent && ev.xany.window == parent[0])
1544 XClearWindow (disp, ev.xany.window); 1552 XClearWindow (xdisp, ev.xany.window);
1545#endif 1553#endif
1546 } 1554 }
1547 break; 1555 break;
1548 1556
1549 case MotionNotify: 1557 case MotionNotify:
1550#ifdef POINTER_BLANK 1558#ifdef POINTER_BLANK
1551 if (hidden_pointer) 1559 if (hidden_pointer)
1552 pointer_unblank (); 1560 pointer_unblank ();
1553#endif 1561#endif
1554#if MENUBAR
1555 if (isMenuBarWindow (ev.xany.window))
1556 {
1557 menubar_control (ev.xbutton);
1558 break;
1559 }
1560#endif
1561 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1562 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1562 break; 1563 break;
1563 1564
1564 if (ev.xany.window == vt) 1565 if (ev.xany.window == vt)
1565 { 1566 {
1567 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1568 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1569 ; // nop
1566 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1570 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1567 { 1571 {
1568 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1572 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1569 ; 1573 ;
1570 1574
1571 XQueryPointer (disp, vt, 1575 XQueryPointer (xdisp, vt,
1572 &unused_root, &unused_child, 1576 &unused_root, &unused_child,
1573 &unused_root_x, &unused_root_y, 1577 &unused_root_x, &unused_root_y,
1574 &ev.xbutton.x, &ev.xbutton.y, 1578 &ev.xbutton.x, &ev.xbutton.y,
1575 &ev.xbutton.state); 1579 &ev.xbutton.state);
1576#ifdef MOUSE_THRESHOLD 1580#ifdef MOUSE_THRESHOLD
… …
1640#endif 1644#endif
1641 } 1645 }
1642 } 1646 }
1643 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1647 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1644 { 1648 {
1645 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1649 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1646 MotionNotify, &ev)) 1650 MotionNotify, &ev))
1647 ; 1651 ;
1648 1652
1649 XQueryPointer (disp, scrollBar.win, 1653 XQueryPointer (xdisp, scrollBar.win,
1650 &unused_root, &unused_child, 1654 &unused_root, &unused_child,
1651 &unused_root_x, &unused_root_y, 1655 &unused_root_x, &unused_root_y,
1652 &ev.xbutton.x, &ev.xbutton.y, 1656 &ev.xbutton.x, &ev.xbutton.y,
1653 &unused_mask); 1657 &unused_mask);
1654 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1655 scrollbar_size ()); 1659 scrollbar_size ());
1656 scr_refresh (refresh_type); 1660 want_refresh = 1;
1657 refresh_limit = 0; 1661 refresh_limit = 0;
1658 scrollbar_show (1); 1662 scrollbar_show (1);
1659 } 1663 }
1660 break; 1664 break;
1661 } 1665 }
1666
1667skip_switch: ;
1668
1669#if defined(CURSOR_BLINK)
1670 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1671 {
1672 if (hidden_cursor)
1673 {
1674 hidden_cursor = 0;
1675 want_refresh = 1;
1676 }
1677
1678 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1679 }
1680#endif
1681
1682#if defined(POINTER_BLANK)
1683 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1684 {
1685 if (ev.type == MotionNotify
1686 || ev.type == ButtonPress
1687 || ev.type == ButtonRelease)
1688 if (hidden_pointer)
1689 pointer_unblank ();
1690
1691 if (ev.type == KeyPress && hidden_pointer == 0)
1692 pointer_blank ();
1693 }
1694#endif
1662} 1695}
1663 1696
1664void 1697void
1665rxvt_term::focus_in () 1698rxvt_term::focus_in ()
1666{ 1699{
1667 if (!focus) 1700 if (!focus)
1668 { 1701 {
1669 focus = 1; 1702 focus = 1;
1670 want_refresh = 1; 1703 want_refresh = 1;
1704
1705 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1706
1671#if USE_XIM 1707#if USE_XIM
1672 if (Input_Context != NULL) 1708 if (Input_Context != NULL)
1673 { 1709 {
1674 IMSetStatusPosition (); 1710 IMSetStatusPosition ();
1675 XSetICFocus (Input_Context); 1711 XSetICFocus (Input_Context);
1676 } 1712 }
1677#endif 1713#endif
1678#if CURSOR_BLINK 1714#if CURSOR_BLINK
1679 if (options & Opt_cursorBlink) 1715 if (OPTION (Opt_cursorBlink))
1680 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1716 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1681#endif 1717#endif
1682#if OFF_FOCUS_FADING 1718#if OFF_FOCUS_FADING
1683 if (rs[Rs_fade]) 1719 if (rs[Rs_fade])
1684 { 1720 {
1685 pix_colors = pix_colors_focused; 1721 pix_colors = pix_colors_focused;
… …
1695 if (focus) 1731 if (focus)
1696 { 1732 {
1697 focus = 0; 1733 focus = 0;
1698 want_refresh = 1; 1734 want_refresh = 1;
1699 1735
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1737
1700#if ENABLE_FRILLS || ISO_14755 1738#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf)
1740 {
1701 iso14755buf = 0; 1741 iso14755buf = 0;
1702#endif
1703#if ENABLE_OVERLAY 1742# if ENABLE_OVERLAY
1704 scr_overlay_off (); 1743 scr_overlay_off ();
1744# endif
1745 }
1705#endif 1746#endif
1706#if USE_XIM 1747#if USE_XIM
1707 if (Input_Context != NULL) 1748 if (Input_Context != NULL)
1708 XUnsetICFocus (Input_Context); 1749 XUnsetICFocus (Input_Context);
1709#endif 1750#endif
1710#if CURSOR_BLINK 1751#if CURSOR_BLINK
1711 if (options & Opt_cursorBlink) 1752 if (OPTION (Opt_cursorBlink))
1712 cursor_blink_ev.stop (); 1753 cursor_blink_ev.stop ();
1713 hidden_cursor = 0; 1754 hidden_cursor = 0;
1714#endif 1755#endif
1715#if OFF_FOCUS_FADING 1756#if OFF_FOCUS_FADING
1716 if (rs[Rs_fade]) 1757 if (rs[Rs_fade])
… …
1724 1765
1725#if TRANSPARENT 1766#if TRANSPARENT
1726void 1767void
1727rxvt_term::rootwin_cb (XEvent &ev) 1768rxvt_term::rootwin_cb (XEvent &ev)
1728{ 1769{
1729 SET_R (this); 1770 make_current ();
1730 SET_LOCALE (locale);
1731 1771
1732 switch (ev.type) 1772 switch (ev.type)
1733 { 1773 {
1734 case PropertyNotify: 1774 case PropertyNotify:
1735 /* 1775 /*
… …
1740 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1780 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1741 return; 1781 return;
1742 1782
1743 /* FALLTHROUGH */ 1783 /* FALLTHROUGH */
1744 case ReparentNotify: 1784 case ReparentNotify:
1745 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1785 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1746 want_refresh = want_full_refresh = 1; 1786 want_refresh = want_full_refresh = 1;
1747 break; 1787 break;
1748 } 1788 }
1749} 1789}
1750#endif 1790#endif
… …
1753rxvt_term::button_press (XButtonEvent &ev) 1793rxvt_term::button_press (XButtonEvent &ev)
1754{ 1794{
1755 int reportmode = 0, clickintime; 1795 int reportmode = 0, clickintime;
1756 1796
1757 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1797 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1798
1758 if (!bypass_keystate) 1799 if (!bypass_keystate)
1759 reportmode = !! (priv_modes & PrivMode_mouse_report); 1800 reportmode = !! (priv_modes & PrivMode_mouse_report);
1760 1801
1761 /* 1802 /*
1762 * VT window processing of button press 1803 * VT window processing of button press
1763 */ 1804 */
1764 if (ev.window == vt) 1805 if (ev.window == vt)
1765 { 1806 {
1807 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1808 return;
1809
1766#if ISO_14755 1810#if ISO_14755
1767 // 5.4 1811 // 5.4
1768 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1769 { 1813 {
1770 iso14755_54 (ev.x, ev.y); 1814 iso14755_54 (ev.x, ev.y);
… …
1782#ifdef MOUSE_REPORT_DOUBLECLICK 1826#ifdef MOUSE_REPORT_DOUBLECLICK
1783 if (ev.button == MEvent.button && clickintime) 1827 if (ev.button == MEvent.button && clickintime)
1784 { 1828 {
1785 /* same button, within alloted time */ 1829 /* same button, within alloted time */
1786 MEvent.clicks++; 1830 MEvent.clicks++;
1831
1787 if (MEvent.clicks > 1) 1832 if (MEvent.clicks > 1)
1788 { 1833 {
1789 /* only report double clicks */ 1834 /* only report double clicks */
1790 MEvent.clicks = 2; 1835 MEvent.clicks = 2;
1791 mouse_report (ev); 1836 mouse_report (ev);
… …
1823#else 1868#else
1824 selection.rect = false; 1869 selection.rect = false;
1825#endif 1870#endif
1826 1871
1827 /* allow shift+left click to extend selection */ 1872 /* allow shift+left click to extend selection */
1828 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1873 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1829 { 1874 {
1830 if (MEvent.button == Button1 && clickintime) 1875 if (MEvent.button == Button1 && clickintime)
1831 selection_rotate (ev.x, ev.y); 1876 selection_rotate (ev.x, ev.y);
1832 else 1877 else
1833 selection_extend (ev.x, ev.y, 1); 1878 selection_extend (ev.x, ev.y, 1);
… …
1998 } 2043 }
1999 2044
2000 break; 2045 break;
2001 } 2046 }
2002 } 2047 }
2048
2003 return; 2049 return;
2004 } 2050 }
2005#if MENUBAR
2006 /*
2007 * Menubar window processing of button press
2008 */
2009 if (isMenuBarWindow (ev.window))
2010 menubar_control (ev);
2011#endif
2012} 2051}
2013 2052
2014void 2053void
2015rxvt_term::button_release (XButtonEvent &ev) 2054rxvt_term::button_release (XButtonEvent &ev)
2016{ 2055{
… …
2022 2061
2023 if (scrollbar_isUpDn ()) 2062 if (scrollbar_isUpDn ())
2024 { 2063 {
2025 scrollBar.setIdle (); 2064 scrollBar.setIdle ();
2026 scrollbar_show (0); 2065 scrollbar_show (0);
2027#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2028 refresh_type &= ~SMOOTH_REFRESH;
2029#endif
2030 } 2066 }
2031 2067
2032#ifdef SELECTION_SCROLLING 2068#ifdef SELECTION_SCROLLING
2033 if (sel_scroll_ev.active) 2069 if (sel_scroll_ev.active)
2034 sel_scroll_ev.stop(); 2070 sel_scroll_ev.stop();
2035#endif 2071#endif
2036 2072
2037 if (ev.window == vt) 2073 if (ev.window == vt)
2038 { 2074 {
2075 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2076 return;
2077
2039#if ISO_14755 2078#if ISO_14755
2040 // 5.4 2079 // 5.4
2041 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2080 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2042 return; 2081 return;
2043#endif 2082#endif
2083
2044 if (reportmode) 2084 if (reportmode)
2045 { 2085 {
2046 /* mouse report from vt window */ 2086 /* mouse report from vt window */
2047 /* don't report release of wheel "buttons" */ 2087 /* don't report release of wheel "buttons" */
2048 if (ev.button >= 4) 2088 if (ev.button >= 4)
… …
2078 { 2118 {
2079 case Button1: 2119 case Button1:
2080 case Button3: 2120 case Button3:
2081 selection_make (ev.time); 2121 selection_make (ev.time);
2082 break; 2122 break;
2123
2083 case Button2: 2124 case Button2:
2084 selection_request (ev.time, ev.x, ev.y); 2125 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2126 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2085 break; 2127 break;
2128
2086#ifdef MOUSE_WHEEL 2129#ifdef MOUSE_WHEEL
2087 case Button4: 2130 case Button4:
2088 case Button5: 2131 case Button5:
2089 { 2132 {
2090 int i; 2133 int i;
… …
2092 2135
2093 v = ev.button == Button4 ? UP : DN; 2136 v = ev.button == Button4 ? UP : DN;
2094 2137
2095 if (ev.state & ShiftMask) 2138 if (ev.state & ShiftMask)
2096 i = 1; 2139 i = 1;
2097 else if (options & Opt_mouseWheelScrollPage) 2140 else if (OPTION (Opt_mouseWheelScrollPage))
2098 i = nrow - 1; 2141 i = nrow - 1;
2099 else 2142 else
2100 i = 5; 2143 i = 5;
2101 2144
2102# ifdef MOUSE_SLIP_WHEELING 2145# ifdef MOUSE_SLIP_WHEELING
… …
2112 slip_wheel_ev.start (); 2155 slip_wheel_ev.start ();
2113 } 2156 }
2114 else 2157 else
2115 { 2158 {
2116# endif 2159# endif
2117# ifdef JUMP_MOUSE_WHEEL
2118 scr_page (v, i); 2160 scr_page (v, i);
2119 scr_refresh (SMOOTH_REFRESH);
2120 scrollbar_show (1); 2161 scrollbar_show (1);
2121# else
2122 while (i--)
2123 {
2124 scr_page (v, 1);
2125 scr_refresh (SMOOTH_REFRESH);
2126 scrollbar_show (1);
2127 }
2128# endif
2129# ifdef MOUSE_SLIP_WHEELING 2162# ifdef MOUSE_SLIP_WHEELING
2130 } 2163 }
2131#endif 2164# endif
2132 } 2165 }
2133 break; 2166 break;
2134#endif 2167#endif
2135 } 2168 }
2136 } 2169 }
2137#ifdef MENUBAR
2138 else if (isMenuBarWindow (ev.window))
2139 menubar_control (ev);
2140#endif
2141} 2170}
2142 2171
2143#ifdef TRANSPARENT 2172#ifdef TRANSPARENT
2144#if TINTING 2173#if TINTING
2145/* taken from aterm-0.4.2 */ 2174/* taken from aterm-0.4.2 */
2146 2175
2147typedef uint32_t RUINT32T; 2176typedef uint32_t RUINT32T;
2148 2177
2149void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2178void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2150{ 2179{
2151 int sh_r, sh_g, sh_b; 2180 int sh_r, sh_g, sh_b;
2152 RUINT32T mask_r, mask_g, mask_b; 2181 RUINT32T mask_r, mask_g, mask_b;
2153 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2182 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2154 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2183 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2155 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2184 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2156 int i; 2185 int i;
2157 2186
2158 Visual *visual = display->visual; 2187 Visual *visual = term->visual;
2159 2188
2160 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2189 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2161 2190
2162 /* for convenience */ 2191 /* for convenience */
2163 mask_r = visual->red_mask; 2192 mask_r = visual->red_mask;
… …
2384 Atom atype; 2413 Atom atype;
2385 unsigned char *prop = NULL; 2414 unsigned char *prop = NULL;
2386 Window root, oldp, *list; 2415 Window root, oldp, *list;
2387 Pixmap rootpixmap = None; 2416 Pixmap rootpixmap = None;
2388 XWindowAttributes wattr, wrootattr; 2417 XWindowAttributes wattr, wrootattr;
2389 dDisp;
2390 2418
2391 pchanged = 0; 2419 pchanged = 0;
2392 2420
2393 if (!(options & Opt_transparent)) 2421 if (!OPTION (Opt_transparent))
2394 return pchanged; /* Don't try any more */ 2422 return pchanged; /* Don't try any more */
2395 2423
2396 XGetWindowAttributes (disp, display->root, &wrootattr); 2424 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2397 rootdepth = wrootattr.depth; 2425 rootdepth = wrootattr.depth;
2398 2426
2399 XGetWindowAttributes (disp, parent[0], &wattr); 2427 XGetWindowAttributes (xdisp, parent[0], &wattr);
2400 2428
2401 if (rootdepth != wattr.depth) 2429 if (rootdepth != wattr.depth)
2402 { 2430 {
2403 if (am_transparent) 2431 if (am_transparent)
2404 { 2432 {
2405 pchanged = 1; 2433 pchanged = 1;
2406 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2434 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2407 am_transparent = am_pixmap_trans = 0; 2435 am_transparent = am_pixmap_trans = 0;
2408 } 2436 }
2409 2437
2410 return pchanged; /* Don't try any more */ 2438 return pchanged; /* Don't try any more */
2411 } 2439 }
2412 2440
2413 /* Get all X ops out of the queue so that our information is up-to-date. */ 2441 /* Get all X ops out of the queue so that our information is up-to-date. */
2414 XSync (disp, False); 2442 XSync (xdisp, False);
2415 2443
2416 /* 2444 /*
2417 * Make the frame window set by the window manager have 2445 * Make the frame window set by the window manager have
2418 * the root background. Some window managers put multiple nested frame 2446 * the root background. Some window managers put multiple nested frame
2419 * windows for each client, so we have to take care about that. 2447 * windows for each client, so we have to take care about that.
2420 */ 2448 */
2421 i = (xa[XA_XROOTPMAP_ID] 2449 i = (xa[XA_XROOTPMAP_ID]
2422 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2450 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2423 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2451 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2424 &nitems, &bytes_after, &prop) == Success); 2452 &nitems, &bytes_after, &prop) == Success);
2425 2453
2426 if (!i || prop == NULL) 2454 if (!i || prop == NULL)
2427 i = (xa[XA_ESETROOT_PMAP_ID] 2455 i = (xa[XA_ESETROOT_PMAP_ID]
2428 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2456 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2429 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2457 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2430 &nitems, &bytes_after, &prop) == Success); 2458 &nitems, &bytes_after, &prop) == Success);
2431 2459
2432 if (!i || prop == NULL 2460 if (!i || prop == NULL
2433#if TINTING 2461#if TINTING
2434 || !rs[Rs_color + Color_tint] 2462 || !ISSET_PIXCOLOR (Color_tint)
2435#endif 2463#endif
2436 ) 2464 )
2437 have_pixmap = 0; 2465 have_pixmap = 0;
2438 else 2466 else
2439 { 2467 {
… …
2452 Window cr; 2480 Window cr;
2453 XImage *image; 2481 XImage *image;
2454 GC gc; 2482 GC gc;
2455 XGCValues gcvalue; 2483 XGCValues gcvalue;
2456 2484
2457 XTranslateCoordinates (disp, parent[0], display->root, 2485 XTranslateCoordinates (xdisp, parent[0], display->root,
2458 0, 0, &sx, &sy, &cr); 2486 0, 0, &sx, &sy, &cr);
2459 nw = (unsigned int)szHint.width; 2487 nw = (unsigned int)szHint.width;
2460 nh = (unsigned int)szHint.height; 2488 nh = (unsigned int)szHint.height;
2461 nx = ny = 0; 2489 nx = ny = 0;
2462 2490
… …
2475 } 2503 }
2476 2504
2477 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2505 min_it (nw, (unsigned int) (wrootattr.width - sx));
2478 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2506 min_it (nh, (unsigned int) (wrootattr.height - sy));
2479 2507
2480 XSync (disp, False); 2508 XSync (xdisp, False);
2481 allowedxerror = -1; 2509 allowedxerror = -1;
2482 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2510 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2483 2511
2484 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2512 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2485 /* XXX: may need a delay here? */ 2513 /* XXX: may need a delay here? */
2486 allowedxerror = 0; 2514 allowedxerror = 0;
2487 2515
… …
2490 if (am_transparent && am_pixmap_trans) 2518 if (am_transparent && am_pixmap_trans)
2491 { 2519 {
2492 pchanged = 1; 2520 pchanged = 1;
2493 if (pixmap != None) 2521 if (pixmap != None)
2494 { 2522 {
2495 XFreePixmap (disp, pixmap); 2523 XFreePixmap (xdisp, pixmap);
2496 pixmap = None; 2524 pixmap = None;
2497 } 2525 }
2498 } 2526 }
2499 2527
2500 am_pixmap_trans = 0; 2528 am_pixmap_trans = 0;
2501 } 2529 }
2502 else 2530 else
2503 { 2531 {
2504 if (pixmap != None) 2532 if (pixmap != None)
2505 XFreePixmap (disp, pixmap); 2533 XFreePixmap (xdisp, pixmap);
2506 2534
2507#if TINTING 2535#if TINTING
2508 if (ISSET_PIXCOLOR (Color_tint)) 2536 if (ISSET_PIXCOLOR (Color_tint))
2509 { 2537 {
2510 unsigned short rm, gm, bm;
2511 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2538 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2512 2539
2540 rgba c;
2513 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2541 pix_colors_focused [Color_tint].get (c);
2514 2542
2515 ShadeXImage (display, image, shade, rm, gm, bm); 2543 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2516 } 2544 }
2517#endif 2545#endif
2518 2546
2519 pixmap = XCreatePixmap (disp, vt, 2547 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2520 szHint.width, szHint.height, image->depth);
2521 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2548 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2522 XPutImage (disp, pixmap, gc, image, 0, 0, 2549 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2523 nx, ny, image->width, image->height); 2550 nx, ny, image->width, image->height);
2524 XFreeGC (disp, gc); 2551 XFreeGC (xdisp, gc);
2525 XDestroyImage (image); 2552 XDestroyImage (image);
2526 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2553 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2527 XClearWindow (disp, parent[0]); 2554 XClearWindow (xdisp, parent[0]);
2528 2555
2529 if (!am_transparent || !am_pixmap_trans) 2556 if (!am_transparent || !am_pixmap_trans)
2530 pchanged = 1; 2557 pchanged = 1;
2531 2558
2532 am_transparent = am_pixmap_trans = 1; 2559 am_transparent = am_pixmap_trans = 1;
2533 } 2560 }
2534 } 2561 }
2535 2562
2536 if (am_pixmap_trans) 2563 if (am_pixmap_trans)
2537 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2564 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2538 else 2565 else
2539 { 2566 {
2540 unsigned int n; 2567 unsigned int n;
2541 /* 2568 /*
2542 * InheritPixmap transparency 2569 * InheritPixmap transparency
2543 */ 2570 */
2544 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2571 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2545 { 2572 {
2546 oldp = parent[i]; 2573 oldp = parent[i];
2547 XQueryTree (disp, parent[i - 1], &root, 2574 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2548 &parent[i], &list, &n);
2549 XFree (list); 2575 XFree (list);
2550 2576
2551 if (parent[i] == display->root) 2577 if (parent[i] == display->root)
2552 { 2578 {
2553 if (oldp != None) 2579 if (oldp != None)
… …
2561 } 2587 }
2562 2588
2563 n = 0; 2589 n = 0;
2564 2590
2565 if (pchanged) 2591 if (pchanged)
2566 {
2567 for (; n < (unsigned int)i; n++) 2592 for (; n < (unsigned int)i; n++)
2568 { 2593 {
2569 XGetWindowAttributes (disp, parent[n], &wattr); 2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2595
2570 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2596 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2571 { 2597 {
2572 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2598 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2573 break; 2599 break;
2574 } 2600 }
2575 } 2601 }
2576 }
2577 2602
2578 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2603 if (n > (sizeof (parent) / sizeof (parent[0])))
2579 { 2604 {
2580 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2581 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2582 am_transparent = 0; 2607 am_transparent = 0;
2583 /* XXX: also turn off Opt_transparent? */ 2608 /* XXX: also turn off Opt_transparent? */
2584 } 2609 }
2585 else 2610 else
2586 { 2611 {
2587#if WAIT_FOR_WM
2588 /* wait (an arbitrary period) for the WM to do its thing
2589 * needed for fvwm2.2.2 (and before?) */
2590 sleep (1);
2591#endif
2592 for (n = 0; n < (unsigned int)i; n++) 2612 for (n = 0; n < (unsigned int)i; n++)
2593 { 2613 {
2594 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2595 XClearWindow (disp, parent[n]); 2615 XClearWindow (xdisp, parent[n]);
2596 } 2616 }
2597 2617
2598 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2599 am_transparent = 1; 2619 am_transparent = 1;
2600 } 2620 }
2601 2621
2602 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2603 parent[i] = None; 2623 parent[i] = None;
2604 } 2624 }
2605 2625
2606 if (scrollBar.win) 2626 if (scrollBar.win)
2607 { 2627 {
2608 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2609 scrollBar.setIdle (); 2629 scrollBar.setIdle ();
2610 scrollbar_show (0); 2630 scrollbar_show (0);
2611 } 2631 }
2612 2632
2613 if (am_transparent) 2633 if (am_transparent)
… …
2625 2645
2626bool 2646bool
2627rxvt_term::cmd_parse () 2647rxvt_term::cmd_parse ()
2628{ 2648{
2629 bool flag = false; 2649 bool flag = false;
2630 unicode_t ch = NOCHAR; 2650 wchar_t ch = NOCHAR;
2631 unsigned char *seq_begin; // remember start of esc-sequence here 2651 char *seq_begin; // remember start of esc-sequence here
2632 2652
2633 for (;;) 2653 for (;;)
2634 { 2654 {
2635 if (ch == NOCHAR) 2655 if (ch == NOCHAR)
2636 { 2656 {
2637 seq_begin = cmdbuf_ptr; 2657 seq_begin = cmdbuf_ptr;
2638 ch = next_char (); 2658 ch = next_char ();
2639 }
2640 2659
2641 if (ch == NOCHAR) // TODO: improve 2660 if (ch == NOCHAR)
2642 break; 2661 break;
2662 }
2643 2663
2644 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2664 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2645 { 2665 {
2646 if (!seen_input) 2666 if (!seen_input)
2647 { 2667 {
… …
2656 if (seen_resize && cmd_pid) 2676 if (seen_resize && cmd_pid)
2657 kill (-cmd_pid, SIGWINCH); 2677 kill (-cmd_pid, SIGWINCH);
2658 } 2678 }
2659 2679
2660 /* Read a text string from the input buffer */ 2680 /* Read a text string from the input buffer */
2661 unicode_t buf[UBUFSIZ]; 2681 wchar_t buf[UBUFSIZ];
2662 bool refreshnow = false; 2682 bool refreshnow = false;
2663 int nlines = 0; 2683 int nlines = 0;
2664 unicode_t *str = buf; 2684 wchar_t *str = buf;
2665 unicode_t *eol = str + min (ncol, UBUFSIZ); 2685 wchar_t *eol = str + min (ncol, UBUFSIZ);
2666 2686
2667 for (;;) 2687 for (;;)
2668 { 2688 {
2669 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2689 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2670 break; 2690 break;
… …
2676 if (ch == C0_LF) 2696 if (ch == C0_LF)
2677 nlines++; 2697 nlines++;
2678 2698
2679 refresh_count++; 2699 refresh_count++;
2680 2700
2681 if (!(options & Opt_jumpScroll) 2701 if (!OPTION (Opt_jumpScroll)
2682 || (refresh_count >= refresh_limit * (nrow - 1))) 2702 || (refresh_count >= refresh_limit * (nrow - 1)))
2683 { 2703 {
2684 refreshnow = true; 2704 refreshnow = true;
2705 refresh_count = 0;
2685 ch = NOCHAR; 2706 ch = NOCHAR;
2686 break; 2707 break;
2687 } 2708 }
2688 2709
2689 // scr_add_lines only works for nlines <= nrow - 1. 2710 // scr_add_lines only works for nlines <= nrow - 1.
2690 if (nlines >= nrow - 1) 2711 if (nlines >= nrow - 1)
2691 { 2712 {
2713 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2714 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2692 scr_add_lines (buf, nlines, str - buf); 2715 scr_add_lines (buf, str - buf, nlines);
2716
2693 nlines = 0; 2717 nlines = 0;
2694 str = buf; 2718 str = buf;
2695 eol = str + min (ncol, UBUFSIZ); 2719 eol = str + min (ncol, UBUFSIZ);
2696 } 2720 }
2697 2721
… …
2710 2734
2711 seq_begin = cmdbuf_ptr; 2735 seq_begin = cmdbuf_ptr;
2712 ch = next_char (); 2736 ch = next_char ();
2713 } 2737 }
2714 2738
2739 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2715 scr_add_lines (buf, nlines, str - buf); 2741 scr_add_lines (buf, str - buf, nlines);
2716 2742
2717 /* 2743 /*
2718 * If there have been a lot of new lines, then update the screen 2744 * If there have been a lot of new lines, then update the screen
2719 * What the heck I'll cheat and only refresh less than every page-full. 2745 * What the heck I'll cheat and only refresh less than every page-full.
2720 * the number of pages between refreshes is refresh_limit, which 2746 * the number of pages between refreshes is refresh_limit, which
2721 * is incremented here because we must be doing flat-out scrolling. 2747 * is incremented here because we must be doing flat-out scrolling.
2722 */ 2748 */
2723 if (refreshnow) 2749 if (refreshnow)
2724 { 2750 {
2725 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2726 refresh_limit++; 2752 refresh_limit++;
2727 else 2753 else
2728 { 2754 {
2729 flag = true; 2755 flag = true;
2730 scr_refresh (refresh_type); 2756 scr_refresh ();
2757 want_refresh = 1;
2731 } 2758 }
2732 } 2759 }
2733 2760
2734 } 2761 }
2735 else 2762 else
… …
2750 } 2777 }
2751 2778
2752 return flag; 2779 return flag;
2753} 2780}
2754 2781
2755// read the next octet
2756unicode_t
2757rxvt_term::next_octet ()
2758{
2759 return cmdbuf_ptr < cmdbuf_endp
2760 ? *cmdbuf_ptr++
2761 : NOCHAR;
2762}
2763
2764// read the next character 2782// read the next character
2765unicode_t 2783wchar_t
2766rxvt_term::next_char () 2784rxvt_term::next_char () NOTHROW
2767{ 2785{
2768 while (cmdbuf_ptr < cmdbuf_endp) 2786 while (cmdbuf_ptr < cmdbuf_endp)
2769 { 2787 {
2770 // assume 7-bit to be ascii ALWAYS 2788 // assume 7-bit to be ascii ALWAYS
2771 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2789 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2772 return *cmdbuf_ptr++; 2790 return *cmdbuf_ptr++;
2773 2791
2774 wchar_t wc; 2792 wchar_t wc;
2775 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2793 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2776 2794
2777 if (len == (size_t)-2) 2795 if (len == (size_t)-2)
2778 { 2796 {
2779 // the mbstate stores incomplete sequences. didn't know this :/ 2797 // the mbstate stores incomplete sequences. didn't know this :/
2780 cmdbuf_ptr = cmdbuf_endp; 2798 cmdbuf_ptr = cmdbuf_endp;
2781 break; 2799 break;
2782 } 2800 }
2783 2801
2784 if (len == (size_t)-1) 2802 if (len == (size_t)-1)
2785 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2803 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2786 2804
2787 // assume wchar == unicode 2805 // assume wchar == unicode
2788 cmdbuf_ptr += len; 2806 cmdbuf_ptr += len;
2789 return wc & UNICODE_MASK; 2807 return wc & UNICODE_MASK;
2790 } 2808 }
2791 2809
2792 return NOCHAR; 2810 return NOCHAR;
2793} 2811}
2812
2813// read the next octet
2814uint32_t
2815rxvt_term::next_octet () NOTHROW
2816{
2817 return cmdbuf_ptr < cmdbuf_endp
2818 ? (unsigned char)*cmdbuf_ptr++
2819 : NOCHAR;
2820}
2821
2822static class out_of_input out_of_input;
2794 2823
2795/* rxvt_cmd_getc () - Return next input character */ 2824/* rxvt_cmd_getc () - Return next input character */
2796/* 2825/*
2797 * Return the next input character after first passing any keyboard input 2826 * Return the next input character after first passing any keyboard input
2798 * to the command. 2827 * to the command.
2799 */ 2828 */
2800unicode_t 2829wchar_t
2801rxvt_term::cmd_getc () 2830rxvt_term::cmd_getc () THROW ((class out_of_input))
2802{ 2831{
2803 unicode_t c = next_char (); 2832 wchar_t c = next_char ();
2804 2833
2805 if (c == NOCHAR) 2834 if (c == NOCHAR)
2806 throw out_of_input; 2835 throw out_of_input;
2807 2836
2808 return c; 2837 return c;
2809} 2838}
2810 2839
2811unicode_t 2840uint32_t
2812rxvt_term::cmd_get8 () 2841rxvt_term::cmd_get8 () THROW ((class out_of_input))
2813{ 2842{
2814 unicode_t c = next_octet (); 2843 uint32_t c = next_octet ();
2815 2844
2816 if (c == NOCHAR) 2845 if (c == NOCHAR)
2817 throw out_of_input; 2846 throw out_of_input;
2818 2847
2819 return c; 2848 return c;
… …
2919 case C0_ESC: 2948 case C0_ESC:
2920 process_escape_seq (); 2949 process_escape_seq ();
2921 break; 2950 break;
2922 case C0_ENQ: /* terminal Status */ 2951 case C0_ENQ: /* terminal Status */
2923 if (rs[Rs_answerbackstring]) 2952 if (rs[Rs_answerbackstring])
2924 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2953 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2925 (unsigned int)strlen (rs[Rs_answerbackstring]));
2926 else 2954 else
2927 tt_write ((unsigned char *)VT100_ANS, 2955 tt_write (VT100_ANS, strlen (VT100_ANS));
2928 (unsigned int)strlen (VT100_ANS));
2929 break; 2956 break;
2930 case C0_BEL: /* bell */ 2957 case C0_BEL: /* bell */
2931 scr_bell (); 2958 scr_bell ();
2932 break; 2959 break;
2933 case C0_BS: /* backspace */ 2960 case C0_BS: /* backspace */
… …
3057 scr_charset_set (2, (unsigned int)cmd_getc ()); 3084 scr_charset_set (2, (unsigned int)cmd_getc ());
3058 break; 3085 break;
3059 case '+': 3086 case '+':
3060 scr_charset_set (3, (unsigned int)cmd_getc ()); 3087 scr_charset_set (3, (unsigned int)cmd_getc ());
3061 break; 3088 break;
3062#if ENABLE_FRILLS 3089#if !ENABLE_MINIMAL
3063 case '6': 3090 case '6':
3064 scr_backindex (); 3091 scr_backindex ();
3065 break; 3092 break;
3066#endif 3093#endif
3067 case '7': 3094 case '7':
3068 scr_cursor (SAVE); 3095 scr_cursor (SAVE);
3069 break; 3096 break;
3070 case '8': 3097 case '8':
3071 scr_cursor (RESTORE); 3098 scr_cursor (RESTORE);
3072 break; 3099 break;
3073#if ENABLE_FRILLS 3100#if !ENABLE_MINIMAL
3074 case '9': 3101 case '9':
3075 scr_forwardindex (); 3102 scr_forwardindex ();
3076 break; 3103 break;
3077#endif 3104#endif
3078 case '=': 3105 case '=':
… …
3088 break; 3115 break;
3089 3116
3090 /* 8.3.87: NEXT LINE */ 3117 /* 8.3.87: NEXT LINE */
3091 case C1_NEL: /* ESC E */ 3118 case C1_NEL: /* ESC E */
3092 { 3119 {
3093 unicode_t nlcr[] = { C0_LF, C0_CR }; 3120 wchar_t nlcr[] = { C0_LF, C0_CR };
3094 scr_add_lines (nlcr, 1, 2); 3121 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3095 } 3122 }
3096 break; 3123 break;
3097 3124
3098 /* kidnapped escape sequence: Should be 8.3.48 */ 3125 /* kidnapped escape sequence: Should be 8.3.48 */
3099 case C1_ESA: /* ESC G */ 3126 case C1_ESA: /* ESC G */
… …
3121 process_dcs_seq (); 3148 process_dcs_seq ();
3122 break; 3149 break;
3123 3150
3124 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3151 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3125 case C1_SCI: /* ESC Z */ 3152 case C1_SCI: /* ESC Z */
3126 tt_write ((const unsigned char *)ESCZ_ANSWER, 3153 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3127 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3128 break; /* steal obsolete ESC [ c */ 3154 break; /* steal obsolete ESC [ c */
3129 3155
3130 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3156 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3131 case C1_CSI: /* ESC [ */ 3157 case C1_CSI: /* ESC [ */
3132 process_csi_seq (); 3158 process_csi_seq ();
… …
3241 ndef = get_byte_array_bit (csi_defaults, i); 3267 ndef = get_byte_array_bit (csi_defaults, i);
3242 for (p = 0; p < nargs; p++) 3268 for (p = 0; p < nargs; p++)
3243 if (arg[p] == -1) 3269 if (arg[p] == -1)
3244 arg[p] = ndef; 3270 arg[p] = ndef;
3245 3271
3246#ifdef DEBUG_CMD
3247 fprintf (stderr, "CSI ");
3248 for (p = 0; p < nargs; p++)
3249 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3250 fprintf (stderr, "%c\n", ch);
3251#endif
3252
3253 /* 3272 /*
3254 * private mode handling 3273 * private mode handling
3255 */ 3274 */
3256 if (priv) 3275 if (priv)
3257 { 3276 {
3258 switch (priv) 3277 switch (priv)
3259 { 3278 {
3260 case '>': 3279 case '>':
3261 if (ch == CSI_DA) /* secondary device attributes */ 3280 if (ch == CSI_DA) /* secondary device attributes */
3262 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3281 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3283 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3284 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3286 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3287 // that we do not support xterm mouse reporting (should be 95 when we do).
3288 //
3289 tt_printf ("\033[>%d;94;0c", 'U');
3290 }
3263 break; 3291 break;
3264 case '?': 3292 case '?':
3265 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3266 process_terminal_mode (ch, priv, nargs, arg); 3294 process_terminal_mode (ch, priv, nargs, arg);
3267 break; 3295 break;
… …
3376 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3404 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3377 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3405 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3378 break; 3406 break;
3379 3407
3380 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3408 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3381 tt_write ((const unsigned char *)VT100_ANS, 3409 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3382 (unsigned int) (sizeof (VT100_ANS) - 1));
3383 break; 3410 break;
3384 3411
3385 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3412 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3386 process_sgr_mode (nargs, arg); 3413 process_sgr_mode (nargs, arg);
3387 break; 3414 break;
… …
3394 break; 3421 break;
3395 case 6: /* CPR requested */ 3422 case 6: /* CPR requested */
3396 scr_report_position (); 3423 scr_report_position ();
3397 break; 3424 break;
3398 case 7: /* unofficial extension */ 3425 case 7: /* unofficial extension */
3399 if (options & Opt_insecure) 3426 if (OPTION (Opt_insecure))
3400 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3427 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3401 break; 3428 break;
3402 case 8: /* unofficial extension */ 3429 case 8: /* unofficial extension */
3403 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3430 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3404 break; 3431 break;
… …
3471 break; 3498 break;
3472 case CSI_75: 3499 case CSI_75:
3473 scr_cursor (RESTORE); 3500 scr_cursor (RESTORE);
3474 break; 3501 break;
3475 3502
3476#if ENABLE_FRILLS 3503#if !ENABLE_MINIMAL
3477 case CSI_74: 3504 case CSI_74:
3478 process_window_ops (arg, nargs); 3505 process_window_ops (arg, nargs);
3479 break; 3506 break;
3480#endif 3507#endif
3481 3508
… …
3488 break; 3515 break;
3489 } 3516 }
3490} 3517}
3491/*}}} */ 3518/*}}} */
3492 3519
3493#if ENABLE_FRILLS 3520#if !ENABLE_MINIMAL
3494/* ARGSUSED */ 3521/* ARGSUSED */
3495void 3522void
3496rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3523rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3497{ 3524{
3498 int x, y; 3525 int x, y;
3499 XWindowAttributes wattr; 3526 XWindowAttributes wattr;
3500 Window wdummy; 3527 Window wdummy;
3501 dDisp; 3528
3529 dLocal (Display *, xdisp);
3502 3530
3503 if (nargs == 0) 3531 if (nargs == 0)
3504 return; 3532 return;
3505 3533
3506 switch (args[0]) 3534 switch (args[0])
3507 { 3535 {
3508 /* 3536 /*
3509 * commands 3537 * commands
3510 */ 3538 */
3511 case 1: /* deiconify window */ 3539 case 1: /* deiconify window */
3512 XMapWindow (disp, parent[0]); 3540 XMapWindow (xdisp, parent[0]);
3513 break; 3541 break;
3514 case 2: /* iconify window */ 3542 case 2: /* iconify window */
3515 XIconifyWindow (disp, parent[0], display->screen); 3543 XIconifyWindow (xdisp, parent[0], display->screen);
3516 break; 3544 break;
3517 case 3: /* set position (pixels) */ 3545 case 3: /* set position (pixels) */
3518 XMoveWindow (disp, parent[0], args[1], args[2]); 3546 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3519 break; 3547 break;
3520 case 4: /* set size (pixels) */ 3548 case 4: /* set size (pixels) */
3521 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3522 break; 3550 break;
3523 case 5: /* raise window */ 3551 case 5: /* raise window */
3524 XRaiseWindow (disp, parent[0]); 3552 XRaiseWindow (xdisp, parent[0]);
3525 break; 3553 break;
3526 case 6: /* lower window */ 3554 case 6: /* lower window */
3527 XLowerWindow (disp, parent[0]); 3555 XLowerWindow (xdisp, parent[0]);
3528 break; 3556 break;
3529 case 7: /* refresh window */ 3557 case 7: /* refresh window */
3530 scr_touch (true); 3558 scr_touch (true);
3531 break; 3559 break;
3532 case 8: /* set size (chars) */ 3560 case 8: /* set size (chars) */
… …
3539 if (args[0] >= 24) /* set height (chars) */ 3567 if (args[0] >= 24) /* set height (chars) */
3540 set_widthheight ((unsigned int)width, 3568 set_widthheight ((unsigned int)width,
3541 (unsigned int) (args[1] * fheight)); 3569 (unsigned int) (args[1] * fheight));
3542 break; 3570 break;
3543 3571
3544
3545 /* 3572 /*
3546 * reports - some output format copied from XTerm 3573 * reports - some output format copied from XTerm
3547 */ 3574 */
3548 case 11: /* report window state */ 3575 case 11: /* report window state */
3549 XGetWindowAttributes (disp, parent[0], &wattr); 3576 XGetWindowAttributes (xdisp, parent[0], &wattr);
3550 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3577 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3551 break; 3578 break;
3552 case 13: /* report window position */ 3579 case 13: /* report window position */
3553 XGetWindowAttributes (disp, parent[0], &wattr); 3580 XGetWindowAttributes (xdisp, parent[0], &wattr);
3554 XTranslateCoordinates (disp, parent[0], wattr.root, 3581 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3555 -wattr.border_width, -wattr.border_width, 3582 -wattr.border_width, -wattr.border_width,
3556 &x, &y, &wdummy); 3583 &x, &y, &wdummy);
3557 tt_printf ("\033[3;%d;%dt", x, y); 3584 tt_printf ("\033[3;%d;%dt", x, y);
3558 break; 3585 break;
3559 case 14: /* report window size (pixels) */ 3586 case 14: /* report window size (pixels) */
3560 XGetWindowAttributes (disp, parent[0], &wattr); 3587 XGetWindowAttributes (xdisp, parent[0], &wattr);
3561 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3588 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3562 break; 3589 break;
3563 case 18: /* report text area size (chars) */ 3590 case 18: /* report text area size (chars) */
3564 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3591 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3565 break; 3592 break;
… …
3567 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3594 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3568 break; 3595 break;
3569 case 20: /* report icon label */ 3596 case 20: /* report icon label */
3570 { 3597 {
3571 char *s; 3598 char *s;
3572 XGetIconName (disp, parent[0], &s); 3599 XGetIconName (xdisp, parent[0], &s);
3573 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3600 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3574 XFree (s); 3601 XFree (s);
3575 } 3602 }
3576 break; 3603 break;
3577 case 21: /* report window title */ 3604 case 21: /* report window title */
3578 { 3605 {
3579 char *s; 3606 char *s;
3580 XFetchName (disp, parent[0], &s); 3607 XFetchName (xdisp, parent[0], &s);
3581 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 */
3582 XFree (s); 3609 XFree (s);
3583 } 3610 }
3584 break; 3611 break;
3585 } 3612 }
3586} 3613}
… …
3589/*----------------------------------------------------------------------*/ 3616/*----------------------------------------------------------------------*/
3590/* 3617/*
3591 * get input up until STRING TERMINATOR (or BEL) 3618 * get input up until STRING TERMINATOR (or BEL)
3592 * ends_how is terminator used. returned input must be free()'d 3619 * ends_how is terminator used. returned input must be free()'d
3593 */ 3620 */
3594unsigned char * 3621char *
3595rxvt_term::get_to_st (unicode_t &ends_how) 3622rxvt_term::get_to_st (unicode_t &ends_how)
3596{ 3623{
3597 unicode_t ch; 3624 unicode_t ch;
3598 bool seen_esc = false; 3625 bool seen_esc = false;
3599 unsigned int n = 0; 3626 unsigned int n = 0;
… …
3632 3659
3633 string[n++] = '\0'; 3660 string[n++] = '\0';
3634 3661
3635 ends_how = (ch == 0x5c ? C0_ESC : ch); 3662 ends_how = (ch == 0x5c ? C0_ESC : ch);
3636 3663
3637 return (unsigned char *)rxvt_wcstombs (string); 3664 return rxvt_wcstombs (string);
3638} 3665}
3639 3666
3640/*----------------------------------------------------------------------*/ 3667/*----------------------------------------------------------------------*/
3641/* 3668/*
3642 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3669 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3643 */ 3670 */
3644void 3671void
3645rxvt_term::process_dcs_seq () 3672rxvt_term::process_dcs_seq ()
3646{ 3673{
3647 unsigned char *s; 3674 char *s;
3648 unicode_t eh; 3675 unicode_t eh;
3649 3676
3650 /* 3677 /*
3651 * Not handled yet 3678 * Not handled yet
3652 */ 3679 */
… …
3671 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3698 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3672 arg = arg * 10 + (ch - '0'); 3699 arg = arg * 10 + (ch - '0');
3673 3700
3674 if (ch == ';') 3701 if (ch == ';')
3675 { 3702 {
3676 unsigned char *s = get_to_st (eh); 3703 char *s = get_to_st (eh);
3677 3704
3678 if (s) 3705 if (s)
3679 { 3706 {
3680 process_xterm_seq (arg, (char *)s, eh); 3707 process_xterm_seq (arg, s, eh);
3681 free (s); 3708 free (s);
3682 } 3709 }
3683 } 3710 }
3684} 3711}
3685 3712
3686void 3713void
3687rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3714rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3688{ 3715{
3689 if (str[0] == '?' && !str[1]) 3716 if (str[0] == '?' && !str[1])
3690 { 3717 {
3691 unsigned short r, g, b; 3718 rgba c;
3692 pix_colors_focused[color].get (display, r, g, b); 3719 pix_colors_focused[color].get (c);
3720
3721#if XFT
3722 if (c.a != rgba::MAX_CC)
3723 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3724 else
3725#endif
3693 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3726 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3694 } 3727 }
3695 else 3728 else
3696 set_window_color (color, str); 3729 set_window_color (color, str);
3697} 3730}
3698 3731
3699/* 3732/*
3700 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3733 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3701 */ 3734 */
3702void 3735void
3703rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3736rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3704{ 3737{
3705 int changed = 0;
3706 int color; 3738 int color;
3707 char *buf, *name; 3739 char *buf, *name;
3708 bool query = str[0] == '?' && !str[1]; 3740 bool query = str[0] == '?' && !str[1];
3709 int saveop = op; 3741 int saveop = op;
3710 dDisp; 3742
3743 dLocal (Display *, xdisp);
3711 3744
3712 assert (str != NULL); 3745 assert (str != NULL);
3713 switch (op) 3746 switch (op)
3714 { 3747 {
3715 case XTerm_name: 3748 case XTerm_name:
… …
3731 unsigned long bytes_after; 3764 unsigned long bytes_after;
3732 unsigned char *value = 0; 3765 unsigned char *value = 0;
3733 const char *str = ""; 3766 const char *str = "";
3734 3767
3735 if (prop 3768 if (prop
3736 && XGetWindowProperty (disp, parent[0], 3769 && XGetWindowProperty (xdisp, parent[0],
3737 prop, 0, 1<<16, 0, AnyPropertyType, 3770 prop, 0, 1<<16, 0, AnyPropertyType,
3738 &actual_type, &actual_format, 3771 &actual_type, &actual_format,
3739 &nitems, &bytes_after, &value) == Success 3772 &nitems, &bytes_after, &value) == Success
3740 && actual_type != None 3773 && actual_type != None
3741 && actual_format == 8) 3774 && actual_format == 8)
3742 str = (const char *)(value); 3775 str = (const char *)(value);
3743 3776
3744 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3777 tt_printf ("\033]%d;%s%c", op, str, resp);
3745 3778
3746 XFree (value); 3779 XFree (value);
3747 } 3780 }
3748 else 3781 else
3749 { 3782 {
… …
3753 { 3786 {
3754 *eq = 0; 3787 *eq = 0;
3755 set_utf8_property (display->atom (str), eq + 1); 3788 set_utf8_property (display->atom (str), eq + 1);
3756 } 3789 }
3757 else 3790 else
3758 XDeleteProperty (disp, parent[0], 3791 XDeleteProperty (xdisp, parent[0],
3759 display->atom (str)); 3792 display->atom (str));
3760 } 3793 }
3761 break; 3794 break;
3762 3795
3763 case XTerm_Color: 3796 case XTerm_Color:
… …
3765 { 3798 {
3766 if ((name = strchr (buf, ';')) == NULL) 3799 if ((name = strchr (buf, ';')) == NULL)
3767 break; 3800 break;
3768 3801
3769 *name++ = '\0'; 3802 *name++ = '\0';
3770 color = atoi (buf); 3803 color = atoi (buf) + minCOLOR;
3771 3804
3772 if (color < 0 || color >= TOTAL_COLORS) 3805 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3773 break; 3806 break;
3774 3807
3775 if ((buf = strchr (name, ';')) != NULL) 3808 if ((buf = strchr (name, ';')) != NULL)
3776 *buf++ = '\0'; 3809 *buf++ = '\0';
3777 3810
3778 if (name[0] == '?' && !name[1]) 3811 process_color_seq (op, color, name, resp);
3779 {
3780 unsigned short r, g, b;
3781 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3782 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3783 }
3784 else
3785 set_window_color (color + minCOLOR, name);
3786 } 3812 }
3787 break; 3813 break;
3788 case XTerm_Color00: 3814 case XTerm_Color00:
3789 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3815 process_color_seq (op, Color_fg, str, resp);
3790 break; 3816 break;
3791 case XTerm_Color01: 3817 case XTerm_Color01:
3792 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3818 process_color_seq (op, Color_bg, str, resp);
3793 break; 3819 break;
3794#ifndef NO_CURSORCOLOR 3820#ifndef NO_CURSORCOLOR
3795 case XTerm_Color_cursor: 3821 case XTerm_Color_cursor:
3796 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3822 process_color_seq (op, Color_cursor, str, resp);
3797 break; 3823 break;
3798#endif 3824#endif
3799 case XTerm_Color_pointer_fg: 3825 case XTerm_Color_pointer_fg:
3800 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3826 process_color_seq (op, Color_pointer_fg, str, resp);
3801 break; 3827 break;
3802 case XTerm_Color_pointer_bg: 3828 case XTerm_Color_pointer_bg:
3803 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3829 process_color_seq (op, Color_pointer_bg, str, resp);
3804 break; 3830 break;
3805#ifndef NO_BOLD_UNDERLINE_REVERSE 3831#ifndef NO_BOLD_UNDERLINE_REVERSE
3806 case XTerm_Color_BD:
3807 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3808 break;
3809 case XTerm_Color_UL:
3810 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3811 break;
3812 case XTerm_Color_RV: 3832 case XTerm_Color_RV:
3813 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3833 process_color_seq (op, Color_RV, str, resp);
3834 break;
3835 case Rxvt_Color_BD:
3836 case URxvt_Color_BD:
3837 process_color_seq (op, Color_BD, str, resp);
3838 break;
3839 case Rxvt_Color_UL:
3840 case URxvt_Color_UL:
3841 process_color_seq (op, Color_UL, str, resp);
3814 break; 3842 break;
3815 case URxvt_Color_IT: 3843 case URxvt_Color_IT:
3816 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3844 process_color_seq (op, Color_IT, str, resp);
3817 break; 3845 break;
3818#endif 3846#endif
3819#if TRANSPARENT && TINTING 3847#if TRANSPARENT && TINTING
3820 case URxvt_Color_tint: 3848 case URxvt_Color_tint:
3821 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3849 process_color_seq (op, Color_tint, str, resp);
3850
3822 check_our_parents (); 3851 check_our_parents ();
3852
3823 if (am_transparent) 3853 if (am_transparent)
3824 want_full_refresh = want_refresh = 1; 3854 want_full_refresh = want_refresh = 1;
3825 break;
3826#endif
3827 3855
3856 break;
3857#endif
3858
3828 case XTerm_Pixmap: 3859 case Rxvt_Pixmap:
3860 {
3829 if (*str != ';') 3861 if (*str != ';')
3830 { 3862 {
3831#if XPM_BACKGROUND 3863#if XPM_BACKGROUND
3832 scale_pixmap (""); /* reset to default scaling */ 3864 scale_pixmap (""); /* reset to default scaling */
3833 set_bgPixmap (str); /* change pixmap */ 3865 set_bgPixmap (str); /* change pixmap */
3834#endif
3835 scr_touch (true); 3866 scr_touch (true);
3867#endif
3836 } 3868 }
3869
3870 int changed = 0;
3871
3837 while ((str = strchr (str, ';')) != NULL) 3872 while ((str = strchr (str, ';')) != NULL)
3838 { 3873 {
3839 str++; 3874 str++;
3840#if XPM_BACKGROUND 3875#if XPM_BACKGROUND
3841 changed += scale_pixmap (str); 3876 changed += scale_pixmap (str);
3842#endif 3877#endif
3843 } 3878 }
3844 3879
3845 if (changed) 3880 if (changed)
3846 { 3881 {
3847#ifdef XPM_BACKGROUND 3882#ifdef XPM_BACKGROUND
3848 resize_pixmap (); 3883 resize_pixmap ();
3849#endif
3850 scr_touch (true); 3884 scr_touch (true);
3885#endif
3851 } 3886 }
3887 }
3852 break; 3888 break;
3853 3889
3854 case XTerm_restoreFG: 3890 case Rxvt_restoreFG:
3855 set_window_color (Color_fg, str); 3891 set_window_color (Color_fg, str);
3856 break; 3892 break;
3857 case XTerm_restoreBG: 3893 case Rxvt_restoreBG:
3858 set_window_color (Color_bg, str); 3894 set_window_color (Color_bg, str);
3859 break; 3895 break;
3860 3896
3861 case XTerm_logfile: 3897 case XTerm_logfile:
3862 // TODO, when secure mode? 3898 // TODO, when secure mode?
3863 break; 3899 break;
3864 3900
3865#ifdef MENUBAR
3866 case URxvt_Menu:
3867 if (options & Opt_insecure)
3868 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3869 break;
3870#endif
3871#if 0 3901#if 0
3872 case XTerm_dumpscreen: /* no error notices */ 3902 case Rxvt_dumpscreen: /* no error notices */
3873 { 3903 {
3874 int fd; 3904 int fd;
3875 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3905 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3876 { 3906 {
3877 scr_dump (fd); 3907 scr_dump (fd);
… …
3888 case URxvt_italicFont: 3918 case URxvt_italicFont:
3889 case URxvt_boldItalicFont: 3919 case URxvt_boldItalicFont:
3890#endif 3920#endif
3891 if (query) 3921 if (query)
3892 tt_printf ("\33]%d;%-.250s%c", saveop, 3922 tt_printf ("\33]%d;%-.250s%c", saveop,
3893 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3923 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3894 ? fontset[op - URxvt_font]->fontdesc : "", 3924 ? fontset[op - URxvt_font]->fontdesc : "",
3895 resp); 3925 resp);
3896 else 3926 else
3897 { 3927 {
3898 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3928 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3901 allocated.push_back ((void *)res); 3931 allocated.push_back ((void *)res);
3902 set_fonts (); 3932 set_fonts ();
3903 } 3933 }
3904 break; 3934 break;
3905 3935
3906#if ENABLE_FRILLS 3936 case URxvt_version:
3937 if (query)
3938 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3939 op,
3940 rs[Rs_name], VERSION[0], VERSION[2],
3941 resp);
3942 break;
3943
3944#if !ENABLE_MINIMAL
3907 case URxvt_locale: 3945 case URxvt_locale:
3908 if (query) 3946 if (query)
3909 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3947 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3910 else 3948 else
3911 { 3949 {
3912 set_locale (str); 3950 set_locale (str);
3913 pty.set_utf8_mode (enc_utf8); 3951 pty->set_utf8_mode (enc_utf8);
3914 init_xlocale (); 3952 init_xlocale ();
3915 } 3953 }
3916 break; 3954 break;
3917 3955
3918 case URxvt_view_up: 3956 case URxvt_view_up:
3919 case URxvt_view_down: 3957 case URxvt_view_down:
3958 {
3920 int lines = atoi (str); 3959 int lines = atoi (str);
3921 3960
3922 if (lines) 3961 if (lines)
3923 scr_page (op == URxvt_view_up ? UP : DN, lines); 3962 scr_page (op == URxvt_view_up ? UP : DN, lines);
3924 else 3963 else
3925 {
3926 scr_erase_savelines (); 3964 scr_erase_savelines ();
3927 } 3965 }
3928 3966
3967 break;
3968#endif
3969
3970#if ENABLE_PERL
3971 case URxvt_perl:
3972 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3973 ; // no responses yet
3929 break; 3974 break;
3930#endif 3975#endif
3931 } 3976 }
3932} 3977}
3933/*----------------------------------------------------------------------*/ 3978/*----------------------------------------------------------------------*/
… …
3964 return state; 4009 return state;
3965} 4010}
3966 4011
3967/* we're not using priv _yet_ */ 4012/* we're not using priv _yet_ */
3968void 4013void
3969rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4014rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3970{ 4015{
3971 unsigned int i, j; 4016 unsigned int i, j;
3972 int state; 4017 int state;
3973 4018
3974 static const struct 4019 static const struct
… …
3985 { 5, PrivMode_rVideo }, 4030 { 5, PrivMode_rVideo },
3986 { 6, PrivMode_relOrigin }, 4031 { 6, PrivMode_relOrigin },
3987 { 7, PrivMode_Autowrap }, 4032 { 7, PrivMode_Autowrap },
3988 // 8, bi-directional support mode 4033 // 8, bi-directional support mode
3989 { 9, PrivMode_MouseX10 }, 4034 { 9, PrivMode_MouseX10 },
3990#ifdef menuBar_esc
3991 { menuBar_esc, PrivMode_menuBar },
3992#endif
3993 // 18, 19 printing-related 4035 // 18, 19 printing-related
3994 { 25, PrivMode_VisibleCursor }, 4036 { 25, PrivMode_VisibleCursor },
3995#ifdef scrollBar_esc 4037#ifdef scrollBar_esc
3996 { scrollBar_esc, PrivMode_scrollBar }, 4038 { scrollBar_esc, PrivMode_scrollBar },
3997#endif 4039#endif
… …
4042 } 4084 }
4043 4085
4044 /* extra handling for values with state unkept */ 4086 /* extra handling for values with state unkept */
4045 switch (arg[i]) 4087 switch (arg[i])
4046 { 4088 {
4089#if ENABLE_STYLES
4090 case 1021:
4091 set_option (Opt_intensityStyles, mode);
4092
4093 scr_touch (true);
4094 break;
4095#endif
4047 case 1048: /* alternative cursor save */ 4096 case 1048: /* alternative cursor save */
4048 case 1049: 4097 case 1049:
4049 if (options & Opt_secondaryScreen) 4098 if (OPTION (Opt_secondaryScreen))
4050 if (mode == 0) 4099 if (mode == 0)
4051 scr_cursor (RESTORE); 4100 scr_cursor (RESTORE);
4052 else if (mode == 1) 4101 else if (mode == 1)
4053 scr_cursor (SAVE); 4102 scr_cursor (SAVE);
4054 break; 4103 break;
… …
4069 case 3: /* 80/132 */ 4118 case 3: /* 80/132 */
4070 if (priv_modes & PrivMode_132OK) 4119 if (priv_modes & PrivMode_132OK)
4071 set_widthheight (((state ? 132 : 80) * fwidth), height); 4120 set_widthheight (((state ? 132 : 80) * fwidth), height);
4072 break; 4121 break;
4073 case 4: /* smooth scrolling */ 4122 case 4: /* smooth scrolling */
4074 if (state)
4075 options &= ~Opt_jumpScroll;
4076 else
4077 options |= Opt_jumpScroll; 4123 set_option (Opt_jumpScroll, !state);
4078 break; 4124 break;
4079 case 5: /* reverse video */ 4125 case 5: /* reverse video */
4080 scr_rvideo_mode (state); 4126 scr_rvideo_mode (state);
4081 break; 4127 break;
4082 case 6: /* relative/absolute origins */ 4128 case 6: /* relative/absolute origins */
… …
4088 /* case 8: - auto repeat, can't do on a per window basis */ 4134 /* case 8: - auto repeat, can't do on a per window basis */
4089 case 9: /* X10 mouse reporting */ 4135 case 9: /* X10 mouse reporting */
4090 if (state) /* orthogonal */ 4136 if (state) /* orthogonal */
4091 priv_modes &= ~PrivMode_MouseX11; 4137 priv_modes &= ~PrivMode_MouseX11;
4092 break; 4138 break;
4093#ifdef menuBar_esc
4094 case menuBar_esc:
4095#ifdef MENUBAR
4096 map_menuBar (state);
4097#endif
4098 break;
4099#endif
4100#ifdef scrollBar_esc 4139#ifdef scrollBar_esc
4101 case scrollBar_esc: 4140 case scrollBar_esc:
4102 if (scrollbar_mapping (state)) 4141 if (scrollbar_mapping (state))
4103 { 4142 {
4104 resize_all_windows (0, 0, 0); 4143 resize_all_windows (0, 0, 0);
… …
4123#if 0 4162#if 0
4124 case 1001: 4163 case 1001:
4125 break; /* X11 mouse highlighting */ 4164 break; /* X11 mouse highlighting */
4126#endif 4165#endif
4127 case 1010: /* scroll to bottom on TTY output inhibit */ 4166 case 1010: /* scroll to bottom on TTY output inhibit */
4128 if (state)
4129 options &= ~Opt_scrollTtyOutput;
4130 else
4131 options |= Opt_scrollTtyOutput; 4167 set_option (Opt_scrollTtyOutput, !state);
4132 break; 4168 break;
4133 case 1011: /* scroll to bottom on key press */ 4169 case 1011: /* scroll to bottom on key press */
4134 if (state)
4135 options |= Opt_scrollTtyKeypress; 4170 set_option (Opt_scrollTtyKeypress, state);
4136 else
4137 options &= ~Opt_scrollTtyKeypress;
4138 break; 4171 break;
4139 case 1047: /* secondary screen w/ clearing last */ 4172 case 1047: /* secondary screen w/ clearing last */
4140 if (options & Opt_secondaryScreen) 4173 if (OPTION (Opt_secondaryScreen))
4141 if (current_screen != PRIMARY) 4174 if (current_screen != PRIMARY)
4142 scr_erase_screen (2); 4175 scr_erase_screen (2);
4143 scr_change_screen (state); 4176 scr_change_screen (state);
4144 break; 4177 break;
4145 case 1049: /* secondary screen w/ clearing first */ 4178 case 1049: /* secondary screen w/ clearing first */
4146 scr_change_screen (state); 4179 scr_change_screen (state);
4147 if (options & Opt_secondaryScreen) 4180 if (OPTION (Opt_secondaryScreen))
4148 if (current_screen != PRIMARY) 4181 if (current_screen != PRIMARY)
4149 scr_erase_screen (2); 4182 scr_erase_screen (2);
4150 break; 4183 break;
4151 default: 4184 default:
4152 break; 4185 break;
… …
4280 scr_color (Color_bg, Color_bg); 4313 scr_color (Color_bg, Color_bg);
4281 break; 4314 break;
4282 4315
4283 //case 50: // not variable spacing 4316 //case 50: // not variable spacing
4284 4317
4285#ifndef NO_BRIGHTCOLOR 4318#if !ENABLE_MINIMAL
4286 case 90: 4319 case 90:
4287 case 91: /* set bright fg color */ 4320 case 91: /* set bright fg color */
4288 case 92: 4321 case 92:
4289 case 93: 4322 case 93:
4290 case 94: 4323 case 94:
… …
4302 case 106: 4335 case 106:
4303 case 107: 4336 case 107:
4304 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4337 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4305 break; 4338 break;
4306#endif 4339#endif
4307
4308 } 4340 }
4309 } 4341 }
4310} 4342}
4311/*}}} */ 4343/*}}} */
4312 4344
… …
4336 */ 4368 */
4337void 4369void
4338rxvt_term::tt_printf (const char *fmt,...) 4370rxvt_term::tt_printf (const char *fmt,...)
4339{ 4371{
4340 va_list arg_ptr; 4372 va_list arg_ptr;
4341 unsigned char buf[256]; 4373 char buf[256];
4342 4374
4343 va_start (arg_ptr, fmt); 4375 va_start (arg_ptr, fmt);
4344 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4376 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4345 va_end (arg_ptr); 4377 va_end (arg_ptr);
4346 tt_write (buf, strlen (buf)); 4378 tt_write (buf, strlen (buf));
… …
4351 * or generated by us in response to a query ESC sequence. 4383 * or generated by us in response to a query ESC sequence.
4352 */ 4384 */
4353const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4385const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4354 4386
4355void 4387void
4356rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4388rxvt_term::tt_write (const char *data, unsigned int len)
4357{ 4389{
4390 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4391 return;
4392
4393 if (pty->pty < 0)
4394 return;
4395
4358 if (v_buflen == 0) 4396 if (v_buflen == 0)
4359 { 4397 {
4360 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4398 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4361 4399
4362 if ((unsigned int)written == len) 4400 if ((unsigned int)written == len)
4363 return; 4401 return;
4364 4402
4365 data += written; 4403 data += written;
4366 len -= written; 4404 len -= written;
4367 } 4405 }
4368 4406
4369 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4407 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4370 4408
4371 memcpy (v_buffer + v_buflen, data, len); 4409 memcpy (v_buffer + v_buflen, data, len);
4372 v_buflen += len; 4410 v_buflen += len;
4373 4411
4374 pty_ev.set (EVENT_READ | EVENT_WRITE); 4412 pty_ev.set (EVENT_READ | EVENT_WRITE);
4375} 4413}
4376 4414
4377void rxvt_term::pty_write () 4415void rxvt_term::pty_write ()
4378{ 4416{
4379 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4417 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4380 4418
4381 if (written > 0) 4419 if (written > 0)
4382 { 4420 {
4383 v_buflen -= written; 4421 v_buflen -= written;
4384 4422

Diff Legend

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