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.265 by root, Mon Jan 16 08:29:57 2006 UTC vs.
Revision 1.490 by sf-exg, Sat Jul 9 18:23:48 2011 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 <csignal>
64 60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
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 }
777
778 if (newlen)
779 len = strlen (kbuf);
834 780
835 /* 781 /*
836 * Pass meta for all function keys, if 'meta' option set 782 * Pass meta for all function keys, if 'meta' option set
837 */ 783 */
838#ifdef META8_OPTION 784#ifdef META8_OPTION
… …
873 return; 819 return;
874 820
875 if (len <= 0) 821 if (len <= 0)
876 return; /* not mapped */ 822 return; /* not mapped */
877 823
878 if (OPTION (Opt_scrollTtyKeypress)) 824 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 825 if (view_start)
880 { 826 {
881 view_start = 0; 827 view_start = 0;
882 want_refresh = 1; 828 want_refresh = 1;
883 } 829 }
… …
905 { 851 {
906 const char ch = C0_ESC; 852 const char ch = C0_ESC;
907 tt_write (&ch, 1); 853 tt_write (&ch, 1);
908 } 854 }
909 855
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); 856 tt_write (kbuf, (unsigned int)len);
921} 857}
922/*}}} */
923 858
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 859void
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 860rxvt_term::key_release (XKeyEvent &ev)
926/* attempt to `write' count to the input buffer */
927unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 861{
930 unsigned int n, s; 862#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
863 KeySym keysym;
931 864
932 n = cmdbuf_ptr - cmdbuf_base; 865 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 866#endif
934 867
935 if (n > 0 && s < count) 868#if ENABLE_FRILLS || ISO_14755
869 // ISO 14755 support
870 if (iso14755buf)
871 if (iso14755buf & ISO_14755_52)
936 { 872 {
937 memmove (cmdbuf_base, cmdbuf_ptr, 873# if ISO_14755
938 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 874 scr_overlay_off ();
939 cmdbuf_ptr = cmdbuf_base;
940 cmdbuf_endp -= n;
941 s += n;
942 }
943
944 if (count > s)
945 {
946 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
947 count = s;
948 }
949
950 for (; count--;)
951 *cmdbuf_endp++ = *str++;
952
953 cmd_parse ();
954
955 return 0;
956}
957#endif 875# endif
876# if ISO_14755
877 // iso14755 part 5.2 handling: release time
878 // first: controls
879 if ((ev.state & ControlMask)
880 && ((keysym >= 0x40 && keysym <= 0x5f)
881 || (keysym >= 0x61 && keysym <= 0x7f)))
882 {
883 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
884 commit_iso14755 ();
885
886 return;
887 }
888
889 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
890 if (i[0] == keysym)
891 {
892 iso14755buf = ISO_14755_51 | i[1];
893 commit_iso14755 ();
894
895 return;
896 }
897
898 scr_bell ();
899# endif
900 iso14755buf = 0;
901
902 return;
903 }
904 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
905 {
906# if ISO_14755
907 scr_overlay_off ();
908# endif
909 if (iso14755buf & ISO_14755_51)
910 commit_iso14755 ();
911#if ISO_14755
912 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
913 {
914 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
915
916 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
917 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
918 }
919# endif
920 else
921 iso14755buf = 0;
922 }
923#endif
924
925 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
926 return;
927
928#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
929 if (!(ev.state & ControlMask))
930 slip_wheel_ev.stop ();
931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
932 mouse_slip_wheel_speed = 0;
933#endif
934}
958 935
959void 936void
960rxvt_term::flush () 937rxvt_term::flush ()
961{ 938{
962 flush_ev.stop (); 939 flush_ev.stop ();
963 940
964#ifdef TRANSPARENT 941#ifdef HAVE_BG_PIXMAP
965 if (want_full_refresh) 942 if (bg_flags & BG_NEEDS_REFRESH)
966 { 943 {
967 want_full_refresh = 0; 944 bg_flags &= ~BG_NEEDS_REFRESH;
968 scr_clear ();
969 scr_touch (false); 945 scr_touch (false);
970 } 946 }
971#endif 947#endif
972 948
973 if (want_refresh) 949 if (want_refresh)
… …
1008 while (l->is_longer () && row < end_row); 984 while (l->is_longer () && row < end_row);
1009 } 985 }
1010 while (row < end_row); 986 while (row < end_row);
1011 } 987 }
1012 988
1013 scr_refresh (refresh_type); 989 scr_refresh ();
1014 scrollbar_show (1); 990 scrollBar.show (1);
1015#ifdef USE_XIM 991#ifdef USE_XIM
1016 IMSendSpot (); 992 im_send_spot ();
1017#endif 993#endif
1018 } 994 }
1019 995
1020 display->flush (); 996 display->flush ();
1021} 997}
1022 998
999/* checks whether a refresh is requested and starts the refresh timer */
1023void 1000void
1024rxvt_term::check_cb (check_watcher &w) 1001rxvt_term::refresh_check ()
1002{
1003 if (want_refresh && !flush_ev.is_active ())
1004 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1005
1006 display->flush ();
1007}
1008
1009void
1010rxvt_term::flush_cb (ev::timer &w, int revents)
1025{ 1011{
1026 make_current (); 1012 make_current ();
1027 1013
1028 display->flush ();
1029
1030 if (want_refresh && !flush_ev.active)
1031 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1032}
1033
1034void
1035rxvt_term::flush_cb (time_watcher &w)
1036{
1037 make_current ();
1038
1039 refresh_limit = 1;
1040 refresh_count = 0; 1014 refresh_count = 0;
1041 flush (); 1015 flush ();
1042} 1016}
1043 1017
1044#ifdef CURSOR_BLINK 1018#ifdef CURSOR_BLINK
1045void 1019void
1046rxvt_term::cursor_blink_cb (time_watcher &w) 1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1047{ 1021{
1048 hidden_cursor = !hidden_cursor; 1022 hidden_cursor = !hidden_cursor;
1049 want_refresh = 1; 1023 want_refresh = 1;
1050 1024 refresh_check ();
1051 w.start (w.at + BLINK_INTERVAL);
1052} 1025}
1053#endif 1026#endif
1054 1027
1055#ifdef TEXT_BLINK 1028#ifdef TEXT_BLINK
1056void 1029void
1057rxvt_term::text_blink_cb (time_watcher &w) 1030rxvt_term::text_blink_cb (ev::timer &w, int revents)
1058{ 1031{
1059 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1032 if (scr_refresh_rend (RS_Blink, RS_Blink))
1060 { 1033 {
1061 hidden_text = !hidden_text; 1034 hidden_text = !hidden_text;
1062 want_refresh = 1; 1035 want_refresh = 1;
1063 w.start (w.at + TEXT_BLINK_INTERVAL); 1036 refresh_check ();
1064 } 1037 }
1038 else
1039 w.stop ();
1065} 1040}
1066#endif 1041#endif
1067 1042
1068#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1069void 1044void
1070rxvt_term::cont_scroll_cb (time_watcher &w) 1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1071{ 1046{
1072 if ((scrollbar_isUp() || scrollbar_isDn()) && 1047 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1073 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1048 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1074 { 1049 {
1075 refresh_type |= SMOOTH_REFRESH;
1076 want_refresh = 1; 1050 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1051 refresh_check ();
1078 } 1052 }
1053 else
1054 w.stop ();
1079} 1055}
1080#endif 1056#endif
1081 1057
1082#ifdef SELECTION_SCROLLING 1058#ifdef SELECTION_SCROLLING
1083void 1059void
1084rxvt_term::sel_scroll_cb (time_watcher &w) 1060rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1085{ 1061{
1086 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1062 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087 { 1063 {
1088 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1064 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089 refresh_type |= SMOOTH_REFRESH;
1090 want_refresh = 1; 1065 want_refresh = 1;
1091 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1066 refresh_check ();
1092 } 1067 }
1068 else
1069 w.stop ();
1093} 1070}
1094#endif 1071#endif
1095 1072
1096#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1073#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1097void 1074void
1098rxvt_term::slip_wheel_cb (time_watcher &w) 1075rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1099{ 1076{
1100 if (mouse_slip_wheel_speed == 0 1077 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1101 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1102 : scr_page (UP, mouse_slip_wheel_speed))
1103 { 1078 {
1104 if (view_start == top_row || view_start == 0)
1105 mouse_slip_wheel_speed = 0;
1106
1107 refresh_type |= SMOOTH_REFRESH;
1108 want_refresh = 1; 1079 want_refresh = 1;
1109 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1080 refresh_check ();
1081 }
1082
1083 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1110 } 1084 {
1085 mouse_slip_wheel_speed = 0;
1086 w.stop ();
1087 }
1111} 1088}
1112#endif 1089#endif
1113 1090
1114#if HAVE_SCHED_YIELD 1091#if LINUX_YIELD_HACK
1115static struct event_handler 1092static struct event_handler
1116{ 1093{
1117 check_watcher cw_yield; 1094 ev::prepare yield_ev;
1118 1095
1119 void yield (check_watcher &w) 1096 void yield_cb (ev::prepare &w, int revents)
1120 { 1097 {
1121 sched_yield (); 1098 // this should really be sched_yield(), but the linux guys thought
1099 // that giving a process calling sched_yield () less cpu time than
1100 // ones with high nice levels is a useful thing to do. It surely is is
1101 // allowed by the sus... as is returning ENOSYS.
1102 // since the linux guys additionally thought that breaking the only
1103 // known workaround against their unusable sched_yield hack is cool,
1104 // we just nanosleep a bit and hope for the best.
1105
1106 struct timespec ts = { 0, 1000 };
1107 nanosleep (&ts, 0);
1108
1122 w.stop (); 1109 w.stop ();
1123 } 1110 }
1124 1111
1125 event_handler () 1112 event_handler ()
1126 : cw_yield (this, &event_handler::yield) 1113 : yield_ev (this, &event_handler::yield_cb)
1127 { 1114 {
1128 } 1115 }
1129} event_handler; 1116} event_handler;
1130#endif 1117#endif
1131 1118
1119/* make sure all the cmd data is at beginning of cmdbuf */
1120void
1121rxvt_term::cmdbuf_reify ()
1122{
1123 if (cmdbuf_ptr == cmdbuf_base)
1124 return;
1125
1126 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1127
1128 memmove (cmdbuf_base, cmdbuf_ptr, used);
1129 cmdbuf_ptr = cmdbuf_base;
1130 cmdbuf_endp = cmdbuf_ptr + used;
1131
1132}
1133
1134#if defined (KEYSYM_RESOURCE)
1135void
1136rxvt_term::cmdbuf_append (const char *str, size_t count)
1137{
1138 cmdbuf_reify ();
1139
1140 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1141
1142 if (count > avail)
1143 return;
1144
1145 memcpy (cmdbuf_endp, str, count);
1146 cmdbuf_endp += count;
1147
1148 cmd_parse ();
1149}
1150#endif
1151
1132bool 1152bool
1133rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1134{ 1154{
1135 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1136 1156
1137 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1138 { 1158
1139 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1140 n = 0;
1141 } 1160 {
1142 1161 // normally this indicates a "too long" command sequence - just drop the data we have
1143 memmove (cmdbuf_base, cmdbuf_ptr, n);
1144 cmdbuf_ptr = cmdbuf_base; 1162 cmdbuf_ptr = cmdbuf_base;
1145 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1146 1166
1147 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1148 1168
1149 if (r > 0) 1169 if (r > 0)
1150 { 1170 {
1151 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1152 return true; 1172 return true;
1153 } 1173 }
1154 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1174 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1155 { 1175 {
1156#if HAVE_SCHED_YIELD 1176#if LINUX_YIELD_HACK
1157 if (display->is_local) 1177 if (display->is_local)
1158 event_handler.cw_yield.start (); 1178 event_handler.yield_ev.start ();
1159#endif 1179#endif
1160 } 1180 }
1161 else 1181 else
1162 { 1182 {
1163 pty_ev.stop (); 1183 pty_ev.stop ();
1164 1184
1165 if (!OPTION (Opt_hold)) 1185 if (!option (Opt_hold))
1166 destroy (); 1186 destroy ();
1167 } 1187 }
1168 1188
1169 return false; 1189 return false;
1170} 1190}
1171 1191
1172void 1192void
1173rxvt_term::pty_cb (io_watcher &w, short revents) 1193rxvt_term::pty_cb (ev::io &w, int revents)
1174{ 1194{
1175 make_current (); 1195 make_current ();
1176 1196
1177 if (revents & EVENT_READ) 1197 if (revents & ev::READ)
1178 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
1179 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
1180 if (cmd_parse ()) 1200 cmd_parse ();
1181 break;
1182 1201
1183 if (revents & EVENT_WRITE) 1202 if (revents & ev::WRITE)
1184 pty_write (); 1203 pty_write ();
1204
1205 refresh_check ();
1185} 1206}
1186 1207
1187void 1208void
1188rxvt_term::pointer_unblank () 1209rxvt_term::pointer_unblank ()
1189{ 1210{
1190 XDefineCursor (display->display, vt, TermWin_cursor); 1211 XDefineCursor (dpy, vt, TermWin_cursor);
1191 recolour_cursor (); 1212 recolour_cursor ();
1192 1213
1193#ifdef POINTER_BLANK 1214#ifdef POINTER_BLANK
1194 hidden_pointer = 0; 1215 hidden_pointer = 0;
1195 1216
1196 if (OPTION (Opt_pointerBlank)) 1217 if (option (Opt_pointerBlank))
1197 pointer_ev.start (NOW + pointerBlankDelay); 1218 pointer_ev.start (pointerBlankDelay);
1198#endif 1219#endif
1199} 1220}
1200 1221
1201#ifdef POINTER_BLANK 1222#ifdef POINTER_BLANK
1202void 1223void
1203rxvt_term::pointer_blank () 1224rxvt_term::pointer_blank ()
1204{ 1225{
1205 if (!OPTION (Opt_pointerBlank)) 1226 if (!option (Opt_pointerBlank))
1206 return; 1227 return;
1207 1228
1208 XDefineCursor (display->display, vt, display->blank_cursor); 1229 XDefineCursor (dpy, vt, display->blank_cursor);
1209 XFlush (display->display); 1230 XFlush (dpy);
1210 1231
1211 hidden_pointer = 1; 1232 hidden_pointer = 1;
1212} 1233}
1213 1234
1214void 1235void
1215rxvt_term::pointer_cb (time_watcher &w) 1236rxvt_term::pointer_cb (ev::timer &w, int revents)
1216{ 1237{
1217 make_current (); 1238 make_current ();
1218 1239
1219 pointer_blank (); 1240 pointer_blank ();
1220} 1241}
… …
1223void 1244void
1224rxvt_term::mouse_report (XButtonEvent &ev) 1245rxvt_term::mouse_report (XButtonEvent &ev)
1225{ 1246{
1226 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1227 int x, y; 1248 int x, y;
1249 int code = 32;
1228 1250
1229 x = ev.x; 1251 x = Pixel2Col (ev.x) + 1;
1230 y = ev.y; 1252 y = Pixel2Row (ev.y) + 1;
1231 pixel_position (&x, &y); 1253
1254 if (ev.type == MotionNotify)
1255 {
1256 if (x == mouse_row && y == mouse_col)
1257 return;
1258
1259 mouse_row = x;
1260 mouse_col = y;
1261 code += 32;
1262 }
1232 1263
1233 if (MEvent.button == AnyButton) 1264 if (MEvent.button == AnyButton)
1234 button_number = 3; 1265 button_number = 3;
1235 else 1266 else
1236 { 1267 {
1237 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1238 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1239 if (button_number >= 3) 1270 if (button_number >= 3)
1240 button_number += (64 - 3); 1271 button_number += 64 - 3;
1241 } 1272 }
1242 1273
1243 if (priv_modes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1244 { 1275 {
1245 /* 1276 /*
… …
1277 fputc ('A', stderr); 1308 fputc ('A', stderr);
1278 if (key_state & 32) 1309 if (key_state & 32)
1279 fputc ('2', stderr); 1310 fputc ('2', stderr);
1280 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1281 button_number, 1312 button_number,
1282 x + 1, 1313 x,
1283 y + 1); 1314 y);
1284#endif 1315#endif
1285 1316
1317#if ENABLE_FRILLS
1318 if (priv_modes & PrivMode_ExtMouseRight)
1319 tt_printf ("\033[%d;%d;%dM",
1320 code + button_number + key_state,
1321 x,
1322 y);
1323 else if (priv_modes & PrivMode_ExtModeMouse)
1324 tt_printf ("\033[M%c%lc%lc",
1325 code + button_number + key_state,
1326 wint_t (32 + x),
1327 wint_t (32 + y));
1328 else
1329#endif
1286 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
1287 (32 + button_number + key_state), 1331 code + button_number + key_state,
1288 (32 + x + 1), 1332 32 + x,
1289 (32 + y + 1)); 1333 32 + y);
1290} 1334}
1291
1292#ifdef USING_W11LIB
1293void
1294rxvt_W11_process_x_event (XEvent *ev)
1295{
1296 rxvt_t *r = rxvt_get_r ();
1297
1298 x_cb (*ev);
1299}
1300#endif
1301 1335
1302/*{{{ process an X event */ 1336/*{{{ process an X event */
1303void 1337void
1304rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
1305{ 1339{
1306 make_current (); 1340 make_current ();
1307 1341
1308 dDisp; 1342 dLocal (Display *, dpy);
1309 1343
1310 if (ev.xany.window == vt 1344 if (ev.xany.window == vt
1311 && SHOULD_INVOKE (HOOK_X_EVENT) 1345 && SHOULD_INVOKE (HOOK_X_EVENT)
1312 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1346 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1313 return; 1347 return;
… …
1318 unsigned int unused_mask; 1352 unsigned int unused_mask;
1319 1353
1320 switch (ev.type) 1354 switch (ev.type)
1321 { 1355 {
1322 case KeyPress: 1356 case KeyPress:
1323#if ISO_14755 1357 key_press (ev.xkey);
1324 if (!(iso14755buf & ISO_14755_52))
1325#endif
1326 lookup_key (ev.xkey);
1327
1328 break; 1358 break;
1329 1359
1330 case KeyRelease: 1360 case KeyRelease:
1331 { 1361 key_release (ev.xkey);
1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1333 KeySym keysym;
1334
1335 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1336#endif
1337
1338#if ENABLE_FRILLS || ISO_14755
1339 // ISO 14755 support
1340 if (iso14755buf)
1341 if (iso14755buf & ISO_14755_52)
1342 {
1343# if ENABLE_OVERLAY
1344 scr_overlay_off ();
1345# endif
1346# if ISO_14755
1347 // iso14755 part 5.2 handling: release time
1348 // first: controls
1349 if ((ev.xkey.state & ControlMask)
1350 && ((keysym >= 0x40 && keysym <= 0x5f)
1351 || (keysym >= 0x61 && keysym <= 0x7f)))
1352 {
1353 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1359 if (i[0] == keysym)
1360 {
1361 iso14755buf = ISO_14755_51 | i[1];
1362 commit_iso14755 ();
1363 goto skip_switch;
1364 }
1365
1366 scr_bell ();
1367# endif
1368 iso14755buf = 0;
1369 break;
1370 }
1371 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1372 {
1373# if ENABLE_OVERLAY
1374 scr_overlay_off ();
1375# endif
1376 if (iso14755buf & ISO_14755_51)
1377 commit_iso14755 ();
1378#if ISO_14755
1379 else if (iso14755buf & ISO_14755_STARTED)
1380 {
1381 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1382
1383 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1384 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1385 }
1386# endif
1387 else
1388 iso14755buf = 0;
1389 }
1390#endif
1391
1392 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1394 break;
1395
1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1397 if (!(ev.xkey.state & ControlMask))
1398 slip_wheel_ev.stop ();
1399 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1400 mouse_slip_wheel_speed = 0;
1401#endif
1402 break; 1362 break;
1403 }
1404 1363
1405 case ButtonPress: 1364 case ButtonPress:
1406 button_press (ev.xbutton); 1365 button_press (ev.xbutton);
1407 break; 1366 break;
1408 1367
… …
1410 button_release (ev.xbutton); 1369 button_release (ev.xbutton);
1411 break; 1370 break;
1412 1371
1413 case ClientMessage: 1372 case ClientMessage:
1414 if (ev.xclient.format == 32 1373 if (ev.xclient.format == 32
1415 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1374 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1416 { 1375 {
1376 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1377 {
1378 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1379 {
1417 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1380 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1381 {
1382 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1418 destroy (); 1383 destroy ();
1384 }
1419#if ENABLE_EWMH 1385#if ENABLE_EWMH
1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1386 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1421 XSendEvent (disp, ev.xclient.window = display->root, 1387 XSendEvent (dpy, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask, 1388 False, SubstructureRedirectMask | SubstructureNotifyMask,
1423 &ev); 1389 &ev);
1390#endif
1391 }
1392 }
1393#if ENABLE_XEMBED
1394 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1395 {
1396 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1397 focus_in ();
1398 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1399 focus_out ();
1400 }
1424#endif 1401#endif
1425 } 1402 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1435#ifdef OFFIX_DND
1436 /* OffiX Dnd (drag 'n' drop) protocol */
1437 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1438 && (ev.xclient.data.l[0] == DndFile
1439 || ev.xclient.data.l[0] == DndDir
1440 || ev.xclient.data.l[0] == DndLink))
1441 {
1442 /* Get Dnd data */
1443 Atom ActualType;
1444 int ActualFormat;
1445 unsigned char *data;
1446 unsigned long Size, RemainingBytes;
1447
1448 XGetWindowProperty (disp, display->root,
1449 xa[XA_DNDSELECTION],
1450 0L, 1000000L,
1451 False, AnyPropertyType,
1452 &ActualType, &ActualFormat,
1453 &Size, &RemainingBytes,
1454 &data);
1455 set_string_property (XA_CUT_BUFFER0, data);
1456 XFree (data);
1457 selection_paste (display->root, XA_CUT_BUFFER0, true);
1458 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1459 }
1460#endif /* OFFIX_DND */
1461 break;
1462
1463 case MappingNotify:
1464 XRefreshKeyboardMapping (&ev.xmapping);
1465 break; 1403 break;
1466 1404
1467 /* 1405 /*
1468 * XXX: this is not the _current_ arrangement 1406 * XXX: this is not the _current_ arrangement
1469 * Here's my conclusion: 1407 * Here's my conclusion:
… …
1488 break; 1426 break;
1489 } 1427 }
1490 break; 1428 break;
1491 1429
1492 case FocusIn: 1430 case FocusIn:
1431 if (ev.xfocus.detail != NotifyInferior
1432 && ev.xfocus.detail != NotifyPointer
1433 && ev.xfocus.mode != NotifyGrab)
1493 focus_in (); 1434 focus_in ();
1494 break; 1435 break;
1495 1436
1496 case FocusOut: 1437 case FocusOut:
1438 if (ev.xfocus.detail != NotifyInferior
1439 && ev.xfocus.detail != NotifyPointer
1440 && ev.xfocus.mode != NotifyGrab)
1497 focus_out (); 1441 focus_out ();
1498 break; 1442 break;
1499 1443
1500 case ConfigureNotify: 1444 case ConfigureNotify:
1501 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1502 { 1446 {
1503 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1504 ; 1448 ;
1449
1450#ifdef HAVE_BG_PIXMAP
1451 bool moved = false;
1452 if (bg_window_position_sensitive ())
1453 {
1454 int x, y;
1455 if (ev.xconfigure.send_event)
1456 {
1457 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y;
1459 }
1460 else
1461 get_window_origin (x, y);
1462
1463 if (bg_set_position (x, y)
1464 || !(bg_flags & BG_IS_VALID))
1465 moved = true;
1466 }
1467#endif
1505 1468
1506 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1507 { 1470 {
1508 seen_resize = 1; 1471 seen_resize = 1;
1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510 } 1473 }
1511 1474 else
1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1475 {
1513 if (OPTION (Opt_transparent)) 1476#ifdef HAVE_BG_PIXMAP
1514 check_our_parents (); 1477 if (moved)
1478 {
1479 if (mapped)
1480 update_background ();
1481 else
1482 bg_invalidate ();
1483 }
1515#endif 1484#endif
1485 }
1486
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1516 } 1488 }
1517 break; 1489 break;
1518 1490
1519 case PropertyNotify: 1491 case PropertyNotify:
1520 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1492 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1521 && ev.xproperty.state == PropertyNewValue)
1522 selection_property (ev.xproperty.window, ev.xproperty.atom);
1523
1524 break; 1493 break;
1525 1494
1526 case SelectionClear: 1495 case SelectionClear:
1527 selection_clear (); 1496 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1528 break;
1529
1530 case SelectionNotify:
1531 if (selection_wait == Sel_normal)
1532 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1533 break; 1497 break;
1534 1498
1535 case SelectionRequest: 1499 case SelectionRequest:
1536 selection_send (ev.xselectionrequest); 1500 selection_send (ev.xselectionrequest);
1537 break; 1501 break;
1538 1502
1539 case MapNotify: 1503 case MapNotify:
1504#ifdef HAVE_BG_PIXMAP
1505 /* This is needed specifically to fix the case of no window manager or a
1506 * non-reparenting window manager. In those cases we never get first
1507 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1508 * care of multiplicity of ConfigureNotify events arriving while WM does
1509 * reparenting.
1510 * We should not render background immediately, as there could be several
1511 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1512 * by scheduling background redraw as soon as we can, but giving a short
1513 * bit of time for ConfigureNotifies to arrive.
1514 * We should render background PRIOR to drawing any text, but AFTER all
1515 * of ConfigureNotifys for the best results.
1516 */
1517 if (!(bg_flags & BG_IS_VALID))
1518 update_background_ev.start (0.025);
1519#endif
1540 mapped = 1; 1520 mapped = 1;
1541#ifdef TEXT_BLINK 1521#ifdef TEXT_BLINK
1542 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1522 text_blink_ev.start ();
1543#endif 1523#endif
1544 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1524 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1545 break; 1525 break;
1546 1526
1547 case UnmapNotify: 1527 case UnmapNotify:
… …
1549#ifdef TEXT_BLINK 1529#ifdef TEXT_BLINK
1550 text_blink_ev.stop (); 1530 text_blink_ev.stop ();
1551#endif 1531#endif
1552 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1532 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1553 break; 1533 break;
1554
1555#ifdef TRANSPARENT
1556 case ReparentNotify:
1557 rootwin_cb (ev);
1558 break;
1559#endif /* TRANSPARENT */
1560 1534
1561 case GraphicsExpose: 1535 case GraphicsExpose:
1562 case Expose: 1536 case Expose:
1563 if (ev.xany.window == vt) 1537 if (ev.xany.window == vt)
1564 { 1538 {
1565 do 1539 do
1540 {
1566 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1567 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, false);
1543 }
1568 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1569 1545
1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1546 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1571 1547
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1549 {
1573 scr_expose (ev.xexpose.x, ev.xexpose.y, 1550 scr_expose (ev.xexpose.x, ev.xexpose.y,
1574 ev.xexpose.width, ev.xexpose.height, False); 1551 ev.xexpose.width, ev.xexpose.height, false);
1552 }
1575 1553
1576 want_refresh = 1; 1554 want_refresh = 1;
1577 } 1555 }
1578 else 1556 else
1579 { 1557 {
1580 XEvent unused_event; 1558 XEvent unused_event;
1581 1559
1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1560 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1583 ; 1561 ;
1584 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1585 ; 1563 ;
1586 1564
1587 if (isScrollbarWindow (ev.xany.window)) 1565 if (scrollBar.state && ev.xany.window == scrollBar.win)
1588 { 1566 {
1589 scrollBar.setIdle (); 1567 scrollBar.state = STATE_IDLE;
1590 scrollbar_show (0); 1568 scrollBar.show (0);
1591 } 1569 }
1592#ifdef MENUBAR
1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594 menubar_expose ();
1595#endif
1596
1597#ifdef TRANSPARENT
1598 if (am_transparent && ev.xany.window == parent[0])
1599 XClearWindow (disp, ev.xany.window);
1600#endif
1601 } 1570 }
1602 break; 1571 break;
1603 1572
1604 case MotionNotify: 1573 case MotionNotify:
1605#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1606 if (hidden_pointer) 1575 if (hidden_pointer)
1607 pointer_unblank (); 1576 pointer_unblank ();
1608#endif 1577#endif
1609#if MENUBAR 1578 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1610 if (isMenuBarWindow (ev.xany.window)) 1579 || priv_modes & PrivMode_MouseAnyEvent)
1611 {
1612 menubar_control (ev.xbutton); 1580 mouse_report (ev.xbutton);
1613 break;
1614 }
1615#endif
1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1581 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617 break; 1582 break;
1618 1583
1619 if (ev.xany.window == vt) 1584 if (ev.xany.window == vt)
1620 { 1585 {
1621 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1586 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1622 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1587 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623 ; // nop 1588 ; // nop
1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1589 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1625 { 1590 {
1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1591 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1627 ; 1592 ;
1628 1593
1629 XQueryPointer (disp, vt, 1594 XQueryPointer (dpy, vt,
1630 &unused_root, &unused_child, 1595 &unused_root, &unused_child,
1631 &unused_root_x, &unused_root_y, 1596 &unused_root_x, &unused_root_y,
1632 &ev.xbutton.x, &ev.xbutton.y, 1597 &ev.xbutton.x, &ev.xbutton.y,
1633 &ev.xbutton.state); 1598 &ev.xbutton.state);
1634#ifdef MOUSE_THRESHOLD 1599#ifdef MOUSE_THRESHOLD
… …
1654 int dist; 1619 int dist;
1655 1620
1656 /* don't clobber the current delay if we are 1621 /* don't clobber the current delay if we are
1657 * already in the middle of scrolling. 1622 * already in the middle of scrolling.
1658 */ 1623 */
1659 if (!sel_scroll_ev.active) 1624 if (!sel_scroll_ev.is_active ())
1660 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1625 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1661 1626
1662 /* save the event params so we can highlight 1627 /* save the event params so we can highlight
1663 * the selection in the pending-scroll loop 1628 * the selection in the pending-scroll loop
1664 */ 1629 */
1665 selection_save_x = ev.xbutton.x; 1630 selection_save_x = ev.xbutton.x;
… …
1687 else 1652 else
1688 { 1653 {
1689 /* we are within the text window, so we 1654 /* we are within the text window, so we
1690 * shouldn't be scrolling 1655 * shouldn't be scrolling
1691 */ 1656 */
1692 if (sel_scroll_ev.active)
1693 sel_scroll_ev.stop(); 1657 sel_scroll_ev.stop();
1694 } 1658 }
1695#endif 1659#endif
1696#ifdef MOUSE_THRESHOLD 1660#ifdef MOUSE_THRESHOLD
1697 } 1661 }
1698#endif 1662#endif
1699 } 1663 }
1700 } 1664 }
1701 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1665 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1702 { 1666 {
1703 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1704 MotionNotify, &ev)) 1668 MotionNotify, &ev))
1705 ; 1669 ;
1706 1670
1707 XQueryPointer (disp, scrollBar.win, 1671 XQueryPointer (dpy, scrollBar.win,
1708 &unused_root, &unused_child, 1672 &unused_root, &unused_child,
1709 &unused_root_x, &unused_root_y, 1673 &unused_root_x, &unused_root_y,
1710 &ev.xbutton.x, &ev.xbutton.y, 1674 &ev.xbutton.x, &ev.xbutton.y,
1711 &unused_mask); 1675 &unused_mask);
1712 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1713 scrollbar_size ()); 1677 scrollBar.size ());
1714 want_refresh = 1; 1678 want_refresh = 1;
1715 refresh_limit = 0;
1716 scrollbar_show (1); 1679 scrollBar.show (1);
1717 } 1680 }
1718 break; 1681 break;
1719 } 1682 }
1720 1683
1721skip_switch: ;
1722
1723#if defined(CURSOR_BLINK) 1684#if defined(CURSOR_BLINK)
1724 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1685 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1725 { 1686 {
1726 if (hidden_cursor) 1687 if (hidden_cursor)
1727 { 1688 {
1728 hidden_cursor = 0; 1689 hidden_cursor = 0;
1729 want_refresh = 1; 1690 want_refresh = 1;
1730 } 1691 }
1731 1692
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1693 cursor_blink_ev.again ();
1733 } 1694 }
1734#endif 1695#endif
1735 1696
1736#if defined(POINTER_BLANK) 1697#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1698 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 { 1699 {
1739 if (ev.type == MotionNotify 1700 if (ev.type == MotionNotify
1740 || ev.type == ButtonPress 1701 || ev.type == ButtonPress
1741 || ev.type == ButtonRelease) 1702 || ev.type == ButtonRelease)
1742 if (hidden_pointer) 1703 if (hidden_pointer)
… …
1744 1705
1745 if (ev.type == KeyPress && hidden_pointer == 0) 1706 if (ev.type == KeyPress && hidden_pointer == 0)
1746 pointer_blank (); 1707 pointer_blank ();
1747 } 1708 }
1748#endif 1709#endif
1710
1711 refresh_check ();
1749} 1712}
1713
1714#if ENABLE_FRILLS
1715void
1716rxvt_term::set_urgency (bool enable)
1717{
1718 if (enable == urgency_hint)
1719 return;
1720
1721 if (XWMHints *h = XGetWMHints (dpy, parent))
1722 {
1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724 XSetWMHints (dpy, parent, h);
1725 urgency_hint = enable;
1726 }
1727}
1728#endif
1750 1729
1751void 1730void
1752rxvt_term::focus_in () 1731rxvt_term::focus_in ()
1753{ 1732{
1754 if (!focus) 1733 if (!focus)
1755 { 1734 {
1756 focus = 1; 1735 focus = 1;
1757 want_refresh = 1; 1736 want_refresh = 1;
1758 1737
1759 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1760
1761#if USE_XIM 1738#if USE_XIM
1762 if (Input_Context != NULL) 1739 if (Input_Context != NULL)
1763 { 1740 {
1764 IMSetStatusPosition (); 1741 im_set_position ();
1765 XSetICFocus (Input_Context); 1742 XSetICFocus (Input_Context);
1766 } 1743 }
1767#endif 1744#endif
1768#if CURSOR_BLINK 1745#if CURSOR_BLINK
1769 if (OPTION (Opt_cursorBlink)) 1746 if (option (Opt_cursorBlink))
1770 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1747 cursor_blink_ev.again ();
1771#endif 1748#endif
1772#if OFF_FOCUS_FADING 1749#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1750 if (rs[Rs_fade])
1774 { 1751 {
1775 pix_colors = pix_colors_focused; 1752 pix_colors = pix_colors_focused;
1776 scr_recolour (); 1753 scr_recolour ();
1777 } 1754 }
1778#endif 1755#endif
1756#if ENABLE_FRILLS
1757 if (option (Opt_urgentOnBell))
1758 set_urgency (0);
1759#endif
1760
1761 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1779 } 1762 }
1780} 1763}
1781 1764
1782void 1765void
1783rxvt_term::focus_out () 1766rxvt_term::focus_out ()
… …
1785 if (focus) 1768 if (focus)
1786 { 1769 {
1787 focus = 0; 1770 focus = 0;
1788 want_refresh = 1; 1771 want_refresh = 1;
1789 1772
1790 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1773#if ENABLE_FRILLS
1791 1774 if (option (Opt_urgentOnBell))
1775 set_urgency (0);
1776#endif
1792#if ENABLE_FRILLS || ISO_14755 1777#if ENABLE_FRILLS || ISO_14755
1793 if (iso14755buf) 1778 if (iso14755buf)
1794 { 1779 {
1795 iso14755buf = 0; 1780 iso14755buf = 0;
1796# if ENABLE_OVERLAY 1781# if ISO_14755
1797 scr_overlay_off (); 1782 scr_overlay_off ();
1798# endif 1783# endif
1799 } 1784 }
1800#endif 1785#endif
1801#if USE_XIM 1786#if USE_XIM
1802 if (Input_Context != NULL) 1787 if (Input_Context != NULL)
1803 XUnsetICFocus (Input_Context); 1788 XUnsetICFocus (Input_Context);
1804#endif 1789#endif
1805#if CURSOR_BLINK 1790#if CURSOR_BLINK
1806 if (OPTION (Opt_cursorBlink)) 1791 if (option (Opt_cursorBlink))
1807 cursor_blink_ev.stop (); 1792 cursor_blink_ev.stop ();
1793
1808 hidden_cursor = 0; 1794 hidden_cursor = 0;
1809#endif 1795#endif
1810#if OFF_FOCUS_FADING 1796#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade]) 1797 if (rs[Rs_fade])
1812 { 1798 {
1813 pix_colors = pix_colors_unfocused; 1799 pix_colors = pix_colors_unfocused;
1814 scr_recolour (); 1800 scr_recolour ();
1815 } 1801 }
1816#endif 1802#endif
1803
1804 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1805 }
1806}
1807
1808void
1809rxvt_term::update_fade_color (unsigned int idx)
1810{
1811#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade])
1817 } 1813 {
1814 rgba c;
1815 pix_colors [Color_fade].get (c);
1816 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817 }
1818#endif
1818} 1819}
1819 1820
1820#if TRANSPARENT 1821#if ENABLE_TRANSPARENCY || ENABLE_PERL
1821void 1822void
1822rxvt_term::rootwin_cb (XEvent &ev) 1823rxvt_term::rootwin_cb (XEvent &ev)
1823{ 1824{
1824 make_current (); 1825 make_current ();
1825 1826
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1831# if ENABLE_TRANSPARENCY
1826 switch (ev.type) 1832 switch (ev.type)
1827 { 1833 {
1828 case PropertyNotify: 1834 case PropertyNotify:
1829 /* 1835 /*
1830 * if user used some Esetroot compatible prog to set the root bg, 1836 * if user used some Esetroot compatible prog to set the root bg,
1831 * use the property to determine the pixmap. We use it later on. 1837 * use the property to determine the pixmap. We use it later on.
1832 */ 1838 */
1833 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1834 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1835 return; 1841 {
1842 bg_set_root_pixmap ();
1843 update_background ();
1844 }
1836 1845
1837 /* FALLTHROUGH */
1838 case ReparentNotify:
1839 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1840 want_refresh = want_full_refresh = 1;
1841 break; 1846 break;
1842 } 1847 }
1848# endif
1849
1850 refresh_check ();
1843} 1851}
1844#endif 1852#endif
1845 1853
1846void 1854void
1847rxvt_term::button_press (XButtonEvent &ev) 1855rxvt_term::button_press (XButtonEvent &ev)
… …
1856 /* 1864 /*
1857 * VT window processing of button press 1865 * VT window processing of button press
1858 */ 1866 */
1859 if (ev.window == vt) 1867 if (ev.window == vt)
1860 { 1868 {
1869 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1870 return;
1871
1861#if ISO_14755 1872#if ISO_14755
1862 // 5.4 1873 // 5.4
1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1874 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1864 { 1875 {
1865 iso14755_54 (ev.x, ev.y); 1876 iso14755_54 (ev.x, ev.y);
… …
1875 /* save the xbutton state (for ButtonRelease) */ 1886 /* save the xbutton state (for ButtonRelease) */
1876 MEvent.state = ev.state; 1887 MEvent.state = ev.state;
1877#ifdef MOUSE_REPORT_DOUBLECLICK 1888#ifdef MOUSE_REPORT_DOUBLECLICK
1878 if (ev.button == MEvent.button && clickintime) 1889 if (ev.button == MEvent.button && clickintime)
1879 { 1890 {
1880 /* same button, within alloted time */ 1891 /* same button, within allowed time */
1881 MEvent.clicks++; 1892 MEvent.clicks++;
1882 1893
1883 if (MEvent.clicks > 1) 1894 if (MEvent.clicks > 1)
1884 { 1895 {
1885 /* only report double clicks */ 1896 /* only report double clicks */
… …
1899 mouse_report (ev); 1910 mouse_report (ev);
1900 } 1911 }
1901#else 1912#else
1902 MEvent.button = ev.button; 1913 MEvent.button = ev.button;
1903 mouse_report (ev); 1914 mouse_report (ev);
1904#endif /* MOUSE_REPORT_DOUBLECLICK */ 1915#endif /* MOUSE_REPORT_DOUBLECLICK */
1905 1916
1906 } 1917 }
1907 else 1918 else
1908 { 1919 {
1909 if (ev.button != MEvent.button) 1920 if (ev.button != MEvent.button)
1910 MEvent.clicks = 0; 1921 MEvent.clicks = 0;
1911 1922
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1913 switch (ev.button) 1923 switch (ev.button)
1914 { 1924 {
1915 case Button1: 1925 case Button1:
1916 /* allow meta + click to select rectangular areas */ 1926 /* allow meta + click to select rectangular areas */
1917 /* should be done in screen.C */ 1927 /* should be done in screen.C */
1918#if ENABLE_FRILLS 1928#if ENABLE_FRILLS
1919 selection.rect = !!(ev.state & ModMetaMask); 1929 selection.rect = !!(ev.state & ModMetaMask);
1920#else 1930#else
1921 selection.rect = false; 1931 selection.rect = false;
1922#endif 1932#endif
1923 1933
1924 /* allow shift+left click to extend selection */ 1934 /* allow shift+left click to extend selection */
1925 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1935 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926 { 1936 {
1927 if (MEvent.button == Button1 && clickintime) 1937 if (MEvent.button == Button1 && clickintime)
1928 selection_rotate (ev.x, ev.y); 1938 selection_rotate (ev.x, ev.y);
1929 else 1939 else
1930 selection_extend (ev.x, ev.y, 1); 1940 selection_extend (ev.x, ev.y, 1);
1931 } 1941 }
1932 else 1942 else
1933 { 1943 {
1934 if (MEvent.button == Button1 && clickintime) 1944 if (MEvent.button == Button1 && clickintime)
1935 MEvent.clicks++; 1945 MEvent.clicks++;
1936 else 1946 else
1937 MEvent.clicks = 1; 1947 MEvent.clicks = 1;
1938 1948
1939 selection_click (MEvent.clicks, ev.x, ev.y); 1949 selection_click (MEvent.clicks, ev.x, ev.y);
1940 } 1950 }
1941 1951
1942 MEvent.button = Button1; 1952 MEvent.button = Button1;
1943 break; 1953 break;
1944 1954
1945 case Button3: 1955 case Button3:
1946 if (MEvent.button == Button3 && clickintime) 1956 if (MEvent.button == Button3 && clickintime)
1947 selection_rotate (ev.x, ev.y); 1957 selection_rotate (ev.x, ev.y);
1948 else 1958 else
1949 selection_extend (ev.x, ev.y, 1); 1959 selection_extend (ev.x, ev.y, 1);
1950 1960
1951 MEvent.button = Button3; 1961 MEvent.button = Button3;
1952 break; 1962 break;
1953 } 1963 }
1954 } 1964 }
1955 1965
1956 MEvent.time = ev.time; 1966 MEvent.time = ev.time;
1957 return; 1967 return;
1958 } 1968 }
1959 1969
1960 /* 1970 /*
1961 * Scrollbar window processing of button press 1971 * Scrollbar window processing of button press
1962 */ 1972 */
1963 if (isScrollbarWindow (ev.window)) 1973 if (scrollBar.state && ev.window == scrollBar.win)
1964 { 1974 {
1965 scrollBar.setIdle (); 1975 page_dirn direction = NO_DIR;
1976
1977 if (scrollBar.upButton (ev.y))
1978 direction = UP; /* up */
1979 else if (scrollBar.dnButton (ev.y))
1980 direction = DN; /* down */
1981
1982 scrollBar.state = STATE_IDLE;
1966 /* 1983 /*
1967 * Rxvt-style scrollbar: 1984 * Rxvt-style scrollbar:
1968 * move up if mouse is above slider 1985 * move up if mouse is above slider
1969 * move dn if mouse is below slider 1986 * move dn if mouse is below slider
1970 * 1987 *
… …
1979 /* 1996 /*
1980 * Mouse report disabled scrollbar: 1997 * Mouse report disabled scrollbar:
1981 * arrow buttons - send up/down 1998 * arrow buttons - send up/down
1982 * click on scrollbar - send pageup/down 1999 * click on scrollbar - send pageup/down
1983 */ 2000 */
1984 if ((scrollBar.style == R_SB_NEXT 2001 if (direction == UP)
1985 && scrollbarnext_upButton (ev.y))
1986 || (scrollBar.style == R_SB_RXVT
1987 && scrollbarrxvt_upButton (ev.y)))
1988 tt_printf ("\033[A"); 2002 tt_printf ("\033[A");
1989 else if ((scrollBar.style == R_SB_NEXT 2003 else if (direction == DN)
1990 && scrollbarnext_dnButton (ev.y))
1991 || (scrollBar.style == R_SB_RXVT
1992 && scrollbarrxvt_dnButton (ev.y)))
1993 tt_printf ("\033[B"); 2004 tt_printf ("\033[B");
1994 else 2005 else
1995 switch (ev.button) 2006 switch (ev.button)
1996 { 2007 {
1997 case Button2: 2008 case Button2:
… …
2004 tt_printf ("\033[5~"); 2015 tt_printf ("\033[5~");
2005 break; 2016 break;
2006 } 2017 }
2007 } 2018 }
2008 else 2019 else
2009#endif /* NO_SCROLLBAR_REPORT */ 2020#endif /* NO_SCROLLBAR_REPORT */
2010
2011 {
2012 char upordown = 0;
2013
2014 if (scrollBar.style == R_SB_NEXT)
2015 { 2021 {
2016 if (scrollbarnext_upButton (ev.y)) 2022 if (direction != NO_DIR)
2017 upordown = -1; /* up */
2018 else if (scrollbarnext_dnButton (ev.y))
2019 upordown = 1; /* down */
2020 }
2021 else if (scrollBar.style == R_SB_RXVT)
2022 {
2023 if (scrollbarrxvt_upButton (ev.y))
2024 upordown = -1; /* up */
2025 else if (scrollbarrxvt_dnButton (ev.y))
2026 upordown = 1; /* down */
2027 }
2028 if (upordown)
2029 { 2023 {
2030#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2024#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2025 if (!cont_scroll_ev.is_active ())
2031 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2026 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2032#endif 2027#endif
2033 if (scr_page (upordown < 0 ? UP : DN, 1)) 2028 if (scr_page (direction, 1))
2034 { 2029 {
2035 if (upordown < 0) 2030 if (direction == UP)
2036 scrollBar.setUp (); 2031 scrollBar.state = STATE_UP;
2037 else 2032 else
2038 scrollBar.setDn (); 2033 scrollBar.state = STATE_DOWN;
2039 } 2034 }
2040 } 2035 }
2041 else 2036 else
2042 switch (ev.button) 2037 switch (ev.button)
2043 { 2038 {
2044 case Button2: 2039 case Button2:
2045 switch (scrollbar_align) 2040 switch (scrollBar.align)
2046 { 2041 {
2047 case R_SB_ALIGN_TOP: 2042 case R_SB_ALIGN_TOP:
2048 csrO = 0; 2043 csrO = 0;
2049 break; 2044 break;
2050 case R_SB_ALIGN_CENTRE: 2045 case R_SB_ALIGN_CENTRE:
… …
2056 } 2051 }
2057 2052
2058 if (scrollBar.style == R_SB_XTERM 2053 if (scrollBar.style == R_SB_XTERM
2059 || scrollbar_above_slider (ev.y) 2054 || scrollbar_above_slider (ev.y)
2060 || scrollbar_below_slider (ev.y)) 2055 || scrollbar_below_slider (ev.y))
2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2062 2057
2063 scrollBar.setMotion (); 2058 scrollBar.state = STATE_MOTION;
2064 break; 2059 break;
2065 2060
2066 case Button1: 2061 case Button1:
2067 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2062 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2068 csrO = ev.y - scrollBar.top; 2063 csrO = ev.y - scrollBar.top;
2069 /* FALLTHROUGH */ 2064 /* FALLTHROUGH */
2070 2065
2071 case Button3: 2066 case Button3:
2072 if (scrollBar.style != R_SB_XTERM) 2067 if (scrollBar.style != R_SB_XTERM)
… …
2082 scr_page (DN, nrow - 1); 2077 scr_page (DN, nrow - 1);
2083# else 2078# else
2084 scr_page (DN, nrow / 4); 2079 scr_page (DN, nrow / 4);
2085# endif 2080# endif
2086 else 2081 else
2087 scrollBar.setMotion (); 2082 scrollBar.state = STATE_MOTION;
2088 } 2083 }
2089 else 2084 else
2090 { 2085 {
2091 scr_page ((ev.button == Button1 ? DN : UP), 2086 scr_page ((ev.button == Button1 ? DN : UP),
2092 (nrow 2087 (nrow
2093 * scrollbar_position (ev.y) 2088 * scrollbar_position (ev.y)
2094 / scrollbar_size ())); 2089 / scrollBar.size ()));
2095 } 2090 }
2096 2091
2097 break; 2092 break;
2098 } 2093 }
2099 } 2094 }
2100 2095
2101 return; 2096 return;
2102 } 2097 }
2103
2104#if MENUBAR
2105 /*
2106 * Menubar window processing of button press
2107 */
2108 if (isMenuBarWindow (ev.window))
2109 menubar_control (ev);
2110#endif
2111} 2098}
2112 2099
2113void 2100void
2114rxvt_term::button_release (XButtonEvent &ev) 2101rxvt_term::button_release (XButtonEvent &ev)
2115{ 2102{
… …
2117 2104
2118 csrO = 0; /* reset csr Offset */ 2105 csrO = 0; /* reset csr Offset */
2119 if (!bypass_keystate) 2106 if (!bypass_keystate)
2120 reportmode = !! (priv_modes & PrivMode_mouse_report); 2107 reportmode = !! (priv_modes & PrivMode_mouse_report);
2121 2108
2122 if (scrollbar_isUpDn ()) 2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2123 { 2110 {
2124 scrollBar.setIdle (); 2111 scrollBar.state = STATE_IDLE;
2125 scrollbar_show (0); 2112 scrollBar.show (0);
2126#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127 refresh_type &= ~SMOOTH_REFRESH;
2128#endif
2129 } 2113 }
2130 2114
2131#ifdef SELECTION_SCROLLING 2115#ifdef SELECTION_SCROLLING
2132 if (sel_scroll_ev.active)
2133 sel_scroll_ev.stop(); 2116 sel_scroll_ev.stop();
2134#endif 2117#endif
2135 2118
2136 if (ev.window == vt) 2119 if (ev.window == vt)
2137 { 2120 {
2121 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2122 return;
2123
2138#if ISO_14755 2124#if ISO_14755
2139 // 5.4 2125 // 5.4
2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2126 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141 return; 2127 return;
2142#endif 2128#endif
2129
2143 if (reportmode) 2130 if (reportmode)
2144 { 2131 {
2145 /* mouse report from vt window */ 2132 /* mouse report from vt window */
2146 /* don't report release of wheel "buttons" */ 2133 /* don't report release of wheel "buttons" */
2147 if (ev.button >= 4) 2134 if (ev.button >= 4)
… …
2158 mouse_report (ev); 2145 mouse_report (ev);
2159 } 2146 }
2160#else /* MOUSE_REPORT_DOUBLECLICK */ 2147#else /* MOUSE_REPORT_DOUBLECLICK */
2161 MEvent.button = AnyButton; 2148 MEvent.button = AnyButton;
2162 mouse_report (ev); 2149 mouse_report (ev);
2163#endif /* MOUSE_REPORT_DOUBLECLICK */ 2150#endif /* MOUSE_REPORT_DOUBLECLICK */
2164 return; 2151 return;
2165 } 2152 }
2166 2153
2167 /* 2154 /*
2168 * dumb hack to compensate for the failure of click-and-drag 2155 * dumb hack to compensate for the failure of click-and-drag
… …
2171 if (priv_modes & PrivMode_mouse_report 2158 if (priv_modes & PrivMode_mouse_report
2172 && bypass_keystate 2159 && bypass_keystate
2173 && ev.button == Button1 && MEvent.clicks <= 1) 2160 && ev.button == Button1 && MEvent.clicks <= 1)
2174 selection_extend (ev.x, ev.y, 0); 2161 selection_extend (ev.x, ev.y, 0);
2175 2162
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2179 switch (ev.button) 2163 switch (ev.button)
2180 { 2164 {
2181 case Button1: 2165 case Button1:
2182 case Button3: 2166 case Button3:
2183 selection_make (ev.time); 2167 selection_make (ev.time);
2184 break; 2168 break;
2169
2185 case Button2: 2170 case Button2:
2186 selection_request (ev.time, ev.x, ev.y); 2171 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2187 break; 2173 break;
2174
2188#ifdef MOUSE_WHEEL 2175#ifdef MOUSE_WHEEL
2189 case Button4: 2176 case Button4:
2190 case Button5: 2177 case Button5:
2191 { 2178 {
2192 int i; 2179 int i;
… …
2194 2181
2195 v = ev.button == Button4 ? UP : DN; 2182 v = ev.button == Button4 ? UP : DN;
2196 2183
2197 if (ev.state & ShiftMask) 2184 if (ev.state & ShiftMask)
2198 i = 1; 2185 i = 1;
2199 else if (OPTION (Opt_mouseWheelScrollPage)) 2186 else if (option (Opt_mouseWheelScrollPage))
2200 i = nrow - 1; 2187 i = nrow - 1;
2201 else 2188 else
2202 i = 5; 2189 i = 5;
2203 2190
2204# ifdef MOUSE_SLIP_WHEELING 2191# ifdef MOUSE_SLIP_WHEELING
… …
2206 { 2193 {
2207 mouse_slip_wheel_speed += v ? -1 : 1; 2194 mouse_slip_wheel_speed += v ? -1 : 1;
2208 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2195 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2209 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2196 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2210 2197
2211 if (slip_wheel_ev.at < NOW) 2198 if (!slip_wheel_ev.is_active ())
2212 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2199 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2213
2214 slip_wheel_ev.start ();
2215 } 2200 }
2216 else 2201 else
2202# endif
2217 { 2203 {
2218# endif
2219 scr_page (v, i); 2204 scr_page (v, i);
2220 scrollbar_show (1); 2205 scrollBar.show (1);
2221# ifdef MOUSE_SLIP_WHEELING
2222 } 2206 }
2223# endif
2224 } 2207 }
2225 break; 2208 break;
2226#endif 2209#endif
2227 } 2210 }
2228 } 2211 }
2229#ifdef MENUBAR
2230 else if (isMenuBarWindow (ev.window))
2231 menubar_control (ev);
2232#endif
2233} 2212}
2234
2235#ifdef TRANSPARENT
2236#if TINTING
2237/* taken from aterm-0.4.2 */
2238
2239typedef uint32_t RUINT32T;
2240
2241void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2242{
2243 int sh_r, sh_g, sh_b;
2244 RUINT32T mask_r, mask_g, mask_b;
2245 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2246 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2247 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2248 int i;
2249
2250 Visual *visual = display->visual;
2251
2252 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2253
2254 /* for convenience */
2255 mask_r = visual->red_mask;
2256 mask_g = visual->green_mask;
2257 mask_b = visual->blue_mask;
2258
2259 /* boring lookup table pre-initialization */
2260 switch (srcImage->bits_per_pixel) {
2261 case 15:
2262 if ((mask_r != 0x7c00) ||
2263 (mask_g != 0x03e0) ||
2264 (mask_b != 0x001f))
2265 return;
2266 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2267 lookup_r = lookup;
2268 lookup_g = lookup+32;
2269 lookup_b = lookup+32+32;
2270 sh_r = 10;
2271 sh_g = 5;
2272 sh_b = 0;
2273 break;
2274 case 16:
2275 if ((mask_r != 0xf800) ||
2276 (mask_g != 0x07e0) ||
2277 (mask_b != 0x001f))
2278 return;
2279 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2280 lookup_r = lookup;
2281 lookup_g = lookup+32;
2282 lookup_b = lookup+32+64;
2283 sh_r = 11;
2284 sh_g = 5;
2285 sh_b = 0;
2286 break;
2287 case 24:
2288 if ((mask_r != 0xff0000) ||
2289 (mask_g != 0x00ff00) ||
2290 (mask_b != 0x0000ff))
2291 return;
2292 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2293 lookup_r = lookup;
2294 lookup_g = lookup+256;
2295 lookup_b = lookup+256+256;
2296 sh_r = 16;
2297 sh_g = 8;
2298 sh_b = 0;
2299 break;
2300 case 32:
2301 if ((mask_r != 0xff0000) ||
2302 (mask_g != 0x00ff00) ||
2303 (mask_b != 0x0000ff))
2304 return;
2305 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2306 lookup_r = lookup;
2307 lookup_g = lookup+256;
2308 lookup_b = lookup+256+256;
2309 sh_r = 16;
2310 sh_g = 8;
2311 sh_b = 0;
2312 break;
2313 default:
2314 return; /* we do not support this color depth */
2315 }
2316
2317 /* prepare limits for color transformation (each channel is handled separately) */
2318 if (shade < 0) {
2319 shade = -shade;
2320 if (shade < 0) shade = 0;
2321 if (shade > 100) shade = 100;
2322
2323 lower_lim_r = 65535-rm;
2324 lower_lim_g = 65535-gm;
2325 lower_lim_b = 65535-bm;
2326
2327 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2328 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2329 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2330
2331 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2332 } else {
2333 if (shade < 0) shade = 0;
2334 if (shade > 100) shade = 100;
2335
2336 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2337
2338 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2339 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2340 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2341 }
2342
2343 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2344 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2345 {
2346 unsigned int tmp;
2347
2348 tmp = lower_lim_r;
2349 lower_lim_r = lower_lim_b;
2350 lower_lim_b = tmp;
2351
2352 tmp = upper_lim_r;
2353 upper_lim_r = upper_lim_b;
2354 upper_lim_b = tmp;
2355 }
2356
2357 /* fill our lookup tables */
2358 for (i = 0; i <= mask_r>>sh_r; i++)
2359 {
2360 RUINT32T tmp;
2361 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2362 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2363 lookup_r[i] = (tmp/65535)<<sh_r;
2364 }
2365 for (i = 0; i <= mask_g>>sh_g; i++)
2366 {
2367 RUINT32T tmp;
2368 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2369 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2370 lookup_g[i] = (tmp/65535)<<sh_g;
2371 }
2372 for (i = 0; i <= mask_b>>sh_b; i++)
2373 {
2374 RUINT32T tmp;
2375 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2376 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2377 lookup_b[i] = (tmp/65535)<<sh_b;
2378 }
2379
2380 /* apply table to input image (replacing colors by newly calculated ones) */
2381 switch (srcImage->bits_per_pixel)
2382 {
2383 case 15:
2384 {
2385 unsigned short *p1, *pf, *p, *pl;
2386 p1 = (unsigned short *) srcImage->data;
2387 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2388 while (p1 < pf)
2389 {
2390 p = p1;
2391 pl = p1 + srcImage->width;
2392 for (; p < pl; p++)
2393 {
2394 *p = lookup_r[(*p & 0x7c00)>>10] |
2395 lookup_g[(*p & 0x03e0)>> 5] |
2396 lookup_b[(*p & 0x001f)];
2397 }
2398 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2399 }
2400 break;
2401 }
2402 case 16:
2403 {
2404 unsigned short *p1, *pf, *p, *pl;
2405 p1 = (unsigned short *) srcImage->data;
2406 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2407 while (p1 < pf)
2408 {
2409 p = p1;
2410 pl = p1 + srcImage->width;
2411 for (; p < pl; p++)
2412 {
2413 *p = lookup_r[(*p & 0xf800)>>11] |
2414 lookup_g[(*p & 0x07e0)>> 5] |
2415 lookup_b[(*p & 0x001f)];
2416 }
2417 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2418 }
2419 break;
2420 }
2421 case 24:
2422 {
2423 unsigned char *p1, *pf, *p, *pl;
2424 p1 = (unsigned char *) srcImage->data;
2425 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2426 while (p1 < pf)
2427 {
2428 p = p1;
2429 pl = p1 + srcImage->width * 3;
2430 for (; p < pl; p += 3)
2431 {
2432 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2433 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2434 p[2] = lookup_r[(p[2] & 0x0000ff)];
2435 }
2436 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2437 }
2438 break;
2439 }
2440 case 32:
2441 {
2442 RUINT32T *p1, *pf, *p, *pl;
2443 p1 = (RUINT32T *) srcImage->data;
2444 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2445
2446 while (p1 < pf)
2447 {
2448 p = p1;
2449 pl = p1 + srcImage->width;
2450 for (; p < pl; p++)
2451 {
2452 *p = lookup_r[(*p & 0xff0000)>>16] |
2453 lookup_g[(*p & 0x00ff00)>> 8] |
2454 lookup_b[(*p & 0x0000ff)] |
2455 (*p & ~0xffffff);
2456 }
2457 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2458 }
2459 break;
2460 }
2461 }
2462
2463 free (lookup);
2464}
2465#endif
2466
2467/*
2468 * Check our parents are still who we think they are.
2469 * Do transparency updates if required
2470 */
2471int
2472rxvt_term::check_our_parents ()
2473{
2474 int i, pchanged, aformat, have_pixmap, rootdepth;
2475 unsigned long nitems, bytes_after;
2476 Atom atype;
2477 unsigned char *prop = NULL;
2478 Window root, oldp, *list;
2479 Pixmap rootpixmap = None;
2480 XWindowAttributes wattr, wrootattr;
2481 dDisp;
2482
2483 pchanged = 0;
2484
2485 if (!OPTION (Opt_transparent))
2486 return pchanged; /* Don't try any more */
2487
2488 XGetWindowAttributes (disp, display->root, &wrootattr);
2489 rootdepth = wrootattr.depth;
2490
2491 XGetWindowAttributes (disp, parent[0], &wattr);
2492
2493 if (rootdepth != wattr.depth)
2494 {
2495 if (am_transparent)
2496 {
2497 pchanged = 1;
2498 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2499 am_transparent = am_pixmap_trans = 0;
2500 }
2501
2502 return pchanged; /* Don't try any more */
2503 }
2504
2505 /* Get all X ops out of the queue so that our information is up-to-date. */
2506 XSync (disp, False);
2507
2508 /*
2509 * Make the frame window set by the window manager have
2510 * the root background. Some window managers put multiple nested frame
2511 * windows for each client, so we have to take care about that.
2512 */
2513 i = (xa[XA_XROOTPMAP_ID]
2514 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2515 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2516 &nitems, &bytes_after, &prop) == Success);
2517
2518 if (!i || prop == NULL)
2519 i = (xa[XA_ESETROOT_PMAP_ID]
2520 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2521 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2522 &nitems, &bytes_after, &prop) == Success);
2523
2524 if (!i || prop == NULL
2525#if TINTING
2526 || !rs[Rs_color + Color_tint]
2527#endif
2528 )
2529 have_pixmap = 0;
2530 else
2531 {
2532 have_pixmap = 1;
2533 rootpixmap = *(Pixmap *)prop;
2534 XFree (prop);
2535 }
2536
2537 if (have_pixmap)
2538 {
2539 /*
2540 * Copy display->root pixmap transparency
2541 */
2542 int sx, sy, nx, ny;
2543 unsigned int nw, nh;
2544 Window cr;
2545 XImage *image;
2546 GC gc;
2547 XGCValues gcvalue;
2548
2549 XTranslateCoordinates (disp, parent[0], display->root,
2550 0, 0, &sx, &sy, &cr);
2551 nw = (unsigned int)szHint.width;
2552 nh = (unsigned int)szHint.height;
2553 nx = ny = 0;
2554
2555 if (sx < 0)
2556 {
2557 nw += sx;
2558 nx = -sx;
2559 sx = 0;
2560 }
2561
2562 if (sy < 0)
2563 {
2564 nh += sy;
2565 ny = -sy;
2566 sy = 0;
2567 }
2568
2569 min_it (nw, (unsigned int) (wrootattr.width - sx));
2570 min_it (nh, (unsigned int) (wrootattr.height - sy));
2571
2572 XSync (disp, False);
2573 allowedxerror = -1;
2574 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2575
2576 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2577 /* XXX: may need a delay here? */
2578 allowedxerror = 0;
2579
2580 if (image == NULL)
2581 {
2582 if (am_transparent && am_pixmap_trans)
2583 {
2584 pchanged = 1;
2585 if (pixmap != None)
2586 {
2587 XFreePixmap (disp, pixmap);
2588 pixmap = None;
2589 }
2590 }
2591
2592 am_pixmap_trans = 0;
2593 }
2594 else
2595 {
2596 if (pixmap != None)
2597 XFreePixmap (disp, pixmap);
2598
2599#if TINTING
2600 if (ISSET_PIXCOLOR (Color_tint))
2601 {
2602 unsigned short rm, gm, bm;
2603 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2604
2605 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2606
2607 ShadeXImage (display, image, shade, rm, gm, bm);
2608 }
2609#endif
2610
2611 pixmap = XCreatePixmap (disp, vt,
2612 szHint.width, szHint.height, image->depth);
2613 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2614 XPutImage (disp, pixmap, gc, image, 0, 0,
2615 nx, ny, image->width, image->height);
2616 XFreeGC (disp, gc);
2617 XDestroyImage (image);
2618 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2619 XClearWindow (disp, parent[0]);
2620
2621 if (!am_transparent || !am_pixmap_trans)
2622 pchanged = 1;
2623
2624 am_transparent = am_pixmap_trans = 1;
2625 }
2626 }
2627
2628 if (am_pixmap_trans)
2629 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2630 else
2631 {
2632 unsigned int n;
2633 /*
2634 * InheritPixmap transparency
2635 */
2636 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637 {
2638 oldp = parent[i];
2639 XQueryTree (disp, parent[i - 1], &root,
2640 &parent[i], &list, &n);
2641 XFree (list);
2642
2643 if (parent[i] == display->root)
2644 {
2645 if (oldp != None)
2646 pchanged = 1;
2647
2648 break;
2649 }
2650
2651 if (oldp != parent[i])
2652 pchanged = 1;
2653 }
2654
2655 n = 0;
2656
2657 if (pchanged)
2658 {
2659 for (; n < (unsigned int)i; n++)
2660 {
2661 XGetWindowAttributes (disp, parent[n], &wattr);
2662 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2663 {
2664 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2665 break;
2666 }
2667 }
2668 }
2669
2670 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2671 {
2672 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2673 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2674 am_transparent = 0;
2675 /* XXX: also turn off Opt_transparent? */
2676 }
2677 else
2678 {
2679#if WAIT_FOR_WM
2680 /* wait (an arbitrary period) for the WM to do its thing
2681 * needed for fvwm2.2.2 (and before?) */
2682 sleep (1);
2683#endif
2684 for (n = 0; n < (unsigned int)i; n++)
2685 {
2686 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2687 XClearWindow (disp, parent[n]);
2688 }
2689
2690 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2691 am_transparent = 1;
2692 }
2693
2694 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2695 parent[i] = None;
2696 }
2697
2698 if (scrollBar.win)
2699 {
2700 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2701 scrollBar.setIdle ();
2702 scrollbar_show (0);
2703 }
2704
2705 if (am_transparent)
2706 {
2707 want_refresh = want_full_refresh = 1;
2708 if (am_pixmap_trans)
2709 flush ();
2710 }
2711
2712 return pchanged;
2713}
2714#endif
2715 2213
2716/*}}} */ 2214/*}}} */
2717 2215
2718bool 2216void
2719rxvt_term::cmd_parse () 2217rxvt_term::cmd_parse ()
2720{ 2218{
2721 bool flag = false;
2722 wchar_t ch = NOCHAR; 2219 wchar_t ch = NOCHAR;
2723 char *seq_begin; // remember start of esc-sequence here 2220 char *seq_begin; // remember start of esc-sequence here
2724 2221
2725 for (;;) 2222 for (;;)
2726 { 2223 {
2727 if (ch == NOCHAR) 2224 if (ecb_unlikely (ch == NOCHAR))
2728 { 2225 {
2729 seq_begin = cmdbuf_ptr; 2226 seq_begin = cmdbuf_ptr;
2730 ch = next_char (); 2227 ch = next_char ();
2731 2228
2732 if (ch == NOCHAR) 2229 if (ch == NOCHAR)
2733 break; 2230 break;
2734 } 2231 }
2735 2232
2736 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2233 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2737 { 2234 {
2738 if (!seen_input) 2235 if (ecb_unlikely (!seen_input))
2739 { 2236 {
2740 seen_input = 1; 2237 seen_input = 1;
2741 // many badly-written programs (e.g. jed) contain a race condition: 2238 // many badly-written programs (e.g. jed) contain a race condition:
2742 // they first read the screensize and then install a SIGWINCH handler. 2239 // they first read the screensize and then install a SIGWINCH handler.
2743 // some window managers resize the window early, and these programs 2240 // some window managers resize the window early, and these programs
… …
2756 wchar_t *str = buf; 2253 wchar_t *str = buf;
2757 wchar_t *eol = str + min (ncol, UBUFSIZ); 2254 wchar_t *eol = str + min (ncol, UBUFSIZ);
2758 2255
2759 for (;;) 2256 for (;;)
2760 { 2257 {
2761 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2258 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2762 break; 2259 break;
2763 2260
2764 *str++ = ch; 2261 *str++ = ch;
2765 2262
2766 if (ch == C0_LF || str >= eol) 2263 if (ecb_unlikely (ch == C0_LF || str >= eol))
2767 { 2264 {
2768 if (ch == C0_LF) 2265 if (ch == C0_LF)
2769 nlines++; 2266 nlines++;
2770 2267
2771 refresh_count++; 2268 refresh_count++;
2772 2269
2773 if (!OPTION (Opt_jumpScroll) 2270 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2774 || (refresh_count >= refresh_limit * (nrow - 1)))
2775 { 2271 {
2776 refreshnow = true;
2777 refresh_count = 0; 2272 refresh_count = 0;
2273
2274 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2275 {
2276 refreshnow = true;
2778 ch = NOCHAR; 2277 ch = NOCHAR;
2779 break; 2278 break;
2279 }
2780 } 2280 }
2781 2281
2782 // scr_add_lines only works for nlines <= nrow - 1. 2282 // scr_add_lines only works for nlines <= nrow - 1.
2783 if (nlines >= nrow - 1) 2283 if (nlines >= nrow - 1)
2784 { 2284 {
2285 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2785 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2286 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2786 scr_add_lines (buf, str - buf, nlines); 2287 scr_add_lines (buf, str - buf, nlines);
2787 2288
2788 nlines = 0; 2289 nlines = 0;
2789 str = buf; 2290 str = buf;
2790 eol = str + min (ncol, UBUFSIZ); 2291 eol = str + min (ncol, UBUFSIZ);
… …
2805 2306
2806 seq_begin = cmdbuf_ptr; 2307 seq_begin = cmdbuf_ptr;
2807 ch = next_char (); 2308 ch = next_char ();
2808 } 2309 }
2809 2310
2311 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2810 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2312 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2811 scr_add_lines (buf, str - buf, nlines); 2313 scr_add_lines (buf, str - buf, nlines);
2812 2314
2813 /* 2315 /*
2814 * If there have been a lot of new lines, then update the screen 2316 * If there have been a lot of new lines, then update the screen
2815 * What the heck I'll cheat and only refresh less than every page-full. 2317 * What the heck we'll cheat and only refresh less than every page-full.
2816 * the number of pages between refreshes is refresh_limit, which 2318 * if skipScroll is enabled.
2817 * is incremented here because we must be doing flat-out scrolling.
2818 */ 2319 */
2819 if (refreshnow) 2320 if (refreshnow)
2820 { 2321 {
2821 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2822 refresh_limit++;
2823 else
2824 {
2825 flag = true;
2826 scr_refresh (refresh_type); 2322 scr_refresh ();
2827 want_refresh = 1; 2323 want_refresh = 1;
2828 }
2829 } 2324 }
2830
2831 } 2325 }
2832 else 2326 else
2833 { 2327 {
2834 try 2328 try
2835 { 2329 {
… …
2843 } 2337 }
2844 2338
2845 ch = NOCHAR; 2339 ch = NOCHAR;
2846 } 2340 }
2847 } 2341 }
2848
2849 return flag;
2850} 2342}
2851 2343
2852// read the next character 2344// read the next character
2853wchar_t 2345wchar_t
2854rxvt_term::next_char () 2346rxvt_term::next_char () NOTHROW
2855{ 2347{
2856 while (cmdbuf_ptr < cmdbuf_endp) 2348 while (cmdbuf_ptr < cmdbuf_endp)
2857 { 2349 {
2858 // assume 7-bit to be ascii ALWAYS 2350 // assume 7-bit to be ascii ALWAYS
2859 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2351 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2860 return *cmdbuf_ptr++; 2352 return *cmdbuf_ptr++;
2861 2353
2862 wchar_t wc; 2354 wchar_t wc;
2863 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2355 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2864 2356
… …
2868 cmdbuf_ptr = cmdbuf_endp; 2360 cmdbuf_ptr = cmdbuf_endp;
2869 break; 2361 break;
2870 } 2362 }
2871 2363
2872 if (len == (size_t)-1) 2364 if (len == (size_t)-1)
2365 {
2366 mbstate.reset (); // reset now undefined conversion state
2873 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2367 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2368 }
2874 2369
2875 // assume wchar == unicode 2370 // assume wchar == unicode
2876 cmdbuf_ptr += len; 2371 cmdbuf_ptr += len;
2877 return wc & UNICODE_MASK; 2372 return wc & UNICODE_MASK;
2878 } 2373 }
… …
2880 return NOCHAR; 2375 return NOCHAR;
2881} 2376}
2882 2377
2883// read the next octet 2378// read the next octet
2884uint32_t 2379uint32_t
2885rxvt_term::next_octet () 2380rxvt_term::next_octet () NOTHROW
2886{ 2381{
2887 return cmdbuf_ptr < cmdbuf_endp 2382 return cmdbuf_ptr < cmdbuf_endp
2888 ? (unsigned char)*cmdbuf_ptr++ 2383 ? (unsigned char)*cmdbuf_ptr++
2889 : NOCHAR; 2384 : NOCHAR;
2890} 2385}
2891 2386
2892/* rxvt_cmd_getc () - Return next input character */ 2387static class out_of_input out_of_input;
2893/* 2388
2894 * Return the next input character after first passing any keyboard input
2895 * to the command.
2896 */
2897wchar_t 2389wchar_t
2898rxvt_term::cmd_getc () 2390rxvt_term::cmd_getc () THROW ((class out_of_input))
2899{ 2391{
2900 wchar_t c = next_char (); 2392 wchar_t c = next_char ();
2901 2393
2902 if (c == NOCHAR) 2394 if (c == NOCHAR)
2903 throw out_of_input; 2395 throw out_of_input;
2904 2396
2905 return c; 2397 return c;
2906} 2398}
2907 2399
2908uint32_t 2400uint32_t
2909rxvt_term::cmd_get8 () 2401rxvt_term::cmd_get8 () THROW ((class out_of_input))
2910{ 2402{
2911 uint32_t c = next_octet (); 2403 uint32_t c = next_octet ();
2912 2404
2913 if (c == NOCHAR) 2405 if (c == NOCHAR)
2914 throw out_of_input; 2406 throw out_of_input;
… …
2920/*----------------------------------------------------------------------*/ 2412/*----------------------------------------------------------------------*/
2921#ifdef PRINTPIPE 2413#ifdef PRINTPIPE
2922FILE * 2414FILE *
2923rxvt_term::popen_printer () 2415rxvt_term::popen_printer ()
2924{ 2416{
2925 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2417 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2926 2418
2927 if (stream == NULL) 2419 if (stream == NULL)
2928 rxvt_warn ("can't open printer pipe, not printing.\n"); 2420 rxvt_warn ("can't open printer pipe, not printing.\n");
2929 2421
2930 return stream; 2422 return stream;
… …
2941 * simulate attached vt100 printer 2433 * simulate attached vt100 printer
2942 */ 2434 */
2943void 2435void
2944rxvt_term::process_print_pipe () 2436rxvt_term::process_print_pipe ()
2945{ 2437{
2946 int done; 2438 FILE *fd = popen_printer ();
2947 FILE *fd;
2948 2439
2949 if ((fd = popen_printer ()) == NULL) 2440 if (!fd)
2950 return; 2441 return;
2951 2442
2952 /* 2443 /*
2953 * Send all input to the printer until either ESC[4i or ESC[?4i 2444 * Send all input to the printer until either ESC[4i or ESC[?4i
2954 * is received. 2445 * is received.
2955 */ 2446 */
2956 for (done = 0; !done;) 2447 for (int done = 0; !done; )
2957 { 2448 {
2958 unsigned char buf[8]; 2449 unsigned char buf[8];
2959 unicode_t ch; 2450 unicode_t ch;
2960 unsigned int i, len; 2451 unsigned int i, len;
2961 2452
… …
2980 { 2471 {
2981 if ((buf[len++] = cmd_getc ()) == 'i') 2472 if ((buf[len++] = cmd_getc ()) == 'i')
2982 break; /* done = 1 */ 2473 break; /* done = 1 */
2983 } 2474 }
2984 } 2475 }
2985 2476
2986 for (i = 0; i < len; i++) 2477 for (i = 0; i < len; i++)
2987 if (putc (buf[i], fd) == EOF) 2478 if (putc (buf[i], fd) == EOF)
2988 { 2479 {
2989 done = 1; 2480 done = 1;
2990 break; 2481 break;
… …
2992 } 2483 }
2993 } 2484 }
2994 2485
2995 pclose_printer (fd); 2486 pclose_printer (fd);
2996} 2487}
2997#endif /* PRINTPIPE */ 2488#endif /* PRINTPIPE */
2998/*}}} */ 2489/*}}} */
2999 2490
3000/* *INDENT-OFF* */
3001enum { 2491enum {
3002 C1_40 = 0x40, 2492 C1_40 = 0x40,
3003 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2493 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
3004 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2494 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
3005 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2495 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
3006 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2496 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
3007}; 2497};
3008/* *INDENT-ON* */
3009 2498
3010/*{{{ process non-printing single characters */ 2499/*{{{ process non-printing single characters */
3011void 2500void
3012rxvt_term::process_nonprinting (unicode_t ch) 2501rxvt_term::process_nonprinting (unicode_t ch)
3013{ 2502{
… …
3052 process_dcs_seq (); 2541 process_dcs_seq ();
3053 break; 2542 break;
3054 case 0x9b: /* CSI */ 2543 case 0x9b: /* CSI */
3055 process_csi_seq (); 2544 process_csi_seq ();
3056 break; 2545 break;
3057 case 0x9d: /* CSI */ 2546 case 0x9d: /* OSC */
3058 process_osc_seq (); 2547 process_osc_seq ();
3059 break; 2548 break;
3060#endif 2549#endif
3061 } 2550 }
3062} 2551}
… …
3106 break; 2595 break;
3107 case 'Z': /* identify the terminal type */ 2596 case 'Z': /* identify the terminal type */
3108 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2597 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3109 break; 2598 break;
3110 case '<': /* turn off VT52 mode */ 2599 case '<': /* turn off VT52 mode */
3111 PrivMode (0, PrivMode_vt52); 2600 set_privmode (PrivMode_vt52, 0);
3112 break; 2601 break;
3113 case 'F': /* use special graphics character set */ 2602 case 'F': /* use special graphics character set */
3114 case 'G': /* use regular character set */ 2603 case 'G': /* use regular character set */
3115 /* unimplemented */ 2604 /* unimplemented */
3116 break; 2605 break;
… …
3135 return; 2624 return;
3136 } 2625 }
3137 2626
3138 switch (ch) 2627 switch (ch)
3139 { 2628 {
3140 /* case 1: do_tek_mode (); break; */
3141 case '#': 2629 case '#':
3142 if (cmd_getc () == '8') 2630 if (cmd_getc () == '8')
3143 scr_E (); 2631 scr_E ();
3144 break; 2632 break;
3145 case '(': 2633 case '(':
… …
3152 scr_charset_set (2, (unsigned int)cmd_getc ()); 2640 scr_charset_set (2, (unsigned int)cmd_getc ());
3153 break; 2641 break;
3154 case '+': 2642 case '+':
3155 scr_charset_set (3, (unsigned int)cmd_getc ()); 2643 scr_charset_set (3, (unsigned int)cmd_getc ());
3156 break; 2644 break;
3157#if ENABLE_FRILLS 2645#if !ENABLE_MINIMAL
3158 case '6': 2646 case '6':
3159 scr_backindex (); 2647 scr_backindex ();
3160 break; 2648 break;
3161#endif 2649#endif
3162 case '7': 2650 case '7':
3163 scr_cursor (SAVE); 2651 scr_cursor (SAVE);
3164 break; 2652 break;
3165 case '8': 2653 case '8':
3166 scr_cursor (RESTORE); 2654 scr_cursor (RESTORE);
3167 break; 2655 break;
3168#if ENABLE_FRILLS 2656#if !ENABLE_MINIMAL
3169 case '9': 2657 case '9':
3170 scr_forwardindex (); 2658 scr_forwardindex ();
3171 break; 2659 break;
3172#endif 2660#endif
2661 // DECPAM/DECPNM
3173 case '=': 2662 case '=':
3174 case '>': 2663 case '>':
3175 PrivMode ((ch == '='), PrivMode_aplKP); 2664 set_privmode (PrivMode_aplKP, ch == '=');
3176 break; 2665 break;
3177 2666
3178 case C1_40: 2667 case C1_40:
3179 cmd_getc (); 2668 cmd_getc ();
3180 break; 2669 break;
… …
3184 2673
3185 /* 8.3.87: NEXT LINE */ 2674 /* 8.3.87: NEXT LINE */
3186 case C1_NEL: /* ESC E */ 2675 case C1_NEL: /* ESC E */
3187 { 2676 {
3188 wchar_t nlcr[] = { C0_LF, C0_CR }; 2677 wchar_t nlcr[] = { C0_LF, C0_CR };
3189 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2678 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3190 } 2679 }
3191 break; 2680 break;
3192 2681
3193 /* kidnapped escape sequence: Should be 8.3.48 */ 2682 /* kidnapped escape sequence: Should be 8.3.48 */
3194 case C1_ESA: /* ESC G */ 2683 case C1_ESA: /* ESC G */
3195 process_graphics (); 2684 // used by original rxvt for rob nations own graphics mode
2685 if (cmd_getc () == 'Q')
2686 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3196 break; 2687 break;
3197 2688
3198 /* 8.3.63: CHARACTER TABULATION SET */ 2689 /* 8.3.63: CHARACTER TABULATION SET */
3199 case C1_HTS: /* ESC H */ 2690 case C1_HTS: /* ESC H */
3200 scr_set_tab (1); 2691 scr_set_tab (1);
… …
3204 case C1_RI: /* ESC M */ 2695 case C1_RI: /* ESC M */
3205 scr_index (DN); 2696 scr_index (DN);
3206 break; 2697 break;
3207 2698
3208 /* 8.3.142: SINGLE-SHIFT TWO */ 2699 /* 8.3.142: SINGLE-SHIFT TWO */
3209 /*case C1_SS2: scr_single_shift (2); break; */ 2700 /* case C1_SS2: break; */
3210 2701
3211 /* 8.3.143: SINGLE-SHIFT THREE */ 2702 /* 8.3.143: SINGLE-SHIFT THREE */
3212 /*case C1_SS3: scr_single_shift (3); break; */ 2703 /* case C1_SS3: break; */
3213 2704
3214 /* 8.3.27: DEVICE CONTROL STRING */ 2705 /* 8.3.27: DEVICE CONTROL STRING */
3215 case C1_DCS: /* ESC P */ 2706 case C1_DCS: /* ESC P */
3216 process_dcs_seq (); 2707 process_dcs_seq ();
3217 break; 2708 break;
… …
3219 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2710 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3220 case C1_SCI: /* ESC Z */ 2711 case C1_SCI: /* ESC Z */
3221 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2712 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3222 break; /* steal obsolete ESC [ c */ 2713 break; /* steal obsolete ESC [ c */
3223 2714
3224 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2715 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3225 case C1_CSI: /* ESC [ */ 2716 case C1_CSI: /* ESC [ */
3226 process_csi_seq (); 2717 process_csi_seq ();
3227 break; 2718 break;
3228 2719
3229 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2720 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3230 case C1_OSC: /* ESC ] */ 2721 case C1_OSC: /* ESC ] */
3231 process_osc_seq (); 2722 process_osc_seq ();
3232 break; 2723 break;
3233 2724
3234 /* 8.3.106: RESET TO INITIAL STATE */ 2725 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3235 case 'c': 2726 case 'c':
3236 mbstate.reset (); 2727 mbstate.reset ();
3237 scr_poweron (); 2728 scr_poweron ();
3238 scrollbar_show (1); 2729 scrollBar.show (1);
3239 break; 2730 break;
3240 2731
3241 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2732 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3242 case 'n': 2733 case 'n':
3243 scr_charset_choose (2); 2734 scr_charset_choose (2);
… …
3250 } 2741 }
3251} 2742}
3252/*}}} */ 2743/*}}} */
3253 2744
3254/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2745/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3255/* *INDENT-OFF* */
3256enum { 2746enum {
3257 CSI_ICH = 0x40, 2747 CSI_ICH = 0x40,
3258 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2748 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3259 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2749 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3260 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2750 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3263 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2753 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3264 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2754 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3265 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2755 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3266}; 2756};
3267 2757
3268#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2758#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3269 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2759 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3270 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2760 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3271#define get_byte_array_bit(array, bit) \ 2761#define get_byte_array_bit(array, bit) \
3272 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2762 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3273 2763
3274const unsigned char csi_defaults[] = 2764static const unsigned char csi_defaults[] =
3275 { 2765 {
3276 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2766 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3277 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2767 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3278 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2768 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3279 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2769 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3280 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2770 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3281 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2771 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3282 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2772 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3283 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2773 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3284 }; 2774 };
3285/* *INDENT-ON* */
3286 2775
3287void 2776void
3288rxvt_term::process_csi_seq () 2777rxvt_term::process_csi_seq ()
3289{ 2778{
3290 unicode_t ch, priv, i; 2779 unicode_t ch, priv, i;
3291 unsigned int nargs, p; 2780 unsigned int nargs, p;
3292 int n, ndef; 2781 int n, ndef;
3293 int arg[ESC_ARGS]; 2782 int arg[ESC_ARGS] = { };
3294 2783
3295 for (nargs = ESC_ARGS; nargs > 0;) 2784 nargs = 0;
3296 arg[--nargs] = 0;
3297 2785
3298 priv = 0; 2786 priv = 0;
3299 ch = cmd_getc (); 2787 ch = cmd_getc ();
3300 if (ch >= '<' && ch <= '?') 2788 if ((ch >= '<' && ch <= '?') || ch == '!')
2789 {
3301 { /* '<' '=' '>' '?' */ 2790 /* '<' '=' '>' '?' '!' */
3302 priv = ch; 2791 priv = ch;
3303 ch = cmd_getc (); 2792 ch = cmd_getc ();
3304 } 2793 }
3305 2794
3306 /* read any numerical arguments */ 2795 /* read any numerical arguments */
… …
3335 ndef = get_byte_array_bit (csi_defaults, i); 2824 ndef = get_byte_array_bit (csi_defaults, i);
3336 for (p = 0; p < nargs; p++) 2825 for (p = 0; p < nargs; p++)
3337 if (arg[p] == -1) 2826 if (arg[p] == -1)
3338 arg[p] = ndef; 2827 arg[p] = ndef;
3339 2828
3340#ifdef DEBUG_CMD
3341 fprintf (stderr, "CSI ");
3342 for (p = 0; p < nargs; p++)
3343 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3344 fprintf (stderr, "%c\n", ch);
3345#endif
3346
3347 /* 2829 /*
3348 * private mode handling 2830 * private mode handling
3349 */ 2831 */
3350 if (priv) 2832 if (priv)
3351 { 2833 {
3352 switch (priv) 2834 switch (priv)
3353 { 2835 {
3354 case '>': 2836 case '>':
3355 if (ch == CSI_DA) /* secondary device attributes */ 2837 if (ch == CSI_DA) /* secondary device attributes */
3356 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2838 {
2839 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2840 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2841 //
2842 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2843 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2844 // versions.
2845 //
2846 tt_printf ("\033[>%d;95;0c", 'U');
2847 }
3357 break; 2848 break;
2849
3358 case '?': 2850 case '?':
3359 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2851 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3360 process_terminal_mode (ch, priv, nargs, arg); 2852 process_terminal_mode (ch, priv, nargs, arg);
3361 break; 2853 break;
2854
2855 case '!':
2856 if (ch == CSI_70)
2857 {
2858 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2859 scr_soft_reset ();
2860
2861 static const int pm_h[] = { 7, 25 };
2862 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2863
2864 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2865 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3362 } 2866 }
2867 break;
2868 }
2869
3363 return; 2870 return;
3364 } 2871 }
3365 2872
3366 switch (ch) 2873 switch (ch)
3367 { 2874 {
… …
3487 break; 2994 break;
3488 case 6: /* CPR requested */ 2995 case 6: /* CPR requested */
3489 scr_report_position (); 2996 scr_report_position ();
3490 break; 2997 break;
3491 case 7: /* unofficial extension */ 2998 case 7: /* unofficial extension */
3492 if (OPTION (Opt_insecure)) 2999 if (option (Opt_insecure))
3493 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3000 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3494 break; 3001 break;
3495 case 8: /* unofficial extension */ 3002 case 8: /* unofficial extension */
3496 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3003 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3497 break; 3004 break;
… …
3564 break; 3071 break;
3565 case CSI_75: 3072 case CSI_75:
3566 scr_cursor (RESTORE); 3073 scr_cursor (RESTORE);
3567 break; 3074 break;
3568 3075
3569#if ENABLE_FRILLS 3076#if !ENABLE_MINIMAL
3570 case CSI_74: 3077 case CSI_74:
3571 process_window_ops (arg, nargs); 3078 process_window_ops (arg, nargs);
3572 break; 3079 break;
3573#endif 3080#endif
3574 3081
… …
3581 break; 3088 break;
3582 } 3089 }
3583} 3090}
3584/*}}} */ 3091/*}}} */
3585 3092
3586#if ENABLE_FRILLS 3093#if !ENABLE_MINIMAL
3587/* ARGSUSED */
3588void 3094void
3589rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3095rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3590{ 3096{
3591 int x, y; 3097 int x, y;
3592 XWindowAttributes wattr; 3098 XWindowAttributes wattr;
3593 Window wdummy; 3099 Window wdummy;
3594 dDisp; 3100
3101 dLocal (Display *, dpy);
3595 3102
3596 if (nargs == 0) 3103 if (nargs == 0)
3597 return; 3104 return;
3598 3105
3599 switch (args[0]) 3106 switch (args[0])
3600 { 3107 {
3601 /* 3108 /*
3602 * commands 3109 * commands
3603 */ 3110 */
3604 case 1: /* deiconify window */ 3111 case 1: /* deiconify window */
3605 XMapWindow (disp, parent[0]); 3112 XMapWindow (dpy, parent);
3606 break; 3113 break;
3607 case 2: /* iconify window */ 3114 case 2: /* iconify window */
3608 XIconifyWindow (disp, parent[0], display->screen); 3115 XIconifyWindow (dpy, parent, display->screen);
3609 break; 3116 break;
3610 case 3: /* set position (pixels) */ 3117 case 3: /* set position (pixels) */
3611 XMoveWindow (disp, parent[0], args[1], args[2]); 3118 XMoveWindow (dpy, parent, args[1], args[2]);
3612 break; 3119 break;
3613 case 4: /* set size (pixels) */ 3120 case 4: /* set size (pixels) */
3614 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3121 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3615 break; 3122 break;
3616 case 5: /* raise window */ 3123 case 5: /* raise window */
3617 XRaiseWindow (disp, parent[0]); 3124 XRaiseWindow (dpy, parent);
3618 break; 3125 break;
3619 case 6: /* lower window */ 3126 case 6: /* lower window */
3620 XLowerWindow (disp, parent[0]); 3127 XLowerWindow (dpy, parent);
3621 break; 3128 break;
3622 case 7: /* refresh window */ 3129 case 7: /* refresh window */
3623 scr_touch (true); 3130 scr_touch (true);
3624 break; 3131 break;
3625 case 8: /* set size (chars) */ 3132 case 8: /* set size (chars) */
… …
3632 if (args[0] >= 24) /* set height (chars) */ 3139 if (args[0] >= 24) /* set height (chars) */
3633 set_widthheight ((unsigned int)width, 3140 set_widthheight ((unsigned int)width,
3634 (unsigned int) (args[1] * fheight)); 3141 (unsigned int) (args[1] * fheight));
3635 break; 3142 break;
3636 3143
3637
3638 /* 3144 /*
3639 * reports - some output format copied from XTerm 3145 * reports - some output format copied from XTerm
3640 */ 3146 */
3641 case 11: /* report window state */ 3147 case 11: /* report window state */
3642 XGetWindowAttributes (disp, parent[0], &wattr); 3148 XGetWindowAttributes (dpy, parent, &wattr);
3643 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3149 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3644 break; 3150 break;
3645 case 13: /* report window position */ 3151 case 13: /* report window position */
3646 XGetWindowAttributes (disp, parent[0], &wattr); 3152 XGetWindowAttributes (dpy, parent, &wattr);
3647 XTranslateCoordinates (disp, parent[0], wattr.root, 3153 XTranslateCoordinates (dpy, parent, wattr.root,
3648 -wattr.border_width, -wattr.border_width, 3154 -wattr.border_width, -wattr.border_width,
3649 &x, &y, &wdummy); 3155 &x, &y, &wdummy);
3650 tt_printf ("\033[3;%d;%dt", x, y); 3156 tt_printf ("\033[3;%d;%dt", x, y);
3651 break; 3157 break;
3652 case 14: /* report window size (pixels) */ 3158 case 14: /* report window size (pixels) */
3653 XGetWindowAttributes (disp, parent[0], &wattr); 3159 XGetWindowAttributes (dpy, parent, &wattr);
3654 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3160 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3655 break; 3161 break;
3656 case 18: /* report text area size (chars) */ 3162 case 18: /* report text area size (chars) */
3657 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3163 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3658 break; 3164 break;
… …
3660 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3166 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3661 break; 3167 break;
3662 case 20: /* report icon label */ 3168 case 20: /* report icon label */
3663 { 3169 {
3664 char *s; 3170 char *s;
3665 XGetIconName (disp, parent[0], &s); 3171 XGetIconName (dpy, parent, &s);
3666 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3172 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3667 XFree (s); 3173 XFree (s);
3668 } 3174 }
3669 break; 3175 break;
3670 case 21: /* report window title */ 3176 case 21: /* report window title */
3671 { 3177 {
3672 char *s; 3178 char *s;
3673 XFetchName (disp, parent[0], &s); 3179 XFetchName (dpy, parent, &s);
3674 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3180 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3675 XFree (s); 3181 XFree (s);
3676 } 3182 }
3677 break; 3183 break;
3678 } 3184 }
3679} 3185}
… …
3706 seen_esc = true; 3212 seen_esc = true;
3707 continue; 3213 continue;
3708 } 3214 }
3709 else if (ch == C0_BEL || ch == CHAR_ST) 3215 else if (ch == C0_BEL || ch == CHAR_ST)
3710 break; 3216 break;
3217 else if (ch == C0_SYN)
3218 ch = cmd_get8 ();
3711 else if (ch < 0x20) 3219 else if (ch < 0x20)
3712 return NULL; /* other control character - exit */ 3220 return NULL; /* other control character - exit */
3713 3221
3714 seen_esc = false; 3222 seen_esc = false;
3715 3223
3716 if (n >= STRING_MAX - 1) 3224 if (n >= STRING_MAX - 1)
3717 // stop at some sane length 3225 // stop at some sane length
3718 return NULL; 3226 return NULL;
3719 3227
3720 if (ch == C0_SYN)
3721 string[n++] = cmd_get8 ();
3722 else
3723 string[n++] = ch; 3228 string[n++] = ch;
3724 } 3229 }
3725 3230
3726 string[n++] = '\0'; 3231 string[n++] = '\0';
3727 3232
3728 ends_how = (ch == 0x5c ? C0_ESC : ch); 3233 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3735 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3240 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3736 */ 3241 */
3737void 3242void
3738rxvt_term::process_dcs_seq () 3243rxvt_term::process_dcs_seq ()
3739{ 3244{
3740 char *s;
3741 unicode_t eh;
3742
3743 /* 3245 /*
3744 * Not handled yet 3246 * Not handled yet
3745 */ 3247 */
3248
3249 unicode_t eh;
3746 s = get_to_st (eh); 3250 char *s = get_to_st (eh);
3747 if (s) 3251 if (s)
3748 free (s); 3252 free (s);
3749 3253
3750 return; 3254 return;
3751} 3255}
… …
3755 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3259 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3756 */ 3260 */
3757void 3261void
3758rxvt_term::process_osc_seq () 3262rxvt_term::process_osc_seq ()
3759{ 3263{
3760 unicode_t ch, eh;
3761 int arg; 3264 int arg;
3762 3265
3763 ch = cmd_getc (); 3266 unicode_t ch = cmd_getc ();
3764 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3267 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3765 arg = arg * 10 + (ch - '0'); 3268 arg = arg * 10 + (ch - '0');
3766 3269
3767 if (ch == ';') 3270 if (ch == ';')
3768 { 3271 {
3272 unicode_t eh;
3769 char *s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3770 3274
3771 if (s) 3275 if (s)
3772 { 3276 {
3773 process_xterm_seq (arg, s, eh); 3277 process_xterm_seq (arg, s, eh);
… …
3779void 3283void
3780rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3284rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3781{ 3285{
3782 if (str[0] == '?' && !str[1]) 3286 if (str[0] == '?' && !str[1])
3783 { 3287 {
3784 unsigned short r, g, b; 3288 rgba c;
3785 pix_colors_focused[color].get (display, r, g, b); 3289 pix_colors_focused[color].get (c);
3290
3291#if XFT
3292 if (c.a != rgba::MAX_CC)
3293 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3294 else
3295#endif
3786 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3296 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3787 } 3297 }
3788 else 3298 else
3789 set_window_color (color, str); 3299 set_window_color (color, str);
3790} 3300}
3791 3301
3792/* 3302/*
3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3303 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3794 */ 3304 */
3795void 3305void
3796rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3306rxvt_term::process_xterm_seq (int op, char *str, char resp)
3797{ 3307{
3798 int changed = 0;
3799 int color; 3308 int color;
3800 char *buf, *name; 3309 char *buf, *name;
3801 bool query = str[0] == '?' && !str[1]; 3310 bool query = str[0] == '?' && !str[1];
3802 int saveop = op; 3311 int saveop = op;
3803 dDisp; 3312
3313 dLocal (Display *, dpy);
3804 3314
3805 assert (str != NULL); 3315 assert (str != NULL);
3316
3317 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3318 return;
3319
3806 switch (op) 3320 switch (op)
3807 { 3321 {
3808 case XTerm_name: 3322 case XTerm_name:
3809 set_title (str); 3323 set_title (str);
3810 /* FALLTHROUGH */ 3324 /* FALLTHROUGH */
… …
3824 unsigned long bytes_after; 3338 unsigned long bytes_after;
3825 unsigned char *value = 0; 3339 unsigned char *value = 0;
3826 const char *str = ""; 3340 const char *str = "";
3827 3341
3828 if (prop 3342 if (prop
3829 && XGetWindowProperty (disp, parent[0], 3343 && XGetWindowProperty (dpy, parent,
3830 prop, 0, 1<<16, 0, AnyPropertyType, 3344 prop, 0, 1<<16, 0, AnyPropertyType,
3831 &actual_type, &actual_format, 3345 &actual_type, &actual_format,
3832 &nitems, &bytes_after, &value) == Success 3346 &nitems, &bytes_after, &value) == Success
3833 && actual_type != None 3347 && actual_type != None
3834 && actual_format == 8) 3348 && actual_format == 8)
3835 str = (const char *)(value); 3349 str = (const char *)(value);
3836 3350
3837 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3351 tt_printf ("\033]%d;%s%c", op, str, resp);
3838 3352
3839 XFree (value); 3353 XFree (value);
3840 } 3354 }
3841 else 3355 else
3842 { 3356 {
3843 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3357 char *eq = strchr (str, '=');
3844 3358
3845 if (eq) 3359 if (eq)
3846 { 3360 {
3847 *eq = 0; 3361 *eq = 0;
3848 set_utf8_property (display->atom (str), eq + 1); 3362 set_utf8_property (display->atom (str), eq + 1);
3849 } 3363 }
3850 else 3364 else
3851 XDeleteProperty (disp, parent[0], 3365 XDeleteProperty (dpy, parent,
3852 display->atom (str)); 3366 display->atom (str));
3853 } 3367 }
3854 break; 3368 break;
3855 3369
3856 case XTerm_Color: 3370 case XTerm_Color:
… …
3866 break; 3380 break;
3867 3381
3868 if ((buf = strchr (name, ';')) != NULL) 3382 if ((buf = strchr (name, ';')) != NULL)
3869 *buf++ = '\0'; 3383 *buf++ = '\0';
3870 3384
3871 if (name[0] == '?' && !name[1]) 3385 process_color_seq (op, color, name, resp);
3386 }
3387 break;
3388 case Rxvt_restoreFG:
3389 case XTerm_Color00:
3390 process_color_seq (op, Color_fg, str, resp);
3391 break;
3392 case Rxvt_restoreBG:
3393 case XTerm_Color01:
3394 process_color_seq (op, Color_bg, str, resp);
3395 break;
3396#ifndef NO_CURSORCOLOR
3397 case XTerm_Color_cursor:
3398 process_color_seq (op, Color_cursor, str, resp);
3399 break;
3400#endif
3401 case XTerm_Color_pointer_fg:
3402 process_color_seq (op, Color_pointer_fg, str, resp);
3403 break;
3404 case XTerm_Color_pointer_bg:
3405 process_color_seq (op, Color_pointer_bg, str, resp);
3406 break;
3407#ifdef OPTION_HC
3408 case XTerm_Color_HC:
3409 process_color_seq (op, Color_HC, str, resp);
3410 break;
3411 case XTerm_Color_HTC:
3412 process_color_seq (op, Color_HTC, str, resp);
3413 break;
3414#endif
3415#ifndef NO_BOLD_UNDERLINE_REVERSE
3416 case URxvt_Color_BD:
3417 process_color_seq (op, Color_BD, str, resp);
3418 break;
3419 case URxvt_Color_UL:
3420 process_color_seq (op, Color_UL, str, resp);
3421 break;
3422 case URxvt_Color_IT:
3423 process_color_seq (op, Color_IT, str, resp);
3424 break;
3425#endif
3426 case URxvt_Color_border:
3427 process_color_seq (op, Color_border, str, resp);
3428 break;
3429#if ENABLE_TRANSPARENCY
3430 case URxvt_Color_tint:
3431 process_color_seq (op, Color_tint, str, resp);
3432 {
3433 bool changed = false;
3434
3435 if (ISSET_PIXCOLOR (Color_tint))
3436 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3437
3438 if (changed)
3439 update_background ();
3440 }
3441
3442 break;
3443#endif
3444
3445#if BG_IMAGE_FROM_FILE
3446 case Rxvt_Pixmap:
3447 if (!strcmp (str, "?"))
3448 {
3449 char str[256];
3450
3451 sprintf (str, "[%dx%d+%d+%d]",
3452 min (h_scale, 32767), min (v_scale, 32767),
3453 min (h_align, 32767), min (v_align, 32767));
3454 process_xterm_seq (XTerm_title, str, CHAR_ST);
3455 }
3456 else
3457 {
3458 int changed = 0;
3459
3460 if (*str != ';')
3872 { 3461 {
3873 unsigned short r, g, b; 3462 if (bg_set_file (str)) /* change pixmap */
3874 pix_colors_focused[color].get (display, r, g, b); 3463 {
3875 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3464 changed++;
3465 str = strchr (str, ';');
3466 if (str == NULL)
3467 bg_set_default_geometry ();
3468 else
3469 bg_set_geometry (str+1);
3470 }
3876 } 3471 }
3877 else 3472 else
3878 set_window_color (color, name); 3473 {
3474 str++;
3475 if (bg_set_geometry (str, true))
3476 changed++;
3477 }
3478
3479 if (changed)
3480 {
3481 if (bg_window_position_sensitive ())
3482 {
3483 int x, y;
3484 get_window_origin (x, y);
3485 bg_set_position (x, y);
3486 }
3487 update_background ();
3488 }
3879 } 3489 }
3880 break; 3490 break;
3881 case XTerm_Color00:
3882 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3883 break;
3884 case XTerm_Color01:
3885 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3886 break;
3887#ifndef NO_CURSORCOLOR
3888 case XTerm_Color_cursor:
3889 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3890 break;
3891#endif 3491#endif
3892 case XTerm_Color_pointer_fg:
3893 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3894 break;
3895 case XTerm_Color_pointer_bg:
3896 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3897 break;
3898#ifndef NO_BOLD_UNDERLINE_REVERSE
3899 case XTerm_Color_RV:
3900 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3901 break;
3902 case Rxvt_Color_BD:
3903 case URxvt_Color_BD:
3904 process_color_seq (op, Color_BD, str, resp);
3905 break;
3906 case Rxvt_Color_UL:
3907 case URxvt_Color_UL:
3908 process_color_seq (op, Color_UL, str, resp);
3909 break;
3910 case URxvt_Color_IT:
3911 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3912 break;
3913#endif
3914#if TRANSPARENT && TINTING
3915 case URxvt_Color_tint:
3916 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3917 check_our_parents ();
3918 if (am_transparent)
3919 want_full_refresh = want_refresh = 1;
3920 break;
3921#endif
3922
3923 case Rxvt_Pixmap:
3924 if (*str != ';')
3925 {
3926#if XPM_BACKGROUND
3927 scale_pixmap (""); /* reset to default scaling */
3928 set_bgPixmap (str); /* change pixmap */
3929 scr_touch (true);
3930#endif
3931 }
3932
3933 while ((str = strchr (str, ';')) != NULL)
3934 {
3935 str++;
3936#if XPM_BACKGROUND
3937 changed += scale_pixmap (str);
3938#endif
3939 }
3940
3941 if (changed)
3942 {
3943#ifdef XPM_BACKGROUND
3944 resize_pixmap ();
3945 scr_touch (true);
3946#endif
3947 }
3948 break;
3949
3950 case Rxvt_restoreFG:
3951 set_window_color (Color_fg, str);
3952 break;
3953 case Rxvt_restoreBG:
3954 set_window_color (Color_bg, str);
3955 break;
3956 3492
3957 case XTerm_logfile: 3493 case XTerm_logfile:
3958 // TODO, when secure mode? 3494 // TODO, when secure mode?
3959 break; 3495 break;
3960 3496
3961#ifdef MENUBAR
3962 case URxvt_Menu:
3963 if (OPTION (Opt_insecure))
3964 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3965 break;
3966#endif
3967#if 0 3497#if 0
3968 case Rxvt_dumpscreen: /* no error notices */ 3498 case Rxvt_dumpscreen: /* no error notices */
3969 { 3499 {
3970 int fd; 3500 int fd;
3971 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3501 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
3984 case URxvt_italicFont: 3514 case URxvt_italicFont:
3985 case URxvt_boldItalicFont: 3515 case URxvt_boldItalicFont:
3986#endif 3516#endif
3987 if (query) 3517 if (query)
3988 tt_printf ("\33]%d;%-.250s%c", saveop, 3518 tt_printf ("\33]%d;%-.250s%c", saveop,
3989 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3519 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3990 ? fontset[op - URxvt_font]->fontdesc : "", 3520 ? fontset[op - URxvt_font]->fontdesc : "",
3991 resp); 3521 resp);
3992 else 3522 else
3993 { 3523 {
3994 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3524 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3997 allocated.push_back ((void *)res); 3527 allocated.push_back ((void *)res);
3998 set_fonts (); 3528 set_fonts ();
3999 } 3529 }
4000 break; 3530 break;
4001 3531
4002#if ENABLE_FRILLS 3532 case URxvt_version:
3533 if (query)
3534 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3535 op,
3536 rs[Rs_name], VERSION[0], VERSION[2],
3537 resp);
3538 break;
3539
3540#if !ENABLE_MINIMAL
4003 case URxvt_locale: 3541 case URxvt_locale:
4004 if (query) 3542 if (query)
4005 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3543 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4006 else 3544 else
4007 { 3545 {
4008 set_locale (str); 3546 set_locale (str);
4009 pty.set_utf8_mode (enc_utf8); 3547 pty->set_utf8_mode (enc_utf8);
4010 init_xlocale (); 3548 init_xlocale ();
4011 } 3549 }
4012 break; 3550 break;
4013 3551
4014 case URxvt_view_up: 3552 case URxvt_view_up:
… …
4025 break; 3563 break;
4026#endif 3564#endif
4027 3565
4028#if ENABLE_PERL 3566#if ENABLE_PERL
4029 case URxvt_perl: 3567 case URxvt_perl:
4030 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3568 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4031 ; // no responses yet
4032 break; 3569 break;
4033#endif 3570#endif
4034 } 3571 }
4035} 3572}
4036/*----------------------------------------------------------------------*/ 3573/*----------------------------------------------------------------------*/
… …
4059 { 3596 {
4060 if (mode == 'r') 3597 if (mode == 'r')
4061 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3598 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4062 else 3599 else
4063 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3600 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4064 PrivMode (state, bit); 3601
3602 set_privmode (bit, state);
4065 } 3603 }
4066 3604
4067 return state; 3605 return state;
4068} 3606}
4069 3607
4070/* we're not using priv _yet_ */ 3608/* we're not using priv _yet_ */
4071void 3609void
4072rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3610rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
4073{ 3611{
4074 unsigned int i, j; 3612 unsigned int i, j;
4075 int state; 3613 int state;
4076 3614
4077 static const struct 3615 static const struct
4078 { 3616 {
4079 const int argval; 3617 const int argval;
4080 const unsigned long bit; 3618 const unsigned long bit;
4081 }
4082
4083 argtopriv[] = { 3619 } argtopriv[] = {
4084 { 1, PrivMode_aplCUR }, 3620 { 1, PrivMode_aplCUR }, // DECCKM
4085 { 2, PrivMode_vt52 }, 3621 { 2, PrivMode_vt52 }, // DECANM
4086 { 3, PrivMode_132 }, 3622 { 3, PrivMode_132 }, // DECCOLM
4087 { 4, PrivMode_smoothScroll }, 3623 { 4, PrivMode_smoothScroll }, // DECSCLM
4088 { 5, PrivMode_rVideo }, 3624 { 5, PrivMode_rVideo }, // DECSCNM
4089 { 6, PrivMode_relOrigin }, 3625 { 6, PrivMode_relOrigin }, // DECOM
4090 { 7, PrivMode_Autowrap }, 3626 { 7, PrivMode_Autowrap }, // DECAWM
4091 // 8, bi-directional support mode 3627 // 8, auto-repeat keys // DECARM
4092 { 9, PrivMode_MouseX10 }, 3628 { 9, PrivMode_MouseX10 },
4093#ifdef menuBar_esc 3629 // 18 end FF to printer after print screen
4094 { menuBar_esc, PrivMode_menuBar }, 3630 // 19 Print screen prints full screen/scroll region
4095#endif
4096 // 18, 19 printing-related
4097 { 25, PrivMode_VisibleCursor }, 3631 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
4098#ifdef scrollBar_esc 3632#ifdef scrollBar_esc
4099 { scrollBar_esc, PrivMode_scrollBar }, 3633 { scrollBar_esc, PrivMode_scrollBar },
4100#endif 3634#endif
4101 { 35, PrivMode_ShiftKeys }, // rxvt extension 3635 { 35, PrivMode_ShiftKeys }, // rxvt extension
3636 // 38, tektronix mode // DECTEK
4102 { 40, PrivMode_132OK }, 3637 { 40, PrivMode_132OK },
4103 // 41 xterm more fixes NYI 3638 // 41 xterm more fixes NYI
4104 // 45 margin bell NYI 3639 // 45 margin bell NYI
4105 // 46 start logging 3640 // 46 start logging
4106 { 47, PrivMode_Screen }, 3641 { 47, PrivMode_Screen },
4107 { 66, PrivMode_aplKP }, 3642 { 66, PrivMode_aplKP }, // DECNKM
4108#ifndef NO_BACKSPACE_KEY 3643#ifndef NO_BACKSPACE_KEY
4109 { 67, PrivMode_BackSpace }, 3644 { 67, PrivMode_BackSpace }, // DECBKM
4110#endif 3645#endif
4111 { 1000, PrivMode_MouseX11 }, 3646 { 1000, PrivMode_MouseX11 },
4112 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3647 { 1002, PrivMode_MouseBtnEvent },
4113 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3648 { 1003, PrivMode_MouseAnyEvent },
4114 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3649#if ENABLE_FRILLS
3650 { 1005, PrivMode_ExtModeMouse },
3651#endif
4115 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3652 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4116 { 1011, PrivMode_Keypress }, // rxvt extension 3653 { 1011, PrivMode_Keypress }, // rxvt extension
3654#if ENABLE_FRILLS
3655 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3656#endif
4117 // 1035 enable modifiers for alt, numlock NYI 3657 // 1035 enable modifiers for alt, numlock NYI
4118 // 1036 send ESC for meta keys NYI 3658 // 1036 send ESC for meta keys NYI
4119 // 1037 send DEL for keypad delete NYI 3659 // 1037 send DEL for keypad delete NYI
4120 { 1047, PrivMode_Screen }, 3660 { 1047, PrivMode_Screen },
4121 // 1048 save and restore cursor 3661 // 1048 save and restore cursor, implemented in code
4122 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3662 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4123 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3663 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3664 { 2004, PrivMode_BracketPaste },
4124 }; 3665 };
4125 3666
4126 if (nargs == 0) 3667 if (nargs == 0)
4127 return; 3668 return;
4128 3669
… …
4135 for (i = 0; i < nargs; i++) 3676 for (i = 0; i < nargs; i++)
4136 { 3677 {
4137 state = -1; 3678 state = -1;
4138 3679
4139 /* basic handling */ 3680 /* basic handling */
4140 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3681 for (j = 0; j < ecb_array_length (argtopriv); j++)
4141 if (argtopriv[j].argval == arg[i]) 3682 if (argtopriv[j].argval == arg[i])
4142 { 3683 {
4143 state = privcases (mode, argtopriv[j].bit); 3684 state = privcases (mode, argtopriv[j].bit);
4144 break; 3685 break;
4145 } 3686 }
… …
4153 3694
4154 scr_touch (true); 3695 scr_touch (true);
4155 break; 3696 break;
4156#endif 3697#endif
4157 case 1048: /* alternative cursor save */ 3698 case 1048: /* alternative cursor save */
4158 case 1049:
4159 if (OPTION (Opt_secondaryScreen)) 3699 if (option (Opt_secondaryScreen))
4160 if (mode == 0) 3700 if (mode == 0)
4161 scr_cursor (RESTORE); 3701 scr_cursor (RESTORE);
4162 else if (mode == 1) 3702 else if (mode == 1)
4163 scr_cursor (SAVE); 3703 scr_cursor (SAVE);
4164 break; 3704 break;
… …
4172 case 2: /* VT52 mode */ 3712 case 2: /* VT52 mode */
4173 /* oddball mode. should be set regardless of set/reset 3713 /* oddball mode. should be set regardless of set/reset
4174 * parameter. Return from VT52 mode with an ESC < from 3714 * parameter. Return from VT52 mode with an ESC < from
4175 * within VT52 mode 3715 * within VT52 mode
4176 */ 3716 */
4177 PrivMode (1, PrivMode_vt52); 3717 set_privmode (PrivMode_vt52, 1);
4178 break; 3718 break;
4179 case 3: /* 80/132 */ 3719 case 3: /* 80/132 */
4180 if (priv_modes & PrivMode_132OK) 3720 if (priv_modes & PrivMode_132OK)
4181 set_widthheight (((state ? 132 : 80) * fwidth), height); 3721 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4182 break; 3722 break;
4183 case 4: /* smooth scrolling */ 3723 case 4: /* smooth scrolling */
4184 set_option (Opt_jumpScroll, !state); 3724 set_option (Opt_jumpScroll, !state);
4185 break; 3725 break;
4186 case 5: /* reverse video */ 3726 case 5: /* reverse video */
… …
4193 scr_autowrap (state); 3733 scr_autowrap (state);
4194 break; 3734 break;
4195 /* case 8: - auto repeat, can't do on a per window basis */ 3735 /* case 8: - auto repeat, can't do on a per window basis */
4196 case 9: /* X10 mouse reporting */ 3736 case 9: /* X10 mouse reporting */
4197 if (state) /* orthogonal */ 3737 if (state) /* orthogonal */
4198 priv_modes &= ~PrivMode_MouseX11; 3738 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4199 break; 3739 break;
4200#ifdef menuBar_esc
4201 case menuBar_esc:
4202#ifdef MENUBAR
4203 map_menuBar (state);
4204#endif
4205 break;
4206#endif
4207#ifdef scrollBar_esc 3740#ifdef scrollBar_esc
4208 case scrollBar_esc: 3741 case scrollBar_esc:
4209 if (scrollbar_mapping (state)) 3742 if (scrollBar.map (state))
4210 { 3743 {
4211 resize_all_windows (0, 0, 0); 3744 resize_all_windows (0, 0, 0);
4212 scr_touch (true); 3745 scr_touch (true);
4213 } 3746 }
4214 break; 3747 break;
… …
4223 break; 3756 break;
4224 /* case 66: - application key pad */ 3757 /* case 66: - application key pad */
4225 /* case 67: - backspace key */ 3758 /* case 67: - backspace key */
4226 case 1000: /* X11 mouse reporting */ 3759 case 1000: /* X11 mouse reporting */
4227 if (state) /* orthogonal */ 3760 if (state) /* orthogonal */
4228 priv_modes &= ~PrivMode_MouseX10; 3761 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4229 break; 3762 break;
4230#if 0
4231 case 1001: 3763 case 1002:
4232 break; /* X11 mouse highlighting */ 3764 case 1003:
4233#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;
4234 case 1010: /* scroll to bottom on TTY output inhibit */ 3777 case 1010: /* scroll to bottom on TTY output inhibit */
4235 set_option (Opt_scrollTtyOutput, !state); 3778 set_option (Opt_scrollTtyOutput, !state);
4236 break; 3779 break;
4237 case 1011: /* scroll to bottom on key press */ 3780 case 1011: /* scroll to bottom on key press */
4238 set_option (Opt_scrollTtyKeypress, state); 3781 set_option (Opt_scrollTtyKeypress, state);
4239 break; 3782 break;
4240 case 1047: /* secondary screen w/ clearing last */ 3783 case 1047: /* secondary screen w/ clearing last */
4241 if (OPTION (Opt_secondaryScreen)) 3784 if (option (Opt_secondaryScreen))
4242 if (current_screen != PRIMARY) 3785 if (!state)
4243 scr_erase_screen (2); 3786 scr_erase_screen (2);
3787
4244 scr_change_screen (state); 3788 scr_change_screen (state);
4245 break; 3789 break;
4246 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
4247 scr_change_screen (state); 3795 scr_change_screen (state);
3796
4248 if (OPTION (Opt_secondaryScreen)) 3797 if (option (Opt_secondaryScreen))
4249 if (current_screen != PRIMARY) 3798 if (state)
4250 scr_erase_screen (2); 3799 scr_erase_screen (2);
3800 else
3801 scr_cursor (RESTORE);
4251 break; 3802 break;
4252 default: 3803 default:
4253 break; 3804 break;
4254 } 3805 }
4255 } 3806 }
… …
4381 scr_color (Color_bg, Color_bg); 3932 scr_color (Color_bg, Color_bg);
4382 break; 3933 break;
4383 3934
4384 //case 50: // not variable spacing 3935 //case 50: // not variable spacing
4385 3936
4386#if ENABLE_FRILLS 3937#if !ENABLE_MINIMAL
4387 case 90: 3938 case 90:
4388 case 91: /* set bright fg color */ 3939 case 91: /* set bright fg color */
4389 case 92: 3940 case 92:
4390 case 93: 3941 case 93:
4391 case 94: 3942 case 94:
… …
4408 } 3959 }
4409 } 3960 }
4410} 3961}
4411/*}}} */ 3962/*}}} */
4412 3963
4413/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4414void
4415rxvt_term::process_graphics ()
4416{
4417 unicode_t ch, cmd = cmd_getc ();
4418
4419 if (cmd == 'Q')
4420 { /* query graphics */
4421 tt_printf ("\033G0\012"); /* no graphics */
4422 return;
4423 }
4424 /* swallow other graphics sequences until terminating ':' */
4425 do
4426 ch = cmd_getc ();
4427 while (ch != ':');
4428}
4429/*}}} */
4430
4431/* ------------------------------------------------------------------------- */ 3964/* ------------------------------------------------------------------------- */
4432 3965
4433/* 3966/*
4434 * Send printf () formatted output to the command. 3967 * Send printf () formatted output to the command.
4435 * Only use for small amounts of data. 3968 * Only use for small amounts of data.
… …
4448 3981
4449/* ---------------------------------------------------------------------- */ 3982/* ---------------------------------------------------------------------- */
4450/* 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,
4451 * or generated by us in response to a query ESC sequence. 3984 * or generated by us in response to a query ESC sequence.
4452 */ 3985 */
4453const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3986static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4454 3987
4455void 3988void
4456rxvt_term::tt_write (const char *data, unsigned int len) 3989rxvt_term::tt_write (const char *data, unsigned int len)
4457{ 3990{
4458 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)))
4459 return; 3992 return;
4460 3993
4461 if (pty.pty < 0) 3994 if (pty->pty < 0)
4462 return; 3995 return;
4463 3996
4464 if (v_buflen == 0) 3997 if (v_buflen == 0)
4465 { 3998 {
4466 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));
4467 4000
4001 max_it (written, 0);
4002
4468 if ((unsigned int)written == len) 4003 if (written == len)
4469 return; 4004 return;
4470 4005
4471 data += written; 4006 data += written;
4472 len -= written; 4007 len -= written;
4473 } 4008 }
4474 4009
4475 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4010 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4476 4011
4477 memcpy (v_buffer + v_buflen, data, len); 4012 memcpy (v_buffer + v_buflen, data, len);
4478 v_buflen += len; 4013 v_buflen += len;
4479 4014
4480 pty_ev.set (EVENT_READ | EVENT_WRITE); 4015 pty_ev.set (ev::READ | ev::WRITE);
4481} 4016}
4482 4017
4483void rxvt_term::pty_write () 4018void rxvt_term::pty_write ()
4484{ 4019{
4485 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));
4486 4021
4487 if (written > 0) 4022 if (written > 0)
4488 { 4023 {
4489 v_buflen -= written; 4024 v_buflen -= written;
4490 4025
4491 if (v_buflen == 0) 4026 if (v_buflen == 0)
4492 { 4027 {
4493 free (v_buffer); 4028 free (v_buffer);
4494 v_buffer = 0; 4029 v_buffer = 0;
4495 v_buflen = 0;
4496 4030
4497 pty_ev.set (EVENT_READ); 4031 pty_ev.set (ev::READ);
4498 return; 4032 return;
4499 } 4033 }
4500 4034
4501 memmove (v_buffer, v_buffer + written, v_buflen); 4035 memmove (v_buffer, v_buffer + written, v_buflen);
4502 } 4036 }
4503 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4037 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4504 pty_ev.set (EVENT_READ); 4038 pty_ev.set (ev::READ);
4505} 4039}
4506 4040
4507/*----------------------- end-of-file (C source) -----------------------*/ 4041/*----------------------- end-of-file (C source) -----------------------*/
4508 4042

Diff Legend

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