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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.202 by root, Sat Mar 12 23:35:14 2005 UTC vs.
Revision 1.323 by ayin, Mon May 28 18:38:03 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 55# include "keyboard.h"
55#endif 56#endif
56 57
57#include <csignal> 58#include <csignal>
58 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
59/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
60 65
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 67
66#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
67 69
68#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
135rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
136{ 138{
137 x = Pixel2Col (x); 139 x = Pixel2Col (x);
138 y = Pixel2Row (y); 140 y = Pixel2Row (y);
139 141
140 if (x < 0 || x >= TermWin.ncol 142 if (!IN_RANGE_EXC (x, 0, ncol)
141 || y < 0 || y >= TermWin.nrow) 143 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 144 return;
143 145
144 for (;;) 146 for (;;)
145 { 147 {
146 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 148 const line_t &l = ROW(y + view_start);
149
150 text_t t = l.t[x];
147 151
148 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
149 { 153 {
150 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 154 iso14755_51 (l.t[x], l.r[x], x, y);
151 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
152 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
153 break; 156 break;
154 } 157 }
155 158
156 x--; 159 x--;
157 } 160 }
158
159} 161}
160#endif
161 162
162#if ENABLE_OVERLAY
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2; 168 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 169 int len;
170 170
171 fname = rxvt_utf8towcs (f->name);
172
171#if ENABLE_COMBINING 173# if ENABLE_COMBINING
172 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
173 { 175 {
174 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
175 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
176 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
177 } 179 }
178 else 180 else
179#endif 181# endif
180 { 182 {
181 ch2 = ch; 183 ch2 = ch;
182 184
183 alloc = 0; 185 alloc = 0;
184 chr = &ch2; 186 chr = &ch2;
185 len = 1; 187 len = 1;
186 } 188 }
187 189
188 int width = strlen (f->name); 190 char attr[80]; // plenty
189 191
190 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
202 int width = wcswidth (fname, wcslen (fname));
203
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
191 214
192 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
193 216
194 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
195 { 218 {
… …
198 ch = *chr++; 221 ch = *chr++;
199 222
200 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
201 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
202 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
203#if !UNICODE3 226# if !UNICODE3
204 if (ch >= 0x10000) 227 if (ch >= 0x10000)
205 ch = 0xfffd; 228 ch = 0xfffd;
206#endif 229# endif
207 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
208 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
209 } 234 }
210 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
241 scr_overlay_set (0, len , attr);
211 scr_overlay_set (0, len, f->name); 242 scr_overlay_set (0, len + 1, fname);
212 243
244 free (fname);
245
213#if ENABLE_COMBINING 246# if ENABLE_COMBINING
214 if (alloc) 247 if (alloc)
215 delete [] alloc; 248 delete [] alloc;
216#endif 249# endif
217} 250}
218#endif 251#endif
219 252
220void 253void
221rxvt_term::commit_iso14755 () 254rxvt_term::commit_iso14755 ()
… …
238 mb[0] = ch[0]; 271 mb[0] = ch[0];
239 len = 1; 272 len = 1;
240 } 273 }
241 274
242 if (len > 0) 275 if (len > 0)
243 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
244 else 277 else
245 scr_bell (); 278 scr_bell ();
246 } 279 }
247 280
248 iso14755buf = 0; 281 iso14755buf = 0;
… …
265 298
266 return -1; 299 return -1;
267} 300}
268#endif 301#endif
269 302
270/*{{{ Convert the keypress event into a string */
271void 303void
272rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
273{ 305{
274 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
275 unsigned int newlen; 307 unsigned int newlen;
276 KeySym keysym; 308 KeySym keysym;
277#ifdef DEBUG_CMD
278 static int debug_key = 1; /* accessible by a debugger only */
279#endif
280 int valid_keysym; 309 int valid_keysym;
281 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
282 316
283 /* 317 /*
284 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
285 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
286 * 320 *
… …
304 Status status_return; 338 Status status_return;
305 339
306#if 0 340#if 0
307#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
308 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 342 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
309 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
310 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
311 else 345 else
312#endif 346#endif
313#endif 347#endif
314 { 348 {
… …
351 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
352 } 386 }
353 else 387 else
354#endif 388#endif
355 { 389 {
356 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
357 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
358 } 392 }
359 393
360 if (valid_keysym) 394 if (valid_keysym)
361 { 395 {
362#ifdef KEYSYM_RESOURCE 396#ifdef KEYSYM_RESOURCE
363 if (keyboard->dispatch (this, keysym, ev.state)) 397 if (keyboard->dispatch (this, keysym, ev.state))
364 return; 398 return;
365#endif 399#endif
366 400
367 if (TermWin.saveLines) 401 if (saveLines)
368 { 402 {
369#ifdef UNSHIFTED_SCROLLKEYS 403#ifdef UNSHIFTED_SCROLLKEYS
370 if (!ctrl && !meta) 404 if (!ctrl && !meta)
371#else 405#else
372 if (IS_SCROLL_MOD) 406 if (IS_SCROLL_MOD)
373#endif 407#endif
374 { 408 {
375 int lnsppg; 409 int lnsppg;
376 410
377#ifdef PAGING_CONTEXT_LINES 411#ifdef PAGING_CONTEXT_LINES
378 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 412 lnsppg = nrow - PAGING_CONTEXT_LINES;
379#else 413#else
380 lnsppg = TermWin.nrow * 4 / 5; 414 lnsppg = nrow * 4 / 5;
381#endif 415#endif
382 if (keysym == XK_Prior) 416 if (keysym == XK_Prior)
383 { 417 {
384 scr_page (UP, lnsppg); 418 scr_page (UP, lnsppg);
385 return; 419 return;
… …
413 scr_move_to (0, 1); 447 scr_move_to (0, 1);
414 return; 448 return;
415 } 449 }
416 else if (keysym == XK_End) 450 else if (keysym == XK_End)
417 { 451 {
418 scr_move_to (1, 0); 452 scr_move_to (1, 1);
419 return; 453 return;
420 } 454 }
421 } 455 }
422#endif 456#endif
423 } 457 }
… …
434 { 468 {
435 switch (keysym) 469 switch (keysym)
436 { 470 {
437 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
438 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
439 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
440 return; 474 return;
441#if TODO 475#if TODO
442 /* rxvt extras */ 476 /* rxvt extras */
443 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
444 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
463 { 497 {
464 commit_iso14755 (); 498 commit_iso14755 ();
465 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
466# if ISO_14755 500# if ISO_14755
467 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
468# endif 510# endif
469 return; 511 return;
470 } 512 }
471 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
472 { 514 {
… …
825 { 867 {
826#ifdef META8_OPTION 868#ifdef META8_OPTION
827 /* set 8-bit on */ 869 /* set 8-bit on */
828 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
829 { 871 {
830 unsigned char *ch; 872 char *ch;
831 873
832 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
833 *ch |= 0x80; 875 *ch |= 0x80;
834 876
835 meta = 0; 877 meta = 0;
… …
837#endif 879#endif
838 /* nil */ ; 880 /* nil */ ;
839 } 881 }
840 } 882 }
841 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
842 if (len <= 0) 887 if (len <= 0)
843 return; /* not mapped */ 888 return; /* not mapped */
844 889
845 if (options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
846 if (TermWin.view_start) 891 if (view_start)
847 { 892 {
848 TermWin.view_start = 0; 893 view_start = 0;
849 want_refresh = 1; 894 want_refresh = 1;
850 } 895 }
851 896
852 /* 897 /*
853 * these modifications only affect the static keybuffer 898 * these modifications only affect the static keybuffer
… …
868#ifdef META8_OPTION 913#ifdef META8_OPTION
869 && meta_char == C0_ESC 914 && meta_char == C0_ESC
870#endif 915#endif
871 ) 916 )
872 { 917 {
873 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
874 tt_write (&ch, 1); 919 tt_write (&ch, 1);
875 } 920 }
876 921
877#if defined(DEBUG_CMD)
878 /* Display keyboard buffer contents */
879 unsigned char *p;
880 int i;
881
882 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
883 for (i = 0, p = kbuf; i < len; i++, p++)
884 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
885 fprintf (stderr, "'\n");
886#endif /* DEBUG_CMD */
887 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
888} 923}
889/*}}} */
890 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
891#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
892/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
893/* attempt to `write' count to the input buffer */
894unsigned int 1003unsigned int
895rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
896{ 1005{
897 unsigned int n, s; 1006 unsigned int n, s;
898 1007
899 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
900 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
937 } 1046 }
938#endif 1047#endif
939 1048
940 if (want_refresh) 1049 if (want_refresh)
941 { 1050 {
1051 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1052 {
1053 int row = view_start;
1054 int end_row = row + nrow;
1055
1056 while (row > top_row && ROW (row - 1).is_longer ())
1057 --row;
1058
1059 do
1060 {
1061 int start_row = row;
1062 line_t *l;
1063
1064 do
1065 {
1066 l = &ROW (row++);
1067
1068 if (!(l->f & LINE_FILTERED))
1069 {
1070 // line not filtered, mark it as filtered
1071 l->f |= LINE_FILTERED;
1072 while (l->is_longer ())
1073 {
1074 l = &ROW (row++);
1075 l->f |= LINE_FILTERED;
1076 }
1077
1078 // and filter it
1079 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1080
1081 break;
1082 }
1083 }
1084 while (l->is_longer () && row < end_row);
1085 }
1086 while (row < end_row);
1087 }
1088
942 scr_refresh (refresh_type); 1089 scr_refresh ();
943 scrollbar_show (1); 1090 scrollbar_show (1);
944#ifdef USE_XIM 1091#ifdef USE_XIM
945 IMSendSpot (); 1092 IMSendSpot ();
946#endif 1093#endif
947 } 1094 }
… …
950} 1097}
951 1098
952void 1099void
953rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
954{ 1101{
955 SET_R (this); 1102 make_current ();
956 SET_LOCALE (locale);
957 1103
958 display->flush (); 1104 display->flush ();
959 1105
960 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
961 flush_ev.start (NOW + 0.01); 1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
962} 1108}
963 1109
964void 1110void
965rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
966{ 1112{
967 SET_R (this); 1113 make_current ();
968 SET_LOCALE (locale);
969 1114
970 refresh_limit = 1; 1115 refresh_limit = 1;
971 refresh_count = 0; 1116 refresh_count = 0;
972 flush (); 1117 flush ();
973} 1118}
… …
977rxvt_term::cursor_blink_cb (time_watcher &w) 1122rxvt_term::cursor_blink_cb (time_watcher &w)
978{ 1123{
979 hidden_cursor = !hidden_cursor; 1124 hidden_cursor = !hidden_cursor;
980 want_refresh = 1; 1125 want_refresh = 1;
981 1126
982 w.start (w.at + BLINK_INTERVAL); 1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
983} 1128}
984#endif 1129#endif
985 1130
986#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
987void 1132void
… …
1001rxvt_term::cont_scroll_cb (time_watcher &w) 1146rxvt_term::cont_scroll_cb (time_watcher &w)
1002{ 1147{
1003 if ((scrollbar_isUp() || scrollbar_isDn()) && 1148 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1004 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1149 scr_page (scrollbar_isUp() ? UP : DN, 1))
1005 { 1150 {
1006 refresh_type |= SMOOTH_REFRESH;
1007 want_refresh = 1; 1151 want_refresh = 1;
1008 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1009 } 1153 }
1010} 1154}
1011#endif 1155#endif
… …
1015rxvt_term::sel_scroll_cb (time_watcher &w) 1159rxvt_term::sel_scroll_cb (time_watcher &w)
1016{ 1160{
1017 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1161 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1018 { 1162 {
1019 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1163 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1020 refresh_type |= SMOOTH_REFRESH;
1021 want_refresh = 1; 1164 want_refresh = 1;
1022 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1023 } 1166 }
1024} 1167}
1025#endif 1168#endif
… …
1030{ 1173{
1031 if (mouse_slip_wheel_speed == 0 1174 if (mouse_slip_wheel_speed == 0
1032 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1033 : scr_page (UP, mouse_slip_wheel_speed)) 1176 : scr_page (UP, mouse_slip_wheel_speed))
1034 { 1177 {
1035 if (TermWin.view_start == TermWin.nscrolled || 1178 if (view_start == top_row || view_start == 0)
1036 TermWin.view_start == 0)
1037 mouse_slip_wheel_speed = 0; 1179 mouse_slip_wheel_speed = 0;
1038 1180
1039 refresh_type |= SMOOTH_REFRESH;
1040 want_refresh = 1; 1181 want_refresh = 1;
1041 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1042 } 1183 }
1043} 1184}
1044#endif 1185#endif
1045 1186
1187#if LINUX_YIELD_HACK
1188static struct event_handler
1189{
1190 check_watcher yield_ev;
1191
1192 void yield_cb (check_watcher &w)
1193 {
1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1202 w.stop ();
1203 }
1204
1205 event_handler ()
1206 : yield_ev (this, &event_handler::yield_cb)
1207 {
1208 }
1209} event_handler;
1210#endif
1211
1046bool 1212bool
1047rxvt_term::pty_fill () 1213rxvt_term::pty_fill ()
1048{ 1214{
1049 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1215 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1050 1216
1051 if (CBUFSIZ == n) 1217 if (CBUFSIZ == n)
1052 { 1218 {
1053 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1219 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1054 n = 0; 1220 n = 0;
1055 } 1221 }
1056 1222
1057 memmove (cmdbuf_base, cmdbuf_ptr, n); 1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
1058 cmdbuf_ptr = cmdbuf_base; 1224 cmdbuf_ptr = cmdbuf_base;
1059 cmdbuf_endp = cmdbuf_ptr + n; 1225 cmdbuf_endp = cmdbuf_ptr + n;
1060 1226
1061 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1062 1228
1063 if (n > 0) 1229 if (r > 0)
1064 { 1230 {
1065 cmdbuf_endp += n; 1231 cmdbuf_endp += r;
1066 return true; 1232 return true;
1067 } 1233 }
1068 else if (n < 0 && errno != EAGAIN) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1235 {
1236#if LINUX_YIELD_HACK
1237 if (display->is_local)
1238 event_handler.yield_ev.start ();
1239#endif
1240 }
1241 else
1242 {
1243 pty_ev.stop ();
1244
1245 if (!option (Opt_hold))
1069 destroy (); 1246 destroy ();
1247 }
1070 1248
1071 return false; 1249 return false;
1072} 1250}
1073 1251
1074void 1252void
1075rxvt_term::pty_cb (io_watcher &w, short revents) 1253rxvt_term::pty_cb (io_watcher &w, short revents)
1076{ 1254{
1077 SET_R (this); 1255 make_current ();
1078 SET_LOCALE (locale);
1079 1256
1080 if (revents & EVENT_READ) 1257 if (revents & EVENT_READ)
1081 // loop, but don't allow a single term to monopolize us 1258 // loop, but don't allow a single term to monopolize us
1082 while (pty_fill ()) 1259 while (pty_fill ())
1083 if (cmd_parse ()) 1260 if (cmd_parse ())
… …
1088} 1265}
1089 1266
1090void 1267void
1091rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1092{ 1269{
1093 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1094 recolour_cursor (); 1271 recolour_cursor ();
1095 1272
1096#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1097 hidden_pointer = 0; 1274 hidden_pointer = 0;
1098 1275
1099 if (options & Opt_pointerBlank) 1276 if (option (Opt_pointerBlank))
1100 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1101#endif 1278#endif
1102} 1279}
1103 1280
1104#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1105void 1282void
1106rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1107{ 1284{
1108 if (! (options & Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1109 return; 1286 return;
1110 1287
1111 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1112 XFlush (display->display); 1289 XFlush (dpy);
1113 1290
1114 hidden_pointer = 1; 1291 hidden_pointer = 1;
1115} 1292}
1116 1293
1117void 1294void
1118rxvt_term::pointer_cb (time_watcher &w) 1295rxvt_term::pointer_cb (time_watcher &w)
1119{ 1296{
1120 SET_R (this); 1297 make_current ();
1121 SET_LOCALE (locale);
1122 1298
1123 pointer_blank (); 1299 pointer_blank ();
1124} 1300}
1125#endif 1301#endif
1126 1302
… …
1191 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
1192 (32 + x + 1), 1368 (32 + x + 1),
1193 (32 + y + 1)); 1369 (32 + y + 1));
1194} 1370}
1195 1371
1196#ifdef USING_W11LIB
1197void
1198rxvt_W11_process_x_event (XEvent *ev)
1199{
1200 rxvt_t *r = rxvt_get_r ();
1201
1202 x_cb (*ev);
1203}
1204#endif
1205
1206/*{{{ process an X event */ 1372/*{{{ process an X event */
1207void 1373void
1208rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1209{ 1375{
1210 dDisp; 1376 make_current ();
1211 1377
1212 SET_R (this); 1378 dLocal (Display *, dpy);
1213 SET_LOCALE (locale);
1214 1379
1215#if defined(CURSOR_BLINK) 1380 if (ev.xany.window == vt
1216 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1217 { 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1218 if (hidden_cursor) 1383 return;
1219 {
1220 hidden_cursor = 0;
1221 want_refresh = 1;
1222 }
1223 1384
1224 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1385 // for XQueryPointer
1225 }
1226#endif
1227
1228#if defined(POINTER_BLANK)
1229 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1230 {
1231 if (ev.type == MotionNotify
1232 || ev.type == ButtonPress
1233 || ev.type == ButtonRelease)
1234 if (hidden_pointer)
1235 pointer_unblank ();
1236
1237 if (ev.type == KeyPress && hidden_pointer == 0)
1238 pointer_blank ();
1239 }
1240#endif
1241
1242 Window unused_root, unused_child; 1386 Window unused_root, unused_child;
1243 int unused_root_x, unused_root_y; 1387 int unused_root_x, unused_root_y;
1244 unsigned int unused_mask; 1388 unsigned int unused_mask;
1245 1389
1246 switch (ev.type) 1390 switch (ev.type)
1247 { 1391 {
1248 case KeyPress: 1392 case KeyPress:
1249#if ISO_14755 1393 key_press (ev.xkey);
1250 if (!(iso14755buf & ISO_14755_52))
1251#endif
1252 lookup_key (ev.xkey);
1253
1254 break; 1394 break;
1255 1395
1256 case KeyRelease: 1396 case KeyRelease:
1257 { 1397 key_release (ev.xkey);
1258#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1259 KeySym ks;
1260
1261 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1262#endif
1263
1264#if ENABLE_FRILLS || ISO_14755
1265 // ISO 14755 support
1266 if (iso14755buf)
1267 if (iso14755buf & ISO_14755_52)
1268 {
1269# if ENABLE_OVERLAY
1270 scr_overlay_off ();
1271# endif
1272# if ISO_14755
1273 // iso14755 part 5.2 handling: release time
1274 // first: controls
1275 if ((ev.xkey.state & ControlMask)
1276 && ((ks >= 0x40 && ks <= 0x5f)
1277 || (ks >= 0x61 && ks <= 0x7f)))
1278 {
1279 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1280 commit_iso14755 ();
1281 return; // case-break;
1282 }
1283
1284 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1285 if (i[0] == ks)
1286 {
1287 iso14755buf = ISO_14755_51 | i[1];
1288 commit_iso14755 ();
1289 return; // case-break;
1290 }
1291
1292 scr_bell ();
1293# endif
1294 iso14755buf = 0;
1295 break;
1296 }
1297 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1298 {
1299# if ENABLE_OVERLAY
1300 scr_overlay_off ();
1301# endif
1302 if (iso14755buf & ISO_14755_51)
1303 commit_iso14755 ();
1304#if ISO_14755
1305 else if (iso14755buf & ISO_14755_STARTED)
1306 {
1307 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1308
1309 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1310 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1311 }
1312# endif
1313 else
1314 iso14755buf = 0;
1315 }
1316#endif
1317
1318#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1319 if (!(ev.xkey.state & ControlMask))
1320 slip_wheel_ev.stop ();
1321 else if (ks == XK_Control_L || ks == XK_Control_R)
1322 mouse_slip_wheel_speed = 0;
1323#endif
1324 break; 1398 break;
1325 }
1326 1399
1327 case ButtonPress: 1400 case ButtonPress:
1328 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1329 break; 1402 break;
1330 1403
… …
1332 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1333 break; 1406 break;
1334 1407
1335 case ClientMessage: 1408 case ClientMessage:
1336 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1337 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1410 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1338 { 1411 {
1412 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1413 {
1414 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1415 {
1339 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1417 {
1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1340 destroy (); 1419 destroy ();
1420 }
1341#if ENABLE_EWMH 1421#if ENABLE_EWMH
1342 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1343 XSendEvent (disp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1344 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1345 &ev); 1425 &ev);
1426#endif
1427 }
1428 }
1429#if ENABLE_XEMBED
1430 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1431 {
1432 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1433 focus_in ();
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out ();
1436 }
1346#endif 1437#endif
1347 } 1438 }
1348#if ENABLE_XEMBED
1349 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1350 {
1351 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1352 focus_in ();
1353 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1354 focus_out ();
1355 }
1356#endif
1357#ifdef OFFIX_DND
1358 /* OffiX Dnd (drag 'n' drop) protocol */
1359 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1360 && (ev.xclient.data.l[0] == DndFile
1361 || ev.xclient.data.l[0] == DndDir
1362 || ev.xclient.data.l[0] == DndLink))
1363 {
1364 /* Get Dnd data */
1365 Atom ActualType;
1366 int ActualFormat;
1367 unsigned char *data;
1368 unsigned long Size, RemainingBytes;
1369
1370 XGetWindowProperty (disp, display->root,
1371 xa[XA_DNDSELECTION],
1372 0L, 1000000L,
1373 False, AnyPropertyType,
1374 &ActualType, &ActualFormat,
1375 &Size, &RemainingBytes,
1376 &data);
1377 set_string_property (XA_CUT_BUFFER0, data);
1378 XFree (data);
1379 selection_paste (display->root, XA_CUT_BUFFER0, true);
1380 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1381 }
1382#endif /* OFFIX_DND */
1383 break; 1439 break;
1384 1440
1385 case MappingNotify: 1441 case MappingNotify:
1386 XRefreshKeyboardMapping (&ev.xmapping); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1387 break; 1443 break;
… …
1410 break; 1466 break;
1411 } 1467 }
1412 break; 1468 break;
1413 1469
1414 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1415 focus_in (); 1474 focus_in ();
1416 break; 1475 break;
1417 1476
1418 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1419 focus_out (); 1481 focus_out ();
1420 break; 1482 break;
1421 1483
1422 case ConfigureNotify: 1484 case ConfigureNotify:
1423 if (ev.xconfigure.window == TermWin.parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1424 { 1486 {
1425 int height, width;
1426
1427 do
1428 { /* Wrap lots of configures into one */
1429 width = ev.xconfigure.width;
1430 height = ev.xconfigure.height;
1431 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1432 }
1433 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488 ;
1434 1489
1435 if (szHint.width != width || szHint.height != height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1436 { 1491 {
1437 seen_resize = 1; 1492 seen_resize = 1;
1438 resize_all_windows (width, height, 1); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1439 } 1494 }
1440 1495
1441#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1496 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1497
1498#ifdef TRANSPARENT
1442 if (options & Opt_transparent) 1499 if (option (Opt_transparent))
1443 check_our_parents (); 1500 check_our_parents ();
1444#endif 1501#endif
1445 } 1502 }
1446 break; 1503 break;
1447 1504
1448 case PropertyNotify: 1505 case PropertyNotify:
1506 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1449 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1507 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1450 && ev.xproperty.state == PropertyNewValue) 1508 && ev.xproperty.state == PropertyNewValue)
1451 selection_property (ev.xproperty.window, ev.xproperty.atom); 1509 selection_property (ev.xproperty.window, ev.xproperty.atom);
1452 1510
1453 break; 1511 break;
1454 1512
1455 case SelectionClear: 1513 case SelectionClear:
1456 selection_clear (); 1514 selection_clear ();
… …
1463 1521
1464 case SelectionRequest: 1522 case SelectionRequest:
1465 selection_send (ev.xselectionrequest); 1523 selection_send (ev.xselectionrequest);
1466 break; 1524 break;
1467 1525
1526 case MapNotify:
1527 mapped = 1;
1528#ifdef TEXT_BLINK
1529 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1530#endif
1531 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1532 break;
1533
1468 case UnmapNotify: 1534 case UnmapNotify:
1469 TermWin.mapped = 0; 1535 mapped = 0;
1470#ifdef TEXT_BLINK 1536#ifdef TEXT_BLINK
1471 text_blink_ev.stop (); 1537 text_blink_ev.stop ();
1472#endif 1538#endif
1473 break; 1539 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1474
1475 case MapNotify:
1476 TermWin.mapped = 1;
1477#ifdef TEXT_BLINK
1478 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1479#endif
1480 break; 1540 break;
1481 1541
1482#ifdef TRANSPARENT 1542#ifdef TRANSPARENT
1483 case ReparentNotify: 1543 case ReparentNotify:
1484 rootwin_cb (ev); 1544 rootwin_cb (ev);
1485 break; 1545 break;
1486#endif /* TRANSPARENT */ 1546#endif /* TRANSPARENT */
1487 1547
1488 case GraphicsExpose: 1548 case GraphicsExpose:
1489 case Expose: 1549 case Expose:
1490 if (ev.xany.window == TermWin.vt) 1550 if (ev.xany.window == vt)
1491 { 1551 {
1492 do 1552 do
1493 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1494 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1495 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1496 1556
1497 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1498 1558
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1502 1562
1503 scr_refresh (refresh_type); 1563 want_refresh = 1;
1504 } 1564 }
1505 else 1565 else
1506 { 1566 {
1507 XEvent unused_event; 1567 XEvent unused_event;
1508 1568
1509 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1510 ; 1570 ;
1511 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1512 ; 1572 ;
1513 1573
1514 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1515 { 1575 {
1516 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1517 scrollbar_show (0); 1577 scrollbar_show (0);
1518 } 1578 }
1519#ifdef MENUBAR
1520 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1521 menubar_expose ();
1522#endif
1523 1579
1524#ifdef TRANSPARENT 1580#ifdef TRANSPARENT
1525 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1581 if (am_transparent && ev.xany.window == parent[0])
1526 XClearWindow (disp, ev.xany.window); 1582 XClearWindow (dpy, ev.xany.window);
1527#endif 1583#endif
1528 } 1584 }
1529 break; 1585 break;
1530 1586
1531 case MotionNotify: 1587 case MotionNotify:
1532#ifdef POINTER_BLANK 1588#ifdef POINTER_BLANK
1533 if (hidden_pointer) 1589 if (hidden_pointer)
1534 pointer_unblank (); 1590 pointer_unblank ();
1535#endif 1591#endif
1536#if MENUBAR
1537 if (isMenuBarWindow (ev.xany.window))
1538 {
1539 menubar_control (ev.xbutton);
1540 break;
1541 }
1542#endif
1543 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1544 break; 1593 break;
1545 1594
1546 if (ev.xany.window == TermWin.vt) 1595 if (ev.xany.window == vt)
1547 { 1596 {
1597 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1598 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1599 ; // nop
1548 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1600 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1549 { 1601 {
1550 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1551 ; 1603 ;
1552 1604
1553 XQueryPointer (disp, TermWin.vt, 1605 XQueryPointer (dpy, vt,
1554 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1555 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1556 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1557 &ev.xbutton.state); 1609 &ev.xbutton.state);
1558#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
… …
1570#endif 1622#endif
1571 selection_extend (ev.xbutton.x, ev.xbutton.y, 1623 selection_extend (ev.xbutton.x, ev.xbutton.y,
1572 ev.xbutton.state & Button3Mask ? 2 : 0); 1624 ev.xbutton.state & Button3Mask ? 2 : 0);
1573 1625
1574#ifdef SELECTION_SCROLLING 1626#ifdef SELECTION_SCROLLING
1575 if (ev.xbutton.y < TermWin.int_bwidth 1627 if (ev.xbutton.y < int_bwidth
1576 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1628 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1577 { 1629 {
1578 int dist; 1630 int dist;
1579 1631
1580 /* don't clobber the current delay if we are 1632 /* don't clobber the current delay if we are
1581 * already in the middle of scrolling. 1633 * already in the middle of scrolling.
… …
1589 selection_save_x = ev.xbutton.x; 1641 selection_save_x = ev.xbutton.x;
1590 selection_save_y = ev.xbutton.y; 1642 selection_save_y = ev.xbutton.y;
1591 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1643 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1592 1644
1593 /* calc number of lines to scroll */ 1645 /* calc number of lines to scroll */
1594 if (ev.xbutton.y < TermWin.int_bwidth) 1646 if (ev.xbutton.y < int_bwidth)
1595 { 1647 {
1596 scroll_selection_dir = UP; 1648 scroll_selection_dir = UP;
1597 dist = TermWin.int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1598 } 1650 }
1599 else 1651 else
1600 { 1652 {
1601 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1602 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1654 dist = ev.xbutton.y - (int_bwidth + height);
1603 } 1655 }
1604 1656
1605 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1606 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1607 + 1; 1659 + 1;
1608 MIN_IT (scroll_selection_lines, 1660 min_it (scroll_selection_lines,
1609 SELECTION_SCROLL_MAX_LINES); 1661 SELECTION_SCROLL_MAX_LINES);
1610 } 1662 }
1611 else 1663 else
1612 { 1664 {
1613 /* we are within the text window, so we 1665 /* we are within the text window, so we
… …
1622#endif 1674#endif
1623 } 1675 }
1624 } 1676 }
1625 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1626 { 1678 {
1627 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1628 MotionNotify, &ev)) 1680 MotionNotify, &ev))
1629 ; 1681 ;
1630 1682
1631 XQueryPointer (disp, scrollBar.win, 1683 XQueryPointer (dpy, scrollBar.win,
1632 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1633 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1634 &ev.xbutton.x, &ev.xbutton.y, 1686 &ev.xbutton.x, &ev.xbutton.y,
1635 &unused_mask); 1687 &unused_mask);
1636 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1637 scrollbar_size ()); 1689 scrollbar_size ());
1638 scr_refresh (refresh_type); 1690 want_refresh = 1;
1639 refresh_limit = 0; 1691 refresh_limit = 0;
1640 scrollbar_show (1); 1692 scrollbar_show (1);
1641 } 1693 }
1642 break; 1694 break;
1643 } 1695 }
1696
1697#if defined(CURSOR_BLINK)
1698 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1699 {
1700 if (hidden_cursor)
1701 {
1702 hidden_cursor = 0;
1703 want_refresh = 1;
1704 }
1705
1706 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1707 }
1708#endif
1709
1710#if defined(POINTER_BLANK)
1711 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1712 {
1713 if (ev.type == MotionNotify
1714 || ev.type == ButtonPress
1715 || ev.type == ButtonRelease)
1716 if (hidden_pointer)
1717 pointer_unblank ();
1718
1719 if (ev.type == KeyPress && hidden_pointer == 0)
1720 pointer_blank ();
1721 }
1722#endif
1644} 1723}
1645 1724
1646void 1725void
1647rxvt_term::focus_in () 1726rxvt_term::focus_in ()
1648{ 1727{
1649 if (!TermWin.focus) 1728 if (!focus)
1650 { 1729 {
1651 TermWin.focus = 1; 1730 focus = 1;
1652 want_refresh = 1; 1731 want_refresh = 1;
1732
1733 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1734
1653#ifdef USE_XIM 1735#if USE_XIM
1654 if (Input_Context != NULL) 1736 if (Input_Context != NULL)
1655 { 1737 {
1656 IMSetStatusPosition (); 1738 IMSetPosition ();
1657 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1658 } 1740 }
1659#endif 1741#endif
1660#ifdef CURSOR_BLINK 1742#if CURSOR_BLINK
1661 if (options & Opt_cursorBlink) 1743 if (option (Opt_cursorBlink))
1662 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1744 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1663#endif 1745#endif
1664#ifdef OFF_FOCUS_FADING 1746#if OFF_FOCUS_FADING
1665 if (rs[Rs_fade]) 1747 if (rs[Rs_fade])
1666 { 1748 {
1667 pix_colors = pix_colors_focused; 1749 pix_colors = pix_colors_focused;
1668 scr_recolour (); 1750 scr_recolour ();
1669 } 1751 }
1670#endif 1752#endif
1753#if ENABLE_FRILLS
1754 if (option (Opt_urgentOnBell))
1755 {
1756 XWMHints *h;
1757
1758 h = XGetWMHints(dpy, parent[0]);
1759 if (h != NULL)
1760 {
1761 h->flags &= ~XUrgencyHint;
1762 XSetWMHints(dpy, parent[0], h);
1763 }
1764 }
1765#endif
1671 } 1766 }
1672} 1767}
1673 1768
1674void 1769void
1675rxvt_term::focus_out () 1770rxvt_term::focus_out ()
1676{ 1771{
1677 if (TermWin.focus) 1772 if (focus)
1678 { 1773 {
1679 TermWin.focus = 0; 1774 focus = 0;
1680 want_refresh = 1; 1775 want_refresh = 1;
1681 1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778
1682#if ENABLE_FRILLS || ISO_14755 1779#if ENABLE_FRILLS || ISO_14755
1780 if (iso14755buf)
1781 {
1683 iso14755buf = 0; 1782 iso14755buf = 0;
1684#endif
1685#if ENABLE_OVERLAY 1783# if ENABLE_OVERLAY
1686 scr_overlay_off (); 1784 scr_overlay_off ();
1687#endif 1785# endif
1786 }
1787#endif
1688#ifdef USE_XIM 1788#if USE_XIM
1689 if (Input_Context != NULL) 1789 if (Input_Context != NULL)
1690 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1691#endif 1791#endif
1692#ifdef CURSOR_BLINK 1792#if CURSOR_BLINK
1693 if (options & Opt_cursorBlink) 1793 if (option (Opt_cursorBlink))
1694 cursor_blink_ev.stop (); 1794 cursor_blink_ev.stop ();
1695 hidden_cursor = 0; 1795 hidden_cursor = 0;
1696#endif 1796#endif
1697#ifdef OFF_FOCUS_FADING 1797#if OFF_FOCUS_FADING
1698 if (rs[Rs_fade]) 1798 if (rs[Rs_fade])
1699 { 1799 {
1700 pix_colors = pix_colors_unfocused; 1800 pix_colors = pix_colors_unfocused;
1701 scr_recolour (); 1801 scr_recolour ();
1702 } 1802 }
1703#endif 1803#endif
1704 } 1804 }
1705} 1805}
1706 1806
1707#if TRANSPARENT 1807void
1808rxvt_term::update_fade_color (unsigned int idx)
1809{
1810#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade])
1812 {
1813 rgba c;
1814 pix_colors [Color_fade].get (c);
1815 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1816 }
1817#endif
1818}
1819
1820#if TRANSPARENT || ENABLE_PERL
1708void 1821void
1709rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1710{ 1823{
1711 SET_R (this); 1824 make_current ();
1712 SET_LOCALE (locale);
1713 1825
1826 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1827 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1828 return;
1829
1830# if TRANSPARENT
1714 switch (ev.type) 1831 switch (ev.type)
1715 { 1832 {
1716 case PropertyNotify: 1833 case PropertyNotify:
1717 /* 1834 /*
1718 * if user used some Esetroot compatible prog to set the root bg, 1835 * if user used some Esetroot compatible prog to set the root bg,
… …
1722 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1723 return; 1840 return;
1724 1841
1725 /* FALLTHROUGH */ 1842 /* FALLTHROUGH */
1726 case ReparentNotify: 1843 case ReparentNotify:
1727 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1844 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1728 want_refresh = want_full_refresh = 1; 1845 want_refresh = want_full_refresh = 1;
1729 break; 1846 break;
1730 } 1847 }
1848# endif
1731} 1849}
1732#endif 1850#endif
1733 1851
1734void 1852void
1735rxvt_term::button_press (XButtonEvent &ev) 1853rxvt_term::button_press (XButtonEvent &ev)
1736{ 1854{
1737 int reportmode = 0, clickintime; 1855 int reportmode = 0, clickintime;
1738 1856
1739 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1857 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1858
1740 if (!bypass_keystate) 1859 if (!bypass_keystate)
1741 reportmode = !! (priv_modes & PrivMode_mouse_report); 1860 reportmode = !! (priv_modes & PrivMode_mouse_report);
1742 1861
1743 /* 1862 /*
1744 * VT window processing of button press 1863 * VT window processing of button press
1745 */ 1864 */
1746 if (ev.window == TermWin.vt) 1865 if (ev.window == vt)
1747 { 1866 {
1867 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1868 return;
1869
1748#if ISO_14755 1870#if ISO_14755
1749 // 5.4 1871 // 5.4
1750 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1872 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1751 { 1873 {
1752 iso14755_54 (ev.x, ev.y); 1874 iso14755_54 (ev.x, ev.y);
… …
1764#ifdef MOUSE_REPORT_DOUBLECLICK 1886#ifdef MOUSE_REPORT_DOUBLECLICK
1765 if (ev.button == MEvent.button && clickintime) 1887 if (ev.button == MEvent.button && clickintime)
1766 { 1888 {
1767 /* same button, within alloted time */ 1889 /* same button, within alloted time */
1768 MEvent.clicks++; 1890 MEvent.clicks++;
1891
1769 if (MEvent.clicks > 1) 1892 if (MEvent.clicks > 1)
1770 { 1893 {
1771 /* only report double clicks */ 1894 /* only report double clicks */
1772 MEvent.clicks = 2; 1895 MEvent.clicks = 2;
1773 mouse_report (ev); 1896 mouse_report (ev);
… …
1805#else 1928#else
1806 selection.rect = false; 1929 selection.rect = false;
1807#endif 1930#endif
1808 1931
1809 /* allow shift+left click to extend selection */ 1932 /* allow shift+left click to extend selection */
1810 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1933 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1811 { 1934 {
1812 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1813 selection_rotate (ev.x, ev.y); 1936 selection_rotate (ev.x, ev.y);
1814 else 1937 else
1815 selection_extend (ev.x, ev.y, 1); 1938 selection_extend (ev.x, ev.y, 1);
… …
1956 case Button3: 2079 case Button3:
1957 if (scrollBar.style != R_SB_XTERM) 2080 if (scrollBar.style != R_SB_XTERM)
1958 { 2081 {
1959 if (scrollbar_above_slider (ev.y)) 2082 if (scrollbar_above_slider (ev.y))
1960# ifdef RXVT_SCROLL_FULL 2083# ifdef RXVT_SCROLL_FULL
1961 scr_page (UP, TermWin.nrow - 1); 2084 scr_page (UP, nrow - 1);
1962# else 2085# else
1963 scr_page (UP, TermWin.nrow / 4); 2086 scr_page (UP, nrow / 4);
1964# endif 2087# endif
1965 else if (scrollbar_below_slider (ev.y)) 2088 else if (scrollbar_below_slider (ev.y))
1966# ifdef RXVT_SCROLL_FULL 2089# ifdef RXVT_SCROLL_FULL
1967 scr_page (DN, TermWin.nrow - 1); 2090 scr_page (DN, nrow - 1);
1968# else 2091# else
1969 scr_page (DN, TermWin.nrow / 4); 2092 scr_page (DN, nrow / 4);
1970# endif 2093# endif
1971 else 2094 else
1972 scrollBar.setMotion (); 2095 scrollBar.setMotion ();
1973 } 2096 }
1974 else 2097 else
1975 { 2098 {
1976 scr_page ((ev.button == Button1 ? DN : UP), 2099 scr_page ((ev.button == Button1 ? DN : UP),
1977 (TermWin.nrow 2100 (nrow
1978 * scrollbar_position (ev.y) 2101 * scrollbar_position (ev.y)
1979 / scrollbar_size ())); 2102 / scrollbar_size ()));
1980 } 2103 }
1981 2104
1982 break; 2105 break;
1983 } 2106 }
1984 } 2107 }
2108
1985 return; 2109 return;
1986 } 2110 }
1987#if MENUBAR
1988 /*
1989 * Menubar window processing of button press
1990 */
1991 if (isMenuBarWindow (ev.window))
1992 menubar_control (ev);
1993#endif
1994} 2111}
1995 2112
1996void 2113void
1997rxvt_term::button_release (XButtonEvent &ev) 2114rxvt_term::button_release (XButtonEvent &ev)
1998{ 2115{
… …
2004 2121
2005 if (scrollbar_isUpDn ()) 2122 if (scrollbar_isUpDn ())
2006 { 2123 {
2007 scrollBar.setIdle (); 2124 scrollBar.setIdle ();
2008 scrollbar_show (0); 2125 scrollbar_show (0);
2009#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2010 refresh_type &= ~SMOOTH_REFRESH;
2011#endif
2012 } 2126 }
2013 2127
2014#ifdef SELECTION_SCROLLING 2128#ifdef SELECTION_SCROLLING
2015 if (sel_scroll_ev.active) 2129 if (sel_scroll_ev.active)
2016 sel_scroll_ev.stop(); 2130 sel_scroll_ev.stop();
2017#endif 2131#endif
2018 2132
2019 if (ev.window == TermWin.vt) 2133 if (ev.window == vt)
2020 { 2134 {
2135 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2136 return;
2137
2021#if ISO_14755 2138#if ISO_14755
2022 // 5.4 2139 // 5.4
2023 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2024 return; 2141 return;
2025#endif 2142#endif
2143
2026 if (reportmode) 2144 if (reportmode)
2027 { 2145 {
2028 /* mouse report from vt window */ 2146 /* mouse report from vt window */
2029 /* don't report release of wheel "buttons" */ 2147 /* don't report release of wheel "buttons" */
2030 if (ev.button >= 4) 2148 if (ev.button >= 4)
… …
2060 { 2178 {
2061 case Button1: 2179 case Button1:
2062 case Button3: 2180 case Button3:
2063 selection_make (ev.time); 2181 selection_make (ev.time);
2064 break; 2182 break;
2183
2065 case Button2: 2184 case Button2:
2066 selection_request (ev.time, ev.x, ev.y); 2185 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2067 break; 2187 break;
2188
2068#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
2069 case Button4: 2190 case Button4:
2070 case Button5: 2191 case Button5:
2071 { 2192 {
2072 int i; 2193 int i;
… …
2074 2195
2075 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
2076 2197
2077 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
2078 i = 1; 2199 i = 1;
2079 else if (options & Opt_mouseWheelScrollPage) 2200 else if (option (Opt_mouseWheelScrollPage))
2080 i = TermWin.nrow - 1; 2201 i = nrow - 1;
2081 else 2202 else
2082 i = 5; 2203 i = 5;
2083 2204
2084# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
2085 if (ev.state & ControlMask) 2206 if (ev.state & ControlMask)
2086 { 2207 {
2087 mouse_slip_wheel_speed += v ? -1 : 1; 2208 mouse_slip_wheel_speed += v ? -1 : 1;
2088 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2209 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2089 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2210 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2090 2211
2091 if (slip_wheel_ev.at < NOW) 2212 if (slip_wheel_ev.at < NOW)
2092 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2213 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2093 2214
2094 slip_wheel_ev.start (); 2215 slip_wheel_ev.start ();
2095 } 2216 }
2096 else 2217 else
2097 { 2218 {
2098# endif 2219# endif
2099# ifdef JUMP_MOUSE_WHEEL
2100 scr_page (v, i); 2220 scr_page (v, i);
2101 scr_refresh (SMOOTH_REFRESH);
2102 scrollbar_show (1); 2221 scrollbar_show (1);
2103# else
2104 while (i--)
2105 {
2106 scr_page (v, 1);
2107 scr_refresh (SMOOTH_REFRESH);
2108 scrollbar_show (1);
2109 }
2110# endif
2111# ifdef MOUSE_SLIP_WHEELING 2222# ifdef MOUSE_SLIP_WHEELING
2112 } 2223 }
2113#endif 2224# endif
2114 } 2225 }
2115 break; 2226 break;
2116#endif 2227#endif
2117 } 2228 }
2118 } 2229 }
2119#ifdef MENUBAR
2120 else if (isMenuBarWindow (ev.window))
2121 menubar_control (ev);
2122#endif
2123} 2230}
2124 2231
2125#ifdef TRANSPARENT 2232#ifdef TRANSPARENT
2126#if TINTING 2233#if TINTING
2127/* taken from aterm-0.4.2 */ 2234/* taken from aterm-0.4.2 */
2128 2235
2129typedef uint32_t RUINT32T; 2236typedef uint32_t RUINT32T;
2130 2237
2131void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2238void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2132{ 2239{
2133 int sh_r, sh_g, sh_b; 2240 int sh_r, sh_g, sh_b;
2134 RUINT32T mask_r, mask_g, mask_b; 2241 RUINT32T mask_r, mask_g, mask_b;
2135 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2242 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2136 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2243 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2137 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2244 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2138 int i; 2245 int i;
2139 2246
2140 Visual *visual = display->visual; 2247 Visual *visual = term->visual;
2141 2248
2142 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2249 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2143 2250
2144 /* for convenience */ 2251 /* for convenience */
2145 mask_r = visual->red_mask; 2252 mask_r = visual->red_mask;
… …
2366 Atom atype; 2473 Atom atype;
2367 unsigned char *prop = NULL; 2474 unsigned char *prop = NULL;
2368 Window root, oldp, *list; 2475 Window root, oldp, *list;
2369 Pixmap rootpixmap = None; 2476 Pixmap rootpixmap = None;
2370 XWindowAttributes wattr, wrootattr; 2477 XWindowAttributes wattr, wrootattr;
2371 dDisp;
2372 2478
2373 pchanged = 0; 2479 pchanged = 0;
2374 2480
2375 if (!(options & Opt_transparent)) 2481 if (!option (Opt_transparent))
2376 return pchanged; /* Don't try any more */ 2482 return pchanged; /* Don't try any more */
2377 2483
2378 XGetWindowAttributes (disp, display->root, &wrootattr); 2484 XGetWindowAttributes (dpy, display->root, &wrootattr);
2379 rootdepth = wrootattr.depth; 2485 rootdepth = wrootattr.depth;
2380 2486
2381 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2487 XGetWindowAttributes (dpy, parent[0], &wattr);
2382 2488
2383 if (rootdepth != wattr.depth) 2489 if (rootdepth != wattr.depth)
2384 { 2490 {
2385 if (am_transparent) 2491 if (am_transparent)
2386 { 2492 {
2387 pchanged = 1; 2493 pchanged = 1;
2388 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2494 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2389 am_transparent = am_pixmap_trans = 0; 2495 am_transparent = am_pixmap_trans = 0;
2390 } 2496 }
2391 2497
2392 return pchanged; /* Don't try any more */ 2498 return pchanged; /* Don't try any more */
2393 } 2499 }
2394 2500
2395 /* Get all X ops out of the queue so that our information is up-to-date. */ 2501 /* Get all X ops out of the queue so that our information is up-to-date. */
2396 XSync (disp, False); 2502 XSync (dpy, False);
2397 2503
2398 /* 2504 /*
2399 * Make the frame window set by the window manager have 2505 * Make the frame window set by the window manager have
2400 * the root background. Some window managers put multiple nested frame 2506 * the root background. Some window managers put multiple nested frame
2401 * windows for each client, so we have to take care about that. 2507 * windows for each client, so we have to take care about that.
2402 */ 2508 */
2403 i = (xa[XA_XROOTPMAP_ID] 2509 i = (xa[XA_XROOTPMAP_ID]
2404 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2510 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2405 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2511 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2406 &nitems, &bytes_after, &prop) == Success); 2512 &nitems, &bytes_after, &prop) == Success);
2407 2513
2408 if (!i || prop == NULL) 2514 if (!i || prop == NULL)
2409 i = (xa[XA_ESETROOT_PMAP_ID] 2515 i = (xa[XA_ESETROOT_PMAP_ID]
2410 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2516 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2411 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2412 &nitems, &bytes_after, &prop) == Success); 2518 &nitems, &bytes_after, &prop) == Success);
2413 2519
2414 if (!i || prop == NULL 2520 if (!i || prop == NULL
2415#if TINTING 2521#if TINTING
2416 || !rs[Rs_color + Color_tint] 2522 || !ISSET_PIXCOLOR (Color_tint)
2417#endif 2523#endif
2418 ) 2524 )
2419 have_pixmap = 0; 2525 have_pixmap = 0;
2420 else 2526 else
2421 { 2527 {
… …
2434 Window cr; 2540 Window cr;
2435 XImage *image; 2541 XImage *image;
2436 GC gc; 2542 GC gc;
2437 XGCValues gcvalue; 2543 XGCValues gcvalue;
2438 2544
2439 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2545 XTranslateCoordinates (dpy, parent[0], display->root,
2440 0, 0, &sx, &sy, &cr); 2546 0, 0, &sx, &sy, &cr);
2441 nw = (unsigned int)szHint.width; 2547 nw = (unsigned int)szHint.width;
2442 nh = (unsigned int)szHint.height; 2548 nh = (unsigned int)szHint.height;
2443 nx = ny = 0; 2549 nx = ny = 0;
2444 2550
… …
2454 nh += sy; 2560 nh += sy;
2455 ny = -sy; 2561 ny = -sy;
2456 sy = 0; 2562 sy = 0;
2457 } 2563 }
2458 2564
2459 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2565 min_it (nw, (unsigned int) (wrootattr.width - sx));
2460 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2566 min_it (nh, (unsigned int) (wrootattr.height - sy));
2461 2567
2462 XSync (disp, False); 2568 XSync (dpy, False);
2463 allowedxerror = -1; 2569 allowedxerror = -1;
2464 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2570 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2465 2571
2466 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2572 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2467 /* XXX: may need a delay here? */ 2573 /* XXX: may need a delay here? */
2468 allowedxerror = 0; 2574 allowedxerror = 0;
2469 2575
2470 if (image == NULL) 2576 if (image == NULL)
2471 { 2577 {
2472 if (am_transparent && am_pixmap_trans) 2578 if (am_transparent && am_pixmap_trans)
2473 { 2579 {
2474 pchanged = 1; 2580 pchanged = 1;
2475 if (TermWin.pixmap != None) 2581 if (pixmap != None)
2476 { 2582 {
2477 XFreePixmap (disp, TermWin.pixmap); 2583 XFreePixmap (dpy, pixmap);
2478 TermWin.pixmap = None; 2584 pixmap = None;
2479 } 2585 }
2480 } 2586 }
2481 2587
2482 am_pixmap_trans = 0; 2588 am_pixmap_trans = 0;
2483 } 2589 }
2484 else 2590 else
2485 { 2591 {
2486 if (TermWin.pixmap != None) 2592 if (pixmap != None)
2487 XFreePixmap (disp, TermWin.pixmap); 2593 XFreePixmap (dpy, pixmap);
2488 2594
2489#if TINTING 2595#if TINTING
2490 if (ISSET_PIXCOLOR (Color_tint)) 2596 if (ISSET_PIXCOLOR (Color_tint))
2491 { 2597 {
2492 unsigned short rm, gm, bm;
2493 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2598 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2494 2599
2600 rgba c;
2495 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2601 pix_colors_focused [Color_tint].get (c);
2496 2602
2497 ShadeXImage (display, image, shade, rm, gm, bm); 2603 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2498 } 2604 }
2499#endif 2605#endif
2500 2606
2501 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2607 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2502 szHint.width, szHint.height, image->depth);
2503 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2608 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2504 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2609 XPutImage (dpy, pixmap, gc, image, 0, 0,
2505 nx, ny, image->width, image->height); 2610 nx, ny, image->width, image->height);
2506 XFreeGC (disp, gc); 2611 XFreeGC (dpy, gc);
2507 XDestroyImage (image); 2612 XDestroyImage (image);
2508 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2613 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2509 XClearWindow (disp, TermWin.parent[0]); 2614 XClearWindow (dpy, parent[0]);
2510 2615
2511 if (!am_transparent || !am_pixmap_trans) 2616 if (!am_transparent || !am_pixmap_trans)
2512 pchanged = 1; 2617 pchanged = 1;
2513 2618
2514 am_transparent = am_pixmap_trans = 1; 2619 am_transparent = am_pixmap_trans = 1;
2515 } 2620 }
2516 } 2621 }
2517 2622
2518 if (am_pixmap_trans) 2623 if (am_pixmap_trans)
2519 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2624 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2520 else 2625 else
2521 { 2626 {
2522 unsigned int n; 2627 unsigned int n;
2523 /* 2628 /*
2524 * InheritPixmap transparency 2629 * InheritPixmap transparency
2525 */ 2630 */
2526 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2631 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2527 { 2632 {
2528 oldp = TermWin.parent[i]; 2633 oldp = parent[i];
2529 XQueryTree (disp, TermWin.parent[i - 1], &root, 2634 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2530 &TermWin.parent[i], &list, &n);
2531 XFree (list); 2635 XFree (list);
2532 2636
2533 if (TermWin.parent[i] == display->root) 2637 if (parent[i] == display->root)
2534 { 2638 {
2535 if (oldp != None) 2639 if (oldp != None)
2536 pchanged = 1; 2640 pchanged = 1;
2537 2641
2538 break; 2642 break;
2539 } 2643 }
2540 2644
2541 if (oldp != TermWin.parent[i]) 2645 if (oldp != parent[i])
2542 pchanged = 1; 2646 pchanged = 1;
2543 } 2647 }
2544 2648
2545 n = 0; 2649 n = 0;
2546 2650
2547 if (pchanged) 2651 if (pchanged)
2548 {
2549 for (; n < (unsigned int)i; n++) 2652 for (; n < (unsigned int)i; n++)
2550 { 2653 {
2551 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2654 XGetWindowAttributes (dpy, parent[n], &wattr);
2655
2552 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2656 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2553 { 2657 {
2554 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2658 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2555 break; 2659 break;
2556 } 2660 }
2557 } 2661 }
2662
2663 if (n > (sizeof (parent) / sizeof (parent[0])))
2558 } 2664 {
2559
2560 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2561 {
2562 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2665 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2563 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2666 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2564 am_transparent = 0; 2667 am_transparent = 0;
2565 /* XXX: also turn off Opt_transparent? */ 2668 /* XXX: also turn off Opt_transparent? */
2566 } 2669 }
2567 else 2670 else
2568 { 2671 {
2569#if WAIT_FOR_WM
2570 /* wait (an arbitrary period) for the WM to do its thing
2571 * needed for fvwm2.2.2 (and before?) */
2572 sleep (1);
2573#endif
2574 for (n = 0; n < (unsigned int)i; n++) 2672 for (n = 0; n < (unsigned int)i; n++)
2575 { 2673 {
2576 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2674 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2577 XClearWindow (disp, TermWin.parent[n]); 2675 XClearWindow (dpy, parent[n]);
2578 } 2676 }
2579 2677
2580 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2678 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2581 am_transparent = 1; 2679 am_transparent = 1;
2582 } 2680 }
2583 2681
2584 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2682 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2585 TermWin.parent[i] = None; 2683 parent[i] = None;
2586 } 2684 }
2587 2685
2588 if (scrollBar.win) 2686 if (scrollBar.win)
2589 { 2687 {
2590 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2688 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2591 scrollBar.setIdle (); 2689 scrollBar.setIdle ();
2592 scrollbar_show (0); 2690 scrollbar_show (0);
2593 } 2691 }
2594 2692
2595 if (am_transparent) 2693 if (am_transparent)
… …
2607 2705
2608bool 2706bool
2609rxvt_term::cmd_parse () 2707rxvt_term::cmd_parse ()
2610{ 2708{
2611 bool flag = false; 2709 bool flag = false;
2612 unicode_t ch = NOCHAR; 2710 wchar_t ch = NOCHAR;
2613 unsigned char *seq_begin; // remember start of esc-sequence here 2711 char *seq_begin; // remember start of esc-sequence here
2614 2712
2615 for (;;) 2713 for (;;)
2616 { 2714 {
2617 if (ch == NOCHAR) 2715 if (ch == NOCHAR)
2618 { 2716 {
2619 seq_begin = cmdbuf_ptr; 2717 seq_begin = cmdbuf_ptr;
2620 ch = next_char (); 2718 ch = next_char ();
2621 }
2622 2719
2623 if (ch == NOCHAR) // TODO: improve 2720 if (ch == NOCHAR)
2624 break; 2721 break;
2722 }
2625 2723
2626 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2724 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2627 { 2725 {
2628 if (!seen_input) 2726 if (!seen_input)
2629 { 2727 {
… …
2638 if (seen_resize && cmd_pid) 2736 if (seen_resize && cmd_pid)
2639 kill (-cmd_pid, SIGWINCH); 2737 kill (-cmd_pid, SIGWINCH);
2640 } 2738 }
2641 2739
2642 /* Read a text string from the input buffer */ 2740 /* Read a text string from the input buffer */
2643 unicode_t buf[UBUFSIZ]; 2741 wchar_t buf[UBUFSIZ];
2644 bool refreshnow = false; 2742 bool refreshnow = false;
2645 int nlines = 0; 2743 int nlines = 0;
2646 unicode_t *str = buf; 2744 wchar_t *str = buf;
2745 wchar_t *eol = str + min (ncol, UBUFSIZ);
2647 2746
2648 for (;;) 2747 for (;;)
2649 { 2748 {
2650 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2749 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2651 break; 2750 break;
2652 2751
2653 *str++ = ch; 2752 *str++ = ch;
2654 2753
2655 if (ch == C0_LF) 2754 if (ch == C0_LF || str >= eol)
2656 { 2755 {
2756 if (ch == C0_LF)
2657 nlines++; 2757 nlines++;
2758
2658 refresh_count++; 2759 refresh_count++;
2659 2760
2660 if (!(options & Opt_jumpScroll) 2761 if (!option (Opt_jumpScroll)
2661 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2762 || (refresh_count >= refresh_limit * (nrow - 1)))
2662 { 2763 {
2663 refreshnow = true; 2764 refreshnow = true;
2765 refresh_count = 0;
2664 ch = NOCHAR; 2766 ch = NOCHAR;
2665 break; 2767 break;
2666 } 2768 }
2667 2769
2668 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2770 // scr_add_lines only works for nlines <= nrow - 1.
2669 if (nlines >= TermWin.nrow - 1) 2771 if (nlines >= nrow - 1)
2670 { 2772 {
2773 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2774 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2671 scr_add_lines (buf, nlines, str - buf); 2775 scr_add_lines (buf, str - buf, nlines);
2776
2672 nlines = 0; 2777 nlines = 0;
2673 str = buf; 2778 str = buf;
2779 eol = str + min (ncol, UBUFSIZ);
2674 } 2780 }
2675 }
2676 2781
2677 if (str >= buf + UBUFSIZ) 2782 if (str >= eol)
2678 { 2783 {
2784 if (eol >= buf + UBUFSIZ)
2785 {
2679 ch = NOCHAR; 2786 ch = NOCHAR;
2680 break; 2787 break;
2788 }
2789 else
2790 eol = min (eol + ncol, buf + UBUFSIZ);
2791 }
2792
2681 } 2793 }
2682 2794
2683 seq_begin = cmdbuf_ptr; 2795 seq_begin = cmdbuf_ptr;
2684 ch = next_char (); 2796 ch = next_char ();
2685 } 2797 }
2686 2798
2799 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2800 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2687 scr_add_lines (buf, nlines, str - buf); 2801 scr_add_lines (buf, str - buf, nlines);
2688 2802
2689 /* 2803 /*
2690 * If there have been a lot of new lines, then update the screen 2804 * If there have been a lot of new lines, then update the screen
2691 * What the heck I'll cheat and only refresh less than every page-full. 2805 * What the heck I'll cheat and only refresh less than every page-full.
2692 * the number of pages between refreshes is refresh_limit, which 2806 * the number of pages between refreshes is refresh_limit, which
2693 * is incremented here because we must be doing flat-out scrolling. 2807 * is incremented here because we must be doing flat-out scrolling.
2694 */ 2808 */
2695 if (refreshnow) 2809 if (refreshnow)
2696 { 2810 {
2697 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2811 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2698 refresh_limit++; 2812 refresh_limit++;
2699 else 2813 else
2700 { 2814 {
2701 flag = true; 2815 flag = true;
2816 //TODO: due to popular request, implement "skipscroll" option here
2702 scr_refresh (refresh_type); 2817 scr_refresh ();
2818 want_refresh = 1;
2703 } 2819 }
2704 } 2820 }
2705 2821
2706 } 2822 }
2707 else 2823 else
… …
2722 } 2838 }
2723 2839
2724 return flag; 2840 return flag;
2725} 2841}
2726 2842
2727// read the next octet
2728unicode_t
2729rxvt_term::next_octet ()
2730{
2731 return cmdbuf_ptr < cmdbuf_endp
2732 ? *cmdbuf_ptr++
2733 : NOCHAR;
2734}
2735
2736// read the next character 2843// read the next character
2737unicode_t 2844wchar_t
2738rxvt_term::next_char () 2845rxvt_term::next_char () NOTHROW
2739{ 2846{
2740 while (cmdbuf_ptr < cmdbuf_endp) 2847 while (cmdbuf_ptr < cmdbuf_endp)
2741 { 2848 {
2742 // assume 7-bit to be ascii ALWAYS 2849 // assume 7-bit to be ascii ALWAYS
2743 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2850 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2744 return *cmdbuf_ptr++; 2851 return *cmdbuf_ptr++;
2745 2852
2746 wchar_t wc; 2853 wchar_t wc;
2747 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2854 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2748 2855
2749 if (len == (size_t)-2) 2856 if (len == (size_t)-2)
2750 { 2857 {
2751 // the mbstate stores incomplete sequences. didn't know this :/ 2858 // the mbstate stores incomplete sequences. didn't know this :/
2752 cmdbuf_ptr = cmdbuf_endp; 2859 cmdbuf_ptr = cmdbuf_endp;
2753 break; 2860 break;
2754 } 2861 }
2755 2862
2756 if (len == (size_t)-1) 2863 if (len == (size_t)-1)
2757 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2864 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2758 2865
2759 // assume wchar == unicode 2866 // assume wchar == unicode
2760 cmdbuf_ptr += len; 2867 cmdbuf_ptr += len;
2761 return wc & UNICODE_MASK; 2868 return wc & UNICODE_MASK;
2762 } 2869 }
2763 2870
2764 return NOCHAR; 2871 return NOCHAR;
2765} 2872}
2873
2874// read the next octet
2875uint32_t
2876rxvt_term::next_octet () NOTHROW
2877{
2878 return cmdbuf_ptr < cmdbuf_endp
2879 ? (unsigned char)*cmdbuf_ptr++
2880 : NOCHAR;
2881}
2882
2883static class out_of_input out_of_input;
2766 2884
2767/* rxvt_cmd_getc () - Return next input character */ 2885/* rxvt_cmd_getc () - Return next input character */
2768/* 2886/*
2769 * Return the next input character after first passing any keyboard input 2887 * Return the next input character after first passing any keyboard input
2770 * to the command. 2888 * to the command.
2771 */ 2889 */
2772unicode_t 2890wchar_t
2773rxvt_term::cmd_getc () 2891rxvt_term::cmd_getc () THROW ((class out_of_input))
2774{ 2892{
2775 unicode_t c = next_char (); 2893 wchar_t c = next_char ();
2776 2894
2777 if (c == NOCHAR) 2895 if (c == NOCHAR)
2778 throw out_of_input; 2896 throw out_of_input;
2779 2897
2780 return c; 2898 return c;
2781} 2899}
2782 2900
2783unicode_t 2901uint32_t
2784rxvt_term::cmd_get8 () 2902rxvt_term::cmd_get8 () THROW ((class out_of_input))
2785{ 2903{
2786 unicode_t c = next_octet (); 2904 uint32_t c = next_octet ();
2787 2905
2788 if (c == NOCHAR) 2906 if (c == NOCHAR)
2789 throw out_of_input; 2907 throw out_of_input;
2790 2908
2791 return c; 2909 return c;
… …
2891 case C0_ESC: 3009 case C0_ESC:
2892 process_escape_seq (); 3010 process_escape_seq ();
2893 break; 3011 break;
2894 case C0_ENQ: /* terminal Status */ 3012 case C0_ENQ: /* terminal Status */
2895 if (rs[Rs_answerbackstring]) 3013 if (rs[Rs_answerbackstring])
2896 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3014 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2897 (unsigned int)strlen (rs[Rs_answerbackstring]));
2898 else 3015 else
2899 tt_write ((unsigned char *)VT100_ANS, 3016 tt_write (VT100_ANS, strlen (VT100_ANS));
2900 (unsigned int)strlen (VT100_ANS));
2901 break; 3017 break;
2902 case C0_BEL: /* bell */ 3018 case C0_BEL: /* bell */
2903 scr_bell (); 3019 scr_bell ();
2904 break; 3020 break;
2905 case C0_BS: /* backspace */ 3021 case C0_BS: /* backspace */
… …
3029 scr_charset_set (2, (unsigned int)cmd_getc ()); 3145 scr_charset_set (2, (unsigned int)cmd_getc ());
3030 break; 3146 break;
3031 case '+': 3147 case '+':
3032 scr_charset_set (3, (unsigned int)cmd_getc ()); 3148 scr_charset_set (3, (unsigned int)cmd_getc ());
3033 break; 3149 break;
3034#if ENABLE_FRILLS 3150#if !ENABLE_MINIMAL
3035 case '6': 3151 case '6':
3036 scr_backindex (); 3152 scr_backindex ();
3037 break; 3153 break;
3038#endif 3154#endif
3039 case '7': 3155 case '7':
3040 scr_cursor (SAVE); 3156 scr_cursor (SAVE);
3041 break; 3157 break;
3042 case '8': 3158 case '8':
3043 scr_cursor (RESTORE); 3159 scr_cursor (RESTORE);
3044 break; 3160 break;
3045#if ENABLE_FRILLS 3161#if !ENABLE_MINIMAL
3046 case '9': 3162 case '9':
3047 scr_forwardindex (); 3163 scr_forwardindex ();
3048 break; 3164 break;
3049#endif 3165#endif
3050 case '=': 3166 case '=':
… …
3060 break; 3176 break;
3061 3177
3062 /* 8.3.87: NEXT LINE */ 3178 /* 8.3.87: NEXT LINE */
3063 case C1_NEL: /* ESC E */ 3179 case C1_NEL: /* ESC E */
3064 { 3180 {
3065 unicode_t nlcr[] = { C0_LF, C0_CR }; 3181 wchar_t nlcr[] = { C0_LF, C0_CR };
3066 scr_add_lines (nlcr, 1, 2); 3182 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3067 } 3183 }
3068 break; 3184 break;
3069 3185
3070 /* kidnapped escape sequence: Should be 8.3.48 */ 3186 /* kidnapped escape sequence: Should be 8.3.48 */
3071 case C1_ESA: /* ESC G */ 3187 case C1_ESA: /* ESC G */
… …
3093 process_dcs_seq (); 3209 process_dcs_seq ();
3094 break; 3210 break;
3095 3211
3096 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3212 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3097 case C1_SCI: /* ESC Z */ 3213 case C1_SCI: /* ESC Z */
3098 tt_write ((const unsigned char *)ESCZ_ANSWER, 3214 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3099 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3100 break; /* steal obsolete ESC [ c */ 3215 break; /* steal obsolete ESC [ c */
3101 3216
3102 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3217 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3103 case C1_CSI: /* ESC [ */ 3218 case C1_CSI: /* ESC [ */
3104 process_csi_seq (); 3219 process_csi_seq ();
… …
3213 ndef = get_byte_array_bit (csi_defaults, i); 3328 ndef = get_byte_array_bit (csi_defaults, i);
3214 for (p = 0; p < nargs; p++) 3329 for (p = 0; p < nargs; p++)
3215 if (arg[p] == -1) 3330 if (arg[p] == -1)
3216 arg[p] = ndef; 3331 arg[p] = ndef;
3217 3332
3218#ifdef DEBUG_CMD
3219 fprintf (stderr, "CSI ");
3220 for (p = 0; p < nargs; p++)
3221 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3222 fprintf (stderr, "%c\n", ch);
3223#endif
3224
3225 /* 3333 /*
3226 * private mode handling 3334 * private mode handling
3227 */ 3335 */
3228 if (priv) 3336 if (priv)
3229 { 3337 {
3230 switch (priv) 3338 switch (priv)
3231 { 3339 {
3232 case '>': 3340 case '>':
3233 if (ch == CSI_DA) /* secondary device attributes */ 3341 if (ch == CSI_DA) /* secondary device attributes */
3234 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3342 {
3343 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3344 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3345 //
3346 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3347 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3348 // that we do not support xterm mouse reporting (should be 95 when we do).
3349 //
3350 tt_printf ("\033[>%d;94;0c", 'U');
3351 }
3235 break; 3352 break;
3236 case '?': 3353 case '?':
3237 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3354 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3238 process_terminal_mode (ch, priv, nargs, arg); 3355 process_terminal_mode (ch, priv, nargs, arg);
3239 break; 3356 break;
… …
3344 3461
3345 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3462 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3346 arg[0] = -arg[0]; 3463 arg[0] = -arg[0];
3347 /* FALLTHROUGH */ 3464 /* FALLTHROUGH */
3348 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3465 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3349 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3466 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3350 break; 3467 break;
3351 3468
3352 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3469 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3353 tt_write ((const unsigned char *)VT100_ANS, 3470 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3354 (unsigned int) (sizeof (VT100_ANS) - 1));
3355 break; 3471 break;
3356 3472
3357 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3473 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3358 process_sgr_mode (nargs, arg); 3474 process_sgr_mode (nargs, arg);
3359 break; 3475 break;
… …
3366 break; 3482 break;
3367 case 6: /* CPR requested */ 3483 case 6: /* CPR requested */
3368 scr_report_position (); 3484 scr_report_position ();
3369 break; 3485 break;
3370 case 7: /* unofficial extension */ 3486 case 7: /* unofficial extension */
3371 if (options & Opt_insecure) 3487 if (option (Opt_insecure))
3372 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3488 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3373 break; 3489 break;
3374 case 8: /* unofficial extension */ 3490 case 8: /* unofficial extension */
3375 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3491 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3376 break; 3492 break;
… …
3443 break; 3559 break;
3444 case CSI_75: 3560 case CSI_75:
3445 scr_cursor (RESTORE); 3561 scr_cursor (RESTORE);
3446 break; 3562 break;
3447 3563
3448#if ENABLE_FRILLS 3564#if !ENABLE_MINIMAL
3449 case CSI_74: 3565 case CSI_74:
3450 process_window_ops (arg, nargs); 3566 process_window_ops (arg, nargs);
3451 break; 3567 break;
3452#endif 3568#endif
3453 3569
… …
3460 break; 3576 break;
3461 } 3577 }
3462} 3578}
3463/*}}} */ 3579/*}}} */
3464 3580
3465#if ENABLE_FRILLS 3581#if !ENABLE_MINIMAL
3466/* ARGSUSED */ 3582/* ARGSUSED */
3467void 3583void
3468rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3584rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3469{ 3585{
3470 int x, y; 3586 int x, y;
3471 XWindowAttributes wattr; 3587 XWindowAttributes wattr;
3472 Window wdummy; 3588 Window wdummy;
3473 dDisp; 3589
3590 dLocal (Display *, dpy);
3474 3591
3475 if (nargs == 0) 3592 if (nargs == 0)
3476 return; 3593 return;
3477 3594
3478 switch (args[0]) 3595 switch (args[0])
3479 { 3596 {
3480 /* 3597 /*
3481 * commands 3598 * commands
3482 */ 3599 */
3483 case 1: /* deiconify window */ 3600 case 1: /* deiconify window */
3484 XMapWindow (disp, TermWin.parent[0]); 3601 XMapWindow (dpy, parent[0]);
3485 break; 3602 break;
3486 case 2: /* iconify window */ 3603 case 2: /* iconify window */
3487 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3604 XIconifyWindow (dpy, parent[0], display->screen);
3488 break; 3605 break;
3489 case 3: /* set position (pixels) */ 3606 case 3: /* set position (pixels) */
3490 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3607 XMoveWindow (dpy, parent[0], args[1], args[2]);
3491 break; 3608 break;
3492 case 4: /* set size (pixels) */ 3609 case 4: /* set size (pixels) */
3493 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3610 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3494 break; 3611 break;
3495 case 5: /* raise window */ 3612 case 5: /* raise window */
3496 XRaiseWindow (disp, TermWin.parent[0]); 3613 XRaiseWindow (dpy, parent[0]);
3497 break; 3614 break;
3498 case 6: /* lower window */ 3615 case 6: /* lower window */
3499 XLowerWindow (disp, TermWin.parent[0]); 3616 XLowerWindow (dpy, parent[0]);
3500 break; 3617 break;
3501 case 7: /* refresh window */ 3618 case 7: /* refresh window */
3502 scr_touch (true); 3619 scr_touch (true);
3503 break; 3620 break;
3504 case 8: /* set size (chars) */ 3621 case 8: /* set size (chars) */
3505 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3622 set_widthheight ((unsigned int) (args[2] * fwidth),
3506 (unsigned int) (args[1] * TermWin.fheight)); 3623 (unsigned int) (args[1] * fheight));
3507 break; 3624 break;
3508 3625
3509 //case 9: NYI, TODO, restore maximized window or maximize window 3626 //case 9: NYI, TODO, restore maximized window or maximize window
3510 default: 3627 default:
3511 if (args[0] >= 24) /* set height (chars) */ 3628 if (args[0] >= 24) /* set height (chars) */
3512 set_widthheight ((unsigned int)TermWin.width, 3629 set_widthheight ((unsigned int)width,
3513 (unsigned int) (args[1] * TermWin.fheight)); 3630 (unsigned int) (args[1] * fheight));
3514 break; 3631 break;
3515
3516 3632
3517 /* 3633 /*
3518 * reports - some output format copied from XTerm 3634 * reports - some output format copied from XTerm
3519 */ 3635 */
3520 case 11: /* report window state */ 3636 case 11: /* report window state */
3521 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3637 XGetWindowAttributes (dpy, parent[0], &wattr);
3522 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3638 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3523 break; 3639 break;
3524 case 13: /* report window position */ 3640 case 13: /* report window position */
3525 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3641 XGetWindowAttributes (dpy, parent[0], &wattr);
3526 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3642 XTranslateCoordinates (dpy, parent[0], wattr.root,
3527 -wattr.border_width, -wattr.border_width, 3643 -wattr.border_width, -wattr.border_width,
3528 &x, &y, &wdummy); 3644 &x, &y, &wdummy);
3529 tt_printf ("\033[3;%d;%dt", x, y); 3645 tt_printf ("\033[3;%d;%dt", x, y);
3530 break; 3646 break;
3531 case 14: /* report window size (pixels) */ 3647 case 14: /* report window size (pixels) */
3532 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3648 XGetWindowAttributes (dpy, parent[0], &wattr);
3533 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3649 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3534 break; 3650 break;
3535 case 18: /* report text area size (chars) */ 3651 case 18: /* report text area size (chars) */
3536 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3652 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3537 break; 3653 break;
3538 case 19: /* report window size (chars) */ 3654 case 19: /* report window size (chars) */
3539 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3655 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3540 break; 3656 break;
3541 case 20: /* report icon label */ 3657 case 20: /* report icon label */
3542 { 3658 {
3543 char *s; 3659 char *s;
3544 XGetIconName (disp, TermWin.parent[0], &s); 3660 XGetIconName (dpy, parent[0], &s);
3545 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3661 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3546 XFree (s); 3662 XFree (s);
3547 } 3663 }
3548 break; 3664 break;
3549 case 21: /* report window title */ 3665 case 21: /* report window title */
3550 { 3666 {
3551 char *s; 3667 char *s;
3552 XFetchName (disp, TermWin.parent[0], &s); 3668 XFetchName (dpy, parent[0], &s);
3553 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3669 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3554 XFree (s); 3670 XFree (s);
3555 } 3671 }
3556 break; 3672 break;
3557 } 3673 }
3558} 3674}
… …
3561/*----------------------------------------------------------------------*/ 3677/*----------------------------------------------------------------------*/
3562/* 3678/*
3563 * get input up until STRING TERMINATOR (or BEL) 3679 * get input up until STRING TERMINATOR (or BEL)
3564 * ends_how is terminator used. returned input must be free()'d 3680 * ends_how is terminator used. returned input must be free()'d
3565 */ 3681 */
3566unsigned char * 3682char *
3567rxvt_term::get_to_st (unicode_t &ends_how) 3683rxvt_term::get_to_st (unicode_t &ends_how)
3568{ 3684{
3569 unicode_t ch; 3685 unicode_t ch;
3570 bool seen_esc = false; 3686 bool seen_esc = false;
3571 unsigned int n = 0; 3687 unsigned int n = 0;
… …
3585 seen_esc = true; 3701 seen_esc = true;
3586 continue; 3702 continue;
3587 } 3703 }
3588 else if (ch == C0_BEL || ch == CHAR_ST) 3704 else if (ch == C0_BEL || ch == CHAR_ST)
3589 break; 3705 break;
3706 else if (ch == C0_SYN)
3707 ch = cmd_get8 ();
3590 else if (ch < 0x20) 3708 else if (ch < 0x20)
3591 return NULL; /* other control character - exit */ 3709 return NULL; /* other control character - exit */
3592 3710
3593 seen_esc = false; 3711 seen_esc = false;
3594 3712
3595 if (n >= STRING_MAX - 1) 3713 if (n >= STRING_MAX - 1)
3596 // stop at some sane length 3714 // stop at some sane length
3597 return NULL; 3715 return NULL;
3598 3716
3599 if (ch == C0_SYN)
3600 string[n++] = cmd_get8 ();
3601 else
3602 string[n++] = ch; 3717 string[n++] = ch;
3603 } 3718 }
3604 3719
3605 string[n++] = '\0'; 3720 string[n++] = '\0';
3606 3721
3607 ends_how = (ch == 0x5c ? C0_ESC : ch); 3722 ends_how = (ch == 0x5c ? C0_ESC : ch);
3608 3723
3609 return (unsigned char *)rxvt_wcstombs (string); 3724 return rxvt_wcstombs (string);
3610} 3725}
3611 3726
3612/*----------------------------------------------------------------------*/ 3727/*----------------------------------------------------------------------*/
3613/* 3728/*
3614 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3729 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3615 */ 3730 */
3616void 3731void
3617rxvt_term::process_dcs_seq () 3732rxvt_term::process_dcs_seq ()
3618{ 3733{
3619 unsigned char *s; 3734 char *s;
3620 unicode_t eh; 3735 unicode_t eh;
3621 3736
3622 /* 3737 /*
3623 * Not handled yet 3738 * Not handled yet
3624 */ 3739 */
… …
3643 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3758 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3644 arg = arg * 10 + (ch - '0'); 3759 arg = arg * 10 + (ch - '0');
3645 3760
3646 if (ch == ';') 3761 if (ch == ';')
3647 { 3762 {
3648 unsigned char *s = get_to_st (eh); 3763 char *s = get_to_st (eh);
3649 3764
3650 if (s) 3765 if (s)
3651 { 3766 {
3652 process_xterm_seq (arg, (char *)s, eh); 3767 process_xterm_seq (arg, s, eh);
3653 free (s); 3768 free (s);
3654 } 3769 }
3655 } 3770 }
3656} 3771}
3657 3772
3658void 3773void
3659rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3774rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3660{ 3775{
3661 if (str[0] == '?' && !str[1]) 3776 if (str[0] == '?' && !str[1])
3662 { 3777 {
3663 unsigned short r, g, b; 3778 rgba c;
3664 pix_colors_focused[color].get (display, r, g, b); 3779 pix_colors_focused[color].get (c);
3780
3781#if XFT
3782 if (c.a != rgba::MAX_CC)
3783 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3784 else
3785#endif
3665 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3786 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3666 } 3787 }
3667 else 3788 else
3668 set_window_color (color, str); 3789 set_window_color (color, str);
3669} 3790}
3670 3791
3671/* 3792/*
3672 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3673 */ 3794 */
3674void 3795void
3675rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3796rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3676{ 3797{
3677 int changed = 0;
3678 int color; 3798 int color;
3679 char *buf, *name; 3799 char *buf, *name;
3680 bool query = str[0] == '?' && !str[1]; 3800 bool query = str[0] == '?' && !str[1];
3681 int saveop = op; 3801 int saveop = op;
3682 dDisp; 3802
3803 dLocal (Display *, dpy);
3683 3804
3684 assert (str != NULL); 3805 assert (str != NULL);
3806
3807 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3808 return;
3809
3685 switch (op) 3810 switch (op)
3686 { 3811 {
3687 case XTerm_name: 3812 case XTerm_name:
3688 set_title (str); 3813 set_title (str);
3689 /* FALLTHROUGH */ 3814 /* FALLTHROUGH */
… …
3703 unsigned long bytes_after; 3828 unsigned long bytes_after;
3704 unsigned char *value = 0; 3829 unsigned char *value = 0;
3705 const char *str = ""; 3830 const char *str = "";
3706 3831
3707 if (prop 3832 if (prop
3708 && XGetWindowProperty (disp, TermWin.parent[0], 3833 && XGetWindowProperty (dpy, parent[0],
3709 prop, 0, 1<<16, 0, AnyPropertyType, 3834 prop, 0, 1<<16, 0, AnyPropertyType,
3710 &actual_type, &actual_format, 3835 &actual_type, &actual_format,
3711 &nitems, &bytes_after, &value) == Success 3836 &nitems, &bytes_after, &value) == Success
3712 && actual_type != None 3837 && actual_type != None
3713 && actual_format == 8) 3838 && actual_format == 8)
3714 str = (const char *)(value); 3839 str = (const char *)(value);
3715 3840
3716 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3841 tt_printf ("\033]%d;%s%c", op, str, resp);
3717 3842
3718 XFree (value); 3843 XFree (value);
3719 } 3844 }
3720 else 3845 else
3721 { 3846 {
… …
3725 { 3850 {
3726 *eq = 0; 3851 *eq = 0;
3727 set_utf8_property (display->atom (str), eq + 1); 3852 set_utf8_property (display->atom (str), eq + 1);
3728 } 3853 }
3729 else 3854 else
3730 XDeleteProperty (disp, TermWin.parent[0], 3855 XDeleteProperty (dpy, parent[0],
3731 display->atom (str)); 3856 display->atom (str));
3732 } 3857 }
3733 break; 3858 break;
3734 3859
3735 case XTerm_Color: 3860 case XTerm_Color:
… …
3737 { 3862 {
3738 if ((name = strchr (buf, ';')) == NULL) 3863 if ((name = strchr (buf, ';')) == NULL)
3739 break; 3864 break;
3740 3865
3741 *name++ = '\0'; 3866 *name++ = '\0';
3742 color = atoi (buf); 3867 color = atoi (buf) + minCOLOR;
3743 3868
3744 if (color < 0 || color >= TOTAL_COLORS) 3869 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3745 break; 3870 break;
3746 3871
3747 if ((buf = strchr (name, ';')) != NULL) 3872 if ((buf = strchr (name, ';')) != NULL)
3748 *buf++ = '\0'; 3873 *buf++ = '\0';
3749 3874
3750 if (name[0] == '?' && !name[1]) 3875 process_color_seq (op, color, name, resp);
3751 {
3752 unsigned short r, g, b;
3753 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3754 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3755 }
3756 else
3757 set_window_color (color + minCOLOR, name);
3758 } 3876 }
3759 break; 3877 break;
3760 case XTerm_Color00: 3878 case XTerm_Color00:
3761 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3879 process_color_seq (op, Color_fg, str, resp);
3762 break; 3880 break;
3763 case XTerm_Color01: 3881 case XTerm_Color01:
3764 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3882 process_color_seq (op, Color_bg, str, resp);
3765 break; 3883 break;
3766#ifndef NO_CURSORCOLOR 3884#ifndef NO_CURSORCOLOR
3767 case XTerm_Color_cursor: 3885 case XTerm_Color_cursor:
3768 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3886 process_color_seq (op, Color_cursor, str, resp);
3769 break; 3887 break;
3770#endif 3888#endif
3771 case XTerm_Color_pointer_fg: 3889 case XTerm_Color_pointer_fg:
3772 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3890 process_color_seq (op, Color_pointer_fg, str, resp);
3773 break; 3891 break;
3774 case XTerm_Color_pointer_bg: 3892 case XTerm_Color_pointer_bg:
3775 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3893 process_color_seq (op, Color_pointer_bg, str, resp);
3776 break; 3894 break;
3777#ifndef NO_BOLD_UNDERLINE_REVERSE 3895#ifndef NO_BOLD_UNDERLINE_REVERSE
3778 case XTerm_Color_BD:
3779 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3780 break;
3781 case XTerm_Color_UL:
3782 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3783 break;
3784 case XTerm_Color_RV: 3896 case XTerm_Color_RV:
3785 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3897 process_color_seq (op, Color_RV, str, resp);
3898 break;
3899 case Rxvt_Color_BD:
3900 case URxvt_Color_BD:
3901 process_color_seq (op, Color_BD, str, resp);
3902 break;
3903 case Rxvt_Color_UL:
3904 case URxvt_Color_UL:
3905 process_color_seq (op, Color_UL, str, resp);
3786 break; 3906 break;
3787 case URxvt_Color_IT: 3907 case URxvt_Color_IT:
3788 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3908 process_color_seq (op, Color_IT, str, resp);
3789 break; 3909 break;
3790#endif 3910#endif
3791#if TRANSPARENT && TINTING 3911#if TRANSPARENT && TINTING
3792 case URxvt_Color_tint: 3912 case URxvt_Color_tint:
3793 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3913 process_color_seq (op, Color_tint, str, resp);
3914
3794 check_our_parents (); 3915 check_our_parents ();
3916
3795 if (am_transparent) 3917 if (am_transparent)
3796 want_full_refresh = want_refresh = 1; 3918 want_full_refresh = want_refresh = 1;
3797 break;
3798#endif
3799 3919
3920 break;
3921#endif
3922
3800 case XTerm_Pixmap: 3923 case Rxvt_Pixmap:
3924 {
3801 if (*str != ';') 3925 if (*str != ';')
3802 { 3926 {
3803#if XPM_BACKGROUND 3927#if XPM_BACKGROUND
3804 scale_pixmap (""); /* reset to default scaling */ 3928 scale_pixmap (""); /* reset to default scaling */
3805 set_bgPixmap (str); /* change pixmap */ 3929 set_bgPixmap (str); /* change pixmap */
3806#endif
3807 scr_touch (true); 3930 scr_touch (true);
3931#endif
3808 } 3932 }
3933
3934 int changed = 0;
3935
3809 while ((str = strchr (str, ';')) != NULL) 3936 while ((str = strchr (str, ';')) != NULL)
3810 { 3937 {
3811 str++; 3938 str++;
3812#if XPM_BACKGROUND 3939#if XPM_BACKGROUND
3813 changed += scale_pixmap (str); 3940 changed += scale_pixmap (str);
3814#endif 3941#endif
3815 } 3942 }
3816 3943
3817 if (changed) 3944 if (changed)
3818 { 3945 {
3819#ifdef XPM_BACKGROUND 3946#ifdef XPM_BACKGROUND
3820 resize_pixmap (); 3947 resize_pixmap ();
3821#endif
3822 scr_touch (true); 3948 scr_touch (true);
3949#endif
3823 } 3950 }
3951 }
3824 break; 3952 break;
3825 3953
3826 case XTerm_restoreFG: 3954 case Rxvt_restoreFG:
3827 set_window_color (Color_fg, str); 3955 set_window_color (Color_fg, str);
3828 break; 3956 break;
3829 case XTerm_restoreBG: 3957 case Rxvt_restoreBG:
3830 set_window_color (Color_bg, str); 3958 set_window_color (Color_bg, str);
3831 break; 3959 break;
3832 3960
3833 case XTerm_logfile: 3961 case XTerm_logfile:
3834 // TODO, when secure mode? 3962 // TODO, when secure mode?
3835 break; 3963 break;
3836 3964
3837#ifdef MENUBAR
3838 case URxvt_Menu:
3839 if (options & Opt_insecure)
3840 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3841 break;
3842#endif
3843#if 0 3965#if 0
3844 case XTerm_dumpscreen: /* no error notices */ 3966 case Rxvt_dumpscreen: /* no error notices */
3845 { 3967 {
3846 int fd; 3968 int fd;
3847 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3969 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3848 { 3970 {
3849 scr_dump (fd); 3971 scr_dump (fd);
… …
3860 case URxvt_italicFont: 3982 case URxvt_italicFont:
3861 case URxvt_boldItalicFont: 3983 case URxvt_boldItalicFont:
3862#endif 3984#endif
3863 if (query) 3985 if (query)
3864 tt_printf ("\33]%d;%-.250s%c", saveop, 3986 tt_printf ("\33]%d;%-.250s%c", saveop,
3865 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3987 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3866 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3988 ? fontset[op - URxvt_font]->fontdesc : "",
3867 resp); 3989 resp);
3868 else 3990 else
3869 { 3991 {
3870 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3992 const char *&res = rs[Rs_font + (op - URxvt_font)];
3871 3993
… …
3873 allocated.push_back ((void *)res); 3995 allocated.push_back ((void *)res);
3874 set_fonts (); 3996 set_fonts ();
3875 } 3997 }
3876 break; 3998 break;
3877 3999
3878#if ENABLE_FRILLS 4000 case URxvt_version:
4001 if (query)
4002 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
4003 op,
4004 rs[Rs_name], VERSION[0], VERSION[2],
4005 resp);
4006 break;
4007
4008#if !ENABLE_MINIMAL
3879 case URxvt_locale: 4009 case URxvt_locale:
3880 if (query) 4010 if (query)
3881 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 4011 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3882 else 4012 else
3883 { 4013 {
3884 set_locale (str); 4014 set_locale (str);
3885 pty.set_utf8_mode (enc_utf8); 4015 pty->set_utf8_mode (enc_utf8);
3886 init_xlocale (); 4016 init_xlocale ();
3887 } 4017 }
3888 break; 4018 break;
3889 4019
3890 case URxvt_view_up: 4020 case URxvt_view_up:
3891 case URxvt_view_down: 4021 case URxvt_view_down:
4022 {
3892 int lines = atoi (str); 4023 int lines = atoi (str);
3893 4024
3894 if (lines) 4025 if (lines)
3895 scr_page (op == URxvt_view_up ? UP : DN, lines); 4026 scr_page (op == URxvt_view_up ? UP : DN, lines);
3896 else 4027 else
3897 {
3898 scr_erase_savelines (); 4028 scr_erase_savelines ();
3899 } 4029 }
3900 4030
4031 break;
4032#endif
4033
4034#if ENABLE_PERL
4035 case URxvt_perl:
4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4037 ; // no responses yet
3901 break; 4038 break;
3902#endif 4039#endif
3903 } 4040 }
3904} 4041}
3905/*----------------------------------------------------------------------*/ 4042/*----------------------------------------------------------------------*/
… …
3936 return state; 4073 return state;
3937} 4074}
3938 4075
3939/* we're not using priv _yet_ */ 4076/* we're not using priv _yet_ */
3940void 4077void
3941rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4078rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3942{ 4079{
3943 unsigned int i, j; 4080 unsigned int i, j;
3944 int state; 4081 int state;
3945 4082
3946 static const struct 4083 static const struct
… …
3957 { 5, PrivMode_rVideo }, 4094 { 5, PrivMode_rVideo },
3958 { 6, PrivMode_relOrigin }, 4095 { 6, PrivMode_relOrigin },
3959 { 7, PrivMode_Autowrap }, 4096 { 7, PrivMode_Autowrap },
3960 // 8, bi-directional support mode 4097 // 8, bi-directional support mode
3961 { 9, PrivMode_MouseX10 }, 4098 { 9, PrivMode_MouseX10 },
3962#ifdef menuBar_esc
3963 { menuBar_esc, PrivMode_menuBar },
3964#endif
3965 // 18, 19 printing-related 4099 // 18, 19 printing-related
3966 { 25, PrivMode_VisibleCursor }, 4100 { 25, PrivMode_VisibleCursor },
3967#ifdef scrollBar_esc 4101#ifdef scrollBar_esc
3968 { scrollBar_esc, PrivMode_scrollBar }, 4102 { scrollBar_esc, PrivMode_scrollBar },
3969#endif 4103#endif
… …
4014 } 4148 }
4015 4149
4016 /* extra handling for values with state unkept */ 4150 /* extra handling for values with state unkept */
4017 switch (arg[i]) 4151 switch (arg[i])
4018 { 4152 {
4153#if ENABLE_STYLES
4154 case 1021:
4155 set_option (Opt_intensityStyles, mode);
4156
4157 scr_touch (true);
4158 break;
4159#endif
4019 case 1048: /* alternative cursor save */ 4160 case 1048: /* alternative cursor save */
4020 case 1049: 4161 case 1049:
4021 if (options & Opt_secondaryScreen) 4162 if (option (Opt_secondaryScreen))
4022 if (mode == 0) 4163 if (mode == 0)
4023 scr_cursor (RESTORE); 4164 scr_cursor (RESTORE);
4024 else if (mode == 1) 4165 else if (mode == 1)
4025 scr_cursor (SAVE); 4166 scr_cursor (SAVE);
4026 break; 4167 break;
… …
4038 */ 4179 */
4039 PrivMode (1, PrivMode_vt52); 4180 PrivMode (1, PrivMode_vt52);
4040 break; 4181 break;
4041 case 3: /* 80/132 */ 4182 case 3: /* 80/132 */
4042 if (priv_modes & PrivMode_132OK) 4183 if (priv_modes & PrivMode_132OK)
4043 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4184 set_widthheight (((state ? 132 : 80) * fwidth), height);
4044 break; 4185 break;
4045 case 4: /* smooth scrolling */ 4186 case 4: /* smooth scrolling */
4046 if (state)
4047 options &= ~Opt_jumpScroll;
4048 else
4049 options |= Opt_jumpScroll; 4187 set_option (Opt_jumpScroll, !state);
4050 break; 4188 break;
4051 case 5: /* reverse video */ 4189 case 5: /* reverse video */
4052 scr_rvideo_mode (state); 4190 scr_rvideo_mode (state);
4053 break; 4191 break;
4054 case 6: /* relative/absolute origins */ 4192 case 6: /* relative/absolute origins */
… …
4060 /* case 8: - auto repeat, can't do on a per window basis */ 4198 /* case 8: - auto repeat, can't do on a per window basis */
4061 case 9: /* X10 mouse reporting */ 4199 case 9: /* X10 mouse reporting */
4062 if (state) /* orthogonal */ 4200 if (state) /* orthogonal */
4063 priv_modes &= ~PrivMode_MouseX11; 4201 priv_modes &= ~PrivMode_MouseX11;
4064 break; 4202 break;
4065#ifdef menuBar_esc
4066 case menuBar_esc:
4067#ifdef MENUBAR
4068 map_menuBar (state);
4069#endif
4070 break;
4071#endif
4072#ifdef scrollBar_esc 4203#ifdef scrollBar_esc
4073 case scrollBar_esc: 4204 case scrollBar_esc:
4074 if (scrollbar_mapping (state)) 4205 if (scrollbar_mapping (state))
4075 { 4206 {
4076 resize_all_windows (0, 0, 0); 4207 resize_all_windows (0, 0, 0);
… …
4095#if 0 4226#if 0
4096 case 1001: 4227 case 1001:
4097 break; /* X11 mouse highlighting */ 4228 break; /* X11 mouse highlighting */
4098#endif 4229#endif
4099 case 1010: /* scroll to bottom on TTY output inhibit */ 4230 case 1010: /* scroll to bottom on TTY output inhibit */
4100 if (state)
4101 options &= ~Opt_scrollTtyOutput;
4102 else
4103 options |= Opt_scrollTtyOutput; 4231 set_option (Opt_scrollTtyOutput, !state);
4104 break; 4232 break;
4105 case 1011: /* scroll to bottom on key press */ 4233 case 1011: /* scroll to bottom on key press */
4106 if (state)
4107 options |= Opt_scrollTtyKeypress; 4234 set_option (Opt_scrollTtyKeypress, state);
4108 else
4109 options &= ~Opt_scrollTtyKeypress;
4110 break; 4235 break;
4111 case 1047: /* secondary screen w/ clearing last */ 4236 case 1047: /* secondary screen w/ clearing last */
4112 if (options & Opt_secondaryScreen) 4237 if (option (Opt_secondaryScreen))
4113 if (current_screen != PRIMARY) 4238 if (current_screen != PRIMARY)
4114 scr_erase_screen (2); 4239 scr_erase_screen (2);
4115 scr_change_screen (state); 4240 scr_change_screen (state);
4116 break; 4241 break;
4117 case 1049: /* secondary screen w/ clearing first */ 4242 case 1049: /* secondary screen w/ clearing first */
4118 scr_change_screen (state); 4243 scr_change_screen (state);
4119 if (options & Opt_secondaryScreen) 4244 if (option (Opt_secondaryScreen))
4120 if (current_screen != PRIMARY) 4245 if (current_screen != PRIMARY)
4121 scr_erase_screen (2); 4246 scr_erase_screen (2);
4122 break; 4247 break;
4123 default: 4248 default:
4124 break; 4249 break;
… …
4252 scr_color (Color_bg, Color_bg); 4377 scr_color (Color_bg, Color_bg);
4253 break; 4378 break;
4254 4379
4255 //case 50: // not variable spacing 4380 //case 50: // not variable spacing
4256 4381
4257#ifndef NO_BRIGHTCOLOR 4382#if !ENABLE_MINIMAL
4258 case 90: 4383 case 90:
4259 case 91: /* set bright fg color */ 4384 case 91: /* set bright fg color */
4260 case 92: 4385 case 92:
4261 case 93: 4386 case 93:
4262 case 94: 4387 case 94:
… …
4274 case 106: 4399 case 106:
4275 case 107: 4400 case 107:
4276 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4401 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4277 break; 4402 break;
4278#endif 4403#endif
4279
4280 } 4404 }
4281 } 4405 }
4282} 4406}
4283/*}}} */ 4407/*}}} */
4284 4408
… …
4308 */ 4432 */
4309void 4433void
4310rxvt_term::tt_printf (const char *fmt,...) 4434rxvt_term::tt_printf (const char *fmt,...)
4311{ 4435{
4312 va_list arg_ptr; 4436 va_list arg_ptr;
4313 unsigned char buf[256]; 4437 char buf[256];
4314 4438
4315 va_start (arg_ptr, fmt); 4439 va_start (arg_ptr, fmt);
4316 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4440 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4317 va_end (arg_ptr); 4441 va_end (arg_ptr);
4318 tt_write (buf, strlen (buf)); 4442 tt_write (buf, strlen (buf));
… …
4323 * or generated by us in response to a query ESC sequence. 4447 * or generated by us in response to a query ESC sequence.
4324 */ 4448 */
4325const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4449const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4326 4450
4327void 4451void
4328rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4452rxvt_term::tt_write (const char *data, unsigned int len)
4329{ 4453{
4454 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4455 return;
4456
4457 if (pty->pty < 0)
4458 return;
4459
4330 if (v_buflen == 0) 4460 if (v_buflen == 0)
4331 { 4461 {
4332 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4462 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4333 4463
4334 if ((unsigned int)written == len) 4464 if ((unsigned int)written == len)
4335 return; 4465 return;
4336 4466
4337 data += written; 4467 data += written;
4338 len -= written; 4468 len -= written;
4339 } 4469 }
4340 4470
4341 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4471 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4342 4472
4343 memcpy (v_buffer + v_buflen, data, len); 4473 memcpy (v_buffer + v_buflen, data, len);
4344 v_buflen += len; 4474 v_buflen += len;
4345 4475
4346 pty_ev.set (EVENT_READ | EVENT_WRITE); 4476 pty_ev.set (EVENT_READ | EVENT_WRITE);
4347} 4477}
4348 4478
4349void rxvt_term::pty_write () 4479void rxvt_term::pty_write ()
4350{ 4480{
4351 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4481 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4352 4482
4353 if (written > 0) 4483 if (written > 0)
4354 { 4484 {
4355 v_buflen -= written; 4485 v_buflen -= written;
4356 4486
… …
4365 } 4495 }
4366 4496
4367 memmove (v_buffer, v_buffer + written, v_buflen); 4497 memmove (v_buffer, v_buffer + written, v_buflen);
4368 } 4498 }
4369 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4499 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4370 // original code just ignores this... 4500 pty_ev.set (EVENT_READ);
4371 destroy ();
4372} 4501}
4373 4502
4374/*----------------------- end-of-file (C source) -----------------------*/ 4503/*----------------------- end-of-file (C source) -----------------------*/
4375 4504

Diff Legend

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