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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.198 by root, Sat Feb 19 01:07:58 2005 UTC vs.
Revision 1.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 {
… …
316 350
317 // the XOpenIM manpage lies about hardcoding the locale 351 // the XOpenIM manpage lies about hardcoding the locale
318 // at the point of XOpenIM, so temporarily switch locales 352 // at the point of XOpenIM, so temporarily switch locales
319 if (rs[Rs_imLocale]) 353 if (rs[Rs_imLocale])
320 SET_LOCALE (rs[Rs_imLocale]); 354 SET_LOCALE (rs[Rs_imLocale]);
355
321 // assume wchar_t == unicode or better 356 // assume wchar_t == unicode or better
322 len = XwcLookupString (Input_Context, &ev, wkbuf, 357 len = XwcLookupString (Input_Context, &ev, wkbuf,
323 KBUFSZ, &keysym, &status_return); 358 KBUFSZ, &keysym, &status_return);
359
324 if (rs[Rs_imLocale]) 360 if (rs[Rs_imLocale])
325 SET_LOCALE (locale); 361 SET_LOCALE (locale);
326 362
327 if (status_return == XLookupChars 363 if (status_return == XLookupChars
328 || status_return == XLookupBoth) 364 || status_return == XLookupBoth)
… …
349 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
350 } 386 }
351 else 387 else
352#endif 388#endif
353 { 389 {
354 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
355 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
356 } 392 }
357 393
358 if (valid_keysym) 394 if (valid_keysym)
359 { 395 {
360#ifdef KEYSYM_RESOURCE 396#ifdef KEYSYM_RESOURCE
361 if (keyboard->dispatch (this, keysym, ev.state)) 397 if (keyboard->dispatch (this, keysym, ev.state))
362 return; 398 return;
363#endif 399#endif
364 400
365 if (TermWin.saveLines) 401 if (saveLines)
366 { 402 {
367#ifdef UNSHIFTED_SCROLLKEYS 403#ifdef UNSHIFTED_SCROLLKEYS
368 if (!ctrl && !meta) 404 if (!ctrl && !meta)
369#else 405#else
370 if (IS_SCROLL_MOD) 406 if (IS_SCROLL_MOD)
371#endif 407#endif
372 { 408 {
373 int lnsppg; 409 int lnsppg;
374 410
375#ifdef PAGING_CONTEXT_LINES 411#ifdef PAGING_CONTEXT_LINES
376 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 412 lnsppg = nrow - PAGING_CONTEXT_LINES;
377#else 413#else
378 lnsppg = TermWin.nrow * 4 / 5; 414 lnsppg = nrow * 4 / 5;
379#endif 415#endif
380 if (keysym == XK_Prior) 416 if (keysym == XK_Prior)
381 { 417 {
382 scr_page (UP, lnsppg); 418 scr_page (UP, lnsppg);
383 return; 419 return;
… …
411 scr_move_to (0, 1); 447 scr_move_to (0, 1);
412 return; 448 return;
413 } 449 }
414 else if (keysym == XK_End) 450 else if (keysym == XK_End)
415 { 451 {
416 scr_move_to (1, 0); 452 scr_move_to (1, 1);
417 return; 453 return;
418 } 454 }
419 } 455 }
420#endif 456#endif
421 } 457 }
… …
432 { 468 {
433 switch (keysym) 469 switch (keysym)
434 { 470 {
435 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
436 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
437 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
438 return; 474 return;
439#if TODO 475#if TODO
440 /* rxvt extras */ 476 /* rxvt extras */
441 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
442 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
461 { 497 {
462 commit_iso14755 (); 498 commit_iso14755 ();
463 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
464# if ISO_14755 500# if ISO_14755
465 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);
466# endif 510# endif
467 return; 511 return;
468 } 512 }
469 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
470 { 514 {
… …
823 { 867 {
824#ifdef META8_OPTION 868#ifdef META8_OPTION
825 /* set 8-bit on */ 869 /* set 8-bit on */
826 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
827 { 871 {
828 unsigned char *ch; 872 char *ch;
829 873
830 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
831 *ch |= 0x80; 875 *ch |= 0x80;
832 876
833 meta = 0; 877 meta = 0;
… …
835#endif 879#endif
836 /* nil */ ; 880 /* nil */ ;
837 } 881 }
838 } 882 }
839 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
840 if (len <= 0) 887 if (len <= 0)
841 return; /* not mapped */ 888 return; /* not mapped */
842 889
843 if (options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
844 if (TermWin.view_start) 891 if (view_start)
845 { 892 {
846 TermWin.view_start = 0; 893 view_start = 0;
847 want_refresh = 1; 894 want_refresh = 1;
848 } 895 }
849 896
850 /* 897 /*
851 * these modifications only affect the static keybuffer 898 * these modifications only affect the static keybuffer
… …
866#ifdef META8_OPTION 913#ifdef META8_OPTION
867 && meta_char == C0_ESC 914 && meta_char == C0_ESC
868#endif 915#endif
869 ) 916 )
870 { 917 {
871 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
872 tt_write (&ch, 1); 919 tt_write (&ch, 1);
873 } 920 }
874 921
875#if defined(DEBUG_CMD)
876 /* Display keyboard buffer contents */
877 unsigned char *p;
878 int i;
879
880 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
881 for (i = 0, p = kbuf; i < len; i++, p++)
882 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
883 fprintf (stderr, "'\n");
884#endif /* DEBUG_CMD */
885 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
886} 923}
887/*}}} */
888 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
889#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
890/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
891/* attempt to `write' count to the input buffer */
892unsigned int 1003unsigned int
893rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
894{ 1005{
895 unsigned int n, s; 1006 unsigned int n, s;
896 1007
897 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
898 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
935 } 1046 }
936#endif 1047#endif
937 1048
938 if (want_refresh) 1049 if (want_refresh)
939 { 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
940 scr_refresh (refresh_type); 1089 scr_refresh ();
941 scrollbar_show (1); 1090 scrollbar_show (1);
942#ifdef USE_XIM 1091#ifdef USE_XIM
943 IMSendSpot (); 1092 IMSendSpot ();
944#endif 1093#endif
945 } 1094 }
… …
948} 1097}
949 1098
950void 1099void
951rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
952{ 1101{
953 SET_R (this); 1102 make_current ();
954 SET_LOCALE (locale);
955 1103
956 display->flush (); 1104 display->flush ();
957 1105
958 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
959 flush_ev.start (NOW + 0.01); 1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
960} 1108}
961 1109
962void 1110void
963rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
964{ 1112{
965 SET_R (this); 1113 make_current ();
966 SET_LOCALE (locale);
967 1114
968 refresh_limit = 1; 1115 refresh_limit = 1;
969 refresh_count = 0; 1116 refresh_count = 0;
970 flush (); 1117 flush ();
971} 1118}
… …
975rxvt_term::cursor_blink_cb (time_watcher &w) 1122rxvt_term::cursor_blink_cb (time_watcher &w)
976{ 1123{
977 hidden_cursor = !hidden_cursor; 1124 hidden_cursor = !hidden_cursor;
978 want_refresh = 1; 1125 want_refresh = 1;
979 1126
980 w.start (w.at + BLINK_INTERVAL); 1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
981} 1128}
982#endif 1129#endif
983 1130
984#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
985void 1132void
… …
999rxvt_term::cont_scroll_cb (time_watcher &w) 1146rxvt_term::cont_scroll_cb (time_watcher &w)
1000{ 1147{
1001 if ((scrollbar_isUp() || scrollbar_isDn()) && 1148 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1002 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1149 scr_page (scrollbar_isUp() ? UP : DN, 1))
1003 { 1150 {
1004 refresh_type |= SMOOTH_REFRESH;
1005 want_refresh = 1; 1151 want_refresh = 1;
1006 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1007 } 1153 }
1008} 1154}
1009#endif 1155#endif
… …
1013rxvt_term::sel_scroll_cb (time_watcher &w) 1159rxvt_term::sel_scroll_cb (time_watcher &w)
1014{ 1160{
1015 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1161 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1016 { 1162 {
1017 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1163 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1018 refresh_type |= SMOOTH_REFRESH;
1019 want_refresh = 1; 1164 want_refresh = 1;
1020 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1021 } 1166 }
1022} 1167}
1023#endif 1168#endif
… …
1028{ 1173{
1029 if (mouse_slip_wheel_speed == 0 1174 if (mouse_slip_wheel_speed == 0
1030 || 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)
1031 : scr_page (UP, mouse_slip_wheel_speed)) 1176 : scr_page (UP, mouse_slip_wheel_speed))
1032 { 1177 {
1033 if (TermWin.view_start == TermWin.nscrolled || 1178 if (view_start == top_row || view_start == 0)
1034 TermWin.view_start == 0)
1035 mouse_slip_wheel_speed = 0; 1179 mouse_slip_wheel_speed = 0;
1036 1180
1037 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1; 1181 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1040 } 1183 }
1041} 1184}
1042#endif 1185#endif
1043 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
1044bool 1212bool
1045rxvt_term::pty_fill () 1213rxvt_term::pty_fill ()
1046{ 1214{
1047 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1215 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1048 1216
1049 if (CBUFSIZ == n) 1217 if (CBUFSIZ == n)
1050 { 1218 {
1051 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");
1052 n = 0; 1220 n = 0;
1053 } 1221 }
1054 1222
1055 memmove (cmdbuf_base, cmdbuf_ptr, n); 1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
1056 cmdbuf_ptr = cmdbuf_base; 1224 cmdbuf_ptr = cmdbuf_base;
1057 cmdbuf_endp = cmdbuf_ptr + n; 1225 cmdbuf_endp = cmdbuf_ptr + n;
1058 1226
1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1060 1228
1061 if (n > 0) 1229 if (r > 0)
1062 { 1230 {
1063 cmdbuf_endp += n; 1231 cmdbuf_endp += r;
1064 return true; 1232 return true;
1065 } 1233 }
1066 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))
1067 destroy (); 1246 destroy ();
1247 }
1068 1248
1069 return false; 1249 return false;
1070} 1250}
1071 1251
1072void 1252void
1073rxvt_term::pty_cb (io_watcher &w, short revents) 1253rxvt_term::pty_cb (io_watcher &w, short revents)
1074{ 1254{
1075 SET_R (this); 1255 make_current ();
1076 SET_LOCALE (locale);
1077 1256
1078 if (revents & EVENT_READ) 1257 if (revents & EVENT_READ)
1079 // loop, but don't allow a single term to monopolize us 1258 // loop, but don't allow a single term to monopolize us
1080 while (pty_fill ()) 1259 while (pty_fill ())
1081 if (cmd_parse ()) 1260 if (cmd_parse ())
… …
1086} 1265}
1087 1266
1088void 1267void
1089rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1090{ 1269{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1092 recolour_cursor (); 1271 recolour_cursor ();
1093 1272
1094#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1274 hidden_pointer = 0;
1096 1275
1097 if (options & Opt_pointerBlank) 1276 if (option (Opt_pointerBlank))
1098 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1099#endif 1278#endif
1100} 1279}
1101 1280
1102#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1103void 1282void
1104rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1105{ 1284{
1106 if (! (options & Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1107 return; 1286 return;
1108 1287
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1110 XFlush (display->display); 1289 XFlush (dpy);
1111 1290
1112 hidden_pointer = 1; 1291 hidden_pointer = 1;
1113} 1292}
1114 1293
1115void 1294void
1116rxvt_term::pointer_cb (time_watcher &w) 1295rxvt_term::pointer_cb (time_watcher &w)
1117{ 1296{
1118 SET_R (this); 1297 make_current ();
1119 SET_LOCALE (locale);
1120 1298
1121 pointer_blank (); 1299 pointer_blank ();
1122} 1300}
1123#endif 1301#endif
1124 1302
… …
1189 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
1190 (32 + x + 1), 1368 (32 + x + 1),
1191 (32 + y + 1)); 1369 (32 + y + 1));
1192} 1370}
1193 1371
1194#ifdef USING_W11LIB
1195void
1196rxvt_W11_process_x_event (XEvent *ev)
1197{
1198 rxvt_t *r = rxvt_get_r ();
1199
1200 x_cb (*ev);
1201}
1202#endif
1203
1204/*{{{ process an X event */ 1372/*{{{ process an X event */
1205void 1373void
1206rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1207{ 1375{
1208 dDisp; 1376 make_current ();
1209 1377
1210 SET_R (this); 1378 dLocal (Display *, dpy);
1211 SET_LOCALE (locale);
1212 1379
1213#if defined(CURSOR_BLINK) 1380 if (ev.xany.window == vt
1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1215 { 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1216 if (hidden_cursor) 1383 return;
1217 {
1218 hidden_cursor = 0;
1219 want_refresh = 1;
1220 }
1221 1384
1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1385 // for XQueryPointer
1223 }
1224#endif
1225
1226#if defined(POINTER_BLANK)
1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1228 {
1229 if (ev.type == MotionNotify
1230 || ev.type == ButtonPress
1231 || ev.type == ButtonRelease)
1232 if (hidden_pointer)
1233 pointer_unblank ();
1234
1235 if (ev.type == KeyPress && hidden_pointer == 0)
1236 pointer_blank ();
1237 }
1238#endif
1239
1240 Window unused_root, unused_child; 1386 Window unused_root, unused_child;
1241 int unused_root_x, unused_root_y; 1387 int unused_root_x, unused_root_y;
1242 unsigned int unused_mask; 1388 unsigned int unused_mask;
1243 1389
1244 switch (ev.type) 1390 switch (ev.type)
1245 { 1391 {
1246 case KeyPress: 1392 case KeyPress:
1247#if ISO_14755 1393 key_press (ev.xkey);
1248 if (!(iso14755buf & ISO_14755_52))
1249#endif
1250 lookup_key (ev.xkey);
1251
1252 break; 1394 break;
1253 1395
1254 case KeyRelease: 1396 case KeyRelease:
1255 { 1397 key_release (ev.xkey);
1256#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1257 KeySym ks;
1258
1259 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1260#endif
1261
1262#if ENABLE_FRILLS || ISO_14755
1263 // ISO 14755 support
1264 if (iso14755buf)
1265 if (iso14755buf & ISO_14755_52)
1266 {
1267# if ENABLE_OVERLAY
1268 scr_overlay_off ();
1269# endif
1270# if ISO_14755
1271 // iso14755 part 5.2 handling: release time
1272 // first: controls
1273 if ((ev.xkey.state & ControlMask)
1274 && ((ks >= 0x40 && ks <= 0x5f)
1275 || (ks >= 0x61 && ks <= 0x7f)))
1276 {
1277 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1278 commit_iso14755 ();
1279 return; // case-break;
1280 }
1281
1282 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1283 if (i[0] == ks)
1284 {
1285 iso14755buf = ISO_14755_51 | i[1];
1286 commit_iso14755 ();
1287 return; // case-break;
1288 }
1289
1290 scr_bell ();
1291# endif
1292 iso14755buf = 0;
1293 break;
1294 }
1295 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1296 {
1297# if ENABLE_OVERLAY
1298 scr_overlay_off ();
1299# endif
1300 if (iso14755buf & ISO_14755_51)
1301 commit_iso14755 ();
1302#if ISO_14755
1303 else if (iso14755buf & ISO_14755_STARTED)
1304 {
1305 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1306
1307 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1308 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1309 }
1310# endif
1311 else
1312 iso14755buf = 0;
1313 }
1314#endif
1315
1316#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1317 if (!(ev.xkey.state & ControlMask))
1318 slip_wheel_ev.stop ();
1319 else if (ks == XK_Control_L || ks == XK_Control_R)
1320 mouse_slip_wheel_speed = 0;
1321#endif
1322 break; 1398 break;
1323 }
1324 1399
1325 case ButtonPress: 1400 case ButtonPress:
1326 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1327 break; 1402 break;
1328 1403
… …
1330 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1331 break; 1406 break;
1332 1407
1333 case ClientMessage: 1408 case ClientMessage:
1334 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1410 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411 {
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS] 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 {
1336 && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1337 destroy (); 1417 {
1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1419 destroy ();
1420 }
1421#if ENABLE_EWMH
1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1423 XSendEvent (dpy, ev.xclient.window = display->root,
1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1425 &ev);
1426#endif
1427 }
1428 }
1338#if ENABLE_XEMBED 1429#if ENABLE_XEMBED
1339 else if (ev.xclient.format == 32
1340 && ev.xclient.message_type == xa[XA_XEMBED]) 1430 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1341 { 1431 {
1342 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) 1432 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1343 focus_in (); 1433 focus_in ();
1344 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1345 focus_out (); 1435 focus_out ();
1436 }
1437#endif
1346 } 1438 }
1347#endif
1348#ifdef OFFIX_DND
1349 /* OffiX Dnd (drag 'n' drop) protocol */
1350 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1351 && (ev.xclient.data.l[0] == DndFile
1352 || ev.xclient.data.l[0] == DndDir
1353 || ev.xclient.data.l[0] == DndLink))
1354 {
1355 /* Get Dnd data */
1356 Atom ActualType;
1357 int ActualFormat;
1358 unsigned char *data;
1359 unsigned long Size, RemainingBytes;
1360
1361 XGetWindowProperty (disp, display->root,
1362 xa[XA_DNDSELECTION],
1363 0L, 1000000L,
1364 False, AnyPropertyType,
1365 &ActualType, &ActualFormat,
1366 &Size, &RemainingBytes,
1367 &data);
1368 set_string_property (XA_CUT_BUFFER0, data);
1369 XFree (data);
1370 selection_paste (display->root, XA_CUT_BUFFER0, true);
1371 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1372 }
1373#endif /* OFFIX_DND */
1374 break; 1439 break;
1375 1440
1376 case MappingNotify: 1441 case MappingNotify:
1377 XRefreshKeyboardMapping (&ev.xmapping); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1378 break; 1443 break;
… …
1401 break; 1466 break;
1402 } 1467 }
1403 break; 1468 break;
1404 1469
1405 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1406 focus_in (); 1474 focus_in ();
1407 break; 1475 break;
1408 1476
1409 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1410 focus_out (); 1481 focus_out ();
1411 break; 1482 break;
1412 1483
1413 case ConfigureNotify: 1484 case ConfigureNotify:
1414 if (ev.xconfigure.window == TermWin.parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1415 { 1486 {
1416 int height, width;
1417
1418 do
1419 { /* Wrap lots of configures into one */
1420 width = ev.xconfigure.width;
1421 height = ev.xconfigure.height;
1422 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1423 }
1424 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488 ;
1425 1489
1426 if (szHint.width != width || szHint.height != height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1427 { 1491 {
1428 seen_resize = 1; 1492 seen_resize = 1;
1429 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
1430 } 1501 }
1431 1502
1432#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
1433 if (options & Opt_transparent) 1506 if (option (Opt_transparent))
1434 check_our_parents (); 1507 check_our_parents ();
1435#endif 1508#endif
1436 } 1509 }
1437 break; 1510 break;
1438 1511
1439 case PropertyNotify: 1512 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1440 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1441 && ev.xproperty.state == PropertyNewValue) 1515 && ev.xproperty.state == PropertyNewValue)
1442 selection_property (ev.xproperty.window, ev.xproperty.atom); 1516 selection_property (ev.xproperty.window, ev.xproperty.atom);
1443 1517
1444 break; 1518 break;
1445 1519
1446 case SelectionClear: 1520 case SelectionClear:
1447 selection_clear (); 1521 selection_clear ();
… …
1454 1528
1455 case SelectionRequest: 1529 case SelectionRequest:
1456 selection_send (ev.xselectionrequest); 1530 selection_send (ev.xselectionrequest);
1457 break; 1531 break;
1458 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
1459 case UnmapNotify: 1541 case UnmapNotify:
1460 TermWin.mapped = 0; 1542 mapped = 0;
1461#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1462 text_blink_ev.stop (); 1544 text_blink_ev.stop ();
1463#endif 1545#endif
1464 break; 1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1465
1466 case MapNotify:
1467 TermWin.mapped = 1;
1468#ifdef TEXT_BLINK
1469 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1470#endif
1471 break; 1547 break;
1472 1548
1473#ifdef TRANSPARENT 1549#ifdef TRANSPARENT
1474 case ReparentNotify: 1550 case ReparentNotify:
1475 rootwin_cb (ev); 1551 rootwin_cb (ev);
1476 break; 1552 break;
1477#endif /* TRANSPARENT */ 1553#endif /* TRANSPARENT */
1478 1554
1479 case GraphicsExpose: 1555 case GraphicsExpose:
1480 case Expose: 1556 case Expose:
1481 if (ev.xany.window == TermWin.vt) 1557 if (ev.xany.window == vt)
1482 { 1558 {
1483 do 1559 do
1484 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1485 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1486 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1487 1563
1488 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1489 1565
1490 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1493 1569
1494 scr_refresh (refresh_type); 1570 want_refresh = 1;
1495 } 1571 }
1496 else 1572 else
1497 { 1573 {
1498 XEvent unused_event; 1574 XEvent unused_event;
1499 1575
1500 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1501 ; 1577 ;
1502 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1503 ; 1579 ;
1504 1580
1505 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1506 { 1582 {
1507 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1508 scrollbar_show (0); 1584 scrollbar_show (0);
1509 } 1585 }
1510#ifdef MENUBAR
1511 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1512 menubar_expose ();
1513#endif
1514 1586
1515#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1516 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1517 XClearWindow (disp, ev.xany.window); 1589 XClearWindow (dpy, ev.xany.window);
1518#endif 1590#endif
1519 } 1591 }
1520 break; 1592 break;
1521 1593
1522 case MotionNotify: 1594 case MotionNotify:
1523#ifdef POINTER_BLANK 1595#ifdef POINTER_BLANK
1524 if (hidden_pointer) 1596 if (hidden_pointer)
1525 pointer_unblank (); 1597 pointer_unblank ();
1526#endif 1598#endif
1527#if MENUBAR
1528 if (isMenuBarWindow (ev.xany.window))
1529 {
1530 menubar_control (ev.xbutton);
1531 break;
1532 }
1533#endif
1534 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1535 break; 1600 break;
1536 1601
1537 if (ev.xany.window == TermWin.vt) 1602 if (ev.xany.window == vt)
1538 { 1603 {
1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1606 ; // nop
1539 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1540 { 1608 {
1541 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1542 ; 1610 ;
1543 1611
1544 XQueryPointer (disp, TermWin.vt, 1612 XQueryPointer (dpy, vt,
1545 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1546 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1547 &ev.xbutton.x, &ev.xbutton.y, 1615 &ev.xbutton.x, &ev.xbutton.y,
1548 &ev.xbutton.state); 1616 &ev.xbutton.state);
1549#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
… …
1561#endif 1629#endif
1562 selection_extend (ev.xbutton.x, ev.xbutton.y, 1630 selection_extend (ev.xbutton.x, ev.xbutton.y,
1563 ev.xbutton.state & Button3Mask ? 2 : 0); 1631 ev.xbutton.state & Button3Mask ? 2 : 0);
1564 1632
1565#ifdef SELECTION_SCROLLING 1633#ifdef SELECTION_SCROLLING
1566 if (ev.xbutton.y < TermWin.int_bwidth 1634 if (ev.xbutton.y < int_bwidth
1567 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1635 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1568 { 1636 {
1569 int dist; 1637 int dist;
1570 1638
1571 /* don't clobber the current delay if we are 1639 /* don't clobber the current delay if we are
1572 * already in the middle of scrolling. 1640 * already in the middle of scrolling.
… …
1580 selection_save_x = ev.xbutton.x; 1648 selection_save_x = ev.xbutton.x;
1581 selection_save_y = ev.xbutton.y; 1649 selection_save_y = ev.xbutton.y;
1582 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1650 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1583 1651
1584 /* calc number of lines to scroll */ 1652 /* calc number of lines to scroll */
1585 if (ev.xbutton.y < TermWin.int_bwidth) 1653 if (ev.xbutton.y < int_bwidth)
1586 { 1654 {
1587 scroll_selection_dir = UP; 1655 scroll_selection_dir = UP;
1588 dist = TermWin.int_bwidth - ev.xbutton.y; 1656 dist = int_bwidth - ev.xbutton.y;
1589 } 1657 }
1590 else 1658 else
1591 { 1659 {
1592 scroll_selection_dir = DN; 1660 scroll_selection_dir = DN;
1593 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1661 dist = ev.xbutton.y - (int_bwidth + height);
1594 } 1662 }
1595 1663
1596 scroll_selection_lines = Pixel2Height (dist) 1664 scroll_selection_lines = Pixel2Height (dist)
1597 / SELECTION_SCROLL_LINE_SPEEDUP 1665 / SELECTION_SCROLL_LINE_SPEEDUP
1598 + 1; 1666 + 1;
1599 MIN_IT (scroll_selection_lines, 1667 min_it (scroll_selection_lines,
1600 SELECTION_SCROLL_MAX_LINES); 1668 SELECTION_SCROLL_MAX_LINES);
1601 } 1669 }
1602 else 1670 else
1603 { 1671 {
1604 /* we are within the text window, so we 1672 /* we are within the text window, so we
… …
1613#endif 1681#endif
1614 } 1682 }
1615 } 1683 }
1616 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1617 { 1685 {
1618 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1619 MotionNotify, &ev)) 1687 MotionNotify, &ev))
1620 ; 1688 ;
1621 1689
1622 XQueryPointer (disp, scrollBar.win, 1690 XQueryPointer (dpy, scrollBar.win,
1623 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1624 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1625 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1626 &unused_mask); 1694 &unused_mask);
1627 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1628 scrollbar_size ()); 1696 scrollbar_size ());
1629 scr_refresh (refresh_type); 1697 want_refresh = 1;
1630 refresh_limit = 0; 1698 refresh_limit = 0;
1631 scrollbar_show (1); 1699 scrollbar_show (1);
1632 } 1700 }
1633 break; 1701 break;
1634 } 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
1635} 1730}
1636 1731
1637void 1732void
1638rxvt_term::focus_in () 1733rxvt_term::focus_in ()
1639{ 1734{
1640 if (!TermWin.focus) 1735 if (!focus)
1641 { 1736 {
1642 TermWin.focus = 1; 1737 focus = 1;
1643 want_refresh = 1; 1738 want_refresh = 1;
1739
1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1741
1644#ifdef USE_XIM 1742#if USE_XIM
1645 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1646 { 1744 {
1647 IMSetStatusPosition (); 1745 IMSetPosition ();
1648 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1649 } 1747 }
1650#endif 1748#endif
1651#ifdef CURSOR_BLINK 1749#if CURSOR_BLINK
1652 if (options & Opt_cursorBlink) 1750 if (option (Opt_cursorBlink))
1653 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1654#endif 1752#endif
1655#ifdef OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1656 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1657 { 1755 {
1658 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1659 scr_recolour (); 1757 scr_recolour ();
1660 } 1758 }
1661#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
1662 } 1773 }
1663} 1774}
1664 1775
1665void 1776void
1666rxvt_term::focus_out () 1777rxvt_term::focus_out ()
1667{ 1778{
1668 if (TermWin.focus) 1779 if (focus)
1669 { 1780 {
1670 TermWin.focus = 0; 1781 focus = 0;
1671 want_refresh = 1; 1782 want_refresh = 1;
1672 1783
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1785
1673#if ENABLE_FRILLS || ISO_14755 1786#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf)
1788 {
1674 iso14755buf = 0; 1789 iso14755buf = 0;
1675#endif
1676#if ENABLE_OVERLAY 1790# if ENABLE_OVERLAY
1677 scr_overlay_off (); 1791 scr_overlay_off ();
1678#endif 1792# endif
1793 }
1794#endif
1679#ifdef USE_XIM 1795#if USE_XIM
1680 if (Input_Context != NULL) 1796 if (Input_Context != NULL)
1681 XUnsetICFocus (Input_Context); 1797 XUnsetICFocus (Input_Context);
1682#endif 1798#endif
1683#ifdef CURSOR_BLINK 1799#if CURSOR_BLINK
1684 if (options & Opt_cursorBlink) 1800 if (option (Opt_cursorBlink))
1685 cursor_blink_ev.stop (); 1801 cursor_blink_ev.stop ();
1686 hidden_cursor = 0; 1802 hidden_cursor = 0;
1687#endif 1803#endif
1688#ifdef OFF_FOCUS_FADING 1804#if OFF_FOCUS_FADING
1689 if (rs[Rs_fade]) 1805 if (rs[Rs_fade])
1690 { 1806 {
1691 pix_colors = pix_colors_unfocused; 1807 pix_colors = pix_colors_unfocused;
1692 scr_recolour (); 1808 scr_recolour ();
1693 } 1809 }
1694#endif 1810#endif
1695 } 1811 }
1696} 1812}
1697 1813
1698#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
1699void 1828void
1700rxvt_term::rootwin_cb (XEvent &ev) 1829rxvt_term::rootwin_cb (XEvent &ev)
1701{ 1830{
1702 SET_R (this); 1831 make_current ();
1703 SET_LOCALE (locale);
1704 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
1705 switch (ev.type) 1838 switch (ev.type)
1706 { 1839 {
1707 case PropertyNotify: 1840 case PropertyNotify:
1708 /* 1841 /*
1709 * 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,
… …
1713 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1714 return; 1847 return;
1715 1848
1716 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1717 case ReparentNotify: 1850 case ReparentNotify:
1718 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1719 want_refresh = want_full_refresh = 1; 1852 check_our_parents ();
1720 break; 1853 break;
1721 } 1854 }
1855# endif
1722} 1856}
1723#endif 1857#endif
1724 1858
1725void 1859void
1726rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
1727{ 1861{
1728 int reportmode = 0, clickintime; 1862 int reportmode = 0, clickintime;
1729 1863
1730 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1864 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1865
1731 if (!bypass_keystate) 1866 if (!bypass_keystate)
1732 reportmode = !! (priv_modes & PrivMode_mouse_report); 1867 reportmode = !! (priv_modes & PrivMode_mouse_report);
1733 1868
1734 /* 1869 /*
1735 * VT window processing of button press 1870 * VT window processing of button press
1736 */ 1871 */
1737 if (ev.window == TermWin.vt) 1872 if (ev.window == vt)
1738 { 1873 {
1874 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1875 return;
1876
1739#if ISO_14755 1877#if ISO_14755
1740 // 5.4 1878 // 5.4
1741 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1879 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1742 { 1880 {
1743 iso14755_54 (ev.x, ev.y); 1881 iso14755_54 (ev.x, ev.y);
… …
1755#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1756 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1757 { 1895 {
1758 /* same button, within alloted time */ 1896 /* same button, within alloted time */
1759 MEvent.clicks++; 1897 MEvent.clicks++;
1898
1760 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1761 { 1900 {
1762 /* only report double clicks */ 1901 /* only report double clicks */
1763 MEvent.clicks = 2; 1902 MEvent.clicks = 2;
1764 mouse_report (ev); 1903 mouse_report (ev);
… …
1796#else 1935#else
1797 selection.rect = false; 1936 selection.rect = false;
1798#endif 1937#endif
1799 1938
1800 /* allow shift+left click to extend selection */ 1939 /* allow shift+left click to extend selection */
1801 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1940 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1802 { 1941 {
1803 if (MEvent.button == Button1 && clickintime) 1942 if (MEvent.button == Button1 && clickintime)
1804 selection_rotate (ev.x, ev.y); 1943 selection_rotate (ev.x, ev.y);
1805 else 1944 else
1806 selection_extend (ev.x, ev.y, 1); 1945 selection_extend (ev.x, ev.y, 1);
… …
1947 case Button3: 2086 case Button3:
1948 if (scrollBar.style != R_SB_XTERM) 2087 if (scrollBar.style != R_SB_XTERM)
1949 { 2088 {
1950 if (scrollbar_above_slider (ev.y)) 2089 if (scrollbar_above_slider (ev.y))
1951# ifdef RXVT_SCROLL_FULL 2090# ifdef RXVT_SCROLL_FULL
1952 scr_page (UP, TermWin.nrow - 1); 2091 scr_page (UP, nrow - 1);
1953# else 2092# else
1954 scr_page (UP, TermWin.nrow / 4); 2093 scr_page (UP, nrow / 4);
1955# endif 2094# endif
1956 else if (scrollbar_below_slider (ev.y)) 2095 else if (scrollbar_below_slider (ev.y))
1957# ifdef RXVT_SCROLL_FULL 2096# ifdef RXVT_SCROLL_FULL
1958 scr_page (DN, TermWin.nrow - 1); 2097 scr_page (DN, nrow - 1);
1959# else 2098# else
1960 scr_page (DN, TermWin.nrow / 4); 2099 scr_page (DN, nrow / 4);
1961# endif 2100# endif
1962 else 2101 else
1963 scrollBar.setMotion (); 2102 scrollBar.setMotion ();
1964 } 2103 }
1965 else 2104 else
1966 { 2105 {
1967 scr_page ((ev.button == Button1 ? DN : UP), 2106 scr_page ((ev.button == Button1 ? DN : UP),
1968 (TermWin.nrow 2107 (nrow
1969 * scrollbar_position (ev.y) 2108 * scrollbar_position (ev.y)
1970 / scrollbar_size ())); 2109 / scrollbar_size ()));
1971 } 2110 }
1972 2111
1973 break; 2112 break;
1974 } 2113 }
1975 } 2114 }
2115
1976 return; 2116 return;
1977 } 2117 }
1978#if MENUBAR
1979 /*
1980 * Menubar window processing of button press
1981 */
1982 if (isMenuBarWindow (ev.window))
1983 menubar_control (ev);
1984#endif
1985} 2118}
1986 2119
1987void 2120void
1988rxvt_term::button_release (XButtonEvent &ev) 2121rxvt_term::button_release (XButtonEvent &ev)
1989{ 2122{
… …
1995 2128
1996 if (scrollbar_isUpDn ()) 2129 if (scrollbar_isUpDn ())
1997 { 2130 {
1998 scrollBar.setIdle (); 2131 scrollBar.setIdle ();
1999 scrollbar_show (0); 2132 scrollbar_show (0);
2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2001 refresh_type &= ~SMOOTH_REFRESH;
2002#endif
2003 } 2133 }
2004 2134
2005#ifdef SELECTION_SCROLLING 2135#ifdef SELECTION_SCROLLING
2006 if (sel_scroll_ev.active) 2136 if (sel_scroll_ev.active)
2007 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
2008#endif 2138#endif
2009 2139
2010 if (ev.window == TermWin.vt) 2140 if (ev.window == vt)
2011 { 2141 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2143 return;
2144
2012#if ISO_14755 2145#if ISO_14755
2013 // 5.4 2146 // 5.4
2014 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2147 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2015 return; 2148 return;
2016#endif 2149#endif
2150
2017 if (reportmode) 2151 if (reportmode)
2018 { 2152 {
2019 /* mouse report from vt window */ 2153 /* mouse report from vt window */
2020 /* don't report release of wheel "buttons" */ 2154 /* don't report release of wheel "buttons" */
2021 if (ev.button >= 4) 2155 if (ev.button >= 4)
… …
2051 { 2185 {
2052 case Button1: 2186 case Button1:
2053 case Button3: 2187 case Button3:
2054 selection_make (ev.time); 2188 selection_make (ev.time);
2055 break; 2189 break;
2190
2056 case Button2: 2191 case Button2:
2057 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);
2058 break; 2194 break;
2195
2059#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2060 case Button4: 2197 case Button4:
2061 case Button5: 2198 case Button5:
2062 { 2199 {
2063 int i; 2200 int i;
… …
2065 2202
2066 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2067 2204
2068 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2069 i = 1; 2206 i = 1;
2070 else if (options & Opt_mouseWheelScrollPage) 2207 else if (option (Opt_mouseWheelScrollPage))
2071 i = TermWin.nrow - 1; 2208 i = nrow - 1;
2072 else 2209 else
2073 i = 5; 2210 i = 5;
2074 2211
2075# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
2076 if (ev.state & ControlMask) 2213 if (ev.state & ControlMask)
2077 { 2214 {
2078 mouse_slip_wheel_speed += v ? -1 : 1; 2215 mouse_slip_wheel_speed += v ? -1 : 1;
2079 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;
2080 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;
2081 2218
2082 if (slip_wheel_ev.at < NOW) 2219 if (slip_wheel_ev.at < NOW)
2083 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2220 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2084 2221
2085 slip_wheel_ev.start (); 2222 slip_wheel_ev.start ();
2086 } 2223 }
2087 else 2224 else
2088 { 2225 {
2089# endif 2226# endif
2090# ifdef JUMP_MOUSE_WHEEL
2091 scr_page (v, i); 2227 scr_page (v, i);
2092 scr_refresh (SMOOTH_REFRESH);
2093 scrollbar_show (1); 2228 scrollbar_show (1);
2094# else
2095 while (i--)
2096 {
2097 scr_page (v, 1);
2098 scr_refresh (SMOOTH_REFRESH);
2099 scrollbar_show (1);
2100 }
2101# endif
2102# ifdef MOUSE_SLIP_WHEELING 2229# ifdef MOUSE_SLIP_WHEELING
2103 } 2230 }
2104#endif 2231# endif
2105 } 2232 }
2106 break; 2233 break;
2107#endif 2234#endif
2108 } 2235 }
2109 } 2236 }
2110#ifdef MENUBAR
2111 else if (isMenuBarWindow (ev.window))
2112 menubar_control (ev);
2113#endif
2114} 2237}
2115 2238
2116#ifdef TRANSPARENT 2239#ifdef TRANSPARENT
2117#if TINTING 2240#if TINTING && !defined(HAVE_AFTERIMAGE)
2118/* taken from aterm-0.4.2 */ 2241/* taken from aterm-0.4.2 */
2119 2242
2120typedef uint32_t RUINT32T; 2243typedef uint32_t RUINT32T;
2121 2244
2122void 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)
2123{ 2246{
2124 int sh_r, sh_g, sh_b; 2247 int sh_r, sh_g, sh_b;
2125 RUINT32T mask_r, mask_g, mask_b; 2248 RUINT32T mask_r, mask_g, mask_b;
2126 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2249 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2127 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2250 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2128 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2251 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2129 int i; 2252 int i;
2130 2253
2131 Visual *visual = display->visual; 2254 Visual *visual = term->visual;
2132 2255
2133 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2256 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2134 2257
2135 /* for convenience */ 2258 /* for convenience */
2136 mask_r = visual->red_mask; 2259 mask_r = visual->red_mask;
… …
2350 * Do transparency updates if required 2473 * Do transparency updates if required
2351 */ 2474 */
2352int 2475int
2353rxvt_term::check_our_parents () 2476rxvt_term::check_our_parents ()
2354{ 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{
2355 int i, pchanged, aformat, have_pixmap, rootdepth; 2486 int i, pchanged, aformat, have_pixmap, rootdepth;
2356 unsigned long nitems, bytes_after; 2487 unsigned long nitems, bytes_after;
2357 Atom atype; 2488 Atom atype;
2358 unsigned char *prop = NULL; 2489 unsigned char *prop = NULL;
2359 Window root, oldp, *list; 2490 Window root, oldp, *list;
2360 Pixmap rootpixmap = None; 2491 Pixmap rootpixmap = None;
2361 XWindowAttributes wattr, wrootattr; 2492 XWindowAttributes wattr, wrootattr;
2362 dDisp; 2493 int sx, sy;
2494 Window cr;
2363 2495
2364 pchanged = 0; 2496 pchanged = 0;
2365 2497
2366 if (!(options & Opt_transparent)) 2498 if (!option (Opt_transparent))
2367 return pchanged; /* Don't try any more */ 2499 return /*pchanged*/; /* Don't try any more */
2368 2500
2369 XGetWindowAttributes (disp, display->root, &wrootattr); 2501 XGetWindowAttributes (dpy, display->root, &wrootattr);
2370 rootdepth = wrootattr.depth; 2502 rootdepth = wrootattr.depth;
2371 2503
2372 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2504 XGetWindowAttributes (dpy, parent[0], &wattr);
2373 2505
2374 if (rootdepth != wattr.depth) 2506 if (rootdepth != wattr.depth)
2375 { 2507 {
2376 if (am_transparent) 2508 if (am_transparent)
2377 { 2509 {
2378 pchanged = 1; 2510 pchanged = 1;
2379 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2511 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2380 am_transparent = am_pixmap_trans = 0; 2512 am_transparent = am_pixmap_trans = 0;
2381 } 2513 }
2382 2514
2383 return pchanged; /* Don't try any more */ 2515 return /*pchanged*/; /* Don't try any more */
2384 } 2516 }
2385 2517
2386 /* 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. */
2387 XSync (disp, False); 2519 XSync (dpy, False);
2388 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 */ ;
2389 /* 2528 /*
2390 * Make the frame window set by the window manager have 2529 * Make the frame window set by the window manager have
2391 * the root background. Some window managers put multiple nested frame 2530 * the root background. Some window managers put multiple nested frame
2392 * 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.
2393 */ 2532 */
2394 i = (xa[XA_XROOTPMAP_ID] 2533 i = (xa[XA_XROOTPMAP_ID]
2395 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2534 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2396 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2535 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2397 &nitems, &bytes_after, &prop) == Success); 2536 &nitems, &bytes_after, &prop) == Success);
2398 2537
2399 if (!i || prop == NULL) 2538 if (!i || prop == NULL)
2400 i = (xa[XA_ESETROOT_PMAP_ID] 2539 i = (xa[XA_ESETROOT_PMAP_ID]
2401 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2540 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2541 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2403 &nitems, &bytes_after, &prop) == Success); 2542 &nitems, &bytes_after, &prop) == Success);
2404 2543
2405 if (!i || prop == NULL 2544 if (!i || prop == NULL
2406#if TINTING 2545#if TINTING
2407 || !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 )
2408#endif 2551#endif
2409 ) 2552 )
2410 have_pixmap = 0; 2553 have_pixmap = 0;
2411 else 2554 else
2412 { 2555 {
… …
2415 XFree (prop); 2558 XFree (prop);
2416 } 2559 }
2417 2560
2418 if (have_pixmap) 2561 if (have_pixmap)
2419 { 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 {
2420 /* 2685 /*
2421 * Copy display->root pixmap transparency 2686 * Copy display->root pixmap transparency
2422 */ 2687 */
2423 int sx, sy, nx, ny; 2688 int nx, ny;
2424 unsigned int nw, nh; 2689 unsigned int nw, nh;
2425 Window cr;
2426 XImage *image; 2690 XImage *image;
2427 GC gc;
2428 XGCValues gcvalue;
2429 2691
2430 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2431 0, 0, &sx, &sy, &cr);
2432 nw = (unsigned int)szHint.width; 2692 nw = (unsigned int)szHint.width;
2433 nh = (unsigned int)szHint.height; 2693 nh = (unsigned int)szHint.height;
2434 nx = ny = 0; 2694 nx = ny = 0;
2435 2695
2436 if (sx < 0) 2696 if (sx < 0)
2437 { 2697 {
2438 nw += sx; 2698 nw += sx;
2439 nx = -sx; 2699 nx = -sx;
2440 sx = 0; 2700 sx = 0;
2441 } 2701 }
2442 2702
2443 if (sy < 0) 2703 if (sy < 0)
2444 { 2704 {
2445 nh += sy; 2705 nh += sy;
2446 ny = -sy; 2706 ny = -sy;
2447 sy = 0; 2707 sy = 0;
2448 } 2708 }
2449 2709
2450 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2710 min_it (nw, (unsigned int) (wrootattr.width - sx));
2451 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2711 min_it (nh, (unsigned int) (wrootattr.height - sy));
2452 2712
2453 XSync (disp, False); 2713 XSync (dpy, False);
2454 allowedxerror = -1; 2714 allowedxerror = -1;
2455 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2715 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2456 2716
2457 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2717 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2458 /* XXX: may need a delay here? */ 2718 /* XXX: may need a delay here? */
2459 allowedxerror = 0; 2719 allowedxerror = 0;
2460
2461 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)
2462 { 2749 {
2463 if (am_transparent && am_pixmap_trans) 2750 if (am_transparent && am_pixmap_trans)
2464 { 2751 {
2465 pchanged = 1; 2752 pchanged = 1;
2466 if (TermWin.pixmap != None) 2753 if (pixmap != None)
2467 { 2754 {
2468 XFreePixmap (disp, TermWin.pixmap); 2755 XFreePixmap (dpy, pixmap);
2469 TermWin.pixmap = None; 2756 pixmap = None;
2470 } 2757 }
2471 } 2758 }
2472 2759
2473 am_pixmap_trans = 0; 2760 am_pixmap_trans = 0;
2474 } 2761 }
2475 else 2762 else
2476 { 2763 {
2477 if (TermWin.pixmap != None)
2478 XFreePixmap (disp, TermWin.pixmap);
2479
2480#if TINTING
2481 if (ISSET_PIXCOLOR (Color_tint))
2482 {
2483 unsigned short rm, gm, bm;
2484 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2485
2486 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2487
2488 ShadeXImage (display, image, shade, rm, gm, bm);
2489 }
2490#endif
2491
2492 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2493 szHint.width, szHint.height, image->depth);
2494 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2495 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2496 nx, ny, image->width, image->height);
2497 XFreeGC (disp, gc);
2498 XDestroyImage (image);
2499 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2764 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2500 XClearWindow (disp, TermWin.parent[0]); 2765 XClearWindow (dpy, parent[0]);
2501 2766
2502 if (!am_transparent || !am_pixmap_trans) 2767 if (!am_transparent || !am_pixmap_trans)
2503 pchanged = 1; 2768 pchanged = 1;
2504 2769
2505 am_transparent = am_pixmap_trans = 1; 2770 am_transparent = am_pixmap_trans = 1;
2506 } 2771 }
2507 } 2772 }
2508 2773
2509 if (am_pixmap_trans) 2774 if (am_pixmap_trans)
2510 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2775 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2511 else 2776 else
2512 { 2777 {
2513 unsigned int n; 2778 unsigned int n;
2514 /* 2779 /*
2515 * InheritPixmap transparency 2780 * InheritPixmap transparency
2516 */ 2781 */
2517 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2782 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2518 { 2783 {
2519 oldp = TermWin.parent[i]; 2784 oldp = parent[i];
2520 XQueryTree (disp, TermWin.parent[i - 1], &root, 2785 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2521 &TermWin.parent[i], &list, &n);
2522 XFree (list); 2786 XFree (list);
2523 2787
2524 if (TermWin.parent[i] == display->root) 2788 if (parent[i] == display->root)
2525 { 2789 {
2526 if (oldp != None) 2790 if (oldp != None)
2527 pchanged = 1; 2791 pchanged = 1;
2528 2792
2529 break; 2793 break;
2530 } 2794 }
2531 2795
2532 if (oldp != TermWin.parent[i]) 2796 if (oldp != parent[i])
2533 pchanged = 1; 2797 pchanged = 1;
2534 } 2798 }
2535 2799
2536 n = 0; 2800 n = 0;
2537 2801
2538 if (pchanged) 2802 if (pchanged)
2539 {
2540 for (; n < (unsigned int)i; n++) 2803 for (; n < (unsigned int)i; n++)
2541 { 2804 {
2542 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2805 XGetWindowAttributes (dpy, parent[n], &wattr);
2806
2543 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2807 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2544 { 2808 {
2545 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2809 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2546 break; 2810 break;
2547 } 2811 }
2548 } 2812 }
2813
2814 if (n > (sizeof (parent) / sizeof (parent[0])))
2549 } 2815 {
2550
2551 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2552 {
2553 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2816 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2554 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2817 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2555 am_transparent = 0; 2818 am_transparent = 0;
2556 /* XXX: also turn off Opt_transparent? */ 2819 /* XXX: also turn off Opt_transparent? */
2557 } 2820 }
2558 else 2821 else
2559 { 2822 {
2560#if WAIT_FOR_WM
2561 /* wait (an arbitrary period) for the WM to do its thing
2562 * needed for fvwm2.2.2 (and before?) */
2563 sleep (1);
2564#endif
2565 for (n = 0; n < (unsigned int)i; n++) 2823 for (n = 0; n < (unsigned int)i; n++)
2566 { 2824 {
2567 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2825 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2568 XClearWindow (disp, TermWin.parent[n]); 2826 XClearWindow (dpy, parent[n]);
2569 } 2827 }
2570 2828
2571 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2829 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2572 am_transparent = 1; 2830 am_transparent = 1;
2573 } 2831 }
2574 2832
2575 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2833 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2576 TermWin.parent[i] = None; 2834 parent[i] = None;
2577 } 2835 }
2578 2836
2579 if (scrollBar.win) 2837 if (scrollBar.win)
2580 { 2838 {
2581 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2839 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2582 scrollBar.setIdle (); 2840 scrollBar.setIdle ();
2583 scrollbar_show (0); 2841 scrollbar_show (0);
2584 } 2842 }
2585 2843
2586 if (am_transparent) 2844 if (am_transparent)
… …
2588 want_refresh = want_full_refresh = 1; 2846 want_refresh = want_full_refresh = 1;
2589 if (am_pixmap_trans) 2847 if (am_pixmap_trans)
2590 flush (); 2848 flush ();
2591 } 2849 }
2592 2850
2593 return pchanged; 2851// return pchanged;
2594} 2852}
2595#endif 2853#endif
2596 2854
2597/*}}} */ 2855/*}}} */
2598 2856
2599bool 2857bool
2600rxvt_term::cmd_parse () 2858rxvt_term::cmd_parse ()
2601{ 2859{
2602 bool flag = false; 2860 bool flag = false;
2603 unicode_t ch = NOCHAR; 2861 wchar_t ch = NOCHAR;
2604 unsigned char *seq_begin; // remember start of esc-sequence here 2862 char *seq_begin; // remember start of esc-sequence here
2605 2863
2606 for (;;) 2864 for (;;)
2607 { 2865 {
2608 if (ch == NOCHAR) 2866 if (ch == NOCHAR)
2609 { 2867 {
2610 seq_begin = cmdbuf_ptr; 2868 seq_begin = cmdbuf_ptr;
2611 ch = next_char (); 2869 ch = next_char ();
2612 }
2613 2870
2614 if (ch == NOCHAR) // TODO: improve 2871 if (ch == NOCHAR)
2615 break; 2872 break;
2873 }
2616 2874
2617 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)
2618 { 2876 {
2619 if (!seen_input) 2877 if (!seen_input)
2620 { 2878 {
… …
2629 if (seen_resize && cmd_pid) 2887 if (seen_resize && cmd_pid)
2630 kill (-cmd_pid, SIGWINCH); 2888 kill (-cmd_pid, SIGWINCH);
2631 } 2889 }
2632 2890
2633 /* Read a text string from the input buffer */ 2891 /* Read a text string from the input buffer */
2634 unicode_t buf[UBUFSIZ]; 2892 wchar_t buf[UBUFSIZ];
2635 bool refreshnow = false; 2893 bool refreshnow = false;
2636 int nlines = 0; 2894 int nlines = 0;
2637 unicode_t *str = buf; 2895 wchar_t *str = buf;
2896 wchar_t *eol = str + min (ncol, UBUFSIZ);
2638 2897
2639 for (;;) 2898 for (;;)
2640 { 2899 {
2641 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))
2642 break; 2901 break;
2643 2902
2644 *str++ = ch; 2903 *str++ = ch;
2645 2904
2646 if (ch == C0_LF) 2905 if (ch == C0_LF || str >= eol)
2647 { 2906 {
2907 if (ch == C0_LF)
2648 nlines++; 2908 nlines++;
2909
2649 refresh_count++; 2910 refresh_count++;
2650 2911
2651 if (!(options & Opt_jumpScroll) 2912 if (!option (Opt_jumpScroll)
2652 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2913 || (refresh_count >= refresh_limit * (nrow - 1)))
2653 { 2914 {
2654 refreshnow = true; 2915 refreshnow = true;
2916 refresh_count = 0;
2655 ch = NOCHAR; 2917 ch = NOCHAR;
2656 break; 2918 break;
2657 } 2919 }
2658 2920
2659 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2921 // scr_add_lines only works for nlines <= nrow - 1.
2660 if (nlines >= TermWin.nrow - 1) 2922 if (nlines >= nrow - 1)
2661 { 2923 {
2924 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2925 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2662 scr_add_lines (buf, nlines, str - buf); 2926 scr_add_lines (buf, str - buf, nlines);
2927
2663 nlines = 0; 2928 nlines = 0;
2664 str = buf; 2929 str = buf;
2930 eol = str + min (ncol, UBUFSIZ);
2665 } 2931 }
2666 }
2667 2932
2668 if (str >= buf + UBUFSIZ) 2933 if (str >= eol)
2669 { 2934 {
2935 if (eol >= buf + UBUFSIZ)
2936 {
2670 ch = NOCHAR; 2937 ch = NOCHAR;
2671 break; 2938 break;
2939 }
2940 else
2941 eol = min (eol + ncol, buf + UBUFSIZ);
2942 }
2943
2672 } 2944 }
2673 2945
2674 seq_begin = cmdbuf_ptr; 2946 seq_begin = cmdbuf_ptr;
2675 ch = next_char (); 2947 ch = next_char ();
2676 } 2948 }
2677 2949
2950 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2951 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2678 scr_add_lines (buf, nlines, str - buf); 2952 scr_add_lines (buf, str - buf, nlines);
2679 2953
2680 /* 2954 /*
2681 * 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
2682 * 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.
2683 * the number of pages between refreshes is refresh_limit, which 2957 * the number of pages between refreshes is refresh_limit, which
2684 * is incremented here because we must be doing flat-out scrolling. 2958 * is incremented here because we must be doing flat-out scrolling.
2685 */ 2959 */
2686 if (refreshnow) 2960 if (refreshnow)
2687 { 2961 {
2688 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2962 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2689 refresh_limit++; 2963 refresh_limit++;
2690 else 2964 else
2691 { 2965 {
2692 flag = true; 2966 flag = true;
2967 //TODO: due to popular request, implement "skipscroll" option here
2693 scr_refresh (refresh_type); 2968 scr_refresh ();
2969 want_refresh = 1;
2694 } 2970 }
2695 } 2971 }
2696 2972
2697 } 2973 }
2698 else 2974 else
… …
2713 } 2989 }
2714 2990
2715 return flag; 2991 return flag;
2716} 2992}
2717 2993
2718// read the next octet
2719unicode_t
2720rxvt_term::next_octet ()
2721{
2722 return cmdbuf_ptr < cmdbuf_endp
2723 ? *cmdbuf_ptr++
2724 : NOCHAR;
2725}
2726
2727// read the next character 2994// read the next character
2728unicode_t 2995wchar_t
2729rxvt_term::next_char () 2996rxvt_term::next_char () NOTHROW
2730{ 2997{
2731 while (cmdbuf_ptr < cmdbuf_endp) 2998 while (cmdbuf_ptr < cmdbuf_endp)
2732 { 2999 {
2733 // assume 7-bit to be ascii ALWAYS 3000 // assume 7-bit to be ascii ALWAYS
2734 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 3001 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2735 return *cmdbuf_ptr++; 3002 return *cmdbuf_ptr++;
2736 3003
2737 wchar_t wc; 3004 wchar_t wc;
2738 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);
2739 3006
2740 if (len == (size_t)-2) 3007 if (len == (size_t)-2)
2741 { 3008 {
2742 // the mbstate stores incomplete sequences. didn't know this :/ 3009 // the mbstate stores incomplete sequences. didn't know this :/
2743 cmdbuf_ptr = cmdbuf_endp; 3010 cmdbuf_ptr = cmdbuf_endp;
2744 break; 3011 break;
2745 } 3012 }
2746 3013
2747 if (len == (size_t)-1) 3014 if (len == (size_t)-1)
2748 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
2749 3016
2750 // assume wchar == unicode 3017 // assume wchar == unicode
2751 cmdbuf_ptr += len; 3018 cmdbuf_ptr += len;
2752 return wc & UNICODE_MASK; 3019 return wc & UNICODE_MASK;
2753 } 3020 }
2754 3021
2755 return NOCHAR; 3022 return NOCHAR;
2756} 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;
2757 3035
2758/* rxvt_cmd_getc () - Return next input character */ 3036/* rxvt_cmd_getc () - Return next input character */
2759/* 3037/*
2760 * Return the next input character after first passing any keyboard input 3038 * Return the next input character after first passing any keyboard input
2761 * to the command. 3039 * to the command.
2762 */ 3040 */
2763unicode_t 3041wchar_t
2764rxvt_term::cmd_getc () 3042rxvt_term::cmd_getc () THROW ((class out_of_input))
2765{ 3043{
2766 unicode_t c = next_char (); 3044 wchar_t c = next_char ();
2767 3045
2768 if (c == NOCHAR) 3046 if (c == NOCHAR)
2769 throw out_of_input; 3047 throw out_of_input;
2770 3048
2771 return c; 3049 return c;
2772} 3050}
2773 3051
2774unicode_t 3052uint32_t
2775rxvt_term::cmd_get8 () 3053rxvt_term::cmd_get8 () THROW ((class out_of_input))
2776{ 3054{
2777 unicode_t c = next_octet (); 3055 uint32_t c = next_octet ();
2778 3056
2779 if (c == NOCHAR) 3057 if (c == NOCHAR)
2780 throw out_of_input; 3058 throw out_of_input;
2781 3059
2782 return c; 3060 return c;
… …
2882 case C0_ESC: 3160 case C0_ESC:
2883 process_escape_seq (); 3161 process_escape_seq ();
2884 break; 3162 break;
2885 case C0_ENQ: /* terminal Status */ 3163 case C0_ENQ: /* terminal Status */
2886 if (rs[Rs_answerbackstring]) 3164 if (rs[Rs_answerbackstring])
2887 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3165 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2888 (unsigned int)strlen (rs[Rs_answerbackstring]));
2889 else 3166 else
2890 tt_write ((unsigned char *)VT100_ANS, 3167 tt_write (VT100_ANS, strlen (VT100_ANS));
2891 (unsigned int)strlen (VT100_ANS));
2892 break; 3168 break;
2893 case C0_BEL: /* bell */ 3169 case C0_BEL: /* bell */
2894 scr_bell (); 3170 scr_bell ();
2895 break; 3171 break;
2896 case C0_BS: /* backspace */ 3172 case C0_BS: /* backspace */
… …
3020 scr_charset_set (2, (unsigned int)cmd_getc ()); 3296 scr_charset_set (2, (unsigned int)cmd_getc ());
3021 break; 3297 break;
3022 case '+': 3298 case '+':
3023 scr_charset_set (3, (unsigned int)cmd_getc ()); 3299 scr_charset_set (3, (unsigned int)cmd_getc ());
3024 break; 3300 break;
3025#if ENABLE_FRILLS 3301#if !ENABLE_MINIMAL
3026 case '6': 3302 case '6':
3027 scr_backindex (); 3303 scr_backindex ();
3028 break; 3304 break;
3029#endif 3305#endif
3030 case '7': 3306 case '7':
3031 scr_cursor (SAVE); 3307 scr_cursor (SAVE);
3032 break; 3308 break;
3033 case '8': 3309 case '8':
3034 scr_cursor (RESTORE); 3310 scr_cursor (RESTORE);
3035 break; 3311 break;
3036#if ENABLE_FRILLS 3312#if !ENABLE_MINIMAL
3037 case '9': 3313 case '9':
3038 scr_forwardindex (); 3314 scr_forwardindex ();
3039 break; 3315 break;
3040#endif 3316#endif
3041 case '=': 3317 case '=':
… …
3051 break; 3327 break;
3052 3328
3053 /* 8.3.87: NEXT LINE */ 3329 /* 8.3.87: NEXT LINE */
3054 case C1_NEL: /* ESC E */ 3330 case C1_NEL: /* ESC E */
3055 { 3331 {
3056 unicode_t nlcr[] = { C0_LF, C0_CR }; 3332 wchar_t nlcr[] = { C0_LF, C0_CR };
3057 scr_add_lines (nlcr, 1, 2); 3333 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3058 } 3334 }
3059 break; 3335 break;
3060 3336
3061 /* kidnapped escape sequence: Should be 8.3.48 */ 3337 /* kidnapped escape sequence: Should be 8.3.48 */
3062 case C1_ESA: /* ESC G */ 3338 case C1_ESA: /* ESC G */
… …
3084 process_dcs_seq (); 3360 process_dcs_seq ();
3085 break; 3361 break;
3086 3362
3087 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3363 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3088 case C1_SCI: /* ESC Z */ 3364 case C1_SCI: /* ESC Z */
3089 tt_write ((const unsigned char *)ESCZ_ANSWER, 3365 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3090 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3091 break; /* steal obsolete ESC [ c */ 3366 break; /* steal obsolete ESC [ c */
3092 3367
3093 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3368 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3094 case C1_CSI: /* ESC [ */ 3369 case C1_CSI: /* ESC [ */
3095 process_csi_seq (); 3370 process_csi_seq ();
… …
3204 ndef = get_byte_array_bit (csi_defaults, i); 3479 ndef = get_byte_array_bit (csi_defaults, i);
3205 for (p = 0; p < nargs; p++) 3480 for (p = 0; p < nargs; p++)
3206 if (arg[p] == -1) 3481 if (arg[p] == -1)
3207 arg[p] = ndef; 3482 arg[p] = ndef;
3208 3483
3209#ifdef DEBUG_CMD
3210 fprintf (stderr, "CSI ");
3211 for (p = 0; p < nargs; p++)
3212 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3213 fprintf (stderr, "%c\n", ch);
3214#endif
3215
3216 /* 3484 /*
3217 * private mode handling 3485 * private mode handling
3218 */ 3486 */
3219 if (priv) 3487 if (priv)
3220 { 3488 {
3221 switch (priv) 3489 switch (priv)
3222 { 3490 {
3223 case '>': 3491 case '>':
3224 if (ch == CSI_DA) /* secondary device attributes */ 3492 if (ch == CSI_DA) /* secondary device attributes */
3225 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 }
3226 break; 3503 break;
3227 case '?': 3504 case '?':
3228 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3505 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3229 process_terminal_mode (ch, priv, nargs, arg); 3506 process_terminal_mode (ch, priv, nargs, arg);
3230 break; 3507 break;
… …
3335 3612
3336 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3613 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3337 arg[0] = -arg[0]; 3614 arg[0] = -arg[0];
3338 /* FALLTHROUGH */ 3615 /* FALLTHROUGH */
3339 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3616 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3340 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3617 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3341 break; 3618 break;
3342 3619
3343 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3620 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3344 tt_write ((const unsigned char *)VT100_ANS, 3621 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3345 (unsigned int) (sizeof (VT100_ANS) - 1));
3346 break; 3622 break;
3347 3623
3348 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3624 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3349 process_sgr_mode (nargs, arg); 3625 process_sgr_mode (nargs, arg);
3350 break; 3626 break;
… …
3357 break; 3633 break;
3358 case 6: /* CPR requested */ 3634 case 6: /* CPR requested */
3359 scr_report_position (); 3635 scr_report_position ();
3360 break; 3636 break;
3361 case 7: /* unofficial extension */ 3637 case 7: /* unofficial extension */
3362 if (options & Opt_insecure) 3638 if (option (Opt_insecure))
3363 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3639 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3364 break; 3640 break;
3365 case 8: /* unofficial extension */ 3641 case 8: /* unofficial extension */
3366 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3642 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3367 break; 3643 break;
… …
3434 break; 3710 break;
3435 case CSI_75: 3711 case CSI_75:
3436 scr_cursor (RESTORE); 3712 scr_cursor (RESTORE);
3437 break; 3713 break;
3438 3714
3439#if ENABLE_FRILLS 3715#if !ENABLE_MINIMAL
3440 case CSI_74: 3716 case CSI_74:
3441 process_window_ops (arg, nargs); 3717 process_window_ops (arg, nargs);
3442 break; 3718 break;
3443#endif 3719#endif
3444 3720
… …
3451 break; 3727 break;
3452 } 3728 }
3453} 3729}
3454/*}}} */ 3730/*}}} */
3455 3731
3456#if ENABLE_FRILLS 3732#if !ENABLE_MINIMAL
3457/* ARGSUSED */ 3733/* ARGSUSED */
3458void 3734void
3459rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3735rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3460{ 3736{
3461 int x, y; 3737 int x, y;
3462 XWindowAttributes wattr; 3738 XWindowAttributes wattr;
3463 Window wdummy; 3739 Window wdummy;
3464 dDisp; 3740
3741 dLocal (Display *, dpy);
3465 3742
3466 if (nargs == 0) 3743 if (nargs == 0)
3467 return; 3744 return;
3468 3745
3469 switch (args[0]) 3746 switch (args[0])
3470 { 3747 {
3471 /* 3748 /*
3472 * commands 3749 * commands
3473 */ 3750 */
3474 case 1: /* deiconify window */ 3751 case 1: /* deiconify window */
3475 XMapWindow (disp, TermWin.parent[0]); 3752 XMapWindow (dpy, parent[0]);
3476 break; 3753 break;
3477 case 2: /* iconify window */ 3754 case 2: /* iconify window */
3478 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3755 XIconifyWindow (dpy, parent[0], display->screen);
3479 break; 3756 break;
3480 case 3: /* set position (pixels) */ 3757 case 3: /* set position (pixels) */
3481 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3758 XMoveWindow (dpy, parent[0], args[1], args[2]);
3482 break; 3759 break;
3483 case 4: /* set size (pixels) */ 3760 case 4: /* set size (pixels) */
3484 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3761 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3485 break; 3762 break;
3486 case 5: /* raise window */ 3763 case 5: /* raise window */
3487 XRaiseWindow (disp, TermWin.parent[0]); 3764 XRaiseWindow (dpy, parent[0]);
3488 break; 3765 break;
3489 case 6: /* lower window */ 3766 case 6: /* lower window */
3490 XLowerWindow (disp, TermWin.parent[0]); 3767 XLowerWindow (dpy, parent[0]);
3491 break; 3768 break;
3492 case 7: /* refresh window */ 3769 case 7: /* refresh window */
3493 scr_touch (true); 3770 scr_touch (true);
3494 break; 3771 break;
3495 case 8: /* set size (chars) */ 3772 case 8: /* set size (chars) */
3496 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3773 set_widthheight ((unsigned int) (args[2] * fwidth),
3497 (unsigned int) (args[1] * TermWin.fheight)); 3774 (unsigned int) (args[1] * fheight));
3498 break; 3775 break;
3499 3776
3500 //case 9: NYI, TODO, restore maximized window or maximize window 3777 //case 9: NYI, TODO, restore maximized window or maximize window
3501 default: 3778 default:
3502 if (args[0] >= 24) /* set height (chars) */ 3779 if (args[0] >= 24) /* set height (chars) */
3503 set_widthheight ((unsigned int)TermWin.width, 3780 set_widthheight ((unsigned int)width,
3504 (unsigned int) (args[1] * TermWin.fheight)); 3781 (unsigned int) (args[1] * fheight));
3505 break; 3782 break;
3506
3507 3783
3508 /* 3784 /*
3509 * reports - some output format copied from XTerm 3785 * reports - some output format copied from XTerm
3510 */ 3786 */
3511 case 11: /* report window state */ 3787 case 11: /* report window state */
3512 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3788 XGetWindowAttributes (dpy, parent[0], &wattr);
3513 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3789 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3514 break; 3790 break;
3515 case 13: /* report window position */ 3791 case 13: /* report window position */
3516 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3792 XGetWindowAttributes (dpy, parent[0], &wattr);
3517 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3793 XTranslateCoordinates (dpy, parent[0], wattr.root,
3518 -wattr.border_width, -wattr.border_width, 3794 -wattr.border_width, -wattr.border_width,
3519 &x, &y, &wdummy); 3795 &x, &y, &wdummy);
3520 tt_printf ("\033[3;%d;%dt", x, y); 3796 tt_printf ("\033[3;%d;%dt", x, y);
3521 break; 3797 break;
3522 case 14: /* report window size (pixels) */ 3798 case 14: /* report window size (pixels) */
3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3799 XGetWindowAttributes (dpy, parent[0], &wattr);
3524 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3800 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3525 break; 3801 break;
3526 case 18: /* report text area size (chars) */ 3802 case 18: /* report text area size (chars) */
3527 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3803 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3528 break; 3804 break;
3529 case 19: /* report window size (chars) */ 3805 case 19: /* report window size (chars) */
3530 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3806 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3531 break; 3807 break;
3532 case 20: /* report icon label */ 3808 case 20: /* report icon label */
3533 { 3809 {
3534 char *s; 3810 char *s;
3535 XGetIconName (disp, TermWin.parent[0], &s); 3811 XGetIconName (dpy, parent[0], &s);
3536 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 */
3537 XFree (s); 3813 XFree (s);
3538 } 3814 }
3539 break; 3815 break;
3540 case 21: /* report window title */ 3816 case 21: /* report window title */
3541 { 3817 {
3542 char *s; 3818 char *s;
3543 XFetchName (disp, TermWin.parent[0], &s); 3819 XFetchName (dpy, parent[0], &s);
3544 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 */
3545 XFree (s); 3821 XFree (s);
3546 } 3822 }
3547 break; 3823 break;
3548 } 3824 }
3549} 3825}
… …
3552/*----------------------------------------------------------------------*/ 3828/*----------------------------------------------------------------------*/
3553/* 3829/*
3554 * get input up until STRING TERMINATOR (or BEL) 3830 * get input up until STRING TERMINATOR (or BEL)
3555 * ends_how is terminator used. returned input must be free()'d 3831 * ends_how is terminator used. returned input must be free()'d
3556 */ 3832 */
3557unsigned char * 3833char *
3558rxvt_term::get_to_st (unicode_t &ends_how) 3834rxvt_term::get_to_st (unicode_t &ends_how)
3559{ 3835{
3560 unicode_t ch; 3836 unicode_t ch;
3561 bool seen_esc = false; 3837 bool seen_esc = false;
3562 unsigned int n = 0; 3838 unsigned int n = 0;
… …
3576 seen_esc = true; 3852 seen_esc = true;
3577 continue; 3853 continue;
3578 } 3854 }
3579 else if (ch == C0_BEL || ch == CHAR_ST) 3855 else if (ch == C0_BEL || ch == CHAR_ST)
3580 break; 3856 break;
3857 else if (ch == C0_SYN)
3858 ch = cmd_get8 ();
3581 else if (ch < 0x20) 3859 else if (ch < 0x20)
3582 return NULL; /* other control character - exit */ 3860 return NULL; /* other control character - exit */
3583 3861
3584 seen_esc = false; 3862 seen_esc = false;
3585 3863
3586 if (n >= sizeof (string) - 1) 3864 if (n >= STRING_MAX - 1)
3587 // stop at some sane length 3865 // stop at some sane length
3588 return NULL; 3866 return NULL;
3589 3867
3590 if (ch == C0_SYN)
3591 string[n++] = cmd_get8 ();
3592 else
3593 string[n++] = ch; 3868 string[n++] = ch;
3594 } 3869 }
3595 3870
3596 string[n++] = '\0'; 3871 string[n++] = '\0';
3597 3872
3598 ends_how = (ch == 0x5c ? C0_ESC : ch); 3873 ends_how = (ch == 0x5c ? C0_ESC : ch);
3599 3874
3600 return (unsigned char *)rxvt_wcstombs (string); 3875 return rxvt_wcstombs (string);
3601} 3876}
3602 3877
3603/*----------------------------------------------------------------------*/ 3878/*----------------------------------------------------------------------*/
3604/* 3879/*
3605 * 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)'
3606 */ 3881 */
3607void 3882void
3608rxvt_term::process_dcs_seq () 3883rxvt_term::process_dcs_seq ()
3609{ 3884{
3610 unsigned char *s; 3885 char *s;
3611 unicode_t eh; 3886 unicode_t eh;
3612 3887
3613 /* 3888 /*
3614 * Not handled yet 3889 * Not handled yet
3615 */ 3890 */
… …
3634 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3909 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3635 arg = arg * 10 + (ch - '0'); 3910 arg = arg * 10 + (ch - '0');
3636 3911
3637 if (ch == ';') 3912 if (ch == ';')
3638 { 3913 {
3639 unsigned char *s = get_to_st (eh); 3914 char *s = get_to_st (eh);
3640 3915
3641 if (s) 3916 if (s)
3642 { 3917 {
3643 process_xterm_seq (arg, (char *)s, eh); 3918 process_xterm_seq (arg, s, eh);
3644 free (s); 3919 free (s);
3645 } 3920 }
3646 } 3921 }
3647} 3922}
3648 3923
3649void 3924void
3650rxvt_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)
3651{ 3926{
3652 if (str[0] == '?' && !str[1]) 3927 if (str[0] == '?' && !str[1])
3653 { 3928 {
3654 unsigned short r, g, b; 3929 rgba c;
3655 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
3656 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);
3657 } 3938 }
3658 else 3939 else
3659 set_window_color (color, str); 3940 set_window_color (color, str);
3660} 3941}
3661 3942
3662/* 3943/*
3663 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3944 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3664 * 0 = change iconName/title
3665 * 1 = change iconName
3666 * 2 = change title
3667 * 4 = change color
3668 * 10 = change fg color
3669 * 11 = change bg color
3670 * 12 = change text color
3671 * 13 = change mouse foreground color
3672 * 17 = change highlight character colour
3673 * 18 = change bold character color
3674 * 19 = change underlined character color
3675 * 46 = change logfile (not implemented)
3676 * 50 = change font
3677 *
3678 * rxvt extensions:
3679 * 20 = bg pixmap
3680 * 39 = change default fg color
3681 * 49 = change default bg color
3682 * 55 = dump scrollback buffer and all of screen
3683 * 701 = change locale
3684 * 702 = find font
3685 * 703 = menu
3686 */ 3945 */
3687void 3946void
3688rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3947rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3689{ 3948{
3690 int changed = 0;
3691 int color; 3949 int color;
3692 char *buf, *name; 3950 char *buf, *name;
3693 bool query = str[0] == '?' && !str[1]; 3951 bool query = str[0] == '?' && !str[1];
3694 int saveop = op; 3952 int saveop = op;
3695 dDisp; 3953
3954 dLocal (Display *, dpy);
3696 3955
3697 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
3698 switch (op) 3961 switch (op)
3699 { 3962 {
3700 case XTerm_name: 3963 case XTerm_name:
3701 set_title (str); 3964 set_title (str);
3702 /* FALLTHROUGH */ 3965 /* FALLTHROUGH */
… …
3716 unsigned long bytes_after; 3979 unsigned long bytes_after;
3717 unsigned char *value = 0; 3980 unsigned char *value = 0;
3718 const char *str = ""; 3981 const char *str = "";
3719 3982
3720 if (prop 3983 if (prop
3721 && XGetWindowProperty (disp, TermWin.parent[0], 3984 && XGetWindowProperty (dpy, parent[0],
3722 prop, 0, 1<<16, 0, AnyPropertyType, 3985 prop, 0, 1<<16, 0, AnyPropertyType,
3723 &actual_type, &actual_format, 3986 &actual_type, &actual_format,
3724 &nitems, &bytes_after, &value) == Success 3987 &nitems, &bytes_after, &value) == Success
3725 && actual_type != None 3988 && actual_type != None
3726 && actual_format == 8) 3989 && actual_format == 8)
3727 str = (const char *)(value); 3990 str = (const char *)(value);
3728 3991
3729 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3992 tt_printf ("\033]%d;%s%c", op, str, resp);
3730 3993
3731 XFree (value); 3994 XFree (value);
3732 } 3995 }
3733 else 3996 else
3734 { 3997 {
… …
3738 { 4001 {
3739 *eq = 0; 4002 *eq = 0;
3740 set_utf8_property (display->atom (str), eq + 1); 4003 set_utf8_property (display->atom (str), eq + 1);
3741 } 4004 }
3742 else 4005 else
3743 XDeleteProperty (disp, TermWin.parent[0], 4006 XDeleteProperty (dpy, parent[0],
3744 display->atom (str)); 4007 display->atom (str));
3745 } 4008 }
3746 break; 4009 break;
3747 4010
3748 case XTerm_Color: 4011 case XTerm_Color:
… …
3750 { 4013 {
3751 if ((name = strchr (buf, ';')) == NULL) 4014 if ((name = strchr (buf, ';')) == NULL)
3752 break; 4015 break;
3753 4016
3754 *name++ = '\0'; 4017 *name++ = '\0';
3755 color = atoi (buf); 4018 color = atoi (buf) + minCOLOR;
3756 4019
3757 if (color < 0 || color >= TOTAL_COLORS) 4020 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3758 break; 4021 break;
3759 4022
3760 if ((buf = strchr (name, ';')) != NULL) 4023 if ((buf = strchr (name, ';')) != NULL)
3761 *buf++ = '\0'; 4024 *buf++ = '\0';
3762 4025
3763 if (name[0] == '?' && !name[1]) 4026 process_color_seq (op, color, name, resp);
3764 {
3765 unsigned short r, g, b;
3766 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3767 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3768 }
3769 else
3770 set_window_color (color + minCOLOR, name);
3771 } 4027 }
3772 break; 4028 break;
3773 case XTerm_Color00: 4029 case XTerm_Color00:
3774 process_color_seq (XTerm_Color00, Color_fg, str, resp); 4030 process_color_seq (op, Color_fg, str, resp);
3775 break; 4031 break;
3776 case XTerm_Color01: 4032 case XTerm_Color01:
3777 process_color_seq (XTerm_Color00, Color_bg, str, resp); 4033 process_color_seq (op, Color_bg, str, resp);
3778 break; 4034 break;
3779#ifndef NO_CURSORCOLOR 4035#ifndef NO_CURSORCOLOR
3780 case XTerm_Color_cursor: 4036 case XTerm_Color_cursor:
3781 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 4037 process_color_seq (op, Color_cursor, str, resp);
3782 break; 4038 break;
3783#endif 4039#endif
3784 case XTerm_Color_pointer_fg: 4040 case XTerm_Color_pointer_fg:
3785 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 4041 process_color_seq (op, Color_pointer_fg, str, resp);
3786 break; 4042 break;
3787 case XTerm_Color_pointer_bg: 4043 case XTerm_Color_pointer_bg:
3788 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 4044 process_color_seq (op, Color_pointer_bg, str, resp);
3789 break; 4045 break;
3790#ifndef NO_BOLD_UNDERLINE_REVERSE 4046#ifndef NO_BOLD_UNDERLINE_REVERSE
3791 case XTerm_Color_BD:
3792 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3793 break;
3794 case XTerm_Color_IT:
3795 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3796 break;
3797 case XTerm_Color_UL:
3798 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3799 break;
3800 case XTerm_Color_RV: 4047 case XTerm_Color_RV:
3801 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);
4057 break;
4058 case URxvt_Color_IT:
4059 process_color_seq (op, Color_IT, str, resp);
3802 break; 4060 break;
3803#endif 4061#endif
3804#if TRANSPARENT && TINTING 4062#if TRANSPARENT && TINTING
3805 case XTerm_Color_tint: 4063 case URxvt_Color_tint:
3806 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 4064 process_color_seq (op, Color_tint, str, resp);
4065
3807 check_our_parents (); 4066 check_our_parents ();
4067
3808 if (am_transparent) 4068 if (am_transparent)
3809 want_full_refresh = want_refresh = 1; 4069 want_full_refresh = want_refresh = 1;
3810 break;
3811#endif
3812 4070
4071 break;
4072#endif
4073
3813 case XTerm_Pixmap: 4074 case Rxvt_Pixmap:
4075 {
3814 if (*str != ';') 4076 if (*str != ';')
3815 { 4077 {
3816#if XPM_BACKGROUND 4078#if XPM_BACKGROUND
3817 scale_pixmap (""); /* reset to default scaling */ 4079 scale_pixmap (""); /* reset to default scaling */
3818 set_bgPixmap (str); /* change pixmap */ 4080 set_bgPixmap (str); /* change pixmap */
3819#endif
3820 scr_touch (true); 4081 scr_touch (true);
4082#endif
3821 } 4083 }
4084
4085 int changed = 0;
4086
3822 while ((str = strchr (str, ';')) != NULL) 4087 while ((str = strchr (str, ';')) != NULL)
3823 { 4088 {
3824 str++; 4089 str++;
3825#if XPM_BACKGROUND 4090#if XPM_BACKGROUND
3826 changed += scale_pixmap (str); 4091 changed += scale_pixmap (str);
3827#endif 4092#endif
3828 } 4093 }
3829 4094
3830 if (changed) 4095 if (changed)
3831 { 4096 {
3832#ifdef XPM_BACKGROUND 4097#ifdef XPM_BACKGROUND
3833 resize_pixmap (); 4098 resize_pixmap ();
3834#endif
3835 scr_touch (true); 4099 scr_touch (true);
4100#endif
3836 } 4101 }
4102#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
4103 if (option(Opt_transparent))
4104 check_our_parents ();
4105#endif
4106
4107 }
3837 break; 4108 break;
3838 4109
3839 case XTerm_restoreFG: 4110 case Rxvt_restoreFG:
3840 set_window_color (Color_fg, str); 4111 set_window_color (Color_fg, str);
3841 break; 4112 break;
3842 case XTerm_restoreBG: 4113 case Rxvt_restoreBG:
3843 set_window_color (Color_bg, str); 4114 set_window_color (Color_bg, str);
3844 break; 4115 break;
3845 4116
3846 case XTerm_logfile: 4117 case XTerm_logfile:
3847 // TODO, when secure mode? 4118 // TODO, when secure mode?
3848 break; 4119 break;
3849 4120
4121#if 0
4122 case Rxvt_dumpscreen: /* no error notices */
4123 {
4124 int fd;
4125 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
4126 {
4127 scr_dump (fd);
4128 close (fd);
4129 }
4130 }
4131 break;
4132#endif
3850 case XTerm_font: 4133 case XTerm_font:
3851 op = URxvt_font; 4134 op = URxvt_font;
3852 case URxvt_font: 4135 case URxvt_font:
3853#if ENABLE_STYLES 4136#if ENABLE_STYLES
3854 case URxvt_boldFont: 4137 case URxvt_boldFont:
3855 case URxvt_italicFont: 4138 case URxvt_italicFont:
3856 case URxvt_boldItalicFont: 4139 case URxvt_boldItalicFont:
3857#endif 4140#endif
3858 if (query) 4141 if (query)
3859 tt_printf ("\33]%d;%-.250s%c", saveop, 4142 tt_printf ("\33]%d;%-.250s%c", saveop,
3860 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 4143 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3861 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 4144 ? fontset[op - URxvt_font]->fontdesc : "",
3862 resp); 4145 resp);
3863 else 4146 else
3864 { 4147 {
3865 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4148 const char *&res = rs[Rs_font + (op - URxvt_font)];
3866 4149
… …
3868 allocated.push_back ((void *)res); 4151 allocated.push_back ((void *)res);
3869 set_fonts (); 4152 set_fonts ();
3870 } 4153 }
3871 break; 4154 break;
3872 4155
3873#if ENABLE_FRILLS 4156 case URxvt_version:
3874 case XTerm_locale:
3875 if (query) 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
4165 case URxvt_locale:
4166 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 4167 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3877 else 4168 else
3878 { 4169 {
3879 set_locale (str); 4170 set_locale (str);
3880 pty.set_utf8_mode (enc_utf8); 4171 pty->set_utf8_mode (enc_utf8);
3881# ifdef USE_XIM
3882 im_cb (); 4172 init_xlocale ();
3883# endif
3884 } 4173 }
3885 break; 4174 break;
3886#endif
3887 4175
3888#ifdef MENUBAR 4176 case URxvt_view_up:
3889 case XTerm_Menu: 4177 case URxvt_view_down:
3890 if (options & Opt_insecure) 4178 {
3891 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 4179 int lines = atoi (str);
4180
4181 if (lines)
4182 scr_page (op == URxvt_view_up ? UP : DN, lines);
4183 else
4184 scr_erase_savelines ();
4185 }
4186
3892 break; 4187 break;
3893#endif 4188#endif
3894#if 0 4189
3895 case XTerm_dumpscreen: /* no error notices */ 4190#if ENABLE_PERL
3896 { 4191 case URxvt_perl:
3897 int fd; 4192 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3898 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4193 ; // no responses yet
3899 {
3900 scr_dump (fd);
3901 close (fd);
3902 }
3903 }
3904 break; 4194 break;
3905#endif 4195#endif
3906 } 4196 }
3907} 4197}
3908/*----------------------------------------------------------------------*/ 4198/*----------------------------------------------------------------------*/
… …
3939 return state; 4229 return state;
3940} 4230}
3941 4231
3942/* we're not using priv _yet_ */ 4232/* we're not using priv _yet_ */
3943void 4233void
3944rxvt_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)
3945{ 4235{
3946 unsigned int i, j; 4236 unsigned int i, j;
3947 int state; 4237 int state;
3948 4238
3949 static const struct 4239 static const struct
… …
3960 { 5, PrivMode_rVideo }, 4250 { 5, PrivMode_rVideo },
3961 { 6, PrivMode_relOrigin }, 4251 { 6, PrivMode_relOrigin },
3962 { 7, PrivMode_Autowrap }, 4252 { 7, PrivMode_Autowrap },
3963 // 8, bi-directional support mode 4253 // 8, bi-directional support mode
3964 { 9, PrivMode_MouseX10 }, 4254 { 9, PrivMode_MouseX10 },
3965#ifdef menuBar_esc
3966 { menuBar_esc, PrivMode_menuBar },
3967#endif
3968 // 18, 19 printing-related 4255 // 18, 19 printing-related
3969 { 25, PrivMode_VisibleCursor }, 4256 { 25, PrivMode_VisibleCursor },
3970#ifdef scrollBar_esc 4257#ifdef scrollBar_esc
3971 { scrollBar_esc, PrivMode_scrollBar }, 4258 { scrollBar_esc, PrivMode_scrollBar },
3972#endif 4259#endif
… …
4017 } 4304 }
4018 4305
4019 /* extra handling for values with state unkept */ 4306 /* extra handling for values with state unkept */
4020 switch (arg[i]) 4307 switch (arg[i])
4021 { 4308 {
4309#if ENABLE_STYLES
4310 case 1021:
4311 set_option (Opt_intensityStyles, mode);
4312
4313 scr_touch (true);
4314 break;
4315#endif
4022 case 1048: /* alternative cursor save */ 4316 case 1048: /* alternative cursor save */
4023 case 1049: 4317 case 1049:
4024 if (options & Opt_secondaryScreen) 4318 if (option (Opt_secondaryScreen))
4025 if (mode == 0) 4319 if (mode == 0)
4026 scr_cursor (RESTORE); 4320 scr_cursor (RESTORE);
4027 else if (mode == 1) 4321 else if (mode == 1)
4028 scr_cursor (SAVE); 4322 scr_cursor (SAVE);
4029 break; 4323 break;
… …
4041 */ 4335 */
4042 PrivMode (1, PrivMode_vt52); 4336 PrivMode (1, PrivMode_vt52);
4043 break; 4337 break;
4044 case 3: /* 80/132 */ 4338 case 3: /* 80/132 */
4045 if (priv_modes & PrivMode_132OK) 4339 if (priv_modes & PrivMode_132OK)
4046 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4340 set_widthheight (((state ? 132 : 80) * fwidth), height);
4047 break; 4341 break;
4048 case 4: /* smooth scrolling */ 4342 case 4: /* smooth scrolling */
4049 if (state)
4050 options &= ~Opt_jumpScroll;
4051 else
4052 options |= Opt_jumpScroll; 4343 set_option (Opt_jumpScroll, !state);
4053 break; 4344 break;
4054 case 5: /* reverse video */ 4345 case 5: /* reverse video */
4055 scr_rvideo_mode (state); 4346 scr_rvideo_mode (state);
4056 break; 4347 break;
4057 case 6: /* relative/absolute origins */ 4348 case 6: /* relative/absolute origins */
… …
4063 /* 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 */
4064 case 9: /* X10 mouse reporting */ 4355 case 9: /* X10 mouse reporting */
4065 if (state) /* orthogonal */ 4356 if (state) /* orthogonal */
4066 priv_modes &= ~PrivMode_MouseX11; 4357 priv_modes &= ~PrivMode_MouseX11;
4067 break; 4358 break;
4068#ifdef menuBar_esc
4069 case menuBar_esc:
4070#ifdef MENUBAR
4071 map_menuBar (state);
4072#endif
4073 break;
4074#endif
4075#ifdef scrollBar_esc 4359#ifdef scrollBar_esc
4076 case scrollBar_esc: 4360 case scrollBar_esc:
4077 if (scrollbar_mapping (state)) 4361 if (scrollbar_mapping (state))
4078 { 4362 {
4079 resize_all_windows (0, 0, 0); 4363 resize_all_windows (0, 0, 0);
… …
4098#if 0 4382#if 0
4099 case 1001: 4383 case 1001:
4100 break; /* X11 mouse highlighting */ 4384 break; /* X11 mouse highlighting */
4101#endif 4385#endif
4102 case 1010: /* scroll to bottom on TTY output inhibit */ 4386 case 1010: /* scroll to bottom on TTY output inhibit */
4103 if (state)
4104 options &= ~Opt_scrollTtyOutput;
4105 else
4106 options |= Opt_scrollTtyOutput; 4387 set_option (Opt_scrollTtyOutput, !state);
4107 break; 4388 break;
4108 case 1011: /* scroll to bottom on key press */ 4389 case 1011: /* scroll to bottom on key press */
4109 if (state)
4110 options |= Opt_scrollTtyKeypress; 4390 set_option (Opt_scrollTtyKeypress, state);
4111 else
4112 options &= ~Opt_scrollTtyKeypress;
4113 break; 4391 break;
4114 case 1047: /* secondary screen w/ clearing last */ 4392 case 1047: /* secondary screen w/ clearing last */
4115 if (options & Opt_secondaryScreen) 4393 if (option (Opt_secondaryScreen))
4116 if (current_screen != PRIMARY) 4394 if (current_screen != PRIMARY)
4117 scr_erase_screen (2); 4395 scr_erase_screen (2);
4118 scr_change_screen (state); 4396 scr_change_screen (state);
4119 break; 4397 break;
4120 case 1049: /* secondary screen w/ clearing first */ 4398 case 1049: /* secondary screen w/ clearing first */
4121 scr_change_screen (state); 4399 scr_change_screen (state);
4122 if (options & Opt_secondaryScreen) 4400 if (option (Opt_secondaryScreen))
4123 if (current_screen != PRIMARY) 4401 if (current_screen != PRIMARY)
4124 scr_erase_screen (2); 4402 scr_erase_screen (2);
4125 break; 4403 break;
4126 default: 4404 default:
4127 break; 4405 break;
… …
4255 scr_color (Color_bg, Color_bg); 4533 scr_color (Color_bg, Color_bg);
4256 break; 4534 break;
4257 4535
4258 //case 50: // not variable spacing 4536 //case 50: // not variable spacing
4259 4537
4260#ifndef NO_BRIGHTCOLOR 4538#if !ENABLE_MINIMAL
4261 case 90: 4539 case 90:
4262 case 91: /* set bright fg color */ 4540 case 91: /* set bright fg color */
4263 case 92: 4541 case 92:
4264 case 93: 4542 case 93:
4265 case 94: 4543 case 94:
… …
4277 case 106: 4555 case 106:
4278 case 107: 4556 case 107:
4279 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4557 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4280 break; 4558 break;
4281#endif 4559#endif
4282
4283 } 4560 }
4284 } 4561 }
4285} 4562}
4286/*}}} */ 4563/*}}} */
4287 4564
… …
4311 */ 4588 */
4312void 4589void
4313rxvt_term::tt_printf (const char *fmt,...) 4590rxvt_term::tt_printf (const char *fmt,...)
4314{ 4591{
4315 va_list arg_ptr; 4592 va_list arg_ptr;
4316 unsigned char buf[256]; 4593 char buf[256];
4317 4594
4318 va_start (arg_ptr, fmt); 4595 va_start (arg_ptr, fmt);
4319 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4596 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4320 va_end (arg_ptr); 4597 va_end (arg_ptr);
4321 tt_write (buf, strlen (buf)); 4598 tt_write (buf, strlen (buf));
… …
4326 * or generated by us in response to a query ESC sequence. 4603 * or generated by us in response to a query ESC sequence.
4327 */ 4604 */
4328const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4605const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4329 4606
4330void 4607void
4331rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4608rxvt_term::tt_write (const char *data, unsigned int len)
4332{ 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
4333 if (v_buflen == 0) 4616 if (v_buflen == 0)
4334 { 4617 {
4335 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));
4336 4619
4337 if ((unsigned int)written == len) 4620 if ((unsigned int)written == len)
4338 return; 4621 return;
4339 4622
4340 data += written; 4623 data += written;
4341 len -= written; 4624 len -= written;
4342 } 4625 }
4343 4626
4344 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4627 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4345 4628
4346 memcpy (v_buffer + v_buflen, data, len); 4629 memcpy (v_buffer + v_buflen, data, len);
4347 v_buflen += len; 4630 v_buflen += len;
4348 4631
4349 pty_ev.set (EVENT_READ | EVENT_WRITE); 4632 pty_ev.set (EVENT_READ | EVENT_WRITE);
4350} 4633}
4351 4634
4352void rxvt_term::pty_write () 4635void rxvt_term::pty_write ()
4353{ 4636{
4354 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));
4355 4638
4356 if (written > 0) 4639 if (written > 0)
4357 { 4640 {
4358 v_buflen -= written; 4641 v_buflen -= written;
4359 4642
… …
4368 } 4651 }
4369 4652
4370 memmove (v_buffer, v_buffer + written, v_buflen); 4653 memmove (v_buffer, v_buffer + written, v_buflen);
4371 } 4654 }
4372 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4655 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4373 // original code just ignores this... 4656 pty_ev.set (EVENT_READ);
4374 destroy ();
4375} 4657}
4376 4658
4377/*----------------------- end-of-file (C source) -----------------------*/ 4659/*----------------------- end-of-file (C source) -----------------------*/
4378 4660

Diff Legend

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