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.215 by root, Fri Dec 23 14:46:34 2005 UTC vs.
Revision 1.418 by root, Fri Oct 10 00:11:44 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * 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 34 * 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 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 44 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 45 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 46 *----------------------------------------------------------------------*/
46 47
47/*{{{ includes: */ 48/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 49#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 50#include "rxvt.h"
51#include "rxvtperl.h"
50#include "version.h" 52#include "version.h"
51#include "command.h" 53#include "command.h"
52 54
53#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 56# include "keyboard.h"
55#endif 57#endif
56 58
57#include <csignal> 59#include <csignal>
58 60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64
59/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
60 66
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 68
66#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
67 70
68#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
93 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
94 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
95 98
96 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
97 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
98 XK_ISO_Lock, 0x21eb,
99 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
100 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
101 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
102 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
103 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
141 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 144 return;
143 145
144 for (;;) 146 for (;;)
145 { 147 {
146 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
147 149
148 text_t t = l.t[x]; 150 text_t t = l.t[x];
149 151
150 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
151 { 153 {
152 iso14755_51 (l.t[x], l.r[x]); 154 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
154 break; 156 break;
155 } 157 }
156 158
157 x--; 159 x--;
158 } 160 }
159} 161}
160#endif
161 162
162#if ENABLE_OVERLAY
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 168 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 169 int len;
170 170
171 fname = rxvt_utf8towcs (f->name); 171 fname = rxvt_utf8towcs (f->name);
172 172
173#if ENABLE_COMBINING 173# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
175 { 175 {
176 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
179 } 179 }
180 else 180 else
181#endif 181# endif
182 { 182 {
183 ch2 = ch; 183 ch2 = ch;
184 184
185 alloc = 0; 185 alloc = 0;
186 chr = &ch2; 186 chr = &ch2;
187 len = 1; 187 len = 1;
188 } 188 }
189 189
190 char attr[80]; // plenty
191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
190 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
191 203
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
193 214
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195 216
196 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
197 { 218 {
… …
200 ch = *chr++; 221 ch = *chr++;
201 222
202 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
205#if !UNICODE3 226# if !UNICODE_3
206 if (ch >= 0x10000) 227 if (ch >= 0x10000)
207 ch = 0xfffd; 228 ch = 0xfffd;
208#endif 229# endif
209 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
210 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
211 } 234 }
212 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
241 scr_overlay_set (0, len , attr);
213 scr_overlay_set (0, len, fname); 242 scr_overlay_set (0, len + 1, fname);
214 243
215 free (fname); 244 free (fname);
216 245
217#if ENABLE_COMBINING 246# if ENABLE_COMBINING
218 if (alloc) 247 if (alloc)
219 delete [] alloc; 248 delete [] alloc;
220#endif 249# endif
221} 250}
222#endif 251#endif
223 252
224void 253void
225rxvt_term::commit_iso14755 () 254rxvt_term::commit_iso14755 ()
… …
242 mb[0] = ch[0]; 271 mb[0] = ch[0];
243 len = 1; 272 len = 1;
244 } 273 }
245 274
246 if (len > 0) 275 if (len > 0)
247 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
248 else 277 else
249 scr_bell (); 278 scr_bell ();
250 } 279 }
251 280
252 iso14755buf = 0; 281 iso14755buf = 0;
253} 282}
254 283
255int 284static int
256rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
257{ 286{
258 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
259 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
260 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
261 { 290 {
… …
269 298
270 return -1; 299 return -1;
271} 300}
272#endif 301#endif
273 302
274/*{{{ Convert the keypress event into a string */ 303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
339static inline int
340map_function_key (KeySym keysym)
341{
342 int param = 0;
343
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
345 {
346 param = 11 + keysym - XK_F1;
347 if (keysym >= XK_F17)
348 param += 4;
349 else if (keysym >= XK_F15)
350 param += 3;
351 else if (keysym >= XK_F11)
352 param += 2;
353 else if (keysym >= XK_F6)
354 param += 1;
355 }
356 else
357 switch (keysym)
358 {
359 case XK_Find:
360 param = 1;
361 break;
362 case XK_Insert:
363 param = 2;
364 break;
365#ifdef DXK_Remove
366 case DXK_Remove:
367#endif
368 case XK_Execute:
369 param = 3;
370 break;
371 case XK_Select:
372 param = 4;
373 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior:
376 param = 5;
377 break;
378 case XK_Next:
379 param = 6;
380 break;
381 case XK_Home:
382 param = 7;
383 break;
384 case XK_End:
385 param = 8;
386 break;
387#endif
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
275void 398void
276rxvt_term::lookup_key (XKeyEvent &ev) 399rxvt_term::key_press (XKeyEvent &ev)
277{ 400{
278 int ctrl, meta, shft, len; 401 int ctrl, meta, shft, len;
279 unsigned int newlen;
280 KeySym keysym; 402 KeySym keysym;
281#ifdef DEBUG_CMD
282 static int debug_key = 1; /* accessible by a debugger only */
283#endif
284 int valid_keysym; 403 int valid_keysym;
285 unsigned char kbuf[KBUFSZ]; 404 char kbuf[KBUFSZ];
405
406#if ISO_14755
407 if (iso14755buf & ISO_14755_52)
408 return;
409#endif
286 410
287 /* 411 /*
288 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 412 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
289 * escape sequence to toggle the Keypad. 413 * escape sequence to toggle the Keypad.
290 * 414 *
… …
295 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
296 420
297 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
298 { 422 {
299 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
300 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
301 } 425 }
302 426
303 kbuf[0] = 0; 427 kbuf[0] = 0;
304 428
305#ifdef USE_XIM 429#ifdef USE_XIM
… …
308 Status status_return; 432 Status status_return;
309 433
310#if 0 434#if 0
311#ifdef X_HAVE_UTF8_STRING 435#ifdef X_HAVE_UTF8_STRING
312 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 436 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
313 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 437 len = Xutf8LookupString (Input_Context, &ev, kbuf,
314 KBUFSZ, &keysym, &status_return); 438 KBUFSZ, &keysym, &status_return);
315 else 439 else
316#endif 440#endif
317#endif 441#endif
318 { 442 {
… …
355 || status_return == XLookupBoth; 479 || status_return == XLookupBoth;
356 } 480 }
357 else 481 else
358#endif 482#endif
359 { 483 {
360 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
361 valid_keysym = keysym != NoSymbol; 485 valid_keysym = keysym != NoSymbol;
362 } 486 }
363 487
364 if (valid_keysym) 488 if (valid_keysym)
365 { 489 {
… …
417 scr_move_to (0, 1); 541 scr_move_to (0, 1);
418 return; 542 return;
419 } 543 }
420 else if (keysym == XK_End) 544 else if (keysym == XK_End)
421 { 545 {
422 scr_move_to (1, 0); 546 scr_move_to (1, 1);
423 return; 547 return;
424 } 548 }
425 } 549 }
426#endif 550#endif
427 } 551 }
… …
438 { 562 {
439 switch (keysym) 563 switch (keysym)
440 { 564 {
441 /* normal XTerm key bindings */ 565 /* normal XTerm key bindings */
442 case XK_Insert: /* Shift+Insert = paste mouse selection */ 566 case XK_Insert: /* Shift+Insert = paste mouse selection */
443 selection_request (ev.time, 0, 0); 567 selection_request (ev.time);
444 return; 568 return;
445#if TODO 569#if TODO
446 /* rxvt extras */ 570 /* rxvt extras */
447 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 571 case XK_KP_Add: /* Shift+KP_Add = bigger font */
448 change_font (FONT_UP); 572 change_font (FONT_UP);
… …
467 { 591 {
468 commit_iso14755 (); 592 commit_iso14755 ();
469 iso14755buf = ISO_14755_51; 593 iso14755buf = ISO_14755_51;
470# if ISO_14755 594# if ISO_14755
471 iso14755_51 (0); 595 iso14755_51 (0);
596# endif
597 return;
598 }
599 else if (keysym == XK_BackSpace)
600 {
601 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
602# if ISO_14755
603 iso14755_51 (iso14755buf & ISO_14755_MASK);
472# endif 604# endif
473 return; 605 return;
474 } 606 }
475 else if ((hv = hex_keyval (ev)) >= 0) 607 else if ((hv = hex_keyval (ev)) >= 0)
476 { 608 {
… …
481# endif 613# endif
482 return; 614 return;
483 } 615 }
484 else 616 else
485 { 617 {
486# if ENABLE_OVERLAY 618# if ISO_14755
487 scr_overlay_off (); 619 scr_overlay_off ();
488# endif 620# endif
489 iso14755buf = 0; 621 iso14755buf = 0;
490 } 622 }
491 } 623 }
492 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
493 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
494 if (!(iso14755buf & ISO_14755_STARTED)) 626 if (!(iso14755buf & ISO_14755_STARTED))
495 { 627 {
496 iso14755buf |= ISO_14755_STARTED; 628 iso14755buf |= ISO_14755_STARTED;
497# if ENABLE_OVERLAY 629# if ISO_14755
498 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
499 scr_overlay_set (0, 0, "ISO 14755 mode"); 631 scr_overlay_set (0, 0, "ISO 14755 mode");
500# endif 632# endif
501 } 633 }
502#endif 634#endif
503 635
504#ifdef PRINTPIPE 636#ifdef PRINTPIPE
505 if (keysym == XK_Print) 637 if (keysym == XK_Print)
506 { 638 {
507 scr_printscreen (ctrl | shft); 639 scr_printscreen (ctrl | shft);
508 return; 640 return;
509 } 641 }
510#endif 642#endif
511 643
512 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
513 { 645 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1;
648
649 switch (translate_keypad (keysym, kp))
514 { 650 {
651#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace)
654 {
655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
656 ^ !!ctrl) ? '\b' : '\177';
657 kbuf[1] = '\0';
658 }
659 else
660 strcpy (kbuf, rs[Rs_backspace_key]);
661 break;
662#endif
663#ifndef NO_DELETE_KEY
664 case XK_Delete:
665 strcpy (kbuf, rs[Rs_delete_key]);
666 break;
667#endif
668 case XK_Tab:
669 if (shft)
670 strcpy (kbuf, "\033[Z");
671 else
672 {
673#ifdef CTRL_TAB_MAKES_META
674 if (ctrl)
675 meta = 1;
676#endif
677#ifdef MOD4_TAB_MAKES_META
678 if (ev.state & Mod4Mask)
679 meta = 1;
680#endif
515 newlen = 1; 681 newlen = 0;
516 switch (keysym) 682 }
683 break;
684
685 case XK_Up: /* "\033[A" */
686 case XK_Down: /* "\033[B" */
687 case XK_Right: /* "\033[C" */
688 case XK_Left: /* "\033[D" */
689 strcpy (kbuf, "\033[Z");
690 kbuf[2] = "DACB"[keysym - XK_Left];
691 /* do Shift first */
692 if (shft)
693 kbuf[2] = "dacb"[keysym - XK_Left];
694 else if (ctrl)
695 {
696 kbuf[1] = 'O';
697 kbuf[2] = "dacb"[keysym - XK_Left];
698 }
699 else if (priv_modes & PrivMode_aplCUR)
700 kbuf[1] = 'O';
701 break;
702
703 case XK_KP_Enter:
704 /* allow shift to override */
705 if (kp)
706 {
707 strcpy (kbuf, "\033OM");
708 break;
709 }
710
711 /* FALLTHROUGH */
712
713 case XK_Return:
714 if (priv_modes & PrivMode_LFNL)
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\012';
718 kbuf[2] = '\0';
719 }
720 else
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\0';
724 }
725 break;
726
727 case XK_KP_F1: /* "\033OP" */
728 case XK_KP_F2: /* "\033OQ" */
729 case XK_KP_F3: /* "\033OR" */
730 case XK_KP_F4: /* "\033OS" */
731 strcpy (kbuf, "\033OP");
732 kbuf[2] += (keysym - XK_KP_F1);
733 break;
734
735 case XK_KP_Multiply: /* "\033Oj" : "*" */
736 case XK_KP_Add: /* "\033Ok" : "+" */
737 case XK_KP_Separator: /* "\033Ol" : "," */
738 case XK_KP_Subtract: /* "\033Om" : "-" */
739 case XK_KP_Decimal: /* "\033On" : "." */
740 case XK_KP_Divide: /* "\033Oo" : "/" */
741 case XK_KP_0: /* "\033Op" : "0" */
742 case XK_KP_1: /* "\033Oq" : "1" */
743 case XK_KP_2: /* "\033Or" : "2" */
744 case XK_KP_3: /* "\033Os" : "3" */
745 case XK_KP_4: /* "\033Ot" : "4" */
746 case XK_KP_5: /* "\033Ou" : "5" */
747 case XK_KP_6: /* "\033Ov" : "6" */
748 case XK_KP_7: /* "\033Ow" : "7" */
749 case XK_KP_8: /* "\033Ox" : "8" */
750 case XK_KP_9: /* "\033Oy" : "9" */
751 /* allow shift to override */
752 if (kp)
753 {
754 strcpy (kbuf, "\033Oj");
755 kbuf[2] += (keysym - XK_KP_Multiply);
756 }
757 else
758 {
759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
760 kbuf[1] = '\0';
761 }
762 break;
763
764 default:
517 { 765 {
518#ifndef NO_BACKSPACE_KEY 766 int param = map_function_key (keysym);
519 case XK_BackSpace: 767 if (param > 0)
520 if (priv_modes & PrivMode_HaveBackSpace) 768 sprintf (kbuf,"\033[%d~", param);
521 {
522 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
523 ^ !!ctrl) ? '\b' : '\177';
524 kbuf[1] = '\0';
525 }
526 else 769 else
527 strcpy (kbuf, key_backspace);
528 break;
529#endif
530#ifndef NO_DELETE_KEY
531# ifdef XK_KP_Prior
532 case XK_KP_Delete:
533 /* allow shift to override */
534 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
535 {
536 strcpy (kbuf, "\033On");
537 break;
538 }
539 /* FALLTHROUGH */
540# endif
541 case XK_Delete:
542 strcpy (kbuf, key_delete);
543 break;
544#endif
545 case XK_Tab:
546 if (shft)
547 strcpy (kbuf, "\033[Z");
548 else
549 {
550#ifdef CTRL_TAB_MAKES_META
551 if (ctrl)
552 meta = 1;
553#endif
554#ifdef MOD4_TAB_MAKES_META
555 if (ev.state & Mod4Mask)
556 meta = 1;
557#endif
558 newlen = 0;
559 }
560 break;
561
562#ifdef XK_KP_Left
563 case XK_KP_Up: /* \033Ox or standard */
564 case XK_KP_Down: /* \033Or or standard */
565 case XK_KP_Right: /* \033Ov or standard */
566 case XK_KP_Left: /* \033Ot or standard */
567 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
568 {
569 strcpy (kbuf, "\033OZ");
570 kbuf[2] = "txvr"[keysym - XK_KP_Left];
571 break;
572 }
573 else
574 /* translate to std. cursor key */
575 keysym = XK_Left + (keysym - XK_KP_Left);
576 /* FALLTHROUGH */
577#endif
578 case XK_Up: /* "\033[A" */
579 case XK_Down: /* "\033[B" */
580 case XK_Right: /* "\033[C" */
581 case XK_Left: /* "\033[D" */
582 strcpy (kbuf, "\033[Z");
583 kbuf[2] = "DACB"[keysym - XK_Left];
584 /* do Shift first */
585 if (shft)
586 kbuf[2] = "dacb"[keysym - XK_Left];
587 else if (ctrl)
588 {
589 kbuf[1] = 'O';
590 kbuf[2] = "dacb"[keysym - XK_Left];
591 }
592 else if (priv_modes & PrivMode_aplCUR)
593 kbuf[1] = 'O';
594 break;
595
596#ifndef UNSHIFTED_SCROLLKEYS
597# ifdef XK_KP_Prior
598 case XK_KP_Prior:
599 /* allow shift to override */
600 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
601 {
602 strcpy (kbuf, "\033Oy");
603 break;
604 }
605 /* FALLTHROUGH */
606# endif
607 case XK_Prior:
608 strcpy (kbuf, "\033[5~");
609 break;
610# ifdef XK_KP_Next
611 case XK_KP_Next:
612 /* allow shift to override */
613 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
614 {
615 strcpy (kbuf, "\033Os");
616 break;
617 }
618 /* FALLTHROUGH */
619# endif
620 case XK_Next:
621 strcpy (kbuf, "\033[6~");
622 break;
623#endif
624 case XK_KP_Enter:
625 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
627 {
628 strcpy (kbuf, "\033OM");
629 break;
630 }
631
632 /* FALLTHROUGH */
633
634 case XK_Return:
635 if (priv_modes & PrivMode_LFNL)
636 {
637 kbuf[0] = '\015';
638 kbuf[1] = '\012';
639 kbuf[2] = '\0';
640 }
641 else
642 {
643 kbuf[0] = '\015';
644 kbuf[1] = '\0';
645 }
646 break;
647
648#ifdef XK_KP_Begin
649 case XK_KP_Begin:
650 strcpy (kbuf, "\033Ou");
651 break;
652
653#endif
654 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */
658 strcpy (kbuf, "\033OP");
659 kbuf[2] += (keysym - XK_KP_F1);
660 break;
661
662 case XK_KP_Multiply: /* "\033Oj" : "*" */
663 case XK_KP_Add: /* "\033Ok" : "+" */
664 case XK_KP_Separator: /* "\033Ol" : "," */
665 case XK_KP_Subtract: /* "\033Om" : "-" */
666 case XK_KP_Decimal: /* "\033On" : "." */
667 case XK_KP_Divide: /* "\033Oo" : "/" */
668 case XK_KP_0: /* "\033Op" : "0" */
669 case XK_KP_1: /* "\033Oq" : "1" */
670 case XK_KP_2: /* "\033Or" : "2" */
671 case XK_KP_3: /* "\033Os" : "3" */
672 case XK_KP_4: /* "\033Ot" : "4" */
673 case XK_KP_5: /* "\033Ou" : "5" */
674 case XK_KP_6: /* "\033Ov" : "6" */
675 case XK_KP_7: /* "\033Ow" : "7" */
676 case XK_KP_8: /* "\033Ox" : "8" */
677 case XK_KP_9: /* "\033Oy" : "9" */
678 /* allow shift to override */
679 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
680 {
681 strcpy (kbuf, "\033Oj");
682 kbuf[2] += (keysym - XK_KP_Multiply);
683 }
684 else
685 {
686 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
687 kbuf[1] = '\0';
688 }
689 break;
690
691 case XK_Find:
692 strcpy (kbuf, "\033[1~");
693 break;
694
695#ifdef XK_KP_End
696 case XK_KP_Insert:
697 /* allow shift to override */
698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
699 {
700 strcpy (kbuf, "\033Op");
701 break;
702 }
703 /* FALLTHROUGH */
704#endif
705 case XK_Insert:
706 strcpy (kbuf, "\033[2~");
707 break;
708#ifdef DXK_Remove /* support for DEC remove like key */
709 case DXK_Remove:
710 /* FALLTHROUGH */
711#endif
712 case XK_Execute:
713 strcpy (kbuf, "\033[3~");
714 break;
715 case XK_Select:
716 strcpy (kbuf, "\033[4~");
717 break;
718#ifdef XK_KP_End
719 case XK_KP_End:
720 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
722 {
723 strcpy (kbuf, "\033Oq");
724 break;
725 }
726 /* FALLTHROUGH */
727#endif
728 case XK_End:
729 strcpy (kbuf, KS_END);
730 break;
731#ifdef XK_KP_Home
732 case XK_KP_Home:
733 /* allow shift to override */
734 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
735 {
736 strcpy (kbuf, "\033Ow");
737 break;
738 }
739 /* FALLTHROUGH */
740#endif
741 case XK_Home:
742 strcpy (kbuf, KS_HOME);
743 break;
744
745#define FKEY(n, fkey) \
746 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
747
748 case XK_F1: /* "\033[11~" */
749 case XK_F2: /* "\033[12~" */
750 case XK_F3: /* "\033[13~" */
751 case XK_F4: /* "\033[14~" */
752 case XK_F5: /* "\033[15~" */
753 FKEY (11, XK_F1);
754 break;
755 case XK_F6: /* "\033[17~" */
756 case XK_F7: /* "\033[18~" */
757 case XK_F8: /* "\033[19~" */
758 case XK_F9: /* "\033[20~" */
759 case XK_F10: /* "\033[21~" */
760 FKEY (17, XK_F6);
761 break;
762 case XK_F11: /* "\033[23~" */
763 case XK_F12: /* "\033[24~" */
764 case XK_F13: /* "\033[25~" */
765 case XK_F14: /* "\033[26~" */
766 FKEY (23, XK_F11);
767 break;
768 case XK_F15: /* "\033[28~" */
769 case XK_F16: /* "\033[29~" */
770 FKEY (28, XK_F15);
771 break;
772 case XK_Help: /* "\033[28~" */
773 FKEY (28, XK_Help);
774 break;
775 case XK_Menu: /* "\033[29~" */
776 FKEY (29, XK_Menu);
777 break;
778 case XK_F17: /* "\033[31~" */
779 case XK_F18: /* "\033[32~" */
780 case XK_F19: /* "\033[33~" */
781 case XK_F20: /* "\033[34~" */
782 case XK_F21: /* "\033[35~" */
783 case XK_F22: /* "\033[36~" */
784 case XK_F23: /* "\033[37~" */
785 case XK_F24: /* "\033[38~" */
786 case XK_F25: /* "\033[39~" */
787 case XK_F26: /* "\033[40~" */
788 case XK_F27: /* "\033[41~" */
789 case XK_F28: /* "\033[42~" */
790 case XK_F29: /* "\033[43~" */
791 case XK_F30: /* "\033[44~" */
792 case XK_F31: /* "\033[45~" */
793 case XK_F32: /* "\033[46~" */
794 case XK_F33: /* "\033[47~" */
795 case XK_F34: /* "\033[48~" */
796 case XK_F35: /* "\033[49~" */
797 FKEY (31, XK_F17);
798 break;
799#undef FKEY
800 default:
801 newlen = 0; 770 newlen = 0;
802 break;
803 } 771 }
804 772 break;
805 if (newlen)
806 len = strlen (kbuf);
807 } 773 }
774
775 if (newlen)
776 len = strlen (kbuf);
808 777
809 /* 778 /*
810 * Pass meta for all function keys, if 'meta' option set 779 * Pass meta for all function keys, if 'meta' option set
811 */ 780 */
812#ifdef META8_OPTION 781#ifdef META8_OPTION
… …
829 { 798 {
830#ifdef META8_OPTION 799#ifdef META8_OPTION
831 /* set 8-bit on */ 800 /* set 8-bit on */
832 if (meta && (meta_char == 0x80)) 801 if (meta && (meta_char == 0x80))
833 { 802 {
834 unsigned char *ch; 803 char *ch;
835 804
836 for (ch = kbuf; ch < kbuf + len; ch++) 805 for (ch = kbuf; ch < kbuf + len; ch++)
837 *ch |= 0x80; 806 *ch |= 0x80;
838 807
839 meta = 0; 808 meta = 0;
… …
841#endif 810#endif
842 /* nil */ ; 811 /* nil */ ;
843 } 812 }
844 } 813 }
845 814
815 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
816 return;
817
846 if (len <= 0) 818 if (len <= 0)
847 return; /* not mapped */ 819 return; /* not mapped */
848 820
849 if (options & Opt_scrollTtyKeypress) 821 if (option (Opt_scrollTtyKeypress))
850 if (view_start) 822 if (view_start)
851 { 823 {
852 view_start = 0; 824 view_start = 0;
853 want_refresh = 1; 825 want_refresh = 1;
854 } 826 }
… …
872#ifdef META8_OPTION 844#ifdef META8_OPTION
873 && meta_char == C0_ESC 845 && meta_char == C0_ESC
874#endif 846#endif
875 ) 847 )
876 { 848 {
877 const unsigned char ch = C0_ESC; 849 const char ch = C0_ESC;
878 tt_write (&ch, 1); 850 tt_write (&ch, 1);
879 } 851 }
880 852
881#if defined(DEBUG_CMD)
882 /* Display keyboard buffer contents */
883 unsigned char *p;
884 int i;
885
886 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
887 for (i = 0, p = kbuf; i < len; i++, p++)
888 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
889 fprintf (stderr, "'\n");
890#endif /* DEBUG_CMD */
891 tt_write (kbuf, (unsigned int)len); 853 tt_write (kbuf, (unsigned int)len);
892} 854}
893/*}}} */
894 855
856void
857rxvt_term::key_release (XKeyEvent &ev)
858{
859#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
860 KeySym keysym;
861
862 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
863#endif
864
865#if ENABLE_FRILLS || ISO_14755
866 // ISO 14755 support
867 if (iso14755buf)
868 if (iso14755buf & ISO_14755_52)
869 {
870# if ISO_14755
871 scr_overlay_off ();
872# endif
873# if ISO_14755
874 // iso14755 part 5.2 handling: release time
875 // first: controls
876 if ((ev.state & ControlMask)
877 && ((keysym >= 0x40 && keysym <= 0x5f)
878 || (keysym >= 0x61 && keysym <= 0x7f)))
879 {
880 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
881 commit_iso14755 ();
882
883 return;
884 }
885
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
887 if (i[0] == keysym)
888 {
889 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 ();
891
892 return;
893 }
894
895 scr_bell ();
896# endif
897 iso14755buf = 0;
898
899 return;
900 }
901 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
902 {
903# if ISO_14755
904 scr_overlay_off ();
905# endif
906 if (iso14755buf & ISO_14755_51)
907 commit_iso14755 ();
908#if ISO_14755
909 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
910 {
911 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
912
913 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
914 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
915 }
916# endif
917 else
918 iso14755buf = 0;
919 }
920#endif
921
922 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
923 return;
924
925#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
926 if (!(ev.state & ControlMask))
927 slip_wheel_ev.stop ();
928 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0;
930#endif
931}
932
895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 933#if defined (KEYSYM_RESOURCE)
896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
897/* attempt to `write' count to the input buffer */
898unsigned int 934unsigned int
899rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 935rxvt_term::cmd_write (const char *str, unsigned int count)
900{ 936{
901 unsigned int n, s; 937 unsigned int n, s;
902 938
903 n = cmdbuf_ptr - cmdbuf_base; 939 n = cmdbuf_ptr - cmdbuf_base;
904 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 940 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
930void 966void
931rxvt_term::flush () 967rxvt_term::flush ()
932{ 968{
933 flush_ev.stop (); 969 flush_ev.stop ();
934 970
935#ifdef TRANSPARENT 971#ifdef HAVE_BG_PIXMAP
936 if (want_full_refresh) 972 if (bgPixmap.check_clearChanged ())
937 { 973 {
938 want_full_refresh = 0; 974// scr_clear (true); This needs to be researched further!
939 scr_clear ();
940 scr_touch (false); 975 scr_touch (false);
941 } 976 }
942#endif 977#endif
943 978
944 if (want_refresh) 979 if (want_refresh)
945 { 980 {
981 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
982 {
983 int row = view_start;
984 int end_row = row + nrow;
985
986 while (row > top_row && ROW (row - 1).is_longer ())
987 --row;
988
989 do
990 {
991 int start_row = row;
992 line_t *l;
993
994 do
995 {
996 l = &ROW (row++);
997
998 if (!(l->f & LINE_FILTERED))
999 {
1000 // line not filtered, mark it as filtered
1001 l->f |= LINE_FILTERED;
1002 while (l->is_longer ())
1003 {
1004 l = &ROW (row++);
1005 l->f |= LINE_FILTERED;
1006 }
1007
1008 // and filter it
1009 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1010
1011 break;
1012 }
1013 }
1014 while (l->is_longer () && row < end_row);
1015 }
1016 while (row < end_row);
1017 }
1018
946 scr_refresh (refresh_type); 1019 scr_refresh ();
947 scrollbar_show (1); 1020 scrollBar.show (1);
948#ifdef USE_XIM 1021#ifdef USE_XIM
949 IMSendSpot (); 1022 IMSendSpot ();
950#endif 1023#endif
951 } 1024 }
952 1025
953 display->flush (); 1026 display->flush ();
954} 1027}
955 1028
1029/* checks wether a refresh is requested and starts the refresh timer */
956void 1030void
957rxvt_term::check_cb (check_watcher &w) 1031rxvt_term::refresh_check ()
958{ 1032{
959 SET_R (this); 1033 if (want_refresh && !flush_ev.is_active ())
960 SET_LOCALE (locale); 1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
961 1035
962 display->flush (); 1036 display->flush ();
963
964 if (want_refresh && !flush_ev.active)
965 flush_ev.start (NOW + 0.01);
966} 1037}
967 1038
968void 1039void
969rxvt_term::flush_cb (time_watcher &w) 1040rxvt_term::flush_cb (ev::timer &w, int revents)
970{ 1041{
971 SET_R (this); 1042 make_current ();
972 SET_LOCALE (locale);
973 1043
974 refresh_limit = 1;
975 refresh_count = 0; 1044 refresh_count = 0;
976 flush (); 1045 flush ();
977} 1046}
978 1047
979#ifdef CURSOR_BLINK 1048#ifdef CURSOR_BLINK
980void 1049void
981rxvt_term::cursor_blink_cb (time_watcher &w) 1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
982{ 1051{
983 hidden_cursor = !hidden_cursor; 1052 hidden_cursor = !hidden_cursor;
984 want_refresh = 1; 1053 want_refresh = 1;
985 1054 refresh_check ();
986 w.start (w.at + BLINK_INTERVAL);
987} 1055}
988#endif 1056#endif
989 1057
990#ifdef TEXT_BLINK 1058#ifdef TEXT_BLINK
991void 1059void
992rxvt_term::text_blink_cb (time_watcher &w) 1060rxvt_term::text_blink_cb (ev::timer &w, int revents)
993{ 1061{
994 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1062 if (scr_refresh_rend (RS_Blink, RS_Blink))
995 { 1063 {
996 hidden_text = !hidden_text; 1064 hidden_text = !hidden_text;
997 want_refresh = 1; 1065 want_refresh = 1;
998 w.start (w.at + TEXT_BLINK_INTERVAL); 1066 refresh_check ();
999 } 1067 }
1068 else
1069 w.stop ();
1000} 1070}
1001#endif 1071#endif
1002 1072
1003#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1004void 1074void
1005rxvt_term::cont_scroll_cb (time_watcher &w) 1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1006{ 1076{
1007 if ((scrollbar_isUp() || scrollbar_isDn()) && 1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1008 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1009 { 1079 {
1010 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1; 1080 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1081 refresh_check ();
1013 } 1082 }
1083 else
1084 w.stop ();
1014} 1085}
1015#endif 1086#endif
1016 1087
1017#ifdef SELECTION_SCROLLING 1088#ifdef SELECTION_SCROLLING
1018void 1089void
1019rxvt_term::sel_scroll_cb (time_watcher &w) 1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1020{ 1091{
1021 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1092 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1022 { 1093 {
1023 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1094 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1024 refresh_type |= SMOOTH_REFRESH;
1025 want_refresh = 1; 1095 want_refresh = 1;
1026 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1027 } 1097 }
1098 else
1099 w.stop ();
1028} 1100}
1029#endif 1101#endif
1030 1102
1031#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1032void 1104void
1033rxvt_term::slip_wheel_cb (time_watcher &w) 1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1034{ 1106{
1035 if (mouse_slip_wheel_speed == 0 1107 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1037 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1108 {
1039 if (view_start == nsaved ||
1040 view_start == 0)
1041 mouse_slip_wheel_speed = 0;
1042
1043 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1109 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1110 refresh_check ();
1111 }
1112
1113 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1046 } 1114 {
1115 mouse_slip_wheel_speed = 0;
1116 w.stop ();
1117 }
1047} 1118}
1119#endif
1120
1121#if LINUX_YIELD_HACK
1122static struct event_handler
1123{
1124 ev::prepare yield_ev;
1125
1126 void yield_cb (ev::prepare &w, int revents)
1127 {
1128 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS.
1132
1133 struct timespec ts = { 0, 0 };
1134 nanosleep (&ts, 0);
1135
1136 w.stop ();
1137 }
1138
1139 event_handler ()
1140 : yield_ev (this, &event_handler::yield_cb)
1141 {
1142 }
1143} event_handler;
1048#endif 1144#endif
1049 1145
1050bool 1146bool
1051rxvt_term::pty_fill () 1147rxvt_term::pty_fill ()
1052{ 1148{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1149 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1150
1055 if (CBUFSIZ == n) 1151 if (CBUFSIZ == n)
1056 { 1152 {
1057 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1153 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1058 n = 0; 1154 n = 0;
1059 } 1155 }
1060 1156
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1157 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1158 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1159 cmdbuf_endp = cmdbuf_ptr + n;
1064 1160
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1161 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1066 1162
1067 if (n > 0) 1163 if (r > 0)
1068 { 1164 {
1069 cmdbuf_endp += n; 1165 cmdbuf_endp += r;
1070 return true; 1166 return true;
1071 } 1167 }
1072 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1168 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1169 {
1170#if LINUX_YIELD_HACK
1171 if (display->is_local)
1172 event_handler.yield_ev.start ();
1173#endif
1174 }
1175 else
1073 { 1176 {
1074 pty_ev.stop (); 1177 pty_ev.stop ();
1075 1178
1076 if (!(options & Opt_hold)) 1179 if (!option (Opt_hold))
1077 destroy (); 1180 destroy ();
1078 } 1181 }
1079 1182
1080 return false; 1183 return false;
1081} 1184}
1082 1185
1083void 1186void
1084rxvt_term::pty_cb (io_watcher &w, short revents) 1187rxvt_term::pty_cb (ev::io &w, int revents)
1085{ 1188{
1086 SET_R (this); 1189 make_current ();
1087 SET_LOCALE (locale);
1088 1190
1089 if (revents & EVENT_READ) 1191 if (revents & ev::READ)
1090 // loop, but don't allow a single term to monopolize us 1192 // loop, but don't allow a single term to monopolize us
1091 while (pty_fill ()) 1193 while (pty_fill ())
1092 if (cmd_parse ()) 1194 if (cmd_parse ())
1093 break; 1195 break;
1094 1196
1095 if (revents & EVENT_WRITE) 1197 if (revents & ev::WRITE)
1096 pty_write (); 1198 pty_write ();
1199
1200 refresh_check ();
1097} 1201}
1098 1202
1099void 1203void
1100rxvt_term::pointer_unblank () 1204rxvt_term::pointer_unblank ()
1101{ 1205{
1102 XDefineCursor (display->display, vt, TermWin_cursor); 1206 XDefineCursor (dpy, vt, TermWin_cursor);
1103 recolour_cursor (); 1207 recolour_cursor ();
1104 1208
1105#ifdef POINTER_BLANK 1209#ifdef POINTER_BLANK
1106 hidden_pointer = 0; 1210 hidden_pointer = 0;
1107 1211
1108 if (options & Opt_pointerBlank) 1212 if (option (Opt_pointerBlank))
1109 pointer_ev.start (NOW + pointerBlankDelay); 1213 pointer_ev.start (pointerBlankDelay);
1110#endif 1214#endif
1111} 1215}
1112 1216
1113#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1114void 1218void
1115rxvt_term::pointer_blank () 1219rxvt_term::pointer_blank ()
1116{ 1220{
1117 if (! (options & Opt_pointerBlank)) 1221 if (!option (Opt_pointerBlank))
1118 return; 1222 return;
1119 1223
1120 XDefineCursor (display->display, vt, display->blank_cursor); 1224 XDefineCursor (dpy, vt, display->blank_cursor);
1121 XFlush (display->display); 1225 XFlush (dpy);
1122 1226
1123 hidden_pointer = 1; 1227 hidden_pointer = 1;
1124} 1228}
1125 1229
1126void 1230void
1127rxvt_term::pointer_cb (time_watcher &w) 1231rxvt_term::pointer_cb (ev::timer &w, int revents)
1128{ 1232{
1129 SET_R (this); 1233 make_current ();
1130 SET_LOCALE (locale);
1131 1234
1132 pointer_blank (); 1235 pointer_blank ();
1133} 1236}
1134#endif 1237#endif
1135 1238
1136void 1239void
1137rxvt_term::mouse_report (XButtonEvent &ev) 1240rxvt_term::mouse_report (XButtonEvent &ev)
1138{ 1241{
1139 int button_number, key_state = 0; 1242 int button_number, key_state = 0;
1140 int x, y; 1243 int x, y;
1244 int code = 32;
1141 1245
1142 x = ev.x; 1246 x = Pixel2Col (ev.x);
1143 y = ev.y; 1247 y = Pixel2Row (ev.y);
1144 pixel_position (&x, &y); 1248 if (ev.type == MotionNotify)
1249 {
1250 if (x == mouse_row && y == mouse_col)
1251 return;
1252 mouse_row = x;
1253 mouse_col = y;
1254 code += 32;
1255 }
1145 1256
1146 if (MEvent.button == AnyButton) 1257 if (MEvent.button == AnyButton)
1147 button_number = 3; 1258 button_number = 3;
1148 else 1259 else
1149 { 1260 {
… …
1195 x + 1, 1306 x + 1,
1196 y + 1); 1307 y + 1);
1197#endif 1308#endif
1198 1309
1199 tt_printf ("\033[M%c%c%c", 1310 tt_printf ("\033[M%c%c%c",
1200 (32 + button_number + key_state), 1311 (code + button_number + key_state),
1201 (32 + x + 1), 1312 (32 + x + 1),
1202 (32 + y + 1)); 1313 (32 + y + 1));
1203} 1314}
1204
1205#ifdef USING_W11LIB
1206void
1207rxvt_W11_process_x_event (XEvent *ev)
1208{
1209 rxvt_t *r = rxvt_get_r ();
1210
1211 x_cb (*ev);
1212}
1213#endif
1214 1315
1215/*{{{ process an X event */ 1316/*{{{ process an X event */
1216void 1317void
1217rxvt_term::x_cb (XEvent &ev) 1318rxvt_term::x_cb (XEvent &ev)
1218{ 1319{
1219 dDisp; 1320 make_current ();
1220 1321
1221 SET_R (this); 1322 dLocal (Display *, dpy);
1222 SET_LOCALE (locale);
1223 1323
1224#if defined(CURSOR_BLINK) 1324 if (ev.xany.window == vt
1225 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1325 && SHOULD_INVOKE (HOOK_X_EVENT)
1226 { 1326 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1227 if (hidden_cursor) 1327 return;
1228 {
1229 hidden_cursor = 0;
1230 want_refresh = 1;
1231 }
1232 1328
1233 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1329 // for XQueryPointer
1234 }
1235#endif
1236
1237#if defined(POINTER_BLANK)
1238 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1239 {
1240 if (ev.type == MotionNotify
1241 || ev.type == ButtonPress
1242 || ev.type == ButtonRelease)
1243 if (hidden_pointer)
1244 pointer_unblank ();
1245
1246 if (ev.type == KeyPress && hidden_pointer == 0)
1247 pointer_blank ();
1248 }
1249#endif
1250
1251 Window unused_root, unused_child; 1330 Window unused_root, unused_child;
1252 int unused_root_x, unused_root_y; 1331 int unused_root_x, unused_root_y;
1253 unsigned int unused_mask; 1332 unsigned int unused_mask;
1254 1333
1255 switch (ev.type) 1334 switch (ev.type)
1256 { 1335 {
1257 case KeyPress: 1336 case KeyPress:
1258#if ISO_14755 1337 key_press (ev.xkey);
1259 if (!(iso14755buf & ISO_14755_52))
1260#endif
1261 lookup_key (ev.xkey);
1262
1263 break; 1338 break;
1264 1339
1265 case KeyRelease: 1340 case KeyRelease:
1266 { 1341 key_release (ev.xkey);
1267#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1268 KeySym ks;
1269
1270 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1271#endif
1272
1273#if ENABLE_FRILLS || ISO_14755
1274 // ISO 14755 support
1275 if (iso14755buf)
1276 if (iso14755buf & ISO_14755_52)
1277 {
1278# if ENABLE_OVERLAY
1279 scr_overlay_off ();
1280# endif
1281# if ISO_14755
1282 // iso14755 part 5.2 handling: release time
1283 // first: controls
1284 if ((ev.xkey.state & ControlMask)
1285 && ((ks >= 0x40 && ks <= 0x5f)
1286 || (ks >= 0x61 && ks <= 0x7f)))
1287 {
1288 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1289 commit_iso14755 ();
1290 return; // case-break;
1291 }
1292
1293 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1294 if (i[0] == ks)
1295 {
1296 iso14755buf = ISO_14755_51 | i[1];
1297 commit_iso14755 ();
1298 return; // case-break;
1299 }
1300
1301 scr_bell ();
1302# endif
1303 iso14755buf = 0;
1304 break;
1305 }
1306 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1307 {
1308# if ENABLE_OVERLAY
1309 scr_overlay_off ();
1310# endif
1311 if (iso14755buf & ISO_14755_51)
1312 commit_iso14755 ();
1313#if ISO_14755
1314 else if (iso14755buf & ISO_14755_STARTED)
1315 {
1316 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1317
1318 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1319 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1320 }
1321# endif
1322 else
1323 iso14755buf = 0;
1324 }
1325#endif
1326
1327#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1328 if (!(ev.xkey.state & ControlMask))
1329 slip_wheel_ev.stop ();
1330 else if (ks == XK_Control_L || ks == XK_Control_R)
1331 mouse_slip_wheel_speed = 0;
1332#endif
1333 break; 1342 break;
1334 }
1335 1343
1336 case ButtonPress: 1344 case ButtonPress:
1337 button_press (ev.xbutton); 1345 button_press (ev.xbutton);
1338 break; 1346 break;
1339 1347
… …
1341 button_release (ev.xbutton); 1349 button_release (ev.xbutton);
1342 break; 1350 break;
1343 1351
1344 case ClientMessage: 1352 case ClientMessage:
1345 if (ev.xclient.format == 32 1353 if (ev.xclient.format == 32
1346 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1354 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1347 { 1355 {
1356 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1357 {
1358 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1359 {
1348 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1360 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1361 {
1362 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1349 destroy (); 1363 destroy ();
1364 }
1350#if ENABLE_EWMH 1365#if ENABLE_EWMH
1351 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1366 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1352 XSendEvent (disp, ev.xclient.window = display->root, 1367 XSendEvent (dpy, ev.xclient.window = display->root,
1353 False, SubstructureRedirectMask | SubstructureNotifyMask, 1368 False, SubstructureRedirectMask | SubstructureNotifyMask,
1354 &ev); 1369 &ev);
1370#endif
1371 }
1372 }
1373#if ENABLE_XEMBED
1374 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1375 {
1376 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1377 focus_in ();
1378 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1379 focus_out ();
1380 }
1355#endif 1381#endif
1356 } 1382 }
1357#if ENABLE_XEMBED
1358 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1359 {
1360 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1361 focus_in ();
1362 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1363 focus_out ();
1364 }
1365#endif
1366#ifdef OFFIX_DND
1367 /* OffiX Dnd (drag 'n' drop) protocol */
1368 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1369 && (ev.xclient.data.l[0] == DndFile
1370 || ev.xclient.data.l[0] == DndDir
1371 || ev.xclient.data.l[0] == DndLink))
1372 {
1373 /* Get Dnd data */
1374 Atom ActualType;
1375 int ActualFormat;
1376 unsigned char *data;
1377 unsigned long Size, RemainingBytes;
1378
1379 XGetWindowProperty (disp, display->root,
1380 xa[XA_DNDSELECTION],
1381 0L, 1000000L,
1382 False, AnyPropertyType,
1383 &ActualType, &ActualFormat,
1384 &Size, &RemainingBytes,
1385 &data);
1386 set_string_property (XA_CUT_BUFFER0, data);
1387 XFree (data);
1388 selection_paste (display->root, XA_CUT_BUFFER0, true);
1389 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1390 }
1391#endif /* OFFIX_DND */
1392 break;
1393
1394 case MappingNotify:
1395 XRefreshKeyboardMapping (&ev.xmapping);
1396 break; 1383 break;
1397 1384
1398 /* 1385 /*
1399 * XXX: this is not the _current_ arrangement 1386 * XXX: this is not the _current_ arrangement
1400 * Here's my conclusion: 1387 * Here's my conclusion:
… …
1419 break; 1406 break;
1420 } 1407 }
1421 break; 1408 break;
1422 1409
1423 case FocusIn: 1410 case FocusIn:
1411 if (ev.xfocus.detail != NotifyInferior
1412 && ev.xfocus.detail != NotifyPointer
1413 && ev.xfocus.mode != NotifyGrab)
1424 focus_in (); 1414 focus_in ();
1425 break; 1415 break;
1426 1416
1427 case FocusOut: 1417 case FocusOut:
1418 if (ev.xfocus.detail != NotifyInferior
1419 && ev.xfocus.detail != NotifyPointer
1420 && ev.xfocus.mode != NotifyGrab)
1428 focus_out (); 1421 focus_out ();
1429 break; 1422 break;
1430 1423
1431 case ConfigureNotify: 1424 case ConfigureNotify:
1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427 szHint.width, szHint.height);*/
1432 if (ev.xconfigure.window == parent[0]) 1428 if (ev.xconfigure.window == parent[0])
1433 { 1429 {
1434 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1435 ; 1431 ;
1436 1432
1437 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1438 { 1434 {
1439 seen_resize = 1; 1435 seen_resize = 1;
1440 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1441 } 1437 }
1442 1438 else
1443#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1439 {
1444 if (options & Opt_transparent) 1440#ifdef HAVE_BG_PIXMAP
1445 check_our_parents (); 1441 if (bgPixmap.window_position_sensitive ())
1442 {
1443 if (mapped)
1444 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1446#endif 1448#endif
1449 }
1450
1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1447 } 1452 }
1448 break; 1453 break;
1449 1454
1450 case PropertyNotify: 1455 case PropertyNotify:
1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1451 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1452 && ev.xproperty.state == PropertyNewValue) 1458 && ev.xproperty.state == PropertyNewValue)
1453 selection_property (ev.xproperty.window, ev.xproperty.atom); 1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1454 1460
1455 break; 1461 break;
1456 1462
1457 case SelectionClear: 1463 case SelectionClear:
1458 selection_clear (); 1464 selection_clear ();
… …
1463 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1464 break; 1470 break;
1465 1471
1466 case SelectionRequest: 1472 case SelectionRequest:
1467 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1474 break;
1475
1476 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a
1479 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does
1482 * reparenting.
1483 * We should not render background immidiately, as there could be several
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1485 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results.
1489 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1491 update_background_ev.start (0.025);
1492#endif
1493 mapped = 1;
1494#ifdef TEXT_BLINK
1495 text_blink_ev.start ();
1496#endif
1497 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1468 break; 1498 break;
1469 1499
1470 case UnmapNotify: 1500 case UnmapNotify:
1471 mapped = 0; 1501 mapped = 0;
1472#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1473 text_blink_ev.stop (); 1503 text_blink_ev.stop ();
1474#endif 1504#endif
1505 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1475 break; 1506 break;
1476
1477 case MapNotify:
1478 mapped = 1;
1479#ifdef TEXT_BLINK
1480 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1481#endif
1482 break;
1483
1484#ifdef TRANSPARENT
1485 case ReparentNotify:
1486 rootwin_cb (ev);
1487 break;
1488#endif /* TRANSPARENT */
1489 1507
1490 case GraphicsExpose: 1508 case GraphicsExpose:
1491 case Expose: 1509 case Expose:
1492 if (ev.xany.window == vt) 1510 if (ev.xany.window == vt)
1493 { 1511 {
1494 do 1512 do
1513 {
1495 scr_expose (ev.xexpose.x, ev.xexpose.y, 1514 scr_expose (ev.xexpose.x, ev.xexpose.y,
1496 ev.xexpose.width, ev.xexpose.height, False); 1515 ev.xexpose.width, ev.xexpose.height, False);
1516 }
1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1498 1518
1499 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1500 1520
1501 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 {
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1525 }
1504 1526
1505 scr_refresh (refresh_type); 1527 want_refresh = 1;
1506 } 1528 }
1507 else 1529 else
1508 { 1530 {
1509 XEvent unused_event; 1531 XEvent unused_event;
1510 1532
1511 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1533 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1512 ; 1534 ;
1513 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1514 ; 1536 ;
1515 1537
1516 if (isScrollbarWindow (ev.xany.window)) 1538 if (scrollBar.state && ev.xany.window == scrollBar.win)
1517 { 1539 {
1518 scrollBar.setIdle (); 1540 scrollBar.state = STATE_IDLE;
1519 scrollbar_show (0); 1541 scrollBar.show (0);
1520 } 1542 }
1521#ifdef MENUBAR
1522 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1523 menubar_expose ();
1524#endif
1525
1526#ifdef TRANSPARENT
1527 if (am_transparent && ev.xany.window == parent[0])
1528 XClearWindow (disp, ev.xany.window);
1529#endif
1530 } 1543 }
1531 break; 1544 break;
1532 1545
1533 case MotionNotify: 1546 case MotionNotify:
1534#ifdef POINTER_BLANK 1547#ifdef POINTER_BLANK
1535 if (hidden_pointer) 1548 if (hidden_pointer)
1536 pointer_unblank (); 1549 pointer_unblank ();
1537#endif 1550#endif
1538#if MENUBAR 1551 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1539 if (isMenuBarWindow (ev.xany.window)) 1552 || priv_modes & PrivMode_MouseAnyEvent)
1540 {
1541 menubar_control (ev.xbutton); 1553 mouse_report (ev.xbutton);
1542 break;
1543 }
1544#endif
1545 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1554 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1546 break; 1555 break;
1547 1556
1548 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1549 { 1558 {
1559 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1560 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1561 ; // nop
1550 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1562 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1551 { 1563 {
1552 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1564 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1553 ; 1565 ;
1554 1566
1555 XQueryPointer (disp, vt, 1567 XQueryPointer (dpy, vt,
1556 &unused_root, &unused_child, 1568 &unused_root, &unused_child,
1557 &unused_root_x, &unused_root_y, 1569 &unused_root_x, &unused_root_y,
1558 &ev.xbutton.x, &ev.xbutton.y, 1570 &ev.xbutton.x, &ev.xbutton.y,
1559 &ev.xbutton.state); 1571 &ev.xbutton.state);
1560#ifdef MOUSE_THRESHOLD 1572#ifdef MOUSE_THRESHOLD
… …
1580 int dist; 1592 int dist;
1581 1593
1582 /* don't clobber the current delay if we are 1594 /* don't clobber the current delay if we are
1583 * already in the middle of scrolling. 1595 * already in the middle of scrolling.
1584 */ 1596 */
1585 if (!sel_scroll_ev.active) 1597 if (!sel_scroll_ev.is_active ())
1586 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1598 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1587 1599
1588 /* save the event params so we can highlight 1600 /* save the event params so we can highlight
1589 * the selection in the pending-scroll loop 1601 * the selection in the pending-scroll loop
1590 */ 1602 */
1591 selection_save_x = ev.xbutton.x; 1603 selection_save_x = ev.xbutton.x;
… …
1613 else 1625 else
1614 { 1626 {
1615 /* we are within the text window, so we 1627 /* we are within the text window, so we
1616 * shouldn't be scrolling 1628 * shouldn't be scrolling
1617 */ 1629 */
1618 if (sel_scroll_ev.active)
1619 sel_scroll_ev.stop(); 1630 sel_scroll_ev.stop();
1620 } 1631 }
1621#endif 1632#endif
1622#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1623 } 1634 }
1624#endif 1635#endif
1625 } 1636 }
1626 } 1637 }
1627 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1628 { 1639 {
1629 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1630 MotionNotify, &ev)) 1641 MotionNotify, &ev))
1631 ; 1642 ;
1632 1643
1633 XQueryPointer (disp, scrollBar.win, 1644 XQueryPointer (dpy, scrollBar.win,
1634 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1635 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1636 &ev.xbutton.x, &ev.xbutton.y, 1647 &ev.xbutton.x, &ev.xbutton.y,
1637 &unused_mask); 1648 &unused_mask);
1638 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1639 scrollbar_size ()); 1650 scrollBar.size ());
1640 scr_refresh (refresh_type);
1641 refresh_limit = 0; 1651 want_refresh = 1;
1642 scrollbar_show (1); 1652 scrollBar.show (1);
1643 } 1653 }
1644 break; 1654 break;
1645 } 1655 }
1656
1657#if defined(CURSOR_BLINK)
1658 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1659 {
1660 if (hidden_cursor)
1661 {
1662 hidden_cursor = 0;
1663 want_refresh = 1;
1664 }
1665
1666 cursor_blink_ev.again ();
1667 }
1668#endif
1669
1670#if defined(POINTER_BLANK)
1671 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1672 {
1673 if (ev.type == MotionNotify
1674 || ev.type == ButtonPress
1675 || ev.type == ButtonRelease)
1676 if (hidden_pointer)
1677 pointer_unblank ();
1678
1679 if (ev.type == KeyPress && hidden_pointer == 0)
1680 pointer_blank ();
1681 }
1682#endif
1683
1684 refresh_check ();
1646} 1685}
1647 1686
1648void 1687void
1649rxvt_term::focus_in () 1688rxvt_term::focus_in ()
1650{ 1689{
1651 if (!focus) 1690 if (!focus)
1652 { 1691 {
1653 focus = 1; 1692 focus = 1;
1654 want_refresh = 1; 1693 want_refresh = 1;
1694
1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696
1655#if USE_XIM 1697#if USE_XIM
1656 if (Input_Context != NULL) 1698 if (Input_Context != NULL)
1657 { 1699 {
1658 IMSetStatusPosition (); 1700 IMSetPosition ();
1659 XSetICFocus (Input_Context); 1701 XSetICFocus (Input_Context);
1660 } 1702 }
1661#endif 1703#endif
1662#if CURSOR_BLINK 1704#if CURSOR_BLINK
1663 if (options & Opt_cursorBlink) 1705 if (option (Opt_cursorBlink))
1664 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1706 cursor_blink_ev.again ();
1665#endif 1707#endif
1666#if OFF_FOCUS_FADING 1708#if OFF_FOCUS_FADING
1667 if (rs[Rs_fade]) 1709 if (rs[Rs_fade])
1668 { 1710 {
1669 pix_colors = pix_colors_focused; 1711 pix_colors = pix_colors_focused;
1670 scr_recolour (); 1712 scr_recolour ();
1671 } 1713 }
1672#endif 1714#endif
1715#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell))
1717 {
1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1719 {
1720 h->flags &= ~XUrgencyHint;
1721 XSetWMHints (dpy, parent[0], h);
1722 }
1723 }
1724#endif
1673 } 1725 }
1674} 1726}
1675 1727
1676void 1728void
1677rxvt_term::focus_out () 1729rxvt_term::focus_out ()
… …
1679 if (focus) 1731 if (focus)
1680 { 1732 {
1681 focus = 0; 1733 focus = 0;
1682 want_refresh = 1; 1734 want_refresh = 1;
1683 1735
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1737
1684#if ENABLE_FRILLS || ISO_14755 1738#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf)
1740 {
1685 iso14755buf = 0; 1741 iso14755buf = 0;
1686#endif 1742# if ISO_14755
1687#if ENABLE_OVERLAY
1688 scr_overlay_off (); 1743 scr_overlay_off ();
1744# endif
1745 }
1689#endif 1746#endif
1690#if USE_XIM 1747#if USE_XIM
1691 if (Input_Context != NULL) 1748 if (Input_Context != NULL)
1692 XUnsetICFocus (Input_Context); 1749 XUnsetICFocus (Input_Context);
1693#endif 1750#endif
1694#if CURSOR_BLINK 1751#if CURSOR_BLINK
1695 if (options & Opt_cursorBlink) 1752 if (option (Opt_cursorBlink))
1696 cursor_blink_ev.stop (); 1753 cursor_blink_ev.stop ();
1754
1697 hidden_cursor = 0; 1755 hidden_cursor = 0;
1698#endif 1756#endif
1699#if OFF_FOCUS_FADING 1757#if OFF_FOCUS_FADING
1700 if (rs[Rs_fade]) 1758 if (rs[Rs_fade])
1701 { 1759 {
… …
1704 } 1762 }
1705#endif 1763#endif
1706 } 1764 }
1707} 1765}
1708 1766
1709#if TRANSPARENT 1767void
1768rxvt_term::update_fade_color (unsigned int idx)
1769{
1770#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade])
1772 {
1773 rgba c;
1774 pix_colors [Color_fade].get (c);
1775 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1776 }
1777#endif
1778}
1779
1780#if ENABLE_TRANSPARENCY || ENABLE_PERL
1710void 1781void
1711rxvt_term::rootwin_cb (XEvent &ev) 1782rxvt_term::rootwin_cb (XEvent &ev)
1712{ 1783{
1713 SET_R (this); 1784 make_current ();
1714 SET_LOCALE (locale);
1715 1785
1786 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1787 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1788 return;
1789
1790# if ENABLE_TRANSPARENCY
1716 switch (ev.type) 1791 switch (ev.type)
1717 { 1792 {
1718 case PropertyNotify: 1793 case PropertyNotify:
1719 /* 1794 /*
1720 * if user used some Esetroot compatible prog to set the root bg, 1795 * if user used some Esetroot compatible prog to set the root bg,
1721 * use the property to determine the pixmap. We use it later on. 1796 * use the property to determine the pixmap. We use it later on.
1722 */ 1797 */
1723 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1798 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1724 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1725 return; 1800 {
1801 bgPixmap.set_root_pixmap ();
1802 update_background ();
1803 }
1726 1804
1727 /* FALLTHROUGH */
1728 case ReparentNotify:
1729 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1730 want_refresh = want_full_refresh = 1;
1731 break; 1805 break;
1732 } 1806 }
1807# endif
1808
1809 refresh_check ();
1733} 1810}
1734#endif 1811#endif
1735 1812
1736void 1813void
1737rxvt_term::button_press (XButtonEvent &ev) 1814rxvt_term::button_press (XButtonEvent &ev)
1738{ 1815{
1739 int reportmode = 0, clickintime; 1816 int reportmode = 0, clickintime;
1740 1817
1741 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1818 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1819
1742 if (!bypass_keystate) 1820 if (!bypass_keystate)
1743 reportmode = !! (priv_modes & PrivMode_mouse_report); 1821 reportmode = !! (priv_modes & PrivMode_mouse_report);
1744 1822
1745 /* 1823 /*
1746 * VT window processing of button press 1824 * VT window processing of button press
1747 */ 1825 */
1748 if (ev.window == vt) 1826 if (ev.window == vt)
1749 { 1827 {
1828 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1750#if ISO_14755 1831#if ISO_14755
1751 // 5.4 1832 // 5.4
1752 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1833 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1753 { 1834 {
1754 iso14755_54 (ev.x, ev.y); 1835 iso14755_54 (ev.x, ev.y);
… …
1766#ifdef MOUSE_REPORT_DOUBLECLICK 1847#ifdef MOUSE_REPORT_DOUBLECLICK
1767 if (ev.button == MEvent.button && clickintime) 1848 if (ev.button == MEvent.button && clickintime)
1768 { 1849 {
1769 /* same button, within alloted time */ 1850 /* same button, within alloted time */
1770 MEvent.clicks++; 1851 MEvent.clicks++;
1852
1771 if (MEvent.clicks > 1) 1853 if (MEvent.clicks > 1)
1772 { 1854 {
1773 /* only report double clicks */ 1855 /* only report double clicks */
1774 MEvent.clicks = 2; 1856 MEvent.clicks = 2;
1775 mouse_report (ev); 1857 mouse_report (ev);
… …
1787 mouse_report (ev); 1869 mouse_report (ev);
1788 } 1870 }
1789#else 1871#else
1790 MEvent.button = ev.button; 1872 MEvent.button = ev.button;
1791 mouse_report (ev); 1873 mouse_report (ev);
1792#endif /* MOUSE_REPORT_DOUBLECLICK */ 1874#endif /* MOUSE_REPORT_DOUBLECLICK */
1793 1875
1794 } 1876 }
1795 else 1877 else
1796 { 1878 {
1797 if (ev.button != MEvent.button) 1879 if (ev.button != MEvent.button)
… …
1807#else 1889#else
1808 selection.rect = false; 1890 selection.rect = false;
1809#endif 1891#endif
1810 1892
1811 /* allow shift+left click to extend selection */ 1893 /* allow shift+left click to extend selection */
1812 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1894 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1813 { 1895 {
1814 if (MEvent.button == Button1 && clickintime) 1896 if (MEvent.button == Button1 && clickintime)
1815 selection_rotate (ev.x, ev.y); 1897 selection_rotate (ev.x, ev.y);
1816 else 1898 else
1817 selection_extend (ev.x, ev.y, 1); 1899 selection_extend (ev.x, ev.y, 1);
… …
1845 } 1927 }
1846 1928
1847 /* 1929 /*
1848 * Scrollbar window processing of button press 1930 * Scrollbar window processing of button press
1849 */ 1931 */
1850 if (isScrollbarWindow (ev.window)) 1932 if (scrollBar.state && ev.window == scrollBar.win)
1851 { 1933 {
1852 scrollBar.setIdle (); 1934 page_dirn direction = NO_DIR;
1935
1936 if (scrollBar.upButton (ev.y))
1937 direction = UP; /* up */
1938 else if (scrollBar.dnButton (ev.y))
1939 direction = DN; /* down */
1940
1941 scrollBar.state = STATE_IDLE;
1853 /* 1942 /*
1854 * Rxvt-style scrollbar: 1943 * Rxvt-style scrollbar:
1855 * move up if mouse is above slider 1944 * move up if mouse is above slider
1856 * move dn if mouse is below slider 1945 * move dn if mouse is below slider
1857 * 1946 *
… …
1866 /* 1955 /*
1867 * Mouse report disabled scrollbar: 1956 * Mouse report disabled scrollbar:
1868 * arrow buttons - send up/down 1957 * arrow buttons - send up/down
1869 * click on scrollbar - send pageup/down 1958 * click on scrollbar - send pageup/down
1870 */ 1959 */
1871 if ((scrollBar.style == R_SB_NEXT 1960 if (direction == UP)
1872 && scrollbarnext_upButton (ev.y))
1873 || (scrollBar.style == R_SB_RXVT
1874 && scrollbarrxvt_upButton (ev.y)))
1875 tt_printf ("\033[A"); 1961 tt_printf ("\033[A");
1876 else if ((scrollBar.style == R_SB_NEXT 1962 else if (direction == DN)
1877 && scrollbarnext_dnButton (ev.y))
1878 || (scrollBar.style == R_SB_RXVT
1879 && scrollbarrxvt_dnButton (ev.y)))
1880 tt_printf ("\033[B"); 1963 tt_printf ("\033[B");
1881 else 1964 else
1882 switch (ev.button) 1965 switch (ev.button)
1883 { 1966 {
1884 case Button2: 1967 case Button2:
… …
1891 tt_printf ("\033[5~"); 1974 tt_printf ("\033[5~");
1892 break; 1975 break;
1893 } 1976 }
1894 } 1977 }
1895 else 1978 else
1896#endif /* NO_SCROLLBAR_REPORT */ 1979#endif /* NO_SCROLLBAR_REPORT */
1897
1898 {
1899 char upordown = 0;
1900
1901 if (scrollBar.style == R_SB_NEXT)
1902 { 1980 {
1903 if (scrollbarnext_upButton (ev.y)) 1981 if (direction != NO_DIR)
1904 upordown = -1; /* up */
1905 else if (scrollbarnext_dnButton (ev.y))
1906 upordown = 1; /* down */
1907 }
1908 else if (scrollBar.style == R_SB_RXVT)
1909 {
1910 if (scrollbarrxvt_upButton (ev.y))
1911 upordown = -1; /* up */
1912 else if (scrollbarrxvt_dnButton (ev.y))
1913 upordown = 1; /* down */
1914 }
1915 if (upordown)
1916 { 1982 {
1917#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1983#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1984 if (!cont_scroll_ev.is_active ())
1918 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1985 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1919#endif 1986#endif
1920 if (scr_page (upordown < 0 ? UP : DN, 1)) 1987 if (scr_page (direction, 1))
1921 { 1988 {
1922 if (upordown < 0) 1989 if (direction == UP)
1923 scrollBar.setUp (); 1990 scrollBar.state = STATE_UP;
1924 else 1991 else
1925 scrollBar.setDn (); 1992 scrollBar.state = STATE_DOWN;
1926 } 1993 }
1927 } 1994 }
1928 else 1995 else
1929 switch (ev.button) 1996 switch (ev.button)
1930 { 1997 {
1931 case Button2: 1998 case Button2:
1932 switch (scrollbar_align) 1999 switch (scrollBar.align)
1933 { 2000 {
1934 case R_SB_ALIGN_TOP: 2001 case R_SB_ALIGN_TOP:
1935 csrO = 0; 2002 csrO = 0;
1936 break; 2003 break;
1937 case R_SB_ALIGN_CENTRE: 2004 case R_SB_ALIGN_CENTRE:
… …
1943 } 2010 }
1944 2011
1945 if (scrollBar.style == R_SB_XTERM 2012 if (scrollBar.style == R_SB_XTERM
1946 || scrollbar_above_slider (ev.y) 2013 || scrollbar_above_slider (ev.y)
1947 || scrollbar_below_slider (ev.y)) 2014 || scrollbar_below_slider (ev.y))
1948 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
1949 2016
1950 scrollBar.setMotion (); 2017 scrollBar.state = STATE_MOTION;
1951 break; 2018 break;
1952 2019
1953 case Button1: 2020 case Button1:
1954 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2021 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1955 csrO = ev.y - scrollBar.top; 2022 csrO = ev.y - scrollBar.top;
1956 /* FALLTHROUGH */ 2023 /* FALLTHROUGH */
1957 2024
1958 case Button3: 2025 case Button3:
1959 if (scrollBar.style != R_SB_XTERM) 2026 if (scrollBar.style != R_SB_XTERM)
… …
1969 scr_page (DN, nrow - 1); 2036 scr_page (DN, nrow - 1);
1970# else 2037# else
1971 scr_page (DN, nrow / 4); 2038 scr_page (DN, nrow / 4);
1972# endif 2039# endif
1973 else 2040 else
1974 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
1975 } 2042 }
1976 else 2043 else
1977 { 2044 {
1978 scr_page ((ev.button == Button1 ? DN : UP), 2045 scr_page ((ev.button == Button1 ? DN : UP),
1979 (nrow 2046 (nrow
1980 * scrollbar_position (ev.y) 2047 * scrollbar_position (ev.y)
1981 / scrollbar_size ())); 2048 / scrollBar.size ()));
1982 } 2049 }
1983 2050
1984 break; 2051 break;
1985 } 2052 }
1986 } 2053 }
2054
1987 return; 2055 return;
1988 } 2056 }
1989#if MENUBAR
1990 /*
1991 * Menubar window processing of button press
1992 */
1993 if (isMenuBarWindow (ev.window))
1994 menubar_control (ev);
1995#endif
1996} 2057}
1997 2058
1998void 2059void
1999rxvt_term::button_release (XButtonEvent &ev) 2060rxvt_term::button_release (XButtonEvent &ev)
2000{ 2061{
… …
2002 2063
2003 csrO = 0; /* reset csr Offset */ 2064 csrO = 0; /* reset csr Offset */
2004 if (!bypass_keystate) 2065 if (!bypass_keystate)
2005 reportmode = !! (priv_modes & PrivMode_mouse_report); 2066 reportmode = !! (priv_modes & PrivMode_mouse_report);
2006 2067
2007 if (scrollbar_isUpDn ()) 2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2008 { 2069 {
2009 scrollBar.setIdle (); 2070 scrollBar.state = STATE_IDLE;
2010 scrollbar_show (0); 2071 scrollBar.show (0);
2011#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2012 refresh_type &= ~SMOOTH_REFRESH;
2013#endif
2014 } 2072 }
2015 2073
2016#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
2017 if (sel_scroll_ev.active)
2018 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2019#endif 2076#endif
2020 2077
2021 if (ev.window == vt) 2078 if (ev.window == vt)
2022 { 2079 {
2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2081 return;
2082
2023#if ISO_14755 2083#if ISO_14755
2024 // 5.4 2084 // 5.4
2025 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2026 return; 2086 return;
2027#endif 2087#endif
2088
2028 if (reportmode) 2089 if (reportmode)
2029 { 2090 {
2030 /* mouse report from vt window */ 2091 /* mouse report from vt window */
2031 /* don't report release of wheel "buttons" */ 2092 /* don't report release of wheel "buttons" */
2032 if (ev.button >= 4) 2093 if (ev.button >= 4)
… …
2043 mouse_report (ev); 2104 mouse_report (ev);
2044 } 2105 }
2045#else /* MOUSE_REPORT_DOUBLECLICK */ 2106#else /* MOUSE_REPORT_DOUBLECLICK */
2046 MEvent.button = AnyButton; 2107 MEvent.button = AnyButton;
2047 mouse_report (ev); 2108 mouse_report (ev);
2048#endif /* MOUSE_REPORT_DOUBLECLICK */ 2109#endif /* MOUSE_REPORT_DOUBLECLICK */
2049 return; 2110 return;
2050 } 2111 }
2051 2112
2052 /* 2113 /*
2053 * dumb hack to compensate for the failure of click-and-drag 2114 * dumb hack to compensate for the failure of click-and-drag
… …
2062 { 2123 {
2063 case Button1: 2124 case Button1:
2064 case Button3: 2125 case Button3:
2065 selection_make (ev.time); 2126 selection_make (ev.time);
2066 break; 2127 break;
2128
2067 case Button2: 2129 case Button2:
2068 selection_request (ev.time, ev.x, ev.y); 2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2069 break; 2132 break;
2133
2070#ifdef MOUSE_WHEEL 2134#ifdef MOUSE_WHEEL
2071 case Button4: 2135 case Button4:
2072 case Button5: 2136 case Button5:
2073 { 2137 {
2074 int i; 2138 int i;
… …
2076 2140
2077 v = ev.button == Button4 ? UP : DN; 2141 v = ev.button == Button4 ? UP : DN;
2078 2142
2079 if (ev.state & ShiftMask) 2143 if (ev.state & ShiftMask)
2080 i = 1; 2144 i = 1;
2081 else if (options & Opt_mouseWheelScrollPage) 2145 else if (option (Opt_mouseWheelScrollPage))
2082 i = nrow - 1; 2146 i = nrow - 1;
2083 else 2147 else
2084 i = 5; 2148 i = 5;
2085 2149
2086# ifdef MOUSE_SLIP_WHEELING 2150# ifdef MOUSE_SLIP_WHEELING
… …
2088 { 2152 {
2089 mouse_slip_wheel_speed += v ? -1 : 1; 2153 mouse_slip_wheel_speed += v ? -1 : 1;
2090 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2091 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2092 2156
2093 if (slip_wheel_ev.at < NOW) 2157 if (!slip_wheel_ev.is_active ())
2094 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2158 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2095
2096 slip_wheel_ev.start ();
2097 } 2159 }
2098 else 2160 else
2161# endif
2099 { 2162 {
2100# endif
2101# ifdef JUMP_MOUSE_WHEEL
2102 scr_page (v, i); 2163 scr_page (v, i);
2103 scr_refresh (SMOOTH_REFRESH);
2104 scrollbar_show (1); 2164 scrollBar.show (1);
2105# else
2106 while (i--)
2107 {
2108 scr_page (v, 1);
2109 scr_refresh (SMOOTH_REFRESH);
2110 scrollbar_show (1);
2111 }
2112# endif
2113# ifdef MOUSE_SLIP_WHEELING
2114 } 2165 }
2115#endif
2116 } 2166 }
2117 break; 2167 break;
2118#endif 2168#endif
2119 } 2169 }
2120 } 2170 }
2121#ifdef MENUBAR
2122 else if (isMenuBarWindow (ev.window))
2123 menubar_control (ev);
2124#endif
2125} 2171}
2126
2127#ifdef TRANSPARENT
2128#if TINTING
2129/* taken from aterm-0.4.2 */
2130
2131typedef uint32_t RUINT32T;
2132
2133void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2134{
2135 int sh_r, sh_g, sh_b;
2136 RUINT32T mask_r, mask_g, mask_b;
2137 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2138 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2139 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2140 int i;
2141
2142 Visual *visual = display->visual;
2143
2144 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2145
2146 /* for convenience */
2147 mask_r = visual->red_mask;
2148 mask_g = visual->green_mask;
2149 mask_b = visual->blue_mask;
2150
2151 /* boring lookup table pre-initialization */
2152 switch (srcImage->bits_per_pixel) {
2153 case 15:
2154 if ((mask_r != 0x7c00) ||
2155 (mask_g != 0x03e0) ||
2156 (mask_b != 0x001f))
2157 return;
2158 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2159 lookup_r = lookup;
2160 lookup_g = lookup+32;
2161 lookup_b = lookup+32+32;
2162 sh_r = 10;
2163 sh_g = 5;
2164 sh_b = 0;
2165 break;
2166 case 16:
2167 if ((mask_r != 0xf800) ||
2168 (mask_g != 0x07e0) ||
2169 (mask_b != 0x001f))
2170 return;
2171 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2172 lookup_r = lookup;
2173 lookup_g = lookup+32;
2174 lookup_b = lookup+32+64;
2175 sh_r = 11;
2176 sh_g = 5;
2177 sh_b = 0;
2178 break;
2179 case 24:
2180 if ((mask_r != 0xff0000) ||
2181 (mask_g != 0x00ff00) ||
2182 (mask_b != 0x0000ff))
2183 return;
2184 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2185 lookup_r = lookup;
2186 lookup_g = lookup+256;
2187 lookup_b = lookup+256+256;
2188 sh_r = 16;
2189 sh_g = 8;
2190 sh_b = 0;
2191 break;
2192 case 32:
2193 if ((mask_r != 0xff0000) ||
2194 (mask_g != 0x00ff00) ||
2195 (mask_b != 0x0000ff))
2196 return;
2197 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2198 lookup_r = lookup;
2199 lookup_g = lookup+256;
2200 lookup_b = lookup+256+256;
2201 sh_r = 16;
2202 sh_g = 8;
2203 sh_b = 0;
2204 break;
2205 default:
2206 return; /* we do not support this color depth */
2207 }
2208
2209 /* prepare limits for color transformation (each channel is handled separately) */
2210 if (shade < 0) {
2211 shade = -shade;
2212 if (shade < 0) shade = 0;
2213 if (shade > 100) shade = 100;
2214
2215 lower_lim_r = 65535-rm;
2216 lower_lim_g = 65535-gm;
2217 lower_lim_b = 65535-bm;
2218
2219 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2220 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2221 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2222
2223 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2224 } else {
2225 if (shade < 0) shade = 0;
2226 if (shade > 100) shade = 100;
2227
2228 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2229
2230 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2231 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2232 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2233 }
2234
2235 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2236 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2237 {
2238 unsigned int tmp;
2239
2240 tmp = lower_lim_r;
2241 lower_lim_r = lower_lim_b;
2242 lower_lim_b = tmp;
2243
2244 tmp = upper_lim_r;
2245 upper_lim_r = upper_lim_b;
2246 upper_lim_b = tmp;
2247 }
2248
2249 /* fill our lookup tables */
2250 for (i = 0; i <= mask_r>>sh_r; i++)
2251 {
2252 RUINT32T tmp;
2253 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2254 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2255 lookup_r[i] = (tmp/65535)<<sh_r;
2256 }
2257 for (i = 0; i <= mask_g>>sh_g; i++)
2258 {
2259 RUINT32T tmp;
2260 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2261 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2262 lookup_g[i] = (tmp/65535)<<sh_g;
2263 }
2264 for (i = 0; i <= mask_b>>sh_b; i++)
2265 {
2266 RUINT32T tmp;
2267 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2268 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2269 lookup_b[i] = (tmp/65535)<<sh_b;
2270 }
2271
2272 /* apply table to input image (replacing colors by newly calculated ones) */
2273 switch (srcImage->bits_per_pixel)
2274 {
2275 case 15:
2276 {
2277 unsigned short *p1, *pf, *p, *pl;
2278 p1 = (unsigned short *) srcImage->data;
2279 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2280 while (p1 < pf)
2281 {
2282 p = p1;
2283 pl = p1 + srcImage->width;
2284 for (; p < pl; p++)
2285 {
2286 *p = lookup_r[(*p & 0x7c00)>>10] |
2287 lookup_g[(*p & 0x03e0)>> 5] |
2288 lookup_b[(*p & 0x001f)];
2289 }
2290 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2291 }
2292 break;
2293 }
2294 case 16:
2295 {
2296 unsigned short *p1, *pf, *p, *pl;
2297 p1 = (unsigned short *) srcImage->data;
2298 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2299 while (p1 < pf)
2300 {
2301 p = p1;
2302 pl = p1 + srcImage->width;
2303 for (; p < pl; p++)
2304 {
2305 *p = lookup_r[(*p & 0xf800)>>11] |
2306 lookup_g[(*p & 0x07e0)>> 5] |
2307 lookup_b[(*p & 0x001f)];
2308 }
2309 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2310 }
2311 break;
2312 }
2313 case 24:
2314 {
2315 unsigned char *p1, *pf, *p, *pl;
2316 p1 = (unsigned char *) srcImage->data;
2317 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2318 while (p1 < pf)
2319 {
2320 p = p1;
2321 pl = p1 + srcImage->width * 3;
2322 for (; p < pl; p += 3)
2323 {
2324 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2325 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2326 p[2] = lookup_r[(p[2] & 0x0000ff)];
2327 }
2328 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2329 }
2330 break;
2331 }
2332 case 32:
2333 {
2334 RUINT32T *p1, *pf, *p, *pl;
2335 p1 = (RUINT32T *) srcImage->data;
2336 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2337
2338 while (p1 < pf)
2339 {
2340 p = p1;
2341 pl = p1 + srcImage->width;
2342 for (; p < pl; p++)
2343 {
2344 *p = lookup_r[(*p & 0xff0000)>>16] |
2345 lookup_g[(*p & 0x00ff00)>> 8] |
2346 lookup_b[(*p & 0x0000ff)] |
2347 (*p & ~0xffffff);
2348 }
2349 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2350 }
2351 break;
2352 }
2353 }
2354
2355 free (lookup);
2356}
2357#endif
2358
2359/*
2360 * Check our parents are still who we think they are.
2361 * Do transparency updates if required
2362 */
2363int
2364rxvt_term::check_our_parents ()
2365{
2366 int i, pchanged, aformat, have_pixmap, rootdepth;
2367 unsigned long nitems, bytes_after;
2368 Atom atype;
2369 unsigned char *prop = NULL;
2370 Window root, oldp, *list;
2371 Pixmap rootpixmap = None;
2372 XWindowAttributes wattr, wrootattr;
2373 dDisp;
2374
2375 pchanged = 0;
2376
2377 if (!(options & Opt_transparent))
2378 return pchanged; /* Don't try any more */
2379
2380 XGetWindowAttributes (disp, display->root, &wrootattr);
2381 rootdepth = wrootattr.depth;
2382
2383 XGetWindowAttributes (disp, parent[0], &wattr);
2384
2385 if (rootdepth != wattr.depth)
2386 {
2387 if (am_transparent)
2388 {
2389 pchanged = 1;
2390 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2391 am_transparent = am_pixmap_trans = 0;
2392 }
2393
2394 return pchanged; /* Don't try any more */
2395 }
2396
2397 /* Get all X ops out of the queue so that our information is up-to-date. */
2398 XSync (disp, False);
2399
2400 /*
2401 * Make the frame window set by the window manager have
2402 * the root background. Some window managers put multiple nested frame
2403 * windows for each client, so we have to take care about that.
2404 */
2405 i = (xa[XA_XROOTPMAP_ID]
2406 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2407 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2408 &nitems, &bytes_after, &prop) == Success);
2409
2410 if (!i || prop == NULL)
2411 i = (xa[XA_ESETROOT_PMAP_ID]
2412 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2413 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2414 &nitems, &bytes_after, &prop) == Success);
2415
2416 if (!i || prop == NULL
2417#if TINTING
2418 || !rs[Rs_color + Color_tint]
2419#endif
2420 )
2421 have_pixmap = 0;
2422 else
2423 {
2424 have_pixmap = 1;
2425 rootpixmap = *(Pixmap *)prop;
2426 XFree (prop);
2427 }
2428
2429 if (have_pixmap)
2430 {
2431 /*
2432 * Copy display->root pixmap transparency
2433 */
2434 int sx, sy, nx, ny;
2435 unsigned int nw, nh;
2436 Window cr;
2437 XImage *image;
2438 GC gc;
2439 XGCValues gcvalue;
2440
2441 XTranslateCoordinates (disp, parent[0], display->root,
2442 0, 0, &sx, &sy, &cr);
2443 nw = (unsigned int)szHint.width;
2444 nh = (unsigned int)szHint.height;
2445 nx = ny = 0;
2446
2447 if (sx < 0)
2448 {
2449 nw += sx;
2450 nx = -sx;
2451 sx = 0;
2452 }
2453
2454 if (sy < 0)
2455 {
2456 nh += sy;
2457 ny = -sy;
2458 sy = 0;
2459 }
2460
2461 min_it (nw, (unsigned int) (wrootattr.width - sx));
2462 min_it (nh, (unsigned int) (wrootattr.height - sy));
2463
2464 XSync (disp, False);
2465 allowedxerror = -1;
2466 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2467
2468 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2469 /* XXX: may need a delay here? */
2470 allowedxerror = 0;
2471
2472 if (image == NULL)
2473 {
2474 if (am_transparent && am_pixmap_trans)
2475 {
2476 pchanged = 1;
2477 if (pixmap != None)
2478 {
2479 XFreePixmap (disp, pixmap);
2480 pixmap = None;
2481 }
2482 }
2483
2484 am_pixmap_trans = 0;
2485 }
2486 else
2487 {
2488 if (pixmap != None)
2489 XFreePixmap (disp, pixmap);
2490
2491#if TINTING
2492 if (ISSET_PIXCOLOR (Color_tint))
2493 {
2494 unsigned short rm, gm, bm;
2495 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2496
2497 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2498
2499 ShadeXImage (display, image, shade, rm, gm, bm);
2500 }
2501#endif
2502
2503 pixmap = XCreatePixmap (disp, vt,
2504 szHint.width, szHint.height, image->depth);
2505 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2506 XPutImage (disp, pixmap, gc, image, 0, 0,
2507 nx, ny, image->width, image->height);
2508 XFreeGC (disp, gc);
2509 XDestroyImage (image);
2510 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2511 XClearWindow (disp, parent[0]);
2512
2513 if (!am_transparent || !am_pixmap_trans)
2514 pchanged = 1;
2515
2516 am_transparent = am_pixmap_trans = 1;
2517 }
2518 }
2519
2520 if (am_pixmap_trans)
2521 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2522 else
2523 {
2524 unsigned int n;
2525 /*
2526 * InheritPixmap transparency
2527 */
2528 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2529 {
2530 oldp = parent[i];
2531 XQueryTree (disp, parent[i - 1], &root,
2532 &parent[i], &list, &n);
2533 XFree (list);
2534
2535 if (parent[i] == display->root)
2536 {
2537 if (oldp != None)
2538 pchanged = 1;
2539
2540 break;
2541 }
2542
2543 if (oldp != parent[i])
2544 pchanged = 1;
2545 }
2546
2547 n = 0;
2548
2549 if (pchanged)
2550 {
2551 for (; n < (unsigned int)i; n++)
2552 {
2553 XGetWindowAttributes (disp, parent[n], &wattr);
2554 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2555 {
2556 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2557 break;
2558 }
2559 }
2560 }
2561
2562 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2563 {
2564 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2565 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2566 am_transparent = 0;
2567 /* XXX: also turn off Opt_transparent? */
2568 }
2569 else
2570 {
2571#if WAIT_FOR_WM
2572 /* wait (an arbitrary period) for the WM to do its thing
2573 * needed for fvwm2.2.2 (and before?) */
2574 sleep (1);
2575#endif
2576 for (n = 0; n < (unsigned int)i; n++)
2577 {
2578 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2579 XClearWindow (disp, parent[n]);
2580 }
2581
2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2583 am_transparent = 1;
2584 }
2585
2586 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2587 parent[i] = None;
2588 }
2589
2590 if (scrollBar.win)
2591 {
2592 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2593 scrollBar.setIdle ();
2594 scrollbar_show (0);
2595 }
2596
2597 if (am_transparent)
2598 {
2599 want_refresh = want_full_refresh = 1;
2600 if (am_pixmap_trans)
2601 flush ();
2602 }
2603
2604 return pchanged;
2605}
2606#endif
2607 2172
2608/*}}} */ 2173/*}}} */
2609 2174
2610bool 2175bool
2611rxvt_term::cmd_parse () 2176rxvt_term::cmd_parse ()
2612{ 2177{
2613 bool flag = false; 2178 bool flag = false;
2614 unicode_t ch = NOCHAR; 2179 wchar_t ch = NOCHAR;
2615 unsigned char *seq_begin; // remember start of esc-sequence here 2180 char *seq_begin; // remember start of esc-sequence here
2616 2181
2617 for (;;) 2182 for (;;)
2618 { 2183 {
2619 if (ch == NOCHAR) 2184 if (expect_false (ch == NOCHAR))
2620 { 2185 {
2621 seq_begin = cmdbuf_ptr; 2186 seq_begin = cmdbuf_ptr;
2622 ch = next_char (); 2187 ch = next_char ();
2623 }
2624 2188
2625 if (ch == NOCHAR) // TODO: improve 2189 if (ch == NOCHAR)
2626 break; 2190 break;
2191 }
2627 2192
2628 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2193 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2629 { 2194 {
2630 if (!seen_input) 2195 if (expect_false (!seen_input))
2631 { 2196 {
2632 seen_input = 1; 2197 seen_input = 1;
2633 // many badly-written programs (e.g. jed) contain a race condition: 2198 // many badly-written programs (e.g. jed) contain a race condition:
2634 // they first read the screensize and then install a SIGWINCH handler. 2199 // they first read the screensize and then install a SIGWINCH handler.
2635 // some window managers resize the window early, and these programs 2200 // some window managers resize the window early, and these programs
… …
2640 if (seen_resize && cmd_pid) 2205 if (seen_resize && cmd_pid)
2641 kill (-cmd_pid, SIGWINCH); 2206 kill (-cmd_pid, SIGWINCH);
2642 } 2207 }
2643 2208
2644 /* Read a text string from the input buffer */ 2209 /* Read a text string from the input buffer */
2645 unicode_t buf[UBUFSIZ]; 2210 wchar_t buf[UBUFSIZ];
2646 bool refreshnow = false; 2211 bool refreshnow = false;
2647 int nlines = 0; 2212 int nlines = 0;
2648 unicode_t *str = buf; 2213 wchar_t *str = buf;
2649 unicode_t *eol = str + min (ncol, UBUFSIZ); 2214 wchar_t *eol = str + min (ncol, UBUFSIZ);
2650 2215
2651 for (;;) 2216 for (;;)
2652 { 2217 {
2653 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2218 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2654 break; 2219 break;
2655 2220
2656 *str++ = ch; 2221 *str++ = ch;
2657 2222
2658 if (ch == C0_LF || str >= eol) 2223 if (expect_false (ch == C0_LF || str >= eol))
2659 { 2224 {
2660 if (ch == C0_LF) 2225 if (ch == C0_LF)
2661 nlines++; 2226 nlines++;
2662 2227
2663 refresh_count++; 2228 refresh_count++;
2664 2229
2665 if (!(options & Opt_jumpScroll) 2230 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2666 || (refresh_count >= refresh_limit * (nrow - 1)))
2667 { 2231 {
2232 refresh_count = 0;
2233
2234 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2235 {
2668 refreshnow = true; 2236 refreshnow = true;
2669 ch = NOCHAR; 2237 ch = NOCHAR;
2670 break; 2238 break;
2239 }
2671 } 2240 }
2672 2241
2673 // scr_add_lines only works for nlines <= nrow - 1. 2242 // scr_add_lines only works for nlines <= nrow - 1.
2674 if (nlines >= nrow - 1) 2243 if (nlines >= nrow - 1)
2675 { 2244 {
2245 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2246 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2676 scr_add_lines (buf, nlines, str - buf); 2247 scr_add_lines (buf, str - buf, nlines);
2248
2677 nlines = 0; 2249 nlines = 0;
2678 str = buf; 2250 str = buf;
2679 eol = str + min (ncol, UBUFSIZ); 2251 eol = str + min (ncol, UBUFSIZ);
2680 } 2252 }
2681 2253
… …
2694 2266
2695 seq_begin = cmdbuf_ptr; 2267 seq_begin = cmdbuf_ptr;
2696 ch = next_char (); 2268 ch = next_char ();
2697 } 2269 }
2698 2270
2271 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2272 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2699 scr_add_lines (buf, nlines, str - buf); 2273 scr_add_lines (buf, str - buf, nlines);
2700 2274
2701 /* 2275 /*
2702 * If there have been a lot of new lines, then update the screen 2276 * If there have been a lot of new lines, then update the screen
2703 * What the heck I'll cheat and only refresh less than every page-full. 2277 * What the heck we'll cheat and only refresh less than every page-full.
2704 * the number of pages between refreshes is refresh_limit, which 2278 * if skipScroll is enabled.
2705 * is incremented here because we must be doing flat-out scrolling.
2706 */ 2279 */
2707 if (refreshnow) 2280 if (refreshnow)
2708 { 2281 {
2709 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2710 refresh_limit++;
2711 else
2712 {
2713 flag = true; 2282 flag = true;
2714 scr_refresh (refresh_type); 2283 scr_refresh ();
2715 } 2284 want_refresh = 1;
2716 } 2285 }
2717 2286
2718 } 2287 }
2719 else 2288 else
2720 { 2289 {
… …
2734 } 2303 }
2735 2304
2736 return flag; 2305 return flag;
2737} 2306}
2738 2307
2739// read the next octet
2740unicode_t
2741rxvt_term::next_octet ()
2742{
2743 return cmdbuf_ptr < cmdbuf_endp
2744 ? *cmdbuf_ptr++
2745 : NOCHAR;
2746}
2747
2748// read the next character 2308// read the next character
2749unicode_t 2309wchar_t
2750rxvt_term::next_char () 2310rxvt_term::next_char () NOTHROW
2751{ 2311{
2752 while (cmdbuf_ptr < cmdbuf_endp) 2312 while (cmdbuf_ptr < cmdbuf_endp)
2753 { 2313 {
2754 // assume 7-bit to be ascii ALWAYS 2314 // assume 7-bit to be ascii ALWAYS
2755 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2315 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2756 return *cmdbuf_ptr++; 2316 return *cmdbuf_ptr++;
2757 2317
2758 wchar_t wc; 2318 wchar_t wc;
2759 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2760 2320
2761 if (len == (size_t)-2) 2321 if (len == (size_t)-2)
2762 { 2322 {
2763 // the mbstate stores incomplete sequences. didn't know this :/ 2323 // the mbstate stores incomplete sequences. didn't know this :/
2764 cmdbuf_ptr = cmdbuf_endp; 2324 cmdbuf_ptr = cmdbuf_endp;
2765 break; 2325 break;
2766 } 2326 }
2767 2327
2768 if (len == (size_t)-1) 2328 if (len == (size_t)-1)
2329 {
2330 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2769 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2331 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2332 }
2770 2333
2771 // assume wchar == unicode 2334 // assume wchar == unicode
2772 cmdbuf_ptr += len; 2335 cmdbuf_ptr += len;
2773 return wc & UNICODE_MASK; 2336 return wc & UNICODE_MASK;
2774 } 2337 }
2775 2338
2776 return NOCHAR; 2339 return NOCHAR;
2777} 2340}
2341
2342// read the next octet
2343uint32_t
2344rxvt_term::next_octet () NOTHROW
2345{
2346 return cmdbuf_ptr < cmdbuf_endp
2347 ? (unsigned char)*cmdbuf_ptr++
2348 : NOCHAR;
2349}
2350
2351static class out_of_input out_of_input;
2778 2352
2779/* rxvt_cmd_getc () - Return next input character */ 2353/* rxvt_cmd_getc () - Return next input character */
2780/* 2354/*
2781 * Return the next input character after first passing any keyboard input 2355 * Return the next input character after first passing any keyboard input
2782 * to the command. 2356 * to the command.
2783 */ 2357 */
2784unicode_t 2358wchar_t
2785rxvt_term::cmd_getc () 2359rxvt_term::cmd_getc () THROW ((class out_of_input))
2786{ 2360{
2787 unicode_t c = next_char (); 2361 wchar_t c = next_char ();
2788 2362
2789 if (c == NOCHAR) 2363 if (c == NOCHAR)
2790 throw out_of_input; 2364 throw out_of_input;
2791 2365
2792 return c; 2366 return c;
2793} 2367}
2794 2368
2795unicode_t 2369uint32_t
2796rxvt_term::cmd_get8 () 2370rxvt_term::cmd_get8 () THROW ((class out_of_input))
2797{ 2371{
2798 unicode_t c = next_octet (); 2372 uint32_t c = next_octet ();
2799 2373
2800 if (c == NOCHAR) 2374 if (c == NOCHAR)
2801 throw out_of_input; 2375 throw out_of_input;
2802 2376
2803 return c; 2377 return c;
… …
2807/*----------------------------------------------------------------------*/ 2381/*----------------------------------------------------------------------*/
2808#ifdef PRINTPIPE 2382#ifdef PRINTPIPE
2809FILE * 2383FILE *
2810rxvt_term::popen_printer () 2384rxvt_term::popen_printer ()
2811{ 2385{
2812 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2386 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2813 2387
2814 if (stream == NULL) 2388 if (stream == NULL)
2815 rxvt_warn ("can't open printer pipe, not printing.\n"); 2389 rxvt_warn ("can't open printer pipe, not printing.\n");
2816 2390
2817 return stream; 2391 return stream;
… …
2828 * simulate attached vt100 printer 2402 * simulate attached vt100 printer
2829 */ 2403 */
2830void 2404void
2831rxvt_term::process_print_pipe () 2405rxvt_term::process_print_pipe ()
2832{ 2406{
2833 int done; 2407 FILE *fd = popen_printer ();
2834 FILE *fd;
2835 2408
2836 if ((fd = popen_printer ()) == NULL) 2409 if (!fd)
2837 return; 2410 return;
2838 2411
2839 /* 2412 /*
2840 * Send all input to the printer until either ESC[4i or ESC[?4i 2413 * Send all input to the printer until either ESC[4i or ESC[?4i
2841 * is received. 2414 * is received.
2842 */ 2415 */
2843 for (done = 0; !done;) 2416 for (int done = 0; !done; )
2844 { 2417 {
2845 unsigned char buf[8]; 2418 unsigned char buf[8];
2846 unicode_t ch; 2419 unicode_t ch;
2847 unsigned int i, len; 2420 unsigned int i, len;
2848 2421
… …
2867 { 2440 {
2868 if ((buf[len++] = cmd_getc ()) == 'i') 2441 if ((buf[len++] = cmd_getc ()) == 'i')
2869 break; /* done = 1 */ 2442 break; /* done = 1 */
2870 } 2443 }
2871 } 2444 }
2872 2445
2873 for (i = 0; i < len; i++) 2446 for (i = 0; i < len; i++)
2874 if (putc (buf[i], fd) == EOF) 2447 if (putc (buf[i], fd) == EOF)
2875 { 2448 {
2876 done = 1; 2449 done = 1;
2877 break; 2450 break;
… …
2879 } 2452 }
2880 } 2453 }
2881 2454
2882 pclose_printer (fd); 2455 pclose_printer (fd);
2883} 2456}
2884#endif /* PRINTPIPE */ 2457#endif /* PRINTPIPE */
2885/*}}} */ 2458/*}}} */
2886 2459
2887/* *INDENT-OFF* */ 2460/* *INDENT-OFF* */
2888enum { 2461enum {
2889 C1_40 = 0x40, 2462 C1_40 = 0x40,
… …
2903 case C0_ESC: 2476 case C0_ESC:
2904 process_escape_seq (); 2477 process_escape_seq ();
2905 break; 2478 break;
2906 case C0_ENQ: /* terminal Status */ 2479 case C0_ENQ: /* terminal Status */
2907 if (rs[Rs_answerbackstring]) 2480 if (rs[Rs_answerbackstring])
2908 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2481 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2909 (unsigned int)strlen (rs[Rs_answerbackstring]));
2910 else 2482 else
2911 tt_write ((unsigned char *)VT100_ANS, 2483 tt_write (VT100_ANS, strlen (VT100_ANS));
2912 (unsigned int)strlen (VT100_ANS));
2913 break; 2484 break;
2914 case C0_BEL: /* bell */ 2485 case C0_BEL: /* bell */
2915 scr_bell (); 2486 scr_bell ();
2916 break; 2487 break;
2917 case C0_BS: /* backspace */ 2488 case C0_BS: /* backspace */
… …
2941 process_dcs_seq (); 2512 process_dcs_seq ();
2942 break; 2513 break;
2943 case 0x9b: /* CSI */ 2514 case 0x9b: /* CSI */
2944 process_csi_seq (); 2515 process_csi_seq ();
2945 break; 2516 break;
2946 case 0x9d: /* CSI */ 2517 case 0x9d: /* OSC */
2947 process_osc_seq (); 2518 process_osc_seq ();
2948 break; 2519 break;
2949#endif 2520#endif
2950 } 2521 }
2951} 2522}
… …
2995 break; 2566 break;
2996 case 'Z': /* identify the terminal type */ 2567 case 'Z': /* identify the terminal type */
2997 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2568 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2998 break; 2569 break;
2999 case '<': /* turn off VT52 mode */ 2570 case '<': /* turn off VT52 mode */
3000 PrivMode (0, PrivMode_vt52); 2571 set_privmode (PrivMode_vt52, 0);
3001 break; 2572 break;
3002 case 'F': /* use special graphics character set */ 2573 case 'F': /* use special graphics character set */
3003 case 'G': /* use regular character set */ 2574 case 'G': /* use regular character set */
3004 /* unimplemented */ 2575 /* unimplemented */
3005 break; 2576 break;
… …
3041 scr_charset_set (2, (unsigned int)cmd_getc ()); 2612 scr_charset_set (2, (unsigned int)cmd_getc ());
3042 break; 2613 break;
3043 case '+': 2614 case '+':
3044 scr_charset_set (3, (unsigned int)cmd_getc ()); 2615 scr_charset_set (3, (unsigned int)cmd_getc ());
3045 break; 2616 break;
3046#if ENABLE_FRILLS 2617#if !ENABLE_MINIMAL
3047 case '6': 2618 case '6':
3048 scr_backindex (); 2619 scr_backindex ();
3049 break; 2620 break;
3050#endif 2621#endif
3051 case '7': 2622 case '7':
3052 scr_cursor (SAVE); 2623 scr_cursor (SAVE);
3053 break; 2624 break;
3054 case '8': 2625 case '8':
3055 scr_cursor (RESTORE); 2626 scr_cursor (RESTORE);
3056 break; 2627 break;
3057#if ENABLE_FRILLS 2628#if !ENABLE_MINIMAL
3058 case '9': 2629 case '9':
3059 scr_forwardindex (); 2630 scr_forwardindex ();
3060 break; 2631 break;
3061#endif 2632#endif
3062 case '=': 2633 case '=':
3063 case '>': 2634 case '>':
3064 PrivMode ((ch == '='), PrivMode_aplKP); 2635 set_privmode (PrivMode_aplKP, ch == '=');
3065 break; 2636 break;
3066 2637
3067 case C1_40: 2638 case C1_40:
3068 cmd_getc (); 2639 cmd_getc ();
3069 break; 2640 break;
… …
3072 break; 2643 break;
3073 2644
3074 /* 8.3.87: NEXT LINE */ 2645 /* 8.3.87: NEXT LINE */
3075 case C1_NEL: /* ESC E */ 2646 case C1_NEL: /* ESC E */
3076 { 2647 {
3077 unicode_t nlcr[] = { C0_LF, C0_CR }; 2648 wchar_t nlcr[] = { C0_LF, C0_CR };
3078 scr_add_lines (nlcr, 1, 2); 2649 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3079 } 2650 }
3080 break; 2651 break;
3081 2652
3082 /* kidnapped escape sequence: Should be 8.3.48 */ 2653 /* kidnapped escape sequence: Should be 8.3.48 */
3083 case C1_ESA: /* ESC G */ 2654 case C1_ESA: /* ESC G */
… …
3105 process_dcs_seq (); 2676 process_dcs_seq ();
3106 break; 2677 break;
3107 2678
3108 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2679 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3109 case C1_SCI: /* ESC Z */ 2680 case C1_SCI: /* ESC Z */
3110 tt_write ((const unsigned char *)ESCZ_ANSWER, 2681 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3111 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3112 break; /* steal obsolete ESC [ c */ 2682 break; /* steal obsolete ESC [ c */
3113 2683
3114 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2684 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3115 case C1_CSI: /* ESC [ */ 2685 case C1_CSI: /* ESC [ */
3116 process_csi_seq (); 2686 process_csi_seq ();
… …
3123 2693
3124 /* 8.3.106: RESET TO INITIAL STATE */ 2694 /* 8.3.106: RESET TO INITIAL STATE */
3125 case 'c': 2695 case 'c':
3126 mbstate.reset (); 2696 mbstate.reset ();
3127 scr_poweron (); 2697 scr_poweron ();
3128 scrollbar_show (1); 2698 scrollBar.show (1);
3129 break; 2699 break;
3130 2700
3131 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2701 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3132 case 'n': 2702 case 'n':
3133 scr_charset_choose (2); 2703 scr_charset_choose (2);
… …
3178rxvt_term::process_csi_seq () 2748rxvt_term::process_csi_seq ()
3179{ 2749{
3180 unicode_t ch, priv, i; 2750 unicode_t ch, priv, i;
3181 unsigned int nargs, p; 2751 unsigned int nargs, p;
3182 int n, ndef; 2752 int n, ndef;
3183 int arg[ESC_ARGS]; 2753 int arg[ESC_ARGS] = { };
3184 2754
3185 for (nargs = ESC_ARGS; nargs > 0;) 2755 nargs = 0;
3186 arg[--nargs] = 0;
3187 2756
3188 priv = 0; 2757 priv = 0;
3189 ch = cmd_getc (); 2758 ch = cmd_getc ();
3190 if (ch >= '<' && ch <= '?') 2759 if (ch >= '<' && ch <= '?')
2760 {
3191 { /* '<' '=' '>' '?' */ 2761 /* '<' '=' '>' '?' */
3192 priv = ch; 2762 priv = ch;
3193 ch = cmd_getc (); 2763 ch = cmd_getc ();
3194 } 2764 }
3195 2765
3196 /* read any numerical arguments */ 2766 /* read any numerical arguments */
… …
3225 ndef = get_byte_array_bit (csi_defaults, i); 2795 ndef = get_byte_array_bit (csi_defaults, i);
3226 for (p = 0; p < nargs; p++) 2796 for (p = 0; p < nargs; p++)
3227 if (arg[p] == -1) 2797 if (arg[p] == -1)
3228 arg[p] = ndef; 2798 arg[p] = ndef;
3229 2799
3230#ifdef DEBUG_CMD
3231 fprintf (stderr, "CSI ");
3232 for (p = 0; p < nargs; p++)
3233 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3234 fprintf (stderr, "%c\n", ch);
3235#endif
3236
3237 /* 2800 /*
3238 * private mode handling 2801 * private mode handling
3239 */ 2802 */
3240 if (priv) 2803 if (priv)
3241 { 2804 {
3242 switch (priv) 2805 switch (priv)
3243 { 2806 {
3244 case '>': 2807 case '>':
3245 if (ch == CSI_DA) /* secondary device attributes */ 2808 if (ch == CSI_DA) /* secondary device attributes */
3246 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2809 {
2810 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2811 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2812 //
2813 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2814 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2815 // versions.
2816 //
2817 tt_printf ("\033[>%d;95;0c", 'U');
2818 }
3247 break; 2819 break;
2820
3248 case '?': 2821 case '?':
3249 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2822 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3250 process_terminal_mode (ch, priv, nargs, arg); 2823 process_terminal_mode (ch, priv, nargs, arg);
3251 break; 2824 break;
3252 } 2825 }
… …
3360 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2933 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3361 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 2934 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3362 break; 2935 break;
3363 2936
3364 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2937 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3365 tt_write ((const unsigned char *)VT100_ANS, 2938 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3366 (unsigned int) (sizeof (VT100_ANS) - 1));
3367 break; 2939 break;
3368 2940
3369 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2941 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3370 process_sgr_mode (nargs, arg); 2942 process_sgr_mode (nargs, arg);
3371 break; 2943 break;
… …
3378 break; 2950 break;
3379 case 6: /* CPR requested */ 2951 case 6: /* CPR requested */
3380 scr_report_position (); 2952 scr_report_position ();
3381 break; 2953 break;
3382 case 7: /* unofficial extension */ 2954 case 7: /* unofficial extension */
3383 if (options & Opt_insecure) 2955 if (option (Opt_insecure))
3384 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2956 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3385 break; 2957 break;
3386 case 8: /* unofficial extension */ 2958 case 8: /* unofficial extension */
3387 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2959 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3388 break; 2960 break;
… …
3455 break; 3027 break;
3456 case CSI_75: 3028 case CSI_75:
3457 scr_cursor (RESTORE); 3029 scr_cursor (RESTORE);
3458 break; 3030 break;
3459 3031
3460#if ENABLE_FRILLS 3032#if !ENABLE_MINIMAL
3461 case CSI_74: 3033 case CSI_74:
3462 process_window_ops (arg, nargs); 3034 process_window_ops (arg, nargs);
3463 break; 3035 break;
3464#endif 3036#endif
3465 3037
… …
3472 break; 3044 break;
3473 } 3045 }
3474} 3046}
3475/*}}} */ 3047/*}}} */
3476 3048
3477#if ENABLE_FRILLS 3049#if !ENABLE_MINIMAL
3478/* ARGSUSED */ 3050/* ARGSUSED */
3479void 3051void
3480rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3052rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3481{ 3053{
3482 int x, y; 3054 int x, y;
3483 XWindowAttributes wattr; 3055 XWindowAttributes wattr;
3484 Window wdummy; 3056 Window wdummy;
3485 dDisp; 3057
3058 dLocal (Display *, dpy);
3486 3059
3487 if (nargs == 0) 3060 if (nargs == 0)
3488 return; 3061 return;
3489 3062
3490 switch (args[0]) 3063 switch (args[0])
3491 { 3064 {
3492 /* 3065 /*
3493 * commands 3066 * commands
3494 */ 3067 */
3495 case 1: /* deiconify window */ 3068 case 1: /* deiconify window */
3496 XMapWindow (disp, parent[0]); 3069 XMapWindow (dpy, parent[0]);
3497 break; 3070 break;
3498 case 2: /* iconify window */ 3071 case 2: /* iconify window */
3499 XIconifyWindow (disp, parent[0], display->screen); 3072 XIconifyWindow (dpy, parent[0], display->screen);
3500 break; 3073 break;
3501 case 3: /* set position (pixels) */ 3074 case 3: /* set position (pixels) */
3502 XMoveWindow (disp, parent[0], args[1], args[2]); 3075 XMoveWindow (dpy, parent[0], args[1], args[2]);
3503 break; 3076 break;
3504 case 4: /* set size (pixels) */ 3077 case 4: /* set size (pixels) */
3505 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3078 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3506 break; 3079 break;
3507 case 5: /* raise window */ 3080 case 5: /* raise window */
3508 XRaiseWindow (disp, parent[0]); 3081 XRaiseWindow (dpy, parent[0]);
3509 break; 3082 break;
3510 case 6: /* lower window */ 3083 case 6: /* lower window */
3511 XLowerWindow (disp, parent[0]); 3084 XLowerWindow (dpy, parent[0]);
3512 break; 3085 break;
3513 case 7: /* refresh window */ 3086 case 7: /* refresh window */
3514 scr_touch (true); 3087 scr_touch (true);
3515 break; 3088 break;
3516 case 8: /* set size (chars) */ 3089 case 8: /* set size (chars) */
… …
3523 if (args[0] >= 24) /* set height (chars) */ 3096 if (args[0] >= 24) /* set height (chars) */
3524 set_widthheight ((unsigned int)width, 3097 set_widthheight ((unsigned int)width,
3525 (unsigned int) (args[1] * fheight)); 3098 (unsigned int) (args[1] * fheight));
3526 break; 3099 break;
3527 3100
3528
3529 /* 3101 /*
3530 * reports - some output format copied from XTerm 3102 * reports - some output format copied from XTerm
3531 */ 3103 */
3532 case 11: /* report window state */ 3104 case 11: /* report window state */
3533 XGetWindowAttributes (disp, parent[0], &wattr); 3105 XGetWindowAttributes (dpy, parent[0], &wattr);
3534 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3106 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3535 break; 3107 break;
3536 case 13: /* report window position */ 3108 case 13: /* report window position */
3537 XGetWindowAttributes (disp, parent[0], &wattr); 3109 XGetWindowAttributes (dpy, parent[0], &wattr);
3538 XTranslateCoordinates (disp, parent[0], wattr.root, 3110 XTranslateCoordinates (dpy, parent[0], wattr.root,
3539 -wattr.border_width, -wattr.border_width, 3111 -wattr.border_width, -wattr.border_width,
3540 &x, &y, &wdummy); 3112 &x, &y, &wdummy);
3541 tt_printf ("\033[3;%d;%dt", x, y); 3113 tt_printf ("\033[3;%d;%dt", x, y);
3542 break; 3114 break;
3543 case 14: /* report window size (pixels) */ 3115 case 14: /* report window size (pixels) */
3544 XGetWindowAttributes (disp, parent[0], &wattr); 3116 XGetWindowAttributes (dpy, parent[0], &wattr);
3545 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3117 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3546 break; 3118 break;
3547 case 18: /* report text area size (chars) */ 3119 case 18: /* report text area size (chars) */
3548 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3120 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3549 break; 3121 break;
… …
3551 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3123 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3552 break; 3124 break;
3553 case 20: /* report icon label */ 3125 case 20: /* report icon label */
3554 { 3126 {
3555 char *s; 3127 char *s;
3556 XGetIconName (disp, parent[0], &s); 3128 XGetIconName (dpy, parent[0], &s);
3557 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3129 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3558 XFree (s); 3130 XFree (s);
3559 } 3131 }
3560 break; 3132 break;
3561 case 21: /* report window title */ 3133 case 21: /* report window title */
3562 { 3134 {
3563 char *s; 3135 char *s;
3564 XFetchName (disp, parent[0], &s); 3136 XFetchName (dpy, parent[0], &s);
3565 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3137 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3566 XFree (s); 3138 XFree (s);
3567 } 3139 }
3568 break; 3140 break;
3569 } 3141 }
3570} 3142}
… …
3573/*----------------------------------------------------------------------*/ 3145/*----------------------------------------------------------------------*/
3574/* 3146/*
3575 * get input up until STRING TERMINATOR (or BEL) 3147 * get input up until STRING TERMINATOR (or BEL)
3576 * ends_how is terminator used. returned input must be free()'d 3148 * ends_how is terminator used. returned input must be free()'d
3577 */ 3149 */
3578unsigned char * 3150char *
3579rxvt_term::get_to_st (unicode_t &ends_how) 3151rxvt_term::get_to_st (unicode_t &ends_how)
3580{ 3152{
3581 unicode_t ch; 3153 unicode_t ch;
3582 bool seen_esc = false; 3154 bool seen_esc = false;
3583 unsigned int n = 0; 3155 unsigned int n = 0;
… …
3597 seen_esc = true; 3169 seen_esc = true;
3598 continue; 3170 continue;
3599 } 3171 }
3600 else if (ch == C0_BEL || ch == CHAR_ST) 3172 else if (ch == C0_BEL || ch == CHAR_ST)
3601 break; 3173 break;
3174 else if (ch == C0_SYN)
3175 ch = cmd_get8 ();
3602 else if (ch < 0x20) 3176 else if (ch < 0x20)
3603 return NULL; /* other control character - exit */ 3177 return NULL; /* other control character - exit */
3604 3178
3605 seen_esc = false; 3179 seen_esc = false;
3606 3180
3607 if (n >= STRING_MAX - 1) 3181 if (n >= STRING_MAX - 1)
3608 // stop at some sane length 3182 // stop at some sane length
3609 return NULL; 3183 return NULL;
3610 3184
3611 if (ch == C0_SYN)
3612 string[n++] = cmd_get8 ();
3613 else
3614 string[n++] = ch; 3185 string[n++] = ch;
3615 } 3186 }
3616 3187
3617 string[n++] = '\0'; 3188 string[n++] = '\0';
3618 3189
3619 ends_how = (ch == 0x5c ? C0_ESC : ch); 3190 ends_how = (ch == 0x5c ? C0_ESC : ch);
3620 3191
3621 return (unsigned char *)rxvt_wcstombs (string); 3192 return rxvt_wcstombs (string);
3622} 3193}
3623 3194
3624/*----------------------------------------------------------------------*/ 3195/*----------------------------------------------------------------------*/
3625/* 3196/*
3626 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3197 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3627 */ 3198 */
3628void 3199void
3629rxvt_term::process_dcs_seq () 3200rxvt_term::process_dcs_seq ()
3630{ 3201{
3631 unsigned char *s; 3202 char *s;
3632 unicode_t eh; 3203 unicode_t eh;
3633 3204
3634 /* 3205 /*
3635 * Not handled yet 3206 * Not handled yet
3636 */ 3207 */
… …
3655 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3226 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3656 arg = arg * 10 + (ch - '0'); 3227 arg = arg * 10 + (ch - '0');
3657 3228
3658 if (ch == ';') 3229 if (ch == ';')
3659 { 3230 {
3660 unsigned char *s = get_to_st (eh); 3231 char *s = get_to_st (eh);
3661 3232
3662 if (s) 3233 if (s)
3663 { 3234 {
3664 process_xterm_seq (arg, (char *)s, eh); 3235 process_xterm_seq (arg, s, eh);
3665 free (s); 3236 free (s);
3666 } 3237 }
3667 } 3238 }
3668} 3239}
3669 3240
3670void 3241void
3671rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3242rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3672{ 3243{
3673 if (str[0] == '?' && !str[1]) 3244 if (str[0] == '?' && !str[1])
3674 { 3245 {
3675 unsigned short r, g, b; 3246 rgba c;
3676 pix_colors_focused[color].get (display, r, g, b); 3247 pix_colors_focused[color].get (c);
3248
3249#if XFT
3250 if (c.a != rgba::MAX_CC)
3251 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3252 else
3253#endif
3677 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3254 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3678 } 3255 }
3679 else 3256 else
3680 set_window_color (color, str); 3257 set_window_color (color, str);
3681} 3258}
3682 3259
3683/* 3260/*
3684 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3261 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3685 */ 3262 */
3686void 3263void
3687rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3264rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3688{ 3265{
3689 int changed = 0;
3690 int color; 3266 int color;
3691 char *buf, *name; 3267 char *buf, *name;
3692 bool query = str[0] == '?' && !str[1]; 3268 bool query = str[0] == '?' && !str[1];
3693 int saveop = op; 3269 int saveop = op;
3694 dDisp; 3270
3271 dLocal (Display *, dpy);
3695 3272
3696 assert (str != NULL); 3273 assert (str != NULL);
3274
3275 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3276 return;
3277 fprintf (stderr, "op %d<%s>\n", op, str);//D
3278
3697 switch (op) 3279 switch (op)
3698 { 3280 {
3699 case XTerm_name: 3281 case XTerm_name:
3700 set_title (str); 3282 set_title (str);
3701 /* FALLTHROUGH */ 3283 /* FALLTHROUGH */
… …
3715 unsigned long bytes_after; 3297 unsigned long bytes_after;
3716 unsigned char *value = 0; 3298 unsigned char *value = 0;
3717 const char *str = ""; 3299 const char *str = "";
3718 3300
3719 if (prop 3301 if (prop
3720 && XGetWindowProperty (disp, parent[0], 3302 && XGetWindowProperty (dpy, parent[0],
3721 prop, 0, 1<<16, 0, AnyPropertyType, 3303 prop, 0, 1<<16, 0, AnyPropertyType,
3722 &actual_type, &actual_format, 3304 &actual_type, &actual_format,
3723 &nitems, &bytes_after, &value) == Success 3305 &nitems, &bytes_after, &value) == Success
3724 && actual_type != None 3306 && actual_type != None
3725 && actual_format == 8) 3307 && actual_format == 8)
3726 str = (const char *)(value); 3308 str = (const char *)(value);
3727 3309
3728 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3310 tt_printf ("\033]%d;%s%c", op, str, resp);
3729 3311
3730 XFree (value); 3312 XFree (value);
3731 } 3313 }
3732 else 3314 else
3733 { 3315 {
… …
3737 { 3319 {
3738 *eq = 0; 3320 *eq = 0;
3739 set_utf8_property (display->atom (str), eq + 1); 3321 set_utf8_property (display->atom (str), eq + 1);
3740 } 3322 }
3741 else 3323 else
3742 XDeleteProperty (disp, parent[0], 3324 XDeleteProperty (dpy, parent[0],
3743 display->atom (str)); 3325 display->atom (str));
3744 } 3326 }
3745 break; 3327 break;
3746 3328
3747 case XTerm_Color: 3329 case XTerm_Color:
… …
3749 { 3331 {
3750 if ((name = strchr (buf, ';')) == NULL) 3332 if ((name = strchr (buf, ';')) == NULL)
3751 break; 3333 break;
3752 3334
3753 *name++ = '\0'; 3335 *name++ = '\0';
3754 color = atoi (buf); 3336 color = atoi (buf) + minCOLOR;
3755 3337
3756 if (color < 0 || color >= TOTAL_COLORS) 3338 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3757 break; 3339 break;
3758 3340
3759 if ((buf = strchr (name, ';')) != NULL) 3341 if ((buf = strchr (name, ';')) != NULL)
3760 *buf++ = '\0'; 3342 *buf++ = '\0';
3761 3343
3762 if (name[0] == '?' && !name[1]) 3344 process_color_seq (op, color, name, resp);
3763 {
3764 unsigned short r, g, b;
3765 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3766 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3767 }
3768 else
3769 set_window_color (color + minCOLOR, name);
3770 } 3345 }
3771 break; 3346 break;
3347 case Rxvt_restoreFG:
3772 case XTerm_Color00: 3348 case XTerm_Color00:
3773 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3349 process_color_seq (op, Color_fg, str, resp);
3774 break; 3350 break;
3351 case Rxvt_restoreBG:
3775 case XTerm_Color01: 3352 case XTerm_Color01:
3776 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3353 process_color_seq (op, Color_bg, str, resp);
3777 break; 3354 break;
3778#ifndef NO_CURSORCOLOR 3355#ifndef NO_CURSORCOLOR
3779 case XTerm_Color_cursor: 3356 case XTerm_Color_cursor:
3780 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3357 process_color_seq (op, Color_cursor, str, resp);
3781 break; 3358 break;
3782#endif 3359#endif
3783 case XTerm_Color_pointer_fg: 3360 case XTerm_Color_pointer_fg:
3784 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3361 process_color_seq (op, Color_pointer_fg, str, resp);
3785 break; 3362 break;
3786 case XTerm_Color_pointer_bg: 3363 case XTerm_Color_pointer_bg:
3787 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3364 process_color_seq (op, Color_pointer_bg, str, resp);
3788 break; 3365 break;
3789#ifndef NO_BOLD_UNDERLINE_REVERSE 3366#ifndef NO_BOLD_UNDERLINE_REVERSE
3790 case XTerm_Color_BD:
3791 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3792 break;
3793 case XTerm_Color_UL:
3794 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3795 break;
3796 case XTerm_Color_RV: 3367 case XTerm_Color_RV:
3797 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3368 process_color_seq (op, Color_RV, str, resp);
3369 break;
3370 case Rxvt_Color_BD:
3371 case URxvt_Color_BD:
3372 process_color_seq (op, Color_BD, str, resp);
3373 break;
3374 case Rxvt_Color_UL:
3375 case URxvt_Color_UL:
3376 process_color_seq (op, Color_UL, str, resp);
3798 break; 3377 break;
3799 case URxvt_Color_IT: 3378 case URxvt_Color_IT:
3800 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3379 process_color_seq (op, Color_IT, str, resp);
3801 break; 3380 break;
3802#endif 3381#endif
3803#if TRANSPARENT && TINTING 3382#if ENABLE_TRANSPARENCY
3804 case URxvt_Color_tint: 3383 case URxvt_Color_tint:
3805 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3384 process_color_seq (op, Color_tint, str, resp);
3806 check_our_parents (); 3385 {
3807 if (am_transparent) 3386 bool changed = false;
3808 want_full_refresh = want_refresh = 1;
3809 break;
3810#endif
3811 3387
3388 if (ISSET_PIXCOLOR (Color_tint))
3389 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3390 else
3391 changed = bgPixmap.unset_tint ();
3392
3393 if (changed)
3394 update_background ();
3395 }
3396
3397 break;
3398#endif
3399
3400#if BG_IMAGE_FROM_FILE
3812 case XTerm_Pixmap: 3401 case Rxvt_Pixmap:
3813 if (*str != ';') 3402 if (!strcmp (str, "?"))
3814 { 3403 {
3815#if XPM_BACKGROUND 3404 char str[256];
3816 scale_pixmap (""); /* reset to default scaling */ 3405
3817 set_bgPixmap (str); /* change pixmap */ 3406 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3818#endif 3407 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3819 scr_touch (true); 3408 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3409 process_xterm_seq (XTerm_title, str, CHAR_ST);
3820 } 3410 }
3821 while ((str = strchr (str, ';')) != NULL) 3411 else
3822 { 3412 {
3413 int changed = 0;
3414
3415 if (*str != ';')
3416 {
3417 /* reset to default scaling :*/
3418 bgPixmap.unset_geometry ();
3419 if (bgPixmap.set_file (str)) /* change pixmap */
3420 changed++;
3421 str = strchr (str, ';');
3422 if (str == NULL)
3423 bgPixmap.set_defaultGeometry ();
3424 }
3425
3426 while (str)
3427 {
3823 str++; 3428 str++;
3824#if XPM_BACKGROUND 3429 if (bgPixmap.set_geometry (str))
3825 changed += scale_pixmap (str); 3430 changed++;
3826#endif 3431 str = strchr (str, ';');
3432 }
3433
3434 if (changed)
3435 update_background ();
3827 } 3436 }
3828
3829 if (changed)
3830 {
3831#ifdef XPM_BACKGROUND
3832 resize_pixmap ();
3833#endif
3834 scr_touch (true);
3835 }
3836 break; 3437 break;
3837 3438#endif
3838 case XTerm_restoreFG:
3839 set_window_color (Color_fg, str);
3840 break;
3841 case XTerm_restoreBG:
3842 set_window_color (Color_bg, str);
3843 break;
3844 3439
3845 case XTerm_logfile: 3440 case XTerm_logfile:
3846 // TODO, when secure mode? 3441 // TODO, when secure mode?
3847 break; 3442 break;
3848 3443
3849#ifdef MENUBAR
3850 case URxvt_Menu:
3851 if (options & Opt_insecure)
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3853 break;
3854#endif
3855#if 0 3444#if 0
3856 case XTerm_dumpscreen: /* no error notices */ 3445 case Rxvt_dumpscreen: /* no error notices */
3857 { 3446 {
3858 int fd; 3447 int fd;
3859 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3448 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3860 { 3449 {
3861 scr_dump (fd); 3450 scr_dump (fd);
… …
3872 case URxvt_italicFont: 3461 case URxvt_italicFont:
3873 case URxvt_boldItalicFont: 3462 case URxvt_boldItalicFont:
3874#endif 3463#endif
3875 if (query) 3464 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", saveop, 3465 tt_printf ("\33]%d;%-.250s%c", saveop,
3877 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3466 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3878 ? fontset[op - URxvt_font]->fontdesc : "", 3467 ? fontset[op - URxvt_font]->fontdesc : "",
3879 resp); 3468 resp);
3880 else 3469 else
3881 { 3470 {
3882 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3471 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3885 allocated.push_back ((void *)res); 3474 allocated.push_back ((void *)res);
3886 set_fonts (); 3475 set_fonts ();
3887 } 3476 }
3888 break; 3477 break;
3889 3478
3890#if ENABLE_FRILLS 3479 case URxvt_version:
3480 if (query)
3481 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3482 op,
3483 rs[Rs_name], VERSION[0], VERSION[2],
3484 resp);
3485 break;
3486
3487#if !ENABLE_MINIMAL
3891 case URxvt_locale: 3488 case URxvt_locale:
3892 if (query) 3489 if (query)
3893 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3490 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3894 else 3491 else
3895 { 3492 {
3896 set_locale (str); 3493 set_locale (str);
3897 pty.set_utf8_mode (enc_utf8); 3494 pty->set_utf8_mode (enc_utf8);
3898 init_xlocale (); 3495 init_xlocale ();
3899 } 3496 }
3900 break; 3497 break;
3901 3498
3902 case URxvt_view_up: 3499 case URxvt_view_up:
3903 case URxvt_view_down: 3500 case URxvt_view_down:
3501 {
3904 int lines = atoi (str); 3502 int lines = atoi (str);
3905 3503
3906 if (lines) 3504 if (lines)
3907 scr_page (op == URxvt_view_up ? UP : DN, lines); 3505 scr_page (op == URxvt_view_up ? UP : DN, lines);
3908 else 3506 else
3909 {
3910 scr_erase_savelines (); 3507 scr_erase_savelines ();
3911 } 3508 }
3912 3509
3510 break;
3511#endif
3512
3513#if ENABLE_PERL
3514 case URxvt_perl:
3515 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3913 break; 3516 break;
3914#endif 3517#endif
3915 } 3518 }
3916} 3519}
3917/*----------------------------------------------------------------------*/ 3520/*----------------------------------------------------------------------*/
… …
3940 { 3543 {
3941 if (mode == 'r') 3544 if (mode == 'r')
3942 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3545 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3943 else 3546 else
3944 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3547 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3945 PrivMode (state, bit); 3548 set_privmode (bit, state);
3946 } 3549 }
3947 3550
3948 return state; 3551 return state;
3949} 3552}
3950 3553
3951/* we're not using priv _yet_ */ 3554/* we're not using priv _yet_ */
3952void 3555void
3953rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3556rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3954{ 3557{
3955 unsigned int i, j; 3558 unsigned int i, j;
3956 int state; 3559 int state;
3957 3560
3958 static const struct 3561 static const struct
3959 { 3562 {
3960 const int argval; 3563 const int argval;
3961 const unsigned long bit; 3564 const unsigned long bit;
3962 }
3963
3964 argtopriv[] = { 3565 } argtopriv[] = {
3965 { 1, PrivMode_aplCUR }, 3566 { 1, PrivMode_aplCUR },
3966 { 2, PrivMode_vt52 }, 3567 { 2, PrivMode_vt52 },
3967 { 3, PrivMode_132 }, 3568 { 3, PrivMode_132 },
3968 { 4, PrivMode_smoothScroll }, 3569 { 4, PrivMode_smoothScroll },
3969 { 5, PrivMode_rVideo }, 3570 { 5, PrivMode_rVideo },
3970 { 6, PrivMode_relOrigin }, 3571 { 6, PrivMode_relOrigin },
3971 { 7, PrivMode_Autowrap }, 3572 { 7, PrivMode_Autowrap },
3972 // 8, bi-directional support mode 3573 // 8, bi-directional support mode
3973 { 9, PrivMode_MouseX10 }, 3574 { 9, PrivMode_MouseX10 },
3974#ifdef menuBar_esc
3975 { menuBar_esc, PrivMode_menuBar },
3976#endif
3977 // 18, 19 printing-related 3575 // 18, 19 printing-related
3978 { 25, PrivMode_VisibleCursor }, 3576 { 25, PrivMode_VisibleCursor },
3979#ifdef scrollBar_esc 3577#ifdef scrollBar_esc
3980 { scrollBar_esc, PrivMode_scrollBar }, 3578 { scrollBar_esc, PrivMode_scrollBar },
3981#endif 3579#endif
… …
3988 { 66, PrivMode_aplKP }, 3586 { 66, PrivMode_aplKP },
3989#ifndef NO_BACKSPACE_KEY 3587#ifndef NO_BACKSPACE_KEY
3990 { 67, PrivMode_BackSpace }, 3588 { 67, PrivMode_BackSpace },
3991#endif 3589#endif
3992 { 1000, PrivMode_MouseX11 }, 3590 { 1000, PrivMode_MouseX11 },
3993 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3591 { 1002, PrivMode_MouseBtnEvent },
3994 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3592 { 1003, PrivMode_MouseAnyEvent },
3995 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3996 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3593 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3997 { 1011, PrivMode_Keypress }, // rxvt extension 3594 { 1011, PrivMode_Keypress }, // rxvt extension
3998 // 1035 enable modifiers for alt, numlock NYI 3595 // 1035 enable modifiers for alt, numlock NYI
3999 // 1036 send ESC for meta keys NYI 3596 // 1036 send ESC for meta keys NYI
4000 // 1037 send DEL for keypad delete NYI 3597 // 1037 send DEL for keypad delete NYI
4001 { 1047, PrivMode_Screen }, 3598 { 1047, PrivMode_Screen },
4002 // 1048 save and restore cursor 3599 // 1048 save and restore cursor
4003 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3600 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4004 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3601 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3602 { 2004, PrivMode_BracketPaste },
4005 }; 3603 };
4006 3604
4007 if (nargs == 0) 3605 if (nargs == 0)
4008 return; 3606 return;
4009 3607
… …
4026 } 3624 }
4027 3625
4028 /* extra handling for values with state unkept */ 3626 /* extra handling for values with state unkept */
4029 switch (arg[i]) 3627 switch (arg[i])
4030 { 3628 {
3629#if ENABLE_STYLES
3630 case 1021:
3631 set_option (Opt_intensityStyles, mode);
3632
3633 scr_touch (true);
3634 break;
3635#endif
4031 case 1048: /* alternative cursor save */ 3636 case 1048: /* alternative cursor save */
4032 case 1049: 3637 case 1049:
4033 if (options & Opt_secondaryScreen) 3638 if (option (Opt_secondaryScreen))
4034 if (mode == 0) 3639 if (mode == 0)
4035 scr_cursor (RESTORE); 3640 scr_cursor (RESTORE);
4036 else if (mode == 1) 3641 else if (mode == 1)
4037 scr_cursor (SAVE); 3642 scr_cursor (SAVE);
4038 break; 3643 break;
… …
4046 case 2: /* VT52 mode */ 3651 case 2: /* VT52 mode */
4047 /* oddball mode. should be set regardless of set/reset 3652 /* oddball mode. should be set regardless of set/reset
4048 * parameter. Return from VT52 mode with an ESC < from 3653 * parameter. Return from VT52 mode with an ESC < from
4049 * within VT52 mode 3654 * within VT52 mode
4050 */ 3655 */
4051 PrivMode (1, PrivMode_vt52); 3656 set_privmode (PrivMode_vt52, 1);
4052 break; 3657 break;
4053 case 3: /* 80/132 */ 3658 case 3: /* 80/132 */
4054 if (priv_modes & PrivMode_132OK) 3659 if (priv_modes & PrivMode_132OK)
3660 {
3661 scr_poweron ();
4055 set_widthheight (((state ? 132 : 80) * fwidth), height); 3662 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3663 }
4056 break; 3664 break;
4057 case 4: /* smooth scrolling */ 3665 case 4: /* smooth scrolling */
4058 if (state)
4059 options &= ~Opt_jumpScroll;
4060 else
4061 options |= Opt_jumpScroll; 3666 set_option (Opt_jumpScroll, !state);
4062 break; 3667 break;
4063 case 5: /* reverse video */ 3668 case 5: /* reverse video */
4064 scr_rvideo_mode (state); 3669 scr_rvideo_mode (state);
4065 break; 3670 break;
4066 case 6: /* relative/absolute origins */ 3671 case 6: /* relative/absolute origins */
… …
4070 scr_autowrap (state); 3675 scr_autowrap (state);
4071 break; 3676 break;
4072 /* case 8: - auto repeat, can't do on a per window basis */ 3677 /* case 8: - auto repeat, can't do on a per window basis */
4073 case 9: /* X10 mouse reporting */ 3678 case 9: /* X10 mouse reporting */
4074 if (state) /* orthogonal */ 3679 if (state) /* orthogonal */
4075 priv_modes &= ~PrivMode_MouseX11; 3680 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4076 break; 3681 break;
4077#ifdef menuBar_esc
4078 case menuBar_esc:
4079#ifdef MENUBAR
4080 map_menuBar (state);
4081#endif
4082 break;
4083#endif
4084#ifdef scrollBar_esc 3682#ifdef scrollBar_esc
4085 case scrollBar_esc: 3683 case scrollBar_esc:
4086 if (scrollbar_mapping (state)) 3684 if (scrollBar.map (state))
4087 { 3685 {
4088 resize_all_windows (0, 0, 0); 3686 resize_all_windows (0, 0, 0);
4089 scr_touch (true); 3687 scr_touch (true);
4090 } 3688 }
4091 break; 3689 break;
… …
4100 break; 3698 break;
4101 /* case 66: - application key pad */ 3699 /* case 66: - application key pad */
4102 /* case 67: - backspace key */ 3700 /* case 67: - backspace key */
4103 case 1000: /* X11 mouse reporting */ 3701 case 1000: /* X11 mouse reporting */
4104 if (state) /* orthogonal */ 3702 if (state) /* orthogonal */
4105 priv_modes &= ~PrivMode_MouseX10; 3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4106 break; 3704 break;
4107#if 0
4108 case 1001: 3705 case 1002:
4109 break; /* X11 mouse highlighting */ 3706 case 1003:
4110#endif 3707 if (state)
3708 {
3709 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3710 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3711 vt_emask_mouse = PointerMotionMask;
3712 }
3713 else
3714 vt_emask_mouse = NoEventMask;
3715 vt_select_input ();
3716 break;
4111 case 1010: /* scroll to bottom on TTY output inhibit */ 3717 case 1010: /* scroll to bottom on TTY output inhibit */
4112 if (state)
4113 options &= ~Opt_scrollTtyOutput;
4114 else
4115 options |= Opt_scrollTtyOutput; 3718 set_option (Opt_scrollTtyOutput, !state);
4116 break; 3719 break;
4117 case 1011: /* scroll to bottom on key press */ 3720 case 1011: /* scroll to bottom on key press */
4118 if (state)
4119 options |= Opt_scrollTtyKeypress; 3721 set_option (Opt_scrollTtyKeypress, state);
4120 else
4121 options &= ~Opt_scrollTtyKeypress;
4122 break; 3722 break;
4123 case 1047: /* secondary screen w/ clearing last */ 3723 case 1047: /* secondary screen w/ clearing last */
4124 if (options & Opt_secondaryScreen) 3724 if (option (Opt_secondaryScreen))
4125 if (current_screen != PRIMARY) 3725 if (current_screen != PRIMARY)
4126 scr_erase_screen (2); 3726 scr_erase_screen (2);
4127 scr_change_screen (state); 3727 scr_change_screen (state);
4128 break; 3728 break;
4129 case 1049: /* secondary screen w/ clearing first */ 3729 case 1049: /* secondary screen w/ clearing first */
4130 scr_change_screen (state); 3730 scr_change_screen (state);
4131 if (options & Opt_secondaryScreen) 3731 if (option (Opt_secondaryScreen))
4132 if (current_screen != PRIMARY) 3732 if (current_screen != PRIMARY)
4133 scr_erase_screen (2); 3733 scr_erase_screen (2);
4134 break; 3734 break;
4135 default: 3735 default:
4136 break; 3736 break;
… …
4264 scr_color (Color_bg, Color_bg); 3864 scr_color (Color_bg, Color_bg);
4265 break; 3865 break;
4266 3866
4267 //case 50: // not variable spacing 3867 //case 50: // not variable spacing
4268 3868
4269#ifndef NO_BRIGHTCOLOR 3869#if !ENABLE_MINIMAL
4270 case 90: 3870 case 90:
4271 case 91: /* set bright fg color */ 3871 case 91: /* set bright fg color */
4272 case 92: 3872 case 92:
4273 case 93: 3873 case 93:
4274 case 94: 3874 case 94:
… …
4286 case 106: 3886 case 106:
4287 case 107: 3887 case 107:
4288 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3888 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4289 break; 3889 break;
4290#endif 3890#endif
4291
4292 } 3891 }
4293 } 3892 }
4294} 3893}
4295/*}}} */ 3894/*}}} */
4296 3895
… …
4299rxvt_term::process_graphics () 3898rxvt_term::process_graphics ()
4300{ 3899{
4301 unicode_t ch, cmd = cmd_getc (); 3900 unicode_t ch, cmd = cmd_getc ();
4302 3901
4303 if (cmd == 'Q') 3902 if (cmd == 'Q')
3903 {
4304 { /* query graphics */ 3904 /* query graphics */
4305 tt_printf ("\033G0\012"); /* no graphics */ 3905 tt_printf ("\033G0\012"); /* no graphics */
4306 return; 3906 return;
4307 } 3907 }
4308 /* swallow other graphics sequences until terminating ':' */ 3908 /* swallow other graphics sequences until terminating ':' */
4309 do 3909 do
… …
4320 */ 3920 */
4321void 3921void
4322rxvt_term::tt_printf (const char *fmt,...) 3922rxvt_term::tt_printf (const char *fmt,...)
4323{ 3923{
4324 va_list arg_ptr; 3924 va_list arg_ptr;
4325 unsigned char buf[256]; 3925 char buf[256];
4326 3926
4327 va_start (arg_ptr, fmt); 3927 va_start (arg_ptr, fmt);
4328 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3928 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4329 va_end (arg_ptr); 3929 va_end (arg_ptr);
4330 tt_write (buf, strlen (buf)); 3930 tt_write (buf, strlen (buf));
… …
4335 * or generated by us in response to a query ESC sequence. 3935 * or generated by us in response to a query ESC sequence.
4336 */ 3936 */
4337const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3937const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4338 3938
4339void 3939void
4340rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3940rxvt_term::tt_write (const char *data, unsigned int len)
4341{ 3941{
3942 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3943 return;
3944
3945 if (pty->pty < 0)
3946 return;
3947
4342 if (v_buflen == 0) 3948 if (v_buflen == 0)
4343 { 3949 {
4344 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3950 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4345 3951
4346 if ((unsigned int)written == len) 3952 if ((unsigned int)written == len)
4347 return; 3953 return;
4348 3954
4349 data += written; 3955 data += written;
4350 len -= written; 3956 len -= written;
4351 } 3957 }
4352 3958
4353 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 3959 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4354 3960
4355 memcpy (v_buffer + v_buflen, data, len); 3961 memcpy (v_buffer + v_buflen, data, len);
4356 v_buflen += len; 3962 v_buflen += len;
4357 3963
4358 pty_ev.set (EVENT_READ | EVENT_WRITE); 3964 pty_ev.set (ev::READ | ev::WRITE);
4359} 3965}
4360 3966
4361void rxvt_term::pty_write () 3967void rxvt_term::pty_write ()
4362{ 3968{
4363 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3969 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4364 3970
4365 if (written > 0) 3971 if (written > 0)
4366 { 3972 {
4367 v_buflen -= written; 3973 v_buflen -= written;
4368 3974
4369 if (v_buflen == 0) 3975 if (v_buflen == 0)
4370 { 3976 {
4371 free (v_buffer); 3977 free (v_buffer);
4372 v_buffer = 0; 3978 v_buffer = 0;
4373 v_buflen = 0;
4374 3979
4375 pty_ev.set (EVENT_READ); 3980 pty_ev.set (ev::READ);
4376 return; 3981 return;
4377 } 3982 }
4378 3983
4379 memmove (v_buffer, v_buffer + written, v_buflen); 3984 memmove (v_buffer, v_buffer + written, v_buflen);
4380 } 3985 }
4381 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3986 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4382 pty_ev.set (EVENT_READ); 3987 pty_ev.set (ev::READ);
4383} 3988}
4384 3989
4385/*----------------------- end-of-file (C source) -----------------------*/ 3990/*----------------------- end-of-file (C source) -----------------------*/
4386 3991

Diff Legend

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