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.490 by sf-exg, Sat Jul 9 18:23:48 2011 UTC

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

Diff Legend

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