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.197 by root, Thu Feb 17 15:07:48 2005 UTC vs.
Revision 1.296 by root, Tue Jan 31 14:16:59 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 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1391 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1336 destroy ();
1337#ifdef OFFIX_DND
1338 /* OffiX Dnd (drag 'n' drop) protocol */
1339 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1340 && (ev.xclient.data.l[0] == DndFile
1341 || ev.xclient.data.l[0] == DndDir
1342 || ev.xclient.data.l[0] == DndLink))
1343 { 1392 {
1344 /* Get Dnd data */ 1393 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1345 Atom ActualType; 1394 {
1346 int ActualFormat; 1395 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1347 unsigned char *data; 1396 {
1348 unsigned long Size, RemainingBytes; 1397 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1349 1398 {
1350 XGetWindowProperty (disp, display->root, 1399 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1351 xa[XA_DNDSELECTION], 1400 destroy ();
1352 0L, 1000000L, 1401 }
1353 False, AnyPropertyType, 1402#if ENABLE_EWMH
1354 &ActualType, &ActualFormat, 1403 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1355 &Size, &RemainingBytes, 1404 XSendEvent (xdisp, ev.xclient.window = display->root,
1405 False, SubstructureRedirectMask | SubstructureNotifyMask,
1356 &data); 1406 &ev);
1357 set_string_property (XA_CUT_BUFFER0, data); 1407#endif
1358 XFree (data); 1408 }
1359 selection_paste (display->root, XA_CUT_BUFFER0, true); 1409 }
1360 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime); 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 }
1418#endif
1361 } 1419 }
1362#endif /* OFFIX_DND */
1363 break; 1420 break;
1364 1421
1365 case MappingNotify: 1422 case MappingNotify:
1366 XRefreshKeyboardMapping (&ev.xmapping); 1423 XRefreshKeyboardMapping (&ev.xmapping);
1367 break; 1424 break;
… …
1390 break; 1447 break;
1391 } 1448 }
1392 break; 1449 break;
1393 1450
1394 case FocusIn: 1451 case FocusIn:
1395 if (!TermWin.focus) 1452 focus_in ();
1453 break;
1454
1455 case FocusOut:
1456 focus_out ();
1457 break;
1458
1459 case ConfigureNotify:
1460 if (ev.xconfigure.window == parent[0])
1396 { 1461 {
1397 TermWin.focus = 1;
1398 want_refresh = 1;
1399#ifdef USE_XIM
1400 if (Input_Context != NULL)
1401 {
1402 IMSetStatusPosition ();
1403 XSetICFocus (Input_Context);
1404 }
1405#endif
1406#ifdef CURSOR_BLINK
1407 if (options & Opt_cursorBlink)
1408 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1409#endif
1410#ifdef OFF_FOCUS_FADING
1411 if (rs[Rs_fade])
1412 {
1413 pix_colors = pix_colors_focused;
1414 scr_recolour ();
1415 }
1416#endif
1417
1418 }
1419 break;
1420
1421 case FocusOut:
1422 if (TermWin.focus)
1423 {
1424 TermWin.focus = 0;
1425 want_refresh = 1;
1426
1427#if ENABLE_FRILLS || ISO_14755
1428 iso14755buf = 0;
1429#endif
1430#if ENABLE_OVERLAY
1431 scr_overlay_off ();
1432#endif
1433#ifdef USE_XIM
1434 if (Input_Context != NULL)
1435 XUnsetICFocus (Input_Context);
1436#endif
1437#ifdef CURSOR_BLINK
1438 if (options & Opt_cursorBlink)
1439 cursor_blink_ev.stop ();
1440 hidden_cursor = 0;
1441#endif
1442#ifdef OFF_FOCUS_FADING
1443 if (rs[Rs_fade])
1444 {
1445 pix_colors = pix_colors_unfocused;
1446 scr_recolour ();
1447 }
1448#endif
1449 }
1450 break;
1451
1452 case ConfigureNotify:
1453 if (ev.xconfigure.window == TermWin.parent[0])
1454 {
1455 int height, width;
1456
1457 do
1458 { /* Wrap lots of configures into one */
1459 width = ev.xconfigure.width;
1460 height = ev.xconfigure.height;
1461 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1462 }
1463 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1462 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1463 ;
1464 1464
1465 if (szHint.width != width || szHint.height != height) 1465 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1466 {
1467 seen_resize = 1; 1467 seen_resize = 1;
1468 resize_all_windows (width, height, 1); 1468 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1469 } 1469 }
1470 1470
1471 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1472
1471#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1472 if (options & Opt_transparent) 1474 if (OPTION (Opt_transparent))
1473 check_our_parents (); 1475 check_our_parents ();
1474#endif 1476#endif
1475 } 1477 }
1476 break; 1478 break;
1477 1479
1478 case PropertyNotify: 1480 case PropertyNotify:
1481 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1479 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1482 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1480 && ev.xproperty.state == PropertyNewValue) 1483 && ev.xproperty.state == PropertyNewValue)
1481 selection_property (ev.xproperty.window, ev.xproperty.atom); 1484 selection_property (ev.xproperty.window, ev.xproperty.atom);
1482 1485
1483 break; 1486 break;
1484 1487
1485 case SelectionClear: 1488 case SelectionClear:
1486 selection_clear (); 1489 selection_clear ();
… …
1493 1496
1494 case SelectionRequest: 1497 case SelectionRequest:
1495 selection_send (ev.xselectionrequest); 1498 selection_send (ev.xselectionrequest);
1496 break; 1499 break;
1497 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
1498 case UnmapNotify: 1509 case UnmapNotify:
1499 TermWin.mapped = 0; 1510 mapped = 0;
1500#ifdef TEXT_BLINK 1511#ifdef TEXT_BLINK
1501 text_blink_ev.stop (); 1512 text_blink_ev.stop ();
1502#endif 1513#endif
1503 break; 1514 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505 case MapNotify:
1506 TermWin.mapped = 1;
1507#ifdef TEXT_BLINK
1508 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1509#endif
1510 break; 1515 break;
1511 1516
1512#ifdef TRANSPARENT 1517#ifdef TRANSPARENT
1513 case ReparentNotify: 1518 case ReparentNotify:
1514 rootwin_cb (ev); 1519 rootwin_cb (ev);
1515 break; 1520 break;
1516#endif /* TRANSPARENT */ 1521#endif /* TRANSPARENT */
1517 1522
1518 case GraphicsExpose: 1523 case GraphicsExpose:
1519 case Expose: 1524 case Expose:
1520 if (ev.xany.window == TermWin.vt) 1525 if (ev.xany.window == vt)
1521 { 1526 {
1522 do 1527 do
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1530 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1526 1531
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1532 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528 1533
1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1534 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1535 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1536 ev.xexpose.width, ev.xexpose.height, False);
1532 1537
1533 scr_refresh (refresh_type); 1538 want_refresh = 1;
1534 } 1539 }
1535 else 1540 else
1536 { 1541 {
1537 XEvent unused_event; 1542 XEvent unused_event;
1538 1543
1539 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1544 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1540 ; 1545 ;
1541 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1546 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1542 ; 1547 ;
1543 1548
1544 if (isScrollbarWindow (ev.xany.window)) 1549 if (isScrollbarWindow (ev.xany.window))
1545 { 1550 {
1546 scrollBar.setIdle (); 1551 scrollBar.setIdle ();
1547 scrollbar_show (0); 1552 scrollbar_show (0);
1548 } 1553 }
1549#ifdef MENUBAR
1550 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1551 menubar_expose ();
1552#endif
1553 1554
1554#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1555 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1556 if (am_transparent && ev.xany.window == parent[0])
1556 XClearWindow (disp, ev.xany.window); 1557 XClearWindow (xdisp, ev.xany.window);
1557#endif 1558#endif
1558 } 1559 }
1559 break; 1560 break;
1560 1561
1561 case MotionNotify: 1562 case MotionNotify:
1562#ifdef POINTER_BLANK 1563#ifdef POINTER_BLANK
1563 if (hidden_pointer) 1564 if (hidden_pointer)
1564 pointer_unblank (); 1565 pointer_unblank ();
1565#endif 1566#endif
1566#if MENUBAR
1567 if (isMenuBarWindow (ev.xany.window))
1568 {
1569 menubar_control (ev.xbutton);
1570 break;
1571 }
1572#endif
1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1574 break; 1568 break;
1575 1569
1576 if (ev.xany.window == TermWin.vt) 1570 if (ev.xany.window == vt)
1577 { 1571 {
1572 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1573 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1574 ; // nop
1578 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1575 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1576 {
1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1577 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1581 ; 1578 ;
1582 1579
1583 XQueryPointer (disp, TermWin.vt, 1580 XQueryPointer (xdisp, vt,
1584 &unused_root, &unused_child, 1581 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1582 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1583 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1584 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1585#ifdef MOUSE_THRESHOLD
… …
1600#endif 1597#endif
1601 selection_extend (ev.xbutton.x, ev.xbutton.y, 1598 selection_extend (ev.xbutton.x, ev.xbutton.y,
1602 ev.xbutton.state & Button3Mask ? 2 : 0); 1599 ev.xbutton.state & Button3Mask ? 2 : 0);
1603 1600
1604#ifdef SELECTION_SCROLLING 1601#ifdef SELECTION_SCROLLING
1605 if (ev.xbutton.y < TermWin.int_bwidth 1602 if (ev.xbutton.y < int_bwidth
1606 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1603 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1607 { 1604 {
1608 int dist; 1605 int dist;
1609 1606
1610 /* don't clobber the current delay if we are 1607 /* don't clobber the current delay if we are
1611 * already in the middle of scrolling. 1608 * already in the middle of scrolling.
… …
1619 selection_save_x = ev.xbutton.x; 1616 selection_save_x = ev.xbutton.x;
1620 selection_save_y = ev.xbutton.y; 1617 selection_save_y = ev.xbutton.y;
1621 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1618 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1622 1619
1623 /* calc number of lines to scroll */ 1620 /* calc number of lines to scroll */
1624 if (ev.xbutton.y < TermWin.int_bwidth) 1621 if (ev.xbutton.y < int_bwidth)
1625 { 1622 {
1626 scroll_selection_dir = UP; 1623 scroll_selection_dir = UP;
1627 dist = TermWin.int_bwidth - ev.xbutton.y; 1624 dist = int_bwidth - ev.xbutton.y;
1628 } 1625 }
1629 else 1626 else
1630 { 1627 {
1631 scroll_selection_dir = DN; 1628 scroll_selection_dir = DN;
1632 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1629 dist = ev.xbutton.y - (int_bwidth + height);
1633 } 1630 }
1634 1631
1635 scroll_selection_lines = Pixel2Height (dist) 1632 scroll_selection_lines = Pixel2Height (dist)
1636 / SELECTION_SCROLL_LINE_SPEEDUP 1633 / SELECTION_SCROLL_LINE_SPEEDUP
1637 + 1; 1634 + 1;
1638 MIN_IT (scroll_selection_lines, 1635 min_it (scroll_selection_lines,
1639 SELECTION_SCROLL_MAX_LINES); 1636 SELECTION_SCROLL_MAX_LINES);
1640 } 1637 }
1641 else 1638 else
1642 { 1639 {
1643 /* we are within the text window, so we 1640 /* we are within the text window, so we
… …
1652#endif 1649#endif
1653 } 1650 }
1654 } 1651 }
1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1652 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1656 { 1653 {
1657 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1654 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1658 MotionNotify, &ev)) 1655 MotionNotify, &ev))
1659 ; 1656 ;
1660 1657
1661 XQueryPointer (disp, scrollBar.win, 1658 XQueryPointer (xdisp, scrollBar.win,
1662 &unused_root, &unused_child, 1659 &unused_root, &unused_child,
1663 &unused_root_x, &unused_root_y, 1660 &unused_root_x, &unused_root_y,
1664 &ev.xbutton.x, &ev.xbutton.y, 1661 &ev.xbutton.x, &ev.xbutton.y,
1665 &unused_mask); 1662 &unused_mask);
1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1663 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1667 scrollbar_size ()); 1664 scrollbar_size ());
1668 scr_refresh (refresh_type); 1665 want_refresh = 1;
1669 refresh_limit = 0; 1666 refresh_limit = 0;
1670 scrollbar_show (1); 1667 scrollbar_show (1);
1671 } 1668 }
1672 break; 1669 break;
1673 } 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
1700}
1701
1702void
1703rxvt_term::focus_in ()
1704{
1705 if (!focus)
1706 {
1707 focus = 1;
1708 want_refresh = 1;
1709
1710 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1711
1712#if USE_XIM
1713 if (Input_Context != NULL)
1714 {
1715 IMSetStatusPosition ();
1716 XSetICFocus (Input_Context);
1717 }
1718#endif
1719#if CURSOR_BLINK
1720 if (OPTION (Opt_cursorBlink))
1721 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1722#endif
1723#if OFF_FOCUS_FADING
1724 if (rs[Rs_fade])
1725 {
1726 pix_colors = pix_colors_focused;
1727 scr_recolour ();
1728 }
1729#endif
1730 }
1731}
1732
1733void
1734rxvt_term::focus_out ()
1735{
1736 if (focus)
1737 {
1738 focus = 0;
1739 want_refresh = 1;
1740
1741 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1742
1743#if ENABLE_FRILLS || ISO_14755
1744 if (iso14755buf)
1745 {
1746 iso14755buf = 0;
1747# if ENABLE_OVERLAY
1748 scr_overlay_off ();
1749# endif
1750 }
1751#endif
1752#if USE_XIM
1753 if (Input_Context != NULL)
1754 XUnsetICFocus (Input_Context);
1755#endif
1756#if CURSOR_BLINK
1757 if (OPTION (Opt_cursorBlink))
1758 cursor_blink_ev.stop ();
1759 hidden_cursor = 0;
1760#endif
1761#if OFF_FOCUS_FADING
1762 if (rs[Rs_fade])
1763 {
1764 pix_colors = pix_colors_unfocused;
1765 scr_recolour ();
1766 }
1767#endif
1768 }
1674} 1769}
1675 1770
1676#if TRANSPARENT 1771#if TRANSPARENT
1677void 1772void
1678rxvt_term::rootwin_cb (XEvent &ev) 1773rxvt_term::rootwin_cb (XEvent &ev)
1679{ 1774{
1680 SET_R (this); 1775 make_current ();
1681 SET_LOCALE (locale);
1682 1776
1683 switch (ev.type) 1777 switch (ev.type)
1684 { 1778 {
1685 case PropertyNotify: 1779 case PropertyNotify:
1686 /* 1780 /*
… …
1691 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1785 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1692 return; 1786 return;
1693 1787
1694 /* FALLTHROUGH */ 1788 /* FALLTHROUGH */
1695 case ReparentNotify: 1789 case ReparentNotify:
1696 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1790 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1697 want_refresh = want_full_refresh = 1; 1791 want_refresh = want_full_refresh = 1;
1698 break; 1792 break;
1699 } 1793 }
1700} 1794}
1701#endif 1795#endif
… …
1704rxvt_term::button_press (XButtonEvent &ev) 1798rxvt_term::button_press (XButtonEvent &ev)
1705{ 1799{
1706 int reportmode = 0, clickintime; 1800 int reportmode = 0, clickintime;
1707 1801
1708 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1802 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1803
1709 if (!bypass_keystate) 1804 if (!bypass_keystate)
1710 reportmode = !! (priv_modes & PrivMode_mouse_report); 1805 reportmode = !! (priv_modes & PrivMode_mouse_report);
1711 1806
1712 /* 1807 /*
1713 * VT window processing of button press 1808 * VT window processing of button press
1714 */ 1809 */
1715 if (ev.window == TermWin.vt) 1810 if (ev.window == vt)
1716 { 1811 {
1812 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1813 return;
1814
1717#if ISO_14755 1815#if ISO_14755
1718 // 5.4 1816 // 5.4
1719 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1720 { 1818 {
1721 iso14755_54 (ev.x, ev.y); 1819 iso14755_54 (ev.x, ev.y);
… …
1733#ifdef MOUSE_REPORT_DOUBLECLICK 1831#ifdef MOUSE_REPORT_DOUBLECLICK
1734 if (ev.button == MEvent.button && clickintime) 1832 if (ev.button == MEvent.button && clickintime)
1735 { 1833 {
1736 /* same button, within alloted time */ 1834 /* same button, within alloted time */
1737 MEvent.clicks++; 1835 MEvent.clicks++;
1836
1738 if (MEvent.clicks > 1) 1837 if (MEvent.clicks > 1)
1739 { 1838 {
1740 /* only report double clicks */ 1839 /* only report double clicks */
1741 MEvent.clicks = 2; 1840 MEvent.clicks = 2;
1742 mouse_report (ev); 1841 mouse_report (ev);
… …
1774#else 1873#else
1775 selection.rect = false; 1874 selection.rect = false;
1776#endif 1875#endif
1777 1876
1778 /* allow shift+left click to extend selection */ 1877 /* allow shift+left click to extend selection */
1779 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1878 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1780 { 1879 {
1781 if (MEvent.button == Button1 && clickintime) 1880 if (MEvent.button == Button1 && clickintime)
1782 selection_rotate (ev.x, ev.y); 1881 selection_rotate (ev.x, ev.y);
1783 else 1882 else
1784 selection_extend (ev.x, ev.y, 1); 1883 selection_extend (ev.x, ev.y, 1);
… …
1925 case Button3: 2024 case Button3:
1926 if (scrollBar.style != R_SB_XTERM) 2025 if (scrollBar.style != R_SB_XTERM)
1927 { 2026 {
1928 if (scrollbar_above_slider (ev.y)) 2027 if (scrollbar_above_slider (ev.y))
1929# ifdef RXVT_SCROLL_FULL 2028# ifdef RXVT_SCROLL_FULL
1930 scr_page (UP, TermWin.nrow - 1); 2029 scr_page (UP, nrow - 1);
1931# else 2030# else
1932 scr_page (UP, TermWin.nrow / 4); 2031 scr_page (UP, nrow / 4);
1933# endif 2032# endif
1934 else if (scrollbar_below_slider (ev.y)) 2033 else if (scrollbar_below_slider (ev.y))
1935# ifdef RXVT_SCROLL_FULL 2034# ifdef RXVT_SCROLL_FULL
1936 scr_page (DN, TermWin.nrow - 1); 2035 scr_page (DN, nrow - 1);
1937# else 2036# else
1938 scr_page (DN, TermWin.nrow / 4); 2037 scr_page (DN, nrow / 4);
1939# endif 2038# endif
1940 else 2039 else
1941 scrollBar.setMotion (); 2040 scrollBar.setMotion ();
1942 } 2041 }
1943 else 2042 else
1944 { 2043 {
1945 scr_page ((ev.button == Button1 ? DN : UP), 2044 scr_page ((ev.button == Button1 ? DN : UP),
1946 (TermWin.nrow 2045 (nrow
1947 * scrollbar_position (ev.y) 2046 * scrollbar_position (ev.y)
1948 / scrollbar_size ())); 2047 / scrollbar_size ()));
1949 } 2048 }
1950 2049
1951 break; 2050 break;
1952 } 2051 }
1953 } 2052 }
2053
1954 return; 2054 return;
1955 } 2055 }
1956#if MENUBAR
1957 /*
1958 * Menubar window processing of button press
1959 */
1960 if (isMenuBarWindow (ev.window))
1961 menubar_control (ev);
1962#endif
1963} 2056}
1964 2057
1965void 2058void
1966rxvt_term::button_release (XButtonEvent &ev) 2059rxvt_term::button_release (XButtonEvent &ev)
1967{ 2060{
… …
1973 2066
1974 if (scrollbar_isUpDn ()) 2067 if (scrollbar_isUpDn ())
1975 { 2068 {
1976 scrollBar.setIdle (); 2069 scrollBar.setIdle ();
1977 scrollbar_show (0); 2070 scrollbar_show (0);
1978#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1979 refresh_type &= ~SMOOTH_REFRESH;
1980#endif
1981 } 2071 }
1982 2072
1983#ifdef SELECTION_SCROLLING 2073#ifdef SELECTION_SCROLLING
1984 if (sel_scroll_ev.active) 2074 if (sel_scroll_ev.active)
1985 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
1986#endif 2076#endif
1987 2077
1988 if (ev.window == TermWin.vt) 2078 if (ev.window == vt)
1989 { 2079 {
2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2081 return;
2082
1990#if ISO_14755 2083#if ISO_14755
1991 // 5.4 2084 // 5.4
1992 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1993 return; 2086 return;
1994#endif 2087#endif
2088
1995 if (reportmode) 2089 if (reportmode)
1996 { 2090 {
1997 /* mouse report from vt window */ 2091 /* mouse report from vt window */
1998 /* don't report release of wheel "buttons" */ 2092 /* don't report release of wheel "buttons" */
1999 if (ev.button >= 4) 2093 if (ev.button >= 4)
… …
2029 { 2123 {
2030 case Button1: 2124 case Button1:
2031 case Button3: 2125 case Button3:
2032 selection_make (ev.time); 2126 selection_make (ev.time);
2033 break; 2127 break;
2128
2034 case Button2: 2129 case Button2:
2035 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);
2036 break; 2132 break;
2133
2037#ifdef MOUSE_WHEEL 2134#ifdef MOUSE_WHEEL
2038 case Button4: 2135 case Button4:
2039 case Button5: 2136 case Button5:
2040 { 2137 {
2041 int i; 2138 int i;
… …
2043 2140
2044 v = ev.button == Button4 ? UP : DN; 2141 v = ev.button == Button4 ? UP : DN;
2045 2142
2046 if (ev.state & ShiftMask) 2143 if (ev.state & ShiftMask)
2047 i = 1; 2144 i = 1;
2048 else if (options & Opt_mouseWheelScrollPage) 2145 else if (OPTION (Opt_mouseWheelScrollPage))
2049 i = TermWin.nrow - 1; 2146 i = nrow - 1;
2050 else 2147 else
2051 i = 5; 2148 i = 5;
2052 2149
2053# ifdef MOUSE_SLIP_WHEELING 2150# ifdef MOUSE_SLIP_WHEELING
2054 if (ev.state & ControlMask) 2151 if (ev.state & ControlMask)
2055 { 2152 {
2056 mouse_slip_wheel_speed += v ? -1 : 1; 2153 mouse_slip_wheel_speed += v ? -1 : 1;
2057 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;
2058 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;
2059 2156
2060 if (slip_wheel_ev.at < NOW) 2157 if (slip_wheel_ev.at < NOW)
2061 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2158 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2062 2159
2063 slip_wheel_ev.start (); 2160 slip_wheel_ev.start ();
2064 } 2161 }
2065 else 2162 else
2066 { 2163 {
2067# endif 2164# endif
2068# ifdef JUMP_MOUSE_WHEEL
2069 scr_page (v, i); 2165 scr_page (v, i);
2070 scr_refresh (SMOOTH_REFRESH);
2071 scrollbar_show (1); 2166 scrollbar_show (1);
2072# else
2073 while (i--)
2074 {
2075 scr_page (v, 1);
2076 scr_refresh (SMOOTH_REFRESH);
2077 scrollbar_show (1);
2078 }
2079# endif
2080# ifdef MOUSE_SLIP_WHEELING 2167# ifdef MOUSE_SLIP_WHEELING
2081 } 2168 }
2082#endif 2169# endif
2083 } 2170 }
2084 break; 2171 break;
2085#endif 2172#endif
2086 } 2173 }
2087 } 2174 }
2088#ifdef MENUBAR
2089 else if (isMenuBarWindow (ev.window))
2090 menubar_control (ev);
2091#endif
2092} 2175}
2093 2176
2094#ifdef TRANSPARENT 2177#ifdef TRANSPARENT
2095#if TINTING 2178#if TINTING
2096/* taken from aterm-0.4.2 */ 2179/* taken from aterm-0.4.2 */
2097 2180
2098typedef uint32_t RUINT32T; 2181typedef uint32_t RUINT32T;
2099 2182
2100void 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)
2101{ 2184{
2102 int sh_r, sh_g, sh_b; 2185 int sh_r, sh_g, sh_b;
2103 RUINT32T mask_r, mask_g, mask_b; 2186 RUINT32T mask_r, mask_g, mask_b;
2104 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2187 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2105 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2188 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2106 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2189 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2107 int i; 2190 int i;
2108 2191
2109 Visual *visual = display->visual; 2192 Visual *visual = term->visual;
2110 2193
2111 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2194 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2112 2195
2113 /* for convenience */ 2196 /* for convenience */
2114 mask_r = visual->red_mask; 2197 mask_r = visual->red_mask;
… …
2335 Atom atype; 2418 Atom atype;
2336 unsigned char *prop = NULL; 2419 unsigned char *prop = NULL;
2337 Window root, oldp, *list; 2420 Window root, oldp, *list;
2338 Pixmap rootpixmap = None; 2421 Pixmap rootpixmap = None;
2339 XWindowAttributes wattr, wrootattr; 2422 XWindowAttributes wattr, wrootattr;
2340 dDisp;
2341 2423
2342 pchanged = 0; 2424 pchanged = 0;
2343 2425
2344 if (!(options & Opt_transparent)) 2426 if (!OPTION (Opt_transparent))
2345 return pchanged; /* Don't try any more */ 2427 return pchanged; /* Don't try any more */
2346 2428
2347 XGetWindowAttributes (disp, display->root, &wrootattr); 2429 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2348 rootdepth = wrootattr.depth; 2430 rootdepth = wrootattr.depth;
2349 2431
2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2432 XGetWindowAttributes (xdisp, parent[0], &wattr);
2351 2433
2352 if (rootdepth != wattr.depth) 2434 if (rootdepth != wattr.depth)
2353 { 2435 {
2354 if (am_transparent) 2436 if (am_transparent)
2355 { 2437 {
2356 pchanged = 1; 2438 pchanged = 1;
2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2439 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2358 am_transparent = am_pixmap_trans = 0; 2440 am_transparent = am_pixmap_trans = 0;
2359 } 2441 }
2360 2442
2361 return pchanged; /* Don't try any more */ 2443 return pchanged; /* Don't try any more */
2362 } 2444 }
2363 2445
2364 /* 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. */
2365 XSync (disp, False); 2447 XSync (xdisp, False);
2366 2448
2367 /* 2449 /*
2368 * Make the frame window set by the window manager have 2450 * Make the frame window set by the window manager have
2369 * the root background. Some window managers put multiple nested frame 2451 * the root background. Some window managers put multiple nested frame
2370 * 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.
2371 */ 2453 */
2372 i = (xa[XA_XROOTPMAP_ID] 2454 i = (xa[XA_XROOTPMAP_ID]
2373 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2455 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2374 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2375 &nitems, &bytes_after, &prop) == Success); 2457 &nitems, &bytes_after, &prop) == Success);
2376 2458
2377 if (!i || prop == NULL) 2459 if (!i || prop == NULL)
2378 i = (xa[XA_ESETROOT_PMAP_ID] 2460 i = (xa[XA_ESETROOT_PMAP_ID]
2379 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2461 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2380 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2381 &nitems, &bytes_after, &prop) == Success); 2463 &nitems, &bytes_after, &prop) == Success);
2382 2464
2383 if (!i || prop == NULL 2465 if (!i || prop == NULL
2384#if TINTING 2466#if TINTING
… …
2403 Window cr; 2485 Window cr;
2404 XImage *image; 2486 XImage *image;
2405 GC gc; 2487 GC gc;
2406 XGCValues gcvalue; 2488 XGCValues gcvalue;
2407 2489
2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2490 XTranslateCoordinates (xdisp, parent[0], display->root,
2409 0, 0, &sx, &sy, &cr); 2491 0, 0, &sx, &sy, &cr);
2410 nw = (unsigned int)szHint.width; 2492 nw = (unsigned int)szHint.width;
2411 nh = (unsigned int)szHint.height; 2493 nh = (unsigned int)szHint.height;
2412 nx = ny = 0; 2494 nx = ny = 0;
2413 2495
… …
2423 nh += sy; 2505 nh += sy;
2424 ny = -sy; 2506 ny = -sy;
2425 sy = 0; 2507 sy = 0;
2426 } 2508 }
2427 2509
2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2510 min_it (nw, (unsigned int) (wrootattr.width - sx));
2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2511 min_it (nh, (unsigned int) (wrootattr.height - sy));
2430 2512
2431 XSync (disp, False); 2513 XSync (xdisp, False);
2432 allowedxerror = -1; 2514 allowedxerror = -1;
2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2515 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2434 2516
2435 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2517 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2436 /* XXX: may need a delay here? */ 2518 /* XXX: may need a delay here? */
2437 allowedxerror = 0; 2519 allowedxerror = 0;
2438 2520
2439 if (image == NULL) 2521 if (image == NULL)
2440 { 2522 {
2441 if (am_transparent && am_pixmap_trans) 2523 if (am_transparent && am_pixmap_trans)
2442 { 2524 {
2443 pchanged = 1; 2525 pchanged = 1;
2444 if (TermWin.pixmap != None) 2526 if (pixmap != None)
2445 { 2527 {
2446 XFreePixmap (disp, TermWin.pixmap); 2528 XFreePixmap (xdisp, pixmap);
2447 TermWin.pixmap = None; 2529 pixmap = None;
2448 } 2530 }
2449 } 2531 }
2450 2532
2451 am_pixmap_trans = 0; 2533 am_pixmap_trans = 0;
2452 } 2534 }
2453 else 2535 else
2454 { 2536 {
2455 if (TermWin.pixmap != None) 2537 if (pixmap != None)
2456 XFreePixmap (disp, TermWin.pixmap); 2538 XFreePixmap (xdisp, pixmap);
2457 2539
2458#if TINTING 2540#if TINTING
2459 if (ISSET_PIXCOLOR (Color_tint)) 2541 if (ISSET_PIXCOLOR (Color_tint))
2460 { 2542 {
2461 unsigned short rm, gm, bm;
2462 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2543 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2463 2544
2545 rxvt_rgba c;
2464 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2546 pix_colors_focused [Color_tint].get (this, c);
2465 2547
2466 ShadeXImage (display, image, shade, rm, gm, bm); 2548 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2467 } 2549 }
2468#endif 2550#endif
2469 2551
2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2552 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2471 szHint.width, szHint.height, image->depth);
2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2553 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2554 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2474 nx, ny, image->width, image->height); 2555 nx, ny, image->width, image->height);
2475 XFreeGC (disp, gc); 2556 XFreeGC (xdisp, gc);
2476 XDestroyImage (image); 2557 XDestroyImage (image);
2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2558 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2478 XClearWindow (disp, TermWin.parent[0]); 2559 XClearWindow (xdisp, parent[0]);
2479 2560
2480 if (!am_transparent || !am_pixmap_trans) 2561 if (!am_transparent || !am_pixmap_trans)
2481 pchanged = 1; 2562 pchanged = 1;
2482 2563
2483 am_transparent = am_pixmap_trans = 1; 2564 am_transparent = am_pixmap_trans = 1;
2484 } 2565 }
2485 } 2566 }
2486 2567
2487 if (am_pixmap_trans) 2568 if (am_pixmap_trans)
2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2569 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2489 else 2570 else
2490 { 2571 {
2491 unsigned int n; 2572 unsigned int n;
2492 /* 2573 /*
2493 * InheritPixmap transparency 2574 * InheritPixmap transparency
2494 */ 2575 */
2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2496 { 2577 {
2497 oldp = TermWin.parent[i]; 2578 oldp = parent[i];
2498 XQueryTree (disp, TermWin.parent[i - 1], &root, 2579 XQueryTree (xdisp, parent[i - 1], &root,
2499 &TermWin.parent[i], &list, &n); 2580 &parent[i], &list, &n);
2500 XFree (list); 2581 XFree (list);
2501 2582
2502 if (TermWin.parent[i] == display->root) 2583 if (parent[i] == display->root)
2503 { 2584 {
2504 if (oldp != None) 2585 if (oldp != None)
2505 pchanged = 1; 2586 pchanged = 1;
2506 2587
2507 break; 2588 break;
2508 } 2589 }
2509 2590
2510 if (oldp != TermWin.parent[i]) 2591 if (oldp != parent[i])
2511 pchanged = 1; 2592 pchanged = 1;
2512 } 2593 }
2513 2594
2514 n = 0; 2595 n = 0;
2515 2596
2516 if (pchanged) 2597 if (pchanged)
2517 { 2598 {
2518 for (; n < (unsigned int)i; n++) 2599 for (; n < (unsigned int)i; n++)
2519 { 2600 {
2520 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2601 XGetWindowAttributes (xdisp, parent[n], &wattr);
2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2602 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2522 { 2603 {
2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2604 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2524 break; 2605 break;
2525 } 2606 }
2526 } 2607 }
2527 } 2608 }
2528 2609
2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2610 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2530 { 2611 {
2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2612 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2532 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2613 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2533 am_transparent = 0; 2614 am_transparent = 0;
2534 /* XXX: also turn off Opt_transparent? */ 2615 /* XXX: also turn off Opt_transparent? */
2535 } 2616 }
2536 else 2617 else
2537 { 2618 {
2538#if WAIT_FOR_WM
2539 /* wait (an arbitrary period) for the WM to do its thing
2540 * needed for fvwm2.2.2 (and before?) */
2541 sleep (1);
2542#endif
2543 for (n = 0; n < (unsigned int)i; n++) 2619 for (n = 0; n < (unsigned int)i; n++)
2544 { 2620 {
2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2621 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2546 XClearWindow (disp, TermWin.parent[n]); 2622 XClearWindow (xdisp, parent[n]);
2547 } 2623 }
2548 2624
2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2625 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2550 am_transparent = 1; 2626 am_transparent = 1;
2551 } 2627 }
2552 2628
2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2629 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 TermWin.parent[i] = None; 2630 parent[i] = None;
2555 } 2631 }
2556 2632
2557 if (scrollBar.win) 2633 if (scrollBar.win)
2558 { 2634 {
2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2635 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2560 scrollBar.setIdle (); 2636 scrollBar.setIdle ();
2561 scrollbar_show (0); 2637 scrollbar_show (0);
2562 } 2638 }
2563 2639
2564 if (am_transparent) 2640 if (am_transparent)
… …
2576 2652
2577bool 2653bool
2578rxvt_term::cmd_parse () 2654rxvt_term::cmd_parse ()
2579{ 2655{
2580 bool flag = false; 2656 bool flag = false;
2581 unicode_t ch = NOCHAR; 2657 wchar_t ch = NOCHAR;
2582 unsigned char *seq_begin; // remember start of esc-sequence here 2658 char *seq_begin; // remember start of esc-sequence here
2583 2659
2584 for (;;) 2660 for (;;)
2585 { 2661 {
2586 if (ch == NOCHAR) 2662 if (ch == NOCHAR)
2587 { 2663 {
2588 seq_begin = cmdbuf_ptr; 2664 seq_begin = cmdbuf_ptr;
2589 ch = next_char (); 2665 ch = next_char ();
2590 }
2591 2666
2592 if (ch == NOCHAR) // TODO: improve 2667 if (ch == NOCHAR)
2593 break; 2668 break;
2669 }
2594 2670
2595 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2671 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2596 { 2672 {
2597 if (!seen_input) 2673 if (!seen_input)
2598 { 2674 {
… …
2607 if (seen_resize && cmd_pid) 2683 if (seen_resize && cmd_pid)
2608 kill (-cmd_pid, SIGWINCH); 2684 kill (-cmd_pid, SIGWINCH);
2609 } 2685 }
2610 2686
2611 /* Read a text string from the input buffer */ 2687 /* Read a text string from the input buffer */
2612 unicode_t buf[UBUFSIZ]; 2688 wchar_t buf[UBUFSIZ];
2613 bool refreshnow = false; 2689 bool refreshnow = false;
2614 int nlines = 0; 2690 int nlines = 0;
2615 unicode_t *str = buf; 2691 wchar_t *str = buf;
2692 wchar_t *eol = str + min (ncol, UBUFSIZ);
2616 2693
2617 for (;;) 2694 for (;;)
2618 { 2695 {
2619 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2696 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2620 break; 2697 break;
2621 2698
2622 *str++ = ch; 2699 *str++ = ch;
2623 2700
2624 if (ch == C0_LF) 2701 if (ch == C0_LF || str >= eol)
2625 { 2702 {
2703 if (ch == C0_LF)
2626 nlines++; 2704 nlines++;
2705
2627 refresh_count++; 2706 refresh_count++;
2628 2707
2629 if (!(options & Opt_jumpScroll) 2708 if (!OPTION (Opt_jumpScroll)
2630 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2709 || (refresh_count >= refresh_limit * (nrow - 1)))
2631 { 2710 {
2632 refreshnow = true; 2711 refreshnow = true;
2712 refresh_count = 0;
2633 ch = NOCHAR; 2713 ch = NOCHAR;
2634 break; 2714 break;
2635 } 2715 }
2636 2716
2637 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2717 // scr_add_lines only works for nlines <= nrow - 1.
2638 if (nlines >= TermWin.nrow - 1) 2718 if (nlines >= nrow - 1)
2639 { 2719 {
2720 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2721 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2640 scr_add_lines (buf, nlines, str - buf); 2722 scr_add_lines (buf, str - buf, nlines);
2723
2641 nlines = 0; 2724 nlines = 0;
2642 str = buf; 2725 str = buf;
2726 eol = str + min (ncol, UBUFSIZ);
2643 } 2727 }
2644 }
2645 2728
2646 if (str >= buf + UBUFSIZ) 2729 if (str >= eol)
2647 { 2730 {
2731 if (eol >= buf + UBUFSIZ)
2732 {
2648 ch = NOCHAR; 2733 ch = NOCHAR;
2649 break; 2734 break;
2735 }
2736 else
2737 eol = min (eol + ncol, buf + UBUFSIZ);
2738 }
2739
2650 } 2740 }
2651 2741
2652 seq_begin = cmdbuf_ptr; 2742 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2743 ch = next_char ();
2654 } 2744 }
2655 2745
2746 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2747 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2656 scr_add_lines (buf, nlines, str - buf); 2748 scr_add_lines (buf, str - buf, nlines);
2657 2749
2658 /* 2750 /*
2659 * If there have been a lot of new lines, then update the screen 2751 * If there have been a lot of new lines, then update the screen
2660 * What the heck I'll cheat and only refresh less than every page-full. 2752 * What the heck I'll cheat and only refresh less than every page-full.
2661 * the number of pages between refreshes is refresh_limit, which 2753 * the number of pages between refreshes is refresh_limit, which
2662 * is incremented here because we must be doing flat-out scrolling. 2754 * is incremented here because we must be doing flat-out scrolling.
2663 */ 2755 */
2664 if (refreshnow) 2756 if (refreshnow)
2665 { 2757 {
2666 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2758 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2667 refresh_limit++; 2759 refresh_limit++;
2668 else 2760 else
2669 { 2761 {
2670 flag = true; 2762 flag = true;
2671 scr_refresh (refresh_type); 2763 scr_refresh ();
2764 want_refresh = 1;
2672 } 2765 }
2673 } 2766 }
2674 2767
2675 } 2768 }
2676 else 2769 else
… …
2691 } 2784 }
2692 2785
2693 return flag; 2786 return flag;
2694} 2787}
2695 2788
2696// read the next octet
2697unicode_t
2698rxvt_term::next_octet ()
2699{
2700 return cmdbuf_ptr < cmdbuf_endp
2701 ? *cmdbuf_ptr++
2702 : NOCHAR;
2703}
2704
2705// read the next character 2789// read the next character
2706unicode_t 2790wchar_t
2707rxvt_term::next_char () 2791rxvt_term::next_char () NOTHROW
2708{ 2792{
2709 while (cmdbuf_ptr < cmdbuf_endp) 2793 while (cmdbuf_ptr < cmdbuf_endp)
2710 { 2794 {
2711 // assume 7-bit to be ascii ALWAYS 2795 // assume 7-bit to be ascii ALWAYS
2712 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2796 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2713 return *cmdbuf_ptr++; 2797 return *cmdbuf_ptr++;
2714 2798
2715 wchar_t wc; 2799 wchar_t wc;
2716 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2800 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2717 2801
2718 if (len == (size_t)-2) 2802 if (len == (size_t)-2)
2719 { 2803 {
2720 // the mbstate stores incomplete sequences. didn't know this :/ 2804 // the mbstate stores incomplete sequences. didn't know this :/
2721 cmdbuf_ptr = cmdbuf_endp; 2805 cmdbuf_ptr = cmdbuf_endp;
2722 break; 2806 break;
2723 } 2807 }
2724 2808
2725 if (len == (size_t)-1) 2809 if (len == (size_t)-1)
2726 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2810 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2727 2811
2728 // assume wchar == unicode 2812 // assume wchar == unicode
2729 cmdbuf_ptr += len; 2813 cmdbuf_ptr += len;
2730 return wc & UNICODE_MASK; 2814 return wc & UNICODE_MASK;
2731 } 2815 }
2732 2816
2733 return NOCHAR; 2817 return NOCHAR;
2734} 2818}
2819
2820// read the next octet
2821uint32_t
2822rxvt_term::next_octet () NOTHROW
2823{
2824 return cmdbuf_ptr < cmdbuf_endp
2825 ? (unsigned char)*cmdbuf_ptr++
2826 : NOCHAR;
2827}
2828
2829static class out_of_input out_of_input;
2735 2830
2736/* rxvt_cmd_getc () - Return next input character */ 2831/* rxvt_cmd_getc () - Return next input character */
2737/* 2832/*
2738 * Return the next input character after first passing any keyboard input 2833 * Return the next input character after first passing any keyboard input
2739 * to the command. 2834 * to the command.
2740 */ 2835 */
2741unicode_t 2836wchar_t
2742rxvt_term::cmd_getc () 2837rxvt_term::cmd_getc () THROW ((class out_of_input))
2743{ 2838{
2744 unicode_t c = next_char (); 2839 wchar_t c = next_char ();
2745 2840
2746 if (c == NOCHAR) 2841 if (c == NOCHAR)
2747 throw out_of_input; 2842 throw out_of_input;
2748 2843
2749 return c; 2844 return c;
2750} 2845}
2751 2846
2752unicode_t 2847uint32_t
2753rxvt_term::cmd_get8 () 2848rxvt_term::cmd_get8 () THROW ((class out_of_input))
2754{ 2849{
2755 unicode_t c = next_octet (); 2850 uint32_t c = next_octet ();
2756 2851
2757 if (c == NOCHAR) 2852 if (c == NOCHAR)
2758 throw out_of_input; 2853 throw out_of_input;
2759 2854
2760 return c; 2855 return c;
… …
2860 case C0_ESC: 2955 case C0_ESC:
2861 process_escape_seq (); 2956 process_escape_seq ();
2862 break; 2957 break;
2863 case C0_ENQ: /* terminal Status */ 2958 case C0_ENQ: /* terminal Status */
2864 if (rs[Rs_answerbackstring]) 2959 if (rs[Rs_answerbackstring])
2865 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2960 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2866 (unsigned int)strlen (rs[Rs_answerbackstring]));
2867 else 2961 else
2868 tt_write ((unsigned char *)VT100_ANS, 2962 tt_write (VT100_ANS, strlen (VT100_ANS));
2869 (unsigned int)strlen (VT100_ANS));
2870 break; 2963 break;
2871 case C0_BEL: /* bell */ 2964 case C0_BEL: /* bell */
2872 scr_bell (); 2965 scr_bell ();
2873 break; 2966 break;
2874 case C0_BS: /* backspace */ 2967 case C0_BS: /* backspace */
… …
2998 scr_charset_set (2, (unsigned int)cmd_getc ()); 3091 scr_charset_set (2, (unsigned int)cmd_getc ());
2999 break; 3092 break;
3000 case '+': 3093 case '+':
3001 scr_charset_set (3, (unsigned int)cmd_getc ()); 3094 scr_charset_set (3, (unsigned int)cmd_getc ());
3002 break; 3095 break;
3003#if ENABLE_FRILLS 3096#if !ENABLE_MINIMAL
3004 case '6': 3097 case '6':
3005 scr_backindex (); 3098 scr_backindex ();
3006 break; 3099 break;
3007#endif 3100#endif
3008 case '7': 3101 case '7':
3009 scr_cursor (SAVE); 3102 scr_cursor (SAVE);
3010 break; 3103 break;
3011 case '8': 3104 case '8':
3012 scr_cursor (RESTORE); 3105 scr_cursor (RESTORE);
3013 break; 3106 break;
3014#if ENABLE_FRILLS 3107#if !ENABLE_MINIMAL
3015 case '9': 3108 case '9':
3016 scr_forwardindex (); 3109 scr_forwardindex ();
3017 break; 3110 break;
3018#endif 3111#endif
3019 case '=': 3112 case '=':
… …
3029 break; 3122 break;
3030 3123
3031 /* 8.3.87: NEXT LINE */ 3124 /* 8.3.87: NEXT LINE */
3032 case C1_NEL: /* ESC E */ 3125 case C1_NEL: /* ESC E */
3033 { 3126 {
3034 unicode_t nlcr[] = { C0_LF, C0_CR }; 3127 wchar_t nlcr[] = { C0_LF, C0_CR };
3035 scr_add_lines (nlcr, 1, 2); 3128 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3036 } 3129 }
3037 break; 3130 break;
3038 3131
3039 /* kidnapped escape sequence: Should be 8.3.48 */ 3132 /* kidnapped escape sequence: Should be 8.3.48 */
3040 case C1_ESA: /* ESC G */ 3133 case C1_ESA: /* ESC G */
… …
3062 process_dcs_seq (); 3155 process_dcs_seq ();
3063 break; 3156 break;
3064 3157
3065 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3158 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3066 case C1_SCI: /* ESC Z */ 3159 case C1_SCI: /* ESC Z */
3067 tt_write ((const unsigned char *)ESCZ_ANSWER, 3160 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3068 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3069 break; /* steal obsolete ESC [ c */ 3161 break; /* steal obsolete ESC [ c */
3070 3162
3071 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3163 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3072 case C1_CSI: /* ESC [ */ 3164 case C1_CSI: /* ESC [ */
3073 process_csi_seq (); 3165 process_csi_seq ();
… …
3182 ndef = get_byte_array_bit (csi_defaults, i); 3274 ndef = get_byte_array_bit (csi_defaults, i);
3183 for (p = 0; p < nargs; p++) 3275 for (p = 0; p < nargs; p++)
3184 if (arg[p] == -1) 3276 if (arg[p] == -1)
3185 arg[p] = ndef; 3277 arg[p] = ndef;
3186 3278
3187#ifdef DEBUG_CMD
3188 fprintf (stderr, "CSI ");
3189 for (p = 0; p < nargs; p++)
3190 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3191 fprintf (stderr, "%c\n", ch);
3192#endif
3193
3194 /* 3279 /*
3195 * private mode handling 3280 * private mode handling
3196 */ 3281 */
3197 if (priv) 3282 if (priv)
3198 { 3283 {
3199 switch (priv) 3284 switch (priv)
3200 { 3285 {
3201 case '>': 3286 case '>':
3202 if (ch == CSI_DA) /* secondary device attributes */ 3287 if (ch == CSI_DA) /* secondary device attributes */
3203 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3288 {
3289 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3290 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3291 //
3292 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3293 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3294 // that we do not support xterm mouse reporting (should be 95 when we do).
3295 //
3296 tt_printf ("\033[>%d;94;0c", 'U');
3297 }
3204 break; 3298 break;
3205 case '?': 3299 case '?':
3206 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3300 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3207 process_terminal_mode (ch, priv, nargs, arg); 3301 process_terminal_mode (ch, priv, nargs, arg);
3208 break; 3302 break;
… …
3313 3407
3314 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3408 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3315 arg[0] = -arg[0]; 3409 arg[0] = -arg[0];
3316 /* FALLTHROUGH */ 3410 /* FALLTHROUGH */
3317 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3411 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3318 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3412 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3319 break; 3413 break;
3320 3414
3321 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3415 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3322 tt_write ((const unsigned char *)VT100_ANS, 3416 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3323 (unsigned int) (sizeof (VT100_ANS) - 1));
3324 break; 3417 break;
3325 3418
3326 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3419 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3327 process_sgr_mode (nargs, arg); 3420 process_sgr_mode (nargs, arg);
3328 break; 3421 break;
… …
3335 break; 3428 break;
3336 case 6: /* CPR requested */ 3429 case 6: /* CPR requested */
3337 scr_report_position (); 3430 scr_report_position ();
3338 break; 3431 break;
3339 case 7: /* unofficial extension */ 3432 case 7: /* unofficial extension */
3340 if (options & Opt_insecure) 3433 if (OPTION (Opt_insecure))
3341 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3434 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3342 break; 3435 break;
3343 case 8: /* unofficial extension */ 3436 case 8: /* unofficial extension */
3344 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3437 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3345 break; 3438 break;
… …
3412 break; 3505 break;
3413 case CSI_75: 3506 case CSI_75:
3414 scr_cursor (RESTORE); 3507 scr_cursor (RESTORE);
3415 break; 3508 break;
3416 3509
3417#if ENABLE_FRILLS 3510#if !ENABLE_MINIMAL
3418 case CSI_74: 3511 case CSI_74:
3419 process_window_ops (arg, nargs); 3512 process_window_ops (arg, nargs);
3420 break; 3513 break;
3421#endif 3514#endif
3422 3515
… …
3429 break; 3522 break;
3430 } 3523 }
3431} 3524}
3432/*}}} */ 3525/*}}} */
3433 3526
3434#if ENABLE_FRILLS 3527#if !ENABLE_MINIMAL
3435/* ARGSUSED */ 3528/* ARGSUSED */
3436void 3529void
3437rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3530rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3438{ 3531{
3439 int x, y; 3532 int x, y;
3440 XWindowAttributes wattr; 3533 XWindowAttributes wattr;
3441 Window wdummy; 3534 Window wdummy;
3442 dDisp; 3535
3536 dLocal (Display *, xdisp);
3443 3537
3444 if (nargs == 0) 3538 if (nargs == 0)
3445 return; 3539 return;
3446 3540
3447 switch (args[0]) 3541 switch (args[0])
3448 { 3542 {
3449 /* 3543 /*
3450 * commands 3544 * commands
3451 */ 3545 */
3452 case 1: /* deiconify window */ 3546 case 1: /* deiconify window */
3453 XMapWindow (disp, TermWin.parent[0]); 3547 XMapWindow (xdisp, parent[0]);
3454 break; 3548 break;
3455 case 2: /* iconify window */ 3549 case 2: /* iconify window */
3456 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3550 XIconifyWindow (xdisp, parent[0], display->screen);
3457 break; 3551 break;
3458 case 3: /* set position (pixels) */ 3552 case 3: /* set position (pixels) */
3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3553 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3460 break; 3554 break;
3461 case 4: /* set size (pixels) */ 3555 case 4: /* set size (pixels) */
3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3556 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3463 break; 3557 break;
3464 case 5: /* raise window */ 3558 case 5: /* raise window */
3465 XRaiseWindow (disp, TermWin.parent[0]); 3559 XRaiseWindow (xdisp, parent[0]);
3466 break; 3560 break;
3467 case 6: /* lower window */ 3561 case 6: /* lower window */
3468 XLowerWindow (disp, TermWin.parent[0]); 3562 XLowerWindow (xdisp, parent[0]);
3469 break; 3563 break;
3470 case 7: /* refresh window */ 3564 case 7: /* refresh window */
3471 scr_touch (true); 3565 scr_touch (true);
3472 break; 3566 break;
3473 case 8: /* set size (chars) */ 3567 case 8: /* set size (chars) */
3474 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3568 set_widthheight ((unsigned int) (args[2] * fwidth),
3475 (unsigned int) (args[1] * TermWin.fheight)); 3569 (unsigned int) (args[1] * fheight));
3476 break; 3570 break;
3477 3571
3478 //case 9: NYI, TODO, restore maximized window or maximize window 3572 //case 9: NYI, TODO, restore maximized window or maximize window
3479 default: 3573 default:
3480 if (args[0] >= 24) /* set height (chars) */ 3574 if (args[0] >= 24) /* set height (chars) */
3481 set_widthheight ((unsigned int)TermWin.width, 3575 set_widthheight ((unsigned int)width,
3482 (unsigned int) (args[1] * TermWin.fheight)); 3576 (unsigned int) (args[1] * fheight));
3483 break; 3577 break;
3484 3578
3485 3579
3486 /* 3580 /*
3487 * reports - some output format copied from XTerm 3581 * reports - some output format copied from XTerm
3488 */ 3582 */
3489 case 11: /* report window state */ 3583 case 11: /* report window state */
3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3584 XGetWindowAttributes (xdisp, parent[0], &wattr);
3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3585 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3492 break; 3586 break;
3493 case 13: /* report window position */ 3587 case 13: /* report window position */
3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3588 XGetWindowAttributes (xdisp, parent[0], &wattr);
3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3589 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3496 -wattr.border_width, -wattr.border_width, 3590 -wattr.border_width, -wattr.border_width,
3497 &x, &y, &wdummy); 3591 &x, &y, &wdummy);
3498 tt_printf ("\033[3;%d;%dt", x, y); 3592 tt_printf ("\033[3;%d;%dt", x, y);
3499 break; 3593 break;
3500 case 14: /* report window size (pixels) */ 3594 case 14: /* report window size (pixels) */
3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3595 XGetWindowAttributes (xdisp, parent[0], &wattr);
3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3596 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3503 break; 3597 break;
3504 case 18: /* report text area size (chars) */ 3598 case 18: /* report text area size (chars) */
3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3599 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3506 break; 3600 break;
3507 case 19: /* report window size (chars) */ 3601 case 19: /* report window size (chars) */
3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3602 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3509 break; 3603 break;
3510 case 20: /* report icon label */ 3604 case 20: /* report icon label */
3511 { 3605 {
3512 char *s; 3606 char *s;
3513 XGetIconName (disp, TermWin.parent[0], &s); 3607 XGetIconName (xdisp, parent[0], &s);
3514 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3608 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3515 XFree (s); 3609 XFree (s);
3516 } 3610 }
3517 break; 3611 break;
3518 case 21: /* report window title */ 3612 case 21: /* report window title */
3519 { 3613 {
3520 char *s; 3614 char *s;
3521 XFetchName (disp, TermWin.parent[0], &s); 3615 XFetchName (xdisp, parent[0], &s);
3522 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3616 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3523 XFree (s); 3617 XFree (s);
3524 } 3618 }
3525 break; 3619 break;
3526 } 3620 }
3527} 3621}
… …
3530/*----------------------------------------------------------------------*/ 3624/*----------------------------------------------------------------------*/
3531/* 3625/*
3532 * get input up until STRING TERMINATOR (or BEL) 3626 * get input up until STRING TERMINATOR (or BEL)
3533 * ends_how is terminator used. returned input must be free()'d 3627 * ends_how is terminator used. returned input must be free()'d
3534 */ 3628 */
3535unsigned char * 3629char *
3536rxvt_term::get_to_st (unicode_t &ends_how) 3630rxvt_term::get_to_st (unicode_t &ends_how)
3537{ 3631{
3538 unicode_t ch; 3632 unicode_t ch;
3539 bool seen_esc = false; 3633 bool seen_esc = false;
3540 unsigned int n = 0; 3634 unsigned int n = 0;
… …
3559 else if (ch < 0x20) 3653 else if (ch < 0x20)
3560 return NULL; /* other control character - exit */ 3654 return NULL; /* other control character - exit */
3561 3655
3562 seen_esc = false; 3656 seen_esc = false;
3563 3657
3564 if (n >= sizeof (string) - 1) 3658 if (n >= STRING_MAX - 1)
3565 // stop at some sane length 3659 // stop at some sane length
3566 return NULL; 3660 return NULL;
3567 3661
3568 if (ch == C0_SYN) 3662 if (ch == C0_SYN)
3569 string[n++] = cmd_get8 (); 3663 string[n++] = cmd_get8 ();
… …
3573 3667
3574 string[n++] = '\0'; 3668 string[n++] = '\0';
3575 3669
3576 ends_how = (ch == 0x5c ? C0_ESC : ch); 3670 ends_how = (ch == 0x5c ? C0_ESC : ch);
3577 3671
3578 return (unsigned char *)rxvt_wcstombs (string); 3672 return rxvt_wcstombs (string);
3579} 3673}
3580 3674
3581/*----------------------------------------------------------------------*/ 3675/*----------------------------------------------------------------------*/
3582/* 3676/*
3583 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3677 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3584 */ 3678 */
3585void 3679void
3586rxvt_term::process_dcs_seq () 3680rxvt_term::process_dcs_seq ()
3587{ 3681{
3588 unsigned char *s; 3682 char *s;
3589 unicode_t eh; 3683 unicode_t eh;
3590 3684
3591 /* 3685 /*
3592 * Not handled yet 3686 * Not handled yet
3593 */ 3687 */
… …
3612 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3706 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3613 arg = arg * 10 + (ch - '0'); 3707 arg = arg * 10 + (ch - '0');
3614 3708
3615 if (ch == ';') 3709 if (ch == ';')
3616 { 3710 {
3617 unsigned char *s = get_to_st (eh); 3711 char *s = get_to_st (eh);
3618 3712
3619 if (s) 3713 if (s)
3620 { 3714 {
3621 process_xterm_seq (arg, (char *)s, eh); 3715 process_xterm_seq (arg, s, eh);
3622 free (s); 3716 free (s);
3623 } 3717 }
3624 } 3718 }
3625} 3719}
3626 3720
3627void 3721void
3628rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3722rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3629{ 3723{
3630 if (str[0] == '?' && !str[1]) 3724 if (str[0] == '?' && !str[1])
3631 { 3725 {
3632 unsigned short r, g, b; 3726 rxvt_rgba c;
3633 pix_colors_focused[color].get (display, r, g, b); 3727 pix_colors_focused[color].get (this, c);
3728
3729#if XFT
3730 if (c.a != rxvt_rgba::MAX_CC)
3731 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3732 else
3733#endif
3634 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3734 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3635 } 3735 }
3636 else 3736 else
3637 set_window_color (color, str); 3737 set_window_color (color, str);
3638} 3738}
3639 3739
3640/* 3740/*
3641 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3741 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3642 * 0 = change iconName/title
3643 * 1 = change iconName
3644 * 2 = change title
3645 * 4 = change color
3646 * 10 = change fg color
3647 * 11 = change bg color
3648 * 12 = change text color
3649 * 13 = change mouse foreground color
3650 * 17 = change highlight character colour
3651 * 18 = change bold character color
3652 * 19 = change underlined character color
3653 * 46 = change logfile (not implemented)
3654 * 50 = change font
3655 *
3656 * rxvt extensions:
3657 * 20 = bg pixmap
3658 * 39 = change default fg color
3659 * 49 = change default bg color
3660 * 55 = dump scrollback buffer and all of screen
3661 * 701 = change locale
3662 * 702 = find font
3663 * 703 = menu
3664 */ 3742 */
3665void 3743void
3666rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3744rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3667{ 3745{
3668 int changed = 0;
3669 int color; 3746 int color;
3670 char *buf, *name; 3747 char *buf, *name;
3671 bool query = str[0] == '?' && !str[1]; 3748 bool query = str[0] == '?' && !str[1];
3672 int saveop = op; 3749 int saveop = op;
3673 dDisp; 3750
3751 dLocal (Display *, xdisp);
3674 3752
3675 assert (str != NULL); 3753 assert (str != NULL);
3676 switch (op) 3754 switch (op)
3677 { 3755 {
3678 case XTerm_name: 3756 case XTerm_name:
… …
3694 unsigned long bytes_after; 3772 unsigned long bytes_after;
3695 unsigned char *value = 0; 3773 unsigned char *value = 0;
3696 const char *str = ""; 3774 const char *str = "";
3697 3775
3698 if (prop 3776 if (prop
3699 && XGetWindowProperty (disp, TermWin.parent[0], 3777 && XGetWindowProperty (xdisp, parent[0],
3700 prop, 0, 1<<16, 0, AnyPropertyType, 3778 prop, 0, 1<<16, 0, AnyPropertyType,
3701 &actual_type, &actual_format, 3779 &actual_type, &actual_format,
3702 &nitems, &bytes_after, &value) == Success 3780 &nitems, &bytes_after, &value) == Success
3703 && actual_type != None 3781 && actual_type != None
3704 && actual_format == 8) 3782 && actual_format == 8)
3705 str = (const char *)(value); 3783 str = (const char *)(value);
3706 3784
3707 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3785 tt_printf ("\033]%d;%s%c", op, str, resp);
3708 3786
3709 XFree (value); 3787 XFree (value);
3710 } 3788 }
3711 else 3789 else
3712 { 3790 {
… …
3716 { 3794 {
3717 *eq = 0; 3795 *eq = 0;
3718 set_utf8_property (display->atom (str), eq + 1); 3796 set_utf8_property (display->atom (str), eq + 1);
3719 } 3797 }
3720 else 3798 else
3721 XDeleteProperty (disp, TermWin.parent[0], 3799 XDeleteProperty (xdisp, parent[0],
3722 display->atom (str)); 3800 display->atom (str));
3723 } 3801 }
3724 break; 3802 break;
3725 3803
3726 case XTerm_Color: 3804 case XTerm_Color:
… …
3728 { 3806 {
3729 if ((name = strchr (buf, ';')) == NULL) 3807 if ((name = strchr (buf, ';')) == NULL)
3730 break; 3808 break;
3731 3809
3732 *name++ = '\0'; 3810 *name++ = '\0';
3733 color = atoi (buf); 3811 color = atoi (buf) + minCOLOR;
3734 3812
3735 if (color < 0 || color >= TOTAL_COLORS) 3813 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3736 break; 3814 break;
3737 3815
3738 if ((buf = strchr (name, ';')) != NULL) 3816 if ((buf = strchr (name, ';')) != NULL)
3739 *buf++ = '\0'; 3817 *buf++ = '\0';
3740 3818
3741 if (name[0] == '?' && !name[1]) 3819 process_color_seq (op, color, name, resp);
3742 {
3743 unsigned short r, g, b;
3744 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3745 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3746 }
3747 else
3748 set_window_color (color + minCOLOR, name);
3749 } 3820 }
3750 break; 3821 break;
3751 case XTerm_Color00: 3822 case XTerm_Color00:
3752 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3823 process_color_seq (op, Color_fg, str, resp);
3753 break; 3824 break;
3754 case XTerm_Color01: 3825 case XTerm_Color01:
3755 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3826 process_color_seq (op, Color_bg, str, resp);
3756 break; 3827 break;
3757#ifndef NO_CURSORCOLOR 3828#ifndef NO_CURSORCOLOR
3758 case XTerm_Color_cursor: 3829 case XTerm_Color_cursor:
3759 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3830 process_color_seq (op, Color_cursor, str, resp);
3760 break; 3831 break;
3761#endif 3832#endif
3762 case XTerm_Color_pointer_fg: 3833 case XTerm_Color_pointer_fg:
3763 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3834 process_color_seq (op, Color_pointer_fg, str, resp);
3764 break; 3835 break;
3765 case XTerm_Color_pointer_bg: 3836 case XTerm_Color_pointer_bg:
3766 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3837 process_color_seq (op, Color_pointer_bg, str, resp);
3767 break; 3838 break;
3768#ifndef NO_BOLD_UNDERLINE_REVERSE 3839#ifndef NO_BOLD_UNDERLINE_REVERSE
3769 case XTerm_Color_BD:
3770 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3771 break;
3772 case XTerm_Color_IT:
3773 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3774 break;
3775 case XTerm_Color_UL:
3776 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3777 break;
3778 case XTerm_Color_RV: 3840 case XTerm_Color_RV:
3779 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3841 process_color_seq (op, Color_RV, str, resp);
3842 break;
3843 case Rxvt_Color_BD:
3844 case URxvt_Color_BD:
3845 process_color_seq (op, Color_BD, str, resp);
3846 break;
3847 case Rxvt_Color_UL:
3848 case URxvt_Color_UL:
3849 process_color_seq (op, Color_UL, str, resp);
3850 break;
3851 case URxvt_Color_IT:
3852 process_color_seq (op, Color_IT, str, resp);
3780 break; 3853 break;
3781#endif 3854#endif
3782#if TRANSPARENT && TINTING 3855#if TRANSPARENT && TINTING
3783 case XTerm_Color_tint: 3856 case URxvt_Color_tint:
3784 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3857 process_color_seq (op, Color_tint, str, resp);
3785 check_our_parents (); 3858 check_our_parents ();
3786 if (am_transparent) 3859 if (am_transparent)
3787 want_full_refresh = want_refresh = 1; 3860 want_full_refresh = want_refresh = 1;
3788 break; 3861 break;
3789#endif 3862#endif
3790 3863
3791 case XTerm_Pixmap: 3864 case Rxvt_Pixmap:
3865 {
3792 if (*str != ';') 3866 if (*str != ';')
3793 { 3867 {
3794#if XPM_BACKGROUND 3868#if XPM_BACKGROUND
3795 scale_pixmap (""); /* reset to default scaling */ 3869 scale_pixmap (""); /* reset to default scaling */
3796 set_bgPixmap (str); /* change pixmap */ 3870 set_bgPixmap (str); /* change pixmap */
3797#endif
3798 scr_touch (true); 3871 scr_touch (true);
3872#endif
3799 } 3873 }
3874
3875 int changed = 0;
3876
3800 while ((str = strchr (str, ';')) != NULL) 3877 while ((str = strchr (str, ';')) != NULL)
3801 { 3878 {
3802 str++; 3879 str++;
3803#if XPM_BACKGROUND 3880#if XPM_BACKGROUND
3804 changed += scale_pixmap (str); 3881 changed += scale_pixmap (str);
3805#endif 3882#endif
3806 } 3883 }
3807 3884
3808 if (changed) 3885 if (changed)
3809 { 3886 {
3810#ifdef XPM_BACKGROUND 3887#ifdef XPM_BACKGROUND
3811 resize_pixmap (); 3888 resize_pixmap ();
3812#endif
3813 scr_touch (true); 3889 scr_touch (true);
3890#endif
3814 } 3891 }
3892 }
3815 break; 3893 break;
3816 3894
3817 case XTerm_restoreFG: 3895 case Rxvt_restoreFG:
3818 set_window_color (Color_fg, str); 3896 set_window_color (Color_fg, str);
3819 break; 3897 break;
3820 case XTerm_restoreBG: 3898 case Rxvt_restoreBG:
3821 set_window_color (Color_bg, str); 3899 set_window_color (Color_bg, str);
3822 break; 3900 break;
3823 3901
3824 case XTerm_logfile: 3902 case XTerm_logfile:
3825 // TODO, when secure mode? 3903 // TODO, when secure mode?
3826 break; 3904 break;
3827 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
3828 case XTerm_font: 3918 case XTerm_font:
3829 op = URxvt_font; 3919 op = URxvt_font;
3830 case URxvt_font: 3920 case URxvt_font:
3831#if ENABLE_STYLES 3921#if ENABLE_STYLES
3832 case URxvt_boldFont: 3922 case URxvt_boldFont:
3833 case URxvt_italicFont: 3923 case URxvt_italicFont:
3834 case URxvt_boldItalicFont: 3924 case URxvt_boldItalicFont:
3835#endif 3925#endif
3836 if (query) 3926 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", saveop, 3927 tt_printf ("\33]%d;%-.250s%c", saveop,
3838 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3928 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3839 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3929 ? fontset[op - URxvt_font]->fontdesc : "",
3840 resp); 3930 resp);
3841 else 3931 else
3842 { 3932 {
3843 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3933 const char *&res = rs[Rs_font + (op - URxvt_font)];
3844 3934
… …
3846 allocated.push_back ((void *)res); 3936 allocated.push_back ((void *)res);
3847 set_fonts (); 3937 set_fonts ();
3848 } 3938 }
3849 break; 3939 break;
3850 3940
3851#if ENABLE_FRILLS 3941 case URxvt_version:
3852 case XTerm_locale:
3853 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)
3854 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);
3855 else 3953 else
3856 { 3954 {
3857 set_locale (str); 3955 set_locale (str);
3858 pty.set_utf8_mode (enc_utf8); 3956 pty->set_utf8_mode (enc_utf8);
3859# ifdef USE_XIM
3860 im_cb (); 3957 init_xlocale ();
3861# endif
3862 } 3958 }
3863 break; 3959 break;
3864#endif
3865 3960
3866#ifdef MENUBAR 3961 case URxvt_view_up:
3867 case XTerm_Menu: 3962 case URxvt_view_down:
3868 if (options & Opt_insecure) 3963 {
3869 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
3870 break; 3972 break;
3871#endif 3973#endif
3872#if 0 3974
3873 case XTerm_dumpscreen: /* no error notices */ 3975#if ENABLE_PERL
3874 { 3976 case URxvt_perl:
3875 int fd; 3977 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3876 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3978 ; // no responses yet
3877 {
3878 scr_dump (fd);
3879 close (fd);
3880 }
3881 }
3882 break; 3979 break;
3883#endif 3980#endif
3884 } 3981 }
3885} 3982}
3886/*----------------------------------------------------------------------*/ 3983/*----------------------------------------------------------------------*/
… …
3917 return state; 4014 return state;
3918} 4015}
3919 4016
3920/* we're not using priv _yet_ */ 4017/* we're not using priv _yet_ */
3921void 4018void
3922rxvt_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)
3923{ 4020{
3924 unsigned int i, j; 4021 unsigned int i, j;
3925 int state; 4022 int state;
3926 4023
3927 static const struct 4024 static const struct
… …
3938 { 5, PrivMode_rVideo }, 4035 { 5, PrivMode_rVideo },
3939 { 6, PrivMode_relOrigin }, 4036 { 6, PrivMode_relOrigin },
3940 { 7, PrivMode_Autowrap }, 4037 { 7, PrivMode_Autowrap },
3941 // 8, bi-directional support mode 4038 // 8, bi-directional support mode
3942 { 9, PrivMode_MouseX10 }, 4039 { 9, PrivMode_MouseX10 },
3943#ifdef menuBar_esc
3944 { menuBar_esc, PrivMode_menuBar },
3945#endif
3946 // 18, 19 printing-related 4040 // 18, 19 printing-related
3947 { 25, PrivMode_VisibleCursor }, 4041 { 25, PrivMode_VisibleCursor },
3948#ifdef scrollBar_esc 4042#ifdef scrollBar_esc
3949 { scrollBar_esc, PrivMode_scrollBar }, 4043 { scrollBar_esc, PrivMode_scrollBar },
3950#endif 4044#endif
… …
3995 } 4089 }
3996 4090
3997 /* extra handling for values with state unkept */ 4091 /* extra handling for values with state unkept */
3998 switch (arg[i]) 4092 switch (arg[i])
3999 { 4093 {
4094#if ENABLE_STYLES
4095 case 1021:
4096 set_option (Opt_intensityStyles, mode);
4097
4098 scr_touch (true);
4099 break;
4100#endif
4000 case 1048: /* alternative cursor save */ 4101 case 1048: /* alternative cursor save */
4001 case 1049: 4102 case 1049:
4002 if (options & Opt_secondaryScreen) 4103 if (OPTION (Opt_secondaryScreen))
4003 if (mode == 0) 4104 if (mode == 0)
4004 scr_cursor (RESTORE); 4105 scr_cursor (RESTORE);
4005 else if (mode == 1) 4106 else if (mode == 1)
4006 scr_cursor (SAVE); 4107 scr_cursor (SAVE);
4007 break; 4108 break;
… …
4019 */ 4120 */
4020 PrivMode (1, PrivMode_vt52); 4121 PrivMode (1, PrivMode_vt52);
4021 break; 4122 break;
4022 case 3: /* 80/132 */ 4123 case 3: /* 80/132 */
4023 if (priv_modes & PrivMode_132OK) 4124 if (priv_modes & PrivMode_132OK)
4024 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4125 set_widthheight (((state ? 132 : 80) * fwidth), height);
4025 break; 4126 break;
4026 case 4: /* smooth scrolling */ 4127 case 4: /* smooth scrolling */
4027 if (state)
4028 options &= ~Opt_jumpScroll;
4029 else
4030 options |= Opt_jumpScroll; 4128 set_option (Opt_jumpScroll, !state);
4031 break; 4129 break;
4032 case 5: /* reverse video */ 4130 case 5: /* reverse video */
4033 scr_rvideo_mode (state); 4131 scr_rvideo_mode (state);
4034 break; 4132 break;
4035 case 6: /* relative/absolute origins */ 4133 case 6: /* relative/absolute origins */
… …
4041 /* 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 */
4042 case 9: /* X10 mouse reporting */ 4140 case 9: /* X10 mouse reporting */
4043 if (state) /* orthogonal */ 4141 if (state) /* orthogonal */
4044 priv_modes &= ~PrivMode_MouseX11; 4142 priv_modes &= ~PrivMode_MouseX11;
4045 break; 4143 break;
4046#ifdef menuBar_esc
4047 case menuBar_esc:
4048#ifdef MENUBAR
4049 map_menuBar (state);
4050#endif
4051 break;
4052#endif
4053#ifdef scrollBar_esc 4144#ifdef scrollBar_esc
4054 case scrollBar_esc: 4145 case scrollBar_esc:
4055 if (scrollbar_mapping (state)) 4146 if (scrollbar_mapping (state))
4056 { 4147 {
4057 resize_all_windows (0, 0, 0); 4148 resize_all_windows (0, 0, 0);
… …
4076#if 0 4167#if 0
4077 case 1001: 4168 case 1001:
4078 break; /* X11 mouse highlighting */ 4169 break; /* X11 mouse highlighting */
4079#endif 4170#endif
4080 case 1010: /* scroll to bottom on TTY output inhibit */ 4171 case 1010: /* scroll to bottom on TTY output inhibit */
4081 if (state)
4082 options &= ~Opt_scrollTtyOutput;
4083 else
4084 options |= Opt_scrollTtyOutput; 4172 set_option (Opt_scrollTtyOutput, !state);
4085 break; 4173 break;
4086 case 1011: /* scroll to bottom on key press */ 4174 case 1011: /* scroll to bottom on key press */
4087 if (state)
4088 options |= Opt_scrollTtyKeypress; 4175 set_option (Opt_scrollTtyKeypress, state);
4089 else
4090 options &= ~Opt_scrollTtyKeypress;
4091 break; 4176 break;
4092 case 1047: /* secondary screen w/ clearing last */ 4177 case 1047: /* secondary screen w/ clearing last */
4093 if (options & Opt_secondaryScreen) 4178 if (OPTION (Opt_secondaryScreen))
4094 if (current_screen != PRIMARY) 4179 if (current_screen != PRIMARY)
4095 scr_erase_screen (2); 4180 scr_erase_screen (2);
4096 scr_change_screen (state); 4181 scr_change_screen (state);
4097 break; 4182 break;
4098 case 1049: /* secondary screen w/ clearing first */ 4183 case 1049: /* secondary screen w/ clearing first */
4099 scr_change_screen (state); 4184 scr_change_screen (state);
4100 if (options & Opt_secondaryScreen) 4185 if (OPTION (Opt_secondaryScreen))
4101 if (current_screen != PRIMARY) 4186 if (current_screen != PRIMARY)
4102 scr_erase_screen (2); 4187 scr_erase_screen (2);
4103 break; 4188 break;
4104 default: 4189 default:
4105 break; 4190 break;
… …
4233 scr_color (Color_bg, Color_bg); 4318 scr_color (Color_bg, Color_bg);
4234 break; 4319 break;
4235 4320
4236 //case 50: // not variable spacing 4321 //case 50: // not variable spacing
4237 4322
4238#ifndef NO_BRIGHTCOLOR 4323#if !ENABLE_MINIMAL
4239 case 90: 4324 case 90:
4240 case 91: /* set bright fg color */ 4325 case 91: /* set bright fg color */
4241 case 92: 4326 case 92:
4242 case 93: 4327 case 93:
4243 case 94: 4328 case 94:
… …
4255 case 106: 4340 case 106:
4256 case 107: 4341 case 107:
4257 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4342 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4258 break; 4343 break;
4259#endif 4344#endif
4260
4261 } 4345 }
4262 } 4346 }
4263} 4347}
4264/*}}} */ 4348/*}}} */
4265 4349
… …
4289 */ 4373 */
4290void 4374void
4291rxvt_term::tt_printf (const char *fmt,...) 4375rxvt_term::tt_printf (const char *fmt,...)
4292{ 4376{
4293 va_list arg_ptr; 4377 va_list arg_ptr;
4294 unsigned char buf[256]; 4378 char buf[256];
4295 4379
4296 va_start (arg_ptr, fmt); 4380 va_start (arg_ptr, fmt);
4297 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4381 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4298 va_end (arg_ptr); 4382 va_end (arg_ptr);
4299 tt_write (buf, strlen (buf)); 4383 tt_write (buf, strlen (buf));
… …
4304 * or generated by us in response to a query ESC sequence. 4388 * or generated by us in response to a query ESC sequence.
4305 */ 4389 */
4306const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4390const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4307 4391
4308void 4392void
4309rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4393rxvt_term::tt_write (const char *data, unsigned int len)
4310{ 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
4311 if (v_buflen == 0) 4401 if (v_buflen == 0)
4312 { 4402 {
4313 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));
4314 4404
4315 if ((unsigned int)written == len) 4405 if ((unsigned int)written == len)
4316 return; 4406 return;
4317 4407
4318 data += written; 4408 data += written;
4319 len -= written; 4409 len -= written;
4320 } 4410 }
4321 4411
4322 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4412 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4323 4413
4324 memcpy (v_buffer + v_buflen, data, len); 4414 memcpy (v_buffer + v_buflen, data, len);
4325 v_buflen += len; 4415 v_buflen += len;
4326 4416
4327 pty_ev.set (EVENT_READ | EVENT_WRITE); 4417 pty_ev.set (EVENT_READ | EVENT_WRITE);
4328} 4418}
4329 4419
4330void rxvt_term::pty_write () 4420void rxvt_term::pty_write ()
4331{ 4421{
4332 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));
4333 4423
4334 if (written > 0) 4424 if (written > 0)
4335 { 4425 {
4336 v_buflen -= written; 4426 v_buflen -= written;
4337 4427
… …
4346 } 4436 }
4347 4437
4348 memmove (v_buffer, v_buffer + written, v_buflen); 4438 memmove (v_buffer, v_buffer + written, v_buflen);
4349 } 4439 }
4350 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4440 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4351 // original code just ignores this... 4441 pty_ev.set (EVENT_READ);
4352 destroy ();
4353} 4442}
4354 4443
4355/*----------------------- end-of-file (C source) -----------------------*/ 4444/*----------------------- end-of-file (C source) -----------------------*/
4356 4445

Diff Legend

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