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.200 by root, Sun Feb 20 19:45:30 2005 UTC vs.
Revision 1.299 by root, Tue Jan 31 19:11:43 2006 UTC

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

Diff Legend

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