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

Diff Legend

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