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.216 by root, Tue Dec 27 01:25:42 2005 UTC vs.
Revision 1.400 by ayin, Mon Jan 28 12:54:47 2008 UTC

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

Diff Legend

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