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.199 by root, Sun Feb 20 02:00:43 2005 UTC vs.
Revision 1.303 by root, Tue Jan 31 21:47:56 2006 UTC

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

Diff Legend

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