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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.202 by root, Sat Mar 12 23:35:14 2005 UTC vs.
Revision 1.327 by ayin, Mon Jun 11 13:33:34 2007 UTC

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

Diff Legend

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