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

Diff Legend

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