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.485 by sf-exg, Fri Apr 29 13:08:24 2011 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 44 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 45 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 46 *----------------------------------------------------------------------*/
46 47
47/*{{{ includes: */ 48/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 49#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 50#include "rxvt.h"
51#include "rxvtperl.h"
50#include "version.h" 52#include "version.h"
51#include "command.h" 53#include "command.h"
52 54
53#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 56# include "keyboard.h"
55#endif 57#endif
56 58
57#include <csignal> 59#include <csignal>
58 60
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);
469 return; 574 return;
470 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 575 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
471 change_font (FONT_DN);
472 return; 576 return;
473#endif 577#endif
474 } 578 }
475 } 579 }
476 } 580 }
477 581
478#if ENABLE_FRILLS || ISO_14755 582#if ENABLE_FRILLS || ISO_14755
479 // ISO 14755 support 583 // ISO 14755 support
480 if (shft && ctrl) 584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
481 { 585 {
482 int hv; 586 int hv;
483 587
484 if (iso14755buf & ISO_14755_51 588 if (iso14755buf & ISO_14755_51
485 && (keysym == XK_space || keysym == XK_KP_Space 589 && (keysym == XK_space || keysym == XK_KP_Space
… …
487 { 591 {
488 commit_iso14755 (); 592 commit_iso14755 ();
489 iso14755buf = ISO_14755_51; 593 iso14755buf = ISO_14755_51;
490# if ISO_14755 594# if ISO_14755
491 iso14755_51 (0); 595 iso14755_51 (0);
596# endif
597 return;
598 }
599 else if (keysym == XK_BackSpace)
600 {
601 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
602# if ISO_14755
603 iso14755_51 (iso14755buf & ISO_14755_MASK);
492# endif 604# endif
493 return; 605 return;
494 } 606 }
495 else if ((hv = hex_keyval (ev)) >= 0) 607 else if ((hv = hex_keyval (ev)) >= 0)
496 { 608 {
… …
501# endif 613# endif
502 return; 614 return;
503 } 615 }
504 else 616 else
505 { 617 {
506# if ENABLE_OVERLAY 618# if ISO_14755
507 scr_overlay_off (); 619 scr_overlay_off ();
508# endif 620# endif
509 iso14755buf = 0; 621 iso14755buf = 0;
510 } 622 }
511 } 623 }
624 else if (option (Opt_iso14755) &&
512 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 625 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
513 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 626 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
514 if (!(iso14755buf & ISO_14755_STARTED)) 627 if (!(iso14755buf & ISO_14755_STARTED))
515 { 628 {
516 iso14755buf |= ISO_14755_STARTED; 629 iso14755buf |= ISO_14755_STARTED;
517# if ENABLE_OVERLAY 630# if ISO_14755
518 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 631 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
519 scr_overlay_set (0, 0, "ISO 14755 mode"); 632 scr_overlay_set (0, 0, "ISO 14755 mode");
520# endif 633# endif
521 } 634 }
522#endif 635#endif
523 636
524#ifdef PRINTPIPE 637#ifdef PRINTPIPE
525 if (keysym == XK_Print) 638 if (keysym == XK_Print)
526 { 639 {
527 scr_printscreen (ctrl | shft); 640 scr_printscreen (ctrl | shft);
528 return; 641 return;
529 } 642 }
530#endif 643#endif
531 644
532 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
533 { 646 {
647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
648 unsigned int newlen = 1;
649
650 if (ev.state & ModNumLockMask)
651 kp = false;
652
653 keysym = translate_keypad (keysym, kp);
654
655 switch (keysym)
534 { 656 {
657#ifndef NO_BACKSPACE_KEY
658 case XK_BackSpace:
659 if (priv_modes & PrivMode_HaveBackSpace)
660 {
661 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
662 ^ !!ctrl) ? '\b' : '\177';
663 kbuf[1] = '\0';
664 }
665 else
666 strcpy (kbuf, rs[Rs_backspace_key]);
667 break;
668#endif
669#ifndef NO_DELETE_KEY
670 case XK_Delete:
671 strcpy (kbuf, rs[Rs_delete_key]);
672 break;
673#endif
674 case XK_Tab:
675 if (shft)
676 strcpy (kbuf, "\033[Z");
677 else
678 {
679#ifdef CTRL_TAB_MAKES_META
680 if (ctrl)
681 meta = 1;
682#endif
683#ifdef MOD4_TAB_MAKES_META
684 if (ev.state & Mod4Mask)
685 meta = 1;
686#endif
535 newlen = 1; 687 newlen = 0;
536 switch (keysym) 688 }
689 break;
690
691 case XK_Up: /* "\033[A" */
692 case XK_Down: /* "\033[B" */
693 case XK_Right: /* "\033[C" */
694 case XK_Left: /* "\033[D" */
695 strcpy (kbuf, "\033[Z");
696 kbuf[2] = "DACB"[keysym - XK_Left];
697 /* do Shift first */
698 if (shft)
699 kbuf[2] = "dacb"[keysym - XK_Left];
700 else if (ctrl)
701 {
702 kbuf[1] = 'O';
703 kbuf[2] = "dacb"[keysym - XK_Left];
704 }
705 else if (priv_modes & PrivMode_aplCUR)
706 kbuf[1] = 'O';
707 break;
708
709 case XK_KP_Enter:
710 /* allow shift to override */
711 if (kp)
712 {
713 strcpy (kbuf, "\033OM");
714 break;
715 }
716
717 /* FALLTHROUGH */
718
719 case XK_Return:
720 if (priv_modes & PrivMode_LFNL)
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\012';
724 kbuf[2] = '\0';
725 }
726 else
727 {
728 kbuf[0] = '\015';
729 kbuf[1] = '\0';
730 }
731 break;
732
733 case XK_KP_F1: /* "\033OP" */
734 case XK_KP_F2: /* "\033OQ" */
735 case XK_KP_F3: /* "\033OR" */
736 case XK_KP_F4: /* "\033OS" */
737 strcpy (kbuf, "\033OP");
738 kbuf[2] += (keysym - XK_KP_F1);
739 break;
740
741 case XK_KP_Multiply: /* "\033Oj" : "*" */
742 case XK_KP_Add: /* "\033Ok" : "+" */
743 case XK_KP_Separator: /* "\033Ol" : "," */
744 case XK_KP_Subtract: /* "\033Om" : "-" */
745 case XK_KP_Decimal: /* "\033On" : "." */
746 case XK_KP_Divide: /* "\033Oo" : "/" */
747 case XK_KP_0: /* "\033Op" : "0" */
748 case XK_KP_1: /* "\033Oq" : "1" */
749 case XK_KP_2: /* "\033Or" : "2" */
750 case XK_KP_3: /* "\033Os" : "3" */
751 case XK_KP_4: /* "\033Ot" : "4" */
752 case XK_KP_5: /* "\033Ou" : "5" */
753 case XK_KP_6: /* "\033Ov" : "6" */
754 case XK_KP_7: /* "\033Ow" : "7" */
755 case XK_KP_8: /* "\033Ox" : "8" */
756 case XK_KP_9: /* "\033Oy" : "9" */
757 /* allow shift to override */
758 if (kp)
759 {
760 strcpy (kbuf, "\033Oj");
761 kbuf[2] += (keysym - XK_KP_Multiply);
762 }
763 else
764 {
765 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
766 kbuf[1] = '\0';
767 }
768 break;
769
770 default:
537 { 771 {
538#ifndef NO_BACKSPACE_KEY 772 int param = map_function_key (keysym);
539 case XK_BackSpace: 773 if (param > 0)
540 if (priv_modes & PrivMode_HaveBackSpace) 774 sprintf (kbuf,"\033[%d~", param);
541 {
542 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
543 ^ !!ctrl) ? '\b' : '\177';
544 kbuf[1] = '\0';
545 }
546 else 775 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; 776 newlen = 0;
822 break;
823 } 777 }
824 778 break;
825 if (newlen)
826 len = strlen (kbuf);
827 } 779 }
780
781 if (newlen)
782 len = strlen (kbuf);
828 783
829 /* 784 /*
830 * Pass meta for all function keys, if 'meta' option set 785 * Pass meta for all function keys, if 'meta' option set
831 */ 786 */
832#ifdef META8_OPTION 787#ifdef META8_OPTION
… …
849 { 804 {
850#ifdef META8_OPTION 805#ifdef META8_OPTION
851 /* set 8-bit on */ 806 /* set 8-bit on */
852 if (meta && (meta_char == 0x80)) 807 if (meta && (meta_char == 0x80))
853 { 808 {
854 unsigned char *ch; 809 char *ch;
855 810
856 for (ch = kbuf; ch < kbuf + len; ch++) 811 for (ch = kbuf; ch < kbuf + len; ch++)
857 *ch |= 0x80; 812 *ch |= 0x80;
858 813
859 meta = 0; 814 meta = 0;
… …
861#endif 816#endif
862 /* nil */ ; 817 /* nil */ ;
863 } 818 }
864 } 819 }
865 820
821 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
822 return;
823
866 if (len <= 0) 824 if (len <= 0)
867 return; /* not mapped */ 825 return; /* not mapped */
868 826
869 if (OPTION (Opt_scrollTtyKeypress)) 827 if (option (Opt_scrollTtyKeypress))
870 if (view_start) 828 if (view_start)
871 { 829 {
872 view_start = 0; 830 view_start = 0;
873 want_refresh = 1; 831 want_refresh = 1;
874 } 832 }
… …
892#ifdef META8_OPTION 850#ifdef META8_OPTION
893 && meta_char == C0_ESC 851 && meta_char == C0_ESC
894#endif 852#endif
895 ) 853 )
896 { 854 {
897 const unsigned char ch = C0_ESC; 855 const char ch = C0_ESC;
898 tt_write (&ch, 1); 856 tt_write (&ch, 1);
899 } 857 }
900 858
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); 859 tt_write (kbuf, (unsigned int)len);
912} 860}
913/*}}} */
914 861
915#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 862void
916/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 863rxvt_term::key_release (XKeyEvent &ev)
917/* attempt to `write' count to the input buffer */
918unsigned int
919rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
920{ 864{
921 unsigned int n, s; 865#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
866 KeySym keysym;
922 867
923 n = cmdbuf_ptr - cmdbuf_base; 868 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
924 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 869#endif
925 870
926 if (n > 0 && s < count) 871#if ENABLE_FRILLS || ISO_14755
872 // ISO 14755 support
873 if (iso14755buf)
874 if (iso14755buf & ISO_14755_52)
927 { 875 {
928 memmove (cmdbuf_base, cmdbuf_ptr, 876# if ISO_14755
929 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 877 scr_overlay_off ();
930 cmdbuf_ptr = cmdbuf_base;
931 cmdbuf_endp -= n;
932 s += n;
933 }
934
935 if (count > s)
936 {
937 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
938 count = s;
939 }
940
941 for (; count--;)
942 *cmdbuf_endp++ = *str++;
943
944 cmd_parse ();
945
946 return 0;
947}
948#endif 878# endif
879# if ISO_14755
880 // iso14755 part 5.2 handling: release time
881 // first: controls
882 if ((ev.state & ControlMask)
883 && ((keysym >= 0x40 && keysym <= 0x5f)
884 || (keysym >= 0x61 && keysym <= 0x7f)))
885 {
886 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
887 commit_iso14755 ();
888
889 return;
890 }
891
892 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
893 if (i[0] == keysym)
894 {
895 iso14755buf = ISO_14755_51 | i[1];
896 commit_iso14755 ();
897
898 return;
899 }
900
901 scr_bell ();
902# endif
903 iso14755buf = 0;
904
905 return;
906 }
907 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
908 {
909# if ISO_14755
910 scr_overlay_off ();
911# endif
912 if (iso14755buf & ISO_14755_51)
913 commit_iso14755 ();
914#if ISO_14755
915 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
916 {
917 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
918
919 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
920 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
921 }
922# endif
923 else
924 iso14755buf = 0;
925 }
926#endif
927
928 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
929 return;
930
931#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
932 if (!(ev.state & ControlMask))
933 slip_wheel_ev.stop ();
934 else if (keysym == XK_Control_L || keysym == XK_Control_R)
935 mouse_slip_wheel_speed = 0;
936#endif
937}
949 938
950void 939void
951rxvt_term::flush () 940rxvt_term::flush ()
952{ 941{
953 flush_ev.stop (); 942 flush_ev.stop ();
954 943
955#ifdef TRANSPARENT 944#ifdef HAVE_BG_PIXMAP
956 if (want_full_refresh) 945 if (bg_flags & BG_NEEDS_REFRESH)
957 { 946 {
958 want_full_refresh = 0; 947 bg_flags &= ~BG_NEEDS_REFRESH;
959 scr_clear ();
960 scr_touch (false); 948 scr_touch (false);
961 } 949 }
962#endif 950#endif
963 951
964 if (want_refresh) 952 if (want_refresh)
965 { 953 {
954 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
955 {
956 int row = view_start;
957 int end_row = row + nrow;
958
959 while (row > top_row && ROW (row - 1).is_longer ())
960 --row;
961
962 do
963 {
964 int start_row = row;
965 line_t *l;
966
967 do
968 {
969 l = &ROW (row++);
970
971 if (!(l->f & LINE_FILTERED))
972 {
973 // line not filtered, mark it as filtered
974 l->f |= LINE_FILTERED;
975 while (l->is_longer ())
976 {
977 l = &ROW (row++);
978 l->f |= LINE_FILTERED;
979 }
980
981 // and filter it
982 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
983
984 break;
985 }
986 }
987 while (l->is_longer () && row < end_row);
988 }
989 while (row < end_row);
990 }
991
966 scr_refresh (refresh_type); 992 scr_refresh ();
967 scrollbar_show (1); 993 scrollBar.show (1);
968#ifdef USE_XIM 994#ifdef USE_XIM
969 IMSendSpot (); 995 IMSendSpot ();
970#endif 996#endif
971 } 997 }
972 998
973 display->flush (); 999 display->flush ();
974} 1000}
975 1001
1002/* checks whether a refresh is requested and starts the refresh timer */
976void 1003void
977rxvt_term::check_cb (check_watcher &w) 1004rxvt_term::refresh_check ()
978{ 1005{
979 SET_R (this); 1006 if (want_refresh && !flush_ev.is_active ())
980 SET_LOCALE (locale); 1007 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
981 1008
982 display->flush (); 1009 display->flush ();
983
984 if (want_refresh && !flush_ev.active)
985 flush_ev.start (NOW + 0.01);
986} 1010}
987 1011
988void 1012void
989rxvt_term::flush_cb (time_watcher &w) 1013rxvt_term::flush_cb (ev::timer &w, int revents)
990{ 1014{
991 SET_R (this); 1015 make_current ();
992 SET_LOCALE (locale);
993 1016
994 refresh_limit = 1;
995 refresh_count = 0; 1017 refresh_count = 0;
996 flush (); 1018 flush ();
997} 1019}
998 1020
999#ifdef CURSOR_BLINK 1021#ifdef CURSOR_BLINK
1000void 1022void
1001rxvt_term::cursor_blink_cb (time_watcher &w) 1023rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1002{ 1024{
1003 hidden_cursor = !hidden_cursor; 1025 hidden_cursor = !hidden_cursor;
1004 want_refresh = 1; 1026 want_refresh = 1;
1005 1027 refresh_check ();
1006 w.start (w.at + BLINK_INTERVAL);
1007} 1028}
1008#endif 1029#endif
1009 1030
1010#ifdef TEXT_BLINK 1031#ifdef TEXT_BLINK
1011void 1032void
1012rxvt_term::text_blink_cb (time_watcher &w) 1033rxvt_term::text_blink_cb (ev::timer &w, int revents)
1013{ 1034{
1014 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1035 if (scr_refresh_rend (RS_Blink, RS_Blink))
1015 { 1036 {
1016 hidden_text = !hidden_text; 1037 hidden_text = !hidden_text;
1017 want_refresh = 1; 1038 want_refresh = 1;
1018 w.start (w.at + TEXT_BLINK_INTERVAL); 1039 refresh_check ();
1019 } 1040 }
1041 else
1042 w.stop ();
1020} 1043}
1021#endif 1044#endif
1022 1045
1023#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1046#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1024void 1047void
1025rxvt_term::cont_scroll_cb (time_watcher &w) 1048rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1026{ 1049{
1027 if ((scrollbar_isUp() || scrollbar_isDn()) && 1050 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1028 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1051 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1029 { 1052 {
1030 refresh_type |= SMOOTH_REFRESH;
1031 want_refresh = 1; 1053 want_refresh = 1;
1032 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1054 refresh_check ();
1033 } 1055 }
1056 else
1057 w.stop ();
1034} 1058}
1035#endif 1059#endif
1036 1060
1037#ifdef SELECTION_SCROLLING 1061#ifdef SELECTION_SCROLLING
1038void 1062void
1039rxvt_term::sel_scroll_cb (time_watcher &w) 1063rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1040{ 1064{
1041 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1065 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1042 { 1066 {
1043 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1067 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1044 refresh_type |= SMOOTH_REFRESH;
1045 want_refresh = 1; 1068 want_refresh = 1;
1046 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1069 refresh_check ();
1047 } 1070 }
1071 else
1072 w.stop ();
1048} 1073}
1049#endif 1074#endif
1050 1075
1051#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1076#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1052void 1077void
1053rxvt_term::slip_wheel_cb (time_watcher &w) 1078rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1054{ 1079{
1055 if (mouse_slip_wheel_speed == 0 1080 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 { 1081 {
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; 1082 want_refresh = 1;
1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1083 refresh_check ();
1084 }
1085
1086 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1066 } 1087 {
1088 mouse_slip_wheel_speed = 0;
1089 w.stop ();
1090 }
1091}
1092#endif
1093
1094#if LINUX_YIELD_HACK
1095static struct event_handler
1096{
1097 ev::prepare yield_ev;
1098
1099 void yield_cb (ev::prepare &w, int revents)
1100 {
1101 // this should really be sched_yield(), but the linux guys thought
1102 // that giving a process calling sched_yield () less cpu time than
1103 // ones with high nice levels is a useful thing to do. It surely is is
1104 // allowed by the sus... as is returning ENOSYS.
1105 // since the linux guys additionally thought that breaking the only
1106 // known workaround against their unusable sched_yield hack is cool,
1107 // we just nanosleep a bit and hope for the best.
1108
1109 struct timespec ts = { 0, 1000 };
1110 nanosleep (&ts, 0);
1111
1112 w.stop ();
1113 }
1114
1115 event_handler ()
1116 : yield_ev (this, &event_handler::yield_cb)
1117 {
1118 }
1119} event_handler;
1120#endif
1121
1122/* make sure all the cmd data is at beginning of cmdbuf */
1123void
1124rxvt_term::cmdbuf_reify ()
1125{
1126 if (cmdbuf_ptr == cmdbuf_base)
1127 return;
1128
1129 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1130
1131 memmove (cmdbuf_base, cmdbuf_ptr, used);
1132 cmdbuf_ptr = cmdbuf_base;
1133 cmdbuf_endp = cmdbuf_ptr + used;
1134
1135}
1136
1137#if defined (KEYSYM_RESOURCE)
1138void
1139rxvt_term::cmdbuf_append (const char *str, size_t count)
1140{
1141 cmdbuf_reify ();
1142
1143 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1144
1145 if (count > avail)
1146 return;
1147
1148 memcpy (cmdbuf_endp, str, count);
1149 cmdbuf_endp += count;
1150
1151 cmd_parse ();
1067} 1152}
1068#endif 1153#endif
1069 1154
1070bool 1155bool
1071rxvt_term::pty_fill () 1156rxvt_term::pty_fill ()
1072{ 1157{
1073 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1158 cmdbuf_reify ();
1074 1159
1075 if (CBUFSIZ == n) 1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1076 { 1161
1077 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1162 if (!avail)
1078 n = 0;
1079 } 1163 {
1080 1164 // normally this indicates a "too long" command sequence - just drop the data we have
1081 memmove (cmdbuf_base, cmdbuf_ptr, n);
1082 cmdbuf_ptr = cmdbuf_base; 1165 cmdbuf_ptr = cmdbuf_base;
1083 cmdbuf_endp = cmdbuf_ptr + n; 1166 cmdbuf_endp = cmdbuf_ptr;
1167 avail = CBUFSIZ;
1168 }
1084 1169
1085 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1170 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1086 1171
1087 if (n > 0) 1172 if (r > 0)
1088 { 1173 {
1089 cmdbuf_endp += n; 1174 cmdbuf_endp += r;
1090 return true; 1175 return true;
1091 } 1176 }
1092 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1177 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1178 {
1179#if LINUX_YIELD_HACK
1180 if (display->is_local)
1181 event_handler.yield_ev.start ();
1182#endif
1183 }
1184 else
1093 { 1185 {
1094 pty_ev.stop (); 1186 pty_ev.stop ();
1095 1187
1096 if (!OPTION (Opt_hold)) 1188 if (!option (Opt_hold))
1097 destroy (); 1189 destroy ();
1098 } 1190 }
1099 1191
1100 return false; 1192 return false;
1101} 1193}
1102 1194
1103void 1195void
1104rxvt_term::pty_cb (io_watcher &w, short revents) 1196rxvt_term::pty_cb (ev::io &w, int revents)
1105{ 1197{
1106 SET_R (this); 1198 make_current ();
1107 SET_LOCALE (locale);
1108 1199
1109 if (revents & EVENT_READ) 1200 if (revents & ev::READ)
1110 // loop, but don't allow a single term to monopolize us 1201 // loop, but don't allow a single term to monopolize us
1111 while (pty_fill ()) 1202 for (int i = CBUFCNT; i-- && pty_fill (); )
1112 if (cmd_parse ()) 1203 cmd_parse ();
1113 break;
1114 1204
1115 if (revents & EVENT_WRITE) 1205 if (revents & ev::WRITE)
1116 pty_write (); 1206 pty_write ();
1207
1208 refresh_check ();
1117} 1209}
1118 1210
1119void 1211void
1120rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
1121{ 1213{
1122 XDefineCursor (display->display, vt, TermWin_cursor); 1214 XDefineCursor (dpy, vt, TermWin_cursor);
1123 recolour_cursor (); 1215 recolour_cursor ();
1124 1216
1125#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1126 hidden_pointer = 0; 1218 hidden_pointer = 0;
1127 1219
1128 if (OPTION (Opt_pointerBlank)) 1220 if (option (Opt_pointerBlank))
1129 pointer_ev.start (NOW + pointerBlankDelay); 1221 pointer_ev.start (pointerBlankDelay);
1130#endif 1222#endif
1131} 1223}
1132 1224
1133#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
1134void 1226void
1135rxvt_term::pointer_blank () 1227rxvt_term::pointer_blank ()
1136{ 1228{
1137 if (! OPTION (Opt_pointerBlank)) 1229 if (!option (Opt_pointerBlank))
1138 return; 1230 return;
1139 1231
1140 XDefineCursor (display->display, vt, display->blank_cursor); 1232 XDefineCursor (dpy, vt, display->blank_cursor);
1141 XFlush (display->display); 1233 XFlush (dpy);
1142 1234
1143 hidden_pointer = 1; 1235 hidden_pointer = 1;
1144} 1236}
1145 1237
1146void 1238void
1147rxvt_term::pointer_cb (time_watcher &w) 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
1148{ 1240{
1149 SET_R (this); 1241 make_current ();
1150 SET_LOCALE (locale);
1151 1242
1152 pointer_blank (); 1243 pointer_blank ();
1153} 1244}
1154#endif 1245#endif
1155 1246
1156void 1247void
1157rxvt_term::mouse_report (XButtonEvent &ev) 1248rxvt_term::mouse_report (XButtonEvent &ev)
1158{ 1249{
1159 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1160 int x, y; 1251 int x, y;
1252 int code = 32;
1161 1253
1162 x = ev.x; 1254 x = Pixel2Col (ev.x) + 1;
1163 y = ev.y; 1255 y = Pixel2Row (ev.y) + 1;
1164 pixel_position (&x, &y); 1256
1257 if (ev.type == MotionNotify)
1258 {
1259 if (x == mouse_row && y == mouse_col)
1260 return;
1261
1262 mouse_row = x;
1263 mouse_col = y;
1264 code += 32;
1265 }
1165 1266
1166 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1167 button_number = 3; 1268 button_number = 3;
1168 else 1269 else
1169 { 1270 {
1170 button_number = MEvent.button - Button1; 1271 button_number = MEvent.button - Button1;
1171 /* add 0x3D for wheel events, like xterm does */ 1272 /* add 0x3D for wheel events, like xterm does */
1172 if (button_number >= 3) 1273 if (button_number >= 3)
1173 button_number += (64 - 3); 1274 button_number += 64 - 3;
1174 } 1275 }
1175 1276
1176 if (priv_modes & PrivMode_MouseX10) 1277 if (priv_modes & PrivMode_MouseX10)
1177 { 1278 {
1178 /* 1279 /*
… …
1210 fputc ('A', stderr); 1311 fputc ('A', stderr);
1211 if (key_state & 32) 1312 if (key_state & 32)
1212 fputc ('2', stderr); 1313 fputc ('2', stderr);
1213 fprintf (stderr, "]: <%d>, %d/%d\n", 1314 fprintf (stderr, "]: <%d>, %d/%d\n",
1214 button_number, 1315 button_number,
1215 x + 1, 1316 x,
1216 y + 1); 1317 y);
1217#endif 1318#endif
1218 1319
1320#if ENABLE_FRILLS
1321 if (priv_modes & PrivMode_ExtMouseRight)
1322 tt_printf ("\033[%d;%d;%dM",
1323 code + button_number + key_state,
1324 x,
1325 y);
1326 else if (priv_modes & PrivMode_ExtModeMouse)
1327 tt_printf ("\033[M%c%lc%lc",
1328 code + button_number + key_state,
1329 wint_t (32 + x),
1330 wint_t (32 + y));
1331 else
1332#endif
1219 tt_printf ("\033[M%c%c%c", 1333 tt_printf ("\033[M%c%c%c",
1220 (32 + button_number + key_state), 1334 code + button_number + key_state,
1221 (32 + x + 1), 1335 32 + x,
1222 (32 + y + 1)); 1336 32 + y);
1223} 1337}
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 1338
1235/*{{{ process an X event */ 1339/*{{{ process an X event */
1236void 1340void
1237rxvt_term::x_cb (XEvent &ev) 1341rxvt_term::x_cb (XEvent &ev)
1238{ 1342{
1239 dDisp; 1343 make_current ();
1240 1344
1241 SET_R (this); 1345 dLocal (Display *, dpy);
1242 SET_LOCALE (locale);
1243 1346
1244#if defined(CURSOR_BLINK) 1347 if (ev.xany.window == vt
1245 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1348 && SHOULD_INVOKE (HOOK_X_EVENT)
1246 { 1349 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1247 if (hidden_cursor) 1350 return;
1248 {
1249 hidden_cursor = 0;
1250 want_refresh = 1;
1251 }
1252 1351
1253 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1352 // 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; 1353 Window unused_root, unused_child;
1272 int unused_root_x, unused_root_y; 1354 int unused_root_x, unused_root_y;
1273 unsigned int unused_mask; 1355 unsigned int unused_mask;
1274 1356
1275 switch (ev.type) 1357 switch (ev.type)
1276 { 1358 {
1277 case KeyPress: 1359 case KeyPress:
1278#if ISO_14755 1360 key_press (ev.xkey);
1279 if (!(iso14755buf & ISO_14755_52))
1280#endif
1281 lookup_key (ev.xkey);
1282
1283 break; 1361 break;
1284 1362
1285 case KeyRelease: 1363 case KeyRelease:
1286 { 1364 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; 1365 break;
1354 }
1355 1366
1356 case ButtonPress: 1367 case ButtonPress:
1357 button_press (ev.xbutton); 1368 button_press (ev.xbutton);
1358 break; 1369 break;
1359 1370
… …
1361 button_release (ev.xbutton); 1372 button_release (ev.xbutton);
1362 break; 1373 break;
1363 1374
1364 case ClientMessage: 1375 case ClientMessage:
1365 if (ev.xclient.format == 32 1376 if (ev.xclient.format == 32
1366 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1377 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1367 { 1378 {
1379 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1380 {
1381 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1382 {
1368 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1383 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1384 {
1385 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1369 destroy (); 1386 destroy ();
1387 }
1370#if ENABLE_EWMH 1388#if ENABLE_EWMH
1371 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1389 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1372 XSendEvent (disp, ev.xclient.window = display->root, 1390 XSendEvent (dpy, ev.xclient.window = display->root,
1373 False, SubstructureRedirectMask | SubstructureNotifyMask, 1391 False, SubstructureRedirectMask | SubstructureNotifyMask,
1374 &ev); 1392 &ev);
1393#endif
1394 }
1395 }
1396#if ENABLE_XEMBED
1397 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1398 {
1399 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1400 focus_in ();
1401 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1402 focus_out ();
1403 }
1375#endif 1404#endif
1376 } 1405 }
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; 1406 break;
1417 1407
1418 /* 1408 /*
1419 * XXX: this is not the _current_ arrangement 1409 * XXX: this is not the _current_ arrangement
1420 * Here's my conclusion: 1410 * Here's my conclusion:
… …
1439 break; 1429 break;
1440 } 1430 }
1441 break; 1431 break;
1442 1432
1443 case FocusIn: 1433 case FocusIn:
1434 if (ev.xfocus.detail != NotifyInferior
1435 && ev.xfocus.detail != NotifyPointer
1436 && ev.xfocus.mode != NotifyGrab)
1444 focus_in (); 1437 focus_in ();
1445 break; 1438 break;
1446 1439
1447 case FocusOut: 1440 case FocusOut:
1441 if (ev.xfocus.detail != NotifyInferior
1442 && ev.xfocus.detail != NotifyPointer
1443 && ev.xfocus.mode != NotifyGrab)
1448 focus_out (); 1444 focus_out ();
1449 break; 1445 break;
1450 1446
1451 case ConfigureNotify: 1447 case ConfigureNotify:
1452 if (ev.xconfigure.window == parent[0]) 1448 if (ev.xconfigure.window == parent)
1453 { 1449 {
1454 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1450 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1455 ; 1451 ;
1452
1453#ifdef HAVE_BG_PIXMAP
1454 bool moved = false;
1455 if (bg_window_position_sensitive ())
1456 {
1457 int x, y;
1458 if (ev.xconfigure.send_event)
1459 {
1460 x = ev.xconfigure.x;
1461 y = ev.xconfigure.y;
1462 }
1463 else
1464 get_window_origin (x, y);
1465
1466 if (bg_set_position (x, y)
1467 || !(bg_flags & BG_IS_VALID))
1468 moved = true;
1469 }
1470#endif
1456 1471
1457 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1472 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1458 { 1473 {
1459 seen_resize = 1; 1474 seen_resize = 1;
1460 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1475 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1461 } 1476 }
1462 1477 else
1463#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1478 {
1464 if (OPTION (Opt_transparent)) 1479#ifdef HAVE_BG_PIXMAP
1465 check_our_parents (); 1480 if (moved)
1481 {
1482 if (mapped)
1483 update_background ();
1484 else
1485 bg_invalidate ();
1486 }
1466#endif 1487#endif
1488 }
1489
1490 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1467 } 1491 }
1468 break; 1492 break;
1469 1493
1470 case PropertyNotify: 1494 case PropertyNotify:
1471 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1495 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1472 && ev.xproperty.state == PropertyNewValue)
1473 selection_property (ev.xproperty.window, ev.xproperty.atom);
1474
1475 break; 1496 break;
1476 1497
1477 case SelectionClear: 1498 case SelectionClear:
1478 selection_clear (); 1499 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1479 break;
1480
1481 case SelectionNotify:
1482 if (selection_wait == Sel_normal)
1483 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1484 break; 1500 break;
1485 1501
1486 case SelectionRequest: 1502 case SelectionRequest:
1487 selection_send (ev.xselectionrequest); 1503 selection_send (ev.xselectionrequest);
1504 break;
1505
1506 case MapNotify:
1507#ifdef HAVE_BG_PIXMAP
1508 /* This is needed specifically to fix the case of no window manager or a
1509 * non-reparenting window manager. In those cases we never get first
1510 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1511 * care of multiplicity of ConfigureNotify events arriving while WM does
1512 * reparenting.
1513 * We should not render background immediately, as there could be several
1514 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1515 * by scheduling background redraw as soon as we can, but giving a short
1516 * bit of time for ConfigureNotifies to arrive.
1517 * We should render background PRIOR to drawing any text, but AFTER all
1518 * of ConfigureNotifys for the best results.
1519 */
1520 if (!(bg_flags & BG_IS_VALID))
1521 update_background_ev.start (0.025);
1522#endif
1523 mapped = 1;
1524#ifdef TEXT_BLINK
1525 text_blink_ev.start ();
1526#endif
1527 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1488 break; 1528 break;
1489 1529
1490 case UnmapNotify: 1530 case UnmapNotify:
1491 mapped = 0; 1531 mapped = 0;
1492#ifdef TEXT_BLINK 1532#ifdef TEXT_BLINK
1493 text_blink_ev.stop (); 1533 text_blink_ev.stop ();
1494#endif 1534#endif
1535 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1495 break; 1536 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 1537
1510 case GraphicsExpose: 1538 case GraphicsExpose:
1511 case Expose: 1539 case Expose:
1512 if (ev.xany.window == vt) 1540 if (ev.xany.window == vt)
1513 { 1541 {
1514 do 1542 do
1543 {
1515 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1516 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, false);
1546 }
1517 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1518 1548
1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1520 1550
1521 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1552 {
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, false);
1555 }
1524 1556
1525 scr_refresh (refresh_type); 1557 want_refresh = 1;
1526 } 1558 }
1527 else 1559 else
1528 { 1560 {
1529 XEvent unused_event; 1561 XEvent unused_event;
1530 1562
1531 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1532 ; 1564 ;
1533 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1534 ; 1566 ;
1535 1567
1536 if (isScrollbarWindow (ev.xany.window)) 1568 if (scrollBar.state && ev.xany.window == scrollBar.win)
1537 { 1569 {
1538 scrollBar.setIdle (); 1570 scrollBar.state = STATE_IDLE;
1539 scrollbar_show (0); 1571 scrollBar.show (0);
1540 } 1572 }
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 } 1573 }
1551 break; 1574 break;
1552 1575
1553 case MotionNotify: 1576 case MotionNotify:
1554#ifdef POINTER_BLANK 1577#ifdef POINTER_BLANK
1555 if (hidden_pointer) 1578 if (hidden_pointer)
1556 pointer_unblank (); 1579 pointer_unblank ();
1557#endif 1580#endif
1558#if MENUBAR 1581 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1559 if (isMenuBarWindow (ev.xany.window)) 1582 || priv_modes & PrivMode_MouseAnyEvent)
1560 {
1561 menubar_control (ev.xbutton); 1583 mouse_report (ev.xbutton);
1562 break;
1563 }
1564#endif
1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1584 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1566 break; 1585 break;
1567 1586
1568 if (ev.xany.window == vt) 1587 if (ev.xany.window == vt)
1569 { 1588 {
1589 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1590 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1591 ; // nop
1570 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1592 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1571 { 1593 {
1572 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1594 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1573 ; 1595 ;
1574 1596
1575 XQueryPointer (disp, vt, 1597 XQueryPointer (dpy, vt,
1576 &unused_root, &unused_child, 1598 &unused_root, &unused_child,
1577 &unused_root_x, &unused_root_y, 1599 &unused_root_x, &unused_root_y,
1578 &ev.xbutton.x, &ev.xbutton.y, 1600 &ev.xbutton.x, &ev.xbutton.y,
1579 &ev.xbutton.state); 1601 &ev.xbutton.state);
1580#ifdef MOUSE_THRESHOLD 1602#ifdef MOUSE_THRESHOLD
… …
1600 int dist; 1622 int dist;
1601 1623
1602 /* don't clobber the current delay if we are 1624 /* don't clobber the current delay if we are
1603 * already in the middle of scrolling. 1625 * already in the middle of scrolling.
1604 */ 1626 */
1605 if (!sel_scroll_ev.active) 1627 if (!sel_scroll_ev.is_active ())
1606 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1628 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1607 1629
1608 /* save the event params so we can highlight 1630 /* save the event params so we can highlight
1609 * the selection in the pending-scroll loop 1631 * the selection in the pending-scroll loop
1610 */ 1632 */
1611 selection_save_x = ev.xbutton.x; 1633 selection_save_x = ev.xbutton.x;
… …
1633 else 1655 else
1634 { 1656 {
1635 /* we are within the text window, so we 1657 /* we are within the text window, so we
1636 * shouldn't be scrolling 1658 * shouldn't be scrolling
1637 */ 1659 */
1638 if (sel_scroll_ev.active)
1639 sel_scroll_ev.stop(); 1660 sel_scroll_ev.stop();
1640 } 1661 }
1641#endif 1662#endif
1642#ifdef MOUSE_THRESHOLD 1663#ifdef MOUSE_THRESHOLD
1643 } 1664 }
1644#endif 1665#endif
1645 } 1666 }
1646 } 1667 }
1647 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1668 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1648 { 1669 {
1649 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1650 MotionNotify, &ev)) 1671 MotionNotify, &ev))
1651 ; 1672 ;
1652 1673
1653 XQueryPointer (disp, scrollBar.win, 1674 XQueryPointer (dpy, scrollBar.win,
1654 &unused_root, &unused_child, 1675 &unused_root, &unused_child,
1655 &unused_root_x, &unused_root_y, 1676 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1677 &ev.xbutton.x, &ev.xbutton.y,
1657 &unused_mask); 1678 &unused_mask);
1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1659 scrollbar_size ()); 1680 scrollBar.size ());
1660 scr_refresh (refresh_type);
1661 refresh_limit = 0; 1681 want_refresh = 1;
1662 scrollbar_show (1); 1682 scrollBar.show (1);
1663 } 1683 }
1664 break; 1684 break;
1665 } 1685 }
1686
1687#if defined(CURSOR_BLINK)
1688 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1689 {
1690 if (hidden_cursor)
1691 {
1692 hidden_cursor = 0;
1693 want_refresh = 1;
1694 }
1695
1696 cursor_blink_ev.again ();
1697 }
1698#endif
1699
1700#if defined(POINTER_BLANK)
1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1702 {
1703 if (ev.type == MotionNotify
1704 || ev.type == ButtonPress
1705 || ev.type == ButtonRelease)
1706 if (hidden_pointer)
1707 pointer_unblank ();
1708
1709 if (ev.type == KeyPress && hidden_pointer == 0)
1710 pointer_blank ();
1711 }
1712#endif
1713
1714 refresh_check ();
1666} 1715}
1716
1717#if ENABLE_FRILLS
1718void
1719rxvt_term::set_urgency (bool enable)
1720{
1721 if (enable == urgency_hint)
1722 return;
1723
1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1725 {
1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1727 XSetWMHints (dpy, parent, h);
1728 urgency_hint = enable;
1729 }
1730}
1731#endif
1667 1732
1668void 1733void
1669rxvt_term::focus_in () 1734rxvt_term::focus_in ()
1670{ 1735{
1671 if (!focus) 1736 if (!focus)
1672 { 1737 {
1673 focus = 1; 1738 focus = 1;
1674 want_refresh = 1; 1739 want_refresh = 1;
1740
1675#if USE_XIM 1741#if USE_XIM
1676 if (Input_Context != NULL) 1742 if (Input_Context != NULL)
1677 { 1743 {
1678 IMSetStatusPosition (); 1744 IMSetPosition ();
1679 XSetICFocus (Input_Context); 1745 XSetICFocus (Input_Context);
1680 } 1746 }
1681#endif 1747#endif
1682#if CURSOR_BLINK 1748#if CURSOR_BLINK
1683 if (OPTION (Opt_cursorBlink)) 1749 if (option (Opt_cursorBlink))
1684 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1750 cursor_blink_ev.again ();
1685#endif 1751#endif
1686#if OFF_FOCUS_FADING 1752#if OFF_FOCUS_FADING
1687 if (rs[Rs_fade]) 1753 if (rs[Rs_fade])
1688 { 1754 {
1689 pix_colors = pix_colors_focused; 1755 pix_colors = pix_colors_focused;
1690 scr_recolour (); 1756 scr_recolour ();
1691 } 1757 }
1692#endif 1758#endif
1759#if ENABLE_FRILLS
1760 if (option (Opt_urgentOnBell))
1761 set_urgency (0);
1762#endif
1763
1764 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1693 } 1765 }
1694} 1766}
1695 1767
1696void 1768void
1697rxvt_term::focus_out () 1769rxvt_term::focus_out ()
… …
1699 if (focus) 1771 if (focus)
1700 { 1772 {
1701 focus = 0; 1773 focus = 0;
1702 want_refresh = 1; 1774 want_refresh = 1;
1703 1775
1776#if ENABLE_FRILLS
1777 if (option (Opt_urgentOnBell))
1778 set_urgency (0);
1779#endif
1704#if ENABLE_FRILLS || ISO_14755 1780#if ENABLE_FRILLS || ISO_14755
1781 if (iso14755buf)
1782 {
1705 iso14755buf = 0; 1783 iso14755buf = 0;
1706#endif 1784# if ISO_14755
1707#if ENABLE_OVERLAY
1708 scr_overlay_off (); 1785 scr_overlay_off ();
1786# endif
1787 }
1709#endif 1788#endif
1710#if USE_XIM 1789#if USE_XIM
1711 if (Input_Context != NULL) 1790 if (Input_Context != NULL)
1712 XUnsetICFocus (Input_Context); 1791 XUnsetICFocus (Input_Context);
1713#endif 1792#endif
1714#if CURSOR_BLINK 1793#if CURSOR_BLINK
1715 if (OPTION (Opt_cursorBlink)) 1794 if (option (Opt_cursorBlink))
1716 cursor_blink_ev.stop (); 1795 cursor_blink_ev.stop ();
1796
1717 hidden_cursor = 0; 1797 hidden_cursor = 0;
1718#endif 1798#endif
1719#if OFF_FOCUS_FADING 1799#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade]) 1800 if (rs[Rs_fade])
1721 { 1801 {
1722 pix_colors = pix_colors_unfocused; 1802 pix_colors = pix_colors_unfocused;
1723 scr_recolour (); 1803 scr_recolour ();
1724 } 1804 }
1725#endif 1805#endif
1806
1807 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1808 }
1809}
1810
1811void
1812rxvt_term::update_fade_color (unsigned int idx)
1813{
1814#if OFF_FOCUS_FADING
1815 if (rs[Rs_fade])
1726 } 1816 {
1817 rgba c;
1818 pix_colors [Color_fade].get (c);
1819 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1820 }
1821#endif
1727} 1822}
1728 1823
1729#if TRANSPARENT 1824#if ENABLE_TRANSPARENCY || ENABLE_PERL
1730void 1825void
1731rxvt_term::rootwin_cb (XEvent &ev) 1826rxvt_term::rootwin_cb (XEvent &ev)
1732{ 1827{
1733 SET_R (this); 1828 make_current ();
1734 SET_LOCALE (locale);
1735 1829
1830 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1831 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1832 return;
1833
1834# if ENABLE_TRANSPARENCY
1736 switch (ev.type) 1835 switch (ev.type)
1737 { 1836 {
1738 case PropertyNotify: 1837 case PropertyNotify:
1739 /* 1838 /*
1740 * if user used some Esetroot compatible prog to set the root bg, 1839 * 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. 1840 * use the property to determine the pixmap. We use it later on.
1742 */ 1841 */
1743 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1842 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1744 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1843 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1745 return; 1844 {
1845 bg_set_root_pixmap ();
1846 update_background ();
1847 }
1746 1848
1747 /* FALLTHROUGH */
1748 case ReparentNotify:
1749 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1750 want_refresh = want_full_refresh = 1;
1751 break; 1849 break;
1752 } 1850 }
1851# endif
1852
1853 refresh_check ();
1753} 1854}
1754#endif 1855#endif
1755 1856
1756void 1857void
1757rxvt_term::button_press (XButtonEvent &ev) 1858rxvt_term::button_press (XButtonEvent &ev)
1758{ 1859{
1759 int reportmode = 0, clickintime; 1860 int reportmode = 0, clickintime;
1760 1861
1761 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1862 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1863
1762 if (!bypass_keystate) 1864 if (!bypass_keystate)
1763 reportmode = !! (priv_modes & PrivMode_mouse_report); 1865 reportmode = !! (priv_modes & PrivMode_mouse_report);
1764 1866
1765 /* 1867 /*
1766 * VT window processing of button press 1868 * VT window processing of button press
1767 */ 1869 */
1768 if (ev.window == vt) 1870 if (ev.window == vt)
1769 { 1871 {
1872 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1873 return;
1874
1770#if ISO_14755 1875#if ISO_14755
1771 // 5.4 1876 // 5.4
1772 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1877 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1773 { 1878 {
1774 iso14755_54 (ev.x, ev.y); 1879 iso14755_54 (ev.x, ev.y);
… …
1784 /* save the xbutton state (for ButtonRelease) */ 1889 /* save the xbutton state (for ButtonRelease) */
1785 MEvent.state = ev.state; 1890 MEvent.state = ev.state;
1786#ifdef MOUSE_REPORT_DOUBLECLICK 1891#ifdef MOUSE_REPORT_DOUBLECLICK
1787 if (ev.button == MEvent.button && clickintime) 1892 if (ev.button == MEvent.button && clickintime)
1788 { 1893 {
1789 /* same button, within alloted time */ 1894 /* same button, within allowed time */
1790 MEvent.clicks++; 1895 MEvent.clicks++;
1896
1791 if (MEvent.clicks > 1) 1897 if (MEvent.clicks > 1)
1792 { 1898 {
1793 /* only report double clicks */ 1899 /* only report double clicks */
1794 MEvent.clicks = 2; 1900 MEvent.clicks = 2;
1795 mouse_report (ev); 1901 mouse_report (ev);
… …
1807 mouse_report (ev); 1913 mouse_report (ev);
1808 } 1914 }
1809#else 1915#else
1810 MEvent.button = ev.button; 1916 MEvent.button = ev.button;
1811 mouse_report (ev); 1917 mouse_report (ev);
1812#endif /* MOUSE_REPORT_DOUBLECLICK */ 1918#endif /* MOUSE_REPORT_DOUBLECLICK */
1813 1919
1814 } 1920 }
1815 else 1921 else
1816 { 1922 {
1817 if (ev.button != MEvent.button) 1923 if (ev.button != MEvent.button)
… …
1827#else 1933#else
1828 selection.rect = false; 1934 selection.rect = false;
1829#endif 1935#endif
1830 1936
1831 /* allow shift+left click to extend selection */ 1937 /* allow shift+left click to extend selection */
1832 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1938 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1833 { 1939 {
1834 if (MEvent.button == Button1 && clickintime) 1940 if (MEvent.button == Button1 && clickintime)
1835 selection_rotate (ev.x, ev.y); 1941 selection_rotate (ev.x, ev.y);
1836 else 1942 else
1837 selection_extend (ev.x, ev.y, 1); 1943 selection_extend (ev.x, ev.y, 1);
… …
1865 } 1971 }
1866 1972
1867 /* 1973 /*
1868 * Scrollbar window processing of button press 1974 * Scrollbar window processing of button press
1869 */ 1975 */
1870 if (isScrollbarWindow (ev.window)) 1976 if (scrollBar.state && ev.window == scrollBar.win)
1871 { 1977 {
1872 scrollBar.setIdle (); 1978 page_dirn direction = NO_DIR;
1979
1980 if (scrollBar.upButton (ev.y))
1981 direction = UP; /* up */
1982 else if (scrollBar.dnButton (ev.y))
1983 direction = DN; /* down */
1984
1985 scrollBar.state = STATE_IDLE;
1873 /* 1986 /*
1874 * Rxvt-style scrollbar: 1987 * Rxvt-style scrollbar:
1875 * move up if mouse is above slider 1988 * move up if mouse is above slider
1876 * move dn if mouse is below slider 1989 * move dn if mouse is below slider
1877 * 1990 *
… …
1886 /* 1999 /*
1887 * Mouse report disabled scrollbar: 2000 * Mouse report disabled scrollbar:
1888 * arrow buttons - send up/down 2001 * arrow buttons - send up/down
1889 * click on scrollbar - send pageup/down 2002 * click on scrollbar - send pageup/down
1890 */ 2003 */
1891 if ((scrollBar.style == R_SB_NEXT 2004 if (direction == UP)
1892 && scrollbarnext_upButton (ev.y))
1893 || (scrollBar.style == R_SB_RXVT
1894 && scrollbarrxvt_upButton (ev.y)))
1895 tt_printf ("\033[A"); 2005 tt_printf ("\033[A");
1896 else if ((scrollBar.style == R_SB_NEXT 2006 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"); 2007 tt_printf ("\033[B");
1901 else 2008 else
1902 switch (ev.button) 2009 switch (ev.button)
1903 { 2010 {
1904 case Button2: 2011 case Button2:
… …
1911 tt_printf ("\033[5~"); 2018 tt_printf ("\033[5~");
1912 break; 2019 break;
1913 } 2020 }
1914 } 2021 }
1915 else 2022 else
1916#endif /* NO_SCROLLBAR_REPORT */ 2023#endif /* NO_SCROLLBAR_REPORT */
1917
1918 {
1919 char upordown = 0;
1920
1921 if (scrollBar.style == R_SB_NEXT)
1922 { 2024 {
1923 if (scrollbarnext_upButton (ev.y)) 2025 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 { 2026 {
1937#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2027#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2028 if (!cont_scroll_ev.is_active ())
1938 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2029 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1939#endif 2030#endif
1940 if (scr_page (upordown < 0 ? UP : DN, 1)) 2031 if (scr_page (direction, 1))
1941 { 2032 {
1942 if (upordown < 0) 2033 if (direction == UP)
1943 scrollBar.setUp (); 2034 scrollBar.state = STATE_UP;
1944 else 2035 else
1945 scrollBar.setDn (); 2036 scrollBar.state = STATE_DOWN;
1946 } 2037 }
1947 } 2038 }
1948 else 2039 else
1949 switch (ev.button) 2040 switch (ev.button)
1950 { 2041 {
1951 case Button2: 2042 case Button2:
1952 switch (scrollbar_align) 2043 switch (scrollBar.align)
1953 { 2044 {
1954 case R_SB_ALIGN_TOP: 2045 case R_SB_ALIGN_TOP:
1955 csrO = 0; 2046 csrO = 0;
1956 break; 2047 break;
1957 case R_SB_ALIGN_CENTRE: 2048 case R_SB_ALIGN_CENTRE:
… …
1963 } 2054 }
1964 2055
1965 if (scrollBar.style == R_SB_XTERM 2056 if (scrollBar.style == R_SB_XTERM
1966 || scrollbar_above_slider (ev.y) 2057 || scrollbar_above_slider (ev.y)
1967 || scrollbar_below_slider (ev.y)) 2058 || scrollbar_below_slider (ev.y))
1968 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
1969 2060
1970 scrollBar.setMotion (); 2061 scrollBar.state = STATE_MOTION;
1971 break; 2062 break;
1972 2063
1973 case Button1: 2064 case Button1:
1974 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2065 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1975 csrO = ev.y - scrollBar.top; 2066 csrO = ev.y - scrollBar.top;
1976 /* FALLTHROUGH */ 2067 /* FALLTHROUGH */
1977 2068
1978 case Button3: 2069 case Button3:
1979 if (scrollBar.style != R_SB_XTERM) 2070 if (scrollBar.style != R_SB_XTERM)
… …
1989 scr_page (DN, nrow - 1); 2080 scr_page (DN, nrow - 1);
1990# else 2081# else
1991 scr_page (DN, nrow / 4); 2082 scr_page (DN, nrow / 4);
1992# endif 2083# endif
1993 else 2084 else
1994 scrollBar.setMotion (); 2085 scrollBar.state = STATE_MOTION;
1995 } 2086 }
1996 else 2087 else
1997 { 2088 {
1998 scr_page ((ev.button == Button1 ? DN : UP), 2089 scr_page ((ev.button == Button1 ? DN : UP),
1999 (nrow 2090 (nrow
2000 * scrollbar_position (ev.y) 2091 * scrollbar_position (ev.y)
2001 / scrollbar_size ())); 2092 / scrollBar.size ()));
2002 } 2093 }
2003 2094
2004 break; 2095 break;
2005 } 2096 }
2006 } 2097 }
2098
2007 return; 2099 return;
2008 } 2100 }
2009#if MENUBAR
2010 /*
2011 * Menubar window processing of button press
2012 */
2013 if (isMenuBarWindow (ev.window))
2014 menubar_control (ev);
2015#endif
2016} 2101}
2017 2102
2018void 2103void
2019rxvt_term::button_release (XButtonEvent &ev) 2104rxvt_term::button_release (XButtonEvent &ev)
2020{ 2105{
… …
2022 2107
2023 csrO = 0; /* reset csr Offset */ 2108 csrO = 0; /* reset csr Offset */
2024 if (!bypass_keystate) 2109 if (!bypass_keystate)
2025 reportmode = !! (priv_modes & PrivMode_mouse_report); 2110 reportmode = !! (priv_modes & PrivMode_mouse_report);
2026 2111
2027 if (scrollbar_isUpDn ()) 2112 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2028 { 2113 {
2029 scrollBar.setIdle (); 2114 scrollBar.state = STATE_IDLE;
2030 scrollbar_show (0); 2115 scrollBar.show (0);
2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2032 refresh_type &= ~SMOOTH_REFRESH;
2033#endif
2034 } 2116 }
2035 2117
2036#ifdef SELECTION_SCROLLING 2118#ifdef SELECTION_SCROLLING
2037 if (sel_scroll_ev.active)
2038 sel_scroll_ev.stop(); 2119 sel_scroll_ev.stop();
2039#endif 2120#endif
2040 2121
2041 if (ev.window == vt) 2122 if (ev.window == vt)
2042 { 2123 {
2124 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2125 return;
2126
2043#if ISO_14755 2127#if ISO_14755
2044 // 5.4 2128 // 5.4
2045 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2129 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2046 return; 2130 return;
2047#endif 2131#endif
2132
2048 if (reportmode) 2133 if (reportmode)
2049 { 2134 {
2050 /* mouse report from vt window */ 2135 /* mouse report from vt window */
2051 /* don't report release of wheel "buttons" */ 2136 /* don't report release of wheel "buttons" */
2052 if (ev.button >= 4) 2137 if (ev.button >= 4)
… …
2063 mouse_report (ev); 2148 mouse_report (ev);
2064 } 2149 }
2065#else /* MOUSE_REPORT_DOUBLECLICK */ 2150#else /* MOUSE_REPORT_DOUBLECLICK */
2066 MEvent.button = AnyButton; 2151 MEvent.button = AnyButton;
2067 mouse_report (ev); 2152 mouse_report (ev);
2068#endif /* MOUSE_REPORT_DOUBLECLICK */ 2153#endif /* MOUSE_REPORT_DOUBLECLICK */
2069 return; 2154 return;
2070 } 2155 }
2071 2156
2072 /* 2157 /*
2073 * dumb hack to compensate for the failure of click-and-drag 2158 * dumb hack to compensate for the failure of click-and-drag
… …
2082 { 2167 {
2083 case Button1: 2168 case Button1:
2084 case Button3: 2169 case Button3:
2085 selection_make (ev.time); 2170 selection_make (ev.time);
2086 break; 2171 break;
2172
2087 case Button2: 2173 case Button2:
2088 selection_request (ev.time, ev.x, ev.y); 2174 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2175 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2089 break; 2176 break;
2177
2090#ifdef MOUSE_WHEEL 2178#ifdef MOUSE_WHEEL
2091 case Button4: 2179 case Button4:
2092 case Button5: 2180 case Button5:
2093 { 2181 {
2094 int i; 2182 int i;
… …
2096 2184
2097 v = ev.button == Button4 ? UP : DN; 2185 v = ev.button == Button4 ? UP : DN;
2098 2186
2099 if (ev.state & ShiftMask) 2187 if (ev.state & ShiftMask)
2100 i = 1; 2188 i = 1;
2101 else if (OPTION (Opt_mouseWheelScrollPage)) 2189 else if (option (Opt_mouseWheelScrollPage))
2102 i = nrow - 1; 2190 i = nrow - 1;
2103 else 2191 else
2104 i = 5; 2192 i = 5;
2105 2193
2106# ifdef MOUSE_SLIP_WHEELING 2194# ifdef MOUSE_SLIP_WHEELING
… …
2108 { 2196 {
2109 mouse_slip_wheel_speed += v ? -1 : 1; 2197 mouse_slip_wheel_speed += v ? -1 : 1;
2110 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2198 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2111 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2199 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2112 2200
2113 if (slip_wheel_ev.at < NOW) 2201 if (!slip_wheel_ev.is_active ())
2114 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2202 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2115
2116 slip_wheel_ev.start ();
2117 } 2203 }
2118 else 2204 else
2205# endif
2119 { 2206 {
2120# endif
2121# ifdef JUMP_MOUSE_WHEEL
2122 scr_page (v, i); 2207 scr_page (v, i);
2123 scr_refresh (SMOOTH_REFRESH);
2124 scrollbar_show (1); 2208 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 } 2209 }
2135#endif
2136 } 2210 }
2137 break; 2211 break;
2138#endif 2212#endif
2139 } 2213 }
2140 } 2214 }
2141#ifdef MENUBAR
2142 else if (isMenuBarWindow (ev.window))
2143 menubar_control (ev);
2144#endif
2145} 2215}
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 2216
2628/*}}} */ 2217/*}}} */
2629 2218
2630bool 2219void
2631rxvt_term::cmd_parse () 2220rxvt_term::cmd_parse ()
2632{ 2221{
2633 bool flag = false;
2634 unicode_t ch = NOCHAR; 2222 wchar_t ch = NOCHAR;
2635 unsigned char *seq_begin; // remember start of esc-sequence here 2223 char *seq_begin; // remember start of esc-sequence here
2636 2224
2637 for (;;) 2225 for (;;)
2638 { 2226 {
2639 if (ch == NOCHAR) 2227 if (expect_false (ch == NOCHAR))
2640 { 2228 {
2641 seq_begin = cmdbuf_ptr; 2229 seq_begin = cmdbuf_ptr;
2642 ch = next_char (); 2230 ch = next_char ();
2643 }
2644 2231
2645 if (ch == NOCHAR) // TODO: improve 2232 if (ch == NOCHAR)
2646 break; 2233 break;
2234 }
2647 2235
2648 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2236 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2649 { 2237 {
2650 if (!seen_input) 2238 if (expect_false (!seen_input))
2651 { 2239 {
2652 seen_input = 1; 2240 seen_input = 1;
2653 // many badly-written programs (e.g. jed) contain a race condition: 2241 // many badly-written programs (e.g. jed) contain a race condition:
2654 // they first read the screensize and then install a SIGWINCH handler. 2242 // they first read the screensize and then install a SIGWINCH handler.
2655 // some window managers resize the window early, and these programs 2243 // some window managers resize the window early, and these programs
… …
2660 if (seen_resize && cmd_pid) 2248 if (seen_resize && cmd_pid)
2661 kill (-cmd_pid, SIGWINCH); 2249 kill (-cmd_pid, SIGWINCH);
2662 } 2250 }
2663 2251
2664 /* Read a text string from the input buffer */ 2252 /* Read a text string from the input buffer */
2665 unicode_t buf[UBUFSIZ]; 2253 wchar_t buf[UBUFSIZ];
2666 bool refreshnow = false; 2254 bool refreshnow = false;
2667 int nlines = 0; 2255 int nlines = 0;
2668 unicode_t *str = buf; 2256 wchar_t *str = buf;
2669 unicode_t *eol = str + min (ncol, UBUFSIZ); 2257 wchar_t *eol = str + min (ncol, UBUFSIZ);
2670 2258
2671 for (;;) 2259 for (;;)
2672 { 2260 {
2673 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2261 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2674 break; 2262 break;
2675 2263
2676 *str++ = ch; 2264 *str++ = ch;
2677 2265
2678 if (ch == C0_LF || str >= eol) 2266 if (expect_false (ch == C0_LF || str >= eol))
2679 { 2267 {
2680 if (ch == C0_LF) 2268 if (ch == C0_LF)
2681 nlines++; 2269 nlines++;
2682 2270
2683 refresh_count++; 2271 refresh_count++;
2684 2272
2685 if (!OPTION (Opt_jumpScroll) 2273 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2686 || (refresh_count >= refresh_limit * (nrow - 1)))
2687 { 2274 {
2275 refresh_count = 0;
2276
2277 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2278 {
2688 refreshnow = true; 2279 refreshnow = true;
2689 ch = NOCHAR; 2280 ch = NOCHAR;
2690 break; 2281 break;
2282 }
2691 } 2283 }
2692 2284
2693 // scr_add_lines only works for nlines <= nrow - 1. 2285 // scr_add_lines only works for nlines <= nrow - 1.
2694 if (nlines >= nrow - 1) 2286 if (nlines >= nrow - 1)
2695 { 2287 {
2288 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2289 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2696 scr_add_lines (buf, nlines, str - buf); 2290 scr_add_lines (buf, str - buf, nlines);
2291
2697 nlines = 0; 2292 nlines = 0;
2698 str = buf; 2293 str = buf;
2699 eol = str + min (ncol, UBUFSIZ); 2294 eol = str + min (ncol, UBUFSIZ);
2700 } 2295 }
2701 2296
… …
2714 2309
2715 seq_begin = cmdbuf_ptr; 2310 seq_begin = cmdbuf_ptr;
2716 ch = next_char (); 2311 ch = next_char ();
2717 } 2312 }
2718 2313
2314 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2315 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2719 scr_add_lines (buf, nlines, str - buf); 2316 scr_add_lines (buf, str - buf, nlines);
2720 2317
2721 /* 2318 /*
2722 * If there have been a lot of new lines, then update the screen 2319 * 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. 2320 * 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 2321 * if skipScroll is enabled.
2725 * is incremented here because we must be doing flat-out scrolling.
2726 */ 2322 */
2727 if (refreshnow) 2323 if (refreshnow)
2728 { 2324 {
2729 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2730 refresh_limit++;
2731 else
2732 {
2733 flag = true;
2734 scr_refresh (refresh_type); 2325 scr_refresh ();
2735 } 2326 want_refresh = 1;
2736 } 2327 }
2737
2738 } 2328 }
2739 else 2329 else
2740 { 2330 {
2741 try 2331 try
2742 { 2332 {
… …
2750 } 2340 }
2751 2341
2752 ch = NOCHAR; 2342 ch = NOCHAR;
2753 } 2343 }
2754 } 2344 }
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} 2345}
2767 2346
2768// read the next character 2347// read the next character
2769unicode_t 2348wchar_t
2770rxvt_term::next_char () 2349rxvt_term::next_char () NOTHROW
2771{ 2350{
2772 while (cmdbuf_ptr < cmdbuf_endp) 2351 while (cmdbuf_ptr < cmdbuf_endp)
2773 { 2352 {
2774 // assume 7-bit to be ascii ALWAYS 2353 // assume 7-bit to be ascii ALWAYS
2775 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2354 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2776 return *cmdbuf_ptr++; 2355 return *cmdbuf_ptr++;
2777 2356
2778 wchar_t wc; 2357 wchar_t wc;
2779 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2358 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2780 2359
2781 if (len == (size_t)-2) 2360 if (len == (size_t)-2)
2782 { 2361 {
2783 // the mbstate stores incomplete sequences. didn't know this :/ 2362 // the mbstate stores incomplete sequences. didn't know this :/
2784 cmdbuf_ptr = cmdbuf_endp; 2363 cmdbuf_ptr = cmdbuf_endp;
2785 break; 2364 break;
2786 } 2365 }
2787 2366
2788 if (len == (size_t)-1) 2367 if (len == (size_t)-1)
2368 {
2369 mbstate.reset (); // reset now undefined conversion state
2789 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2370 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2371 }
2790 2372
2791 // assume wchar == unicode 2373 // assume wchar == unicode
2792 cmdbuf_ptr += len; 2374 cmdbuf_ptr += len;
2793 return wc & UNICODE_MASK; 2375 return wc & UNICODE_MASK;
2794 } 2376 }
2795 2377
2796 return NOCHAR; 2378 return NOCHAR;
2797} 2379}
2798 2380
2799/* rxvt_cmd_getc () - Return next input character */ 2381// read the next octet
2800/* 2382uint32_t
2801 * Return the next input character after first passing any keyboard input 2383rxvt_term::next_octet () NOTHROW
2802 * to the command.
2803 */
2804unicode_t
2805rxvt_term::cmd_getc ()
2806{ 2384{
2385 return cmdbuf_ptr < cmdbuf_endp
2386 ? (unsigned char)*cmdbuf_ptr++
2387 : NOCHAR;
2388}
2389
2390static class out_of_input out_of_input;
2391
2392wchar_t
2393rxvt_term::cmd_getc () THROW ((class out_of_input))
2394{
2807 unicode_t c = next_char (); 2395 wchar_t c = next_char ();
2808 2396
2809 if (c == NOCHAR) 2397 if (c == NOCHAR)
2810 throw out_of_input; 2398 throw out_of_input;
2811 2399
2812 return c; 2400 return c;
2813} 2401}
2814 2402
2815unicode_t 2403uint32_t
2816rxvt_term::cmd_get8 () 2404rxvt_term::cmd_get8 () THROW ((class out_of_input))
2817{ 2405{
2818 unicode_t c = next_octet (); 2406 uint32_t c = next_octet ();
2819 2407
2820 if (c == NOCHAR) 2408 if (c == NOCHAR)
2821 throw out_of_input; 2409 throw out_of_input;
2822 2410
2823 return c; 2411 return c;
… …
2827/*----------------------------------------------------------------------*/ 2415/*----------------------------------------------------------------------*/
2828#ifdef PRINTPIPE 2416#ifdef PRINTPIPE
2829FILE * 2417FILE *
2830rxvt_term::popen_printer () 2418rxvt_term::popen_printer ()
2831{ 2419{
2832 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2420 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2833 2421
2834 if (stream == NULL) 2422 if (stream == NULL)
2835 rxvt_warn ("can't open printer pipe, not printing.\n"); 2423 rxvt_warn ("can't open printer pipe, not printing.\n");
2836 2424
2837 return stream; 2425 return stream;
… …
2848 * simulate attached vt100 printer 2436 * simulate attached vt100 printer
2849 */ 2437 */
2850void 2438void
2851rxvt_term::process_print_pipe () 2439rxvt_term::process_print_pipe ()
2852{ 2440{
2853 int done; 2441 FILE *fd = popen_printer ();
2854 FILE *fd;
2855 2442
2856 if ((fd = popen_printer ()) == NULL) 2443 if (!fd)
2857 return; 2444 return;
2858 2445
2859 /* 2446 /*
2860 * Send all input to the printer until either ESC[4i or ESC[?4i 2447 * Send all input to the printer until either ESC[4i or ESC[?4i
2861 * is received. 2448 * is received.
2862 */ 2449 */
2863 for (done = 0; !done;) 2450 for (int done = 0; !done; )
2864 { 2451 {
2865 unsigned char buf[8]; 2452 unsigned char buf[8];
2866 unicode_t ch; 2453 unicode_t ch;
2867 unsigned int i, len; 2454 unsigned int i, len;
2868 2455
… …
2887 { 2474 {
2888 if ((buf[len++] = cmd_getc ()) == 'i') 2475 if ((buf[len++] = cmd_getc ()) == 'i')
2889 break; /* done = 1 */ 2476 break; /* done = 1 */
2890 } 2477 }
2891 } 2478 }
2892 2479
2893 for (i = 0; i < len; i++) 2480 for (i = 0; i < len; i++)
2894 if (putc (buf[i], fd) == EOF) 2481 if (putc (buf[i], fd) == EOF)
2895 { 2482 {
2896 done = 1; 2483 done = 1;
2897 break; 2484 break;
… …
2899 } 2486 }
2900 } 2487 }
2901 2488
2902 pclose_printer (fd); 2489 pclose_printer (fd);
2903} 2490}
2904#endif /* PRINTPIPE */ 2491#endif /* PRINTPIPE */
2905/*}}} */ 2492/*}}} */
2906 2493
2907/* *INDENT-OFF* */
2908enum { 2494enum {
2909 C1_40 = 0x40, 2495 C1_40 = 0x40,
2910 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2496 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2911 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2497 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2912 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2498 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2913 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2499 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2914}; 2500};
2915/* *INDENT-ON* */
2916 2501
2917/*{{{ process non-printing single characters */ 2502/*{{{ process non-printing single characters */
2918void 2503void
2919rxvt_term::process_nonprinting (unicode_t ch) 2504rxvt_term::process_nonprinting (unicode_t ch)
2920{ 2505{
… …
2923 case C0_ESC: 2508 case C0_ESC:
2924 process_escape_seq (); 2509 process_escape_seq ();
2925 break; 2510 break;
2926 case C0_ENQ: /* terminal Status */ 2511 case C0_ENQ: /* terminal Status */
2927 if (rs[Rs_answerbackstring]) 2512 if (rs[Rs_answerbackstring])
2928 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2513 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2929 (unsigned int)strlen (rs[Rs_answerbackstring]));
2930 else 2514 else
2931 tt_write ((unsigned char *)VT100_ANS, 2515 tt_write (VT100_ANS, strlen (VT100_ANS));
2932 (unsigned int)strlen (VT100_ANS));
2933 break; 2516 break;
2934 case C0_BEL: /* bell */ 2517 case C0_BEL: /* bell */
2935 scr_bell (); 2518 scr_bell ();
2936 break; 2519 break;
2937 case C0_BS: /* backspace */ 2520 case C0_BS: /* backspace */
… …
2961 process_dcs_seq (); 2544 process_dcs_seq ();
2962 break; 2545 break;
2963 case 0x9b: /* CSI */ 2546 case 0x9b: /* CSI */
2964 process_csi_seq (); 2547 process_csi_seq ();
2965 break; 2548 break;
2966 case 0x9d: /* CSI */ 2549 case 0x9d: /* OSC */
2967 process_osc_seq (); 2550 process_osc_seq ();
2968 break; 2551 break;
2969#endif 2552#endif
2970 } 2553 }
2971} 2554}
… …
3015 break; 2598 break;
3016 case 'Z': /* identify the terminal type */ 2599 case 'Z': /* identify the terminal type */
3017 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2600 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3018 break; 2601 break;
3019 case '<': /* turn off VT52 mode */ 2602 case '<': /* turn off VT52 mode */
3020 PrivMode (0, PrivMode_vt52); 2603 set_privmode (PrivMode_vt52, 0);
3021 break; 2604 break;
3022 case 'F': /* use special graphics character set */ 2605 case 'F': /* use special graphics character set */
3023 case 'G': /* use regular character set */ 2606 case 'G': /* use regular character set */
3024 /* unimplemented */ 2607 /* unimplemented */
3025 break; 2608 break;
… …
3061 scr_charset_set (2, (unsigned int)cmd_getc ()); 2644 scr_charset_set (2, (unsigned int)cmd_getc ());
3062 break; 2645 break;
3063 case '+': 2646 case '+':
3064 scr_charset_set (3, (unsigned int)cmd_getc ()); 2647 scr_charset_set (3, (unsigned int)cmd_getc ());
3065 break; 2648 break;
3066#if ENABLE_FRILLS 2649#if !ENABLE_MINIMAL
3067 case '6': 2650 case '6':
3068 scr_backindex (); 2651 scr_backindex ();
3069 break; 2652 break;
3070#endif 2653#endif
3071 case '7': 2654 case '7':
3072 scr_cursor (SAVE); 2655 scr_cursor (SAVE);
3073 break; 2656 break;
3074 case '8': 2657 case '8':
3075 scr_cursor (RESTORE); 2658 scr_cursor (RESTORE);
3076 break; 2659 break;
3077#if ENABLE_FRILLS 2660#if !ENABLE_MINIMAL
3078 case '9': 2661 case '9':
3079 scr_forwardindex (); 2662 scr_forwardindex ();
3080 break; 2663 break;
3081#endif 2664#endif
3082 case '=': 2665 case '=':
3083 case '>': 2666 case '>':
3084 PrivMode ((ch == '='), PrivMode_aplKP); 2667 set_privmode (PrivMode_aplKP, ch == '=');
3085 break; 2668 break;
3086 2669
3087 case C1_40: 2670 case C1_40:
3088 cmd_getc (); 2671 cmd_getc ();
3089 break; 2672 break;
… …
3092 break; 2675 break;
3093 2676
3094 /* 8.3.87: NEXT LINE */ 2677 /* 8.3.87: NEXT LINE */
3095 case C1_NEL: /* ESC E */ 2678 case C1_NEL: /* ESC E */
3096 { 2679 {
3097 unicode_t nlcr[] = { C0_LF, C0_CR }; 2680 wchar_t nlcr[] = { C0_LF, C0_CR };
3098 scr_add_lines (nlcr, 1, 2); 2681 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
3099 } 2682 }
3100 break; 2683 break;
3101 2684
3102 /* kidnapped escape sequence: Should be 8.3.48 */ 2685 /* kidnapped escape sequence: Should be 8.3.48 */
3103 case C1_ESA: /* ESC G */ 2686 case C1_ESA: /* ESC G */
3104 process_graphics (); 2687 // used by original rxvt for rob nations own graphics mode
2688 if (cmd_getc () == 'Q')
2689 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3105 break; 2690 break;
3106 2691
3107 /* 8.3.63: CHARACTER TABULATION SET */ 2692 /* 8.3.63: CHARACTER TABULATION SET */
3108 case C1_HTS: /* ESC H */ 2693 case C1_HTS: /* ESC H */
3109 scr_set_tab (1); 2694 scr_set_tab (1);
… …
3125 process_dcs_seq (); 2710 process_dcs_seq ();
3126 break; 2711 break;
3127 2712
3128 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2713 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3129 case C1_SCI: /* ESC Z */ 2714 case C1_SCI: /* ESC Z */
3130 tt_write ((const unsigned char *)ESCZ_ANSWER, 2715 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3131 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3132 break; /* steal obsolete ESC [ c */ 2716 break; /* steal obsolete ESC [ c */
3133 2717
3134 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2718 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3135 case C1_CSI: /* ESC [ */ 2719 case C1_CSI: /* ESC [ */
3136 process_csi_seq (); 2720 process_csi_seq ();
3137 break; 2721 break;
3138 2722
3139 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2723 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3140 case C1_OSC: /* ESC ] */ 2724 case C1_OSC: /* ESC ] */
3141 process_osc_seq (); 2725 process_osc_seq ();
3142 break; 2726 break;
3143 2727
3144 /* 8.3.106: RESET TO INITIAL STATE */ 2728 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3145 case 'c': 2729 case 'c':
3146 mbstate.reset (); 2730 mbstate.reset ();
3147 scr_poweron (); 2731 scr_poweron ();
3148 scrollbar_show (1); 2732 scrollBar.show (1);
3149 break; 2733 break;
3150 2734
3151 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2735 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3152 case 'n': 2736 case 'n':
3153 scr_charset_choose (2); 2737 scr_charset_choose (2);
… …
3160 } 2744 }
3161} 2745}
3162/*}}} */ 2746/*}}} */
3163 2747
3164/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2748/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3165/* *INDENT-OFF* */
3166enum { 2749enum {
3167 CSI_ICH = 0x40, 2750 CSI_ICH = 0x40,
3168 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2751 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3169 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2752 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3170 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2753 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3173 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2756 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 , 2757 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 2758 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3176}; 2759};
3177 2760
3178#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2761#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3179 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2762 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3180 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2763 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3181#define get_byte_array_bit(array, bit) \ 2764#define get_byte_array_bit(array, bit) \
3182 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2765 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3183 2766
3184const unsigned char csi_defaults[] = 2767static const unsigned char csi_defaults[] =
3185 { 2768 {
3186 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2769 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, */ 2770 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, */ 2771 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, [, \, ], ^, _, */ 2772 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3190 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2773 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3191 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2774 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3192 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2775 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3193 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2776 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3194 }; 2777 };
3195/* *INDENT-ON* */
3196 2778
3197void 2779void
3198rxvt_term::process_csi_seq () 2780rxvt_term::process_csi_seq ()
3199{ 2781{
3200 unicode_t ch, priv, i; 2782 unicode_t ch, priv, i;
3201 unsigned int nargs, p; 2783 unsigned int nargs, p;
3202 int n, ndef; 2784 int n, ndef;
3203 int arg[ESC_ARGS]; 2785 int arg[ESC_ARGS] = { };
3204 2786
3205 for (nargs = ESC_ARGS; nargs > 0;) 2787 nargs = 0;
3206 arg[--nargs] = 0;
3207 2788
3208 priv = 0; 2789 priv = 0;
3209 ch = cmd_getc (); 2790 ch = cmd_getc ();
3210 if (ch >= '<' && ch <= '?') 2791 if ((ch >= '<' && ch <= '?') || ch == '!')
2792 {
3211 { /* '<' '=' '>' '?' */ 2793 /* '<' '=' '>' '?' '!' */
3212 priv = ch; 2794 priv = ch;
3213 ch = cmd_getc (); 2795 ch = cmd_getc ();
3214 } 2796 }
3215 2797
3216 /* read any numerical arguments */ 2798 /* read any numerical arguments */
… …
3245 ndef = get_byte_array_bit (csi_defaults, i); 2827 ndef = get_byte_array_bit (csi_defaults, i);
3246 for (p = 0; p < nargs; p++) 2828 for (p = 0; p < nargs; p++)
3247 if (arg[p] == -1) 2829 if (arg[p] == -1)
3248 arg[p] = ndef; 2830 arg[p] = ndef;
3249 2831
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 /* 2832 /*
3258 * private mode handling 2833 * private mode handling
3259 */ 2834 */
3260 if (priv) 2835 if (priv)
3261 { 2836 {
3262 switch (priv) 2837 switch (priv)
3263 { 2838 {
3264 case '>': 2839 case '>':
3265 if (ch == CSI_DA) /* secondary device attributes */ 2840 if (ch == CSI_DA) /* secondary device attributes */
3266 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2841 {
2842 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2843 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2844 //
2845 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2846 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2847 // versions.
2848 //
2849 tt_printf ("\033[>%d;95;0c", 'U');
2850 }
3267 break; 2851 break;
2852
3268 case '?': 2853 case '?':
3269 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2854 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3270 process_terminal_mode (ch, priv, nargs, arg); 2855 process_terminal_mode (ch, priv, nargs, arg);
3271 break; 2856 break;
2857
2858 case '!':
2859 if (ch == CSI_70)
2860 {
2861 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2862 scr_soft_reset ();
2863
2864 static const int pm_h[] = { 7, 25 };
2865 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2866
2867 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2868 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
3272 } 2869 }
2870 break;
2871 }
2872
3273 return; 2873 return;
3274 } 2874 }
3275 2875
3276 switch (ch) 2876 switch (ch)
3277 { 2877 {
… …
3380 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2980 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3381 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 2981 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3382 break; 2982 break;
3383 2983
3384 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2984 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3385 tt_write ((const unsigned char *)VT100_ANS, 2985 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3386 (unsigned int) (sizeof (VT100_ANS) - 1));
3387 break; 2986 break;
3388 2987
3389 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2988 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3390 process_sgr_mode (nargs, arg); 2989 process_sgr_mode (nargs, arg);
3391 break; 2990 break;
… …
3398 break; 2997 break;
3399 case 6: /* CPR requested */ 2998 case 6: /* CPR requested */
3400 scr_report_position (); 2999 scr_report_position ();
3401 break; 3000 break;
3402 case 7: /* unofficial extension */ 3001 case 7: /* unofficial extension */
3403 if (OPTION (Opt_insecure)) 3002 if (option (Opt_insecure))
3404 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3003 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3405 break; 3004 break;
3406 case 8: /* unofficial extension */ 3005 case 8: /* unofficial extension */
3407 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3006 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3408 break; 3007 break;
… …
3475 break; 3074 break;
3476 case CSI_75: 3075 case CSI_75:
3477 scr_cursor (RESTORE); 3076 scr_cursor (RESTORE);
3478 break; 3077 break;
3479 3078
3480#if ENABLE_FRILLS 3079#if !ENABLE_MINIMAL
3481 case CSI_74: 3080 case CSI_74:
3482 process_window_ops (arg, nargs); 3081 process_window_ops (arg, nargs);
3483 break; 3082 break;
3484#endif 3083#endif
3485 3084
… …
3492 break; 3091 break;
3493 } 3092 }
3494} 3093}
3495/*}}} */ 3094/*}}} */
3496 3095
3497#if ENABLE_FRILLS 3096#if !ENABLE_MINIMAL
3498/* ARGSUSED */
3499void 3097void
3500rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3098rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3501{ 3099{
3502 int x, y; 3100 int x, y;
3503 XWindowAttributes wattr; 3101 XWindowAttributes wattr;
3504 Window wdummy; 3102 Window wdummy;
3505 dDisp; 3103
3104 dLocal (Display *, dpy);
3506 3105
3507 if (nargs == 0) 3106 if (nargs == 0)
3508 return; 3107 return;
3509 3108
3510 switch (args[0]) 3109 switch (args[0])
3511 { 3110 {
3512 /* 3111 /*
3513 * commands 3112 * commands
3514 */ 3113 */
3515 case 1: /* deiconify window */ 3114 case 1: /* deiconify window */
3516 XMapWindow (disp, parent[0]); 3115 XMapWindow (dpy, parent);
3517 break; 3116 break;
3518 case 2: /* iconify window */ 3117 case 2: /* iconify window */
3519 XIconifyWindow (disp, parent[0], display->screen); 3118 XIconifyWindow (dpy, parent, display->screen);
3520 break; 3119 break;
3521 case 3: /* set position (pixels) */ 3120 case 3: /* set position (pixels) */
3522 XMoveWindow (disp, parent[0], args[1], args[2]); 3121 XMoveWindow (dpy, parent, args[1], args[2]);
3523 break; 3122 break;
3524 case 4: /* set size (pixels) */ 3123 case 4: /* set size (pixels) */
3525 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3124 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3526 break; 3125 break;
3527 case 5: /* raise window */ 3126 case 5: /* raise window */
3528 XRaiseWindow (disp, parent[0]); 3127 XRaiseWindow (dpy, parent);
3529 break; 3128 break;
3530 case 6: /* lower window */ 3129 case 6: /* lower window */
3531 XLowerWindow (disp, parent[0]); 3130 XLowerWindow (dpy, parent);
3532 break; 3131 break;
3533 case 7: /* refresh window */ 3132 case 7: /* refresh window */
3534 scr_touch (true); 3133 scr_touch (true);
3535 break; 3134 break;
3536 case 8: /* set size (chars) */ 3135 case 8: /* set size (chars) */
… …
3543 if (args[0] >= 24) /* set height (chars) */ 3142 if (args[0] >= 24) /* set height (chars) */
3544 set_widthheight ((unsigned int)width, 3143 set_widthheight ((unsigned int)width,
3545 (unsigned int) (args[1] * fheight)); 3144 (unsigned int) (args[1] * fheight));
3546 break; 3145 break;
3547 3146
3548
3549 /* 3147 /*
3550 * reports - some output format copied from XTerm 3148 * reports - some output format copied from XTerm
3551 */ 3149 */
3552 case 11: /* report window state */ 3150 case 11: /* report window state */
3553 XGetWindowAttributes (disp, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent, &wattr);
3554 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3152 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3555 break; 3153 break;
3556 case 13: /* report window position */ 3154 case 13: /* report window position */
3557 XGetWindowAttributes (disp, parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent, &wattr);
3558 XTranslateCoordinates (disp, parent[0], wattr.root, 3156 XTranslateCoordinates (dpy, parent, wattr.root,
3559 -wattr.border_width, -wattr.border_width, 3157 -wattr.border_width, -wattr.border_width,
3560 &x, &y, &wdummy); 3158 &x, &y, &wdummy);
3561 tt_printf ("\033[3;%d;%dt", x, y); 3159 tt_printf ("\033[3;%d;%dt", x, y);
3562 break; 3160 break;
3563 case 14: /* report window size (pixels) */ 3161 case 14: /* report window size (pixels) */
3564 XGetWindowAttributes (disp, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent, &wattr);
3565 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3163 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3566 break; 3164 break;
3567 case 18: /* report text area size (chars) */ 3165 case 18: /* report text area size (chars) */
3568 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3166 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3569 break; 3167 break;
… …
3571 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3572 break; 3170 break;
3573 case 20: /* report icon label */ 3171 case 20: /* report icon label */
3574 { 3172 {
3575 char *s; 3173 char *s;
3576 XGetIconName (disp, parent[0], &s); 3174 XGetIconName (dpy, parent, &s);
3577 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3578 XFree (s); 3176 XFree (s);
3579 } 3177 }
3580 break; 3178 break;
3581 case 21: /* report window title */ 3179 case 21: /* report window title */
3582 { 3180 {
3583 char *s; 3181 char *s;
3584 XFetchName (disp, parent[0], &s); 3182 XFetchName (dpy, parent, &s);
3585 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3183 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3586 XFree (s); 3184 XFree (s);
3587 } 3185 }
3588 break; 3186 break;
3589 } 3187 }
3590} 3188}
… …
3593/*----------------------------------------------------------------------*/ 3191/*----------------------------------------------------------------------*/
3594/* 3192/*
3595 * get input up until STRING TERMINATOR (or BEL) 3193 * get input up until STRING TERMINATOR (or BEL)
3596 * ends_how is terminator used. returned input must be free()'d 3194 * ends_how is terminator used. returned input must be free()'d
3597 */ 3195 */
3598unsigned char * 3196char *
3599rxvt_term::get_to_st (unicode_t &ends_how) 3197rxvt_term::get_to_st (unicode_t &ends_how)
3600{ 3198{
3601 unicode_t ch; 3199 unicode_t ch;
3602 bool seen_esc = false; 3200 bool seen_esc = false;
3603 unsigned int n = 0; 3201 unsigned int n = 0;
… …
3617 seen_esc = true; 3215 seen_esc = true;
3618 continue; 3216 continue;
3619 } 3217 }
3620 else if (ch == C0_BEL || ch == CHAR_ST) 3218 else if (ch == C0_BEL || ch == CHAR_ST)
3621 break; 3219 break;
3220 else if (ch == C0_SYN)
3221 ch = cmd_get8 ();
3622 else if (ch < 0x20) 3222 else if (ch < 0x20)
3623 return NULL; /* other control character - exit */ 3223 return NULL; /* other control character - exit */
3624 3224
3625 seen_esc = false; 3225 seen_esc = false;
3626 3226
3627 if (n >= STRING_MAX - 1) 3227 if (n >= STRING_MAX - 1)
3628 // stop at some sane length 3228 // stop at some sane length
3629 return NULL; 3229 return NULL;
3630 3230
3631 if (ch == C0_SYN)
3632 string[n++] = cmd_get8 ();
3633 else
3634 string[n++] = ch; 3231 string[n++] = ch;
3635 } 3232 }
3636 3233
3637 string[n++] = '\0'; 3234 string[n++] = '\0';
3638 3235
3639 ends_how = (ch == 0x5c ? C0_ESC : ch); 3236 ends_how = (ch == 0x5c ? C0_ESC : ch);
3640 3237
3641 return (unsigned char *)rxvt_wcstombs (string); 3238 return rxvt_wcstombs (string);
3642} 3239}
3643 3240
3644/*----------------------------------------------------------------------*/ 3241/*----------------------------------------------------------------------*/
3645/* 3242/*
3646 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3243 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3647 */ 3244 */
3648void 3245void
3649rxvt_term::process_dcs_seq () 3246rxvt_term::process_dcs_seq ()
3650{ 3247{
3651 unsigned char *s;
3652 unicode_t eh;
3653
3654 /* 3248 /*
3655 * Not handled yet 3249 * Not handled yet
3656 */ 3250 */
3251
3252 unicode_t eh;
3657 s = get_to_st (eh); 3253 char *s = get_to_st (eh);
3658 if (s) 3254 if (s)
3659 free (s); 3255 free (s);
3660 3256
3661 return; 3257 return;
3662} 3258}
… …
3666 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3262 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3667 */ 3263 */
3668void 3264void
3669rxvt_term::process_osc_seq () 3265rxvt_term::process_osc_seq ()
3670{ 3266{
3671 unicode_t ch, eh;
3672 int arg; 3267 int arg;
3673 3268
3674 ch = cmd_getc (); 3269 unicode_t ch = cmd_getc ();
3675 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3270 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3676 arg = arg * 10 + (ch - '0'); 3271 arg = arg * 10 + (ch - '0');
3677 3272
3678 if (ch == ';') 3273 if (ch == ';')
3679 { 3274 {
3275 unicode_t eh;
3680 unsigned char *s = get_to_st (eh); 3276 char *s = get_to_st (eh);
3681 3277
3682 if (s) 3278 if (s)
3683 { 3279 {
3684 process_xterm_seq (arg, (char *)s, eh); 3280 process_xterm_seq (arg, s, eh);
3685 free (s); 3281 free (s);
3686 } 3282 }
3687 } 3283 }
3688} 3284}
3689 3285
3690void 3286void
3691rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3287rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3692{ 3288{
3693 if (str[0] == '?' && !str[1]) 3289 if (str[0] == '?' && !str[1])
3694 { 3290 {
3695 unsigned short r, g, b; 3291 rgba c;
3696 pix_colors_focused[color].get (display, r, g, b); 3292 pix_colors_focused[color].get (c);
3293
3294#if XFT
3295 if (c.a != rgba::MAX_CC)
3296 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3297 else
3298#endif
3697 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3299 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3698 } 3300 }
3699 else 3301 else
3700 set_window_color (color, str); 3302 set_window_color (color, str);
3701} 3303}
3702 3304
3703/* 3305/*
3704 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3306 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3705 */ 3307 */
3706void 3308void
3707rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3309rxvt_term::process_xterm_seq (int op, char *str, char resp)
3708{ 3310{
3709 int changed = 0;
3710 int color; 3311 int color;
3711 char *buf, *name; 3312 char *buf, *name;
3712 bool query = str[0] == '?' && !str[1]; 3313 bool query = str[0] == '?' && !str[1];
3713 int saveop = op; 3314 int saveop = op;
3714 dDisp; 3315
3316 dLocal (Display *, dpy);
3715 3317
3716 assert (str != NULL); 3318 assert (str != NULL);
3319
3320 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3321 return;
3322
3717 switch (op) 3323 switch (op)
3718 { 3324 {
3719 case XTerm_name: 3325 case XTerm_name:
3720 set_title (str); 3326 set_title (str);
3721 /* FALLTHROUGH */ 3327 /* FALLTHROUGH */
… …
3735 unsigned long bytes_after; 3341 unsigned long bytes_after;
3736 unsigned char *value = 0; 3342 unsigned char *value = 0;
3737 const char *str = ""; 3343 const char *str = "";
3738 3344
3739 if (prop 3345 if (prop
3740 && XGetWindowProperty (disp, parent[0], 3346 && XGetWindowProperty (dpy, parent,
3741 prop, 0, 1<<16, 0, AnyPropertyType, 3347 prop, 0, 1<<16, 0, AnyPropertyType,
3742 &actual_type, &actual_format, 3348 &actual_type, &actual_format,
3743 &nitems, &bytes_after, &value) == Success 3349 &nitems, &bytes_after, &value) == Success
3744 && actual_type != None 3350 && actual_type != None
3745 && actual_format == 8) 3351 && actual_format == 8)
3746 str = (const char *)(value); 3352 str = (const char *)(value);
3747 3353
3748 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3354 tt_printf ("\033]%d;%s%c", op, str, resp);
3749 3355
3750 XFree (value); 3356 XFree (value);
3751 } 3357 }
3752 else 3358 else
3753 { 3359 {
3754 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3360 char *eq = strchr (str, '=');
3755 3361
3756 if (eq) 3362 if (eq)
3757 { 3363 {
3758 *eq = 0; 3364 *eq = 0;
3759 set_utf8_property (display->atom (str), eq + 1); 3365 set_utf8_property (display->atom (str), eq + 1);
3760 } 3366 }
3761 else 3367 else
3762 XDeleteProperty (disp, parent[0], 3368 XDeleteProperty (dpy, parent,
3763 display->atom (str)); 3369 display->atom (str));
3764 } 3370 }
3765 break; 3371 break;
3766 3372
3767 case XTerm_Color: 3373 case XTerm_Color:
… …
3769 { 3375 {
3770 if ((name = strchr (buf, ';')) == NULL) 3376 if ((name = strchr (buf, ';')) == NULL)
3771 break; 3377 break;
3772 3378
3773 *name++ = '\0'; 3379 *name++ = '\0';
3774 color = atoi (buf); 3380 color = atoi (buf) + minCOLOR;
3775 3381
3776 if (color < 0 || color >= TOTAL_COLORS) 3382 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3777 break; 3383 break;
3778 3384
3779 if ((buf = strchr (name, ';')) != NULL) 3385 if ((buf = strchr (name, ';')) != NULL)
3780 *buf++ = '\0'; 3386 *buf++ = '\0';
3781 3387
3782 if (name[0] == '?' && !name[1]) 3388 process_color_seq (op, color, name, resp);
3389 }
3390 break;
3391 case Rxvt_restoreFG:
3392 case XTerm_Color00:
3393 process_color_seq (op, Color_fg, str, resp);
3394 break;
3395 case Rxvt_restoreBG:
3396 case XTerm_Color01:
3397 process_color_seq (op, Color_bg, str, resp);
3398 break;
3399#ifndef NO_CURSORCOLOR
3400 case XTerm_Color_cursor:
3401 process_color_seq (op, Color_cursor, str, resp);
3402 break;
3403#endif
3404 case XTerm_Color_pointer_fg:
3405 process_color_seq (op, Color_pointer_fg, str, resp);
3406 break;
3407 case XTerm_Color_pointer_bg:
3408 process_color_seq (op, Color_pointer_bg, str, resp);
3409 break;
3410#ifdef OPTION_HC
3411 case XTerm_Color_HC:
3412 process_color_seq (op, Color_HC, str, resp);
3413 break;
3414 case XTerm_Color_HTC:
3415 process_color_seq (op, Color_HTC, str, resp);
3416 break;
3417#endif
3418#ifndef NO_BOLD_UNDERLINE_REVERSE
3419 case URxvt_Color_BD:
3420 process_color_seq (op, Color_BD, str, resp);
3421 break;
3422 case URxvt_Color_UL:
3423 process_color_seq (op, Color_UL, str, resp);
3424 break;
3425 case URxvt_Color_IT:
3426 process_color_seq (op, Color_IT, str, resp);
3427 break;
3428#endif
3429 case URxvt_Color_border:
3430 process_color_seq (op, Color_border, str, resp);
3431 break;
3432#if ENABLE_TRANSPARENCY
3433 case URxvt_Color_tint:
3434 process_color_seq (op, Color_tint, str, resp);
3435 {
3436 bool changed = false;
3437
3438 if (ISSET_PIXCOLOR (Color_tint))
3439 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3440
3441 if (changed)
3442 update_background ();
3443 }
3444
3445 break;
3446#endif
3447
3448#if BG_IMAGE_FROM_FILE
3449 case Rxvt_Pixmap:
3450 if (!strcmp (str, "?"))
3451 {
3452 char str[256];
3453
3454 sprintf (str, "[%dx%d+%d+%d]",
3455 min (h_scale, 32767), min (v_scale, 32767),
3456 min (h_align, 32767), min (v_align, 32767));
3457 process_xterm_seq (XTerm_title, str, CHAR_ST);
3458 }
3459 else
3460 {
3461 int changed = 0;
3462
3463 if (*str != ';')
3783 { 3464 {
3784 unsigned short r, g, b; 3465 if (bg_set_file (str)) /* change pixmap */
3785 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3466 {
3786 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3467 changed++;
3468 str = strchr (str, ';');
3469 if (str == NULL)
3470 bg_set_default_geometry ();
3471 else
3472 bg_set_geometry (str+1);
3473 }
3787 } 3474 }
3788 else 3475 else
3789 set_window_color (color + minCOLOR, name); 3476 {
3477 str++;
3478 if (bg_set_geometry (str, true))
3479 changed++;
3480 }
3481
3482 if (changed)
3483 {
3484 if (bg_window_position_sensitive ())
3485 {
3486 int x, y;
3487 get_window_origin (x, y);
3488 bg_set_position (x, y);
3489 }
3490 update_background ();
3491 }
3790 } 3492 }
3791 break; 3493 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 3494#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 3495
3865 case XTerm_logfile: 3496 case XTerm_logfile:
3866 // TODO, when secure mode? 3497 // TODO, when secure mode?
3867 break; 3498 break;
3868 3499
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 3500#if 0
3876 case XTerm_dumpscreen: /* no error notices */ 3501 case Rxvt_dumpscreen: /* no error notices */
3877 { 3502 {
3878 int fd; 3503 int fd;
3879 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3504 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3880 { 3505 {
3881 scr_dump (fd); 3506 scr_dump (fd);
… …
3892 case URxvt_italicFont: 3517 case URxvt_italicFont:
3893 case URxvt_boldItalicFont: 3518 case URxvt_boldItalicFont:
3894#endif 3519#endif
3895 if (query) 3520 if (query)
3896 tt_printf ("\33]%d;%-.250s%c", saveop, 3521 tt_printf ("\33]%d;%-.250s%c", saveop,
3897 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3522 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3898 ? fontset[op - URxvt_font]->fontdesc : "", 3523 ? fontset[op - URxvt_font]->fontdesc : "",
3899 resp); 3524 resp);
3900 else 3525 else
3901 { 3526 {
3902 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3527 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3905 allocated.push_back ((void *)res); 3530 allocated.push_back ((void *)res);
3906 set_fonts (); 3531 set_fonts ();
3907 } 3532 }
3908 break; 3533 break;
3909 3534
3910#if ENABLE_FRILLS 3535 case URxvt_version:
3536 if (query)
3537 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3538 op,
3539 rs[Rs_name], VERSION[0], VERSION[2],
3540 resp);
3541 break;
3542
3543#if !ENABLE_MINIMAL
3911 case URxvt_locale: 3544 case URxvt_locale:
3912 if (query) 3545 if (query)
3913 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3546 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3914 else 3547 else
3915 { 3548 {
3916 set_locale (str); 3549 set_locale (str);
3917 pty.set_utf8_mode (enc_utf8); 3550 pty->set_utf8_mode (enc_utf8);
3918 init_xlocale (); 3551 init_xlocale ();
3919 } 3552 }
3920 break; 3553 break;
3921 3554
3922 case URxvt_view_up: 3555 case URxvt_view_up:
3923 case URxvt_view_down: 3556 case URxvt_view_down:
3557 {
3924 int lines = atoi (str); 3558 int lines = atoi (str);
3925 3559
3926 if (lines) 3560 if (lines)
3927 scr_page (op == URxvt_view_up ? UP : DN, lines); 3561 scr_page (op == URxvt_view_up ? UP : DN, lines);
3928 else 3562 else
3929 {
3930 scr_erase_savelines (); 3563 scr_erase_savelines ();
3931 } 3564 }
3932 3565
3566 break;
3567#endif
3568
3569#if ENABLE_PERL
3570 case URxvt_perl:
3571 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3933 break; 3572 break;
3934#endif 3573#endif
3935 } 3574 }
3936} 3575}
3937/*----------------------------------------------------------------------*/ 3576/*----------------------------------------------------------------------*/
… …
3960 { 3599 {
3961 if (mode == 'r') 3600 if (mode == 'r')
3962 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3601 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3963 else 3602 else
3964 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3603 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3965 PrivMode (state, bit); 3604
3605 set_privmode (bit, state);
3966 } 3606 }
3967 3607
3968 return state; 3608 return state;
3969} 3609}
3970 3610
3971/* we're not using priv _yet_ */ 3611/* we're not using priv _yet_ */
3972void 3612void
3973rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3613rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3974{ 3614{
3975 unsigned int i, j; 3615 unsigned int i, j;
3976 int state; 3616 int state;
3977 3617
3978 static const struct 3618 static const struct
3979 { 3619 {
3980 const int argval; 3620 const int argval;
3981 const unsigned long bit; 3621 const unsigned long bit;
3982 }
3983
3984 argtopriv[] = { 3622 } argtopriv[] = {
3985 { 1, PrivMode_aplCUR }, 3623 { 1, PrivMode_aplCUR }, // DECCKM
3986 { 2, PrivMode_vt52 }, 3624 { 2, PrivMode_vt52 },
3987 { 3, PrivMode_132 }, 3625 { 3, PrivMode_132 }, // DECCOLM
3988 { 4, PrivMode_smoothScroll }, 3626 { 4, PrivMode_smoothScroll }, // DECSCLM
3989 { 5, PrivMode_rVideo }, 3627 { 5, PrivMode_rVideo }, // DECSCNM
3990 { 6, PrivMode_relOrigin }, 3628 { 6, PrivMode_relOrigin }, // DECOM
3991 { 7, PrivMode_Autowrap }, 3629 { 7, PrivMode_Autowrap }, // DECAWM
3992 // 8, bi-directional support mode 3630 // 8, auto-repeat keys // DECARM
3993 { 9, PrivMode_MouseX10 }, 3631 { 9, PrivMode_MouseX10 },
3994#ifdef menuBar_esc 3632 // 18 end FF to printer after print screen
3995 { menuBar_esc, PrivMode_menuBar }, 3633 // 19 Print screen prints full screen/scroll region
3996#endif
3997 // 18, 19 printing-related
3998 { 25, PrivMode_VisibleCursor }, 3634 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3999#ifdef scrollBar_esc 3635#ifdef scrollBar_esc
4000 { scrollBar_esc, PrivMode_scrollBar }, 3636 { scrollBar_esc, PrivMode_scrollBar },
4001#endif 3637#endif
4002 { 35, PrivMode_ShiftKeys }, // rxvt extension 3638 { 35, PrivMode_ShiftKeys }, // rxvt extension
3639 // 38, tektronix mode // DECTEK
4003 { 40, PrivMode_132OK }, 3640 { 40, PrivMode_132OK },
4004 // 41 xterm more fixes NYI 3641 // 41 xterm more fixes NYI
4005 // 45 margin bell NYI 3642 // 45 margin bell NYI
4006 // 46 start logging 3643 // 46 start logging
4007 { 47, PrivMode_Screen }, 3644 { 47, PrivMode_Screen },
4008 { 66, PrivMode_aplKP }, 3645 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
4009#ifndef NO_BACKSPACE_KEY 3646#ifndef NO_BACKSPACE_KEY
4010 { 67, PrivMode_BackSpace }, 3647 { 67, PrivMode_BackSpace }, // DECBKM
4011#endif 3648#endif
4012 { 1000, PrivMode_MouseX11 }, 3649 { 1000, PrivMode_MouseX11 },
4013 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3650 { 1002, PrivMode_MouseBtnEvent },
4014 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3651 { 1003, PrivMode_MouseAnyEvent },
4015 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3652#if ENABLE_FRILLS
3653 { 1005, PrivMode_ExtModeMouse },
3654#endif
4016 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3655 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4017 { 1011, PrivMode_Keypress }, // rxvt extension 3656 { 1011, PrivMode_Keypress }, // rxvt extension
3657#if ENABLE_FRILLS
3658 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3659#endif
4018 // 1035 enable modifiers for alt, numlock NYI 3660 // 1035 enable modifiers for alt, numlock NYI
4019 // 1036 send ESC for meta keys NYI 3661 // 1036 send ESC for meta keys NYI
4020 // 1037 send DEL for keypad delete NYI 3662 // 1037 send DEL for keypad delete NYI
4021 { 1047, PrivMode_Screen }, 3663 { 1047, PrivMode_Screen },
4022 // 1048 save and restore cursor 3664 // 1048 save and restore cursor, implemented in code
4023 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3665 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4024 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3666 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3667 { 2004, PrivMode_BracketPaste },
4025 }; 3668 };
4026 3669
4027 if (nargs == 0) 3670 if (nargs == 0)
4028 return; 3671 return;
4029 3672
… …
4036 for (i = 0; i < nargs; i++) 3679 for (i = 0; i < nargs; i++)
4037 { 3680 {
4038 state = -1; 3681 state = -1;
4039 3682
4040 /* basic handling */ 3683 /* basic handling */
4041 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3684 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
4042 if (argtopriv[j].argval == arg[i]) 3685 if (argtopriv[j].argval == arg[i])
4043 { 3686 {
4044 state = privcases (mode, argtopriv[j].bit); 3687 state = privcases (mode, argtopriv[j].bit);
4045 break; 3688 break;
4046 } 3689 }
… …
4048 /* extra handling for values with state unkept */ 3691 /* extra handling for values with state unkept */
4049 switch (arg[i]) 3692 switch (arg[i])
4050 { 3693 {
4051#if ENABLE_STYLES 3694#if ENABLE_STYLES
4052 case 1021: 3695 case 1021:
4053 if (mode) 3696 set_option (Opt_intensityStyles, mode);
4054 SET_OPTION (Opt_intensityStyles); 3697
3698 scr_touch (true);
4055 else 3699 break;
4056 CLR_OPTION (Opt_intensityStyles);
4057#endif 3700#endif
4058 case 1048: /* alternative cursor save */ 3701 case 1048: /* alternative cursor save */
4059 case 1049:
4060 if (OPTION (Opt_secondaryScreen)) 3702 if (option (Opt_secondaryScreen))
4061 if (mode == 0) 3703 if (mode == 0)
4062 scr_cursor (RESTORE); 3704 scr_cursor (RESTORE);
4063 else if (mode == 1) 3705 else if (mode == 1)
4064 scr_cursor (SAVE); 3706 scr_cursor (SAVE);
4065 break; 3707 break;
… …
4073 case 2: /* VT52 mode */ 3715 case 2: /* VT52 mode */
4074 /* oddball mode. should be set regardless of set/reset 3716 /* oddball mode. should be set regardless of set/reset
4075 * parameter. Return from VT52 mode with an ESC < from 3717 * parameter. Return from VT52 mode with an ESC < from
4076 * within VT52 mode 3718 * within VT52 mode
4077 */ 3719 */
4078 PrivMode (1, PrivMode_vt52); 3720 set_privmode (PrivMode_vt52, 1);
4079 break; 3721 break;
4080 case 3: /* 80/132 */ 3722 case 3: /* 80/132 */
4081 if (priv_modes & PrivMode_132OK) 3723 if (priv_modes & PrivMode_132OK)
4082 set_widthheight (((state ? 132 : 80) * fwidth), height); 3724 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4083 break; 3725 break;
4084 case 4: /* smooth scrolling */ 3726 case 4: /* smooth scrolling */
4085 if (!state) 3727 set_option (Opt_jumpScroll, !state);
4086 SET_OPTION (Opt_jumpScroll);
4087 else
4088 CLR_OPTION (Opt_jumpScroll);
4089 break; 3728 break;
4090 case 5: /* reverse video */ 3729 case 5: /* reverse video */
4091 scr_rvideo_mode (state); 3730 scr_rvideo_mode (state);
4092 break; 3731 break;
4093 case 6: /* relative/absolute origins */ 3732 case 6: /* relative/absolute origins */
… …
4097 scr_autowrap (state); 3736 scr_autowrap (state);
4098 break; 3737 break;
4099 /* case 8: - auto repeat, can't do on a per window basis */ 3738 /* case 8: - auto repeat, can't do on a per window basis */
4100 case 9: /* X10 mouse reporting */ 3739 case 9: /* X10 mouse reporting */
4101 if (state) /* orthogonal */ 3740 if (state) /* orthogonal */
4102 priv_modes &= ~PrivMode_MouseX11; 3741 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4103 break; 3742 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 3743#ifdef scrollBar_esc
4112 case scrollBar_esc: 3744 case scrollBar_esc:
4113 if (scrollbar_mapping (state)) 3745 if (scrollBar.map (state))
4114 { 3746 {
4115 resize_all_windows (0, 0, 0); 3747 resize_all_windows (0, 0, 0);
4116 scr_touch (true); 3748 scr_touch (true);
4117 } 3749 }
4118 break; 3750 break;
… …
4127 break; 3759 break;
4128 /* case 66: - application key pad */ 3760 /* case 66: - application key pad */
4129 /* case 67: - backspace key */ 3761 /* case 67: - backspace key */
4130 case 1000: /* X11 mouse reporting */ 3762 case 1000: /* X11 mouse reporting */
4131 if (state) /* orthogonal */ 3763 if (state) /* orthogonal */
4132 priv_modes &= ~PrivMode_MouseX10; 3764 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4133 break; 3765 break;
4134#if 0
4135 case 1001: 3766 case 1002:
4136 break; /* X11 mouse highlighting */ 3767 case 1003:
4137#endif 3768 if (state)
3769 {
3770 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3771 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3772 mouse_row = mouse_col = 0;
3773 vt_emask_mouse = PointerMotionMask;
3774 }
3775 else
3776 vt_emask_mouse = NoEventMask;
3777
3778 vt_select_input ();
3779 break;
4138 case 1010: /* scroll to bottom on TTY output inhibit */ 3780 case 1010: /* scroll to bottom on TTY output inhibit */
4139 if (!state) 3781 set_option (Opt_scrollTtyOutput, !state);
4140 SET_OPTION (Opt_scrollTtyOutput);
4141 else
4142 CLR_OPTION (Opt_scrollTtyOutput);
4143 break; 3782 break;
4144 case 1011: /* scroll to bottom on key press */ 3783 case 1011: /* scroll to bottom on key press */
4145 if (state) 3784 set_option (Opt_scrollTtyKeypress, state);
4146 SET_OPTION (Opt_scrollTtyKeypress);
4147 else
4148 CLR_OPTION (Opt_scrollTtyKeypress);
4149 break; 3785 break;
4150 case 1047: /* secondary screen w/ clearing last */ 3786 case 1047: /* secondary screen w/ clearing last */
4151 if (OPTION (Opt_secondaryScreen)) 3787 if (option (Opt_secondaryScreen))
4152 if (current_screen != PRIMARY) 3788 if (!state)
4153 scr_erase_screen (2); 3789 scr_erase_screen (2);
3790
4154 scr_change_screen (state); 3791 scr_change_screen (state);
4155 break; 3792 break;
4156 case 1049: /* secondary screen w/ clearing first */ 3793 case 1049: /* secondary screen w/ clearing first */
3794 if (option (Opt_secondaryScreen))
3795 if (state)
3796 scr_cursor (SAVE);
3797
4157 scr_change_screen (state); 3798 scr_change_screen (state);
3799
4158 if (OPTION (Opt_secondaryScreen)) 3800 if (option (Opt_secondaryScreen))
4159 if (current_screen != PRIMARY) 3801 if (state)
4160 scr_erase_screen (2); 3802 scr_erase_screen (2);
3803 else
3804 scr_cursor (RESTORE);
4161 break; 3805 break;
4162 default: 3806 default:
4163 break; 3807 break;
4164 } 3808 }
4165 } 3809 }
… …
4291 scr_color (Color_bg, Color_bg); 3935 scr_color (Color_bg, Color_bg);
4292 break; 3936 break;
4293 3937
4294 //case 50: // not variable spacing 3938 //case 50: // not variable spacing
4295 3939
4296#ifndef NO_BRIGHTCOLOR 3940#if !ENABLE_MINIMAL
4297 case 90: 3941 case 90:
4298 case 91: /* set bright fg color */ 3942 case 91: /* set bright fg color */
4299 case 92: 3943 case 92:
4300 case 93: 3944 case 93:
4301 case 94: 3945 case 94:
… …
4318 } 3962 }
4319 } 3963 }
4320} 3964}
4321/*}}} */ 3965/*}}} */
4322 3966
4323/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4324void
4325rxvt_term::process_graphics ()
4326{
4327 unicode_t ch, cmd = cmd_getc ();
4328
4329 if (cmd == 'Q')
4330 { /* query graphics */
4331 tt_printf ("\033G0\012"); /* no graphics */
4332 return;
4333 }
4334 /* swallow other graphics sequences until terminating ':' */
4335 do
4336 ch = cmd_getc ();
4337 while (ch != ':');
4338}
4339/*}}} */
4340
4341/* ------------------------------------------------------------------------- */ 3967/* ------------------------------------------------------------------------- */
4342 3968
4343/* 3969/*
4344 * Send printf () formatted output to the command. 3970 * Send printf () formatted output to the command.
4345 * Only use for small amounts of data. 3971 * Only use for small amounts of data.
4346 */ 3972 */
4347void 3973void
4348rxvt_term::tt_printf (const char *fmt,...) 3974rxvt_term::tt_printf (const char *fmt,...)
4349{ 3975{
4350 va_list arg_ptr; 3976 va_list arg_ptr;
4351 unsigned char buf[256]; 3977 char buf[256];
4352 3978
4353 va_start (arg_ptr, fmt); 3979 va_start (arg_ptr, fmt);
4354 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3980 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4355 va_end (arg_ptr); 3981 va_end (arg_ptr);
4356 tt_write (buf, strlen (buf)); 3982 tt_write (buf, strlen (buf));
… …
4358 3984
4359/* ---------------------------------------------------------------------- */ 3985/* ---------------------------------------------------------------------- */
4360/* Write data to the pty as typed by the user, pasted with the mouse, 3986/* 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. 3987 * or generated by us in response to a query ESC sequence.
4362 */ 3988 */
4363const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3989static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4364 3990
4365void 3991void
4366rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3992rxvt_term::tt_write (const char *data, unsigned int len)
4367{ 3993{
3994 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3995 return;
3996
3997 if (pty->pty < 0)
3998 return;
3999
4368 if (v_buflen == 0) 4000 if (v_buflen == 0)
4369 { 4001 {
4370 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4002 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4371 4003
4004 max_it (written, 0);
4005
4372 if ((unsigned int)written == len) 4006 if (written == len)
4373 return; 4007 return;
4374 4008
4375 data += written; 4009 data += written;
4376 len -= written; 4010 len -= written;
4377 } 4011 }
4378 4012
4379 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4013 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4380 4014
4381 memcpy (v_buffer + v_buflen, data, len); 4015 memcpy (v_buffer + v_buflen, data, len);
4382 v_buflen += len; 4016 v_buflen += len;
4383 4017
4384 pty_ev.set (EVENT_READ | EVENT_WRITE); 4018 pty_ev.set (ev::READ | ev::WRITE);
4385} 4019}
4386 4020
4387void rxvt_term::pty_write () 4021void rxvt_term::pty_write ()
4388{ 4022{
4389 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4023 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4390 4024
4391 if (written > 0) 4025 if (written > 0)
4392 { 4026 {
4393 v_buflen -= written; 4027 v_buflen -= written;
4394 4028
4395 if (v_buflen == 0) 4029 if (v_buflen == 0)
4396 { 4030 {
4397 free (v_buffer); 4031 free (v_buffer);
4398 v_buffer = 0; 4032 v_buffer = 0;
4399 v_buflen = 0;
4400 4033
4401 pty_ev.set (EVENT_READ); 4034 pty_ev.set (ev::READ);
4402 return; 4035 return;
4403 } 4036 }
4404 4037
4405 memmove (v_buffer, v_buffer + written, v_buflen); 4038 memmove (v_buffer, v_buffer + written, v_buflen);
4406 } 4039 }
4407 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4040 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4408 pty_ev.set (EVENT_READ); 4041 pty_ev.set (ev::READ);
4409} 4042}
4410 4043
4411/*----------------------- end-of-file (C source) -----------------------*/ 4044/*----------------------- end-of-file (C source) -----------------------*/
4412 4045

Diff Legend

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