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.204 by root, Wed Jul 13 02:47:02 2005 UTC vs.
Revision 1.288 by root, Sat Jan 28 20:33:31 2006 UTC

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

Diff Legend

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