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.302 by root, Tue Jan 31 21:35:39 2006 UTC

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

Diff Legend

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