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

Diff Legend

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