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.197 by root, Thu Feb 17 15:07:48 2005 UTC vs.
Revision 1.334 by ayin, Tue Jun 26 13:05:05 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 {
… …
492 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
493 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
494# endif 538# endif
495 } 539 }
496#endif 540#endif
497 541
498#ifdef PRINTPIPE 542#ifdef PRINTPIPE
499 if (keysym == XK_Print) 543 if (keysym == XK_Print)
500 { 544 {
501 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
502 return; 546 return;
… …
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;
… …
924void 1035void
925rxvt_term::flush () 1036rxvt_term::flush ()
926{ 1037{
927 flush_ev.stop (); 1038 flush_ev.stop ();
928 1039
929#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
930 if (want_full_refresh) 1041 if (want_full_refresh)
931 { 1042 {
932 want_full_refresh = 0; 1043 want_full_refresh = 0;
933 scr_clear (); 1044 scr_clear ();
934 scr_touch (false); 1045 scr_touch (false);
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;
969 refresh_count = 0; 1115 refresh_count = 0;
970 flush (); 1116 flush ();
971} 1117}
972 1118
973#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
… …
975rxvt_term::cursor_blink_cb (time_watcher &w) 1121rxvt_term::cursor_blink_cb (time_watcher &w)
976{ 1122{
977 hidden_cursor = !hidden_cursor; 1123 hidden_cursor = !hidden_cursor;
978 want_refresh = 1; 1124 want_refresh = 1;
979 1125
980 w.start (w.at + BLINK_INTERVAL); 1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
981} 1127}
982#endif 1128#endif
983 1129
984#ifdef TEXT_BLINK 1130#ifdef TEXT_BLINK
985void 1131void
… …
999rxvt_term::cont_scroll_cb (time_watcher &w) 1145rxvt_term::cont_scroll_cb (time_watcher &w)
1000{ 1146{
1001 if ((scrollbar_isUp() || scrollbar_isDn()) && 1147 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1002 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1148 scr_page (scrollbar_isUp() ? UP : DN, 1))
1003 { 1149 {
1004 refresh_type |= SMOOTH_REFRESH;
1005 want_refresh = 1; 1150 want_refresh = 1;
1006 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1007 } 1152 }
1008} 1153}
1009#endif 1154#endif
… …
1013rxvt_term::sel_scroll_cb (time_watcher &w) 1158rxvt_term::sel_scroll_cb (time_watcher &w)
1014{ 1159{
1015 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1160 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1016 { 1161 {
1017 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1162 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1018 refresh_type |= SMOOTH_REFRESH;
1019 want_refresh = 1; 1163 want_refresh = 1;
1020 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1021 } 1165 }
1022} 1166}
1023#endif 1167#endif
… …
1028{ 1172{
1029 if (mouse_slip_wheel_speed == 0 1173 if (mouse_slip_wheel_speed == 0
1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1031 : scr_page (UP, mouse_slip_wheel_speed)) 1175 : scr_page (UP, mouse_slip_wheel_speed))
1032 { 1176 {
1033 if (TermWin.view_start == TermWin.nscrolled || 1177 if (view_start == top_row || view_start == 0)
1034 TermWin.view_start == 0)
1035 mouse_slip_wheel_speed = 0; 1178 mouse_slip_wheel_speed = 0;
1036 1179
1037 refresh_type |= SMOOTH_REFRESH;
1038 want_refresh = 1; 1180 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1040 } 1182 }
1041} 1183}
1042#endif 1184#endif
1043 1185
1186#if LINUX_YIELD_HACK
1187static struct event_handler
1188{
1189 check_watcher yield_ev;
1190
1191 void yield_cb (check_watcher &w)
1192 {
1193 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS.
1197
1198 struct timespec ts = { 0, 0 };
1199 nanosleep (&ts, 0);
1200
1201 w.stop ();
1202 }
1203
1204 event_handler ()
1205 : yield_ev (this, &event_handler::yield_cb)
1206 {
1207 }
1208} event_handler;
1209#endif
1210
1044bool 1211bool
1045rxvt_term::pty_fill () 1212rxvt_term::pty_fill ()
1046{ 1213{
1047 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1214 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1048 1215
1049 if (CBUFSIZ == n) 1216 if (CBUFSIZ == n)
1050 { 1217 {
1051 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1218 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1052 n = 0; 1219 n = 0;
1053 } 1220 }
1054 1221
1055 memmove (cmdbuf_base, cmdbuf_ptr, n); 1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
1056 cmdbuf_ptr = cmdbuf_base; 1223 cmdbuf_ptr = cmdbuf_base;
1057 cmdbuf_endp = cmdbuf_ptr + n; 1224 cmdbuf_endp = cmdbuf_ptr + n;
1058 1225
1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1060 1227
1061 if (n > 0) 1228 if (r > 0)
1062 { 1229 {
1063 cmdbuf_endp += n; 1230 cmdbuf_endp += r;
1064 return true; 1231 return true;
1065 } 1232 }
1066 else if (n < 0 && errno != EAGAIN) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1234 {
1235#if LINUX_YIELD_HACK
1236 if (display->is_local)
1237 event_handler.yield_ev.start ();
1238#endif
1239 }
1240 else
1241 {
1242 pty_ev.stop ();
1243
1244 if (!option (Opt_hold))
1067 destroy (); 1245 destroy ();
1068 1246 }
1247
1069 return false; 1248 return false;
1070} 1249}
1071 1250
1072void 1251void
1073rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
1074{ 1253{
1075 SET_R (this); 1254 make_current ();
1076 SET_LOCALE (locale);
1077 1255
1078 if (revents & EVENT_READ) 1256 if (revents & EVENT_READ)
1079 // loop, but don't allow a single term to monopolize us 1257 // loop, but don't allow a single term to monopolize us
1080 while (pty_fill ()) 1258 while (pty_fill ())
1081 if (cmd_parse ()) 1259 if (cmd_parse ())
… …
1086} 1264}
1087 1265
1088void 1266void
1089rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1090{ 1268{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1092 recolour_cursor (); 1270 recolour_cursor ();
1093 1271
1094#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1273 hidden_pointer = 0;
1096 1274
1097 if (options & Opt_pointerBlank) 1275 if (option (Opt_pointerBlank))
1098 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1099#endif 1277#endif
1100} 1278}
1101 1279
1102#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1103void 1281void
1104rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1105{ 1283{
1106 if (! (options & Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1107 return; 1285 return;
1108 1286
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1110 XFlush (display->display); 1288 XFlush (dpy);
1111 1289
1112 hidden_pointer = 1; 1290 hidden_pointer = 1;
1113} 1291}
1114 1292
1115void 1293void
1116rxvt_term::pointer_cb (time_watcher &w) 1294rxvt_term::pointer_cb (time_watcher &w)
1117{ 1295{
1118 SET_R (this); 1296 make_current ();
1119 SET_LOCALE (locale);
1120 1297
1121 pointer_blank (); 1298 pointer_blank ();
1122} 1299}
1123#endif 1300#endif
1124 1301
… …
1189 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
1190 (32 + x + 1), 1367 (32 + x + 1),
1191 (32 + y + 1)); 1368 (32 + y + 1));
1192} 1369}
1193 1370
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 */ 1371/*{{{ process an X event */
1205void 1372void
1206rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1207{ 1374{
1208 dDisp; 1375 make_current ();
1209 1376
1210 SET_R (this); 1377 dLocal (Display *, dpy);
1211 SET_LOCALE (locale);
1212 1378
1213#if defined(CURSOR_BLINK) 1379 if (ev.xany.window == vt
1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1215 { 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1216 if (hidden_cursor) 1382 return;
1217 {
1218 hidden_cursor = 0;
1219 want_refresh = 1;
1220 }
1221 1383
1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1384 // 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; 1385 Window unused_root, unused_child;
1241 int unused_root_x, unused_root_y; 1386 int unused_root_x, unused_root_y;
1242 unsigned int unused_mask; 1387 unsigned int unused_mask;
1243 1388
1244 switch (ev.type) 1389 switch (ev.type)
1245 { 1390 {
1246 case KeyPress: 1391 case KeyPress:
1247#if ISO_14755 1392 key_press (ev.xkey);
1248 if (!(iso14755buf & ISO_14755_52))
1249#endif
1250 lookup_key (ev.xkey);
1251
1252 break; 1393 break;
1253 1394
1254 case KeyRelease: 1395 case KeyRelease:
1255 { 1396 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; 1397 break;
1323 }
1324 1398
1325 case ButtonPress: 1399 case ButtonPress:
1326 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1327 break; 1401 break;
1328 1402
… …
1330 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1331 break; 1405 break;
1332 1406
1333 case ClientMessage: 1407 case ClientMessage:
1334 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1335 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1409 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1336 destroy ();
1337#ifdef OFFIX_DND
1338 /* OffiX Dnd (drag 'n' drop) protocol */
1339 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1340 && (ev.xclient.data.l[0] == DndFile
1341 || ev.xclient.data.l[0] == DndDir
1342 || ev.xclient.data.l[0] == DndLink))
1343 { 1410 {
1344 /* Get Dnd data */ 1411 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1345 Atom ActualType; 1412 {
1346 int ActualFormat; 1413 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1347 unsigned char *data; 1414 {
1348 unsigned long Size, RemainingBytes; 1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1349 1416 {
1350 XGetWindowProperty (disp, display->root, 1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1351 xa[XA_DNDSELECTION], 1418 destroy ();
1352 0L, 1000000L, 1419 }
1353 False, AnyPropertyType, 1420#if ENABLE_EWMH
1354 &ActualType, &ActualFormat, 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1355 &Size, &RemainingBytes, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1356 &data); 1424 &ev);
1357 set_string_property (XA_CUT_BUFFER0, data); 1425#endif
1358 XFree (data); 1426 }
1359 selection_paste (display->root, XA_CUT_BUFFER0, true); 1427 }
1360 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime); 1428#if ENABLE_XEMBED
1429 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1430 {
1431 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432 focus_in ();
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out ();
1435 }
1436#endif
1361 } 1437 }
1362#endif /* OFFIX_DND */
1363 break; 1438 break;
1364 1439
1365 case MappingNotify: 1440 case MappingNotify:
1366 XRefreshKeyboardMapping (&ev.xmapping); 1441 XRefreshKeyboardMapping (&ev.xmapping);
1367 break; 1442 break;
… …
1390 break; 1465 break;
1391 } 1466 }
1392 break; 1467 break;
1393 1468
1394 case FocusIn: 1469 case FocusIn:
1395 if (!TermWin.focus) 1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1473 focus_in ();
1474 break;
1475
1476 case FocusOut:
1477 if (ev.xfocus.detail != NotifyInferior
1478 && ev.xfocus.detail != NotifyPointer
1479 && ev.xfocus.mode != NotifyGrab)
1480 focus_out ();
1481 break;
1482
1483 case ConfigureNotify:
1484 if (ev.xconfigure.window == parent[0])
1396 { 1485 {
1397 TermWin.focus = 1;
1398 want_refresh = 1;
1399#ifdef USE_XIM
1400 if (Input_Context != NULL)
1401 {
1402 IMSetStatusPosition ();
1403 XSetICFocus (Input_Context);
1404 }
1405#endif
1406#ifdef CURSOR_BLINK
1407 if (options & Opt_cursorBlink)
1408 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1409#endif
1410#ifdef OFF_FOCUS_FADING
1411 if (rs[Rs_fade])
1412 {
1413 pix_colors = pix_colors_focused;
1414 scr_recolour ();
1415 }
1416#endif
1417
1418 }
1419 break;
1420
1421 case FocusOut:
1422 if (TermWin.focus)
1423 {
1424 TermWin.focus = 0;
1425 want_refresh = 1;
1426
1427#if ENABLE_FRILLS || ISO_14755
1428 iso14755buf = 0;
1429#endif
1430#if ENABLE_OVERLAY
1431 scr_overlay_off ();
1432#endif
1433#ifdef USE_XIM
1434 if (Input_Context != NULL)
1435 XUnsetICFocus (Input_Context);
1436#endif
1437#ifdef CURSOR_BLINK
1438 if (options & Opt_cursorBlink)
1439 cursor_blink_ev.stop ();
1440 hidden_cursor = 0;
1441#endif
1442#ifdef OFF_FOCUS_FADING
1443 if (rs[Rs_fade])
1444 {
1445 pix_colors = pix_colors_unfocused;
1446 scr_recolour ();
1447 }
1448#endif
1449 }
1450 break;
1451
1452 case ConfigureNotify:
1453 if (ev.xconfigure.window == TermWin.parent[0])
1454 {
1455 int height, width;
1456
1457 do
1458 { /* Wrap lots of configures into one */
1459 width = ev.xconfigure.width;
1460 height = ev.xconfigure.height;
1461 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1462 }
1463 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1486 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1487 ;
1464 1488
1465 if (szHint.width != width || szHint.height != height) 1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1490 {
1467 seen_resize = 1; 1491 seen_resize = 1;
1468 resize_all_windows (width, height, 1); 1492 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1493#ifdef XPM_BACKGROUND
1494 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1495 {
1496 resize_pixmap ();
1497 scr_touch (true);
1498 }
1499#endif
1469 } 1500 }
1470 1501
1471#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1502 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1503
1504#ifdef ENABLE_TRANSPARENCY
1472 if (options & Opt_transparent) 1505 if (option (Opt_transparent))
1473 check_our_parents (); 1506 check_our_parents ();
1474#endif 1507#endif
1475 } 1508 }
1476 break; 1509 break;
1477 1510
1478 case PropertyNotify: 1511 case PropertyNotify:
1512 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1479 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1513 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1480 && ev.xproperty.state == PropertyNewValue) 1514 && ev.xproperty.state == PropertyNewValue)
1481 selection_property (ev.xproperty.window, ev.xproperty.atom); 1515 selection_property (ev.xproperty.window, ev.xproperty.atom);
1482 1516
1483 break; 1517 break;
1484 1518
1485 case SelectionClear: 1519 case SelectionClear:
1486 selection_clear (); 1520 selection_clear ();
… …
1493 1527
1494 case SelectionRequest: 1528 case SelectionRequest:
1495 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1496 break; 1530 break;
1497 1531
1532 case MapNotify:
1533 mapped = 1;
1534#ifdef TEXT_BLINK
1535 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1536#endif
1537 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 break;
1539
1498 case UnmapNotify: 1540 case UnmapNotify:
1499 TermWin.mapped = 0; 1541 mapped = 0;
1500#ifdef TEXT_BLINK 1542#ifdef TEXT_BLINK
1501 text_blink_ev.stop (); 1543 text_blink_ev.stop ();
1502#endif 1544#endif
1545 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1503 break; 1546 break;
1504 1547
1505 case MapNotify:
1506 TermWin.mapped = 1;
1507#ifdef TEXT_BLINK
1508 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1509#endif
1510 break;
1511
1512#ifdef TRANSPARENT 1548#ifdef ENABLE_TRANSPARENCY
1513 case ReparentNotify: 1549 case ReparentNotify:
1514 rootwin_cb (ev); 1550 rootwin_cb (ev);
1515 break; 1551 break;
1516#endif /* TRANSPARENT */ 1552#endif /* ENABLE_TRANSPARENCY */
1517 1553
1518 case GraphicsExpose: 1554 case GraphicsExpose:
1519 case Expose: 1555 case Expose:
1520 if (ev.xany.window == TermWin.vt) 1556 if (ev.xany.window == vt)
1521 { 1557 {
1522 do 1558 do
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1559 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1560 ev.xexpose.width, ev.xexpose.height, False);
1525 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1526 1562
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1563 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528 1564
1529 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1565 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, False);
1532 1568
1533 scr_refresh (refresh_type); 1569 want_refresh = 1;
1534 } 1570 }
1535 else 1571 else
1536 { 1572 {
1537 XEvent unused_event; 1573 XEvent unused_event;
1538 1574
1539 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1540 ; 1576 ;
1541 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1542 ; 1578 ;
1543 1579
1544 if (isScrollbarWindow (ev.xany.window)) 1580 if (isScrollbarWindow (ev.xany.window))
1545 { 1581 {
1546 scrollBar.setIdle (); 1582 scrollBar.setIdle ();
1547 scrollbar_show (0); 1583 scrollbar_show (0);
1548 } 1584 }
1549#ifdef MENUBAR
1550 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1551 menubar_expose ();
1552#endif
1553 1585
1554#ifdef TRANSPARENT 1586#ifdef ENABLE_TRANSPARENCY
1555 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1587 if (am_transparent && ev.xany.window == parent[0])
1556 XClearWindow (disp, ev.xany.window); 1588 XClearWindow (dpy, ev.xany.window);
1557#endif 1589#endif
1558 } 1590 }
1559 break; 1591 break;
1560 1592
1561 case MotionNotify: 1593 case MotionNotify:
1562#ifdef POINTER_BLANK 1594#ifdef POINTER_BLANK
1563 if (hidden_pointer) 1595 if (hidden_pointer)
1564 pointer_unblank (); 1596 pointer_unblank ();
1565#endif 1597#endif
1566#if MENUBAR
1567 if (isMenuBarWindow (ev.xany.window))
1568 {
1569 menubar_control (ev.xbutton);
1570 break;
1571 }
1572#endif
1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1598 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1574 break; 1599 break;
1575 1600
1576 if (ev.xany.window == TermWin.vt) 1601 if (ev.xany.window == vt)
1577 { 1602 {
1603 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1604 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1605 ; // nop
1578 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1606 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1607 {
1580 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1608 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1581 ; 1609 ;
1582 1610
1583 XQueryPointer (disp, TermWin.vt, 1611 XQueryPointer (dpy, vt,
1584 &unused_root, &unused_child, 1612 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1613 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1614 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1615 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1616#ifdef MOUSE_THRESHOLD
… …
1600#endif 1628#endif
1601 selection_extend (ev.xbutton.x, ev.xbutton.y, 1629 selection_extend (ev.xbutton.x, ev.xbutton.y,
1602 ev.xbutton.state & Button3Mask ? 2 : 0); 1630 ev.xbutton.state & Button3Mask ? 2 : 0);
1603 1631
1604#ifdef SELECTION_SCROLLING 1632#ifdef SELECTION_SCROLLING
1605 if (ev.xbutton.y < TermWin.int_bwidth 1633 if (ev.xbutton.y < int_bwidth
1606 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1634 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1607 { 1635 {
1608 int dist; 1636 int dist;
1609 1637
1610 /* don't clobber the current delay if we are 1638 /* don't clobber the current delay if we are
1611 * already in the middle of scrolling. 1639 * already in the middle of scrolling.
… …
1619 selection_save_x = ev.xbutton.x; 1647 selection_save_x = ev.xbutton.x;
1620 selection_save_y = ev.xbutton.y; 1648 selection_save_y = ev.xbutton.y;
1621 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1649 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1622 1650
1623 /* calc number of lines to scroll */ 1651 /* calc number of lines to scroll */
1624 if (ev.xbutton.y < TermWin.int_bwidth) 1652 if (ev.xbutton.y < int_bwidth)
1625 { 1653 {
1626 scroll_selection_dir = UP; 1654 scroll_selection_dir = UP;
1627 dist = TermWin.int_bwidth - ev.xbutton.y; 1655 dist = int_bwidth - ev.xbutton.y;
1628 } 1656 }
1629 else 1657 else
1630 { 1658 {
1631 scroll_selection_dir = DN; 1659 scroll_selection_dir = DN;
1632 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1660 dist = ev.xbutton.y - (int_bwidth + height);
1633 } 1661 }
1634 1662
1635 scroll_selection_lines = Pixel2Height (dist) 1663 scroll_selection_lines = Pixel2Height (dist)
1636 / SELECTION_SCROLL_LINE_SPEEDUP 1664 / SELECTION_SCROLL_LINE_SPEEDUP
1637 + 1; 1665 + 1;
1638 MIN_IT (scroll_selection_lines, 1666 min_it (scroll_selection_lines,
1639 SELECTION_SCROLL_MAX_LINES); 1667 SELECTION_SCROLL_MAX_LINES);
1640 } 1668 }
1641 else 1669 else
1642 { 1670 {
1643 /* we are within the text window, so we 1671 /* we are within the text window, so we
… …
1652#endif 1680#endif
1653 } 1681 }
1654 } 1682 }
1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1683 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1656 { 1684 {
1657 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1685 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1658 MotionNotify, &ev)) 1686 MotionNotify, &ev))
1659 ; 1687 ;
1660 1688
1661 XQueryPointer (disp, scrollBar.win, 1689 XQueryPointer (dpy, scrollBar.win,
1662 &unused_root, &unused_child, 1690 &unused_root, &unused_child,
1663 &unused_root_x, &unused_root_y, 1691 &unused_root_x, &unused_root_y,
1664 &ev.xbutton.x, &ev.xbutton.y, 1692 &ev.xbutton.x, &ev.xbutton.y,
1665 &unused_mask); 1693 &unused_mask);
1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1694 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1667 scrollbar_size ()); 1695 scrollbar_size ());
1668 scr_refresh (refresh_type);
1669 refresh_limit = 0; 1696 want_refresh = 1;
1670 scrollbar_show (1); 1697 scrollbar_show (1);
1671 } 1698 }
1672 break; 1699 break;
1673 } 1700 }
1674}
1675 1701
1676#if TRANSPARENT 1702#if defined(CURSOR_BLINK)
1703 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1704 {
1705 if (hidden_cursor)
1706 {
1707 hidden_cursor = 0;
1708 want_refresh = 1;
1709 }
1710
1711 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1712 }
1713#endif
1714
1715#if defined(POINTER_BLANK)
1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1717 {
1718 if (ev.type == MotionNotify
1719 || ev.type == ButtonPress
1720 || ev.type == ButtonRelease)
1721 if (hidden_pointer)
1722 pointer_unblank ();
1723
1724 if (ev.type == KeyPress && hidden_pointer == 0)
1725 pointer_blank ();
1726 }
1727#endif
1728}
1729
1730void
1731rxvt_term::focus_in ()
1732{
1733 if (!focus)
1734 {
1735 focus = 1;
1736 want_refresh = 1;
1737
1738 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1739
1740#if USE_XIM
1741 if (Input_Context != NULL)
1742 {
1743 IMSetPosition ();
1744 XSetICFocus (Input_Context);
1745 }
1746#endif
1747#if CURSOR_BLINK
1748 if (option (Opt_cursorBlink))
1749 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1750#endif
1751#if OFF_FOCUS_FADING
1752 if (rs[Rs_fade])
1753 {
1754 pix_colors = pix_colors_focused;
1755 scr_recolour ();
1756 }
1757#endif
1758#if ENABLE_FRILLS
1759 if (option (Opt_urgentOnBell))
1760 {
1761 XWMHints *h;
1762
1763 h = XGetWMHints(dpy, parent[0]);
1764 if (h != NULL)
1765 {
1766 h->flags &= ~XUrgencyHint;
1767 XSetWMHints(dpy, parent[0], h);
1768 }
1769 }
1770#endif
1771 }
1772}
1773
1774void
1775rxvt_term::focus_out ()
1776{
1777 if (focus)
1778 {
1779 focus = 0;
1780 want_refresh = 1;
1781
1782 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1783
1784#if ENABLE_FRILLS || ISO_14755
1785 if (iso14755buf)
1786 {
1787 iso14755buf = 0;
1788# if ENABLE_OVERLAY
1789 scr_overlay_off ();
1790# endif
1791 }
1792#endif
1793#if USE_XIM
1794 if (Input_Context != NULL)
1795 XUnsetICFocus (Input_Context);
1796#endif
1797#if CURSOR_BLINK
1798 if (option (Opt_cursorBlink))
1799 cursor_blink_ev.stop ();
1800 hidden_cursor = 0;
1801#endif
1802#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade])
1804 {
1805 pix_colors = pix_colors_unfocused;
1806 scr_recolour ();
1807 }
1808#endif
1809 }
1810}
1811
1812void
1813rxvt_term::update_fade_color (unsigned int idx)
1814{
1815#if OFF_FOCUS_FADING
1816 if (rs[Rs_fade])
1817 {
1818 rgba c;
1819 pix_colors [Color_fade].get (c);
1820 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1821 }
1822#endif
1823}
1824
1825#if ENABLE_TRANSPARENCY || ENABLE_PERL
1677void 1826void
1678rxvt_term::rootwin_cb (XEvent &ev) 1827rxvt_term::rootwin_cb (XEvent &ev)
1679{ 1828{
1680 SET_R (this); 1829 make_current ();
1681 SET_LOCALE (locale);
1682 1830
1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1832 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1833 return;
1834
1835# if ENABLE_TRANSPARENCY
1683 switch (ev.type) 1836 switch (ev.type)
1684 { 1837 {
1685 case PropertyNotify: 1838 case PropertyNotify:
1686 /* 1839 /*
1687 * if user used some Esetroot compatible prog to set the root bg, 1840 * if user used some Esetroot compatible prog to set the root bg,
… …
1691 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1844 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1692 return; 1845 return;
1693 1846
1694 /* FALLTHROUGH */ 1847 /* FALLTHROUGH */
1695 case ReparentNotify: 1848 case ReparentNotify:
1696 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1849 if (option (Opt_transparent))
1697 want_refresh = want_full_refresh = 1; 1850 check_our_parents ();
1698 break; 1851 break;
1699 } 1852 }
1853# endif
1700} 1854}
1701#endif 1855#endif
1702 1856
1703void 1857void
1704rxvt_term::button_press (XButtonEvent &ev) 1858rxvt_term::button_press (XButtonEvent &ev)
1705{ 1859{
1706 int reportmode = 0, clickintime; 1860 int reportmode = 0, clickintime;
1707 1861
1708 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1862 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1863
1709 if (!bypass_keystate) 1864 if (!bypass_keystate)
1710 reportmode = !! (priv_modes & PrivMode_mouse_report); 1865 reportmode = !! (priv_modes & PrivMode_mouse_report);
1711 1866
1712 /* 1867 /*
1713 * VT window processing of button press 1868 * VT window processing of button press
1714 */ 1869 */
1715 if (ev.window == TermWin.vt) 1870 if (ev.window == vt)
1716 { 1871 {
1872 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1873 return;
1874
1717#if ISO_14755 1875#if ISO_14755
1718 // 5.4 1876 // 5.4
1719 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1877 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1720 { 1878 {
1721 iso14755_54 (ev.x, ev.y); 1879 iso14755_54 (ev.x, ev.y);
… …
1733#ifdef MOUSE_REPORT_DOUBLECLICK 1891#ifdef MOUSE_REPORT_DOUBLECLICK
1734 if (ev.button == MEvent.button && clickintime) 1892 if (ev.button == MEvent.button && clickintime)
1735 { 1893 {
1736 /* same button, within alloted time */ 1894 /* same button, within alloted time */
1737 MEvent.clicks++; 1895 MEvent.clicks++;
1896
1738 if (MEvent.clicks > 1) 1897 if (MEvent.clicks > 1)
1739 { 1898 {
1740 /* only report double clicks */ 1899 /* only report double clicks */
1741 MEvent.clicks = 2; 1900 MEvent.clicks = 2;
1742 mouse_report (ev); 1901 mouse_report (ev);
… …
1774#else 1933#else
1775 selection.rect = false; 1934 selection.rect = false;
1776#endif 1935#endif
1777 1936
1778 /* allow shift+left click to extend selection */ 1937 /* allow shift+left click to extend selection */
1779 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1938 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1780 { 1939 {
1781 if (MEvent.button == Button1 && clickintime) 1940 if (MEvent.button == Button1 && clickintime)
1782 selection_rotate (ev.x, ev.y); 1941 selection_rotate (ev.x, ev.y);
1783 else 1942 else
1784 selection_extend (ev.x, ev.y, 1); 1943 selection_extend (ev.x, ev.y, 1);
… …
1925 case Button3: 2084 case Button3:
1926 if (scrollBar.style != R_SB_XTERM) 2085 if (scrollBar.style != R_SB_XTERM)
1927 { 2086 {
1928 if (scrollbar_above_slider (ev.y)) 2087 if (scrollbar_above_slider (ev.y))
1929# ifdef RXVT_SCROLL_FULL 2088# ifdef RXVT_SCROLL_FULL
1930 scr_page (UP, TermWin.nrow - 1); 2089 scr_page (UP, nrow - 1);
1931# else 2090# else
1932 scr_page (UP, TermWin.nrow / 4); 2091 scr_page (UP, nrow / 4);
1933# endif 2092# endif
1934 else if (scrollbar_below_slider (ev.y)) 2093 else if (scrollbar_below_slider (ev.y))
1935# ifdef RXVT_SCROLL_FULL 2094# ifdef RXVT_SCROLL_FULL
1936 scr_page (DN, TermWin.nrow - 1); 2095 scr_page (DN, nrow - 1);
1937# else 2096# else
1938 scr_page (DN, TermWin.nrow / 4); 2097 scr_page (DN, nrow / 4);
1939# endif 2098# endif
1940 else 2099 else
1941 scrollBar.setMotion (); 2100 scrollBar.setMotion ();
1942 } 2101 }
1943 else 2102 else
1944 { 2103 {
1945 scr_page ((ev.button == Button1 ? DN : UP), 2104 scr_page ((ev.button == Button1 ? DN : UP),
1946 (TermWin.nrow 2105 (nrow
1947 * scrollbar_position (ev.y) 2106 * scrollbar_position (ev.y)
1948 / scrollbar_size ())); 2107 / scrollbar_size ()));
1949 } 2108 }
1950 2109
1951 break; 2110 break;
1952 } 2111 }
1953 } 2112 }
2113
1954 return; 2114 return;
1955 } 2115 }
1956#if MENUBAR
1957 /*
1958 * Menubar window processing of button press
1959 */
1960 if (isMenuBarWindow (ev.window))
1961 menubar_control (ev);
1962#endif
1963} 2116}
1964 2117
1965void 2118void
1966rxvt_term::button_release (XButtonEvent &ev) 2119rxvt_term::button_release (XButtonEvent &ev)
1967{ 2120{
… …
1973 2126
1974 if (scrollbar_isUpDn ()) 2127 if (scrollbar_isUpDn ())
1975 { 2128 {
1976 scrollBar.setIdle (); 2129 scrollBar.setIdle ();
1977 scrollbar_show (0); 2130 scrollbar_show (0);
1978#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1979 refresh_type &= ~SMOOTH_REFRESH;
1980#endif
1981 } 2131 }
1982 2132
1983#ifdef SELECTION_SCROLLING 2133#ifdef SELECTION_SCROLLING
1984 if (sel_scroll_ev.active) 2134 if (sel_scroll_ev.active)
1985 sel_scroll_ev.stop(); 2135 sel_scroll_ev.stop();
1986#endif 2136#endif
1987 2137
1988 if (ev.window == TermWin.vt) 2138 if (ev.window == vt)
1989 { 2139 {
2140 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2141 return;
2142
1990#if ISO_14755 2143#if ISO_14755
1991 // 5.4 2144 // 5.4
1992 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2145 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1993 return; 2146 return;
1994#endif 2147#endif
2148
1995 if (reportmode) 2149 if (reportmode)
1996 { 2150 {
1997 /* mouse report from vt window */ 2151 /* mouse report from vt window */
1998 /* don't report release of wheel "buttons" */ 2152 /* don't report release of wheel "buttons" */
1999 if (ev.button >= 4) 2153 if (ev.button >= 4)
… …
2029 { 2183 {
2030 case Button1: 2184 case Button1:
2031 case Button3: 2185 case Button3:
2032 selection_make (ev.time); 2186 selection_make (ev.time);
2033 break; 2187 break;
2188
2034 case Button2: 2189 case Button2:
2035 selection_request (ev.time, ev.x, ev.y); 2190 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2191 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2036 break; 2192 break;
2193
2037#ifdef MOUSE_WHEEL 2194#ifdef MOUSE_WHEEL
2038 case Button4: 2195 case Button4:
2039 case Button5: 2196 case Button5:
2040 { 2197 {
2041 int i; 2198 int i;
… …
2043 2200
2044 v = ev.button == Button4 ? UP : DN; 2201 v = ev.button == Button4 ? UP : DN;
2045 2202
2046 if (ev.state & ShiftMask) 2203 if (ev.state & ShiftMask)
2047 i = 1; 2204 i = 1;
2048 else if (options & Opt_mouseWheelScrollPage) 2205 else if (option (Opt_mouseWheelScrollPage))
2049 i = TermWin.nrow - 1; 2206 i = nrow - 1;
2050 else 2207 else
2051 i = 5; 2208 i = 5;
2052 2209
2053# ifdef MOUSE_SLIP_WHEELING 2210# ifdef MOUSE_SLIP_WHEELING
2054 if (ev.state & ControlMask) 2211 if (ev.state & ControlMask)
2055 { 2212 {
2056 mouse_slip_wheel_speed += v ? -1 : 1; 2213 mouse_slip_wheel_speed += v ? -1 : 1;
2057 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2214 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2058 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2215 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2059 2216
2060 if (slip_wheel_ev.at < NOW) 2217 if (slip_wheel_ev.at < NOW)
2061 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2218 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2062 2219
2063 slip_wheel_ev.start (); 2220 slip_wheel_ev.start ();
2064 } 2221 }
2065 else 2222 else
2066 { 2223 {
2067# endif 2224# endif
2068# ifdef JUMP_MOUSE_WHEEL
2069 scr_page (v, i); 2225 scr_page (v, i);
2070 scr_refresh (SMOOTH_REFRESH);
2071 scrollbar_show (1); 2226 scrollbar_show (1);
2072# else
2073 while (i--)
2074 {
2075 scr_page (v, 1);
2076 scr_refresh (SMOOTH_REFRESH);
2077 scrollbar_show (1);
2078 }
2079# endif
2080# ifdef MOUSE_SLIP_WHEELING 2227# ifdef MOUSE_SLIP_WHEELING
2081 } 2228 }
2082#endif 2229# endif
2083 } 2230 }
2084 break; 2231 break;
2085#endif 2232#endif
2086 } 2233 }
2087 } 2234 }
2088#ifdef MENUBAR
2089 else if (isMenuBarWindow (ev.window))
2090 menubar_control (ev);
2091#endif
2092} 2235}
2093
2094#ifdef TRANSPARENT
2095#if TINTING
2096/* taken from aterm-0.4.2 */
2097
2098typedef uint32_t RUINT32T;
2099
2100void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2101{
2102 int sh_r, sh_g, sh_b;
2103 RUINT32T mask_r, mask_g, mask_b;
2104 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2105 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2106 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2107 int i;
2108
2109 Visual *visual = display->visual;
2110
2111 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2112
2113 /* for convenience */
2114 mask_r = visual->red_mask;
2115 mask_g = visual->green_mask;
2116 mask_b = visual->blue_mask;
2117
2118 /* boring lookup table pre-initialization */
2119 switch (srcImage->bits_per_pixel) {
2120 case 15:
2121 if ((mask_r != 0x7c00) ||
2122 (mask_g != 0x03e0) ||
2123 (mask_b != 0x001f))
2124 return;
2125 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2126 lookup_r = lookup;
2127 lookup_g = lookup+32;
2128 lookup_b = lookup+32+32;
2129 sh_r = 10;
2130 sh_g = 5;
2131 sh_b = 0;
2132 break;
2133 case 16:
2134 if ((mask_r != 0xf800) ||
2135 (mask_g != 0x07e0) ||
2136 (mask_b != 0x001f))
2137 return;
2138 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2139 lookup_r = lookup;
2140 lookup_g = lookup+32;
2141 lookup_b = lookup+32+64;
2142 sh_r = 11;
2143 sh_g = 5;
2144 sh_b = 0;
2145 break;
2146 case 24:
2147 if ((mask_r != 0xff0000) ||
2148 (mask_g != 0x00ff00) ||
2149 (mask_b != 0x0000ff))
2150 return;
2151 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2152 lookup_r = lookup;
2153 lookup_g = lookup+256;
2154 lookup_b = lookup+256+256;
2155 sh_r = 16;
2156 sh_g = 8;
2157 sh_b = 0;
2158 break;
2159 case 32:
2160 if ((mask_r != 0xff0000) ||
2161 (mask_g != 0x00ff00) ||
2162 (mask_b != 0x0000ff))
2163 return;
2164 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2165 lookup_r = lookup;
2166 lookup_g = lookup+256;
2167 lookup_b = lookup+256+256;
2168 sh_r = 16;
2169 sh_g = 8;
2170 sh_b = 0;
2171 break;
2172 default:
2173 return; /* we do not support this color depth */
2174 }
2175
2176 /* prepare limits for color transformation (each channel is handled separately) */
2177 if (shade < 0) {
2178 shade = -shade;
2179 if (shade < 0) shade = 0;
2180 if (shade > 100) shade = 100;
2181
2182 lower_lim_r = 65535-rm;
2183 lower_lim_g = 65535-gm;
2184 lower_lim_b = 65535-bm;
2185
2186 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2187 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2188 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2189
2190 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2191 } else {
2192 if (shade < 0) shade = 0;
2193 if (shade > 100) shade = 100;
2194
2195 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2196
2197 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2198 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2199 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2200 }
2201
2202 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2203 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2204 {
2205 unsigned int tmp;
2206
2207 tmp = lower_lim_r;
2208 lower_lim_r = lower_lim_b;
2209 lower_lim_b = tmp;
2210
2211 tmp = upper_lim_r;
2212 upper_lim_r = upper_lim_b;
2213 upper_lim_b = tmp;
2214 }
2215
2216 /* fill our lookup tables */
2217 for (i = 0; i <= mask_r>>sh_r; i++)
2218 {
2219 RUINT32T tmp;
2220 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2221 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2222 lookup_r[i] = (tmp/65535)<<sh_r;
2223 }
2224 for (i = 0; i <= mask_g>>sh_g; i++)
2225 {
2226 RUINT32T tmp;
2227 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2228 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2229 lookup_g[i] = (tmp/65535)<<sh_g;
2230 }
2231 for (i = 0; i <= mask_b>>sh_b; i++)
2232 {
2233 RUINT32T tmp;
2234 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2235 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2236 lookup_b[i] = (tmp/65535)<<sh_b;
2237 }
2238
2239 /* apply table to input image (replacing colors by newly calculated ones) */
2240 switch (srcImage->bits_per_pixel)
2241 {
2242 case 15:
2243 {
2244 unsigned short *p1, *pf, *p, *pl;
2245 p1 = (unsigned short *) srcImage->data;
2246 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2247 while (p1 < pf)
2248 {
2249 p = p1;
2250 pl = p1 + srcImage->width;
2251 for (; p < pl; p++)
2252 {
2253 *p = lookup_r[(*p & 0x7c00)>>10] |
2254 lookup_g[(*p & 0x03e0)>> 5] |
2255 lookup_b[(*p & 0x001f)];
2256 }
2257 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2258 }
2259 break;
2260 }
2261 case 16:
2262 {
2263 unsigned short *p1, *pf, *p, *pl;
2264 p1 = (unsigned short *) srcImage->data;
2265 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2266 while (p1 < pf)
2267 {
2268 p = p1;
2269 pl = p1 + srcImage->width;
2270 for (; p < pl; p++)
2271 {
2272 *p = lookup_r[(*p & 0xf800)>>11] |
2273 lookup_g[(*p & 0x07e0)>> 5] |
2274 lookup_b[(*p & 0x001f)];
2275 }
2276 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2277 }
2278 break;
2279 }
2280 case 24:
2281 {
2282 unsigned char *p1, *pf, *p, *pl;
2283 p1 = (unsigned char *) srcImage->data;
2284 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2285 while (p1 < pf)
2286 {
2287 p = p1;
2288 pl = p1 + srcImage->width * 3;
2289 for (; p < pl; p += 3)
2290 {
2291 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2292 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2293 p[2] = lookup_r[(p[2] & 0x0000ff)];
2294 }
2295 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2296 }
2297 break;
2298 }
2299 case 32:
2300 {
2301 RUINT32T *p1, *pf, *p, *pl;
2302 p1 = (RUINT32T *) srcImage->data;
2303 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2304
2305 while (p1 < pf)
2306 {
2307 p = p1;
2308 pl = p1 + srcImage->width;
2309 for (; p < pl; p++)
2310 {
2311 *p = lookup_r[(*p & 0xff0000)>>16] |
2312 lookup_g[(*p & 0x00ff00)>> 8] |
2313 lookup_b[(*p & 0x0000ff)] |
2314 (*p & ~0xffffff);
2315 }
2316 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2317 }
2318 break;
2319 }
2320 }
2321
2322 free (lookup);
2323}
2324#endif
2325
2326/*
2327 * Check our parents are still who we think they are.
2328 * Do transparency updates if required
2329 */
2330int
2331rxvt_term::check_our_parents ()
2332{
2333 int i, pchanged, aformat, have_pixmap, rootdepth;
2334 unsigned long nitems, bytes_after;
2335 Atom atype;
2336 unsigned char *prop = NULL;
2337 Window root, oldp, *list;
2338 Pixmap rootpixmap = None;
2339 XWindowAttributes wattr, wrootattr;
2340 dDisp;
2341
2342 pchanged = 0;
2343
2344 if (!(options & Opt_transparent))
2345 return pchanged; /* Don't try any more */
2346
2347 XGetWindowAttributes (disp, display->root, &wrootattr);
2348 rootdepth = wrootattr.depth;
2349
2350 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2351
2352 if (rootdepth != wattr.depth)
2353 {
2354 if (am_transparent)
2355 {
2356 pchanged = 1;
2357 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2358 am_transparent = am_pixmap_trans = 0;
2359 }
2360
2361 return pchanged; /* Don't try any more */
2362 }
2363
2364 /* Get all X ops out of the queue so that our information is up-to-date. */
2365 XSync (disp, False);
2366
2367 /*
2368 * Make the frame window set by the window manager have
2369 * the root background. Some window managers put multiple nested frame
2370 * windows for each client, so we have to take care about that.
2371 */
2372 i = (xa[XA_XROOTPMAP_ID]
2373 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2374 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2375 &nitems, &bytes_after, &prop) == Success);
2376
2377 if (!i || prop == NULL)
2378 i = (xa[XA_ESETROOT_PMAP_ID]
2379 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2380 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2381 &nitems, &bytes_after, &prop) == Success);
2382
2383 if (!i || prop == NULL
2384#if TINTING
2385 || !rs[Rs_color + Color_tint]
2386#endif
2387 )
2388 have_pixmap = 0;
2389 else
2390 {
2391 have_pixmap = 1;
2392 rootpixmap = *(Pixmap *)prop;
2393 XFree (prop);
2394 }
2395
2396 if (have_pixmap)
2397 {
2398 /*
2399 * Copy display->root pixmap transparency
2400 */
2401 int sx, sy, nx, ny;
2402 unsigned int nw, nh;
2403 Window cr;
2404 XImage *image;
2405 GC gc;
2406 XGCValues gcvalue;
2407
2408 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2409 0, 0, &sx, &sy, &cr);
2410 nw = (unsigned int)szHint.width;
2411 nh = (unsigned int)szHint.height;
2412 nx = ny = 0;
2413
2414 if (sx < 0)
2415 {
2416 nw += sx;
2417 nx = -sx;
2418 sx = 0;
2419 }
2420
2421 if (sy < 0)
2422 {
2423 nh += sy;
2424 ny = -sy;
2425 sy = 0;
2426 }
2427
2428 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2429 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2430
2431 XSync (disp, False);
2432 allowedxerror = -1;
2433 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2434
2435 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2436 /* XXX: may need a delay here? */
2437 allowedxerror = 0;
2438
2439 if (image == NULL)
2440 {
2441 if (am_transparent && am_pixmap_trans)
2442 {
2443 pchanged = 1;
2444 if (TermWin.pixmap != None)
2445 {
2446 XFreePixmap (disp, TermWin.pixmap);
2447 TermWin.pixmap = None;
2448 }
2449 }
2450
2451 am_pixmap_trans = 0;
2452 }
2453 else
2454 {
2455 if (TermWin.pixmap != None)
2456 XFreePixmap (disp, TermWin.pixmap);
2457
2458#if TINTING
2459 if (ISSET_PIXCOLOR (Color_tint))
2460 {
2461 unsigned short rm, gm, bm;
2462 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2463
2464 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2465
2466 ShadeXImage (display, image, shade, rm, gm, bm);
2467 }
2468#endif
2469
2470 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2471 szHint.width, szHint.height, image->depth);
2472 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2473 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2474 nx, ny, image->width, image->height);
2475 XFreeGC (disp, gc);
2476 XDestroyImage (image);
2477 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2478 XClearWindow (disp, TermWin.parent[0]);
2479
2480 if (!am_transparent || !am_pixmap_trans)
2481 pchanged = 1;
2482
2483 am_transparent = am_pixmap_trans = 1;
2484 }
2485 }
2486
2487 if (am_pixmap_trans)
2488 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2489 else
2490 {
2491 unsigned int n;
2492 /*
2493 * InheritPixmap transparency
2494 */
2495 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2496 {
2497 oldp = TermWin.parent[i];
2498 XQueryTree (disp, TermWin.parent[i - 1], &root,
2499 &TermWin.parent[i], &list, &n);
2500 XFree (list);
2501
2502 if (TermWin.parent[i] == display->root)
2503 {
2504 if (oldp != None)
2505 pchanged = 1;
2506
2507 break;
2508 }
2509
2510 if (oldp != TermWin.parent[i])
2511 pchanged = 1;
2512 }
2513
2514 n = 0;
2515
2516 if (pchanged)
2517 {
2518 for (; n < (unsigned int)i; n++)
2519 {
2520 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2521 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2522 {
2523 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2524 break;
2525 }
2526 }
2527 }
2528
2529 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2530 {
2531 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2532 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2533 am_transparent = 0;
2534 /* XXX: also turn off Opt_transparent? */
2535 }
2536 else
2537 {
2538#if WAIT_FOR_WM
2539 /* wait (an arbitrary period) for the WM to do its thing
2540 * needed for fvwm2.2.2 (and before?) */
2541 sleep (1);
2542#endif
2543 for (n = 0; n < (unsigned int)i; n++)
2544 {
2545 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2546 XClearWindow (disp, TermWin.parent[n]);
2547 }
2548
2549 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2550 am_transparent = 1;
2551 }
2552
2553 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2554 TermWin.parent[i] = None;
2555 }
2556
2557 if (scrollBar.win)
2558 {
2559 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2560 scrollBar.setIdle ();
2561 scrollbar_show (0);
2562 }
2563
2564 if (am_transparent)
2565 {
2566 want_refresh = want_full_refresh = 1;
2567 if (am_pixmap_trans)
2568 flush ();
2569 }
2570
2571 return pchanged;
2572}
2573#endif
2574 2236
2575/*}}} */ 2237/*}}} */
2576 2238
2577bool 2239bool
2578rxvt_term::cmd_parse () 2240rxvt_term::cmd_parse ()
2579{ 2241{
2580 bool flag = false; 2242 bool flag = false;
2581 unicode_t ch = NOCHAR; 2243 wchar_t ch = NOCHAR;
2582 unsigned char *seq_begin; // remember start of esc-sequence here 2244 char *seq_begin; // remember start of esc-sequence here
2583 2245
2584 for (;;) 2246 for (;;)
2585 { 2247 {
2586 if (ch == NOCHAR) 2248 if (ch == NOCHAR)
2587 { 2249 {
2588 seq_begin = cmdbuf_ptr; 2250 seq_begin = cmdbuf_ptr;
2589 ch = next_char (); 2251 ch = next_char ();
2590 }
2591 2252
2592 if (ch == NOCHAR) // TODO: improve 2253 if (ch == NOCHAR)
2593 break; 2254 break;
2255 }
2594 2256
2595 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2257 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2596 { 2258 {
2597 if (!seen_input) 2259 if (!seen_input)
2598 { 2260 {
… …
2607 if (seen_resize && cmd_pid) 2269 if (seen_resize && cmd_pid)
2608 kill (-cmd_pid, SIGWINCH); 2270 kill (-cmd_pid, SIGWINCH);
2609 } 2271 }
2610 2272
2611 /* Read a text string from the input buffer */ 2273 /* Read a text string from the input buffer */
2612 unicode_t buf[UBUFSIZ]; 2274 wchar_t buf[UBUFSIZ];
2613 bool refreshnow = false; 2275 bool refreshnow = false;
2614 int nlines = 0; 2276 int nlines = 0;
2615 unicode_t *str = buf; 2277 wchar_t *str = buf;
2278 wchar_t *eol = str + min (ncol, UBUFSIZ);
2616 2279
2617 for (;;) 2280 for (;;)
2618 { 2281 {
2619 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2282 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2620 break; 2283 break;
2621 2284
2622 *str++ = ch; 2285 *str++ = ch;
2623 2286
2624 if (ch == C0_LF) 2287 if (ch == C0_LF || str >= eol)
2625 { 2288 {
2289 if (ch == C0_LF)
2626 nlines++; 2290 nlines++;
2291
2627 refresh_count++; 2292 refresh_count++;
2628 2293
2629 if (!(options & Opt_jumpScroll) 2294 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2630 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2631 { 2295 {
2296 refresh_count = 0;
2297
2298 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2299 {
2632 refreshnow = true; 2300 refreshnow = true;
2633 ch = NOCHAR; 2301 ch = NOCHAR;
2634 break; 2302 break;
2303 }
2635 } 2304 }
2636 2305
2637 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2306 // scr_add_lines only works for nlines <= nrow - 1.
2638 if (nlines >= TermWin.nrow - 1) 2307 if (nlines >= nrow - 1)
2639 { 2308 {
2309 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2310 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2640 scr_add_lines (buf, nlines, str - buf); 2311 scr_add_lines (buf, str - buf, nlines);
2312
2641 nlines = 0; 2313 nlines = 0;
2642 str = buf; 2314 str = buf;
2315 eol = str + min (ncol, UBUFSIZ);
2643 } 2316 }
2644 }
2645 2317
2646 if (str >= buf + UBUFSIZ) 2318 if (str >= eol)
2647 { 2319 {
2320 if (eol >= buf + UBUFSIZ)
2321 {
2648 ch = NOCHAR; 2322 ch = NOCHAR;
2649 break; 2323 break;
2324 }
2325 else
2326 eol = min (eol + ncol, buf + UBUFSIZ);
2327 }
2328
2650 } 2329 }
2651 2330
2652 seq_begin = cmdbuf_ptr; 2331 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2332 ch = next_char ();
2654 } 2333 }
2655 2334
2335 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2336 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2656 scr_add_lines (buf, nlines, str - buf); 2337 scr_add_lines (buf, str - buf, nlines);
2657 2338
2658 /* 2339 /*
2659 * If there have been a lot of new lines, then update the screen 2340 * If there have been a lot of new lines, then update the screen
2660 * What the heck I'll cheat and only refresh less than every page-full. 2341 * What the heck we'll cheat and only refresh less than every page-full.
2661 * the number of pages between refreshes is refresh_limit, which 2342 * if skipScroll is enabled.
2662 * is incremented here because we must be doing flat-out scrolling.
2663 */ 2343 */
2664 if (refreshnow) 2344 if (refreshnow)
2665 { 2345 {
2666 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2667 refresh_limit++;
2668 else
2669 {
2670 flag = true; 2346 flag = true;
2671 scr_refresh (refresh_type); 2347 scr_refresh ();
2672 } 2348 want_refresh = 1;
2673 } 2349 }
2674 2350
2675 } 2351 }
2676 else 2352 else
2677 { 2353 {
… …
2691 } 2367 }
2692 2368
2693 return flag; 2369 return flag;
2694} 2370}
2695 2371
2696// read the next octet
2697unicode_t
2698rxvt_term::next_octet ()
2699{
2700 return cmdbuf_ptr < cmdbuf_endp
2701 ? *cmdbuf_ptr++
2702 : NOCHAR;
2703}
2704
2705// read the next character 2372// read the next character
2706unicode_t 2373wchar_t
2707rxvt_term::next_char () 2374rxvt_term::next_char () NOTHROW
2708{ 2375{
2709 while (cmdbuf_ptr < cmdbuf_endp) 2376 while (cmdbuf_ptr < cmdbuf_endp)
2710 { 2377 {
2711 // assume 7-bit to be ascii ALWAYS 2378 // assume 7-bit to be ascii ALWAYS
2712 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2379 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2713 return *cmdbuf_ptr++; 2380 return *cmdbuf_ptr++;
2714 2381
2715 wchar_t wc; 2382 wchar_t wc;
2716 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2383 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2717 2384
2718 if (len == (size_t)-2) 2385 if (len == (size_t)-2)
2719 { 2386 {
2720 // the mbstate stores incomplete sequences. didn't know this :/ 2387 // the mbstate stores incomplete sequences. didn't know this :/
2721 cmdbuf_ptr = cmdbuf_endp; 2388 cmdbuf_ptr = cmdbuf_endp;
2722 break; 2389 break;
2723 } 2390 }
2724 2391
2725 if (len == (size_t)-1) 2392 if (len == (size_t)-1)
2726 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2393 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2727 2394
2728 // assume wchar == unicode 2395 // assume wchar == unicode
2729 cmdbuf_ptr += len; 2396 cmdbuf_ptr += len;
2730 return wc & UNICODE_MASK; 2397 return wc & UNICODE_MASK;
2731 } 2398 }
2732 2399
2733 return NOCHAR; 2400 return NOCHAR;
2734} 2401}
2402
2403// read the next octet
2404uint32_t
2405rxvt_term::next_octet () NOTHROW
2406{
2407 return cmdbuf_ptr < cmdbuf_endp
2408 ? (unsigned char)*cmdbuf_ptr++
2409 : NOCHAR;
2410}
2411
2412static class out_of_input out_of_input;
2735 2413
2736/* rxvt_cmd_getc () - Return next input character */ 2414/* rxvt_cmd_getc () - Return next input character */
2737/* 2415/*
2738 * Return the next input character after first passing any keyboard input 2416 * Return the next input character after first passing any keyboard input
2739 * to the command. 2417 * to the command.
2740 */ 2418 */
2741unicode_t 2419wchar_t
2742rxvt_term::cmd_getc () 2420rxvt_term::cmd_getc () THROW ((class out_of_input))
2743{ 2421{
2744 unicode_t c = next_char (); 2422 wchar_t c = next_char ();
2745 2423
2746 if (c == NOCHAR) 2424 if (c == NOCHAR)
2747 throw out_of_input; 2425 throw out_of_input;
2748 2426
2749 return c; 2427 return c;
2750} 2428}
2751 2429
2752unicode_t 2430uint32_t
2753rxvt_term::cmd_get8 () 2431rxvt_term::cmd_get8 () THROW ((class out_of_input))
2754{ 2432{
2755 unicode_t c = next_octet (); 2433 uint32_t c = next_octet ();
2756 2434
2757 if (c == NOCHAR) 2435 if (c == NOCHAR)
2758 throw out_of_input; 2436 throw out_of_input;
2759 2437
2760 return c; 2438 return c;
… …
2824 { 2502 {
2825 if ((buf[len++] = cmd_getc ()) == 'i') 2503 if ((buf[len++] = cmd_getc ()) == 'i')
2826 break; /* done = 1 */ 2504 break; /* done = 1 */
2827 } 2505 }
2828 } 2506 }
2829 2507
2830 for (i = 0; i < len; i++) 2508 for (i = 0; i < len; i++)
2831 if (putc (buf[i], fd) == EOF) 2509 if (putc (buf[i], fd) == EOF)
2832 { 2510 {
2833 done = 1; 2511 done = 1;
2834 break; 2512 break;
… …
2860 case C0_ESC: 2538 case C0_ESC:
2861 process_escape_seq (); 2539 process_escape_seq ();
2862 break; 2540 break;
2863 case C0_ENQ: /* terminal Status */ 2541 case C0_ENQ: /* terminal Status */
2864 if (rs[Rs_answerbackstring]) 2542 if (rs[Rs_answerbackstring])
2865 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2543 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2866 (unsigned int)strlen (rs[Rs_answerbackstring]));
2867 else 2544 else
2868 tt_write ((unsigned char *)VT100_ANS, 2545 tt_write (VT100_ANS, strlen (VT100_ANS));
2869 (unsigned int)strlen (VT100_ANS));
2870 break; 2546 break;
2871 case C0_BEL: /* bell */ 2547 case C0_BEL: /* bell */
2872 scr_bell (); 2548 scr_bell ();
2873 break; 2549 break;
2874 case C0_BS: /* backspace */ 2550 case C0_BS: /* backspace */
… …
2898 process_dcs_seq (); 2574 process_dcs_seq ();
2899 break; 2575 break;
2900 case 0x9b: /* CSI */ 2576 case 0x9b: /* CSI */
2901 process_csi_seq (); 2577 process_csi_seq ();
2902 break; 2578 break;
2903 case 0x9d: /* CSI */ 2579 case 0x9d: /* OSC */
2904 process_osc_seq (); 2580 process_osc_seq ();
2905 break; 2581 break;
2906#endif 2582#endif
2907 } 2583 }
2908} 2584}
… …
2998 scr_charset_set (2, (unsigned int)cmd_getc ()); 2674 scr_charset_set (2, (unsigned int)cmd_getc ());
2999 break; 2675 break;
3000 case '+': 2676 case '+':
3001 scr_charset_set (3, (unsigned int)cmd_getc ()); 2677 scr_charset_set (3, (unsigned int)cmd_getc ());
3002 break; 2678 break;
3003#if ENABLE_FRILLS 2679#if !ENABLE_MINIMAL
3004 case '6': 2680 case '6':
3005 scr_backindex (); 2681 scr_backindex ();
3006 break; 2682 break;
3007#endif 2683#endif
3008 case '7': 2684 case '7':
3009 scr_cursor (SAVE); 2685 scr_cursor (SAVE);
3010 break; 2686 break;
3011 case '8': 2687 case '8':
3012 scr_cursor (RESTORE); 2688 scr_cursor (RESTORE);
3013 break; 2689 break;
3014#if ENABLE_FRILLS 2690#if !ENABLE_MINIMAL
3015 case '9': 2691 case '9':
3016 scr_forwardindex (); 2692 scr_forwardindex ();
3017 break; 2693 break;
3018#endif 2694#endif
3019 case '=': 2695 case '=':
… …
3029 break; 2705 break;
3030 2706
3031 /* 8.3.87: NEXT LINE */ 2707 /* 8.3.87: NEXT LINE */
3032 case C1_NEL: /* ESC E */ 2708 case C1_NEL: /* ESC E */
3033 { 2709 {
3034 unicode_t nlcr[] = { C0_LF, C0_CR }; 2710 wchar_t nlcr[] = { C0_LF, C0_CR };
3035 scr_add_lines (nlcr, 1, 2); 2711 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3036 } 2712 }
3037 break; 2713 break;
3038 2714
3039 /* kidnapped escape sequence: Should be 8.3.48 */ 2715 /* kidnapped escape sequence: Should be 8.3.48 */
3040 case C1_ESA: /* ESC G */ 2716 case C1_ESA: /* ESC G */
… …
3062 process_dcs_seq (); 2738 process_dcs_seq ();
3063 break; 2739 break;
3064 2740
3065 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2741 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3066 case C1_SCI: /* ESC Z */ 2742 case C1_SCI: /* ESC Z */
3067 tt_write ((const unsigned char *)ESCZ_ANSWER, 2743 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3068 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3069 break; /* steal obsolete ESC [ c */ 2744 break; /* steal obsolete ESC [ c */
3070 2745
3071 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2746 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3072 case C1_CSI: /* ESC [ */ 2747 case C1_CSI: /* ESC [ */
3073 process_csi_seq (); 2748 process_csi_seq ();
… …
3182 ndef = get_byte_array_bit (csi_defaults, i); 2857 ndef = get_byte_array_bit (csi_defaults, i);
3183 for (p = 0; p < nargs; p++) 2858 for (p = 0; p < nargs; p++)
3184 if (arg[p] == -1) 2859 if (arg[p] == -1)
3185 arg[p] = ndef; 2860 arg[p] = ndef;
3186 2861
3187#ifdef DEBUG_CMD
3188 fprintf (stderr, "CSI ");
3189 for (p = 0; p < nargs; p++)
3190 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3191 fprintf (stderr, "%c\n", ch);
3192#endif
3193
3194 /* 2862 /*
3195 * private mode handling 2863 * private mode handling
3196 */ 2864 */
3197 if (priv) 2865 if (priv)
3198 { 2866 {
3199 switch (priv) 2867 switch (priv)
3200 { 2868 {
3201 case '>': 2869 case '>':
3202 if (ch == CSI_DA) /* secondary device attributes */ 2870 if (ch == CSI_DA) /* secondary device attributes */
3203 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2871 {
2872 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2873 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2874 //
2875 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2876 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2877 // that we do not support xterm mouse reporting (should be 95 when we do).
2878 //
2879 tt_printf ("\033[>%d;94;0c", 'U');
2880 }
3204 break; 2881 break;
3205 case '?': 2882 case '?':
3206 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2883 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3207 process_terminal_mode (ch, priv, nargs, arg); 2884 process_terminal_mode (ch, priv, nargs, arg);
3208 break; 2885 break;
… …
3313 2990
3314 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2991 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3315 arg[0] = -arg[0]; 2992 arg[0] = -arg[0];
3316 /* FALLTHROUGH */ 2993 /* FALLTHROUGH */
3317 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2994 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3318 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2995 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3319 break; 2996 break;
3320 2997
3321 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2998 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3322 tt_write ((const unsigned char *)VT100_ANS, 2999 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3323 (unsigned int) (sizeof (VT100_ANS) - 1));
3324 break; 3000 break;
3325 3001
3326 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3002 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3327 process_sgr_mode (nargs, arg); 3003 process_sgr_mode (nargs, arg);
3328 break; 3004 break;
… …
3335 break; 3011 break;
3336 case 6: /* CPR requested */ 3012 case 6: /* CPR requested */
3337 scr_report_position (); 3013 scr_report_position ();
3338 break; 3014 break;
3339 case 7: /* unofficial extension */ 3015 case 7: /* unofficial extension */
3340 if (options & Opt_insecure) 3016 if (option (Opt_insecure))
3341 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3017 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3342 break; 3018 break;
3343 case 8: /* unofficial extension */ 3019 case 8: /* unofficial extension */
3344 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3020 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3345 break; 3021 break;
… …
3412 break; 3088 break;
3413 case CSI_75: 3089 case CSI_75:
3414 scr_cursor (RESTORE); 3090 scr_cursor (RESTORE);
3415 break; 3091 break;
3416 3092
3417#if ENABLE_FRILLS 3093#if !ENABLE_MINIMAL
3418 case CSI_74: 3094 case CSI_74:
3419 process_window_ops (arg, nargs); 3095 process_window_ops (arg, nargs);
3420 break; 3096 break;
3421#endif 3097#endif
3422 3098
… …
3429 break; 3105 break;
3430 } 3106 }
3431} 3107}
3432/*}}} */ 3108/*}}} */
3433 3109
3434#if ENABLE_FRILLS 3110#if !ENABLE_MINIMAL
3435/* ARGSUSED */ 3111/* ARGSUSED */
3436void 3112void
3437rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3113rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3438{ 3114{
3439 int x, y; 3115 int x, y;
3440 XWindowAttributes wattr; 3116 XWindowAttributes wattr;
3441 Window wdummy; 3117 Window wdummy;
3442 dDisp; 3118
3119 dLocal (Display *, dpy);
3443 3120
3444 if (nargs == 0) 3121 if (nargs == 0)
3445 return; 3122 return;
3446 3123
3447 switch (args[0]) 3124 switch (args[0])
3448 { 3125 {
3449 /* 3126 /*
3450 * commands 3127 * commands
3451 */ 3128 */
3452 case 1: /* deiconify window */ 3129 case 1: /* deiconify window */
3453 XMapWindow (disp, TermWin.parent[0]); 3130 XMapWindow (dpy, parent[0]);
3454 break; 3131 break;
3455 case 2: /* iconify window */ 3132 case 2: /* iconify window */
3456 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3133 XIconifyWindow (dpy, parent[0], display->screen);
3457 break; 3134 break;
3458 case 3: /* set position (pixels) */ 3135 case 3: /* set position (pixels) */
3459 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3136 XMoveWindow (dpy, parent[0], args[1], args[2]);
3460 break; 3137 break;
3461 case 4: /* set size (pixels) */ 3138 case 4: /* set size (pixels) */
3462 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3139 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3463 break; 3140 break;
3464 case 5: /* raise window */ 3141 case 5: /* raise window */
3465 XRaiseWindow (disp, TermWin.parent[0]); 3142 XRaiseWindow (dpy, parent[0]);
3466 break; 3143 break;
3467 case 6: /* lower window */ 3144 case 6: /* lower window */
3468 XLowerWindow (disp, TermWin.parent[0]); 3145 XLowerWindow (dpy, parent[0]);
3469 break; 3146 break;
3470 case 7: /* refresh window */ 3147 case 7: /* refresh window */
3471 scr_touch (true); 3148 scr_touch (true);
3472 break; 3149 break;
3473 case 8: /* set size (chars) */ 3150 case 8: /* set size (chars) */
3474 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3151 set_widthheight ((unsigned int) (args[2] * fwidth),
3475 (unsigned int) (args[1] * TermWin.fheight)); 3152 (unsigned int) (args[1] * fheight));
3476 break; 3153 break;
3477 3154
3478 //case 9: NYI, TODO, restore maximized window or maximize window 3155 //case 9: NYI, TODO, restore maximized window or maximize window
3479 default: 3156 default:
3480 if (args[0] >= 24) /* set height (chars) */ 3157 if (args[0] >= 24) /* set height (chars) */
3481 set_widthheight ((unsigned int)TermWin.width, 3158 set_widthheight ((unsigned int)width,
3482 (unsigned int) (args[1] * TermWin.fheight)); 3159 (unsigned int) (args[1] * fheight));
3483 break; 3160 break;
3484
3485 3161
3486 /* 3162 /*
3487 * reports - some output format copied from XTerm 3163 * reports - some output format copied from XTerm
3488 */ 3164 */
3489 case 11: /* report window state */ 3165 case 11: /* report window state */
3490 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3166 XGetWindowAttributes (dpy, parent[0], &wattr);
3491 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3167 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3492 break; 3168 break;
3493 case 13: /* report window position */ 3169 case 13: /* report window position */
3494 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3170 XGetWindowAttributes (dpy, parent[0], &wattr);
3495 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3171 XTranslateCoordinates (dpy, parent[0], wattr.root,
3496 -wattr.border_width, -wattr.border_width, 3172 -wattr.border_width, -wattr.border_width,
3497 &x, &y, &wdummy); 3173 &x, &y, &wdummy);
3498 tt_printf ("\033[3;%d;%dt", x, y); 3174 tt_printf ("\033[3;%d;%dt", x, y);
3499 break; 3175 break;
3500 case 14: /* report window size (pixels) */ 3176 case 14: /* report window size (pixels) */
3501 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3177 XGetWindowAttributes (dpy, parent[0], &wattr);
3502 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3178 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3503 break; 3179 break;
3504 case 18: /* report text area size (chars) */ 3180 case 18: /* report text area size (chars) */
3505 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3181 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3506 break; 3182 break;
3507 case 19: /* report window size (chars) */ 3183 case 19: /* report window size (chars) */
3508 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3184 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3509 break; 3185 break;
3510 case 20: /* report icon label */ 3186 case 20: /* report icon label */
3511 { 3187 {
3512 char *s; 3188 char *s;
3513 XGetIconName (disp, TermWin.parent[0], &s); 3189 XGetIconName (dpy, parent[0], &s);
3514 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3190 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3515 XFree (s); 3191 XFree (s);
3516 } 3192 }
3517 break; 3193 break;
3518 case 21: /* report window title */ 3194 case 21: /* report window title */
3519 { 3195 {
3520 char *s; 3196 char *s;
3521 XFetchName (disp, TermWin.parent[0], &s); 3197 XFetchName (dpy, parent[0], &s);
3522 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3198 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3523 XFree (s); 3199 XFree (s);
3524 } 3200 }
3525 break; 3201 break;
3526 } 3202 }
3527} 3203}
… …
3530/*----------------------------------------------------------------------*/ 3206/*----------------------------------------------------------------------*/
3531/* 3207/*
3532 * get input up until STRING TERMINATOR (or BEL) 3208 * get input up until STRING TERMINATOR (or BEL)
3533 * ends_how is terminator used. returned input must be free()'d 3209 * ends_how is terminator used. returned input must be free()'d
3534 */ 3210 */
3535unsigned char * 3211char *
3536rxvt_term::get_to_st (unicode_t &ends_how) 3212rxvt_term::get_to_st (unicode_t &ends_how)
3537{ 3213{
3538 unicode_t ch; 3214 unicode_t ch;
3539 bool seen_esc = false; 3215 bool seen_esc = false;
3540 unsigned int n = 0; 3216 unsigned int n = 0;
… …
3554 seen_esc = true; 3230 seen_esc = true;
3555 continue; 3231 continue;
3556 } 3232 }
3557 else if (ch == C0_BEL || ch == CHAR_ST) 3233 else if (ch == C0_BEL || ch == CHAR_ST)
3558 break; 3234 break;
3235 else if (ch == C0_SYN)
3236 ch = cmd_get8 ();
3559 else if (ch < 0x20) 3237 else if (ch < 0x20)
3560 return NULL; /* other control character - exit */ 3238 return NULL; /* other control character - exit */
3561 3239
3562 seen_esc = false; 3240 seen_esc = false;
3563 3241
3564 if (n >= sizeof (string) - 1) 3242 if (n >= STRING_MAX - 1)
3565 // stop at some sane length 3243 // stop at some sane length
3566 return NULL; 3244 return NULL;
3567 3245
3568 if (ch == C0_SYN)
3569 string[n++] = cmd_get8 ();
3570 else
3571 string[n++] = ch; 3246 string[n++] = ch;
3572 } 3247 }
3573 3248
3574 string[n++] = '\0'; 3249 string[n++] = '\0';
3575 3250
3576 ends_how = (ch == 0x5c ? C0_ESC : ch); 3251 ends_how = (ch == 0x5c ? C0_ESC : ch);
3577 3252
3578 return (unsigned char *)rxvt_wcstombs (string); 3253 return rxvt_wcstombs (string);
3579} 3254}
3580 3255
3581/*----------------------------------------------------------------------*/ 3256/*----------------------------------------------------------------------*/
3582/* 3257/*
3583 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3258 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3584 */ 3259 */
3585void 3260void
3586rxvt_term::process_dcs_seq () 3261rxvt_term::process_dcs_seq ()
3587{ 3262{
3588 unsigned char *s; 3263 char *s;
3589 unicode_t eh; 3264 unicode_t eh;
3590 3265
3591 /* 3266 /*
3592 * Not handled yet 3267 * Not handled yet
3593 */ 3268 */
… …
3612 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3287 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3613 arg = arg * 10 + (ch - '0'); 3288 arg = arg * 10 + (ch - '0');
3614 3289
3615 if (ch == ';') 3290 if (ch == ';')
3616 { 3291 {
3617 unsigned char *s = get_to_st (eh); 3292 char *s = get_to_st (eh);
3618 3293
3619 if (s) 3294 if (s)
3620 { 3295 {
3621 process_xterm_seq (arg, (char *)s, eh); 3296 process_xterm_seq (arg, s, eh);
3622 free (s); 3297 free (s);
3623 } 3298 }
3624 } 3299 }
3625} 3300}
3626 3301
3627void 3302void
3628rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3303rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3629{ 3304{
3630 if (str[0] == '?' && !str[1]) 3305 if (str[0] == '?' && !str[1])
3631 { 3306 {
3632 unsigned short r, g, b; 3307 rgba c;
3633 pix_colors_focused[color].get (display, r, g, b); 3308 pix_colors_focused[color].get (c);
3309
3310#if XFT
3311 if (c.a != rgba::MAX_CC)
3312 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3313 else
3314#endif
3634 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3315 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3635 } 3316 }
3636 else 3317 else
3637 set_window_color (color, str); 3318 set_window_color (color, str);
3638} 3319}
3639 3320
3640/* 3321/*
3641 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3322 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3642 * 0 = change iconName/title
3643 * 1 = change iconName
3644 * 2 = change title
3645 * 4 = change color
3646 * 10 = change fg color
3647 * 11 = change bg color
3648 * 12 = change text color
3649 * 13 = change mouse foreground color
3650 * 17 = change highlight character colour
3651 * 18 = change bold character color
3652 * 19 = change underlined character color
3653 * 46 = change logfile (not implemented)
3654 * 50 = change font
3655 *
3656 * rxvt extensions:
3657 * 20 = bg pixmap
3658 * 39 = change default fg color
3659 * 49 = change default bg color
3660 * 55 = dump scrollback buffer and all of screen
3661 * 701 = change locale
3662 * 702 = find font
3663 * 703 = menu
3664 */ 3323 */
3665void 3324void
3666rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3325rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3667{ 3326{
3668 int changed = 0;
3669 int color; 3327 int color;
3670 char *buf, *name; 3328 char *buf, *name;
3671 bool query = str[0] == '?' && !str[1]; 3329 bool query = str[0] == '?' && !str[1];
3672 int saveop = op; 3330 int saveop = op;
3673 dDisp; 3331
3332 dLocal (Display *, dpy);
3674 3333
3675 assert (str != NULL); 3334 assert (str != NULL);
3335
3336 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3337 return;
3338
3676 switch (op) 3339 switch (op)
3677 { 3340 {
3678 case XTerm_name: 3341 case XTerm_name:
3679 set_title (str); 3342 set_title (str);
3680 /* FALLTHROUGH */ 3343 /* FALLTHROUGH */
… …
3694 unsigned long bytes_after; 3357 unsigned long bytes_after;
3695 unsigned char *value = 0; 3358 unsigned char *value = 0;
3696 const char *str = ""; 3359 const char *str = "";
3697 3360
3698 if (prop 3361 if (prop
3699 && XGetWindowProperty (disp, TermWin.parent[0], 3362 && XGetWindowProperty (dpy, parent[0],
3700 prop, 0, 1<<16, 0, AnyPropertyType, 3363 prop, 0, 1<<16, 0, AnyPropertyType,
3701 &actual_type, &actual_format, 3364 &actual_type, &actual_format,
3702 &nitems, &bytes_after, &value) == Success 3365 &nitems, &bytes_after, &value) == Success
3703 && actual_type != None 3366 && actual_type != None
3704 && actual_format == 8) 3367 && actual_format == 8)
3705 str = (const char *)(value); 3368 str = (const char *)(value);
3706 3369
3707 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3370 tt_printf ("\033]%d;%s%c", op, str, resp);
3708 3371
3709 XFree (value); 3372 XFree (value);
3710 } 3373 }
3711 else 3374 else
3712 { 3375 {
… …
3716 { 3379 {
3717 *eq = 0; 3380 *eq = 0;
3718 set_utf8_property (display->atom (str), eq + 1); 3381 set_utf8_property (display->atom (str), eq + 1);
3719 } 3382 }
3720 else 3383 else
3721 XDeleteProperty (disp, TermWin.parent[0], 3384 XDeleteProperty (dpy, parent[0],
3722 display->atom (str)); 3385 display->atom (str));
3723 } 3386 }
3724 break; 3387 break;
3725 3388
3726 case XTerm_Color: 3389 case XTerm_Color:
… …
3728 { 3391 {
3729 if ((name = strchr (buf, ';')) == NULL) 3392 if ((name = strchr (buf, ';')) == NULL)
3730 break; 3393 break;
3731 3394
3732 *name++ = '\0'; 3395 *name++ = '\0';
3733 color = atoi (buf); 3396 color = atoi (buf) + minCOLOR;
3734 3397
3735 if (color < 0 || color >= TOTAL_COLORS) 3398 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3736 break; 3399 break;
3737 3400
3738 if ((buf = strchr (name, ';')) != NULL) 3401 if ((buf = strchr (name, ';')) != NULL)
3739 *buf++ = '\0'; 3402 *buf++ = '\0';
3740 3403
3741 if (name[0] == '?' && !name[1]) 3404 process_color_seq (op, color, name, resp);
3742 {
3743 unsigned short r, g, b;
3744 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3745 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3746 }
3747 else
3748 set_window_color (color + minCOLOR, name);
3749 } 3405 }
3750 break; 3406 break;
3751 case XTerm_Color00: 3407 case XTerm_Color00:
3752 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3408 process_color_seq (op, Color_fg, str, resp);
3753 break; 3409 break;
3754 case XTerm_Color01: 3410 case XTerm_Color01:
3755 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3411 process_color_seq (op, Color_bg, str, resp);
3756 break; 3412 break;
3757#ifndef NO_CURSORCOLOR 3413#ifndef NO_CURSORCOLOR
3758 case XTerm_Color_cursor: 3414 case XTerm_Color_cursor:
3759 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3415 process_color_seq (op, Color_cursor, str, resp);
3760 break; 3416 break;
3761#endif 3417#endif
3762 case XTerm_Color_pointer_fg: 3418 case XTerm_Color_pointer_fg:
3763 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3419 process_color_seq (op, Color_pointer_fg, str, resp);
3764 break; 3420 break;
3765 case XTerm_Color_pointer_bg: 3421 case XTerm_Color_pointer_bg:
3766 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3422 process_color_seq (op, Color_pointer_bg, str, resp);
3767 break; 3423 break;
3768#ifndef NO_BOLD_UNDERLINE_REVERSE 3424#ifndef NO_BOLD_UNDERLINE_REVERSE
3769 case XTerm_Color_BD:
3770 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3771 break;
3772 case XTerm_Color_IT:
3773 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3774 break;
3775 case XTerm_Color_UL:
3776 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3777 break;
3778 case XTerm_Color_RV: 3425 case XTerm_Color_RV:
3779 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3426 process_color_seq (op, Color_RV, str, resp);
3780 break; 3427 break;
3428 case Rxvt_Color_BD:
3429 case URxvt_Color_BD:
3430 process_color_seq (op, Color_BD, str, resp);
3431 break;
3432 case Rxvt_Color_UL:
3433 case URxvt_Color_UL:
3434 process_color_seq (op, Color_UL, str, resp);
3435 break;
3436 case URxvt_Color_IT:
3437 process_color_seq (op, Color_IT, str, resp);
3438 break;
3781#endif 3439#endif
3782#if TRANSPARENT && TINTING 3440#if ENABLE_TRANSPARENCY && TINTING
3783 case XTerm_Color_tint: 3441 case URxvt_Color_tint:
3784 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3442 process_color_seq (op, Color_tint, str, resp);
3443
3785 check_our_parents (); 3444 check_our_parents ();
3445
3786 if (am_transparent) 3446 if (am_transparent)
3787 want_full_refresh = want_refresh = 1; 3447 want_full_refresh = want_refresh = 1;
3788 break;
3789#endif
3790 3448
3449 break;
3450#endif
3451
3791 case XTerm_Pixmap: 3452 case Rxvt_Pixmap:
3453 {
3792 if (*str != ';') 3454 if (*str != ';')
3793 { 3455 {
3794#if XPM_BACKGROUND 3456#if XPM_BACKGROUND
3795 scale_pixmap (""); /* reset to default scaling */ 3457 scale_pixmap (""); /* reset to default scaling */
3796 set_bgPixmap (str); /* change pixmap */ 3458 set_bgPixmap (str); /* change pixmap */
3797#endif
3798 scr_touch (true); 3459 scr_touch (true);
3460#endif
3799 } 3461 }
3462
3463 int changed = 0;
3464
3800 while ((str = strchr (str, ';')) != NULL) 3465 while ((str = strchr (str, ';')) != NULL)
3801 { 3466 {
3802 str++; 3467 str++;
3803#if XPM_BACKGROUND 3468#if XPM_BACKGROUND
3804 changed += scale_pixmap (str); 3469 changed += scale_pixmap (str);
3805#endif 3470#endif
3806 } 3471 }
3807 3472
3808 if (changed) 3473 if (changed)
3809 { 3474 {
3810#ifdef XPM_BACKGROUND 3475#ifdef XPM_BACKGROUND
3811 resize_pixmap (); 3476 resize_pixmap ();
3812#endif
3813 scr_touch (true); 3477 scr_touch (true);
3478#endif
3814 } 3479 }
3480#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3484 }
3815 break; 3485 break;
3816 3486
3817 case XTerm_restoreFG: 3487 case Rxvt_restoreFG:
3818 set_window_color (Color_fg, str); 3488 set_window_color (Color_fg, str);
3819 break; 3489 break;
3820 case XTerm_restoreBG: 3490 case Rxvt_restoreBG:
3821 set_window_color (Color_bg, str); 3491 set_window_color (Color_bg, str);
3822 break; 3492 break;
3823 3493
3824 case XTerm_logfile: 3494 case XTerm_logfile:
3825 // TODO, when secure mode? 3495 // TODO, when secure mode?
3826 break; 3496 break;
3827 3497
3498#if 0
3499 case Rxvt_dumpscreen: /* no error notices */
3500 {
3501 int fd;
3502 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3503 {
3504 scr_dump (fd);
3505 close (fd);
3506 }
3507 }
3508 break;
3509#endif
3828 case XTerm_font: 3510 case XTerm_font:
3829 op = URxvt_font; 3511 op = URxvt_font;
3830 case URxvt_font: 3512 case URxvt_font:
3831#if ENABLE_STYLES 3513#if ENABLE_STYLES
3832 case URxvt_boldFont: 3514 case URxvt_boldFont:
3833 case URxvt_italicFont: 3515 case URxvt_italicFont:
3834 case URxvt_boldItalicFont: 3516 case URxvt_boldItalicFont:
3835#endif 3517#endif
3836 if (query) 3518 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", saveop, 3519 tt_printf ("\33]%d;%-.250s%c", saveop,
3838 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3520 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3839 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3521 ? fontset[op - URxvt_font]->fontdesc : "",
3840 resp); 3522 resp);
3841 else 3523 else
3842 { 3524 {
3843 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3525 const char *&res = rs[Rs_font + (op - URxvt_font)];
3844 3526
… …
3846 allocated.push_back ((void *)res); 3528 allocated.push_back ((void *)res);
3847 set_fonts (); 3529 set_fonts ();
3848 } 3530 }
3849 break; 3531 break;
3850 3532
3851#if ENABLE_FRILLS 3533 case URxvt_version:
3852 case XTerm_locale:
3853 if (query) 3534 if (query)
3535 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3536 op,
3537 rs[Rs_name], VERSION[0], VERSION[2],
3538 resp);
3539 break;
3540
3541#if !ENABLE_MINIMAL
3542 case URxvt_locale:
3543 if (query)
3854 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3544 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3855 else 3545 else
3856 { 3546 {
3857 set_locale (str); 3547 set_locale (str);
3858 pty.set_utf8_mode (enc_utf8); 3548 pty->set_utf8_mode (enc_utf8);
3859# ifdef USE_XIM
3860 im_cb (); 3549 init_xlocale ();
3861# endif
3862 } 3550 }
3863 break; 3551 break;
3864#endif
3865 3552
3866#ifdef MENUBAR 3553 case URxvt_view_up:
3867 case XTerm_Menu: 3554 case URxvt_view_down:
3868 if (options & Opt_insecure) 3555 {
3869 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3556 int lines = atoi (str);
3557
3558 if (lines)
3559 scr_page (op == URxvt_view_up ? UP : DN, lines);
3560 else
3561 scr_erase_savelines ();
3562 }
3563
3870 break; 3564 break;
3871#endif 3565#endif
3872#if 0 3566
3873 case XTerm_dumpscreen: /* no error notices */ 3567#if ENABLE_PERL
3874 { 3568 case URxvt_perl:
3875 int fd; 3569 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3876 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3570 ; // no responses yet
3877 {
3878 scr_dump (fd);
3879 close (fd);
3880 }
3881 }
3882 break; 3571 break;
3883#endif 3572#endif
3884 } 3573 }
3885} 3574}
3886/*----------------------------------------------------------------------*/ 3575/*----------------------------------------------------------------------*/
… …
3917 return state; 3606 return state;
3918} 3607}
3919 3608
3920/* we're not using priv _yet_ */ 3609/* we're not using priv _yet_ */
3921void 3610void
3922rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3611rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3923{ 3612{
3924 unsigned int i, j; 3613 unsigned int i, j;
3925 int state; 3614 int state;
3926 3615
3927 static const struct 3616 static const struct
… …
3938 { 5, PrivMode_rVideo }, 3627 { 5, PrivMode_rVideo },
3939 { 6, PrivMode_relOrigin }, 3628 { 6, PrivMode_relOrigin },
3940 { 7, PrivMode_Autowrap }, 3629 { 7, PrivMode_Autowrap },
3941 // 8, bi-directional support mode 3630 // 8, bi-directional support mode
3942 { 9, PrivMode_MouseX10 }, 3631 { 9, PrivMode_MouseX10 },
3943#ifdef menuBar_esc
3944 { menuBar_esc, PrivMode_menuBar },
3945#endif
3946 // 18, 19 printing-related 3632 // 18, 19 printing-related
3947 { 25, PrivMode_VisibleCursor }, 3633 { 25, PrivMode_VisibleCursor },
3948#ifdef scrollBar_esc 3634#ifdef scrollBar_esc
3949 { scrollBar_esc, PrivMode_scrollBar }, 3635 { scrollBar_esc, PrivMode_scrollBar },
3950#endif 3636#endif
… …
3995 } 3681 }
3996 3682
3997 /* extra handling for values with state unkept */ 3683 /* extra handling for values with state unkept */
3998 switch (arg[i]) 3684 switch (arg[i])
3999 { 3685 {
3686#if ENABLE_STYLES
3687 case 1021:
3688 set_option (Opt_intensityStyles, mode);
3689
3690 scr_touch (true);
3691 break;
3692#endif
4000 case 1048: /* alternative cursor save */ 3693 case 1048: /* alternative cursor save */
4001 case 1049: 3694 case 1049:
4002 if (options & Opt_secondaryScreen) 3695 if (option (Opt_secondaryScreen))
4003 if (mode == 0) 3696 if (mode == 0)
4004 scr_cursor (RESTORE); 3697 scr_cursor (RESTORE);
4005 else if (mode == 1) 3698 else if (mode == 1)
4006 scr_cursor (SAVE); 3699 scr_cursor (SAVE);
4007 break; 3700 break;
… …
4019 */ 3712 */
4020 PrivMode (1, PrivMode_vt52); 3713 PrivMode (1, PrivMode_vt52);
4021 break; 3714 break;
4022 case 3: /* 80/132 */ 3715 case 3: /* 80/132 */
4023 if (priv_modes & PrivMode_132OK) 3716 if (priv_modes & PrivMode_132OK)
4024 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3717 set_widthheight (((state ? 132 : 80) * fwidth), height);
4025 break; 3718 break;
4026 case 4: /* smooth scrolling */ 3719 case 4: /* smooth scrolling */
4027 if (state)
4028 options &= ~Opt_jumpScroll;
4029 else
4030 options |= Opt_jumpScroll; 3720 set_option (Opt_jumpScroll, !state);
4031 break; 3721 break;
4032 case 5: /* reverse video */ 3722 case 5: /* reverse video */
4033 scr_rvideo_mode (state); 3723 scr_rvideo_mode (state);
4034 break; 3724 break;
4035 case 6: /* relative/absolute origins */ 3725 case 6: /* relative/absolute origins */
… …
4041 /* case 8: - auto repeat, can't do on a per window basis */ 3731 /* case 8: - auto repeat, can't do on a per window basis */
4042 case 9: /* X10 mouse reporting */ 3732 case 9: /* X10 mouse reporting */
4043 if (state) /* orthogonal */ 3733 if (state) /* orthogonal */
4044 priv_modes &= ~PrivMode_MouseX11; 3734 priv_modes &= ~PrivMode_MouseX11;
4045 break; 3735 break;
4046#ifdef menuBar_esc
4047 case menuBar_esc:
4048#ifdef MENUBAR
4049 map_menuBar (state);
4050#endif
4051 break;
4052#endif
4053#ifdef scrollBar_esc 3736#ifdef scrollBar_esc
4054 case scrollBar_esc: 3737 case scrollBar_esc:
4055 if (scrollbar_mapping (state)) 3738 if (scrollbar_mapping (state))
4056 { 3739 {
4057 resize_all_windows (0, 0, 0); 3740 resize_all_windows (0, 0, 0);
… …
4076#if 0 3759#if 0
4077 case 1001: 3760 case 1001:
4078 break; /* X11 mouse highlighting */ 3761 break; /* X11 mouse highlighting */
4079#endif 3762#endif
4080 case 1010: /* scroll to bottom on TTY output inhibit */ 3763 case 1010: /* scroll to bottom on TTY output inhibit */
4081 if (state)
4082 options &= ~Opt_scrollTtyOutput;
4083 else
4084 options |= Opt_scrollTtyOutput; 3764 set_option (Opt_scrollTtyOutput, !state);
4085 break; 3765 break;
4086 case 1011: /* scroll to bottom on key press */ 3766 case 1011: /* scroll to bottom on key press */
4087 if (state)
4088 options |= Opt_scrollTtyKeypress; 3767 set_option (Opt_scrollTtyKeypress, state);
4089 else
4090 options &= ~Opt_scrollTtyKeypress;
4091 break; 3768 break;
4092 case 1047: /* secondary screen w/ clearing last */ 3769 case 1047: /* secondary screen w/ clearing last */
4093 if (options & Opt_secondaryScreen) 3770 if (option (Opt_secondaryScreen))
4094 if (current_screen != PRIMARY) 3771 if (current_screen != PRIMARY)
4095 scr_erase_screen (2); 3772 scr_erase_screen (2);
4096 scr_change_screen (state); 3773 scr_change_screen (state);
4097 break; 3774 break;
4098 case 1049: /* secondary screen w/ clearing first */ 3775 case 1049: /* secondary screen w/ clearing first */
4099 scr_change_screen (state); 3776 scr_change_screen (state);
4100 if (options & Opt_secondaryScreen) 3777 if (option (Opt_secondaryScreen))
4101 if (current_screen != PRIMARY) 3778 if (current_screen != PRIMARY)
4102 scr_erase_screen (2); 3779 scr_erase_screen (2);
4103 break; 3780 break;
4104 default: 3781 default:
4105 break; 3782 break;
… …
4233 scr_color (Color_bg, Color_bg); 3910 scr_color (Color_bg, Color_bg);
4234 break; 3911 break;
4235 3912
4236 //case 50: // not variable spacing 3913 //case 50: // not variable spacing
4237 3914
4238#ifndef NO_BRIGHTCOLOR 3915#if !ENABLE_MINIMAL
4239 case 90: 3916 case 90:
4240 case 91: /* set bright fg color */ 3917 case 91: /* set bright fg color */
4241 case 92: 3918 case 92:
4242 case 93: 3919 case 93:
4243 case 94: 3920 case 94:
… …
4255 case 106: 3932 case 106:
4256 case 107: 3933 case 107:
4257 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3934 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4258 break; 3935 break;
4259#endif 3936#endif
4260
4261 } 3937 }
4262 } 3938 }
4263} 3939}
4264/*}}} */ 3940/*}}} */
4265 3941
… …
4289 */ 3965 */
4290void 3966void
4291rxvt_term::tt_printf (const char *fmt,...) 3967rxvt_term::tt_printf (const char *fmt,...)
4292{ 3968{
4293 va_list arg_ptr; 3969 va_list arg_ptr;
4294 unsigned char buf[256]; 3970 char buf[256];
4295 3971
4296 va_start (arg_ptr, fmt); 3972 va_start (arg_ptr, fmt);
4297 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3973 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4298 va_end (arg_ptr); 3974 va_end (arg_ptr);
4299 tt_write (buf, strlen (buf)); 3975 tt_write (buf, strlen (buf));
… …
4304 * or generated by us in response to a query ESC sequence. 3980 * or generated by us in response to a query ESC sequence.
4305 */ 3981 */
4306const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3982const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4307 3983
4308void 3984void
4309rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3985rxvt_term::tt_write (const char *data, unsigned int len)
4310{ 3986{
3987 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3988 return;
3989
3990 if (pty->pty < 0)
3991 return;
3992
4311 if (v_buflen == 0) 3993 if (v_buflen == 0)
4312 { 3994 {
4313 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3995 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4314 3996
4315 if ((unsigned int)written == len) 3997 if ((unsigned int)written == len)
4316 return; 3998 return;
4317 3999
4318 data += written; 4000 data += written;
4319 len -= written; 4001 len -= written;
4320 } 4002 }
4321 4003
4322 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4004 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4323 4005
4324 memcpy (v_buffer + v_buflen, data, len); 4006 memcpy (v_buffer + v_buflen, data, len);
4325 v_buflen += len; 4007 v_buflen += len;
4326 4008
4327 pty_ev.set (EVENT_READ | EVENT_WRITE); 4009 pty_ev.set (EVENT_READ | EVENT_WRITE);
4328} 4010}
4329 4011
4330void rxvt_term::pty_write () 4012void rxvt_term::pty_write ()
4331{ 4013{
4332 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4014 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4333 4015
4334 if (written > 0) 4016 if (written > 0)
4335 { 4017 {
4336 v_buflen -= written; 4018 v_buflen -= written;
4337 4019
… …
4346 } 4028 }
4347 4029
4348 memmove (v_buffer, v_buffer + written, v_buflen); 4030 memmove (v_buffer, v_buffer + written, v_buflen);
4349 } 4031 }
4350 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4032 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4351 // original code just ignores this... 4033 pty_ev.set (EVENT_READ);
4352 destroy ();
4353} 4034}
4354 4035
4355/*----------------------- end-of-file (C source) -----------------------*/ 4036/*----------------------- end-of-file (C source) -----------------------*/
4356 4037

Diff Legend

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