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.209 by root, Tue Dec 20 19:30:59 2005 UTC vs.
Revision 1.287 by root, Sat Jan 28 20:08:05 2006 UTC

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

Diff Legend

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