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.205 by root, Wed Jul 13 03:11:51 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, *fname; 168 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 169 int len;
170 170
171 fname = rxvt_utf8towcs (f->name); 171 fname = rxvt_utf8towcs (f->name);
172 172
173#if ENABLE_COMBINING 173# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
175 { 175 {
176 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
179 } 179 }
180 else 180 else
181#endif 181# endif
182 { 182 {
183 ch2 = ch; 183 ch2 = ch;
184 184
185 alloc = 0; 185 alloc = 0;
186 chr = &ch2; 186 chr = &ch2;
187 len = 1; 187 len = 1;
188 } 188 }
189 189
190 char attr[80]; // plenty
191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
190 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
191 203
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
193 214
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195 216
196 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
197 { 218 {
… …
200 ch = *chr++; 221 ch = *chr++;
201 222
202 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
205#if !UNICODE3 226# if !UNICODE3
206 if (ch >= 0x10000) 227 if (ch >= 0x10000)
207 ch = 0xfffd; 228 ch = 0xfffd;
208#endif 229# endif
209 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
210 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
211 } 234 }
212 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
241 scr_overlay_set (0, len , attr);
213 scr_overlay_set (0, len, fname); 242 scr_overlay_set (0, len + 1, fname);
214 243
215 free (fname); 244 free (fname);
216 245
217#if ENABLE_COMBINING 246# if ENABLE_COMBINING
218 if (alloc) 247 if (alloc)
219 delete [] alloc; 248 delete [] alloc;
220#endif 249# endif
221} 250}
222#endif 251#endif
223 252
224void 253void
225rxvt_term::commit_iso14755 () 254rxvt_term::commit_iso14755 ()
… …
242 mb[0] = ch[0]; 271 mb[0] = ch[0];
243 len = 1; 272 len = 1;
244 } 273 }
245 274
246 if (len > 0) 275 if (len > 0)
247 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
248 else 277 else
249 scr_bell (); 278 scr_bell ();
250 } 279 }
251 280
252 iso14755buf = 0; 281 iso14755buf = 0;
… …
269 298
270 return -1; 299 return -1;
271} 300}
272#endif 301#endif
273 302
274/*{{{ Convert the keypress event into a string */
275void 303void
276rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
277{ 305{
278 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
279 unsigned int newlen; 307 unsigned int newlen;
280 KeySym keysym; 308 KeySym keysym;
281#ifdef DEBUG_CMD
282 static int debug_key = 1; /* accessible by a debugger only */
283#endif
284 int valid_keysym; 309 int valid_keysym;
285 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
286 316
287 /* 317 /*
288 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
289 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
290 * 320 *
… …
308 Status status_return; 338 Status status_return;
309 339
310#if 0 340#if 0
311#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
312 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 342 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
313 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
314 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
315 else 345 else
316#endif 346#endif
317#endif 347#endif
318 { 348 {
… …
355 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
356 } 386 }
357 else 387 else
358#endif 388#endif
359 { 389 {
360 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
361 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
362 } 392 }
363 393
364 if (valid_keysym) 394 if (valid_keysym)
365 { 395 {
366#ifdef KEYSYM_RESOURCE 396#ifdef KEYSYM_RESOURCE
367 if (keyboard->dispatch (this, keysym, ev.state)) 397 if (keyboard->dispatch (this, keysym, ev.state))
368 return; 398 return;
369#endif 399#endif
370 400
371 if (TermWin.saveLines) 401 if (saveLines)
372 { 402 {
373#ifdef UNSHIFTED_SCROLLKEYS 403#ifdef UNSHIFTED_SCROLLKEYS
374 if (!ctrl && !meta) 404 if (!ctrl && !meta)
375#else 405#else
376 if (IS_SCROLL_MOD) 406 if (IS_SCROLL_MOD)
377#endif 407#endif
378 { 408 {
379 int lnsppg; 409 int lnsppg;
380 410
381#ifdef PAGING_CONTEXT_LINES 411#ifdef PAGING_CONTEXT_LINES
382 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 412 lnsppg = nrow - PAGING_CONTEXT_LINES;
383#else 413#else
384 lnsppg = TermWin.nrow * 4 / 5; 414 lnsppg = nrow * 4 / 5;
385#endif 415#endif
386 if (keysym == XK_Prior) 416 if (keysym == XK_Prior)
387 { 417 {
388 scr_page (UP, lnsppg); 418 scr_page (UP, lnsppg);
389 return; 419 return;
… …
417 scr_move_to (0, 1); 447 scr_move_to (0, 1);
418 return; 448 return;
419 } 449 }
420 else if (keysym == XK_End) 450 else if (keysym == XK_End)
421 { 451 {
422 scr_move_to (1, 0); 452 scr_move_to (1, 1);
423 return; 453 return;
424 } 454 }
425 } 455 }
426#endif 456#endif
427 } 457 }
… …
438 { 468 {
439 switch (keysym) 469 switch (keysym)
440 { 470 {
441 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
442 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
443 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
444 return; 474 return;
445#if TODO 475#if TODO
446 /* rxvt extras */ 476 /* rxvt extras */
447 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
448 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
467 { 497 {
468 commit_iso14755 (); 498 commit_iso14755 ();
469 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
470# if ISO_14755 500# if ISO_14755
471 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
472# endif 510# endif
473 return; 511 return;
474 } 512 }
475 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
476 { 514 {
… …
498 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
499 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
500# endif 538# endif
501 } 539 }
502#endif 540#endif
503 541
504#ifdef PRINTPIPE 542#ifdef PRINTPIPE
505 if (keysym == XK_Print) 543 if (keysym == XK_Print)
506 { 544 {
507 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
508 return; 546 return;
… …
829 { 867 {
830#ifdef META8_OPTION 868#ifdef META8_OPTION
831 /* set 8-bit on */ 869 /* set 8-bit on */
832 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
833 { 871 {
834 unsigned char *ch; 872 char *ch;
835 873
836 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
837 *ch |= 0x80; 875 *ch |= 0x80;
838 876
839 meta = 0; 877 meta = 0;
… …
841#endif 879#endif
842 /* nil */ ; 880 /* nil */ ;
843 } 881 }
844 } 882 }
845 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
846 if (len <= 0) 887 if (len <= 0)
847 return; /* not mapped */ 888 return; /* not mapped */
848 889
849 if (options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
850 if (TermWin.view_start) 891 if (view_start)
851 { 892 {
852 TermWin.view_start = 0; 893 view_start = 0;
853 want_refresh = 1; 894 want_refresh = 1;
854 } 895 }
855 896
856 /* 897 /*
857 * these modifications only affect the static keybuffer 898 * these modifications only affect the static keybuffer
… …
872#ifdef META8_OPTION 913#ifdef META8_OPTION
873 && meta_char == C0_ESC 914 && meta_char == C0_ESC
874#endif 915#endif
875 ) 916 )
876 { 917 {
877 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
878 tt_write (&ch, 1); 919 tt_write (&ch, 1);
879 } 920 }
880 921
881#if defined(DEBUG_CMD)
882 /* Display keyboard buffer contents */
883 unsigned char *p;
884 int i;
885
886 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
887 for (i = 0, p = kbuf; i < len; i++, p++)
888 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
889 fprintf (stderr, "'\n");
890#endif /* DEBUG_CMD */
891 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
892} 923}
893/*}}} */
894 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (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
895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
897/* attempt to `write' count to the input buffer */
898unsigned int 1003unsigned int
899rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
900{ 1005{
901 unsigned int n, s; 1006 unsigned int n, s;
902 1007
903 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
904 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
930void 1035void
931rxvt_term::flush () 1036rxvt_term::flush ()
932{ 1037{
933 flush_ev.stop (); 1038 flush_ev.stop ();
934 1039
935#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
936 if (want_full_refresh) 1041 if (want_full_refresh)
937 { 1042 {
938 want_full_refresh = 0; 1043 want_full_refresh = 0;
939 scr_clear (); 1044 scr_clear ();
940 scr_touch (false); 1045 scr_touch (false);
941 } 1046 }
942#endif 1047#endif
943 1048
944 if (want_refresh) 1049 if (want_refresh)
945 { 1050 {
1051 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1052 {
1053 int row = view_start;
1054 int end_row = row + nrow;
1055
1056 while (row > top_row && ROW (row - 1).is_longer ())
1057 --row;
1058
1059 do
1060 {
1061 int start_row = row;
1062 line_t *l;
1063
1064 do
1065 {
1066 l = &ROW (row++);
1067
1068 if (!(l->f & LINE_FILTERED))
1069 {
1070 // line not filtered, mark it as filtered
1071 l->f |= LINE_FILTERED;
1072 while (l->is_longer ())
1073 {
1074 l = &ROW (row++);
1075 l->f |= LINE_FILTERED;
1076 }
1077
1078 // and filter it
1079 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1080
1081 break;
1082 }
1083 }
1084 while (l->is_longer () && row < end_row);
1085 }
1086 while (row < end_row);
1087 }
1088
946 scr_refresh (refresh_type); 1089 scr_refresh ();
947 scrollbar_show (1); 1090 scrollbar_show (1);
948#ifdef USE_XIM 1091#ifdef USE_XIM
949 IMSendSpot (); 1092 IMSendSpot ();
950#endif 1093#endif
951 } 1094 }
… …
954} 1097}
955 1098
956void 1099void
957rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
958{ 1101{
959 SET_R (this); 1102 make_current ();
960 SET_LOCALE (locale);
961 1103
962 display->flush (); 1104 display->flush ();
963 1105
964 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
965 flush_ev.start (NOW + 0.01); 1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
966} 1108}
967 1109
968void 1110void
969rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
970{ 1112{
971 SET_R (this); 1113 make_current ();
972 SET_LOCALE (locale);
973 1114
974 refresh_limit = 1;
975 refresh_count = 0; 1115 refresh_count = 0;
976 flush (); 1116 flush ();
977} 1117}
978 1118
979#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
… …
981rxvt_term::cursor_blink_cb (time_watcher &w) 1121rxvt_term::cursor_blink_cb (time_watcher &w)
982{ 1122{
983 hidden_cursor = !hidden_cursor; 1123 hidden_cursor = !hidden_cursor;
984 want_refresh = 1; 1124 want_refresh = 1;
985 1125
986 w.start (w.at + BLINK_INTERVAL); 1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
987} 1127}
988#endif 1128#endif
989 1129
990#ifdef TEXT_BLINK 1130#ifdef TEXT_BLINK
991void 1131void
… …
1005rxvt_term::cont_scroll_cb (time_watcher &w) 1145rxvt_term::cont_scroll_cb (time_watcher &w)
1006{ 1146{
1007 if ((scrollbar_isUp() || scrollbar_isDn()) && 1147 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1008 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1148 scr_page (scrollbar_isUp() ? UP : DN, 1))
1009 { 1149 {
1010 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1; 1150 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1013 } 1152 }
1014} 1153}
1015#endif 1154#endif
… …
1019rxvt_term::sel_scroll_cb (time_watcher &w) 1158rxvt_term::sel_scroll_cb (time_watcher &w)
1020{ 1159{
1021 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1160 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1022 { 1161 {
1023 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1162 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1024 refresh_type |= SMOOTH_REFRESH;
1025 want_refresh = 1; 1163 want_refresh = 1;
1026 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1027 } 1165 }
1028} 1166}
1029#endif 1167#endif
… …
1034{ 1172{
1035 if (mouse_slip_wheel_speed == 0 1173 if (mouse_slip_wheel_speed == 0
1036 || 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)
1037 : scr_page (UP, mouse_slip_wheel_speed)) 1175 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1176 {
1039 if (TermWin.view_start == TermWin.nscrolled || 1177 if (view_start == top_row || view_start == 0)
1040 TermWin.view_start == 0)
1041 mouse_slip_wheel_speed = 0; 1178 mouse_slip_wheel_speed = 0;
1042 1179
1043 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1180 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1046 } 1182 }
1047} 1183}
1048#endif 1184#endif
1049 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
1050bool 1211bool
1051rxvt_term::pty_fill () 1212rxvt_term::pty_fill ()
1052{ 1213{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1214 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1215
1055 if (CBUFSIZ == n) 1216 if (CBUFSIZ == n)
1056 { 1217 {
1057 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");
1058 n = 0; 1219 n = 0;
1059 } 1220 }
1060 1221
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1223 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1224 cmdbuf_endp = cmdbuf_ptr + n;
1064 1225
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1066 1227
1067 if (n > 0) 1228 if (r > 0)
1068 { 1229 {
1069 cmdbuf_endp += n; 1230 cmdbuf_endp += r;
1070 return true; 1231 return true;
1071 } 1232 }
1072 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))
1073 destroy (); 1245 destroy ();
1074 1246 }
1247
1075 return false; 1248 return false;
1076} 1249}
1077 1250
1078void 1251void
1079rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
1080{ 1253{
1081 SET_R (this); 1254 make_current ();
1082 SET_LOCALE (locale);
1083 1255
1084 if (revents & EVENT_READ) 1256 if (revents & EVENT_READ)
1085 // loop, but don't allow a single term to monopolize us 1257 // loop, but don't allow a single term to monopolize us
1086 while (pty_fill ()) 1258 while (pty_fill ())
1087 if (cmd_parse ()) 1259 if (cmd_parse ())
… …
1092} 1264}
1093 1265
1094void 1266void
1095rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1096{ 1268{
1097 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1098 recolour_cursor (); 1270 recolour_cursor ();
1099 1271
1100#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1273 hidden_pointer = 0;
1102 1274
1103 if (options & Opt_pointerBlank) 1275 if (option (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1105#endif 1277#endif
1106} 1278}
1107 1279
1108#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1109void 1281void
1110rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1111{ 1283{
1112 if (! (options & Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1113 return; 1285 return;
1114 1286
1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1116 XFlush (display->display); 1288 XFlush (dpy);
1117 1289
1118 hidden_pointer = 1; 1290 hidden_pointer = 1;
1119} 1291}
1120 1292
1121void 1293void
1122rxvt_term::pointer_cb (time_watcher &w) 1294rxvt_term::pointer_cb (time_watcher &w)
1123{ 1295{
1124 SET_R (this); 1296 make_current ();
1125 SET_LOCALE (locale);
1126 1297
1127 pointer_blank (); 1298 pointer_blank ();
1128} 1299}
1129#endif 1300#endif
1130 1301
… …
1195 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
1196 (32 + x + 1), 1367 (32 + x + 1),
1197 (32 + y + 1)); 1368 (32 + y + 1));
1198} 1369}
1199 1370
1200#ifdef USING_W11LIB
1201void
1202rxvt_W11_process_x_event (XEvent *ev)
1203{
1204 rxvt_t *r = rxvt_get_r ();
1205
1206 x_cb (*ev);
1207}
1208#endif
1209
1210/*{{{ process an X event */ 1371/*{{{ process an X event */
1211void 1372void
1212rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1213{ 1374{
1214 dDisp; 1375 make_current ();
1215 1376
1216 SET_R (this); 1377 dLocal (Display *, dpy);
1217 SET_LOCALE (locale);
1218 1378
1219#if defined(CURSOR_BLINK) 1379 if (ev.xany.window == vt
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1221 { 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1222 if (hidden_cursor) 1382 return;
1223 {
1224 hidden_cursor = 0;
1225 want_refresh = 1;
1226 }
1227 1383
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1384 // for XQueryPointer
1229 }
1230#endif
1231
1232#if defined(POINTER_BLANK)
1233 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1234 {
1235 if (ev.type == MotionNotify
1236 || ev.type == ButtonPress
1237 || ev.type == ButtonRelease)
1238 if (hidden_pointer)
1239 pointer_unblank ();
1240
1241 if (ev.type == KeyPress && hidden_pointer == 0)
1242 pointer_blank ();
1243 }
1244#endif
1245
1246 Window unused_root, unused_child; 1385 Window unused_root, unused_child;
1247 int unused_root_x, unused_root_y; 1386 int unused_root_x, unused_root_y;
1248 unsigned int unused_mask; 1387 unsigned int unused_mask;
1249 1388
1250 switch (ev.type) 1389 switch (ev.type)
1251 { 1390 {
1252 case KeyPress: 1391 case KeyPress:
1253#if ISO_14755 1392 key_press (ev.xkey);
1254 if (!(iso14755buf & ISO_14755_52))
1255#endif
1256 lookup_key (ev.xkey);
1257
1258 break; 1393 break;
1259 1394
1260 case KeyRelease: 1395 case KeyRelease:
1261 { 1396 key_release (ev.xkey);
1262#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1263 KeySym ks;
1264
1265 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1266#endif
1267
1268#if ENABLE_FRILLS || ISO_14755
1269 // ISO 14755 support
1270 if (iso14755buf)
1271 if (iso14755buf & ISO_14755_52)
1272 {
1273# if ENABLE_OVERLAY
1274 scr_overlay_off ();
1275# endif
1276# if ISO_14755
1277 // iso14755 part 5.2 handling: release time
1278 // first: controls
1279 if ((ev.xkey.state & ControlMask)
1280 && ((ks >= 0x40 && ks <= 0x5f)
1281 || (ks >= 0x61 && ks <= 0x7f)))
1282 {
1283 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1284 commit_iso14755 ();
1285 return; // case-break;
1286 }
1287
1288 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1289 if (i[0] == ks)
1290 {
1291 iso14755buf = ISO_14755_51 | i[1];
1292 commit_iso14755 ();
1293 return; // case-break;
1294 }
1295
1296 scr_bell ();
1297# endif
1298 iso14755buf = 0;
1299 break;
1300 }
1301 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1302 {
1303# if ENABLE_OVERLAY
1304 scr_overlay_off ();
1305# endif
1306 if (iso14755buf & ISO_14755_51)
1307 commit_iso14755 ();
1308#if ISO_14755
1309 else if (iso14755buf & ISO_14755_STARTED)
1310 {
1311 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1312
1313 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1314 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1315 }
1316# endif
1317 else
1318 iso14755buf = 0;
1319 }
1320#endif
1321
1322#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1323 if (!(ev.xkey.state & ControlMask))
1324 slip_wheel_ev.stop ();
1325 else if (ks == XK_Control_L || ks == XK_Control_R)
1326 mouse_slip_wheel_speed = 0;
1327#endif
1328 break; 1397 break;
1329 }
1330 1398
1331 case ButtonPress: 1399 case ButtonPress:
1332 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1333 break; 1401 break;
1334 1402
… …
1336 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1337 break; 1405 break;
1338 1406
1339 case ClientMessage: 1407 case ClientMessage:
1340 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1409 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1342 { 1410 {
1411 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1412 {
1413 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1414 {
1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1416 {
1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1344 destroy (); 1418 destroy ();
1419 }
1345#if ENABLE_EWMH 1420#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev); 1424 &ev);
1425#endif
1426 }
1427 }
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 }
1350#endif 1436#endif
1351 } 1437 }
1352#if ENABLE_XEMBED
1353 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1354 {
1355 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1356 focus_in ();
1357 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1358 focus_out ();
1359 }
1360#endif
1361#ifdef OFFIX_DND
1362 /* OffiX Dnd (drag 'n' drop) protocol */
1363 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1364 && (ev.xclient.data.l[0] == DndFile
1365 || ev.xclient.data.l[0] == DndDir
1366 || ev.xclient.data.l[0] == DndLink))
1367 {
1368 /* Get Dnd data */
1369 Atom ActualType;
1370 int ActualFormat;
1371 unsigned char *data;
1372 unsigned long Size, RemainingBytes;
1373
1374 XGetWindowProperty (disp, display->root,
1375 xa[XA_DNDSELECTION],
1376 0L, 1000000L,
1377 False, AnyPropertyType,
1378 &ActualType, &ActualFormat,
1379 &Size, &RemainingBytes,
1380 &data);
1381 set_string_property (XA_CUT_BUFFER0, data);
1382 XFree (data);
1383 selection_paste (display->root, XA_CUT_BUFFER0, true);
1384 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1385 }
1386#endif /* OFFIX_DND */
1387 break; 1438 break;
1388 1439
1389 case MappingNotify: 1440 case MappingNotify:
1390 XRefreshKeyboardMapping (&ev.xmapping); 1441 XRefreshKeyboardMapping (&ev.xmapping);
1391 break; 1442 break;
… …
1414 break; 1465 break;
1415 } 1466 }
1416 break; 1467 break;
1417 1468
1418 case FocusIn: 1469 case FocusIn:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1419 focus_in (); 1473 focus_in ();
1420 break; 1474 break;
1421 1475
1422 case FocusOut: 1476 case FocusOut:
1477 if (ev.xfocus.detail != NotifyInferior
1478 && ev.xfocus.detail != NotifyPointer
1479 && ev.xfocus.mode != NotifyGrab)
1423 focus_out (); 1480 focus_out ();
1424 break; 1481 break;
1425 1482
1426 case ConfigureNotify: 1483 case ConfigureNotify:
1427 if (ev.xconfigure.window == TermWin.parent[0]) 1484 if (ev.xconfigure.window == parent[0])
1428 { 1485 {
1429 int height, width;
1430
1431 do
1432 { /* Wrap lots of configures into one */
1433 width = ev.xconfigure.width;
1434 height = ev.xconfigure.height;
1435 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1436 }
1437 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1486 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1487 ;
1438 1488
1439 if (szHint.width != width || szHint.height != height) 1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1440 { 1490 {
1441 seen_resize = 1; 1491 seen_resize = 1;
1442 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
1443 } 1500 }
1444 1501
1445#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
1446 if (options & Opt_transparent) 1505 if (option (Opt_transparent))
1447 check_our_parents (); 1506 check_our_parents ();
1448#endif 1507#endif
1449 } 1508 }
1450 break; 1509 break;
1451 1510
1452 case PropertyNotify: 1511 case PropertyNotify:
1512 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1453 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1513 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1454 && ev.xproperty.state == PropertyNewValue) 1514 && ev.xproperty.state == PropertyNewValue)
1455 selection_property (ev.xproperty.window, ev.xproperty.atom); 1515 selection_property (ev.xproperty.window, ev.xproperty.atom);
1456 1516
1457 break; 1517 break;
1458 1518
1459 case SelectionClear: 1519 case SelectionClear:
1460 selection_clear (); 1520 selection_clear ();
… …
1467 1527
1468 case SelectionRequest: 1528 case SelectionRequest:
1469 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1470 break; 1530 break;
1471 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
1472 case UnmapNotify: 1540 case UnmapNotify:
1473 TermWin.mapped = 0; 1541 mapped = 0;
1474#ifdef TEXT_BLINK 1542#ifdef TEXT_BLINK
1475 text_blink_ev.stop (); 1543 text_blink_ev.stop ();
1476#endif 1544#endif
1545 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1477 break; 1546 break;
1478 1547
1479 case MapNotify:
1480 TermWin.mapped = 1;
1481#ifdef TEXT_BLINK
1482 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1483#endif
1484 break;
1485
1486#ifdef TRANSPARENT 1548#ifdef ENABLE_TRANSPARENCY
1487 case ReparentNotify: 1549 case ReparentNotify:
1488 rootwin_cb (ev); 1550 rootwin_cb (ev);
1489 break; 1551 break;
1490#endif /* TRANSPARENT */ 1552#endif /* ENABLE_TRANSPARENCY */
1491 1553
1492 case GraphicsExpose: 1554 case GraphicsExpose:
1493 case Expose: 1555 case Expose:
1494 if (ev.xany.window == TermWin.vt) 1556 if (ev.xany.window == vt)
1495 { 1557 {
1496 do 1558 do
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1559 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1560 ev.xexpose.width, ev.xexpose.height, False);
1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1500 1562
1501 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1563 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1502 1564
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1565 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1504 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1505 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, False);
1506 1568
1507 scr_refresh (refresh_type); 1569 want_refresh = 1;
1508 } 1570 }
1509 else 1571 else
1510 { 1572 {
1511 XEvent unused_event; 1573 XEvent unused_event;
1512 1574
1513 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1514 ; 1576 ;
1515 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1516 ; 1578 ;
1517 1579
1518 if (isScrollbarWindow (ev.xany.window)) 1580 if (isScrollbarWindow (ev.xany.window))
1519 { 1581 {
1520 scrollBar.setIdle (); 1582 scrollBar.setIdle ();
1521 scrollbar_show (0); 1583 scrollbar_show (0);
1522 } 1584 }
1523#ifdef MENUBAR
1524 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1525 menubar_expose ();
1526#endif
1527 1585
1528#ifdef TRANSPARENT 1586#ifdef ENABLE_TRANSPARENCY
1529 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1587 if (am_transparent && ev.xany.window == parent[0])
1530 XClearWindow (disp, ev.xany.window); 1588 XClearWindow (dpy, ev.xany.window);
1531#endif 1589#endif
1532 } 1590 }
1533 break; 1591 break;
1534 1592
1535 case MotionNotify: 1593 case MotionNotify:
1536#ifdef POINTER_BLANK 1594#ifdef POINTER_BLANK
1537 if (hidden_pointer) 1595 if (hidden_pointer)
1538 pointer_unblank (); 1596 pointer_unblank ();
1539#endif 1597#endif
1540#if MENUBAR
1541 if (isMenuBarWindow (ev.xany.window))
1542 {
1543 menubar_control (ev.xbutton);
1544 break;
1545 }
1546#endif
1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1598 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1548 break; 1599 break;
1549 1600
1550 if (ev.xany.window == TermWin.vt) 1601 if (ev.xany.window == vt)
1551 { 1602 {
1603 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1604 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1605 ; // nop
1552 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1606 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1607 {
1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1608 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1555 ; 1609 ;
1556 1610
1557 XQueryPointer (disp, TermWin.vt, 1611 XQueryPointer (dpy, vt,
1558 &unused_root, &unused_child, 1612 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1613 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1614 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1615 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1616#ifdef MOUSE_THRESHOLD
… …
1574#endif 1628#endif
1575 selection_extend (ev.xbutton.x, ev.xbutton.y, 1629 selection_extend (ev.xbutton.x, ev.xbutton.y,
1576 ev.xbutton.state & Button3Mask ? 2 : 0); 1630 ev.xbutton.state & Button3Mask ? 2 : 0);
1577 1631
1578#ifdef SELECTION_SCROLLING 1632#ifdef SELECTION_SCROLLING
1579 if (ev.xbutton.y < TermWin.int_bwidth 1633 if (ev.xbutton.y < int_bwidth
1580 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1634 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1581 { 1635 {
1582 int dist; 1636 int dist;
1583 1637
1584 /* don't clobber the current delay if we are 1638 /* don't clobber the current delay if we are
1585 * already in the middle of scrolling. 1639 * already in the middle of scrolling.
… …
1593 selection_save_x = ev.xbutton.x; 1647 selection_save_x = ev.xbutton.x;
1594 selection_save_y = ev.xbutton.y; 1648 selection_save_y = ev.xbutton.y;
1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1649 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1596 1650
1597 /* calc number of lines to scroll */ 1651 /* calc number of lines to scroll */
1598 if (ev.xbutton.y < TermWin.int_bwidth) 1652 if (ev.xbutton.y < int_bwidth)
1599 { 1653 {
1600 scroll_selection_dir = UP; 1654 scroll_selection_dir = UP;
1601 dist = TermWin.int_bwidth - ev.xbutton.y; 1655 dist = int_bwidth - ev.xbutton.y;
1602 } 1656 }
1603 else 1657 else
1604 { 1658 {
1605 scroll_selection_dir = DN; 1659 scroll_selection_dir = DN;
1606 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1660 dist = ev.xbutton.y - (int_bwidth + height);
1607 } 1661 }
1608 1662
1609 scroll_selection_lines = Pixel2Height (dist) 1663 scroll_selection_lines = Pixel2Height (dist)
1610 / SELECTION_SCROLL_LINE_SPEEDUP 1664 / SELECTION_SCROLL_LINE_SPEEDUP
1611 + 1; 1665 + 1;
1612 MIN_IT (scroll_selection_lines, 1666 min_it (scroll_selection_lines,
1613 SELECTION_SCROLL_MAX_LINES); 1667 SELECTION_SCROLL_MAX_LINES);
1614 } 1668 }
1615 else 1669 else
1616 { 1670 {
1617 /* we are within the text window, so we 1671 /* we are within the text window, so we
… …
1626#endif 1680#endif
1627 } 1681 }
1628 } 1682 }
1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1683 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1630 { 1684 {
1631 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1685 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1632 MotionNotify, &ev)) 1686 MotionNotify, &ev))
1633 ; 1687 ;
1634 1688
1635 XQueryPointer (disp, scrollBar.win, 1689 XQueryPointer (dpy, scrollBar.win,
1636 &unused_root, &unused_child, 1690 &unused_root, &unused_child,
1637 &unused_root_x, &unused_root_y, 1691 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1692 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1693 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1694 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1641 scrollbar_size ()); 1695 scrollbar_size ());
1642 scr_refresh (refresh_type);
1643 refresh_limit = 0; 1696 want_refresh = 1;
1644 scrollbar_show (1); 1697 scrollbar_show (1);
1645 } 1698 }
1646 break; 1699 break;
1647 } 1700 }
1701
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
1648} 1728}
1649 1729
1650void 1730void
1651rxvt_term::focus_in () 1731rxvt_term::focus_in ()
1652{ 1732{
1653 if (!TermWin.focus) 1733 if (!focus)
1654 { 1734 {
1655 TermWin.focus = 1; 1735 focus = 1;
1656 want_refresh = 1; 1736 want_refresh = 1;
1737
1738 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1739
1657#ifdef USE_XIM 1740#if USE_XIM
1658 if (Input_Context != NULL) 1741 if (Input_Context != NULL)
1659 { 1742 {
1660 IMSetStatusPosition (); 1743 IMSetPosition ();
1661 XSetICFocus (Input_Context); 1744 XSetICFocus (Input_Context);
1662 } 1745 }
1663#endif 1746#endif
1664#ifdef CURSOR_BLINK 1747#if CURSOR_BLINK
1665 if (options & Opt_cursorBlink) 1748 if (option (Opt_cursorBlink))
1666 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1749 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1667#endif 1750#endif
1668#ifdef OFF_FOCUS_FADING 1751#if OFF_FOCUS_FADING
1669 if (rs[Rs_fade]) 1752 if (rs[Rs_fade])
1670 { 1753 {
1671 pix_colors = pix_colors_focused; 1754 pix_colors = pix_colors_focused;
1672 scr_recolour (); 1755 scr_recolour ();
1673 } 1756 }
1674#endif 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
1675 } 1771 }
1676} 1772}
1677 1773
1678void 1774void
1679rxvt_term::focus_out () 1775rxvt_term::focus_out ()
1680{ 1776{
1681 if (TermWin.focus) 1777 if (focus)
1682 { 1778 {
1683 TermWin.focus = 0; 1779 focus = 0;
1684 want_refresh = 1; 1780 want_refresh = 1;
1685 1781
1782 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1783
1686#if ENABLE_FRILLS || ISO_14755 1784#if ENABLE_FRILLS || ISO_14755
1785 if (iso14755buf)
1786 {
1687 iso14755buf = 0; 1787 iso14755buf = 0;
1688#endif
1689#if ENABLE_OVERLAY 1788# if ENABLE_OVERLAY
1690 scr_overlay_off (); 1789 scr_overlay_off ();
1691#endif 1790# endif
1791 }
1792#endif
1692#ifdef USE_XIM 1793#if USE_XIM
1693 if (Input_Context != NULL) 1794 if (Input_Context != NULL)
1694 XUnsetICFocus (Input_Context); 1795 XUnsetICFocus (Input_Context);
1695#endif 1796#endif
1696#ifdef CURSOR_BLINK 1797#if CURSOR_BLINK
1697 if (options & Opt_cursorBlink) 1798 if (option (Opt_cursorBlink))
1698 cursor_blink_ev.stop (); 1799 cursor_blink_ev.stop ();
1699 hidden_cursor = 0; 1800 hidden_cursor = 0;
1700#endif 1801#endif
1701#ifdef OFF_FOCUS_FADING 1802#if OFF_FOCUS_FADING
1702 if (rs[Rs_fade]) 1803 if (rs[Rs_fade])
1703 { 1804 {
1704 pix_colors = pix_colors_unfocused; 1805 pix_colors = pix_colors_unfocused;
1705 scr_recolour (); 1806 scr_recolour ();
1706 } 1807 }
1707#endif 1808#endif
1708 } 1809 }
1709} 1810}
1710 1811
1711#if TRANSPARENT 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
1712void 1826void
1713rxvt_term::rootwin_cb (XEvent &ev) 1827rxvt_term::rootwin_cb (XEvent &ev)
1714{ 1828{
1715 SET_R (this); 1829 make_current ();
1716 SET_LOCALE (locale);
1717 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
1718 switch (ev.type) 1836 switch (ev.type)
1719 { 1837 {
1720 case PropertyNotify: 1838 case PropertyNotify:
1721 /* 1839 /*
1722 * 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,
… …
1726 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1844 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1727 return; 1845 return;
1728 1846
1729 /* FALLTHROUGH */ 1847 /* FALLTHROUGH */
1730 case ReparentNotify: 1848 case ReparentNotify:
1731 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1849 if (option (Opt_transparent))
1732 want_refresh = want_full_refresh = 1; 1850 check_our_parents ();
1733 break; 1851 break;
1734 } 1852 }
1853# endif
1735} 1854}
1736#endif 1855#endif
1737 1856
1738void 1857void
1739rxvt_term::button_press (XButtonEvent &ev) 1858rxvt_term::button_press (XButtonEvent &ev)
1740{ 1859{
1741 int reportmode = 0, clickintime; 1860 int reportmode = 0, clickintime;
1742 1861
1743 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1862 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1863
1744 if (!bypass_keystate) 1864 if (!bypass_keystate)
1745 reportmode = !! (priv_modes & PrivMode_mouse_report); 1865 reportmode = !! (priv_modes & PrivMode_mouse_report);
1746 1866
1747 /* 1867 /*
1748 * VT window processing of button press 1868 * VT window processing of button press
1749 */ 1869 */
1750 if (ev.window == TermWin.vt) 1870 if (ev.window == vt)
1751 { 1871 {
1872 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1873 return;
1874
1752#if ISO_14755 1875#if ISO_14755
1753 // 5.4 1876 // 5.4
1754 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1877 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1755 { 1878 {
1756 iso14755_54 (ev.x, ev.y); 1879 iso14755_54 (ev.x, ev.y);
… …
1768#ifdef MOUSE_REPORT_DOUBLECLICK 1891#ifdef MOUSE_REPORT_DOUBLECLICK
1769 if (ev.button == MEvent.button && clickintime) 1892 if (ev.button == MEvent.button && clickintime)
1770 { 1893 {
1771 /* same button, within alloted time */ 1894 /* same button, within alloted time */
1772 MEvent.clicks++; 1895 MEvent.clicks++;
1896
1773 if (MEvent.clicks > 1) 1897 if (MEvent.clicks > 1)
1774 { 1898 {
1775 /* only report double clicks */ 1899 /* only report double clicks */
1776 MEvent.clicks = 2; 1900 MEvent.clicks = 2;
1777 mouse_report (ev); 1901 mouse_report (ev);
… …
1809#else 1933#else
1810 selection.rect = false; 1934 selection.rect = false;
1811#endif 1935#endif
1812 1936
1813 /* allow shift+left click to extend selection */ 1937 /* allow shift+left click to extend selection */
1814 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1938 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1815 { 1939 {
1816 if (MEvent.button == Button1 && clickintime) 1940 if (MEvent.button == Button1 && clickintime)
1817 selection_rotate (ev.x, ev.y); 1941 selection_rotate (ev.x, ev.y);
1818 else 1942 else
1819 selection_extend (ev.x, ev.y, 1); 1943 selection_extend (ev.x, ev.y, 1);
… …
1960 case Button3: 2084 case Button3:
1961 if (scrollBar.style != R_SB_XTERM) 2085 if (scrollBar.style != R_SB_XTERM)
1962 { 2086 {
1963 if (scrollbar_above_slider (ev.y)) 2087 if (scrollbar_above_slider (ev.y))
1964# ifdef RXVT_SCROLL_FULL 2088# ifdef RXVT_SCROLL_FULL
1965 scr_page (UP, TermWin.nrow - 1); 2089 scr_page (UP, nrow - 1);
1966# else 2090# else
1967 scr_page (UP, TermWin.nrow / 4); 2091 scr_page (UP, nrow / 4);
1968# endif 2092# endif
1969 else if (scrollbar_below_slider (ev.y)) 2093 else if (scrollbar_below_slider (ev.y))
1970# ifdef RXVT_SCROLL_FULL 2094# ifdef RXVT_SCROLL_FULL
1971 scr_page (DN, TermWin.nrow - 1); 2095 scr_page (DN, nrow - 1);
1972# else 2096# else
1973 scr_page (DN, TermWin.nrow / 4); 2097 scr_page (DN, nrow / 4);
1974# endif 2098# endif
1975 else 2099 else
1976 scrollBar.setMotion (); 2100 scrollBar.setMotion ();
1977 } 2101 }
1978 else 2102 else
1979 { 2103 {
1980 scr_page ((ev.button == Button1 ? DN : UP), 2104 scr_page ((ev.button == Button1 ? DN : UP),
1981 (TermWin.nrow 2105 (nrow
1982 * scrollbar_position (ev.y) 2106 * scrollbar_position (ev.y)
1983 / scrollbar_size ())); 2107 / scrollbar_size ()));
1984 } 2108 }
1985 2109
1986 break; 2110 break;
1987 } 2111 }
1988 } 2112 }
2113
1989 return; 2114 return;
1990 } 2115 }
1991#if MENUBAR
1992 /*
1993 * Menubar window processing of button press
1994 */
1995 if (isMenuBarWindow (ev.window))
1996 menubar_control (ev);
1997#endif
1998} 2116}
1999 2117
2000void 2118void
2001rxvt_term::button_release (XButtonEvent &ev) 2119rxvt_term::button_release (XButtonEvent &ev)
2002{ 2120{
… …
2008 2126
2009 if (scrollbar_isUpDn ()) 2127 if (scrollbar_isUpDn ())
2010 { 2128 {
2011 scrollBar.setIdle (); 2129 scrollBar.setIdle ();
2012 scrollbar_show (0); 2130 scrollbar_show (0);
2013#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2014 refresh_type &= ~SMOOTH_REFRESH;
2015#endif
2016 } 2131 }
2017 2132
2018#ifdef SELECTION_SCROLLING 2133#ifdef SELECTION_SCROLLING
2019 if (sel_scroll_ev.active) 2134 if (sel_scroll_ev.active)
2020 sel_scroll_ev.stop(); 2135 sel_scroll_ev.stop();
2021#endif 2136#endif
2022 2137
2023 if (ev.window == TermWin.vt) 2138 if (ev.window == vt)
2024 { 2139 {
2140 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2141 return;
2142
2025#if ISO_14755 2143#if ISO_14755
2026 // 5.4 2144 // 5.4
2027 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2145 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2028 return; 2146 return;
2029#endif 2147#endif
2148
2030 if (reportmode) 2149 if (reportmode)
2031 { 2150 {
2032 /* mouse report from vt window */ 2151 /* mouse report from vt window */
2033 /* don't report release of wheel "buttons" */ 2152 /* don't report release of wheel "buttons" */
2034 if (ev.button >= 4) 2153 if (ev.button >= 4)
… …
2064 { 2183 {
2065 case Button1: 2184 case Button1:
2066 case Button3: 2185 case Button3:
2067 selection_make (ev.time); 2186 selection_make (ev.time);
2068 break; 2187 break;
2188
2069 case Button2: 2189 case Button2:
2070 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);
2071 break; 2192 break;
2193
2072#ifdef MOUSE_WHEEL 2194#ifdef MOUSE_WHEEL
2073 case Button4: 2195 case Button4:
2074 case Button5: 2196 case Button5:
2075 { 2197 {
2076 int i; 2198 int i;
… …
2078 2200
2079 v = ev.button == Button4 ? UP : DN; 2201 v = ev.button == Button4 ? UP : DN;
2080 2202
2081 if (ev.state & ShiftMask) 2203 if (ev.state & ShiftMask)
2082 i = 1; 2204 i = 1;
2083 else if (options & Opt_mouseWheelScrollPage) 2205 else if (option (Opt_mouseWheelScrollPage))
2084 i = TermWin.nrow - 1; 2206 i = nrow - 1;
2085 else 2207 else
2086 i = 5; 2208 i = 5;
2087 2209
2088# ifdef MOUSE_SLIP_WHEELING 2210# ifdef MOUSE_SLIP_WHEELING
2089 if (ev.state & ControlMask) 2211 if (ev.state & ControlMask)
2090 { 2212 {
2091 mouse_slip_wheel_speed += v ? -1 : 1; 2213 mouse_slip_wheel_speed += v ? -1 : 1;
2092 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;
2093 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;
2094 2216
2095 if (slip_wheel_ev.at < NOW) 2217 if (slip_wheel_ev.at < NOW)
2096 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2218 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2097 2219
2098 slip_wheel_ev.start (); 2220 slip_wheel_ev.start ();
2099 } 2221 }
2100 else 2222 else
2101 { 2223 {
2102# endif 2224# endif
2103# ifdef JUMP_MOUSE_WHEEL
2104 scr_page (v, i); 2225 scr_page (v, i);
2105 scr_refresh (SMOOTH_REFRESH);
2106 scrollbar_show (1); 2226 scrollbar_show (1);
2107# else
2108 while (i--)
2109 {
2110 scr_page (v, 1);
2111 scr_refresh (SMOOTH_REFRESH);
2112 scrollbar_show (1);
2113 }
2114# endif
2115# ifdef MOUSE_SLIP_WHEELING 2227# ifdef MOUSE_SLIP_WHEELING
2116 } 2228 }
2117#endif 2229# endif
2118 } 2230 }
2119 break; 2231 break;
2120#endif 2232#endif
2121 } 2233 }
2122 } 2234 }
2123#ifdef MENUBAR
2124 else if (isMenuBarWindow (ev.window))
2125 menubar_control (ev);
2126#endif
2127} 2235}
2128
2129#ifdef TRANSPARENT
2130#if TINTING
2131/* taken from aterm-0.4.2 */
2132
2133typedef uint32_t RUINT32T;
2134
2135void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2136{
2137 int sh_r, sh_g, sh_b;
2138 RUINT32T mask_r, mask_g, mask_b;
2139 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2140 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2141 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2142 int i;
2143
2144 Visual *visual = display->visual;
2145
2146 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2147
2148 /* for convenience */
2149 mask_r = visual->red_mask;
2150 mask_g = visual->green_mask;
2151 mask_b = visual->blue_mask;
2152
2153 /* boring lookup table pre-initialization */
2154 switch (srcImage->bits_per_pixel) {
2155 case 15:
2156 if ((mask_r != 0x7c00) ||
2157 (mask_g != 0x03e0) ||
2158 (mask_b != 0x001f))
2159 return;
2160 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2161 lookup_r = lookup;
2162 lookup_g = lookup+32;
2163 lookup_b = lookup+32+32;
2164 sh_r = 10;
2165 sh_g = 5;
2166 sh_b = 0;
2167 break;
2168 case 16:
2169 if ((mask_r != 0xf800) ||
2170 (mask_g != 0x07e0) ||
2171 (mask_b != 0x001f))
2172 return;
2173 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2174 lookup_r = lookup;
2175 lookup_g = lookup+32;
2176 lookup_b = lookup+32+64;
2177 sh_r = 11;
2178 sh_g = 5;
2179 sh_b = 0;
2180 break;
2181 case 24:
2182 if ((mask_r != 0xff0000) ||
2183 (mask_g != 0x00ff00) ||
2184 (mask_b != 0x0000ff))
2185 return;
2186 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2187 lookup_r = lookup;
2188 lookup_g = lookup+256;
2189 lookup_b = lookup+256+256;
2190 sh_r = 16;
2191 sh_g = 8;
2192 sh_b = 0;
2193 break;
2194 case 32:
2195 if ((mask_r != 0xff0000) ||
2196 (mask_g != 0x00ff00) ||
2197 (mask_b != 0x0000ff))
2198 return;
2199 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2200 lookup_r = lookup;
2201 lookup_g = lookup+256;
2202 lookup_b = lookup+256+256;
2203 sh_r = 16;
2204 sh_g = 8;
2205 sh_b = 0;
2206 break;
2207 default:
2208 return; /* we do not support this color depth */
2209 }
2210
2211 /* prepare limits for color transformation (each channel is handled separately) */
2212 if (shade < 0) {
2213 shade = -shade;
2214 if (shade < 0) shade = 0;
2215 if (shade > 100) shade = 100;
2216
2217 lower_lim_r = 65535-rm;
2218 lower_lim_g = 65535-gm;
2219 lower_lim_b = 65535-bm;
2220
2221 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2222 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2223 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2224
2225 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2226 } else {
2227 if (shade < 0) shade = 0;
2228 if (shade > 100) shade = 100;
2229
2230 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2231
2232 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2233 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2234 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2235 }
2236
2237 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2238 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2239 {
2240 unsigned int tmp;
2241
2242 tmp = lower_lim_r;
2243 lower_lim_r = lower_lim_b;
2244 lower_lim_b = tmp;
2245
2246 tmp = upper_lim_r;
2247 upper_lim_r = upper_lim_b;
2248 upper_lim_b = tmp;
2249 }
2250
2251 /* fill our lookup tables */
2252 for (i = 0; i <= mask_r>>sh_r; i++)
2253 {
2254 RUINT32T tmp;
2255 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2256 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2257 lookup_r[i] = (tmp/65535)<<sh_r;
2258 }
2259 for (i = 0; i <= mask_g>>sh_g; i++)
2260 {
2261 RUINT32T tmp;
2262 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2263 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2264 lookup_g[i] = (tmp/65535)<<sh_g;
2265 }
2266 for (i = 0; i <= mask_b>>sh_b; i++)
2267 {
2268 RUINT32T tmp;
2269 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2270 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2271 lookup_b[i] = (tmp/65535)<<sh_b;
2272 }
2273
2274 /* apply table to input image (replacing colors by newly calculated ones) */
2275 switch (srcImage->bits_per_pixel)
2276 {
2277 case 15:
2278 {
2279 unsigned short *p1, *pf, *p, *pl;
2280 p1 = (unsigned short *) srcImage->data;
2281 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2282 while (p1 < pf)
2283 {
2284 p = p1;
2285 pl = p1 + srcImage->width;
2286 for (; p < pl; p++)
2287 {
2288 *p = lookup_r[(*p & 0x7c00)>>10] |
2289 lookup_g[(*p & 0x03e0)>> 5] |
2290 lookup_b[(*p & 0x001f)];
2291 }
2292 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2293 }
2294 break;
2295 }
2296 case 16:
2297 {
2298 unsigned short *p1, *pf, *p, *pl;
2299 p1 = (unsigned short *) srcImage->data;
2300 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2301 while (p1 < pf)
2302 {
2303 p = p1;
2304 pl = p1 + srcImage->width;
2305 for (; p < pl; p++)
2306 {
2307 *p = lookup_r[(*p & 0xf800)>>11] |
2308 lookup_g[(*p & 0x07e0)>> 5] |
2309 lookup_b[(*p & 0x001f)];
2310 }
2311 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2312 }
2313 break;
2314 }
2315 case 24:
2316 {
2317 unsigned char *p1, *pf, *p, *pl;
2318 p1 = (unsigned char *) srcImage->data;
2319 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2320 while (p1 < pf)
2321 {
2322 p = p1;
2323 pl = p1 + srcImage->width * 3;
2324 for (; p < pl; p += 3)
2325 {
2326 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2327 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2328 p[2] = lookup_r[(p[2] & 0x0000ff)];
2329 }
2330 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2331 }
2332 break;
2333 }
2334 case 32:
2335 {
2336 RUINT32T *p1, *pf, *p, *pl;
2337 p1 = (RUINT32T *) srcImage->data;
2338 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2339
2340 while (p1 < pf)
2341 {
2342 p = p1;
2343 pl = p1 + srcImage->width;
2344 for (; p < pl; p++)
2345 {
2346 *p = lookup_r[(*p & 0xff0000)>>16] |
2347 lookup_g[(*p & 0x00ff00)>> 8] |
2348 lookup_b[(*p & 0x0000ff)] |
2349 (*p & ~0xffffff);
2350 }
2351 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2352 }
2353 break;
2354 }
2355 }
2356
2357 free (lookup);
2358}
2359#endif
2360
2361/*
2362 * Check our parents are still who we think they are.
2363 * Do transparency updates if required
2364 */
2365int
2366rxvt_term::check_our_parents ()
2367{
2368 int i, pchanged, aformat, have_pixmap, rootdepth;
2369 unsigned long nitems, bytes_after;
2370 Atom atype;
2371 unsigned char *prop = NULL;
2372 Window root, oldp, *list;
2373 Pixmap rootpixmap = None;
2374 XWindowAttributes wattr, wrootattr;
2375 dDisp;
2376
2377 pchanged = 0;
2378
2379 if (!(options & Opt_transparent))
2380 return pchanged; /* Don't try any more */
2381
2382 XGetWindowAttributes (disp, display->root, &wrootattr);
2383 rootdepth = wrootattr.depth;
2384
2385 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2386
2387 if (rootdepth != wattr.depth)
2388 {
2389 if (am_transparent)
2390 {
2391 pchanged = 1;
2392 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2393 am_transparent = am_pixmap_trans = 0;
2394 }
2395
2396 return pchanged; /* Don't try any more */
2397 }
2398
2399 /* Get all X ops out of the queue so that our information is up-to-date. */
2400 XSync (disp, False);
2401
2402 /*
2403 * Make the frame window set by the window manager have
2404 * the root background. Some window managers put multiple nested frame
2405 * windows for each client, so we have to take care about that.
2406 */
2407 i = (xa[XA_XROOTPMAP_ID]
2408 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2409 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2410 &nitems, &bytes_after, &prop) == Success);
2411
2412 if (!i || prop == NULL)
2413 i = (xa[XA_ESETROOT_PMAP_ID]
2414 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2415 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2416 &nitems, &bytes_after, &prop) == Success);
2417
2418 if (!i || prop == NULL
2419#if TINTING
2420 || !rs[Rs_color + Color_tint]
2421#endif
2422 )
2423 have_pixmap = 0;
2424 else
2425 {
2426 have_pixmap = 1;
2427 rootpixmap = *(Pixmap *)prop;
2428 XFree (prop);
2429 }
2430
2431 if (have_pixmap)
2432 {
2433 /*
2434 * Copy display->root pixmap transparency
2435 */
2436 int sx, sy, nx, ny;
2437 unsigned int nw, nh;
2438 Window cr;
2439 XImage *image;
2440 GC gc;
2441 XGCValues gcvalue;
2442
2443 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2444 0, 0, &sx, &sy, &cr);
2445 nw = (unsigned int)szHint.width;
2446 nh = (unsigned int)szHint.height;
2447 nx = ny = 0;
2448
2449 if (sx < 0)
2450 {
2451 nw += sx;
2452 nx = -sx;
2453 sx = 0;
2454 }
2455
2456 if (sy < 0)
2457 {
2458 nh += sy;
2459 ny = -sy;
2460 sy = 0;
2461 }
2462
2463 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2464 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2465
2466 XSync (disp, False);
2467 allowedxerror = -1;
2468 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2469
2470 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2471 /* XXX: may need a delay here? */
2472 allowedxerror = 0;
2473
2474 if (image == NULL)
2475 {
2476 if (am_transparent && am_pixmap_trans)
2477 {
2478 pchanged = 1;
2479 if (TermWin.pixmap != None)
2480 {
2481 XFreePixmap (disp, TermWin.pixmap);
2482 TermWin.pixmap = None;
2483 }
2484 }
2485
2486 am_pixmap_trans = 0;
2487 }
2488 else
2489 {
2490 if (TermWin.pixmap != None)
2491 XFreePixmap (disp, TermWin.pixmap);
2492
2493#if TINTING
2494 if (ISSET_PIXCOLOR (Color_tint))
2495 {
2496 unsigned short rm, gm, bm;
2497 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2498
2499 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2500
2501 ShadeXImage (display, image, shade, rm, gm, bm);
2502 }
2503#endif
2504
2505 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2506 szHint.width, szHint.height, image->depth);
2507 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2508 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2509 nx, ny, image->width, image->height);
2510 XFreeGC (disp, gc);
2511 XDestroyImage (image);
2512 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2513 XClearWindow (disp, TermWin.parent[0]);
2514
2515 if (!am_transparent || !am_pixmap_trans)
2516 pchanged = 1;
2517
2518 am_transparent = am_pixmap_trans = 1;
2519 }
2520 }
2521
2522 if (am_pixmap_trans)
2523 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2524 else
2525 {
2526 unsigned int n;
2527 /*
2528 * InheritPixmap transparency
2529 */
2530 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2531 {
2532 oldp = TermWin.parent[i];
2533 XQueryTree (disp, TermWin.parent[i - 1], &root,
2534 &TermWin.parent[i], &list, &n);
2535 XFree (list);
2536
2537 if (TermWin.parent[i] == display->root)
2538 {
2539 if (oldp != None)
2540 pchanged = 1;
2541
2542 break;
2543 }
2544
2545 if (oldp != TermWin.parent[i])
2546 pchanged = 1;
2547 }
2548
2549 n = 0;
2550
2551 if (pchanged)
2552 {
2553 for (; n < (unsigned int)i; n++)
2554 {
2555 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2556 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2557 {
2558 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2559 break;
2560 }
2561 }
2562 }
2563
2564 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2565 {
2566 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2567 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2568 am_transparent = 0;
2569 /* XXX: also turn off Opt_transparent? */
2570 }
2571 else
2572 {
2573#if WAIT_FOR_WM
2574 /* wait (an arbitrary period) for the WM to do its thing
2575 * needed for fvwm2.2.2 (and before?) */
2576 sleep (1);
2577#endif
2578 for (n = 0; n < (unsigned int)i; n++)
2579 {
2580 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2581 XClearWindow (disp, TermWin.parent[n]);
2582 }
2583
2584 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2585 am_transparent = 1;
2586 }
2587
2588 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2589 TermWin.parent[i] = None;
2590 }
2591
2592 if (scrollBar.win)
2593 {
2594 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2595 scrollBar.setIdle ();
2596 scrollbar_show (0);
2597 }
2598
2599 if (am_transparent)
2600 {
2601 want_refresh = want_full_refresh = 1;
2602 if (am_pixmap_trans)
2603 flush ();
2604 }
2605
2606 return pchanged;
2607}
2608#endif
2609 2236
2610/*}}} */ 2237/*}}} */
2611 2238
2612bool 2239bool
2613rxvt_term::cmd_parse () 2240rxvt_term::cmd_parse ()
2614{ 2241{
2615 bool flag = false; 2242 bool flag = false;
2616 unicode_t ch = NOCHAR; 2243 wchar_t ch = NOCHAR;
2617 unsigned char *seq_begin; // remember start of esc-sequence here 2244 char *seq_begin; // remember start of esc-sequence here
2618 2245
2619 for (;;) 2246 for (;;)
2620 { 2247 {
2621 if (ch == NOCHAR) 2248 if (ch == NOCHAR)
2622 { 2249 {
2623 seq_begin = cmdbuf_ptr; 2250 seq_begin = cmdbuf_ptr;
2624 ch = next_char (); 2251 ch = next_char ();
2625 }
2626 2252
2627 if (ch == NOCHAR) // TODO: improve 2253 if (ch == NOCHAR)
2628 break; 2254 break;
2255 }
2629 2256
2630 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)
2631 { 2258 {
2632 if (!seen_input) 2259 if (!seen_input)
2633 { 2260 {
… …
2642 if (seen_resize && cmd_pid) 2269 if (seen_resize && cmd_pid)
2643 kill (-cmd_pid, SIGWINCH); 2270 kill (-cmd_pid, SIGWINCH);
2644 } 2271 }
2645 2272
2646 /* Read a text string from the input buffer */ 2273 /* Read a text string from the input buffer */
2647 unicode_t buf[UBUFSIZ]; 2274 wchar_t buf[UBUFSIZ];
2648 bool refreshnow = false; 2275 bool refreshnow = false;
2649 int nlines = 0; 2276 int nlines = 0;
2650 unicode_t *str = buf; 2277 wchar_t *str = buf;
2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ); 2278 wchar_t *eol = str + min (ncol, UBUFSIZ);
2652 2279
2653 for (;;) 2280 for (;;)
2654 { 2281 {
2655 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))
2656 break; 2283 break;
… …
2662 if (ch == C0_LF) 2289 if (ch == C0_LF)
2663 nlines++; 2290 nlines++;
2664 2291
2665 refresh_count++; 2292 refresh_count++;
2666 2293
2667 if (!(options & Opt_jumpScroll) 2294 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2668 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2669 { 2295 {
2296 refresh_count = 0;
2297
2298 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2299 {
2670 refreshnow = true; 2300 refreshnow = true;
2671 ch = NOCHAR; 2301 ch = NOCHAR;
2672 break; 2302 break;
2303 }
2673 } 2304 }
2674 2305
2675 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2306 // scr_add_lines only works for nlines <= nrow - 1.
2676 if (nlines >= TermWin.nrow - 1) 2307 if (nlines >= nrow - 1)
2677 { 2308 {
2309 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2310 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2678 scr_add_lines (buf, nlines, str - buf); 2311 scr_add_lines (buf, str - buf, nlines);
2312
2679 nlines = 0; 2313 nlines = 0;
2680 str = buf; 2314 str = buf;
2681 eol = str + min (TermWin.ncol, UBUFSIZ); 2315 eol = str + min (ncol, UBUFSIZ);
2682 } 2316 }
2683 2317
2684 if (str >= eol) 2318 if (str >= eol)
2685 { 2319 {
2686 if (eol >= buf + UBUFSIZ) 2320 if (eol >= buf + UBUFSIZ)
2687 { 2321 {
2688 ch = NOCHAR; 2322 ch = NOCHAR;
2689 break; 2323 break;
2690 } 2324 }
2691 else 2325 else
2692 eol = min (eol + TermWin.ncol, buf + UBUFSIZ); 2326 eol = min (eol + ncol, buf + UBUFSIZ);
2693 } 2327 }
2694 2328
2695 } 2329 }
2696 2330
2697 seq_begin = cmdbuf_ptr; 2331 seq_begin = cmdbuf_ptr;
2698 ch = next_char (); 2332 ch = next_char ();
2699 } 2333 }
2700 2334
2335 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2336 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2701 scr_add_lines (buf, nlines, str - buf); 2337 scr_add_lines (buf, str - buf, nlines);
2702 2338
2703 /* 2339 /*
2704 * 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
2705 * 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.
2706 * the number of pages between refreshes is refresh_limit, which 2342 * if skipScroll is enabled.
2707 * is incremented here because we must be doing flat-out scrolling.
2708 */ 2343 */
2709 if (refreshnow) 2344 if (refreshnow)
2710 { 2345 {
2711 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2712 refresh_limit++;
2713 else
2714 {
2715 flag = true; 2346 flag = true;
2716 scr_refresh (refresh_type); 2347 scr_refresh ();
2717 } 2348 want_refresh = 1;
2718 } 2349 }
2719 2350
2720 } 2351 }
2721 else 2352 else
2722 { 2353 {
… …
2736 } 2367 }
2737 2368
2738 return flag; 2369 return flag;
2739} 2370}
2740 2371
2741// read the next octet
2742unicode_t
2743rxvt_term::next_octet ()
2744{
2745 return cmdbuf_ptr < cmdbuf_endp
2746 ? *cmdbuf_ptr++
2747 : NOCHAR;
2748}
2749
2750// read the next character 2372// read the next character
2751unicode_t 2373wchar_t
2752rxvt_term::next_char () 2374rxvt_term::next_char () NOTHROW
2753{ 2375{
2754 while (cmdbuf_ptr < cmdbuf_endp) 2376 while (cmdbuf_ptr < cmdbuf_endp)
2755 { 2377 {
2756 // assume 7-bit to be ascii ALWAYS 2378 // assume 7-bit to be ascii ALWAYS
2757 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2379 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2758 return *cmdbuf_ptr++; 2380 return *cmdbuf_ptr++;
2759 2381
2760 wchar_t wc; 2382 wchar_t wc;
2761 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);
2762 2384
2763 if (len == (size_t)-2) 2385 if (len == (size_t)-2)
2764 { 2386 {
2765 // the mbstate stores incomplete sequences. didn't know this :/ 2387 // the mbstate stores incomplete sequences. didn't know this :/
2766 cmdbuf_ptr = cmdbuf_endp; 2388 cmdbuf_ptr = cmdbuf_endp;
2767 break; 2389 break;
2768 } 2390 }
2769 2391
2770 if (len == (size_t)-1) 2392 if (len == (size_t)-1)
2771 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
2772 2394
2773 // assume wchar == unicode 2395 // assume wchar == unicode
2774 cmdbuf_ptr += len; 2396 cmdbuf_ptr += len;
2775 return wc & UNICODE_MASK; 2397 return wc & UNICODE_MASK;
2776 } 2398 }
2777 2399
2778 return NOCHAR; 2400 return NOCHAR;
2779} 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;
2780 2413
2781/* rxvt_cmd_getc () - Return next input character */ 2414/* rxvt_cmd_getc () - Return next input character */
2782/* 2415/*
2783 * Return the next input character after first passing any keyboard input 2416 * Return the next input character after first passing any keyboard input
2784 * to the command. 2417 * to the command.
2785 */ 2418 */
2786unicode_t 2419wchar_t
2787rxvt_term::cmd_getc () 2420rxvt_term::cmd_getc () THROW ((class out_of_input))
2788{ 2421{
2789 unicode_t c = next_char (); 2422 wchar_t c = next_char ();
2790 2423
2791 if (c == NOCHAR) 2424 if (c == NOCHAR)
2792 throw out_of_input; 2425 throw out_of_input;
2793 2426
2794 return c; 2427 return c;
2795} 2428}
2796 2429
2797unicode_t 2430uint32_t
2798rxvt_term::cmd_get8 () 2431rxvt_term::cmd_get8 () THROW ((class out_of_input))
2799{ 2432{
2800 unicode_t c = next_octet (); 2433 uint32_t c = next_octet ();
2801 2434
2802 if (c == NOCHAR) 2435 if (c == NOCHAR)
2803 throw out_of_input; 2436 throw out_of_input;
2804 2437
2805 return c; 2438 return c;
… …
2869 { 2502 {
2870 if ((buf[len++] = cmd_getc ()) == 'i') 2503 if ((buf[len++] = cmd_getc ()) == 'i')
2871 break; /* done = 1 */ 2504 break; /* done = 1 */
2872 } 2505 }
2873 } 2506 }
2874 2507
2875 for (i = 0; i < len; i++) 2508 for (i = 0; i < len; i++)
2876 if (putc (buf[i], fd) == EOF) 2509 if (putc (buf[i], fd) == EOF)
2877 { 2510 {
2878 done = 1; 2511 done = 1;
2879 break; 2512 break;
… …
2905 case C0_ESC: 2538 case C0_ESC:
2906 process_escape_seq (); 2539 process_escape_seq ();
2907 break; 2540 break;
2908 case C0_ENQ: /* terminal Status */ 2541 case C0_ENQ: /* terminal Status */
2909 if (rs[Rs_answerbackstring]) 2542 if (rs[Rs_answerbackstring])
2910 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2543 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2911 (unsigned int)strlen (rs[Rs_answerbackstring]));
2912 else 2544 else
2913 tt_write ((unsigned char *)VT100_ANS, 2545 tt_write (VT100_ANS, strlen (VT100_ANS));
2914 (unsigned int)strlen (VT100_ANS));
2915 break; 2546 break;
2916 case C0_BEL: /* bell */ 2547 case C0_BEL: /* bell */
2917 scr_bell (); 2548 scr_bell ();
2918 break; 2549 break;
2919 case C0_BS: /* backspace */ 2550 case C0_BS: /* backspace */
… …
2943 process_dcs_seq (); 2574 process_dcs_seq ();
2944 break; 2575 break;
2945 case 0x9b: /* CSI */ 2576 case 0x9b: /* CSI */
2946 process_csi_seq (); 2577 process_csi_seq ();
2947 break; 2578 break;
2948 case 0x9d: /* CSI */ 2579 case 0x9d: /* OSC */
2949 process_osc_seq (); 2580 process_osc_seq ();
2950 break; 2581 break;
2951#endif 2582#endif
2952 } 2583 }
2953} 2584}
… …
3043 scr_charset_set (2, (unsigned int)cmd_getc ()); 2674 scr_charset_set (2, (unsigned int)cmd_getc ());
3044 break; 2675 break;
3045 case '+': 2676 case '+':
3046 scr_charset_set (3, (unsigned int)cmd_getc ()); 2677 scr_charset_set (3, (unsigned int)cmd_getc ());
3047 break; 2678 break;
3048#if ENABLE_FRILLS 2679#if !ENABLE_MINIMAL
3049 case '6': 2680 case '6':
3050 scr_backindex (); 2681 scr_backindex ();
3051 break; 2682 break;
3052#endif 2683#endif
3053 case '7': 2684 case '7':
3054 scr_cursor (SAVE); 2685 scr_cursor (SAVE);
3055 break; 2686 break;
3056 case '8': 2687 case '8':
3057 scr_cursor (RESTORE); 2688 scr_cursor (RESTORE);
3058 break; 2689 break;
3059#if ENABLE_FRILLS 2690#if !ENABLE_MINIMAL
3060 case '9': 2691 case '9':
3061 scr_forwardindex (); 2692 scr_forwardindex ();
3062 break; 2693 break;
3063#endif 2694#endif
3064 case '=': 2695 case '=':
… …
3074 break; 2705 break;
3075 2706
3076 /* 8.3.87: NEXT LINE */ 2707 /* 8.3.87: NEXT LINE */
3077 case C1_NEL: /* ESC E */ 2708 case C1_NEL: /* ESC E */
3078 { 2709 {
3079 unicode_t nlcr[] = { C0_LF, C0_CR }; 2710 wchar_t nlcr[] = { C0_LF, C0_CR };
3080 scr_add_lines (nlcr, 1, 2); 2711 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3081 } 2712 }
3082 break; 2713 break;
3083 2714
3084 /* kidnapped escape sequence: Should be 8.3.48 */ 2715 /* kidnapped escape sequence: Should be 8.3.48 */
3085 case C1_ESA: /* ESC G */ 2716 case C1_ESA: /* ESC G */
… …
3107 process_dcs_seq (); 2738 process_dcs_seq ();
3108 break; 2739 break;
3109 2740
3110 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2741 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3111 case C1_SCI: /* ESC Z */ 2742 case C1_SCI: /* ESC Z */
3112 tt_write ((const unsigned char *)ESCZ_ANSWER, 2743 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3113 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3114 break; /* steal obsolete ESC [ c */ 2744 break; /* steal obsolete ESC [ c */
3115 2745
3116 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2746 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3117 case C1_CSI: /* ESC [ */ 2747 case C1_CSI: /* ESC [ */
3118 process_csi_seq (); 2748 process_csi_seq ();
… …
3227 ndef = get_byte_array_bit (csi_defaults, i); 2857 ndef = get_byte_array_bit (csi_defaults, i);
3228 for (p = 0; p < nargs; p++) 2858 for (p = 0; p < nargs; p++)
3229 if (arg[p] == -1) 2859 if (arg[p] == -1)
3230 arg[p] = ndef; 2860 arg[p] = ndef;
3231 2861
3232#ifdef DEBUG_CMD
3233 fprintf (stderr, "CSI ");
3234 for (p = 0; p < nargs; p++)
3235 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3236 fprintf (stderr, "%c\n", ch);
3237#endif
3238
3239 /* 2862 /*
3240 * private mode handling 2863 * private mode handling
3241 */ 2864 */
3242 if (priv) 2865 if (priv)
3243 { 2866 {
3244 switch (priv) 2867 switch (priv)
3245 { 2868 {
3246 case '>': 2869 case '>':
3247 if (ch == CSI_DA) /* secondary device attributes */ 2870 if (ch == CSI_DA) /* secondary device attributes */
3248 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 }
3249 break; 2881 break;
3250 case '?': 2882 case '?':
3251 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2883 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3252 process_terminal_mode (ch, priv, nargs, arg); 2884 process_terminal_mode (ch, priv, nargs, arg);
3253 break; 2885 break;
… …
3358 2990
3359 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2991 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3360 arg[0] = -arg[0]; 2992 arg[0] = -arg[0];
3361 /* FALLTHROUGH */ 2993 /* FALLTHROUGH */
3362 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2994 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3363 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2995 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3364 break; 2996 break;
3365 2997
3366 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2998 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3367 tt_write ((const unsigned char *)VT100_ANS, 2999 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3368 (unsigned int) (sizeof (VT100_ANS) - 1));
3369 break; 3000 break;
3370 3001
3371 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3002 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3372 process_sgr_mode (nargs, arg); 3003 process_sgr_mode (nargs, arg);
3373 break; 3004 break;
… …
3380 break; 3011 break;
3381 case 6: /* CPR requested */ 3012 case 6: /* CPR requested */
3382 scr_report_position (); 3013 scr_report_position ();
3383 break; 3014 break;
3384 case 7: /* unofficial extension */ 3015 case 7: /* unofficial extension */
3385 if (options & Opt_insecure) 3016 if (option (Opt_insecure))
3386 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3017 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3387 break; 3018 break;
3388 case 8: /* unofficial extension */ 3019 case 8: /* unofficial extension */
3389 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3020 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3390 break; 3021 break;
… …
3457 break; 3088 break;
3458 case CSI_75: 3089 case CSI_75:
3459 scr_cursor (RESTORE); 3090 scr_cursor (RESTORE);
3460 break; 3091 break;
3461 3092
3462#if ENABLE_FRILLS 3093#if !ENABLE_MINIMAL
3463 case CSI_74: 3094 case CSI_74:
3464 process_window_ops (arg, nargs); 3095 process_window_ops (arg, nargs);
3465 break; 3096 break;
3466#endif 3097#endif
3467 3098
… …
3474 break; 3105 break;
3475 } 3106 }
3476} 3107}
3477/*}}} */ 3108/*}}} */
3478 3109
3479#if ENABLE_FRILLS 3110#if !ENABLE_MINIMAL
3480/* ARGSUSED */ 3111/* ARGSUSED */
3481void 3112void
3482rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3113rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3483{ 3114{
3484 int x, y; 3115 int x, y;
3485 XWindowAttributes wattr; 3116 XWindowAttributes wattr;
3486 Window wdummy; 3117 Window wdummy;
3487 dDisp; 3118
3119 dLocal (Display *, dpy);
3488 3120
3489 if (nargs == 0) 3121 if (nargs == 0)
3490 return; 3122 return;
3491 3123
3492 switch (args[0]) 3124 switch (args[0])
3493 { 3125 {
3494 /* 3126 /*
3495 * commands 3127 * commands
3496 */ 3128 */
3497 case 1: /* deiconify window */ 3129 case 1: /* deiconify window */
3498 XMapWindow (disp, TermWin.parent[0]); 3130 XMapWindow (dpy, parent[0]);
3499 break; 3131 break;
3500 case 2: /* iconify window */ 3132 case 2: /* iconify window */
3501 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3133 XIconifyWindow (dpy, parent[0], display->screen);
3502 break; 3134 break;
3503 case 3: /* set position (pixels) */ 3135 case 3: /* set position (pixels) */
3504 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3136 XMoveWindow (dpy, parent[0], args[1], args[2]);
3505 break; 3137 break;
3506 case 4: /* set size (pixels) */ 3138 case 4: /* set size (pixels) */
3507 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3139 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3508 break; 3140 break;
3509 case 5: /* raise window */ 3141 case 5: /* raise window */
3510 XRaiseWindow (disp, TermWin.parent[0]); 3142 XRaiseWindow (dpy, parent[0]);
3511 break; 3143 break;
3512 case 6: /* lower window */ 3144 case 6: /* lower window */
3513 XLowerWindow (disp, TermWin.parent[0]); 3145 XLowerWindow (dpy, parent[0]);
3514 break; 3146 break;
3515 case 7: /* refresh window */ 3147 case 7: /* refresh window */
3516 scr_touch (true); 3148 scr_touch (true);
3517 break; 3149 break;
3518 case 8: /* set size (chars) */ 3150 case 8: /* set size (chars) */
3519 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3151 set_widthheight ((unsigned int) (args[2] * fwidth),
3520 (unsigned int) (args[1] * TermWin.fheight)); 3152 (unsigned int) (args[1] * fheight));
3521 break; 3153 break;
3522 3154
3523 //case 9: NYI, TODO, restore maximized window or maximize window 3155 //case 9: NYI, TODO, restore maximized window or maximize window
3524 default: 3156 default:
3525 if (args[0] >= 24) /* set height (chars) */ 3157 if (args[0] >= 24) /* set height (chars) */
3526 set_widthheight ((unsigned int)TermWin.width, 3158 set_widthheight ((unsigned int)width,
3527 (unsigned int) (args[1] * TermWin.fheight)); 3159 (unsigned int) (args[1] * fheight));
3528 break; 3160 break;
3529
3530 3161
3531 /* 3162 /*
3532 * reports - some output format copied from XTerm 3163 * reports - some output format copied from XTerm
3533 */ 3164 */
3534 case 11: /* report window state */ 3165 case 11: /* report window state */
3535 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3166 XGetWindowAttributes (dpy, parent[0], &wattr);
3536 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3167 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3537 break; 3168 break;
3538 case 13: /* report window position */ 3169 case 13: /* report window position */
3539 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3170 XGetWindowAttributes (dpy, parent[0], &wattr);
3540 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3171 XTranslateCoordinates (dpy, parent[0], wattr.root,
3541 -wattr.border_width, -wattr.border_width, 3172 -wattr.border_width, -wattr.border_width,
3542 &x, &y, &wdummy); 3173 &x, &y, &wdummy);
3543 tt_printf ("\033[3;%d;%dt", x, y); 3174 tt_printf ("\033[3;%d;%dt", x, y);
3544 break; 3175 break;
3545 case 14: /* report window size (pixels) */ 3176 case 14: /* report window size (pixels) */
3546 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3177 XGetWindowAttributes (dpy, parent[0], &wattr);
3547 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3178 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3548 break; 3179 break;
3549 case 18: /* report text area size (chars) */ 3180 case 18: /* report text area size (chars) */
3550 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3181 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3551 break; 3182 break;
3552 case 19: /* report window size (chars) */ 3183 case 19: /* report window size (chars) */
3553 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3184 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3554 break; 3185 break;
3555 case 20: /* report icon label */ 3186 case 20: /* report icon label */
3556 { 3187 {
3557 char *s; 3188 char *s;
3558 XGetIconName (disp, TermWin.parent[0], &s); 3189 XGetIconName (dpy, parent[0], &s);
3559 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 */
3560 XFree (s); 3191 XFree (s);
3561 } 3192 }
3562 break; 3193 break;
3563 case 21: /* report window title */ 3194 case 21: /* report window title */
3564 { 3195 {
3565 char *s; 3196 char *s;
3566 XFetchName (disp, TermWin.parent[0], &s); 3197 XFetchName (dpy, parent[0], &s);
3567 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 */
3568 XFree (s); 3199 XFree (s);
3569 } 3200 }
3570 break; 3201 break;
3571 } 3202 }
3572} 3203}
… …
3575/*----------------------------------------------------------------------*/ 3206/*----------------------------------------------------------------------*/
3576/* 3207/*
3577 * get input up until STRING TERMINATOR (or BEL) 3208 * get input up until STRING TERMINATOR (or BEL)
3578 * ends_how is terminator used. returned input must be free()'d 3209 * ends_how is terminator used. returned input must be free()'d
3579 */ 3210 */
3580unsigned char * 3211char *
3581rxvt_term::get_to_st (unicode_t &ends_how) 3212rxvt_term::get_to_st (unicode_t &ends_how)
3582{ 3213{
3583 unicode_t ch; 3214 unicode_t ch;
3584 bool seen_esc = false; 3215 bool seen_esc = false;
3585 unsigned int n = 0; 3216 unsigned int n = 0;
… …
3599 seen_esc = true; 3230 seen_esc = true;
3600 continue; 3231 continue;
3601 } 3232 }
3602 else if (ch == C0_BEL || ch == CHAR_ST) 3233 else if (ch == C0_BEL || ch == CHAR_ST)
3603 break; 3234 break;
3235 else if (ch == C0_SYN)
3236 ch = cmd_get8 ();
3604 else if (ch < 0x20) 3237 else if (ch < 0x20)
3605 return NULL; /* other control character - exit */ 3238 return NULL; /* other control character - exit */
3606 3239
3607 seen_esc = false; 3240 seen_esc = false;
3608 3241
3609 if (n >= STRING_MAX - 1) 3242 if (n >= STRING_MAX - 1)
3610 // stop at some sane length 3243 // stop at some sane length
3611 return NULL; 3244 return NULL;
3612 3245
3613 if (ch == C0_SYN)
3614 string[n++] = cmd_get8 ();
3615 else
3616 string[n++] = ch; 3246 string[n++] = ch;
3617 } 3247 }
3618 3248
3619 string[n++] = '\0'; 3249 string[n++] = '\0';
3620 3250
3621 ends_how = (ch == 0x5c ? C0_ESC : ch); 3251 ends_how = (ch == 0x5c ? C0_ESC : ch);
3622 3252
3623 return (unsigned char *)rxvt_wcstombs (string); 3253 return rxvt_wcstombs (string);
3624} 3254}
3625 3255
3626/*----------------------------------------------------------------------*/ 3256/*----------------------------------------------------------------------*/
3627/* 3257/*
3628 * 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)'
3629 */ 3259 */
3630void 3260void
3631rxvt_term::process_dcs_seq () 3261rxvt_term::process_dcs_seq ()
3632{ 3262{
3633 unsigned char *s; 3263 char *s;
3634 unicode_t eh; 3264 unicode_t eh;
3635 3265
3636 /* 3266 /*
3637 * Not handled yet 3267 * Not handled yet
3638 */ 3268 */
… …
3657 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3287 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3658 arg = arg * 10 + (ch - '0'); 3288 arg = arg * 10 + (ch - '0');
3659 3289
3660 if (ch == ';') 3290 if (ch == ';')
3661 { 3291 {
3662 unsigned char *s = get_to_st (eh); 3292 char *s = get_to_st (eh);
3663 3293
3664 if (s) 3294 if (s)
3665 { 3295 {
3666 process_xterm_seq (arg, (char *)s, eh); 3296 process_xterm_seq (arg, s, eh);
3667 free (s); 3297 free (s);
3668 } 3298 }
3669 } 3299 }
3670} 3300}
3671 3301
3672void 3302void
3673rxvt_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)
3674{ 3304{
3675 if (str[0] == '?' && !str[1]) 3305 if (str[0] == '?' && !str[1])
3676 { 3306 {
3677 unsigned short r, g, b; 3307 rgba c;
3678 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
3679 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);
3680 } 3316 }
3681 else 3317 else
3682 set_window_color (color, str); 3318 set_window_color (color, str);
3683} 3319}
3684 3320
3685/* 3321/*
3686 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3322 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3687 */ 3323 */
3688void 3324void
3689rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3325rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3690{ 3326{
3691 int changed = 0;
3692 int color; 3327 int color;
3693 char *buf, *name; 3328 char *buf, *name;
3694 bool query = str[0] == '?' && !str[1]; 3329 bool query = str[0] == '?' && !str[1];
3695 int saveop = op; 3330 int saveop = op;
3696 dDisp; 3331
3332 dLocal (Display *, dpy);
3697 3333
3698 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
3699 switch (op) 3339 switch (op)
3700 { 3340 {
3701 case XTerm_name: 3341 case XTerm_name:
3702 set_title (str); 3342 set_title (str);
3703 /* FALLTHROUGH */ 3343 /* FALLTHROUGH */
… …
3717 unsigned long bytes_after; 3357 unsigned long bytes_after;
3718 unsigned char *value = 0; 3358 unsigned char *value = 0;
3719 const char *str = ""; 3359 const char *str = "";
3720 3360
3721 if (prop 3361 if (prop
3722 && XGetWindowProperty (disp, TermWin.parent[0], 3362 && XGetWindowProperty (dpy, parent[0],
3723 prop, 0, 1<<16, 0, AnyPropertyType, 3363 prop, 0, 1<<16, 0, AnyPropertyType,
3724 &actual_type, &actual_format, 3364 &actual_type, &actual_format,
3725 &nitems, &bytes_after, &value) == Success 3365 &nitems, &bytes_after, &value) == Success
3726 && actual_type != None 3366 && actual_type != None
3727 && actual_format == 8) 3367 && actual_format == 8)
3728 str = (const char *)(value); 3368 str = (const char *)(value);
3729 3369
3730 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3370 tt_printf ("\033]%d;%s%c", op, str, resp);
3731 3371
3732 XFree (value); 3372 XFree (value);
3733 } 3373 }
3734 else 3374 else
3735 { 3375 {
… …
3739 { 3379 {
3740 *eq = 0; 3380 *eq = 0;
3741 set_utf8_property (display->atom (str), eq + 1); 3381 set_utf8_property (display->atom (str), eq + 1);
3742 } 3382 }
3743 else 3383 else
3744 XDeleteProperty (disp, TermWin.parent[0], 3384 XDeleteProperty (dpy, parent[0],
3745 display->atom (str)); 3385 display->atom (str));
3746 } 3386 }
3747 break; 3387 break;
3748 3388
3749 case XTerm_Color: 3389 case XTerm_Color:
… …
3751 { 3391 {
3752 if ((name = strchr (buf, ';')) == NULL) 3392 if ((name = strchr (buf, ';')) == NULL)
3753 break; 3393 break;
3754 3394
3755 *name++ = '\0'; 3395 *name++ = '\0';
3756 color = atoi (buf); 3396 color = atoi (buf) + minCOLOR;
3757 3397
3758 if (color < 0 || color >= TOTAL_COLORS) 3398 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3759 break; 3399 break;
3760 3400
3761 if ((buf = strchr (name, ';')) != NULL) 3401 if ((buf = strchr (name, ';')) != NULL)
3762 *buf++ = '\0'; 3402 *buf++ = '\0';
3763 3403
3764 if (name[0] == '?' && !name[1]) 3404 process_color_seq (op, color, name, resp);
3765 {
3766 unsigned short r, g, b;
3767 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3768 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3769 }
3770 else
3771 set_window_color (color + minCOLOR, name);
3772 } 3405 }
3773 break; 3406 break;
3774 case XTerm_Color00: 3407 case XTerm_Color00:
3775 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3408 process_color_seq (op, Color_fg, str, resp);
3776 break; 3409 break;
3777 case XTerm_Color01: 3410 case XTerm_Color01:
3778 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3411 process_color_seq (op, Color_bg, str, resp);
3779 break; 3412 break;
3780#ifndef NO_CURSORCOLOR 3413#ifndef NO_CURSORCOLOR
3781 case XTerm_Color_cursor: 3414 case XTerm_Color_cursor:
3782 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3415 process_color_seq (op, Color_cursor, str, resp);
3783 break; 3416 break;
3784#endif 3417#endif
3785 case XTerm_Color_pointer_fg: 3418 case XTerm_Color_pointer_fg:
3786 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3419 process_color_seq (op, Color_pointer_fg, str, resp);
3787 break; 3420 break;
3788 case XTerm_Color_pointer_bg: 3421 case XTerm_Color_pointer_bg:
3789 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3422 process_color_seq (op, Color_pointer_bg, str, resp);
3790 break; 3423 break;
3791#ifndef NO_BOLD_UNDERLINE_REVERSE 3424#ifndef NO_BOLD_UNDERLINE_REVERSE
3792 case XTerm_Color_BD:
3793 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3794 break;
3795 case XTerm_Color_UL:
3796 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3797 break;
3798 case XTerm_Color_RV: 3425 case XTerm_Color_RV:
3799 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3426 process_color_seq (op, Color_RV, str, resp);
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);
3800 break; 3435 break;
3801 case URxvt_Color_IT: 3436 case URxvt_Color_IT:
3802 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3437 process_color_seq (op, Color_IT, str, resp);
3803 break; 3438 break;
3804#endif 3439#endif
3805#if TRANSPARENT && TINTING 3440#if ENABLE_TRANSPARENCY && TINTING
3806 case URxvt_Color_tint: 3441 case URxvt_Color_tint:
3807 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3442 process_color_seq (op, Color_tint, str, resp);
3443
3808 check_our_parents (); 3444 check_our_parents ();
3445
3809 if (am_transparent) 3446 if (am_transparent)
3810 want_full_refresh = want_refresh = 1; 3447 want_full_refresh = want_refresh = 1;
3811 break;
3812#endif
3813 3448
3449 break;
3450#endif
3451
3814 case XTerm_Pixmap: 3452 case Rxvt_Pixmap:
3453 {
3815 if (*str != ';') 3454 if (*str != ';')
3816 { 3455 {
3817#if XPM_BACKGROUND 3456#if XPM_BACKGROUND
3818 scale_pixmap (""); /* reset to default scaling */ 3457 scale_pixmap (""); /* reset to default scaling */
3819 set_bgPixmap (str); /* change pixmap */ 3458 set_bgPixmap (str); /* change pixmap */
3820#endif
3821 scr_touch (true); 3459 scr_touch (true);
3460#endif
3822 } 3461 }
3462
3463 int changed = 0;
3464
3823 while ((str = strchr (str, ';')) != NULL) 3465 while ((str = strchr (str, ';')) != NULL)
3824 { 3466 {
3825 str++; 3467 str++;
3826#if XPM_BACKGROUND 3468#if XPM_BACKGROUND
3827 changed += scale_pixmap (str); 3469 changed += scale_pixmap (str);
3828#endif 3470#endif
3829 } 3471 }
3830 3472
3831 if (changed) 3473 if (changed)
3832 { 3474 {
3833#ifdef XPM_BACKGROUND 3475#ifdef XPM_BACKGROUND
3834 resize_pixmap (); 3476 resize_pixmap ();
3835#endif
3836 scr_touch (true); 3477 scr_touch (true);
3478#endif
3837 } 3479 }
3480#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3484 }
3838 break; 3485 break;
3839 3486
3840 case XTerm_restoreFG: 3487 case Rxvt_restoreFG:
3841 set_window_color (Color_fg, str); 3488 set_window_color (Color_fg, str);
3842 break; 3489 break;
3843 case XTerm_restoreBG: 3490 case Rxvt_restoreBG:
3844 set_window_color (Color_bg, str); 3491 set_window_color (Color_bg, str);
3845 break; 3492 break;
3846 3493
3847 case XTerm_logfile: 3494 case XTerm_logfile:
3848 // TODO, when secure mode? 3495 // TODO, when secure mode?
3849 break; 3496 break;
3850 3497
3851#ifdef MENUBAR
3852 case URxvt_Menu:
3853 if (options & Opt_insecure)
3854 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3855 break;
3856#endif
3857#if 0 3498#if 0
3858 case XTerm_dumpscreen: /* no error notices */ 3499 case Rxvt_dumpscreen: /* no error notices */
3859 { 3500 {
3860 int fd; 3501 int fd;
3861 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3502 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3862 { 3503 {
3863 scr_dump (fd); 3504 scr_dump (fd);
… …
3874 case URxvt_italicFont: 3515 case URxvt_italicFont:
3875 case URxvt_boldItalicFont: 3516 case URxvt_boldItalicFont:
3876#endif 3517#endif
3877 if (query) 3518 if (query)
3878 tt_printf ("\33]%d;%-.250s%c", saveop, 3519 tt_printf ("\33]%d;%-.250s%c", saveop,
3879 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3520 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3880 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3521 ? fontset[op - URxvt_font]->fontdesc : "",
3881 resp); 3522 resp);
3882 else 3523 else
3883 { 3524 {
3884 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3525 const char *&res = rs[Rs_font + (op - URxvt_font)];
3885 3526
… …
3887 allocated.push_back ((void *)res); 3528 allocated.push_back ((void *)res);
3888 set_fonts (); 3529 set_fonts ();
3889 } 3530 }
3890 break; 3531 break;
3891 3532
3892#if ENABLE_FRILLS 3533 case URxvt_version:
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
3893 case URxvt_locale: 3542 case URxvt_locale:
3894 if (query) 3543 if (query)
3895 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3544 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3896 else 3545 else
3897 { 3546 {
3898 set_locale (str); 3547 set_locale (str);
3899 pty.set_utf8_mode (enc_utf8); 3548 pty->set_utf8_mode (enc_utf8);
3900 init_xlocale (); 3549 init_xlocale ();
3901 } 3550 }
3902 break; 3551 break;
3903 3552
3904 case URxvt_view_up: 3553 case URxvt_view_up:
3905 case URxvt_view_down: 3554 case URxvt_view_down:
3555 {
3906 int lines = atoi (str); 3556 int lines = atoi (str);
3907 3557
3908 if (lines) 3558 if (lines)
3909 scr_page (op == URxvt_view_up ? UP : DN, lines); 3559 scr_page (op == URxvt_view_up ? UP : DN, lines);
3910 else 3560 else
3911 {
3912 scr_erase_savelines (); 3561 scr_erase_savelines ();
3913 } 3562 }
3914 3563
3564 break;
3565#endif
3566
3567#if ENABLE_PERL
3568 case URxvt_perl:
3569 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3570 ; // no responses yet
3915 break; 3571 break;
3916#endif 3572#endif
3917 } 3573 }
3918} 3574}
3919/*----------------------------------------------------------------------*/ 3575/*----------------------------------------------------------------------*/
… …
3950 return state; 3606 return state;
3951} 3607}
3952 3608
3953/* we're not using priv _yet_ */ 3609/* we're not using priv _yet_ */
3954void 3610void
3955rxvt_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)
3956{ 3612{
3957 unsigned int i, j; 3613 unsigned int i, j;
3958 int state; 3614 int state;
3959 3615
3960 static const struct 3616 static const struct
… …
3971 { 5, PrivMode_rVideo }, 3627 { 5, PrivMode_rVideo },
3972 { 6, PrivMode_relOrigin }, 3628 { 6, PrivMode_relOrigin },
3973 { 7, PrivMode_Autowrap }, 3629 { 7, PrivMode_Autowrap },
3974 // 8, bi-directional support mode 3630 // 8, bi-directional support mode
3975 { 9, PrivMode_MouseX10 }, 3631 { 9, PrivMode_MouseX10 },
3976#ifdef menuBar_esc
3977 { menuBar_esc, PrivMode_menuBar },
3978#endif
3979 // 18, 19 printing-related 3632 // 18, 19 printing-related
3980 { 25, PrivMode_VisibleCursor }, 3633 { 25, PrivMode_VisibleCursor },
3981#ifdef scrollBar_esc 3634#ifdef scrollBar_esc
3982 { scrollBar_esc, PrivMode_scrollBar }, 3635 { scrollBar_esc, PrivMode_scrollBar },
3983#endif 3636#endif
… …
4028 } 3681 }
4029 3682
4030 /* extra handling for values with state unkept */ 3683 /* extra handling for values with state unkept */
4031 switch (arg[i]) 3684 switch (arg[i])
4032 { 3685 {
3686#if ENABLE_STYLES
3687 case 1021:
3688 set_option (Opt_intensityStyles, mode);
3689
3690 scr_touch (true);
3691 break;
3692#endif
4033 case 1048: /* alternative cursor save */ 3693 case 1048: /* alternative cursor save */
4034 case 1049: 3694 case 1049:
4035 if (options & Opt_secondaryScreen) 3695 if (option (Opt_secondaryScreen))
4036 if (mode == 0) 3696 if (mode == 0)
4037 scr_cursor (RESTORE); 3697 scr_cursor (RESTORE);
4038 else if (mode == 1) 3698 else if (mode == 1)
4039 scr_cursor (SAVE); 3699 scr_cursor (SAVE);
4040 break; 3700 break;
… …
4052 */ 3712 */
4053 PrivMode (1, PrivMode_vt52); 3713 PrivMode (1, PrivMode_vt52);
4054 break; 3714 break;
4055 case 3: /* 80/132 */ 3715 case 3: /* 80/132 */
4056 if (priv_modes & PrivMode_132OK) 3716 if (priv_modes & PrivMode_132OK)
4057 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3717 set_widthheight (((state ? 132 : 80) * fwidth), height);
4058 break; 3718 break;
4059 case 4: /* smooth scrolling */ 3719 case 4: /* smooth scrolling */
4060 if (state)
4061 options &= ~Opt_jumpScroll;
4062 else
4063 options |= Opt_jumpScroll; 3720 set_option (Opt_jumpScroll, !state);
4064 break; 3721 break;
4065 case 5: /* reverse video */ 3722 case 5: /* reverse video */
4066 scr_rvideo_mode (state); 3723 scr_rvideo_mode (state);
4067 break; 3724 break;
4068 case 6: /* relative/absolute origins */ 3725 case 6: /* relative/absolute origins */
… …
4074 /* 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 */
4075 case 9: /* X10 mouse reporting */ 3732 case 9: /* X10 mouse reporting */
4076 if (state) /* orthogonal */ 3733 if (state) /* orthogonal */
4077 priv_modes &= ~PrivMode_MouseX11; 3734 priv_modes &= ~PrivMode_MouseX11;
4078 break; 3735 break;
4079#ifdef menuBar_esc
4080 case menuBar_esc:
4081#ifdef MENUBAR
4082 map_menuBar (state);
4083#endif
4084 break;
4085#endif
4086#ifdef scrollBar_esc 3736#ifdef scrollBar_esc
4087 case scrollBar_esc: 3737 case scrollBar_esc:
4088 if (scrollbar_mapping (state)) 3738 if (scrollbar_mapping (state))
4089 { 3739 {
4090 resize_all_windows (0, 0, 0); 3740 resize_all_windows (0, 0, 0);
… …
4109#if 0 3759#if 0
4110 case 1001: 3760 case 1001:
4111 break; /* X11 mouse highlighting */ 3761 break; /* X11 mouse highlighting */
4112#endif 3762#endif
4113 case 1010: /* scroll to bottom on TTY output inhibit */ 3763 case 1010: /* scroll to bottom on TTY output inhibit */
4114 if (state)
4115 options &= ~Opt_scrollTtyOutput;
4116 else
4117 options |= Opt_scrollTtyOutput; 3764 set_option (Opt_scrollTtyOutput, !state);
4118 break; 3765 break;
4119 case 1011: /* scroll to bottom on key press */ 3766 case 1011: /* scroll to bottom on key press */
4120 if (state)
4121 options |= Opt_scrollTtyKeypress; 3767 set_option (Opt_scrollTtyKeypress, state);
4122 else
4123 options &= ~Opt_scrollTtyKeypress;
4124 break; 3768 break;
4125 case 1047: /* secondary screen w/ clearing last */ 3769 case 1047: /* secondary screen w/ clearing last */
4126 if (options & Opt_secondaryScreen) 3770 if (option (Opt_secondaryScreen))
4127 if (current_screen != PRIMARY) 3771 if (current_screen != PRIMARY)
4128 scr_erase_screen (2); 3772 scr_erase_screen (2);
4129 scr_change_screen (state); 3773 scr_change_screen (state);
4130 break; 3774 break;
4131 case 1049: /* secondary screen w/ clearing first */ 3775 case 1049: /* secondary screen w/ clearing first */
4132 scr_change_screen (state); 3776 scr_change_screen (state);
4133 if (options & Opt_secondaryScreen) 3777 if (option (Opt_secondaryScreen))
4134 if (current_screen != PRIMARY) 3778 if (current_screen != PRIMARY)
4135 scr_erase_screen (2); 3779 scr_erase_screen (2);
4136 break; 3780 break;
4137 default: 3781 default:
4138 break; 3782 break;
… …
4266 scr_color (Color_bg, Color_bg); 3910 scr_color (Color_bg, Color_bg);
4267 break; 3911 break;
4268 3912
4269 //case 50: // not variable spacing 3913 //case 50: // not variable spacing
4270 3914
4271#ifndef NO_BRIGHTCOLOR 3915#if !ENABLE_MINIMAL
4272 case 90: 3916 case 90:
4273 case 91: /* set bright fg color */ 3917 case 91: /* set bright fg color */
4274 case 92: 3918 case 92:
4275 case 93: 3919 case 93:
4276 case 94: 3920 case 94:
… …
4288 case 106: 3932 case 106:
4289 case 107: 3933 case 107:
4290 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3934 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4291 break; 3935 break;
4292#endif 3936#endif
4293
4294 } 3937 }
4295 } 3938 }
4296} 3939}
4297/*}}} */ 3940/*}}} */
4298 3941
… …
4322 */ 3965 */
4323void 3966void
4324rxvt_term::tt_printf (const char *fmt,...) 3967rxvt_term::tt_printf (const char *fmt,...)
4325{ 3968{
4326 va_list arg_ptr; 3969 va_list arg_ptr;
4327 unsigned char buf[256]; 3970 char buf[256];
4328 3971
4329 va_start (arg_ptr, fmt); 3972 va_start (arg_ptr, fmt);
4330 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3973 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4331 va_end (arg_ptr); 3974 va_end (arg_ptr);
4332 tt_write (buf, strlen (buf)); 3975 tt_write (buf, strlen (buf));
… …
4337 * or generated by us in response to a query ESC sequence. 3980 * or generated by us in response to a query ESC sequence.
4338 */ 3981 */
4339const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3982const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4340 3983
4341void 3984void
4342rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3985rxvt_term::tt_write (const char *data, unsigned int len)
4343{ 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
4344 if (v_buflen == 0) 3993 if (v_buflen == 0)
4345 { 3994 {
4346 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));
4347 3996
4348 if ((unsigned int)written == len) 3997 if ((unsigned int)written == len)
4349 return; 3998 return;
4350 3999
4351 data += written; 4000 data += written;
4352 len -= written; 4001 len -= written;
4353 } 4002 }
4354 4003
4355 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4004 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4356 4005
4357 memcpy (v_buffer + v_buflen, data, len); 4006 memcpy (v_buffer + v_buflen, data, len);
4358 v_buflen += len; 4007 v_buflen += len;
4359 4008
4360 pty_ev.set (EVENT_READ | EVENT_WRITE); 4009 pty_ev.set (EVENT_READ | EVENT_WRITE);
4361} 4010}
4362 4011
4363void rxvt_term::pty_write () 4012void rxvt_term::pty_write ()
4364{ 4013{
4365 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));
4366 4015
4367 if (written > 0) 4016 if (written > 0)
4368 { 4017 {
4369 v_buflen -= written; 4018 v_buflen -= written;
4370 4019
… …
4379 } 4028 }
4380 4029
4381 memmove (v_buffer, v_buffer + written, v_buflen); 4030 memmove (v_buffer, v_buffer + written, v_buflen);
4382 } 4031 }
4383 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4032 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4384 // original code just ignores this... 4033 pty_ev.set (EVENT_READ);
4385 destroy ();
4386} 4034}
4387 4035
4388/*----------------------- end-of-file (C source) -----------------------*/ 4036/*----------------------- end-of-file (C source) -----------------------*/
4389 4037

Diff Legend

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