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.145 by root, Mon Aug 16 12:04:57 2004 UTC vs.
Revision 1.327 by ayin, Mon Jun 11 13:33:34 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 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#include <wchar.h> 54#ifdef KEYSYM_RESOURCE
55# include "keyboard.h"
56#endif
57
58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
54 63
55/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
56 65
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58
59// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input;
61 67
62#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
63 69
64#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
65#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
113 XK_Escape, 0x238b, 119 XK_Escape, 0x238b,
114 XK_Undo, 0x238c, 120 XK_Undo, 0x238c,
115 XK_Print, 0x2399, 121 XK_Print, 0x2399,
116 122
117 XK_space, 0x2423, 123 XK_space, 0x2423,
124
125#ifdef XK_KP_Begin
126 XK_KP_Prior, 0x21de,
127 XK_KP_Next, 0x21df,
128 XK_KP_Begin, 0x2320,
129 XK_KP_Insert, 0x2380,
130 XK_KP_Delete, 0x2326,
118 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif
119 0, 133 0,
120}; 134};
121 135
122void 136void
123rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
124{ 138{
125 x = Pixel2Col (x); 139 x = Pixel2Col (x);
126 y = Pixel2Row (y); 140 y = Pixel2Row (y);
127 141
128 if (x < 0 || x >= TermWin.ncol 142 if (!IN_RANGE_EXC (x, 0, ncol)
129 || y < 0 || y >= TermWin.nrow) 143 || !IN_RANGE_EXC (y, 0, nrow))
130 return; 144 return;
131 145
132 for (;;) 146 for (;;)
133 { 147 {
134 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];
135 151
136 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
137 { 153 {
138 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x]); 154 iso14755_51 (l.t[x], l.r[x], x, y);
139 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
140 break; 156 break;
141 } 157 }
142 158
143 x--; 159 x--;
144 } 160 }
145
146} 161}
147#endif
148 162
149#if ENABLE_OVERLAY
150void 163void
151rxvt_term::iso14755_51 (wchar_t ch) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
152{ 165{
166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
153 wchar_t *chr, *alloc; 168 wchar_t *chr, *alloc, ch2, *fname;
154 int len; 169 int len;
155 170
171 fname = rxvt_utf8towcs (f->name);
172
156#if ENABLE_COMBINING 173# if ENABLE_COMBINING
157 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
158 { 175 {
159 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
160 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
161 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
162 } 179 }
163 else 180 else
164#endif 181# endif
165 { 182 {
183 ch2 = ch;
184
166 alloc = 0; 185 alloc = 0;
167 chr = &ch; 186 chr = &ch2;
168 len = 1; 187 len = 1;
169 } 188 }
170 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
202 int width = wcswidth (fname, wcslen (fname));
203
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
171 scr_overlay_new (0, -1, 8 + 5, len); 213 scr_overlay_new (x, y, width, len + 2);
214
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
172 216
173 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
174 { 218 {
175 char buf[9]; 219 char buf[9];
176 220
177 ch = *chr++; 221 ch = *chr++;
178 222
179 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
180 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
181 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
182#if !UNICODE3 226# if !UNICODE3
183 if (ch >= 0x10000) 227 if (ch >= 0x10000)
184 ch = 0xfffd; 228 ch = 0xfffd;
185#endif 229# endif
186 scr_overlay_set (11, y, ch); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
187 scr_overlay_set (12, y, NOCHAR); 233 scr_overlay_set (12, y, NOCHAR, r);
188 } 234 }
189 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);
242 scr_overlay_set (0, len + 1, fname);
243
244 free (fname);
245
190#if ENABLE_COMBINING 246# if ENABLE_COMBINING
191 if (alloc) 247 if (alloc)
192 delete [] alloc; 248 delete [] alloc;
193#endif 249# endif
194} 250}
195#endif 251#endif
196 252
197void 253void
198rxvt_term::commit_iso14755 () 254rxvt_term::commit_iso14755 ()
… …
215 mb[0] = ch[0]; 271 mb[0] = ch[0];
216 len = 1; 272 len = 1;
217 } 273 }
218 274
219 if (len > 0) 275 if (len > 0)
220 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
221 else 277 else
222 scr_bell (); 278 scr_bell ();
223 } 279 }
224 280
225 iso14755buf = 0; 281 iso14755buf = 0;
… …
242 298
243 return -1; 299 return -1;
244} 300}
245#endif 301#endif
246 302
247/*{{{ Convert the keypress event into a string */
248void 303void
249rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
250{ 305{
251 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
252 unsigned int newlen; 307 unsigned int newlen;
253 KeySym keysym; 308 KeySym keysym;
254#ifdef DEBUG_CMD
255 static int debug_key = 1; /* accessible by a debugger only */
256#endif
257 int valid_keysym; 309 int valid_keysym;
258 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
259 316
260 /* 317 /*
261 * 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
262 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
263 * 320 *
264 * Always permit `shift' to override the current setting 321 * Always permit `shift' to override the current setting
265 */ 322 */
266 shft = (ev.state & ShiftMask); 323 shft = ev.state & ShiftMask;
267 ctrl = (ev.state & ControlMask); 324 ctrl = ev.state & ControlMask;
268 meta = (ev.state & ModMetaMask); 325 meta = ev.state & ModMetaMask;
269 326
270 if (numlock_state || (ev.state & ModNumLockMask)) 327 if (numlock_state || (ev.state & ModNumLockMask))
271 { 328 {
272 numlock_state = (ev.state & ModNumLockMask); 329 numlock_state = (ev.state & ModNumLockMask);
273 PrivMode ((!numlock_state), PrivMode_aplKP); 330 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
281 Status status_return; 338 Status status_return;
282 339
283#if 0 340#if 0
284#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
285 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
286 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
287 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
288 else 345 else
289#endif 346#endif
290#endif 347#endif
291 { 348 {
… …
293 350
294 // the XOpenIM manpage lies about hardcoding the locale 351 // the XOpenIM manpage lies about hardcoding the locale
295 // at the point of XOpenIM, so temporarily switch locales 352 // at the point of XOpenIM, so temporarily switch locales
296 if (rs[Rs_imLocale]) 353 if (rs[Rs_imLocale])
297 SET_LOCALE (rs[Rs_imLocale]); 354 SET_LOCALE (rs[Rs_imLocale]);
355
298 // assume wchar_t == unicode or better 356 // assume wchar_t == unicode or better
299 len = XwcLookupString (Input_Context, &ev, wkbuf, 357 len = XwcLookupString (Input_Context, &ev, wkbuf,
300 KBUFSZ, &keysym, &status_return); 358 KBUFSZ, &keysym, &status_return);
359
301 if (rs[Rs_imLocale]) 360 if (rs[Rs_imLocale])
302 SET_LOCALE (locale); 361 SET_LOCALE (locale);
303 362
304 if (status_return == XLookupChars 363 if (status_return == XLookupChars
305 || status_return == XLookupBoth) 364 || status_return == XLookupBoth)
… …
326 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
327 } 386 }
328 else 387 else
329#endif 388#endif
330 { 389 {
331 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
332 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
333 } 392 }
334 393
335 if (valid_keysym) 394 if (valid_keysym)
336 { 395 {
396#ifdef KEYSYM_RESOURCE
397 if (keyboard->dispatch (this, keysym, ev.state))
398 return;
399#endif
400
337 if (TermWin.saveLines) 401 if (saveLines)
338 { 402 {
339#ifdef UNSHIFTED_SCROLLKEYS 403#ifdef UNSHIFTED_SCROLLKEYS
340 if (!ctrl && !meta) 404 if (!ctrl && !meta)
341#else 405#else
342 if (IS_SCROLL_MOD) 406 if (IS_SCROLL_MOD)
343#endif 407#endif
344 { 408 {
345 int lnsppg; 409 int lnsppg;
346 410
347#ifdef PAGING_CONTEXT_LINES 411#ifdef PAGING_CONTEXT_LINES
348 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 412 lnsppg = nrow - PAGING_CONTEXT_LINES;
349#else 413#else
350 lnsppg = TermWin.nrow * 4 / 5; 414 lnsppg = nrow * 4 / 5;
351#endif 415#endif
352 if (keysym == XK_Prior) 416 if (keysym == XK_Prior)
353 { 417 {
354 scr_page (UP, lnsppg); 418 scr_page (UP, lnsppg);
355 return; 419 return;
… …
383 scr_move_to (0, 1); 447 scr_move_to (0, 1);
384 return; 448 return;
385 } 449 }
386 else if (keysym == XK_End) 450 else if (keysym == XK_End)
387 { 451 {
388 scr_move_to (1, 0); 452 scr_move_to (1, 1);
389 return; 453 return;
390 } 454 }
391 } 455 }
392#endif 456#endif
393 } 457 }
… …
404 { 468 {
405 switch (keysym) 469 switch (keysym)
406 { 470 {
407 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
408 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
409 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
410 return; 474 return;
411#if TODO // TODO 475#if TODO
412 /* rxvt extras */ 476 /* rxvt extras */
413 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
414 change_font (FONT_UP); 478 change_font (FONT_UP);
415 return; 479 return;
416 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
433 { 497 {
434 commit_iso14755 (); 498 commit_iso14755 ();
435 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
436# if ISO_14755 500# if ISO_14755
437 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);
438# endif 510# endif
439 return; 511 return;
440 } 512 }
441 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
442 { 514 {
… …
475 } 547 }
476#endif 548#endif
477 549
478 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
479 { 551 {
480#ifdef KEYSYM_RESOURCE
481 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
482 {
483 unsigned int l;
484 const unsigned char *kbuf0;
485
486 kbuf0 = (Keysym_map[keysym & 0xFF]);
487 l = (unsigned int)*kbuf0++;
488
489 /* escape prefix */
490 if (meta
491# ifdef META8_OPTION
492 && meta_char == C0_ESC
493# endif
494 )
495 {
496 const unsigned char ch = C0_ESC;
497 tt_write (&ch, 1);
498 }
499
500 tt_write (kbuf0, l);
501 return;
502 }
503 else
504#endif
505 { 552 {
506 newlen = 1; 553 newlen = 1;
507 switch (keysym) 554 switch (keysym)
508 { 555 {
509#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
… …
517 else 564 else
518 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, key_backspace);
519 break; 566 break;
520#endif 567#endif
521#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
522 case XK_Delete: 579 case XK_Delete:
523 strcpy (kbuf, key_delete); 580 strcpy (kbuf, key_delete);
524 break; 581 break;
525#endif 582#endif
526 case XK_Tab: 583 case XK_Tab:
… …
629#ifdef XK_KP_Begin 686#ifdef XK_KP_Begin
630 case XK_KP_Begin: 687 case XK_KP_Begin:
631 strcpy (kbuf, "\033Ou"); 688 strcpy (kbuf, "\033Ou");
632 break; 689 break;
633 690
634 case XK_KP_Insert:
635 strcpy (kbuf, "\033Op");
636 break;
637
638 case XK_KP_Delete:
639 strcpy (kbuf, "\033On");
640 break;
641#endif 691#endif
642 case XK_KP_F1: /* "\033OP" */ 692 case XK_KP_F1: /* "\033OP" */
643 case XK_KP_F2: /* "\033OQ" */ 693 case XK_KP_F2: /* "\033OQ" */
644 case XK_KP_F3: /* "\033OR" */ 694 case XK_KP_F3: /* "\033OR" */
645 case XK_KP_F4: /* "\033OS" */ 695 case XK_KP_F4: /* "\033OS" */
… …
677 break; 727 break;
678 728
679 case XK_Find: 729 case XK_Find:
680 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
681 break; 731 break;
732
733#ifdef XK_KP_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
682 case XK_Insert: 743 case XK_Insert:
683 strcpy (kbuf, "\033[2~"); 744 strcpy (kbuf, "\033[2~");
684 break; 745 break;
685#ifdef DXK_Remove /* support for DEC remove like key */ 746#ifdef DXK_Remove /* support for DEC remove like key */
686 case DXK_Remove: 747 case DXK_Remove:
… …
776#undef FKEY 837#undef FKEY
777 default: 838 default:
778 newlen = 0; 839 newlen = 0;
779 break; 840 break;
780 } 841 }
842
781 if (newlen) 843 if (newlen)
782 len = strlen (kbuf); 844 len = strlen (kbuf);
783 } 845 }
784 846
785 /* 847 /*
… …
794 else if (ctrl && keysym == XK_minus) 856 else if (ctrl && keysym == XK_minus)
795 { 857 {
796 len = 1; 858 len = 1;
797 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 859 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
798 } 860 }
861 else if (keysym == XK_ISO_Left_Tab)
862 {
863 strcpy (kbuf, "\033[Z");
864 len = 3;
865 }
799 else 866 else
800 { 867 {
801#ifdef META8_OPTION 868#ifdef META8_OPTION
802 /* set 8-bit on */ 869 /* set 8-bit on */
803 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
804 { 871 {
805 unsigned char *ch; 872 char *ch;
806 873
807 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
808 *ch |= 0x80; 875 *ch |= 0x80;
809 876
810 meta = 0; 877 meta = 0;
… …
812#endif 879#endif
813 /* nil */ ; 880 /* nil */ ;
814 } 881 }
815 } 882 }
816 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
817 if (len <= 0) 887 if (len <= 0)
818 return; /* not mapped */ 888 return; /* not mapped */
819 889
820 if (options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
821 if (TermWin.view_start) 891 if (view_start)
822 { 892 {
823 TermWin.view_start = 0; 893 view_start = 0;
824 want_refresh = 1; 894 want_refresh = 1;
825 } 895 }
826 896
827 /* 897 /*
828 * these modifications only affect the static keybuffer 898 * these modifications only affect the static keybuffer
… …
843#ifdef META8_OPTION 913#ifdef META8_OPTION
844 && meta_char == C0_ESC 914 && meta_char == C0_ESC
845#endif 915#endif
846 ) 916 )
847 { 917 {
848 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
849 tt_write (&ch, 1); 919 tt_write (&ch, 1);
850 } 920 }
851 921
852#if defined(DEBUG_CMD)
853 /* Display keyboard buffer contents */
854 unsigned char *p;
855 int i;
856
857 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
858 for (i = 0, p = kbuf; i < len; i++, p++)
859 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
860 fprintf (stderr, "'\n");
861#endif /* DEBUG_CMD */
862 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
863} 923}
864/*}}} */
865 924
866#if (MENUBAR_MAX) 925void
867/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 926rxvt_term::key_release (XKeyEvent &ev)
868/* attempt to `write' count to the input buffer */ 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
1002#if defined (KEYSYM_RESOURCE)
869unsigned int 1003unsigned int
870rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
871{ 1005{
872 unsigned int n, s; 1006 unsigned int n, s;
873 1007
874 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
875 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
894 1028
895 cmd_parse (); 1029 cmd_parse ();
896 1030
897 return 0; 1031 return 0;
898} 1032}
899#endif /* MENUBAR_MAX */ 1033#endif
900 1034
901void 1035void
902rxvt_term::flush () 1036rxvt_term::flush ()
903{ 1037{
1038 flush_ev.stop ();
1039
904#ifdef TRANSPARENT 1040#ifdef TRANSPARENT
905 if (want_full_refresh) 1041 if (want_full_refresh)
906 { 1042 {
907 want_full_refresh = 0; 1043 want_full_refresh = 0;
908 scr_clear (); 1044 scr_clear ();
… …
910 } 1046 }
911#endif 1047#endif
912 1048
913 if (want_refresh) 1049 if (want_refresh)
914 { 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
915 scr_refresh (refresh_type); 1089 scr_refresh ();
916 scrollbar_show (1); 1090 scrollbar_show (1);
917#ifdef USE_XIM 1091#ifdef USE_XIM
918 IMSendSpot (); 1092 IMSendSpot ();
919#endif 1093#endif
920 } 1094 }
921 1095
922 display->flush (); 1096 display->flush ();
923
924 flush_ev.stop ();
925} 1097}
926 1098
927void 1099void
928rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
929{ 1101{
930 SET_R (this); 1102 make_current ();
931 SET_LOCALE (locale);
932 1103
933 display->flush (); 1104 display->flush ();
934 1105
935 if (want_refresh && !flush_ev.active) 1106 if (want_refresh && !flush_ev.active)
936 flush_ev.start (NOW + 0.01); 1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
937} 1108}
938 1109
939void 1110void
940rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
941{ 1112{
942 SET_R (this); 1113 make_current ();
943 SET_LOCALE (locale);
944 1114
945 refresh_limit = 1; 1115 refresh_limit = 1;
946 refresh_count = 0; 1116 refresh_count = 0;
947 flush (); 1117 flush ();
948} 1118}
… …
952rxvt_term::cursor_blink_cb (time_watcher &w) 1122rxvt_term::cursor_blink_cb (time_watcher &w)
953{ 1123{
954 hidden_cursor = !hidden_cursor; 1124 hidden_cursor = !hidden_cursor;
955 want_refresh = 1; 1125 want_refresh = 1;
956 1126
957 w.start (w.at + BLINK_INTERVAL); 1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
958} 1128}
959#endif 1129#endif
960 1130
961#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
962void 1132void
… …
976rxvt_term::cont_scroll_cb (time_watcher &w) 1146rxvt_term::cont_scroll_cb (time_watcher &w)
977{ 1147{
978 if ((scrollbar_isUp() || scrollbar_isDn()) && 1148 if ((scrollbar_isUp() || scrollbar_isDn()) &&
979 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1149 scr_page (scrollbar_isUp() ? UP : DN, 1))
980 { 1150 {
981 refresh_type |= SMOOTH_REFRESH;
982 want_refresh = 1; 1151 want_refresh = 1;
983 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
984 } 1153 }
985} 1154}
986#endif 1155#endif
… …
990rxvt_term::sel_scroll_cb (time_watcher &w) 1159rxvt_term::sel_scroll_cb (time_watcher &w)
991{ 1160{
992 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1161 if (scr_page (scroll_selection_dir, scroll_selection_lines))
993 { 1162 {
994 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1163 selection_extend (selection_save_x, selection_save_y, selection_save_state);
995 refresh_type |= SMOOTH_REFRESH;
996 want_refresh = 1; 1164 want_refresh = 1;
997 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
998 } 1166 }
999} 1167}
1000#endif 1168#endif
… …
1005{ 1173{
1006 if (mouse_slip_wheel_speed == 0 1174 if (mouse_slip_wheel_speed == 0
1007 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1008 : scr_page (UP, mouse_slip_wheel_speed)) 1176 : scr_page (UP, mouse_slip_wheel_speed))
1009 { 1177 {
1010 refresh_type |= SMOOTH_REFRESH; 1178 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0;
1180
1011 want_refresh = 1; 1181 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1013 } 1183 }
1014} 1184}
1015#endif 1185#endif
1016 1186
1187#if LINUX_YIELD_HACK
1188static struct event_handler
1189{
1190 check_watcher yield_ev;
1191
1192 void yield_cb (check_watcher &w)
1193 {
1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1202 w.stop ();
1203 }
1204
1205 event_handler ()
1206 : yield_ev (this, &event_handler::yield_cb)
1207 {
1208 }
1209} event_handler;
1210#endif
1211
1017bool 1212bool
1018rxvt_term::pty_fill () 1213rxvt_term::pty_fill ()
1019{ 1214{
1020 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1215 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1021 1216
1022 if (CBUFSIZ == n) 1217 if (CBUFSIZ == n)
1023 { 1218 {
1024 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1219 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1025 n = 0; 1220 n = 0;
1026 } 1221 }
1027 1222
1028 memmove (cmdbuf_base, cmdbuf_ptr, n); 1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
1029 cmdbuf_ptr = cmdbuf_base; 1224 cmdbuf_ptr = cmdbuf_base;
1030 cmdbuf_endp = cmdbuf_ptr + n; 1225 cmdbuf_endp = cmdbuf_ptr + n;
1031 1226
1032 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1033 1228
1034 if (n > 0) 1229 if (r > 0)
1035 { 1230 {
1036 cmdbuf_endp += n; 1231 cmdbuf_endp += r;
1037 return true; 1232 return true;
1038 } 1233 }
1039 else if (n < 0 && errno != EAGAIN) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1235 {
1236#if LINUX_YIELD_HACK
1237 if (display->is_local)
1238 event_handler.yield_ev.start ();
1239#endif
1240 }
1241 else
1242 {
1243 pty_ev.stop ();
1244
1245 if (!option (Opt_hold))
1040 destroy (); 1246 destroy ();
1247 }
1041 1248
1042 return false; 1249 return false;
1043} 1250}
1044 1251
1045void 1252void
1046rxvt_term::pty_cb (io_watcher &w, short revents) 1253rxvt_term::pty_cb (io_watcher &w, short revents)
1047{ 1254{
1048 SET_R (this); 1255 make_current ();
1049 SET_LOCALE (locale);
1050 1256
1051 if (revents & EVENT_WRITE)
1052 tt_write (0, 0);
1053 else if (revents & EVENT_READ) 1257 if (revents & EVENT_READ)
1054 // loop, but don't allow a single term to monopolize us 1258 // loop, but don't allow a single term to monopolize us
1055 while (pty_fill ()) 1259 while (pty_fill ())
1056 if (cmd_parse ()) 1260 if (cmd_parse ())
1057 break; 1261 break;
1262
1263 if (revents & EVENT_WRITE)
1264 pty_write ();
1058} 1265}
1059 1266
1060void 1267void
1061rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1062{ 1269{
1063 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1064 recolour_cursor (); 1271 recolour_cursor ();
1065 1272
1066#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1067 hidden_pointer = 0; 1274 hidden_pointer = 0;
1068 1275
1069 if (options & Opt_pointerBlank) 1276 if (option (Opt_pointerBlank))
1070 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1071#endif 1278#endif
1072} 1279}
1073 1280
1074#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1075void 1282void
1076rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1077{ 1284{
1078 if (! (options & Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1079 return; 1286 return;
1080 1287
1081 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1082 XFlush (display->display); 1289 XFlush (dpy);
1083 1290
1084 hidden_pointer = 1; 1291 hidden_pointer = 1;
1085} 1292}
1086 1293
1087void 1294void
1088rxvt_term::pointer_cb (time_watcher &w) 1295rxvt_term::pointer_cb (time_watcher &w)
1089{ 1296{
1090 SET_R (this); 1297 make_current ();
1091 SET_LOCALE (locale);
1092 1298
1093 pointer_blank (); 1299 pointer_blank ();
1094} 1300}
1095#endif 1301#endif
1096 1302
… …
1137 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1343 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1138 + ((MEvent.state & ControlMask) ? 16 : 0); 1344 + ((MEvent.state & ControlMask) ? 16 : 0);
1139#ifdef MOUSE_REPORT_DOUBLECLICK 1345#ifdef MOUSE_REPORT_DOUBLECLICK
1140 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1346 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1141#endif 1347#endif
1142
1143 } 1348 }
1144 1349
1145#ifdef DEBUG_MOUSEREPORT 1350#if DEBUG_MOUSEREPORT
1146 fprintf (stderr, "Mouse ["); 1351 fprintf (stderr, "Mouse [");
1147 if (key_state & 16) 1352 if (key_state & 16)
1148 fputc ('C', stderr); 1353 fputc ('C', stderr);
1149 if (key_state & 4) 1354 if (key_state & 4)
1150 fputc ('S', stderr); 1355 fputc ('S', stderr);
… …
1154 fputc ('2', stderr); 1359 fputc ('2', stderr);
1155 fprintf (stderr, "]: <%d>, %d/%d\n", 1360 fprintf (stderr, "]: <%d>, %d/%d\n",
1156 button_number, 1361 button_number,
1157 x + 1, 1362 x + 1,
1158 y + 1); 1363 y + 1);
1159#else 1364#endif
1365
1160 tt_printf ("\033[M%c%c%c", 1366 tt_printf ("\033[M%c%c%c",
1161 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
1162 (32 + x + 1), 1368 (32 + x + 1),
1163 (32 + y + 1)); 1369 (32 + y + 1));
1164#endif
1165} 1370}
1166
1167#ifdef USING_W11LIB
1168void
1169rxvt_W11_process_x_event (XEvent *ev)
1170{
1171 rxvt_t *r = rxvt_get_r ();
1172
1173 x_cb (*ev);
1174}
1175#endif
1176 1371
1177/*{{{ process an X event */ 1372/*{{{ process an X event */
1178void 1373void
1179rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1180{ 1375{
1181 SET_R (this); 1376 make_current ();
1182 SET_LOCALE (locale);
1183 1377
1184#if defined(CURSOR_BLINK) 1378 dLocal (Display *, dpy);
1185 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1186 {
1187 if (hidden_cursor)
1188 {
1189 hidden_cursor = 0;
1190 want_refresh = 1;
1191 }
1192 1379
1193 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1380 if (ev.xany.window == vt
1194 } 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1195#endif 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1196
1197#if defined(POINTER_BLANK)
1198 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1199 {
1200 if (ev.type == MotionNotify
1201 || ev.type == ButtonPress
1202 || ev.type == ButtonRelease)
1203 if (hidden_pointer)
1204 pointer_unblank ();
1205
1206 if (ev.type == KeyPress && hidden_pointer == 0)
1207 pointer_blank ();
1208 }
1209#endif
1210
1211#ifdef USE_XIM
1212 if (XFilterEvent (&ev, None))
1213 return; 1383 return;
1214#endif
1215 1384
1385 // for XQueryPointer
1216 Window unused_root, unused_child; 1386 Window unused_root, unused_child;
1217 int unused_root_x, unused_root_y; 1387 int unused_root_x, unused_root_y;
1218 unsigned int unused_mask; 1388 unsigned int unused_mask;
1219 1389
1220 switch (ev.type) 1390 switch (ev.type)
1221 { 1391 {
1222 case KeyPress: 1392 case KeyPress:
1223#if ISO_14755 1393 key_press (ev.xkey);
1224 if (!(iso14755buf & ISO_14755_52))
1225#endif
1226 lookup_key (ev.xkey);
1227
1228 break; 1394 break;
1229 1395
1230 case KeyRelease: 1396 case KeyRelease:
1231 { 1397 key_release (ev.xkey);
1232#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || defined (ENABLE_FRILLS)
1233 KeySym ks;
1234
1235 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1236#endif
1237
1238#if ENABLE_FRILLS || ISO_14755
1239 // ISO 14755 support
1240 if (iso14755buf)
1241 if (iso14755buf & ISO_14755_52)
1242 {
1243# if ENABLE_OVERLAY
1244 scr_overlay_off ();
1245# endif
1246# if ISO_14755
1247 // iso14755 part 5.2 handling: release time
1248 // first: controls
1249 if ((ev.xkey.state & ControlMask)
1250 && ((ks >= 0x40 && ks <= 0x5f)
1251 || (ks >= 0x61 && ks <= 0x7f)))
1252 {
1253 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1254 commit_iso14755 ();
1255 return; // case-break;
1256 }
1257
1258 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1259 if (i[0] == ks)
1260 {
1261 iso14755buf = ISO_14755_51 | i[1];
1262 commit_iso14755 ();
1263 return; // case-break;
1264 }
1265
1266 scr_bell ();
1267# endif
1268 iso14755buf = 0;
1269 break;
1270 }
1271 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1272 {
1273# if ENABLE_OVERLAY
1274 scr_overlay_off ();
1275# endif
1276 if (iso14755buf & ISO_14755_51)
1277 commit_iso14755 ();
1278#if ISO_14755
1279 else if (iso14755buf & ISO_14755_STARTED)
1280 {
1281 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1282
1283 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1284 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1285 }
1286# endif
1287 else
1288 iso14755buf = 0;
1289 }
1290#endif
1291
1292#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1293 if (!(ev.xkey.state & ControlMask))
1294 slip_wheel_ev.stop ();
1295 else if (ks == XK_Control_L || ks == XK_Control_R)
1296 mouse_slip_wheel_speed = 0;
1297#endif
1298 break; 1398 break;
1299 }
1300 1399
1301 case ButtonPress: 1400 case ButtonPress:
1302 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1303 break; 1402 break;
1304 1403
… …
1306 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1307 break; 1406 break;
1308 1407
1309 case ClientMessage: 1408 case ClientMessage:
1310 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1311 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1410 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1312 destroy ();
1313#ifdef OFFIX_DND
1314 /* OffiX Dnd (drag 'n' drop) protocol */
1315 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1316 && (ev.xclient.data.l[0] == DndFile
1317 || ev.xclient.data.l[0] == DndDir
1318 || ev.xclient.data.l[0] == DndLink))
1319 { 1411 {
1320 /* Get Dnd data */ 1412 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1321 Atom ActualType; 1413 {
1322 int ActualFormat; 1414 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1323 unsigned char *data; 1415 {
1324 unsigned long Size, RemainingBytes; 1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1325 1417 {
1326 XGetWindowProperty (display->display, display->root, 1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1327 xa[XA_DNDSELECTION], 1419 destroy ();
1328 0L, 1000000L, 1420 }
1329 False, AnyPropertyType, 1421#if ENABLE_EWMH
1330 &ActualType, &ActualFormat, 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1331 &Size, &RemainingBytes, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1332 &data); 1425 &ev);
1333 XChangeProperty (display->display, display->root, 1426#endif
1334 XA_CUT_BUFFER0, XA_STRING, 1427 }
1335 8, PropModeReplace, 1428 }
1336 data, strlen (data)); 1429#if ENABLE_XEMBED
1337 XFree (data); 1430 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1338 selection_paste (display->root, XA_CUT_BUFFER0, True); 1431 {
1339 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1432 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1433 focus_in ();
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out ();
1436 }
1437#endif
1340 } 1438 }
1341#endif /* OFFIX_DND */
1342 break; 1439 break;
1343 1440
1344 case MappingNotify: 1441 case MappingNotify:
1345 XRefreshKeyboardMapping (&ev.xmapping); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1346 break; 1443 break;
… …
1369 break; 1466 break;
1370 } 1467 }
1371 break; 1468 break;
1372 1469
1373 case FocusIn: 1470 case FocusIn:
1374 if (!TermWin.focus) 1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1474 focus_in ();
1475 break;
1476
1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1481 focus_out ();
1482 break;
1483
1484 case ConfigureNotify:
1485 if (ev.xconfigure.window == parent[0])
1375 { 1486 {
1376 TermWin.focus = 1; 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1377 want_refresh = 1; 1488 ;
1378#ifdef USE_XIM 1489
1379 if (Input_Context != NULL) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1380 { 1491 {
1381 IMSetStatusPosition (); 1492 seen_resize = 1;
1382 XSetICFocus (Input_Context); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND
1495 if (!option(Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1498 scr_touch (true);
1499 }
1500#endif
1383 } 1501 }
1384#endif
1385#ifdef CURSOR_BLINK
1386 if (options & Opt_cursorBlink)
1387 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1388#endif
1389#ifdef OFF_FOCUS_FADING
1390 if (rs[Rs_fade])
1391 {
1392 pix_colors = pix_colors_focused;
1393 set_colorfgbg ();
1394 scr_clear ();
1395 scr_touch (true);
1396 }
1397#endif
1398 1502
1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505#ifdef TRANSPARENT
1506 if (option (Opt_transparent))
1507 check_our_parents ();
1508#endif
1399 } 1509 }
1400 break; 1510 break;
1401 1511
1402 case FocusOut:
1403 if (TermWin.focus)
1404 {
1405 TermWin.focus = 0;
1406 want_refresh = 1;
1407#ifdef USE_XIM
1408 if (Input_Context != NULL)
1409 XUnsetICFocus (Input_Context);
1410#endif
1411#ifdef CURSOR_BLINK
1412 if (options & Opt_cursorBlink)
1413 cursor_blink_ev.stop ();
1414 hidden_cursor = 0;
1415#endif
1416#ifdef OFF_FOCUS_FADING
1417 if (rs[Rs_fade])
1418 {
1419 pix_colors = pix_colors_unfocused;
1420 set_colorfgbg ();
1421 scr_clear ();
1422 scr_touch (true);
1423 }
1424#endif
1425
1426 }
1427 break;
1428
1429 case ConfigureNotify:
1430 if (ev.xconfigure.window == TermWin.parent[0])
1431 {
1432 int height, width;
1433
1434 do
1435 { /* Wrap lots of configures into one */
1436 width = ev.xconfigure.width;
1437 height = ev.xconfigure.height;
1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1439 }
1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1441
1442 if (szHint.width != width || szHint.height != height)
1443 resize_all_windows (width, height, 1);
1444
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446 if (options & Opt_transparent)
1447 {
1448 check_our_parents ();
1449 if (am_transparent)
1450 want_refresh = want_full_refresh = 1;
1451 }
1452#endif
1453 }
1454 break;
1455
1456 case PropertyNotify: 1512 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue) 1515 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom); 1516 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460 1517
1461 break; 1518 break;
1462 1519
1463 case SelectionClear: 1520 case SelectionClear:
1464 selection_clear (); 1521 selection_clear ();
1465 break; 1522 break;
1466 1523
1467 case SelectionNotify: 1524 case SelectionNotify:
1468 if (selection_wait == Sel_normal) 1525 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, 1526 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470 ev.xselection.property, True);
1471 break; 1527 break;
1472 1528
1473 case SelectionRequest: 1529 case SelectionRequest:
1474 selection_send (ev.xselectionrequest); 1530 selection_send (ev.xselectionrequest);
1475 break; 1531 break;
1476 1532
1533 case MapNotify:
1534 mapped = 1;
1535#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1537#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break;
1540
1477 case UnmapNotify: 1541 case UnmapNotify:
1478 TermWin.mapped = 0; 1542 mapped = 0;
1479#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1480 text_blink_ev.stop (); 1544 text_blink_ev.stop ();
1481#endif 1545#endif
1482 break; 1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1484 case MapNotify:
1485 TermWin.mapped = 1;
1486#ifdef TEXT_BLINK
1487 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1488#endif
1489 break; 1547 break;
1490 1548
1491#ifdef TRANSPARENT 1549#ifdef TRANSPARENT
1492 case ReparentNotify: 1550 case ReparentNotify:
1493 rootwin_cb (ev); 1551 rootwin_cb (ev);
1494 break; 1552 break;
1495#endif /* TRANSPARENT */ 1553#endif /* TRANSPARENT */
1496 1554
1497 case GraphicsExpose: 1555 case GraphicsExpose:
1498 case Expose: 1556 case Expose:
1499 if (ev.xany.window == TermWin.vt) 1557 if (ev.xany.window == vt)
1500 { 1558 {
1501 do 1559 do
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1504 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1505 1563
1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507 1565
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1511 1569
1512 scr_refresh (refresh_type); 1570 want_refresh = 1;
1513 } 1571 }
1514 else 1572 else
1515 { 1573 {
1516 XEvent unused_event; 1574 XEvent unused_event;
1517 1575
1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1519 ; 1577 ;
1520 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1521 ; 1579 ;
1522 1580
1523 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1524 { 1582 {
1525 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1526 scrollbar_show (0); 1584 scrollbar_show (0);
1527 } 1585 }
1528#ifdef MENUBAR
1529 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1530 menubar_expose ();
1531#endif
1532 1586
1533#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1534 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1535 XClearWindow (display->display, ev.xany.window); 1589 XClearWindow (dpy, ev.xany.window);
1536#endif 1590#endif
1537 } 1591 }
1538 break; 1592 break;
1539 1593
1540 case MotionNotify: 1594 case MotionNotify:
1541#ifdef POINTER_BLANK 1595#ifdef POINTER_BLANK
1542 if (hidden_pointer) 1596 if (hidden_pointer)
1543 pointer_unblank (); 1597 pointer_unblank ();
1544#endif 1598#endif
1545#if MENUBAR 1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1546 if (isMenuBarWindow (ev.xany.window)) 1600 break;
1601
1602 if (ev.xany.window == vt)
1547 { 1603 {
1548 menubar_control (ev.xbutton); 1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1549 break; 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1550 } 1606 ; // nop
1551#endif
1552 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate))
1553 break;
1554
1555 if (ev.xany.window == TermWin.vt)
1556 {
1557 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1558 { 1608 {
1559 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1560 ; 1610 ;
1561 1611
1562 XQueryPointer (display->display, TermWin.vt, 1612 XQueryPointer (dpy, vt,
1563 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1564 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1565 & (ev.xbutton.x), & (ev.xbutton.y), 1615 &ev.xbutton.x, &ev.xbutton.y,
1566 &unused_mask); 1616 &ev.xbutton.state);
1567#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
1568 /* deal with a `jumpy' mouse */ 1618 /* deal with a `jumpy' mouse */
1569 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1619 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1570 { 1620 {
1571#endif 1621#endif
… …
1576 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1626 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1577 break; 1627 break;
1578 } 1628 }
1579#endif 1629#endif
1580 selection_extend (ev.xbutton.x, ev.xbutton.y, 1630 selection_extend (ev.xbutton.x, ev.xbutton.y,
1581 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1631 ev.xbutton.state & Button3Mask ? 2 : 0);
1632
1582#ifdef SELECTION_SCROLLING 1633#ifdef SELECTION_SCROLLING
1583 if (ev.xbutton.y < TermWin.int_bwidth 1634 if (ev.xbutton.y < int_bwidth
1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1635 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1585 { 1636 {
1586 int dist; 1637 int dist;
1587 1638
1588 /* don't clobber the current delay if we are 1639 /* don't clobber the current delay if we are
1589 * already in the middle of scrolling. 1640 * already in the middle of scrolling.
… …
1597 selection_save_x = ev.xbutton.x; 1648 selection_save_x = ev.xbutton.x;
1598 selection_save_y = ev.xbutton.y; 1649 selection_save_y = ev.xbutton.y;
1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1650 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1600 1651
1601 /* calc number of lines to scroll */ 1652 /* calc number of lines to scroll */
1602 if (ev.xbutton.y<TermWin.int_bwidth) 1653 if (ev.xbutton.y < int_bwidth)
1603 { 1654 {
1604 scroll_selection_dir = UP; 1655 scroll_selection_dir = UP;
1605 dist = TermWin.int_bwidth - ev.xbutton.y; 1656 dist = int_bwidth - ev.xbutton.y;
1606 } 1657 }
1607 else 1658 else
1608 { 1659 {
1609 scroll_selection_dir = DN; 1660 scroll_selection_dir = DN;
1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1661 dist = ev.xbutton.y - (int_bwidth + height);
1611 } 1662 }
1612 1663
1613 scroll_selection_lines = Pixel2Height (dist) 1664 scroll_selection_lines = Pixel2Height (dist)
1614 / SELECTION_SCROLL_LINE_SPEEDUP 1665 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1; 1666 + 1;
1616 MIN_IT (scroll_selection_lines, 1667 min_it (scroll_selection_lines,
1617 SELECTION_SCROLL_MAX_LINES); 1668 SELECTION_SCROLL_MAX_LINES);
1618 } 1669 }
1619 else 1670 else
1620 { 1671 {
1621 /* we are within the text window, so we 1672 /* we are within the text window, so we
… …
1630#endif 1681#endif
1631 } 1682 }
1632 } 1683 }
1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1634 { 1685 {
1635 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1636 MotionNotify, &ev)) ; 1687 MotionNotify, &ev))
1688 ;
1689
1637 XQueryPointer (display->display, scrollBar.win, 1690 XQueryPointer (dpy, scrollBar.win,
1638 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1639 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1640 & (ev.xbutton.x), & (ev.xbutton.y), 1693 &ev.xbutton.x, &ev.xbutton.y,
1641 &unused_mask); 1694 &unused_mask);
1642 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1643 scrollbar_size ()); 1696 scrollbar_size ());
1644 scr_refresh (refresh_type); 1697 want_refresh = 1;
1645 refresh_limit = 0; 1698 refresh_limit = 0;
1646 scrollbar_show (1); 1699 scrollbar_show (1);
1647 } 1700 }
1648 break; 1701 break;
1649 } 1702 }
1650}
1651 1703
1652#if TRANSPARENT 1704#if defined(CURSOR_BLINK)
1705 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1706 {
1707 if (hidden_cursor)
1708 {
1709 hidden_cursor = 0;
1710 want_refresh = 1;
1711 }
1712
1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1714 }
1715#endif
1716
1717#if defined(POINTER_BLANK)
1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1719 {
1720 if (ev.type == MotionNotify
1721 || ev.type == ButtonPress
1722 || ev.type == ButtonRelease)
1723 if (hidden_pointer)
1724 pointer_unblank ();
1725
1726 if (ev.type == KeyPress && hidden_pointer == 0)
1727 pointer_blank ();
1728 }
1729#endif
1730}
1731
1732void
1733rxvt_term::focus_in ()
1734{
1735 if (!focus)
1736 {
1737 focus = 1;
1738 want_refresh = 1;
1739
1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1741
1742#if USE_XIM
1743 if (Input_Context != NULL)
1744 {
1745 IMSetPosition ();
1746 XSetICFocus (Input_Context);
1747 }
1748#endif
1749#if CURSOR_BLINK
1750 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1752#endif
1753#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade])
1755 {
1756 pix_colors = pix_colors_focused;
1757 scr_recolour ();
1758 }
1759#endif
1760#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell))
1762 {
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]);
1766 if (h != NULL)
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1771 }
1772#endif
1773 }
1774}
1775
1776void
1777rxvt_term::focus_out ()
1778{
1779 if (focus)
1780 {
1781 focus = 0;
1782 want_refresh = 1;
1783
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1785
1786#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf)
1788 {
1789 iso14755buf = 0;
1790# if ENABLE_OVERLAY
1791 scr_overlay_off ();
1792# endif
1793 }
1794#endif
1795#if USE_XIM
1796 if (Input_Context != NULL)
1797 XUnsetICFocus (Input_Context);
1798#endif
1799#if CURSOR_BLINK
1800 if (option (Opt_cursorBlink))
1801 cursor_blink_ev.stop ();
1802 hidden_cursor = 0;
1803#endif
1804#if OFF_FOCUS_FADING
1805 if (rs[Rs_fade])
1806 {
1807 pix_colors = pix_colors_unfocused;
1808 scr_recolour ();
1809 }
1810#endif
1811 }
1812}
1813
1814void
1815rxvt_term::update_fade_color (unsigned int idx)
1816{
1817#if OFF_FOCUS_FADING
1818 if (rs[Rs_fade])
1819 {
1820 rgba c;
1821 pix_colors [Color_fade].get (c);
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 }
1824#endif
1825}
1826
1827#if TRANSPARENT || ENABLE_PERL
1653void 1828void
1654rxvt_term::rootwin_cb (XEvent &ev) 1829rxvt_term::rootwin_cb (XEvent &ev)
1655{ 1830{
1656 SET_R (this); 1831 make_current ();
1657 SET_LOCALE (locale);
1658 1832
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return;
1836
1837# if TRANSPARENT
1659 switch (ev.type) 1838 switch (ev.type)
1660 { 1839 {
1661 case PropertyNotify: 1840 case PropertyNotify:
1662 /* 1841 /*
1663 * if user used some Esetroot compatible prog to set the root bg, 1842 * if user used some Esetroot compatible prog to set the root bg,
1664 * use the property to determine the pixmap. We use it later on. 1843 * use the property to determine the pixmap. We use it later on.
1665 */ 1844 */
1666 if (xa[XA_XROOTPMAPID] == 0)
1667 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1668
1669 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1845 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1670 return; 1847 return;
1671 1848
1672 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1673 case ReparentNotify: 1850 case ReparentNotify:
1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1675 want_refresh = want_full_refresh = 1; 1852 check_our_parents ();
1676 break; 1853 break;
1677 } 1854 }
1855# endif
1678} 1856}
1679#endif 1857#endif
1680 1858
1681void 1859void
1682rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
1683{ 1861{
1684 int reportmode = 0, clickintime; 1862 int reportmode = 0, clickintime;
1685 1863
1686 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1864 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1865
1687 if (!bypass_keystate) 1866 if (!bypass_keystate)
1688 reportmode = !! (priv_modes & PrivMode_mouse_report); 1867 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689 1868
1690 /* 1869 /*
1691 * VT window processing of button press 1870 * VT window processing of button press
1692 */ 1871 */
1693 if (ev.window == TermWin.vt) 1872 if (ev.window == vt)
1694 { 1873 {
1874 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1875 return;
1876
1695#if ISO_14755 1877#if ISO_14755
1696 // 5.4 1878 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1879 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 { 1880 {
1699 iso14755_54 (ev.x, ev.y); 1881 iso14755_54 (ev.x, ev.y);
1700 return; 1882 return;
1701 } 1883 }
1702#endif 1884#endif
1703 1885
1704 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1886 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1887
1705 if (reportmode) 1888 if (reportmode)
1706 { 1889 {
1707 /* mouse report from vt window */ 1890 /* mouse report from vt window */
1708 /* save the xbutton state (for ButtonRelease) */ 1891 /* save the xbutton state (for ButtonRelease) */
1709 MEvent.state = ev.state; 1892 MEvent.state = ev.state;
1710#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1711 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1712 { 1895 {
1713 /* same button, within alloted time */ 1896 /* same button, within alloted time */
1714 MEvent.clicks++; 1897 MEvent.clicks++;
1898
1715 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1716 { 1900 {
1717 /* only report double clicks */ 1901 /* only report double clicks */
1718 MEvent.clicks = 2; 1902 MEvent.clicks = 2;
1719 mouse_report (ev); 1903 mouse_report (ev);
… …
1738 } 1922 }
1739 else 1923 else
1740 { 1924 {
1741 if (ev.button != MEvent.button) 1925 if (ev.button != MEvent.button)
1742 MEvent.clicks = 0; 1926 MEvent.clicks = 0;
1927
1743 switch (ev.button) 1928 switch (ev.button)
1744 { 1929 {
1745 case Button1: 1930 case Button1:
1931 /* allow meta + click to select rectangular areas */
1932 /* should be done in screen.C */
1933#if ENABLE_FRILLS
1934 selection.rect = !!(ev.state & ModMetaMask);
1935#else
1936 selection.rect = false;
1937#endif
1938
1746 /* allow shift+left click to extend selection */ 1939 /* allow shift+left click to extend selection */
1747 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1940 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1748 { 1941 {
1749 if (MEvent.button == Button1 && clickintime) 1942 if (MEvent.button == Button1 && clickintime)
1750 selection_rotate (ev.x, ev.y); 1943 selection_rotate (ev.x, ev.y);
1751 else 1944 else
1752 selection_extend (ev.x, ev.y, 1); 1945 selection_extend (ev.x, ev.y, 1);
… …
1893 case Button3: 2086 case Button3:
1894 if (scrollBar.style != R_SB_XTERM) 2087 if (scrollBar.style != R_SB_XTERM)
1895 { 2088 {
1896 if (scrollbar_above_slider (ev.y)) 2089 if (scrollbar_above_slider (ev.y))
1897# ifdef RXVT_SCROLL_FULL 2090# ifdef RXVT_SCROLL_FULL
1898 scr_page (UP, TermWin.nrow - 1); 2091 scr_page (UP, nrow - 1);
1899# else 2092# else
1900 scr_page (UP, TermWin.nrow / 4); 2093 scr_page (UP, nrow / 4);
1901# endif 2094# endif
1902 else if (scrollbar_below_slider (ev.y)) 2095 else if (scrollbar_below_slider (ev.y))
1903# ifdef RXVT_SCROLL_FULL 2096# ifdef RXVT_SCROLL_FULL
1904 scr_page (DN, TermWin.nrow - 1); 2097 scr_page (DN, nrow - 1);
1905# else 2098# else
1906 scr_page (DN, TermWin.nrow / 4); 2099 scr_page (DN, nrow / 4);
1907# endif 2100# endif
1908 else 2101 else
1909 scrollBar.setMotion (); 2102 scrollBar.setMotion ();
1910 } 2103 }
1911 else 2104 else
1912 { 2105 {
1913 scr_page ((ev.button == Button1 ? DN : UP), 2106 scr_page ((ev.button == Button1 ? DN : UP),
1914 (TermWin.nrow 2107 (nrow
1915 * scrollbar_position (ev.y) 2108 * scrollbar_position (ev.y)
1916 / scrollbar_size ())); 2109 / scrollbar_size ()));
1917 } 2110 }
1918 2111
1919 break; 2112 break;
1920 } 2113 }
1921 } 2114 }
2115
1922 return; 2116 return;
1923 } 2117 }
1924#if MENUBAR
1925 /*
1926 * Menubar window processing of button press
1927 */
1928 if (isMenuBarWindow (ev.window))
1929 menubar_control (ev);
1930#endif
1931} 2118}
1932 2119
1933void 2120void
1934rxvt_term::button_release (XButtonEvent &ev) 2121rxvt_term::button_release (XButtonEvent &ev)
1935{ 2122{
… …
1941 2128
1942 if (scrollbar_isUpDn ()) 2129 if (scrollbar_isUpDn ())
1943 { 2130 {
1944 scrollBar.setIdle (); 2131 scrollBar.setIdle ();
1945 scrollbar_show (0); 2132 scrollbar_show (0);
1946#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1947 refresh_type &= ~SMOOTH_REFRESH;
1948#endif
1949 } 2133 }
1950 2134
1951#ifdef SELECTION_SCROLLING 2135#ifdef SELECTION_SCROLLING
1952 if (sel_scroll_ev.active) 2136 if (sel_scroll_ev.active)
1953 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
1954#endif 2138#endif
1955 2139
1956 if (ev.window == TermWin.vt) 2140 if (ev.window == vt)
1957 { 2141 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2143 return;
2144
1958#if ISO_14755 2145#if ISO_14755
1959 // 5.4 2146 // 5.4
1960 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2147 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1961 return; 2148 return;
1962#endif 2149#endif
2150
1963 if (reportmode) 2151 if (reportmode)
1964 { 2152 {
1965 /* mouse report from vt window */ 2153 /* mouse report from vt window */
1966 /* don't report release of wheel "buttons" */ 2154 /* don't report release of wheel "buttons" */
1967 if (ev.button >= 4) 2155 if (ev.button >= 4)
… …
1997 { 2185 {
1998 case Button1: 2186 case Button1:
1999 case Button3: 2187 case Button3:
2000 selection_make (ev.time); 2188 selection_make (ev.time);
2001 break; 2189 break;
2190
2002 case Button2: 2191 case Button2:
2003 selection_request (ev.time, ev.x, ev.y); 2192 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2004 break; 2194 break;
2195
2005#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2006 case Button4: 2197 case Button4:
2007 case Button5: 2198 case Button5:
2008 { 2199 {
2009 int i; 2200 int i;
… …
2011 2202
2012 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2013 2204
2014 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2015 i = 1; 2206 i = 1;
2016 else if (options & Opt_mouseWheelScrollPage) 2207 else if (option (Opt_mouseWheelScrollPage))
2017 i = TermWin.nrow - 1; 2208 i = nrow - 1;
2018 else 2209 else
2019 i = 5; 2210 i = 5;
2020 2211
2021# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
2022 if (ev.state & ControlMask) 2213 if (ev.state & ControlMask)
2023 { 2214 {
2024 mouse_slip_wheel_speed += v ? -1 : 1; 2215 mouse_slip_wheel_speed += v ? -1 : 1;
2025 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2026 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2027 2218
2028 if (slip_wheel_ev.at < NOW) 2219 if (slip_wheel_ev.at < NOW)
2029 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2220 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2030 2221
2031 slip_wheel_ev.start (); 2222 slip_wheel_ev.start ();
2032 } 2223 }
2033 else 2224 else
2034 { 2225 {
2035# endif 2226# endif
2036# ifdef JUMP_MOUSE_WHEEL
2037 scr_page (v, i); 2227 scr_page (v, i);
2038 scr_refresh (SMOOTH_REFRESH);
2039 scrollbar_show (1); 2228 scrollbar_show (1);
2040# else
2041 while (i--)
2042 {
2043 scr_page (v, 1);
2044 scr_refresh (SMOOTH_REFRESH);
2045 scrollbar_show (1);
2046 }
2047# endif
2048# ifdef MOUSE_SLIP_WHEELING 2229# ifdef MOUSE_SLIP_WHEELING
2049 } 2230 }
2050#endif 2231# endif
2051 } 2232 }
2052 break; 2233 break;
2053#endif 2234#endif
2054 } 2235 }
2055 } 2236 }
2056#ifdef MENUBAR
2057 else if (isMenuBarWindow (ev.window))
2058 menubar_control (ev);
2059#endif
2060} 2237}
2061 2238
2062#ifdef TRANSPARENT 2239#ifdef TRANSPARENT
2063#if TINTING 2240#if TINTING && !defined(HAVE_AFTERIMAGE)
2064/* taken from aterm-0.4.2 */ 2241/* taken from aterm-0.4.2 */
2065 2242
2066typedef uint32_t RUINT32T; 2243typedef uint32_t RUINT32T;
2067 2244
2068void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2245void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2069{ 2246{
2070 int sh_r, sh_g, sh_b; 2247 int sh_r, sh_g, sh_b;
2071 RUINT32T mask_r, mask_g, mask_b; 2248 RUINT32T mask_r, mask_g, mask_b;
2072 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2249 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2073 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2250 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2074 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2251 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2075 int i; 2252 int i;
2076 2253
2077 Visual* visual = display->visual; 2254 Visual *visual = term->visual;
2078 2255
2079 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2256 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2080 2257
2081 /* for convenience */ 2258 /* for convenience */
2082 mask_r = visual->red_mask; 2259 mask_r = visual->red_mask;
… …
2296 * Do transparency updates if required 2473 * Do transparency updates if required
2297 */ 2474 */
2298int 2475int
2299rxvt_term::check_our_parents () 2476rxvt_term::check_our_parents ()
2300{ 2477{
2478 check_our_parents_ev.stop ();
2479 check_our_parents_ev.start (NOW + .1);
2480 return 0;
2481}
2482
2483void
2484rxvt_term::check_our_parents_cb (time_watcher &w)
2485{
2301 int i, pchanged, aformat, have_pixmap, rootdepth; 2486 int i, pchanged, aformat, have_pixmap, rootdepth;
2302 unsigned long nitems, bytes_after; 2487 unsigned long nitems, bytes_after;
2303 Atom atype; 2488 Atom atype;
2304 unsigned char *prop = NULL; 2489 unsigned char *prop = NULL;
2305 Window root, oldp, *list; 2490 Window root, oldp, *list;
2306 Pixmap rootpixmap = None; 2491 Pixmap rootpixmap = None;
2307 XWindowAttributes wattr, wrootattr; 2492 XWindowAttributes wattr, wrootattr;
2493 int sx, sy;
2494 Window cr;
2308 2495
2309 pchanged = 0; 2496 pchanged = 0;
2310 2497
2311 if (!(options & Opt_transparent)) 2498 if (!option (Opt_transparent))
2312 return pchanged; /* Don't try any more */ 2499 return /*pchanged*/; /* Don't try any more */
2313 2500
2314 XGetWindowAttributes (display->display, display->root, &wrootattr); 2501 XGetWindowAttributes (dpy, display->root, &wrootattr);
2315 rootdepth = wrootattr.depth; 2502 rootdepth = wrootattr.depth;
2316 2503
2317 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2504 XGetWindowAttributes (dpy, parent[0], &wattr);
2318 2505
2319 if (rootdepth != wattr.depth) 2506 if (rootdepth != wattr.depth)
2320 { 2507 {
2321 if (am_transparent) 2508 if (am_transparent)
2322 { 2509 {
2323 pchanged = 1; 2510 pchanged = 1;
2324 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2511 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2325 am_transparent = am_pixmap_trans = 0; 2512 am_transparent = am_pixmap_trans = 0;
2326 } 2513 }
2327 2514
2328 return pchanged; /* Don't try any more */ 2515 return /*pchanged*/; /* Don't try any more */
2329 } 2516 }
2330 2517
2331 /* Get all X ops out of the queue so that our information is up-to-date. */ 2518 /* Get all X ops out of the queue so that our information is up-to-date. */
2332 XSync (display->display, False); 2519 XSync (dpy, False);
2333 2520
2521 XTranslateCoordinates (dpy, parent[0], display->root,
2522 0, 0, &sx, &sy, &cr);
2523
2524 /* check if we are outside of the visible part of the virtual screen : */
2525 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
2526 || sx >= wrootattr.width || sy >= wrootattr.height )
2527 return /* 0 */ ;
2334 /* 2528 /*
2335 * Make the frame window set by the window manager have 2529 * Make the frame window set by the window manager have
2336 * the root background. Some window managers put multiple nested frame 2530 * the root background. Some window managers put multiple nested frame
2337 * windows for each client, so we have to take care about that. 2531 * windows for each client, so we have to take care about that.
2338 */ 2532 */
2339 i = (xa[XA_XROOTPMAPID] 2533 i = (xa[XA_XROOTPMAP_ID]
2340 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2534 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2341 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2535 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2342 &nitems, &bytes_after, &prop) == Success); 2536 &nitems, &bytes_after, &prop) == Success);
2343 2537
2344 if (!i || prop == NULL) 2538 if (!i || prop == NULL)
2345 i = (xa[XA_XSETROOTID] 2539 i = (xa[XA_ESETROOT_PMAP_ID]
2346 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2540 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2347 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2541 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2348 &nitems, &bytes_after, &prop) == Success); 2542 &nitems, &bytes_after, &prop) == Success);
2349 2543
2350 if (!i || prop == NULL 2544 if (!i || prop == NULL
2351#if TINTING 2545#if TINTING
2352 || !rs[Rs_color + Color_tint] 2546 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
2547#ifdef HAVE_AFTERIMAGE
2548 && original_asim == NULL && rs[Rs_blurradius] == NULL
2549#endif
2550 )
2353#endif 2551#endif
2354 ) 2552 )
2355 have_pixmap = 0; 2553 have_pixmap = 0;
2356 else 2554 else
2357 { 2555 {
… …
2360 XFree (prop); 2558 XFree (prop);
2361 } 2559 }
2362 2560
2363 if (have_pixmap) 2561 if (have_pixmap)
2364 { 2562 {
2563 Bool success = False ;
2564 GC gc;
2565 XGCValues gcvalue;
2566#ifdef HAVE_AFTERIMAGE
2567 {
2568 Pixmap tmp_pmap = None ;
2569 ShadingInfo shade;
2570 ARGB32 tint ;
2571 unsigned int pmap_w = 0, pmap_h = 0;
2572
2573 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h ))
2574 {
2575 int root_x = 0, root_y = 0;
2576
2577 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2578 if (ISSET_PIXCOLOR (Color_tint))
2579 {
2580 rgba c;
2581 pix_colors_focused [Color_tint].get (c);
2582 shade.tintColor.red = c.r;
2583 shade.tintColor.green = c.g;
2584 shade.tintColor.blue = c.b;
2585 }
2586 else
2587 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
2588 tint = shading2tint32( &shade );
2589 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2590 if (GetWinPosition (parent[0], &root_x, &root_y) )
2591 {
2592 ASImageLayer *layers = create_image_layers( 2 );
2593 ASImage *merged_im = NULL;
2594 int back_x, back_y, back_w, back_h;
2595 /* merge_layers does good job at tiling background appropriately,
2596 so all we need is to cut out smallest possible piece : */
2597#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
2598 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
2599 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
2600 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
2601 back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
2602 else \
2603 { /* small background - need the whole of it for successfull tiling :*/ \
2604 back_##xy = 0; \
2605 back_##wh = pmap_##wh; \
2606 }}while(0)
2607
2608 MAKE_ROOTPMAP_GEOM(x,w,width);
2609 MAKE_ROOTPMAP_GEOM(y,h,height);
2610
2611 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
2612 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
2613 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
2614 layers[0].clip_width = szHint.width;
2615 layers[0].clip_height = szHint.height;
2616 layers[0].tint = tint;
2617 if (rs[Rs_blurradius] && layers[0].im)
2618 {
2619 double r = atof(rs[Rs_blurradius]);
2620 ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
2621 if( tmp )
2622 {
2623 destroy_asimage( &layers[0].im );
2624 layers[0].im = tmp;
2625 }
2626 }
2627 if (original_asim != NULL)
2628 {
2629 int fore_w, fore_h;
2630 layers[1].im = original_asim;
2631 if( bgPixmap.auto_resize )
2632 {
2633 fore_w = szHint.width;
2634 fore_h = szHint.height;
2635 }
2636 else
2637 {
2638 fore_w = bgPixmap.w;
2639 fore_h = bgPixmap.h;
2640 }
2641 if (fore_w != original_asim->width
2642 || fore_h != original_asim->height)
2643 {
2644 layers[1].im = scale_asimage( display->asv,
2645 original_asim,
2646 fore_w, fore_h,
2647 ASA_ASImage, 100,
2648 ASIMAGE_QUALITY_DEFAULT );
2649 }
2650
2651 layers[1].clip_width = szHint.width;
2652 layers[1].clip_height = szHint.height;
2653
2654 if (rs[Rs_blendtype])
2655 {
2656 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);
2657 if( layers[1].merge_scanlines == NULL )
2658 layers[1].merge_scanlines = alphablend_scanlines;
2659 }
2660 }
2661 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1,
2662 szHint.width, szHint.height,
2663 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
2664 if (layers[1].im != original_asim)
2665 destroy_asimage( &(layers[1].im) );
2666 destroy_asimage( &(layers[0].im) );
2667 if (merged_im != NULL)
2668 {
2669 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
2670 destroy_asimage( &merged_im );
2671 }
2672 free( layers );
2673 }
2674 }
2675 if (tmp_pmap != None)
2676 {
2677 success = True;
2678 if (pixmap != None)
2679 XFreePixmap (dpy, pixmap);
2680 pixmap = tmp_pmap;
2681 }
2682 }
2683#else /* HAVE_AFTERIMAGE */
2684 {
2365 /* 2685 /*
2366 * Copy display->root pixmap transparency 2686 * Copy display->root pixmap transparency
2367 */ 2687 */
2368 int sx, sy, nx, ny; 2688 int nx, ny;
2369 unsigned int nw, nh; 2689 unsigned int nw, nh;
2370 Window cr;
2371 XImage *image; 2690 XImage *image;
2372 GC gc;
2373 XGCValues gcvalue;
2374 2691
2375 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2376 0, 0, &sx, &sy, &cr);
2377 nw = (unsigned int)szHint.width; 2692 nw = (unsigned int)szHint.width;
2378 nh = (unsigned int)szHint.height; 2693 nh = (unsigned int)szHint.height;
2379 nx = ny = 0; 2694 nx = ny = 0;
2380 2695
2381 if (sx < 0) 2696 if (sx < 0)
2382 { 2697 {
2383 nw += sx; 2698 nw += sx;
2384 nx = -sx; 2699 nx = -sx;
2385 sx = 0; 2700 sx = 0;
2386 } 2701 }
2387 2702
2388 if (sy < 0) 2703 if (sy < 0)
2389 { 2704 {
2390 nh += sy; 2705 nh += sy;
2391 ny = -sy; 2706 ny = -sy;
2392 sy = 0; 2707 sy = 0;
2393 } 2708 }
2394 2709
2395 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2710 min_it (nw, (unsigned int) (wrootattr.width - sx));
2396 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2711 min_it (nh, (unsigned int) (wrootattr.height - sy));
2712
2713 XSync (dpy, False);
2397 allowedxerror = -1; 2714 allowedxerror = -1;
2398 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2715 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2399 2716
2400 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2717 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2401 /* XXX: may need a delay here? */ 2718 /* XXX: may need a delay here? */
2402 allowedxerror = 0; 2719 allowedxerror = 0;
2403
2404 if (image == NULL) 2720 if (image != NULL)
2721 {
2722 if (pixmap != None)
2723 XFreePixmap (dpy, pixmap);
2724
2725#if TINTING
2726 if (ISSET_PIXCOLOR (Color_tint))
2727 {
2728 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2729
2730 rgba c;
2731 pix_colors_focused [Color_tint].get (c);
2732 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2733 }
2734#endif
2735
2736 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2737 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2738 XPutImage (dpy, pixmap, gc, image, 0, 0,
2739 nx, ny, image->width, image->height);
2740 XDestroyImage (image);
2741 success = True ;
2742 }
2743 }
2744#endif /* HAVE_AFTERIMAGE */
2745 if (gc != NULL)
2746 XFreeGC (dpy, gc);
2747
2748 if (!success)
2405 { 2749 {
2406 if (am_transparent && am_pixmap_trans) 2750 if (am_transparent && am_pixmap_trans)
2407 { 2751 {
2408 pchanged = 1; 2752 pchanged = 1;
2409 if (TermWin.pixmap != None) 2753 if (pixmap != None)
2410 { 2754 {
2411 XFreePixmap (display->display, TermWin.pixmap); 2755 XFreePixmap (dpy, pixmap);
2412 TermWin.pixmap = None; 2756 pixmap = None;
2413 } 2757 }
2414 } 2758 }
2415 2759
2416 am_pixmap_trans = 0; 2760 am_pixmap_trans = 0;
2417 } 2761 }
2418 else 2762 else
2419 { 2763 {
2420 if (TermWin.pixmap != None)
2421 XFreePixmap (display->display, TermWin.pixmap);
2422
2423#if TINTING
2424 if (ISSET_PIXCOLOR (Color_tint))
2425 {
2426 unsigned short rm, gm, bm;
2427 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2428
2429 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2430
2431 ShadeXImage (display, image, shade, rm, gm, bm);
2432 }
2433#endif
2434
2435 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2436 szHint.width, szHint.height, image->depth);
2437 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2438 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2439 nx, ny, image->width, image->height);
2440 XFreeGC (display->display, gc);
2441 XDestroyImage (image);
2442 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2764 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2443 XClearWindow (display->display, TermWin.parent[0]); 2765 XClearWindow (dpy, parent[0]);
2444 2766
2445 if (!am_transparent || !am_pixmap_trans) 2767 if (!am_transparent || !am_pixmap_trans)
2446 pchanged = 1; 2768 pchanged = 1;
2447 2769
2448 am_transparent = am_pixmap_trans = 1; 2770 am_transparent = am_pixmap_trans = 1;
2449 } 2771 }
2450 } 2772 }
2451 2773
2452 if (!am_pixmap_trans) 2774 if (am_pixmap_trans)
2775 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2776 else
2453 { 2777 {
2454 unsigned int n; 2778 unsigned int n;
2455 /* 2779 /*
2456 * InheritPixmap transparency 2780 * InheritPixmap transparency
2457 */ 2781 */
2458 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2782 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2459 { 2783 {
2460 oldp = TermWin.parent[i]; 2784 oldp = parent[i];
2461 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2785 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2462 &TermWin.parent[i], &list, &n);
2463 XFree (list); 2786 XFree (list);
2464 2787
2465 if (TermWin.parent[i] == display->root) 2788 if (parent[i] == display->root)
2466 { 2789 {
2467 if (oldp != None) 2790 if (oldp != None)
2468 pchanged = 1; 2791 pchanged = 1;
2469 2792
2470 break; 2793 break;
2471 } 2794 }
2472 2795
2473 if (oldp != TermWin.parent[i]) 2796 if (oldp != parent[i])
2474 pchanged = 1; 2797 pchanged = 1;
2475 } 2798 }
2476 2799
2477 n = 0; 2800 n = 0;
2478 2801
2479 if (pchanged) 2802 if (pchanged)
2480 {
2481 for (; n < (unsigned int)i; n++) 2803 for (; n < (unsigned int)i; n++)
2482 { 2804 {
2483 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2805 XGetWindowAttributes (dpy, parent[n], &wattr);
2806
2484 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2807 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2485 { 2808 {
2486 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2809 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2487 break; 2810 break;
2488 } 2811 }
2489 } 2812 }
2813
2814 if (n > (sizeof (parent) / sizeof (parent[0])))
2490 } 2815 {
2491
2492 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2493 {
2494 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2816 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2495 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2817 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2496 am_transparent = 0; 2818 am_transparent = 0;
2497 /* XXX: also turn off Opt_transparent? */ 2819 /* XXX: also turn off Opt_transparent? */
2498 } 2820 }
2499 else 2821 else
2500 { 2822 {
2501#if WAIT_FOR_WM
2502 /* wait (an arbitrary period) for the WM to do its thing
2503 * needed for fvwm2.2.2 (and before?) */
2504 sleep (1);
2505#endif
2506 for (n = 0; n < (unsigned int)i; n++) 2823 for (n = 0; n < (unsigned int)i; n++)
2507 { 2824 {
2508 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2825 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2509 XClearWindow (display->display, TermWin.parent[n]); 2826 XClearWindow (dpy, parent[n]);
2510 } 2827 }
2511 2828
2512 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2829 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2513 am_transparent = 1; 2830 am_transparent = 1;
2514 } 2831 }
2515 2832
2516 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2833 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2517 TermWin.parent[i] = None; 2834 parent[i] = None;
2518 } 2835 }
2519 2836
2520 // this is experimental
2521 if (scrollBar.win) 2837 if (scrollBar.win)
2522 { 2838 {
2523 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2839 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2524 XClearWindow (display->display, scrollBar.win);
2525 scrollBar.setIdle (); 2840 scrollBar.setIdle ();
2526 scrollbar_show (0); 2841 scrollbar_show (0);
2527 } 2842 }
2528 2843
2844 if (am_transparent)
2845 {
2846 want_refresh = want_full_refresh = 1;
2847 if (am_pixmap_trans)
2848 flush ();
2849 }
2850
2529 return pchanged; 2851// return pchanged;
2530} 2852}
2531#endif 2853#endif
2532 2854
2533/*}}} */ 2855/*}}} */
2534 2856
2535bool 2857bool
2536rxvt_term::cmd_parse () 2858rxvt_term::cmd_parse ()
2537{ 2859{
2538 bool flag = false; 2860 bool flag = false;
2539 unicode_t ch = NOCHAR; 2861 wchar_t ch = NOCHAR;
2540 unsigned char *seq_begin; // remember start of esc-sequence here 2862 char *seq_begin; // remember start of esc-sequence here
2541 2863
2542 for (;;) 2864 for (;;)
2543 { 2865 {
2544 if (ch == NOCHAR) 2866 if (ch == NOCHAR)
2545 { 2867 {
2546 seq_begin = cmdbuf_ptr; 2868 seq_begin = cmdbuf_ptr;
2547 ch = next_char (); 2869 ch = next_char ();
2548 }
2549 2870
2550 if (ch == NOCHAR) // TODO: improve 2871 if (ch == NOCHAR)
2551 break; 2872 break;
2873 }
2552 2874
2553 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2875 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2554 { 2876 {
2555 if (!seen_input) 2877 if (!seen_input)
2556 { 2878 {
2557 seen_input = 1; 2879 seen_input = 1;
2558 // many badly-written programs (e.g. jed) contain a race condition: 2880 // many badly-written programs (e.g. jed) contain a race condition:
2559 // they first read the screensize and then install a SIGWINCH handler. 2881 // they first read the screensize and then install a SIGWINCH handler.
2560 // some window managers resize the window early, and these programs 2882 // some window managers resize the window early, and these programs
2561 // then sometimes get the size wrong. 2883 // then sometimes get the size wrong.
2884 // unfortunately other programs are even more buggy and dislike
2885 // being sent SIGWINCH, so only do it when we were in fact being
2886 // resized.
2887 if (seen_resize && cmd_pid)
2562 kill (-cmd_pid, SIGWINCH); 2888 kill (-cmd_pid, SIGWINCH);
2563 } 2889 }
2564 2890
2565 /* Read a text string from the input buffer */ 2891 /* Read a text string from the input buffer */
2566 unicode_t buf[UBUFSIZ]; 2892 wchar_t buf[UBUFSIZ];
2567 bool refreshnow = false; 2893 bool refreshnow = false;
2568 int nlines = 0; 2894 int nlines = 0;
2569 unicode_t *str = buf; 2895 wchar_t *str = buf;
2896 wchar_t *eol = str + min (ncol, UBUFSIZ);
2570 2897
2571 for (;;) 2898 for (;;)
2572 { 2899 {
2573 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2900 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2574 break; 2901 break;
2575 2902
2576 *str++ = ch; 2903 *str++ = ch;
2577 2904
2578 if (ch == C0_LF) 2905 if (ch == C0_LF || str >= eol)
2579 { 2906 {
2907 if (ch == C0_LF)
2580 nlines++; 2908 nlines++;
2909
2581 refresh_count++; 2910 refresh_count++;
2582 2911
2583 if (!(options & Opt_jumpScroll) 2912 if (!option (Opt_jumpScroll)
2584 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2913 || (refresh_count >= refresh_limit * (nrow - 1)))
2585 { 2914 {
2586 refreshnow = true; 2915 refreshnow = true;
2916 refresh_count = 0;
2587 ch = NOCHAR; 2917 ch = NOCHAR;
2588 break; 2918 break;
2589 } 2919 }
2590 2920
2591 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2921 // scr_add_lines only works for nlines <= nrow - 1.
2592 if (nlines >= TermWin.nrow - 1) 2922 if (nlines >= nrow - 1)
2593 { 2923 {
2924 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2925 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2594 scr_add_lines (buf, nlines, str - buf); 2926 scr_add_lines (buf, str - buf, nlines);
2927
2595 nlines = 0; 2928 nlines = 0;
2596 str = buf; 2929 str = buf;
2930 eol = str + min (ncol, UBUFSIZ);
2597 } 2931 }
2598 }
2599 2932
2600 if (str >= buf + UBUFSIZ) 2933 if (str >= eol)
2601 { 2934 {
2935 if (eol >= buf + UBUFSIZ)
2936 {
2602 ch = NOCHAR; 2937 ch = NOCHAR;
2603 break; 2938 break;
2939 }
2940 else
2941 eol = min (eol + ncol, buf + UBUFSIZ);
2942 }
2943
2604 } 2944 }
2605 2945
2606 seq_begin = cmdbuf_ptr; 2946 seq_begin = cmdbuf_ptr;
2607 ch = next_char (); 2947 ch = next_char ();
2608 } 2948 }
2609 2949
2950 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2951 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2610 scr_add_lines (buf, nlines, str - buf); 2952 scr_add_lines (buf, str - buf, nlines);
2611 2953
2612 /* 2954 /*
2613 * If there have been a lot of new lines, then update the screen 2955 * If there have been a lot of new lines, then update the screen
2614 * What the heck I'll cheat and only refresh less than every page-full. 2956 * What the heck I'll cheat and only refresh less than every page-full.
2615 * the number of pages between refreshes is refresh_limit, which 2957 * the number of pages between refreshes is refresh_limit, which
2616 * is incremented here because we must be doing flat-out scrolling. 2958 * is incremented here because we must be doing flat-out scrolling.
2617 */ 2959 */
2618 if (refreshnow) 2960 if (refreshnow)
2619 { 2961 {
2620 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2962 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2621 refresh_limit++; 2963 refresh_limit++;
2622 else 2964 else
2623 { 2965 {
2624 flag = true; 2966 flag = true;
2967 //TODO: due to popular request, implement "skipscroll" option here
2625 scr_refresh (refresh_type); 2968 scr_refresh ();
2969 want_refresh = 1;
2626 } 2970 }
2627 } 2971 }
2628 2972
2629 } 2973 }
2630 else 2974 else
… …
2645 } 2989 }
2646 2990
2647 return flag; 2991 return flag;
2648} 2992}
2649 2993
2650// read the next octet
2651unicode_t
2652rxvt_term::next_octet ()
2653{
2654 return cmdbuf_ptr < cmdbuf_endp
2655 ? *cmdbuf_ptr++
2656 : NOCHAR;
2657}
2658
2659// read the next character 2994// read the next character
2660unicode_t 2995wchar_t
2661rxvt_term::next_char () 2996rxvt_term::next_char () NOTHROW
2662{ 2997{
2663 while (cmdbuf_ptr < cmdbuf_endp) 2998 while (cmdbuf_ptr < cmdbuf_endp)
2664 { 2999 {
2665 // assume 7-bit to be ascii ALWAYS 3000 // assume 7-bit to be ascii ALWAYS
2666 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 3001 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2667 return *cmdbuf_ptr++; 3002 return *cmdbuf_ptr++;
2668 3003
2669 wchar_t wc; 3004 wchar_t wc;
2670 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 3005 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2671 3006
2672 if (len == (size_t)-2) 3007 if (len == (size_t)-2)
2673 { 3008 {
2674 // the mbstate stores incomplete sequences. didn't know this :/ 3009 // the mbstate stores incomplete sequences. didn't know this :/
2675 cmdbuf_ptr = cmdbuf_endp; 3010 cmdbuf_ptr = cmdbuf_endp;
2676 break; 3011 break;
2677 } 3012 }
2678 3013
2679 if (len == (size_t)-1) 3014 if (len == (size_t)-1)
2680 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 3015 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2681 3016
2682 // assume wchar == unicode 3017 // assume wchar == unicode
2683 cmdbuf_ptr += len; 3018 cmdbuf_ptr += len;
2684 return wc; 3019 return wc & UNICODE_MASK;
2685 } 3020 }
2686 3021
2687 return NOCHAR; 3022 return NOCHAR;
2688} 3023}
3024
3025// read the next octet
3026uint32_t
3027rxvt_term::next_octet () NOTHROW
3028{
3029 return cmdbuf_ptr < cmdbuf_endp
3030 ? (unsigned char)*cmdbuf_ptr++
3031 : NOCHAR;
3032}
3033
3034static class out_of_input out_of_input;
2689 3035
2690/* rxvt_cmd_getc () - Return next input character */ 3036/* rxvt_cmd_getc () - Return next input character */
2691/* 3037/*
2692 * Return the next input character after first passing any keyboard input 3038 * Return the next input character after first passing any keyboard input
2693 * to the command. 3039 * to the command.
2694 */ 3040 */
2695unicode_t 3041wchar_t
2696rxvt_term::cmd_getc () 3042rxvt_term::cmd_getc () THROW ((class out_of_input))
2697{ 3043{
2698 unicode_t c = next_char (); 3044 wchar_t c = next_char ();
2699 3045
2700 if (c == NOCHAR) 3046 if (c == NOCHAR)
2701 throw out_of_input; 3047 throw out_of_input;
2702 3048
2703 return c; 3049 return c;
2704} 3050}
2705 3051
2706unicode_t 3052uint32_t
2707rxvt_term::cmd_get8 () 3053rxvt_term::cmd_get8 () THROW ((class out_of_input))
2708{ 3054{
2709 unicode_t c = next_octet (); 3055 uint32_t c = next_octet ();
2710 3056
2711 if (c == NOCHAR) 3057 if (c == NOCHAR)
2712 throw out_of_input; 3058 throw out_of_input;
2713 3059
2714 return c; 3060 return c;
… …
2814 case C0_ESC: 3160 case C0_ESC:
2815 process_escape_seq (); 3161 process_escape_seq ();
2816 break; 3162 break;
2817 case C0_ENQ: /* terminal Status */ 3163 case C0_ENQ: /* terminal Status */
2818 if (rs[Rs_answerbackstring]) 3164 if (rs[Rs_answerbackstring])
2819 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3165 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2820 (unsigned int)strlen (rs[Rs_answerbackstring]));
2821 else 3166 else
2822 tt_write ((unsigned char *)VT100_ANS, 3167 tt_write (VT100_ANS, strlen (VT100_ANS));
2823 (unsigned int)strlen (VT100_ANS));
2824 break; 3168 break;
2825 case C0_BEL: /* bell */ 3169 case C0_BEL: /* bell */
2826 scr_bell (); 3170 scr_bell ();
2827 break; 3171 break;
2828 case C0_BS: /* backspace */ 3172 case C0_BS: /* backspace */
… …
2952 scr_charset_set (2, (unsigned int)cmd_getc ()); 3296 scr_charset_set (2, (unsigned int)cmd_getc ());
2953 break; 3297 break;
2954 case '+': 3298 case '+':
2955 scr_charset_set (3, (unsigned int)cmd_getc ()); 3299 scr_charset_set (3, (unsigned int)cmd_getc ());
2956 break; 3300 break;
2957#if ENABLE_FRILLS 3301#if !ENABLE_MINIMAL
2958 case '6': 3302 case '6':
2959 scr_backindex (); 3303 scr_backindex ();
2960 break; 3304 break;
2961#endif 3305#endif
2962 case '7': 3306 case '7':
2963 scr_cursor (SAVE); 3307 scr_cursor (SAVE);
2964 break; 3308 break;
2965 case '8': 3309 case '8':
2966 scr_cursor (RESTORE); 3310 scr_cursor (RESTORE);
2967 break; 3311 break;
2968#if ENABLE_FRILLS 3312#if !ENABLE_MINIMAL
2969 case '9': 3313 case '9':
2970 scr_forwardindex (); 3314 scr_forwardindex ();
2971 break; 3315 break;
2972#endif 3316#endif
2973 case '=': 3317 case '=':
… …
2983 break; 3327 break;
2984 3328
2985 /* 8.3.87: NEXT LINE */ 3329 /* 8.3.87: NEXT LINE */
2986 case C1_NEL: /* ESC E */ 3330 case C1_NEL: /* ESC E */
2987 { 3331 {
2988 unicode_t nlcr[] = { C0_LF, C0_CR }; 3332 wchar_t nlcr[] = { C0_LF, C0_CR };
2989 scr_add_lines (nlcr, 1, 2); 3333 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2990 } 3334 }
2991 break; 3335 break;
2992 3336
2993 /* kidnapped escape sequence: Should be 8.3.48 */ 3337 /* kidnapped escape sequence: Should be 8.3.48 */
2994 case C1_ESA: /* ESC G */ 3338 case C1_ESA: /* ESC G */
… …
3016 process_dcs_seq (); 3360 process_dcs_seq ();
3017 break; 3361 break;
3018 3362
3019 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3363 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3020 case C1_SCI: /* ESC Z */ 3364 case C1_SCI: /* ESC Z */
3021 tt_write ((const unsigned char *)ESCZ_ANSWER, 3365 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3022 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3023 break; /* steal obsolete ESC [ c */ 3366 break; /* steal obsolete ESC [ c */
3024 3367
3025 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3368 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3026 case C1_CSI: /* ESC [ */ 3369 case C1_CSI: /* ESC [ */
3027 process_csi_seq (); 3370 process_csi_seq ();
… …
3136 ndef = get_byte_array_bit (csi_defaults, i); 3479 ndef = get_byte_array_bit (csi_defaults, i);
3137 for (p = 0; p < nargs; p++) 3480 for (p = 0; p < nargs; p++)
3138 if (arg[p] == -1) 3481 if (arg[p] == -1)
3139 arg[p] = ndef; 3482 arg[p] = ndef;
3140 3483
3141#ifdef DEBUG_CMD
3142 fprintf (stderr, "CSI ");
3143 for (p = 0; p < nargs; p++)
3144 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3145 fprintf (stderr, "%c\n", ch);
3146#endif
3147
3148 /* 3484 /*
3149 * private mode handling 3485 * private mode handling
3150 */ 3486 */
3151 if (priv) 3487 if (priv)
3152 { 3488 {
3153 switch (priv) 3489 switch (priv)
3154 { 3490 {
3155 case '>': 3491 case '>':
3156 if (ch == CSI_DA) /* secondary device attributes */ 3492 if (ch == CSI_DA) /* secondary device attributes */
3493 {
3494 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3495 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3496 //
3497 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3498 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3499 // that we do not support xterm mouse reporting (should be 95 when we do).
3500 //
3157 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3501 tt_printf ("\033[>%d;94;0c", 'U');
3502 }
3158 break; 3503 break;
3159 case '?': 3504 case '?':
3160 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3505 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3161 process_terminal_mode (ch, priv, nargs, arg); 3506 process_terminal_mode (ch, priv, nargs, arg);
3162 break; 3507 break;
… …
3267 3612
3268 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3613 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3269 arg[0] = -arg[0]; 3614 arg[0] = -arg[0];
3270 /* FALLTHROUGH */ 3615 /* FALLTHROUGH */
3271 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3616 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3272 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3617 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3273 break; 3618 break;
3274 3619
3275 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3620 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3276 tt_write ((const unsigned char *)VT100_ANS, 3621 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3277 (unsigned int) (sizeof (VT100_ANS) - 1));
3278 break; 3622 break;
3279 3623
3280 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3624 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3281 process_sgr_mode (nargs, arg); 3625 process_sgr_mode (nargs, arg);
3282 break; 3626 break;
… …
3289 break; 3633 break;
3290 case 6: /* CPR requested */ 3634 case 6: /* CPR requested */
3291 scr_report_position (); 3635 scr_report_position ();
3292 break; 3636 break;
3293 case 7: /* unofficial extension */ 3637 case 7: /* unofficial extension */
3294 if (options & Opt_insecure) 3638 if (option (Opt_insecure))
3295 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3639 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3296 break; 3640 break;
3297 case 8: /* unofficial extension */ 3641 case 8: /* unofficial extension */
3298 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3642 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3299 break; 3643 break;
… …
3366 break; 3710 break;
3367 case CSI_75: 3711 case CSI_75:
3368 scr_cursor (RESTORE); 3712 scr_cursor (RESTORE);
3369 break; 3713 break;
3370 3714
3371#if ENABLE_FRILLS 3715#if !ENABLE_MINIMAL
3372 case CSI_74: 3716 case CSI_74:
3373 process_window_ops (arg, nargs); 3717 process_window_ops (arg, nargs);
3374 break; 3718 break;
3375#endif 3719#endif
3376 3720
… …
3383 break; 3727 break;
3384 } 3728 }
3385} 3729}
3386/*}}} */ 3730/*}}} */
3387 3731
3388#if ENABLE_FRILLS 3732#if !ENABLE_MINIMAL
3389/* ARGSUSED */ 3733/* ARGSUSED */
3390void 3734void
3391rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3735rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3392{ 3736{
3393 int x, y; 3737 int x, y;
3394 XWindowAttributes wattr; 3738 XWindowAttributes wattr;
3395 Window wdummy; 3739 Window wdummy;
3740
3741 dLocal (Display *, dpy);
3396 3742
3397 if (nargs == 0) 3743 if (nargs == 0)
3398 return; 3744 return;
3399 3745
3400 switch (args[0]) 3746 switch (args[0])
3401 { 3747 {
3402 /* 3748 /*
3403 * commands 3749 * commands
3404 */ 3750 */
3405 case 1: /* deiconify window */ 3751 case 1: /* deiconify window */
3406 XMapWindow (display->display, TermWin.parent[0]); 3752 XMapWindow (dpy, parent[0]);
3407 break; 3753 break;
3408 case 2: /* iconify window */ 3754 case 2: /* iconify window */
3409 XIconifyWindow (display->display, TermWin.parent[0], 3755 XIconifyWindow (dpy, parent[0], display->screen);
3410 DefaultScreen (display->display));
3411 break; 3756 break;
3412 case 3: /* set position (pixels) */ 3757 case 3: /* set position (pixels) */
3413 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3758 XMoveWindow (dpy, parent[0], args[1], args[2]);
3414 break; 3759 break;
3415 case 4: /* set size (pixels) */ 3760 case 4: /* set size (pixels) */
3416 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3761 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3417 break; 3762 break;
3418 case 5: /* raise window */ 3763 case 5: /* raise window */
3419 XRaiseWindow (display->display, TermWin.parent[0]); 3764 XRaiseWindow (dpy, parent[0]);
3420 break; 3765 break;
3421 case 6: /* lower window */ 3766 case 6: /* lower window */
3422 XLowerWindow (display->display, TermWin.parent[0]); 3767 XLowerWindow (dpy, parent[0]);
3423 break; 3768 break;
3424 case 7: /* refresh window */ 3769 case 7: /* refresh window */
3425 scr_touch (true); 3770 scr_touch (true);
3426 break; 3771 break;
3427 case 8: /* set size (chars) */ 3772 case 8: /* set size (chars) */
3428 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3773 set_widthheight ((unsigned int) (args[2] * fwidth),
3429 (unsigned int) (args[1] * TermWin.fheight)); 3774 (unsigned int) (args[1] * fheight));
3430 break; 3775 break;
3431 3776
3432 //case 9: NYI, TODO, restore maximized window or maximize window 3777 //case 9: NYI, TODO, restore maximized window or maximize window
3433 default: 3778 default:
3434 if (args[0] >= 24) /* set height (chars) */ 3779 if (args[0] >= 24) /* set height (chars) */
3435 set_widthheight ((unsigned int)TermWin.width, 3780 set_widthheight ((unsigned int)width,
3436 (unsigned int) (args[1] * TermWin.fheight)); 3781 (unsigned int) (args[1] * fheight));
3437 break; 3782 break;
3438
3439 3783
3440 /* 3784 /*
3441 * reports - some output format copied from XTerm 3785 * reports - some output format copied from XTerm
3442 */ 3786 */
3443 case 11: /* report window state */ 3787 case 11: /* report window state */
3444 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3788 XGetWindowAttributes (dpy, parent[0], &wattr);
3445 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3789 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3446 break; 3790 break;
3447 case 13: /* report window position */ 3791 case 13: /* report window position */
3448 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3792 XGetWindowAttributes (dpy, parent[0], &wattr);
3449 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3793 XTranslateCoordinates (dpy, parent[0], wattr.root,
3450 -wattr.border_width, -wattr.border_width, 3794 -wattr.border_width, -wattr.border_width,
3451 &x, &y, &wdummy); 3795 &x, &y, &wdummy);
3452 tt_printf ("\033[3;%d;%dt", x, y); 3796 tt_printf ("\033[3;%d;%dt", x, y);
3453 break; 3797 break;
3454 case 14: /* report window size (pixels) */ 3798 case 14: /* report window size (pixels) */
3455 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3799 XGetWindowAttributes (dpy, parent[0], &wattr);
3456 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3800 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3457 break; 3801 break;
3458 case 18: /* report text area size (chars) */ 3802 case 18: /* report text area size (chars) */
3459 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3803 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3460 break; 3804 break;
3461 case 19: /* report window size (chars) */ 3805 case 19: /* report window size (chars) */
3462 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3806 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3463 break; 3807 break;
3464 case 20: /* report icon label */ 3808 case 20: /* report icon label */
3465 { 3809 {
3466 char *s; 3810 char *s;
3467 XGetIconName (display->display, TermWin.parent[0], &s); 3811 XGetIconName (dpy, parent[0], &s);
3468 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3812 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3469 XFree (s); 3813 XFree (s);
3470 } 3814 }
3471 break; 3815 break;
3472 case 21: /* report window title */ 3816 case 21: /* report window title */
3473 { 3817 {
3474 char *s; 3818 char *s;
3475 XFetchName (display->display, TermWin.parent[0], &s); 3819 XFetchName (dpy, parent[0], &s);
3476 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3820 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3477 XFree (s); 3821 XFree (s);
3478 } 3822 }
3479 break; 3823 break;
3480 } 3824 }
3481} 3825}
… …
3484/*----------------------------------------------------------------------*/ 3828/*----------------------------------------------------------------------*/
3485/* 3829/*
3486 * get input up until STRING TERMINATOR (or BEL) 3830 * get input up until STRING TERMINATOR (or BEL)
3487 * ends_how is terminator used. returned input must be free()'d 3831 * ends_how is terminator used. returned input must be free()'d
3488 */ 3832 */
3489unsigned char * 3833char *
3490rxvt_term::get_to_st (unicode_t &ends_how) 3834rxvt_term::get_to_st (unicode_t &ends_how)
3491{ 3835{
3492 unicode_t prev = 0, ch; 3836 unicode_t ch;
3837 bool seen_esc = false;
3493 unsigned int n = 0; 3838 unsigned int n = 0;
3494 unsigned char *s;
3495 unsigned char string[STRING_MAX]; 3839 wchar_t string[STRING_MAX];
3496 3840
3497 while ((ch = cmd_getc ()) != NOCHAR) 3841 while ((ch = cmd_getc ()) != NOCHAR)
3498 { 3842 {
3499 if (prev == C0_ESC) 3843 if (seen_esc)
3500 { 3844 {
3501 if (ch == 0x5c) /* 7bit ST */ 3845 if (ch == 0x5c) /* 7bit ST */
3502 break; 3846 break;
3503 else 3847 else
3504 return NULL; 3848 return NULL;
3505 } 3849 }
3850 else if (ch == C0_ESC)
3851 {
3852 seen_esc = true;
3853 continue;
3854 }
3506 else if (ch == C0_BEL || ch == CHAR_ST) 3855 else if (ch == C0_BEL || ch == CHAR_ST)
3507 break; 3856 break;
3857 else if (ch == C0_SYN)
3858 ch = cmd_get8 ();
3508 else if (ch < 0x20) 3859 else if (ch < 0x20)
3509 return NULL; /* other control character - exit */ 3860 return NULL; /* other control character - exit */
3510 3861
3511 if (n >= sizeof (string) - 1) 3862 seen_esc = false;
3863
3864 if (n >= STRING_MAX - 1)
3512 // stop at some sane length 3865 // stop at some sane length
3513 return NULL; 3866 return NULL;
3514 3867
3515 if (ch == C0_SYN)
3516 {
3517 string[n++] = cmd_get8 ();
3518 prev = 0;
3519 }
3520 else
3521 string[n++] = prev = ch; 3868 string[n++] = ch;
3522 } 3869 }
3523 3870
3524 string[n++] = '\0'; 3871 string[n++] = '\0';
3525 3872
3526 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3527 return NULL;
3528
3529 ends_how = (ch == 0x5c ? C0_ESC : ch); 3873 ends_how = (ch == 0x5c ? C0_ESC : ch);
3530 strncpy (s, string, n); 3874
3531 return s; 3875 return rxvt_wcstombs (string);
3532} 3876}
3533 3877
3534/*----------------------------------------------------------------------*/ 3878/*----------------------------------------------------------------------*/
3535/* 3879/*
3536 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3880 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3537 */ 3881 */
3538void 3882void
3539rxvt_term::process_dcs_seq () 3883rxvt_term::process_dcs_seq ()
3540{ 3884{
3541 unsigned char *s; 3885 char *s;
3542 unicode_t eh; 3886 unicode_t eh;
3543 3887
3544 /* 3888 /*
3545 * Not handled yet 3889 * Not handled yet
3546 */ 3890 */
… …
3565 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3909 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3566 arg = arg * 10 + (ch - '0'); 3910 arg = arg * 10 + (ch - '0');
3567 3911
3568 if (ch == ';') 3912 if (ch == ';')
3569 { 3913 {
3570 unsigned char *s = get_to_st (eh); 3914 char *s = get_to_st (eh);
3571 3915
3572 if (s) 3916 if (s)
3573 { 3917 {
3574 process_xterm_seq (arg, (char *)s, eh); 3918 process_xterm_seq (arg, s, eh);
3575 free (s); 3919 free (s);
3576 } 3920 }
3577 } 3921 }
3578} 3922}
3579 3923
3580void 3924void
3581rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3925rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3582{ 3926{
3583 if (str[0] == '?' && !str[1]) 3927 if (str[0] == '?' && !str[1])
3584 { 3928 {
3585 unsigned short r, g, b; 3929 rgba c;
3586 pix_colors_focused[color].get (display, r, g, b); 3930 pix_colors_focused[color].get (c);
3931
3932#if XFT
3933 if (c.a != rgba::MAX_CC)
3934 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3935 else
3936#endif
3587 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3937 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3588 } 3938 }
3589 else 3939 else
3590 set_window_color (color, str); 3940 set_window_color (color, str);
3591} 3941}
3592 3942
3593/* 3943/*
3594 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3944 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3595 * 0 = change iconName/title
3596 * 1 = change iconName
3597 * 2 = change title
3598 * 4 = change color
3599 * 10 = change fg color
3600 * 11 = change bg color
3601 * 12 = change text color
3602 * 13 = change mouse foreground color
3603 * 17 = change highlight character colour
3604 * 18 = change bold character color
3605 * 19 = change underlined character color
3606 * 46 = change logfile (not implemented)
3607 * 50 = change font
3608 *
3609 * rxvt extensions:
3610 * 20 = bg pixmap
3611 * 39 = change default fg color
3612 * 49 = change default bg color
3613 * 55 = dump scrollback buffer and all of screen
3614 * 701 = change locale
3615 * 702 = find font
3616 * 703 = menu
3617 */ 3945 */
3618void 3946void
3619rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3947rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3620{ 3948{
3621 int changed = 0;
3622 int color; 3949 int color;
3623 char *buf, *name; 3950 char *buf, *name;
3624 bool query = str[0] == '?' && !str[1]; 3951 bool query = str[0] == '?' && !str[1];
3952 int saveop = op;
3953
3954 dLocal (Display *, dpy);
3625 3955
3626 assert (str != NULL); 3956 assert (str != NULL);
3957
3958 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3959 return;
3960
3627 switch (op) 3961 switch (op)
3628 { 3962 {
3629 case XTerm_name: 3963 case XTerm_name:
3630 set_title (str); 3964 set_title (str);
3631 /* FALLTHROUGH */ 3965 /* FALLTHROUGH */
… …
3636 set_title (str); 3970 set_title (str);
3637 break; 3971 break;
3638 case XTerm_property: 3972 case XTerm_property:
3639 if (str[0] == '?') 3973 if (str[0] == '?')
3640 { 3974 {
3641 Atom prop = XInternAtom (display->display, str + 1, True); 3975 Atom prop = display->atom (str + 1);
3642 Atom actual_type; 3976 Atom actual_type;
3643 int actual_format; 3977 int actual_format;
3644 unsigned long nitems; 3978 unsigned long nitems;
3645 unsigned long bytes_after; 3979 unsigned long bytes_after;
3646 unsigned char *value = 0; 3980 unsigned char *value = 0;
3647 const char *str = ""; 3981 const char *str = "";
3648 3982
3649 if (prop 3983 if (prop
3650 && XGetWindowProperty (display->display, TermWin.parent[0], 3984 && XGetWindowProperty (dpy, parent[0],
3651 prop, 0, 1<<16, 0, AnyPropertyType, 3985 prop, 0, 1<<16, 0, AnyPropertyType,
3652 &actual_type, &actual_format, 3986 &actual_type, &actual_format,
3653 &nitems, &bytes_after, &value) == Success 3987 &nitems, &bytes_after, &value) == Success
3654 && actual_type != None 3988 && actual_type != None
3655 && actual_format == 8) 3989 && actual_format == 8)
3656 str = (const char *)(value); 3990 str = (const char *)(value);
3657 3991
3658 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3992 tt_printf ("\033]%d;%s%c", op, str, resp);
3659 3993
3660 XFree (value); 3994 XFree (value);
3661 } 3995 }
3662 else 3996 else
3663 { 3997 {
3664 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3998 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3665 3999
3666 if (eq) 4000 if (eq)
3667 { 4001 {
3668 *eq = 0; 4002 *eq = 0;
3669 XChangeProperty (display->display, TermWin.parent[0], 4003 set_utf8_property (display->atom (str), eq + 1);
3670 display->atom (str), XA_STRING, 8,
3671 PropModeReplace, (unsigned char *)eq + 1,
3672 strlen (eq + 1));
3673 } 4004 }
3674 else 4005 else
3675 XDeleteProperty (display->display, TermWin.parent[0], 4006 XDeleteProperty (dpy, parent[0],
3676 display->atom (str)); 4007 display->atom (str));
3677 } 4008 }
3678 break; 4009 break;
3679 4010
3680 case XTerm_Color: 4011 case XTerm_Color:
… …
3682 { 4013 {
3683 if ((name = strchr (buf, ';')) == NULL) 4014 if ((name = strchr (buf, ';')) == NULL)
3684 break; 4015 break;
3685 4016
3686 *name++ = '\0'; 4017 *name++ = '\0';
3687 color = atoi (buf); 4018 color = atoi (buf) + minCOLOR;
3688 4019
3689 if (color < 0 || color >= TOTAL_COLORS) 4020 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3690 break; 4021 break;
3691 4022
3692 if ((buf = strchr (name, ';')) != NULL) 4023 if ((buf = strchr (name, ';')) != NULL)
3693 *buf++ = '\0'; 4024 *buf++ = '\0';
3694 4025
3695 if (name[0] == '?' && !name[1]) 4026 process_color_seq (op, color, name, resp);
3696 {
3697 unsigned short r, g, b;
3698 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3699 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3700 }
3701 else
3702 set_window_color (color + minCOLOR, name);
3703 } 4027 }
3704 break; 4028 break;
3705 case XTerm_Color00: 4029 case XTerm_Color00:
3706 process_color_seq (XTerm_Color00, Color_fg, str, resp); 4030 process_color_seq (op, Color_fg, str, resp);
3707 break; 4031 break;
3708 case XTerm_Color01: 4032 case XTerm_Color01:
3709 process_color_seq (XTerm_Color00, Color_bg, str, resp); 4033 process_color_seq (op, Color_bg, str, resp);
3710 break; 4034 break;
3711#ifndef NO_CURSORCOLOR 4035#ifndef NO_CURSORCOLOR
3712 case XTerm_Color_cursor: 4036 case XTerm_Color_cursor:
3713 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 4037 process_color_seq (op, Color_cursor, str, resp);
3714 break; 4038 break;
3715#endif 4039#endif
3716 case XTerm_Color_pointer_fg: 4040 case XTerm_Color_pointer_fg:
3717 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 4041 process_color_seq (op, Color_pointer_fg, str, resp);
3718 break; 4042 break;
3719 case XTerm_Color_pointer_bg: 4043 case XTerm_Color_pointer_bg:
3720 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 4044 process_color_seq (op, Color_pointer_bg, str, resp);
3721 break; 4045 break;
3722#ifndef NO_BOLD_UNDERLINE_REVERSE 4046#ifndef NO_BOLD_UNDERLINE_REVERSE
3723 case XTerm_Color_BD:
3724 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3725 break;
3726 case XTerm_Color_UL:
3727 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3728 break;
3729 case XTerm_Color_RV: 4047 case XTerm_Color_RV:
3730 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 4048 process_color_seq (op, Color_RV, str, resp);
3731 break; 4049 break;
4050 case Rxvt_Color_BD:
4051 case URxvt_Color_BD:
4052 process_color_seq (op, Color_BD, str, resp);
4053 break;
4054 case Rxvt_Color_UL:
4055 case URxvt_Color_UL:
4056 process_color_seq (op, Color_UL, str, resp);
4057 break;
4058 case URxvt_Color_IT:
4059 process_color_seq (op, Color_IT, str, resp);
4060 break;
3732#endif 4061#endif
4062#if TRANSPARENT && TINTING
4063 case URxvt_Color_tint:
4064 process_color_seq (op, Color_tint, str, resp);
3733 4065
4066 check_our_parents ();
4067
4068 if (am_transparent)
4069 want_full_refresh = want_refresh = 1;
4070
4071 break;
4072#endif
4073
3734 case XTerm_Pixmap: 4074 case Rxvt_Pixmap:
4075 {
3735 if (*str != ';') 4076 if (*str != ';')
3736 { 4077 {
3737#if XPM_BACKGROUND 4078#if XPM_BACKGROUND
3738 scale_pixmap (""); /* reset to default scaling */ 4079 scale_pixmap (""); /* reset to default scaling */
3739 set_bgPixmap (str); /* change pixmap */ 4080 set_bgPixmap (str); /* change pixmap */
3740#endif
3741 scr_touch (true); 4081 scr_touch (true);
4082#endif
3742 } 4083 }
4084
4085 int changed = 0;
4086
3743 while ((str = strchr (str, ';')) != NULL) 4087 while ((str = strchr (str, ';')) != NULL)
3744 { 4088 {
3745 str++; 4089 str++;
3746#if XPM_BACKGROUND 4090#if XPM_BACKGROUND
3747 changed += scale_pixmap (str); 4091 changed += scale_pixmap (str);
3748#endif 4092#endif
3749
3750 } 4093 }
4094
3751 if (changed) 4095 if (changed)
3752 { 4096 {
3753#ifdef XPM_BACKGROUND 4097#ifdef XPM_BACKGROUND
3754 resize_pixmap (); 4098 resize_pixmap ();
3755#endif
3756 scr_touch (true); 4099 scr_touch (true);
4100#endif
3757 } 4101 }
4102#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
4103 if (option(Opt_transparent))
4104 check_our_parents ();
4105#endif
4106
4107 }
3758 break; 4108 break;
3759 4109
3760 case XTerm_restoreFG: 4110 case Rxvt_restoreFG:
3761 set_window_color (Color_fg, str); 4111 set_window_color (Color_fg, str);
3762 break; 4112 break;
3763 case XTerm_restoreBG: 4113 case Rxvt_restoreBG:
3764 set_window_color (Color_bg, str); 4114 set_window_color (Color_bg, str);
3765 break; 4115 break;
3766 4116
3767 case XTerm_logfile: 4117 case XTerm_logfile:
3768 // TODO, when secure mode? 4118 // TODO, when secure mode?
3769 break; 4119 break;
3770 4120
3771 case XTerm_font:
3772 if (query)
3773 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3774 (options & Opt_insecure) && TermWin.fontset->fontdesc
3775 ? TermWin.fontset->fontdesc : "",
3776 resp);
3777 else
3778 change_font (str);
3779 break;
3780
3781#if ENABLE_FRILLS
3782 case XTerm_locale:
3783 if (query)
3784 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3785 else
3786 {
3787 set_locale (str);
3788# ifdef USE_XIM
3789 im_cb ();
3790# endif
3791 }
3792 break;
3793
3794 case XTerm_findfont:
3795 {
3796 int fid = TermWin.fontset->find_font (atoi (str));
3797 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3798 fid,
3799 (options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3800 resp);
3801 }
3802 break;
3803#endif
3804
3805#ifdef MENUBAR
3806 case XTerm_Menu:
3807 if (options & Opt_insecure)
3808 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3809 break;
3810#endif
3811#if 0 4121#if 0
3812 case XTerm_dumpscreen: /* no error notices */ 4122 case Rxvt_dumpscreen: /* no error notices */
3813 { 4123 {
3814 int fd; 4124 int fd;
3815 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4125 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3816 { 4126 {
3817 scr_dump (fd); 4127 scr_dump (fd);
3818 close (fd); 4128 close (fd);
3819 } 4129 }
3820 } 4130 }
4131 break;
4132#endif
4133 case XTerm_font:
4134 op = URxvt_font;
4135 case URxvt_font:
4136#if ENABLE_STYLES
4137 case URxvt_boldFont:
4138 case URxvt_italicFont:
4139 case URxvt_boldItalicFont:
4140#endif
4141 if (query)
4142 tt_printf ("\33]%d;%-.250s%c", saveop,
4143 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
4144 ? fontset[op - URxvt_font]->fontdesc : "",
4145 resp);
4146 else
4147 {
4148 const char *&res = rs[Rs_font + (op - URxvt_font)];
4149
4150 res = strdup (str);
4151 allocated.push_back ((void *)res);
4152 set_fonts ();
4153 }
4154 break;
4155
4156 case URxvt_version:
4157 if (query)
4158 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
4159 op,
4160 rs[Rs_name], VERSION[0], VERSION[2],
4161 resp);
4162 break;
4163
4164#if !ENABLE_MINIMAL
4165 case URxvt_locale:
4166 if (query)
4167 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4168 else
4169 {
4170 set_locale (str);
4171 pty->set_utf8_mode (enc_utf8);
4172 init_xlocale ();
4173 }
4174 break;
4175
4176 case URxvt_view_up:
4177 case URxvt_view_down:
4178 {
4179 int lines = atoi (str);
4180
4181 if (lines)
4182 scr_page (op == URxvt_view_up ? UP : DN, lines);
4183 else
4184 scr_erase_savelines ();
4185 }
4186
4187 break;
4188#endif
4189
4190#if ENABLE_PERL
4191 case URxvt_perl:
4192 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4193 ; // no responses yet
3821 break; 4194 break;
3822#endif 4195#endif
3823 } 4196 }
3824} 4197}
3825/*----------------------------------------------------------------------*/ 4198/*----------------------------------------------------------------------*/
… …
3856 return state; 4229 return state;
3857} 4230}
3858 4231
3859/* we're not using priv _yet_ */ 4232/* we're not using priv _yet_ */
3860void 4233void
3861rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4234rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3862{ 4235{
3863 unsigned int i, j; 4236 unsigned int i, j;
3864 int state; 4237 int state;
3865 4238
3866 static const struct 4239 static const struct
… …
3877 { 5, PrivMode_rVideo }, 4250 { 5, PrivMode_rVideo },
3878 { 6, PrivMode_relOrigin }, 4251 { 6, PrivMode_relOrigin },
3879 { 7, PrivMode_Autowrap }, 4252 { 7, PrivMode_Autowrap },
3880 // 8, bi-directional support mode 4253 // 8, bi-directional support mode
3881 { 9, PrivMode_MouseX10 }, 4254 { 9, PrivMode_MouseX10 },
3882#ifdef menuBar_esc
3883 { menuBar_esc, PrivMode_menuBar },
3884#endif
3885 // 18, 19 printing-related 4255 // 18, 19 printing-related
3886 { 25, PrivMode_VisibleCursor }, 4256 { 25, PrivMode_VisibleCursor },
3887#ifdef scrollBar_esc 4257#ifdef scrollBar_esc
3888 { scrollBar_esc, PrivMode_scrollBar }, 4258 { scrollBar_esc, PrivMode_scrollBar },
3889#endif 4259#endif
… …
3934 } 4304 }
3935 4305
3936 /* extra handling for values with state unkept */ 4306 /* extra handling for values with state unkept */
3937 switch (arg[i]) 4307 switch (arg[i])
3938 { 4308 {
4309#if ENABLE_STYLES
4310 case 1021:
4311 set_option (Opt_intensityStyles, mode);
4312
4313 scr_touch (true);
4314 break;
4315#endif
3939 case 1048: /* alternative cursor save */ 4316 case 1048: /* alternative cursor save */
4317 case 1049:
3940 if (options & Opt_secondaryScreen) 4318 if (option (Opt_secondaryScreen))
3941 if (mode == 0) 4319 if (mode == 0)
3942 scr_cursor (RESTORE); 4320 scr_cursor (RESTORE);
3943 else if (mode == 1) 4321 else if (mode == 1)
3944 scr_cursor (SAVE); 4322 scr_cursor (SAVE);
3945 break; 4323 break;
… …
3957 */ 4335 */
3958 PrivMode (1, PrivMode_vt52); 4336 PrivMode (1, PrivMode_vt52);
3959 break; 4337 break;
3960 case 3: /* 80/132 */ 4338 case 3: /* 80/132 */
3961 if (priv_modes & PrivMode_132OK) 4339 if (priv_modes & PrivMode_132OK)
3962 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4340 set_widthheight (((state ? 132 : 80) * fwidth), height);
3963 break; 4341 break;
3964 case 4: /* smooth scrolling */ 4342 case 4: /* smooth scrolling */
3965 if (state)
3966 options &= ~Opt_jumpScroll;
3967 else
3968 options |= Opt_jumpScroll; 4343 set_option (Opt_jumpScroll, !state);
3969 break; 4344 break;
3970 case 5: /* reverse video */ 4345 case 5: /* reverse video */
3971 scr_rvideo_mode (state); 4346 scr_rvideo_mode (state);
3972 break; 4347 break;
3973 case 6: /* relative/absolute origins */ 4348 case 6: /* relative/absolute origins */
… …
3979 /* case 8: - auto repeat, can't do on a per window basis */ 4354 /* case 8: - auto repeat, can't do on a per window basis */
3980 case 9: /* X10 mouse reporting */ 4355 case 9: /* X10 mouse reporting */
3981 if (state) /* orthogonal */ 4356 if (state) /* orthogonal */
3982 priv_modes &= ~PrivMode_MouseX11; 4357 priv_modes &= ~PrivMode_MouseX11;
3983 break; 4358 break;
3984#ifdef menuBar_esc
3985 case menuBar_esc:
3986#ifdef MENUBAR
3987 map_menuBar (state);
3988#endif
3989 break;
3990#endif
3991#ifdef scrollBar_esc 4359#ifdef scrollBar_esc
3992 case scrollBar_esc: 4360 case scrollBar_esc:
3993 if (scrollbar_mapping (state)) 4361 if (scrollbar_mapping (state))
3994 { 4362 {
3995 resize_all_windows (0, 0, 0); 4363 resize_all_windows (0, 0, 0);
… …
4014#if 0 4382#if 0
4015 case 1001: 4383 case 1001:
4016 break; /* X11 mouse highlighting */ 4384 break; /* X11 mouse highlighting */
4017#endif 4385#endif
4018 case 1010: /* scroll to bottom on TTY output inhibit */ 4386 case 1010: /* scroll to bottom on TTY output inhibit */
4019 if (state)
4020 options &= ~Opt_scrollTtyOutput;
4021 else
4022 options |= Opt_scrollTtyOutput; 4387 set_option (Opt_scrollTtyOutput, !state);
4023 break; 4388 break;
4024 case 1011: /* scroll to bottom on key press */ 4389 case 1011: /* scroll to bottom on key press */
4025 if (state)
4026 options |= Opt_scrollTtyKeypress; 4390 set_option (Opt_scrollTtyKeypress, state);
4027 else
4028 options &= ~Opt_scrollTtyKeypress;
4029 break; 4391 break;
4030 case 1047: /* secondary screen w/ clearing last */ 4392 case 1047: /* secondary screen w/ clearing last */
4031 if (options & Opt_secondaryScreen) 4393 if (option (Opt_secondaryScreen))
4032 if (current_screen != PRIMARY) 4394 if (current_screen != PRIMARY)
4033 scr_erase_screen (2); 4395 scr_erase_screen (2);
4034 scr_change_screen (state); 4396 scr_change_screen (state);
4035 break; 4397 break;
4036 case 1049: /* secondary screen w/ clearing first */ 4398 case 1049: /* secondary screen w/ clearing first */
4037 scr_change_screen (state); 4399 scr_change_screen (state);
4038 if (options & Opt_secondaryScreen) 4400 if (option (Opt_secondaryScreen))
4039 if (current_screen != PRIMARY) 4401 if (current_screen != PRIMARY)
4040 scr_erase_screen (2); 4402 scr_erase_screen (2);
4041 break; 4403 break;
4042 default: 4404 default:
4043 break; 4405 break;
… …
4069 rendset = 0, rendstyle = ~RS_None; 4431 rendset = 0, rendstyle = ~RS_None;
4070 break; 4432 break;
4071 case 1: 4433 case 1:
4072 rendset = 1, rendstyle = RS_Bold; 4434 rendset = 1, rendstyle = RS_Bold;
4073 break; 4435 break;
4074 //case 2: // faint or second colour 4436 //case 2: // low intensity
4075 //case 3: // italic 4437 case 3:
4438 rendset = 1, rendstyle = RS_Italic;
4439 break;
4076 case 4: 4440 case 4:
4077 rendset = 1, rendstyle = RS_Uline; 4441 rendset = 1, rendstyle = RS_Uline;
4078 break; 4442 break;
4079 case 5: // slowly blinking 4443 case 5: // slowly blinking
4080 case 6: // rapidly blinking 4444 case 6: // rapidly blinking
… …
4092 //case 11: // scoansi acs on, first alt font 4456 //case 11: // scoansi acs on, first alt font
4093 //case 12: // scoansi acs on, |0x80, second alt font 4457 //case 12: // scoansi acs on, |0x80, second alt font
4094 //... 4458 //...
4095 //case 19: // ninth alt font 4459 //case 19: // ninth alt font
4096 //case 20: // gothic 4460 //case 20: // gothic
4097 case 21: // disable bold, faint 4461 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
4098 rendset = 0, rendstyle = RS_Bold; 4462 rendset = 0, rendstyle = RS_Bold;
4099 break; 4463 break;
4100 case 22: 4464 case 22: // normal intensity
4101 rendset = 0, rendstyle = RS_Bold; 4465 rendset = 0, rendstyle = RS_Bold;
4102 break; 4466 break;
4103 //case 23: disable italic 4467 case 23: // disable italic
4468 rendset = 0, rendstyle = RS_Italic;
4469 break;
4104 case 24: 4470 case 24:
4105 rendset = 0, rendstyle = RS_Uline; 4471 rendset = 0, rendstyle = RS_Uline;
4106 break; 4472 break;
4107 case 25: 4473 case 25:
4108 rendset = 0, rendstyle = RS_Blink; 4474 rendset = 0, rendstyle = RS_Blink;
4109 break; 4475 break;
4110 case 26: 4476 case 26: // variable spacing (iso 8613)
4111 rendset = 0, rendstyle = RS_Blink; 4477 rendset = 0, rendstyle = RS_Blink;
4112 break; 4478 break;
4113 case 27: 4479 case 27:
4114 rendset = 0, rendstyle = RS_RVid; 4480 rendset = 0, rendstyle = RS_RVid;
4115 break; 4481 break;
… …
4133 case 35: 4499 case 35:
4134 case 36: 4500 case 36:
4135 case 37: 4501 case 37:
4136 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4502 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4137 break; 4503 break;
4138#ifdef TTY_256COLOR 4504 case 38: // set fg color, ISO 8613-6
4139 case 38:
4140 if (nargs > i + 2 && arg[i + 1] == 5) 4505 if (nargs > i + 2 && arg[i + 1] == 5)
4141 { 4506 {
4142 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4507 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4143 i += 2; 4508 i += 2;
4144 } 4509 }
4145 break; 4510 break;
4146#endif
4147 case 39: /* default fg */ 4511 case 39: /* default fg */
4148 scr_color (Color_fg, Color_fg); 4512 scr_color (Color_fg, Color_fg);
4149 break; 4513 break;
4150 4514
4151 case 40: 4515 case 40:
… …
4156 case 45: 4520 case 45:
4157 case 46: 4521 case 46:
4158 case 47: 4522 case 47:
4159 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4523 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4160 break; 4524 break;
4161#ifdef TTY_256COLOR 4525 case 48: // set bg color, ISO 8613-6
4162 case 48:
4163 if (nargs > i + 2 && arg[i + 1] == 5) 4526 if (nargs > i + 2 && arg[i + 1] == 5)
4164 { 4527 {
4165 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4528 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4166 i += 2; 4529 i += 2;
4167 } 4530 }
4168 break; 4531 break;
4169#endif
4170 case 49: /* default bg */ 4532 case 49: /* default bg */
4171 scr_color (Color_bg, Color_bg); 4533 scr_color (Color_bg, Color_bg);
4172 break; 4534 break;
4173 4535
4174#ifndef NO_BRIGHTCOLOR 4536 //case 50: // not variable spacing
4537
4538#if !ENABLE_MINIMAL
4175 case 90: 4539 case 90:
4176 case 91: /* set bright fg color */ 4540 case 91: /* set bright fg color */
4177 case 92: 4541 case 92:
4178 case 93: 4542 case 93:
4179 case 94: 4543 case 94:
4180 case 95: 4544 case 95:
4181 case 96: 4545 case 96:
4182 case 97: 4546 case 97:
4183 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4547 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4184 Color_fg);
4185 break; 4548 break;
4186 case 100: 4549 case 100:
4187 case 101: /* set bright bg color */ 4550 case 101: /* set bright bg color */
4188 case 102: 4551 case 102:
4189 case 103: 4552 case 103:
4190 case 104: 4553 case 104:
4191 case 105: 4554 case 105:
4192 case 106: 4555 case 106:
4193 case 107: 4556 case 107:
4194 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4557 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4195 Color_bg);
4196 break; 4558 break;
4197#endif 4559#endif
4198
4199 } 4560 }
4200 } 4561 }
4201} 4562}
4202/*}}} */ 4563/*}}} */
4203 4564
… …
4227 */ 4588 */
4228void 4589void
4229rxvt_term::tt_printf (const char *fmt,...) 4590rxvt_term::tt_printf (const char *fmt,...)
4230{ 4591{
4231 va_list arg_ptr; 4592 va_list arg_ptr;
4232 unsigned char buf[256]; 4593 char buf[256];
4233 4594
4234 va_start (arg_ptr, fmt); 4595 va_start (arg_ptr, fmt);
4235 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4596 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4236 va_end (arg_ptr); 4597 va_end (arg_ptr);
4237 tt_write (buf, strlen (buf)); 4598 tt_write (buf, strlen (buf));
… …
4239 4600
4240/* ---------------------------------------------------------------------- */ 4601/* ---------------------------------------------------------------------- */
4241/* Write data to the pty as typed by the user, pasted with the mouse, 4602/* Write data to the pty as typed by the user, pasted with the mouse,
4242 * or generated by us in response to a query ESC sequence. 4603 * or generated by us in response to a query ESC sequence.
4243 */ 4604 */
4605const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4606
4244void 4607void
4245rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4608rxvt_term::tt_write (const char *data, unsigned int len)
4246{ 4609{
4247 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4610 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4611 return;
4248 4612
4249 if (len) 4613 if (pty->pty < 0)
4614 return;
4615
4616 if (v_buflen == 0)
4617 {
4618 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4619
4620 if ((unsigned int)written == len)
4621 return;
4622
4623 data += written;
4624 len -= written;
4250 { 4625 }
4626
4627 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4628
4629 memcpy (v_buffer + v_buflen, data, len);
4630 v_buflen += len;
4631
4632 pty_ev.set (EVENT_READ | EVENT_WRITE);
4633}
4634
4635void rxvt_term::pty_write ()
4636{
4637 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4638
4639 if (written > 0)
4640 {
4641 v_buflen -= written;
4642
4251 if (v_buflen == 0) 4643 if (v_buflen == 0)
4252 { 4644 {
4253 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4254
4255 if ((unsigned int)written == len)
4256 return;
4257
4258 data += written;
4259 len -= written;
4260 }
4261
4262
4263 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4264
4265 memcpy (v_buffer + v_buflen, data, len);
4266 v_buflen += len;
4267 }
4268
4269 for (;;)
4270 {
4271 int written = write (pty.pty, v_buffer, min (MAX_PTY_WRITE, v_buflen));
4272
4273 if (written > 0)
4274 {
4275 v_buflen -= written;
4276
4277 if (v_buflen == 0)
4278 {
4279 free (v_buffer); 4645 free (v_buffer);
4280 v_buffer = 0; 4646 v_buffer = 0;
4281 v_buflen = 0; 4647 v_buflen = 0;
4282 4648
4283 pty_ev.set (EVENT_READ); 4649 pty_ev.set (EVENT_READ);
4284 return;
4285 }
4286
4287 memmove (v_buffer, v_buffer + written, v_buflen);
4288 }
4289 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4290 // original code just ignores this...
4291 destroy ();
4292 else
4293 {
4294 pty_ev.set (EVENT_READ | EVENT_WRITE);
4295 return; 4650 return;
4296 } 4651 }
4652
4653 memmove (v_buffer, v_buffer + written, v_buflen);
4297 } 4654 }
4655 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4656 pty_ev.set (EVENT_READ);
4298} 4657}
4299 4658
4300/*----------------------- end-of-file (C source) -----------------------*/ 4659/*----------------------- end-of-file (C source) -----------------------*/
4301 4660

Diff Legend

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