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

Diff Legend

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