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

Diff Legend

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