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

Diff Legend

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