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

Diff Legend

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