ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

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

Diff Legend

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