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

Diff Legend

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