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

Diff Legend

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