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

Diff Legend

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