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.409 by ayin, Sat Feb 16 15:39:20 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;
269} 282}
270 283
271int 284static int
272rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
273{ 286{
274 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
275 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
276 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
277 { 290 {
… …
285 298
286 return -1; 299 return -1;
287} 300}
288#endif 301#endif
289 302
290/*{{{ Convert the keypress event into a string */ 303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
339static inline int
340map_function_key (KeySym keysym)
341{
342 int param = 0;
343
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
345 {
346 param = 11 + keysym - XK_F1;
347 if (keysym >= XK_F17)
348 param += 4;
349 else if (keysym >= XK_F15)
350 param += 3;
351 else if (keysym >= XK_F11)
352 param += 2;
353 else if (keysym >= XK_F6)
354 param += 1;
355 }
356 else
357 switch (keysym)
358 {
359 case XK_Find:
360 param = 1;
361 break;
362 case XK_Insert:
363 param = 2;
364 break;
365#ifdef DXK_Remove
366 case DXK_Remove:
367#endif
368 case XK_Execute:
369 param = 3;
370 break;
371 case XK_Select:
372 param = 4;
373 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior:
376 param = 5;
377 break;
378 case XK_Next:
379 param = 6;
380 break;
381#endif
382 case XK_Help:
383 param = 28;
384 break;
385 case XK_Menu:
386 param = 29;
387 break;
388 }
389 return param;
390}
391
291void 392void
292rxvt_term::lookup_key (XKeyEvent &ev) 393rxvt_term::key_press (XKeyEvent &ev)
293{ 394{
294 int ctrl, meta, shft, len; 395 int ctrl, meta, shft, len;
295 unsigned int newlen;
296 KeySym keysym; 396 KeySym keysym;
297#ifdef DEBUG_CMD
298 static int debug_key = 1; /* accessible by a debugger only */
299#endif
300 int valid_keysym; 397 int valid_keysym;
301 unsigned char kbuf[KBUFSZ]; 398 char kbuf[KBUFSZ];
399
400#if ISO_14755
401 if (iso14755buf & ISO_14755_52)
402 return;
403#endif
302 404
303 /* 405 /*
304 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 406 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
305 * escape sequence to toggle the Keypad. 407 * escape sequence to toggle the Keypad.
306 * 408 *
… …
324 Status status_return; 426 Status status_return;
325 427
326#if 0 428#if 0
327#ifdef X_HAVE_UTF8_STRING 429#ifdef X_HAVE_UTF8_STRING
328 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 430 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
329 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 431 len = Xutf8LookupString (Input_Context, &ev, kbuf,
330 KBUFSZ, &keysym, &status_return); 432 KBUFSZ, &keysym, &status_return);
331 else 433 else
332#endif 434#endif
333#endif 435#endif
334 { 436 {
… …
371 || status_return == XLookupBoth; 473 || status_return == XLookupBoth;
372 } 474 }
373 else 475 else
374#endif 476#endif
375 { 477 {
376 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 478 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
377 valid_keysym = keysym != NoSymbol; 479 valid_keysym = keysym != NoSymbol;
378 } 480 }
379 481
380 if (valid_keysym) 482 if (valid_keysym)
381 { 483 {
… …
433 scr_move_to (0, 1); 535 scr_move_to (0, 1);
434 return; 536 return;
435 } 537 }
436 else if (keysym == XK_End) 538 else if (keysym == XK_End)
437 { 539 {
438 scr_move_to (1, 0); 540 scr_move_to (1, 1);
439 return; 541 return;
440 } 542 }
441 } 543 }
442#endif 544#endif
443 } 545 }
… …
454 { 556 {
455 switch (keysym) 557 switch (keysym)
456 { 558 {
457 /* normal XTerm key bindings */ 559 /* normal XTerm key bindings */
458 case XK_Insert: /* Shift+Insert = paste mouse selection */ 560 case XK_Insert: /* Shift+Insert = paste mouse selection */
459 selection_request (ev.time, 0, 0); 561 selection_request (ev.time);
460 return; 562 return;
461#if TODO 563#if TODO
462 /* rxvt extras */ 564 /* rxvt extras */
463 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 565 case XK_KP_Add: /* Shift+KP_Add = bigger font */
464 change_font (FONT_UP); 566 change_font (FONT_UP);
… …
483 { 585 {
484 commit_iso14755 (); 586 commit_iso14755 ();
485 iso14755buf = ISO_14755_51; 587 iso14755buf = ISO_14755_51;
486# if ISO_14755 588# if ISO_14755
487 iso14755_51 (0); 589 iso14755_51 (0);
590# endif
591 return;
592 }
593 else if (keysym == XK_BackSpace)
594 {
595 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
596# if ISO_14755
597 iso14755_51 (iso14755buf & ISO_14755_MASK);
488# endif 598# endif
489 return; 599 return;
490 } 600 }
491 else if ((hv = hex_keyval (ev)) >= 0) 601 else if ((hv = hex_keyval (ev)) >= 0)
492 { 602 {
… …
497# endif 607# endif
498 return; 608 return;
499 } 609 }
500 else 610 else
501 { 611 {
502# if ENABLE_OVERLAY 612# if ISO_14755
503 scr_overlay_off (); 613 scr_overlay_off ();
504# endif 614# endif
505 iso14755buf = 0; 615 iso14755buf = 0;
506 } 616 }
507 } 617 }
508 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 618 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
509 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 619 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
510 if (!(iso14755buf & ISO_14755_STARTED)) 620 if (!(iso14755buf & ISO_14755_STARTED))
511 { 621 {
512 iso14755buf |= ISO_14755_STARTED; 622 iso14755buf |= ISO_14755_STARTED;
513# if ENABLE_OVERLAY 623# if ISO_14755
514 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 624 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
515 scr_overlay_set (0, 0, "ISO 14755 mode"); 625 scr_overlay_set (0, 0, "ISO 14755 mode");
516# endif 626# endif
517 } 627 }
518#endif 628#endif
519 629
520#ifdef PRINTPIPE 630#ifdef PRINTPIPE
521 if (keysym == XK_Print) 631 if (keysym == XK_Print)
522 { 632 {
523 scr_printscreen (ctrl | shft); 633 scr_printscreen (ctrl | shft);
524 return; 634 return;
525 } 635 }
526#endif 636#endif
527 637
528 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 638 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
529 { 639 {
530 { 640 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
531 newlen = 1; 641 unsigned int newlen = 1;
532 switch (keysym) 642
643 switch (translate_keypad (keysym, kp))
533 { 644 {
534#ifndef NO_BACKSPACE_KEY 645#ifndef NO_BACKSPACE_KEY
535 case XK_BackSpace: 646 case XK_BackSpace:
536 if (priv_modes & PrivMode_HaveBackSpace) 647 if (priv_modes & PrivMode_HaveBackSpace)
537 { 648 {
538 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 649 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
539 ^ !!ctrl) ? '\b' : '\177'; 650 ^ !!ctrl) ? '\b' : '\177';
540 kbuf[1] = '\0'; 651 kbuf[1] = '\0';
541 } 652 }
542 else 653 else
543 strcpy (kbuf, key_backspace); 654 strcpy (kbuf, rs[Rs_backspace_key]);
544 break; 655 break;
545#endif 656#endif
546#ifndef NO_DELETE_KEY 657#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: 658 case XK_Delete:
558 strcpy (kbuf, key_delete); 659 strcpy (kbuf, rs[Rs_delete_key]);
559 break; 660 break;
560#endif 661#endif
561 case XK_Tab: 662 case XK_Tab:
562 if (shft) 663 if (shft)
563 strcpy (kbuf, "\033[Z"); 664 strcpy (kbuf, "\033[Z");
… …
573#endif 674#endif
574 newlen = 0; 675 newlen = 0;
575 } 676 }
576 break; 677 break;
577 678
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" */ 679 case XK_Up: /* "\033[A" */
595 case XK_Down: /* "\033[B" */ 680 case XK_Down: /* "\033[B" */
596 case XK_Right: /* "\033[C" */ 681 case XK_Right: /* "\033[C" */
597 case XK_Left: /* "\033[D" */ 682 case XK_Left: /* "\033[D" */
598 strcpy (kbuf, "\033[Z"); 683 strcpy (kbuf, "\033[Z");
… …
607 } 692 }
608 else if (priv_modes & PrivMode_aplCUR) 693 else if (priv_modes & PrivMode_aplCUR)
609 kbuf[1] = 'O'; 694 kbuf[1] = 'O';
610 break; 695 break;
611 696
612#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:
624 strcpy (kbuf, "\033[5~");
625 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:
637 strcpy (kbuf, "\033[6~");
638 break;
639#endif
640 case XK_KP_Enter: 697 case XK_KP_Enter:
641 /* allow shift to override */ 698 /* allow shift to override */
642 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 699 if (kp)
643 { 700 {
644 strcpy (kbuf, "\033OM"); 701 strcpy (kbuf, "\033OM");
645 break; 702 break;
646 } 703 }
647 704
… …
659 kbuf[0] = '\015'; 716 kbuf[0] = '\015';
660 kbuf[1] = '\0'; 717 kbuf[1] = '\0';
661 } 718 }
662 break; 719 break;
663 720
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" */ 721 case XK_KP_F1: /* "\033OP" */
671 case XK_KP_F2: /* "\033OQ" */ 722 case XK_KP_F2: /* "\033OQ" */
672 case XK_KP_F3: /* "\033OR" */ 723 case XK_KP_F3: /* "\033OR" */
673 case XK_KP_F4: /* "\033OS" */ 724 case XK_KP_F4: /* "\033OS" */
674 strcpy (kbuf, "\033OP"); 725 strcpy (kbuf, "\033OP");
… …
690 case XK_KP_6: /* "\033Ov" : "6" */ 741 case XK_KP_6: /* "\033Ov" : "6" */
691 case XK_KP_7: /* "\033Ow" : "7" */ 742 case XK_KP_7: /* "\033Ow" : "7" */
692 case XK_KP_8: /* "\033Ox" : "8" */ 743 case XK_KP_8: /* "\033Ox" : "8" */
693 case XK_KP_9: /* "\033Oy" : "9" */ 744 case XK_KP_9: /* "\033Oy" : "9" */
694 /* allow shift to override */ 745 /* allow shift to override */
695 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 746 if (kp)
696 { 747 {
697 strcpy (kbuf, "\033Oj"); 748 strcpy (kbuf, "\033Oj");
698 kbuf[2] += (keysym - XK_KP_Multiply); 749 kbuf[2] += (keysym - XK_KP_Multiply);
699 } 750 }
700 else 751 else
… …
702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 753 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703 kbuf[1] = '\0'; 754 kbuf[1] = '\0';
704 } 755 }
705 break; 756 break;
706 757
707 case XK_Find:
708 strcpy (kbuf, "\033[1~");
709 break;
710
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:
722 strcpy (kbuf, "\033[2~");
723 break;
724#ifdef DXK_Remove /* support for DEC remove like key */
725 case DXK_Remove:
726 /* FALLTHROUGH */
727#endif
728 case XK_Execute:
729 strcpy (kbuf, "\033[3~");
730 break;
731 case XK_Select:
732 strcpy (kbuf, "\033[4~");
733 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: 758 case XK_End:
745 strcpy (kbuf, KS_END); 759 strcpy (kbuf, KS_END);
746 break; 760 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: 761 case XK_Home:
758 strcpy (kbuf, KS_HOME); 762 strcpy (kbuf, KS_HOME);
759 break; 763 break;
760 764
761#define FKEY(n, fkey) \
762 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
763
764 case XK_F1: /* "\033[11~" */
765 case XK_F2: /* "\033[12~" */
766 case XK_F3: /* "\033[13~" */
767 case XK_F4: /* "\033[14~" */
768 case XK_F5: /* "\033[15~" */
769 FKEY (11, XK_F1);
770 break;
771 case XK_F6: /* "\033[17~" */
772 case XK_F7: /* "\033[18~" */
773 case XK_F8: /* "\033[19~" */
774 case XK_F9: /* "\033[20~" */
775 case XK_F10: /* "\033[21~" */
776 FKEY (17, XK_F6);
777 break;
778 case XK_F11: /* "\033[23~" */
779 case XK_F12: /* "\033[24~" */
780 case XK_F13: /* "\033[25~" */
781 case XK_F14: /* "\033[26~" */
782 FKEY (23, XK_F11);
783 break;
784 case XK_F15: /* "\033[28~" */
785 case XK_F16: /* "\033[29~" */
786 FKEY (28, XK_F15);
787 break;
788 case XK_Help: /* "\033[28~" */
789 FKEY (28, XK_Help);
790 break;
791 case XK_Menu: /* "\033[29~" */
792 FKEY (29, XK_Menu);
793 break;
794 case XK_F17: /* "\033[31~" */
795 case XK_F18: /* "\033[32~" */
796 case XK_F19: /* "\033[33~" */
797 case XK_F20: /* "\033[34~" */
798 case XK_F21: /* "\033[35~" */
799 case XK_F22: /* "\033[36~" */
800 case XK_F23: /* "\033[37~" */
801 case XK_F24: /* "\033[38~" */
802 case XK_F25: /* "\033[39~" */
803 case XK_F26: /* "\033[40~" */
804 case XK_F27: /* "\033[41~" */
805 case XK_F28: /* "\033[42~" */
806 case XK_F29: /* "\033[43~" */
807 case XK_F30: /* "\033[44~" */
808 case XK_F31: /* "\033[45~" */
809 case XK_F32: /* "\033[46~" */
810 case XK_F33: /* "\033[47~" */
811 case XK_F34: /* "\033[48~" */
812 case XK_F35: /* "\033[49~" */
813 FKEY (31, XK_F17);
814 break;
815#undef FKEY
816 default: 765 default:
766 {
767 int param = map_function_key (keysym);
768 if (param > 0)
769 sprintf (kbuf,"\033[%d~", param);
770 else
817 newlen = 0; 771 newlen = 0;
772 }
818 break; 773 break;
819 } 774 }
820 775
821 if (newlen) 776 if (newlen)
822 len = strlen (kbuf); 777 len = strlen (kbuf);
823 }
824 778
825 /* 779 /*
826 * Pass meta for all function keys, if 'meta' option set 780 * Pass meta for all function keys, if 'meta' option set
827 */ 781 */
828#ifdef META8_OPTION 782#ifdef META8_OPTION
… …
845 { 799 {
846#ifdef META8_OPTION 800#ifdef META8_OPTION
847 /* set 8-bit on */ 801 /* set 8-bit on */
848 if (meta && (meta_char == 0x80)) 802 if (meta && (meta_char == 0x80))
849 { 803 {
850 unsigned char *ch; 804 char *ch;
851 805
852 for (ch = kbuf; ch < kbuf + len; ch++) 806 for (ch = kbuf; ch < kbuf + len; ch++)
853 *ch |= 0x80; 807 *ch |= 0x80;
854 808
855 meta = 0; 809 meta = 0;
… …
857#endif 811#endif
858 /* nil */ ; 812 /* nil */ ;
859 } 813 }
860 } 814 }
861 815
816 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
817 return;
818
862 if (len <= 0) 819 if (len <= 0)
863 return; /* not mapped */ 820 return; /* not mapped */
864 821
865 if (options & Opt_scrollTtyKeypress) 822 if (option (Opt_scrollTtyKeypress))
866 if (view_start) 823 if (view_start)
867 { 824 {
868 view_start = 0; 825 view_start = 0;
869 want_refresh = 1; 826 want_refresh = 1;
870 } 827 }
… …
888#ifdef META8_OPTION 845#ifdef META8_OPTION
889 && meta_char == C0_ESC 846 && meta_char == C0_ESC
890#endif 847#endif
891 ) 848 )
892 { 849 {
893 const unsigned char ch = C0_ESC; 850 const char ch = C0_ESC;
894 tt_write (&ch, 1); 851 tt_write (&ch, 1);
895 } 852 }
896 853
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); 854 tt_write (kbuf, (unsigned int)len);
908} 855}
909/*}}} */
910 856
857void
858rxvt_term::key_release (XKeyEvent &ev)
859{
860#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
861 KeySym keysym;
862
863 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
864#endif
865
866#if ENABLE_FRILLS || ISO_14755
867 // ISO 14755 support
868 if (iso14755buf)
869 if (iso14755buf & ISO_14755_52)
870 {
871# if ISO_14755
872 scr_overlay_off ();
873# endif
874# if ISO_14755
875 // iso14755 part 5.2 handling: release time
876 // first: controls
877 if ((ev.state & ControlMask)
878 && ((keysym >= 0x40 && keysym <= 0x5f)
879 || (keysym >= 0x61 && keysym <= 0x7f)))
880 {
881 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
882 commit_iso14755 ();
883
884 return;
885 }
886
887 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
888 if (i[0] == keysym)
889 {
890 iso14755buf = ISO_14755_51 | i[1];
891 commit_iso14755 ();
892
893 return;
894 }
895
896 scr_bell ();
897# endif
898 iso14755buf = 0;
899
900 return;
901 }
902 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
903 {
904# if ISO_14755
905 scr_overlay_off ();
906# endif
907 if (iso14755buf & ISO_14755_51)
908 commit_iso14755 ();
909#if ISO_14755
910 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
911 {
912 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
913
914 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
915 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
916 }
917# endif
918 else
919 iso14755buf = 0;
920 }
921#endif
922
923 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
924 return;
925
926#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
927 if (!(ev.state & ControlMask))
928 slip_wheel_ev.stop ();
929 else if (keysym == XK_Control_L || keysym == XK_Control_R)
930 mouse_slip_wheel_speed = 0;
931#endif
932}
933
911#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 934#if defined (KEYSYM_RESOURCE)
912/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
913/* attempt to `write' count to the input buffer */
914unsigned int 935unsigned int
915rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 936rxvt_term::cmd_write (const char *str, unsigned int count)
916{ 937{
917 unsigned int n, s; 938 unsigned int n, s;
918 939
919 n = cmdbuf_ptr - cmdbuf_base; 940 n = cmdbuf_ptr - cmdbuf_base;
920 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 941 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
946void 967void
947rxvt_term::flush () 968rxvt_term::flush ()
948{ 969{
949 flush_ev.stop (); 970 flush_ev.stop ();
950 971
951#ifdef TRANSPARENT 972#ifdef HAVE_BG_PIXMAP
952 if (want_full_refresh) 973 if (bgPixmap.check_clearChanged ())
953 { 974 {
954 want_full_refresh = 0; 975// scr_clear (true); This needs to be researched further!
955 scr_clear ();
956 scr_touch (false); 976 scr_touch (false);
957 } 977 }
958#endif 978#endif
959 979
960 if (want_refresh) 980 if (want_refresh)
961 { 981 {
982 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
983 {
984 int row = view_start;
985 int end_row = row + nrow;
986
987 while (row > top_row && ROW (row - 1).is_longer ())
988 --row;
989
990 do
991 {
992 int start_row = row;
993 line_t *l;
994
995 do
996 {
997 l = &ROW (row++);
998
999 if (!(l->f & LINE_FILTERED))
1000 {
1001 // line not filtered, mark it as filtered
1002 l->f |= LINE_FILTERED;
1003 while (l->is_longer ())
1004 {
1005 l = &ROW (row++);
1006 l->f |= LINE_FILTERED;
1007 }
1008
1009 // and filter it
1010 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1011
1012 break;
1013 }
1014 }
1015 while (l->is_longer () && row < end_row);
1016 }
1017 while (row < end_row);
1018 }
1019
962 scr_refresh (refresh_type); 1020 scr_refresh ();
963 scrollbar_show (1); 1021 scrollbar_show (1);
964#ifdef USE_XIM 1022#ifdef USE_XIM
965 IMSendSpot (); 1023 IMSendSpot ();
966#endif 1024#endif
967 } 1025 }
968 1026
969 display->flush (); 1027 display->flush ();
970} 1028}
971 1029
1030/* checks wether a refresh is requested and starts the refresh timer */
972void 1031void
973rxvt_term::check_cb (check_watcher &w) 1032rxvt_term::refresh_check ()
974{ 1033{
975 SET_R (this); 1034 if (want_refresh && !flush_ev.is_active ())
976 SET_LOCALE (locale); 1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
977 1036
978 display->flush (); 1037 display->flush ();
979
980 if (want_refresh && !flush_ev.active)
981 flush_ev.start (NOW + 0.01);
982} 1038}
983 1039
984void 1040void
985rxvt_term::flush_cb (time_watcher &w) 1041rxvt_term::flush_cb (ev::timer &w, int revents)
986{ 1042{
987 SET_R (this); 1043 make_current ();
988 SET_LOCALE (locale);
989 1044
990 refresh_limit = 1;
991 refresh_count = 0; 1045 refresh_count = 0;
992 flush (); 1046 flush ();
993} 1047}
994 1048
995#ifdef CURSOR_BLINK 1049#ifdef CURSOR_BLINK
996void 1050void
997rxvt_term::cursor_blink_cb (time_watcher &w) 1051rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
998{ 1052{
999 hidden_cursor = !hidden_cursor; 1053 hidden_cursor = !hidden_cursor;
1000 want_refresh = 1; 1054 want_refresh = 1;
1001 1055 refresh_check ();
1002 w.start (w.at + BLINK_INTERVAL);
1003} 1056}
1004#endif 1057#endif
1005 1058
1006#ifdef TEXT_BLINK 1059#ifdef TEXT_BLINK
1007void 1060void
1008rxvt_term::text_blink_cb (time_watcher &w) 1061rxvt_term::text_blink_cb (ev::timer &w, int revents)
1009{ 1062{
1010 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1063 if (scr_refresh_rend (RS_Blink, RS_Blink))
1011 { 1064 {
1012 hidden_text = !hidden_text; 1065 hidden_text = !hidden_text;
1013 want_refresh = 1; 1066 want_refresh = 1;
1014 w.start (w.at + TEXT_BLINK_INTERVAL); 1067 refresh_check ();
1015 } 1068 }
1069 else
1070 w.stop ();
1016} 1071}
1017#endif 1072#endif
1018 1073
1019#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1020void 1075void
1021rxvt_term::cont_scroll_cb (time_watcher &w) 1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1022{ 1077{
1023 if ((scrollbar_isUp() || scrollbar_isDn()) && 1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1024 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1025 { 1080 {
1026 refresh_type |= SMOOTH_REFRESH;
1027 want_refresh = 1; 1081 want_refresh = 1;
1028 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1082 refresh_check ();
1029 } 1083 }
1084 else
1085 w.stop ();
1030} 1086}
1031#endif 1087#endif
1032 1088
1033#ifdef SELECTION_SCROLLING 1089#ifdef SELECTION_SCROLLING
1034void 1090void
1035rxvt_term::sel_scroll_cb (time_watcher &w) 1091rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1036{ 1092{
1037 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1093 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1038 { 1094 {
1039 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1095 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1040 refresh_type |= SMOOTH_REFRESH;
1041 want_refresh = 1; 1096 want_refresh = 1;
1042 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1097 refresh_check ();
1043 } 1098 }
1099 else
1100 w.stop ();
1044} 1101}
1045#endif 1102#endif
1046 1103
1047#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1104#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1048void 1105void
1049rxvt_term::slip_wheel_cb (time_watcher &w) 1106rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1050{ 1107{
1051 if (mouse_slip_wheel_speed == 0 1108 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 { 1109 {
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; 1110 want_refresh = 1;
1061 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 refresh_check ();
1112 }
1113
1114 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1062 } 1115 {
1116 mouse_slip_wheel_speed = 0;
1117 w.stop ();
1118 }
1063} 1119}
1120#endif
1121
1122#if LINUX_YIELD_HACK
1123static struct event_handler
1124{
1125 ev::prepare yield_ev;
1126
1127 void yield_cb (ev::prepare &w, int revents)
1128 {
1129 // this should really be sched_yield(), but the linux guys thought
1130 // that giving a process calling sched_yield () less cpu time than
1131 // ones with high nice levels is a useful thing to do. It surely is is
1132 // allowed by the sus... as is returning ENOSYS.
1133
1134 struct timespec ts = { 0, 0 };
1135 nanosleep (&ts, 0);
1136
1137 w.stop ();
1138 }
1139
1140 event_handler ()
1141 : yield_ev (this, &event_handler::yield_cb)
1142 {
1143 }
1144} event_handler;
1064#endif 1145#endif
1065 1146
1066bool 1147bool
1067rxvt_term::pty_fill () 1148rxvt_term::pty_fill ()
1068{ 1149{
1069 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1150 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1070 1151
1071 if (CBUFSIZ == n) 1152 if (CBUFSIZ == n)
1072 { 1153 {
1073 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1154 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1074 n = 0; 1155 n = 0;
1075 } 1156 }
1076 1157
1077 memmove (cmdbuf_base, cmdbuf_ptr, n); 1158 memmove (cmdbuf_base, cmdbuf_ptr, n);
1078 cmdbuf_ptr = cmdbuf_base; 1159 cmdbuf_ptr = cmdbuf_base;
1079 cmdbuf_endp = cmdbuf_ptr + n; 1160 cmdbuf_endp = cmdbuf_ptr + n;
1080 1161
1081 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1162 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1082 1163
1083 if (n > 0) 1164 if (r > 0)
1084 { 1165 {
1085 cmdbuf_endp += n; 1166 cmdbuf_endp += r;
1086 return true; 1167 return true;
1087 } 1168 }
1088 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1169 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1170 {
1171#if LINUX_YIELD_HACK
1172 if (display->is_local)
1173 event_handler.yield_ev.start ();
1174#endif
1175 }
1176 else
1089 { 1177 {
1090 pty_ev.stop (); 1178 pty_ev.stop ();
1091 1179
1092 if (!(options & Opt_hold)) 1180 if (!option (Opt_hold))
1093 destroy (); 1181 destroy ();
1094 } 1182 }
1095 1183
1096 return false; 1184 return false;
1097} 1185}
1098 1186
1099void 1187void
1100rxvt_term::pty_cb (io_watcher &w, short revents) 1188rxvt_term::pty_cb (ev::io &w, int revents)
1101{ 1189{
1102 SET_R (this); 1190 make_current ();
1103 SET_LOCALE (locale);
1104 1191
1105 if (revents & EVENT_READ) 1192 if (revents & ev::READ)
1106 // loop, but don't allow a single term to monopolize us 1193 // loop, but don't allow a single term to monopolize us
1107 while (pty_fill ()) 1194 while (pty_fill ())
1108 if (cmd_parse ()) 1195 if (cmd_parse ())
1109 break; 1196 break;
1110 1197
1111 if (revents & EVENT_WRITE) 1198 if (revents & ev::WRITE)
1112 pty_write (); 1199 pty_write ();
1200
1201 refresh_check ();
1113} 1202}
1114 1203
1115void 1204void
1116rxvt_term::pointer_unblank () 1205rxvt_term::pointer_unblank ()
1117{ 1206{
1118 XDefineCursor (display->display, vt, TermWin_cursor); 1207 XDefineCursor (dpy, vt, TermWin_cursor);
1119 recolour_cursor (); 1208 recolour_cursor ();
1120 1209
1121#ifdef POINTER_BLANK 1210#ifdef POINTER_BLANK
1122 hidden_pointer = 0; 1211 hidden_pointer = 0;
1123 1212
1124 if (options & Opt_pointerBlank) 1213 if (option (Opt_pointerBlank))
1125 pointer_ev.start (NOW + pointerBlankDelay); 1214 pointer_ev.start (pointerBlankDelay);
1126#endif 1215#endif
1127} 1216}
1128 1217
1129#ifdef POINTER_BLANK 1218#ifdef POINTER_BLANK
1130void 1219void
1131rxvt_term::pointer_blank () 1220rxvt_term::pointer_blank ()
1132{ 1221{
1133 if (! (options & Opt_pointerBlank)) 1222 if (!option (Opt_pointerBlank))
1134 return; 1223 return;
1135 1224
1136 XDefineCursor (display->display, vt, display->blank_cursor); 1225 XDefineCursor (dpy, vt, display->blank_cursor);
1137 XFlush (display->display); 1226 XFlush (dpy);
1138 1227
1139 hidden_pointer = 1; 1228 hidden_pointer = 1;
1140} 1229}
1141 1230
1142void 1231void
1143rxvt_term::pointer_cb (time_watcher &w) 1232rxvt_term::pointer_cb (ev::timer &w, int revents)
1144{ 1233{
1145 SET_R (this); 1234 make_current ();
1146 SET_LOCALE (locale);
1147 1235
1148 pointer_blank (); 1236 pointer_blank ();
1149} 1237}
1150#endif 1238#endif
1151 1239
1152void 1240void
1153rxvt_term::mouse_report (XButtonEvent &ev) 1241rxvt_term::mouse_report (XButtonEvent &ev)
1154{ 1242{
1155 int button_number, key_state = 0; 1243 int button_number, key_state = 0;
1156 int x, y; 1244 int x, y;
1245 int code = 32;
1157 1246
1158 x = ev.x; 1247 x = Pixel2Col (ev.x);
1159 y = ev.y; 1248 y = Pixel2Row (ev.y);
1160 pixel_position (&x, &y); 1249 if (ev.type == MotionNotify)
1250 {
1251 if (x == mouse_row && y == mouse_col)
1252 return;
1253 mouse_row = x;
1254 mouse_col = y;
1255 code += 32;
1256 }
1161 1257
1162 if (MEvent.button == AnyButton) 1258 if (MEvent.button == AnyButton)
1163 button_number = 3; 1259 button_number = 3;
1164 else 1260 else
1165 { 1261 {
… …
1211 x + 1, 1307 x + 1,
1212 y + 1); 1308 y + 1);
1213#endif 1309#endif
1214 1310
1215 tt_printf ("\033[M%c%c%c", 1311 tt_printf ("\033[M%c%c%c",
1216 (32 + button_number + key_state), 1312 (code + button_number + key_state),
1217 (32 + x + 1), 1313 (32 + x + 1),
1218 (32 + y + 1)); 1314 (32 + y + 1));
1219} 1315}
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 1316
1231/*{{{ process an X event */ 1317/*{{{ process an X event */
1232void 1318void
1233rxvt_term::x_cb (XEvent &ev) 1319rxvt_term::x_cb (XEvent &ev)
1234{ 1320{
1235 dDisp; 1321 make_current ();
1236 1322
1237 SET_R (this); 1323 dLocal (Display *, dpy);
1238 SET_LOCALE (locale);
1239 1324
1240#if defined(CURSOR_BLINK) 1325 if (ev.xany.window == vt
1241 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1326 && SHOULD_INVOKE (HOOK_X_EVENT)
1242 { 1327 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1243 if (hidden_cursor) 1328 return;
1244 {
1245 hidden_cursor = 0;
1246 want_refresh = 1;
1247 }
1248 1329
1249 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1330 // 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; 1331 Window unused_root, unused_child;
1268 int unused_root_x, unused_root_y; 1332 int unused_root_x, unused_root_y;
1269 unsigned int unused_mask; 1333 unsigned int unused_mask;
1270 1334
1271 switch (ev.type) 1335 switch (ev.type)
1272 { 1336 {
1273 case KeyPress: 1337 case KeyPress:
1274#if ISO_14755 1338 key_press (ev.xkey);
1275 if (!(iso14755buf & ISO_14755_52))
1276#endif
1277 lookup_key (ev.xkey);
1278
1279 break; 1339 break;
1280 1340
1281 case KeyRelease: 1341 case KeyRelease:
1282 { 1342 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; 1343 break;
1350 }
1351 1344
1352 case ButtonPress: 1345 case ButtonPress:
1353 button_press (ev.xbutton); 1346 button_press (ev.xbutton);
1354 break; 1347 break;
1355 1348
… …
1357 button_release (ev.xbutton); 1350 button_release (ev.xbutton);
1358 break; 1351 break;
1359 1352
1360 case ClientMessage: 1353 case ClientMessage:
1361 if (ev.xclient.format == 32 1354 if (ev.xclient.format == 32
1362 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1355 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1363 { 1356 {
1357 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1358 {
1359 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1360 {
1364 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1361 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1362 {
1363 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1365 destroy (); 1364 destroy ();
1365 }
1366#if ENABLE_EWMH 1366#if ENABLE_EWMH
1367 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1367 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1368 XSendEvent (disp, ev.xclient.window = display->root, 1368 XSendEvent (dpy, ev.xclient.window = display->root,
1369 False, SubstructureRedirectMask | SubstructureNotifyMask, 1369 False, SubstructureRedirectMask | SubstructureNotifyMask,
1370 &ev); 1370 &ev);
1371#endif
1372 }
1373 }
1374#if ENABLE_XEMBED
1375 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1376 {
1377 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1378 focus_in ();
1379 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1380 focus_out ();
1381 }
1371#endif 1382#endif
1372 } 1383 }
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; 1384 break;
1413 1385
1414 /* 1386 /*
1415 * XXX: this is not the _current_ arrangement 1387 * XXX: this is not the _current_ arrangement
1416 * Here's my conclusion: 1388 * Here's my conclusion:
… …
1435 break; 1407 break;
1436 } 1408 }
1437 break; 1409 break;
1438 1410
1439 case FocusIn: 1411 case FocusIn:
1412 if (ev.xfocus.detail != NotifyInferior
1413 && ev.xfocus.detail != NotifyPointer
1414 && ev.xfocus.mode != NotifyGrab)
1440 focus_in (); 1415 focus_in ();
1441 break; 1416 break;
1442 1417
1443 case FocusOut: 1418 case FocusOut:
1419 if (ev.xfocus.detail != NotifyInferior
1420 && ev.xfocus.detail != NotifyPointer
1421 && ev.xfocus.mode != NotifyGrab)
1444 focus_out (); 1422 focus_out ();
1445 break; 1423 break;
1446 1424
1447 case ConfigureNotify: 1425 case ConfigureNotify:
1426 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1427 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1428 szHint.width, szHint.height);*/
1448 if (ev.xconfigure.window == parent[0]) 1429 if (ev.xconfigure.window == parent[0])
1449 { 1430 {
1450 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1431 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1451 ; 1432 ;
1452 1433
1453 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1434 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1454 { 1435 {
1455 seen_resize = 1; 1436 seen_resize = 1;
1456 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1437 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1457 } 1438 }
1458 1439 else
1459#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1440 {
1460 if (options & Opt_transparent) 1441#ifdef HAVE_BG_PIXMAP
1461 check_our_parents (); 1442 if (bgPixmap.window_position_sensitive ())
1443 {
1444 if (mapped)
1445 update_background ();
1446 else
1447 bgPixmap.invalidate ();
1448 }
1462#endif 1449#endif
1450 }
1451
1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 } 1453 }
1464 break; 1454 break;
1465 1455
1466 case PropertyNotify: 1456 case PropertyNotify:
1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1467 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1458 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1468 && ev.xproperty.state == PropertyNewValue) 1459 && ev.xproperty.state == PropertyNewValue)
1469 selection_property (ev.xproperty.window, ev.xproperty.atom); 1460 selection_property (ev.xproperty.window, ev.xproperty.atom);
1470 1461
1471 break; 1462 break;
1472 1463
1473 case SelectionClear: 1464 case SelectionClear:
1474 selection_clear (); 1465 selection_clear ();
… …
1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1470 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1480 break; 1471 break;
1481 1472
1482 case SelectionRequest: 1473 case SelectionRequest:
1483 selection_send (ev.xselectionrequest); 1474 selection_send (ev.xselectionrequest);
1475 break;
1476
1477 case MapNotify:
1478#ifdef HAVE_BG_PIXMAP
1479 /* This is needed spcifically to fix the case of no window manager or a
1480 * non-reparenting window manager. In those cases we never get first
1481 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1482 * care of multiplicity of ConfigureNotify events arriwing while WM does
1483 * reparenting.
1484 * We should not render background immidiately, as there could be several
1485 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1486 * by scheduling background redraw as soon as we can, but giving a short
1487 * bit of time for ConfigureNotifies to arrive.
1488 * We should render background PRIOR to drawing any text, but AFTER all
1489 * of ConfigureNotifys for the best results.
1490 */
1491 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1492 update_background_ev.start (0.025);
1493#endif
1494 mapped = 1;
1495#ifdef TEXT_BLINK
1496 text_blink_ev.start ();
1497#endif
1498 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break; 1499 break;
1485 1500
1486 case UnmapNotify: 1501 case UnmapNotify:
1487 mapped = 0; 1502 mapped = 0;
1488#ifdef TEXT_BLINK 1503#ifdef TEXT_BLINK
1489 text_blink_ev.stop (); 1504 text_blink_ev.stop ();
1490#endif 1505#endif
1506 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1491 break; 1507 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 1508
1506 case GraphicsExpose: 1509 case GraphicsExpose:
1507 case Expose: 1510 case Expose:
1508 if (ev.xany.window == vt) 1511 if (ev.xany.window == vt)
1509 { 1512 {
1510 do 1513 do
1514 {
1511 scr_expose (ev.xexpose.x, ev.xexpose.y, 1515 scr_expose (ev.xexpose.x, ev.xexpose.y,
1512 ev.xexpose.width, ev.xexpose.height, False); 1516 ev.xexpose.width, ev.xexpose.height, False);
1517 }
1513 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1518 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1514 1519
1515 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1520 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1516 1521
1517 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1522 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1523 {
1518 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1519 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1526 }
1520 1527
1521 scr_refresh (refresh_type); 1528 want_refresh = 1;
1522 } 1529 }
1523 else 1530 else
1524 { 1531 {
1525 XEvent unused_event; 1532 XEvent unused_event;
1526 1533
1527 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1534 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1528 ; 1535 ;
1529 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1530 ; 1537 ;
1531 1538
1532 if (isScrollbarWindow (ev.xany.window)) 1539 if (scrollBar.state && ev.xany.window == scrollBar.win)
1533 { 1540 {
1534 scrollBar.setIdle (); 1541 scrollBar.state = STATE_IDLE;
1535 scrollbar_show (0); 1542 scrollbar_show (0);
1536 } 1543 }
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 } 1544 }
1547 break; 1545 break;
1548 1546
1549 case MotionNotify: 1547 case MotionNotify:
1550#ifdef POINTER_BLANK 1548#ifdef POINTER_BLANK
1551 if (hidden_pointer) 1549 if (hidden_pointer)
1552 pointer_unblank (); 1550 pointer_unblank ();
1553#endif 1551#endif
1554#if MENUBAR 1552 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1555 if (isMenuBarWindow (ev.xany.window)) 1553 || priv_modes & PrivMode_MouseAnyEvent)
1556 {
1557 menubar_control (ev.xbutton); 1554 mouse_report (ev.xbutton);
1558 break;
1559 }
1560#endif
1561 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1555 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1562 break; 1556 break;
1563 1557
1564 if (ev.xany.window == vt) 1558 if (ev.xany.window == vt)
1565 { 1559 {
1560 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1561 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1562 ; // nop
1566 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1563 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1567 { 1564 {
1568 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1565 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1569 ; 1566 ;
1570 1567
1571 XQueryPointer (disp, vt, 1568 XQueryPointer (dpy, vt,
1572 &unused_root, &unused_child, 1569 &unused_root, &unused_child,
1573 &unused_root_x, &unused_root_y, 1570 &unused_root_x, &unused_root_y,
1574 &ev.xbutton.x, &ev.xbutton.y, 1571 &ev.xbutton.x, &ev.xbutton.y,
1575 &ev.xbutton.state); 1572 &ev.xbutton.state);
1576#ifdef MOUSE_THRESHOLD 1573#ifdef MOUSE_THRESHOLD
… …
1596 int dist; 1593 int dist;
1597 1594
1598 /* don't clobber the current delay if we are 1595 /* don't clobber the current delay if we are
1599 * already in the middle of scrolling. 1596 * already in the middle of scrolling.
1600 */ 1597 */
1601 if (!sel_scroll_ev.active) 1598 if (!sel_scroll_ev.is_active ())
1602 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1599 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1603 1600
1604 /* save the event params so we can highlight 1601 /* save the event params so we can highlight
1605 * the selection in the pending-scroll loop 1602 * the selection in the pending-scroll loop
1606 */ 1603 */
1607 selection_save_x = ev.xbutton.x; 1604 selection_save_x = ev.xbutton.x;
… …
1629 else 1626 else
1630 { 1627 {
1631 /* we are within the text window, so we 1628 /* we are within the text window, so we
1632 * shouldn't be scrolling 1629 * shouldn't be scrolling
1633 */ 1630 */
1634 if (sel_scroll_ev.active)
1635 sel_scroll_ev.stop(); 1631 sel_scroll_ev.stop();
1636 } 1632 }
1637#endif 1633#endif
1638#ifdef MOUSE_THRESHOLD 1634#ifdef MOUSE_THRESHOLD
1639 } 1635 }
1640#endif 1636#endif
1641 } 1637 }
1642 } 1638 }
1643 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1639 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1644 { 1640 {
1645 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1641 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1646 MotionNotify, &ev)) 1642 MotionNotify, &ev))
1647 ; 1643 ;
1648 1644
1649 XQueryPointer (disp, scrollBar.win, 1645 XQueryPointer (dpy, scrollBar.win,
1650 &unused_root, &unused_child, 1646 &unused_root, &unused_child,
1651 &unused_root_x, &unused_root_y, 1647 &unused_root_x, &unused_root_y,
1652 &ev.xbutton.x, &ev.xbutton.y, 1648 &ev.xbutton.x, &ev.xbutton.y,
1653 &unused_mask); 1649 &unused_mask);
1654 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1650 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1655 scrollbar_size ()); 1651 scrollbar_size ());
1656 scr_refresh (refresh_type);
1657 refresh_limit = 0; 1652 want_refresh = 1;
1658 scrollbar_show (1); 1653 scrollbar_show (1);
1659 } 1654 }
1660 break; 1655 break;
1661 } 1656 }
1657
1658#if defined(CURSOR_BLINK)
1659 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1660 {
1661 if (hidden_cursor)
1662 {
1663 hidden_cursor = 0;
1664 want_refresh = 1;
1665 }
1666
1667 cursor_blink_ev.again ();
1668 }
1669#endif
1670
1671#if defined(POINTER_BLANK)
1672 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1673 {
1674 if (ev.type == MotionNotify
1675 || ev.type == ButtonPress
1676 || ev.type == ButtonRelease)
1677 if (hidden_pointer)
1678 pointer_unblank ();
1679
1680 if (ev.type == KeyPress && hidden_pointer == 0)
1681 pointer_blank ();
1682 }
1683#endif
1684
1685 refresh_check ();
1662} 1686}
1663 1687
1664void 1688void
1665rxvt_term::focus_in () 1689rxvt_term::focus_in ()
1666{ 1690{
1667 if (!focus) 1691 if (!focus)
1668 { 1692 {
1669 focus = 1; 1693 focus = 1;
1670 want_refresh = 1; 1694 want_refresh = 1;
1695
1696 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1697
1671#if USE_XIM 1698#if USE_XIM
1672 if (Input_Context != NULL) 1699 if (Input_Context != NULL)
1673 { 1700 {
1674 IMSetStatusPosition (); 1701 IMSetPosition ();
1675 XSetICFocus (Input_Context); 1702 XSetICFocus (Input_Context);
1676 } 1703 }
1677#endif 1704#endif
1678#if CURSOR_BLINK 1705#if CURSOR_BLINK
1679 if (options & Opt_cursorBlink) 1706 if (option (Opt_cursorBlink))
1680 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1707 cursor_blink_ev.again ();
1681#endif 1708#endif
1682#if OFF_FOCUS_FADING 1709#if OFF_FOCUS_FADING
1683 if (rs[Rs_fade]) 1710 if (rs[Rs_fade])
1684 { 1711 {
1685 pix_colors = pix_colors_focused; 1712 pix_colors = pix_colors_focused;
1686 scr_recolour (); 1713 scr_recolour ();
1687 } 1714 }
1688#endif 1715#endif
1716#if ENABLE_FRILLS
1717 if (option (Opt_urgentOnBell))
1718 {
1719 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1720 {
1721 h->flags &= ~XUrgencyHint;
1722 XSetWMHints (dpy, parent[0], h);
1723 }
1724 }
1725#endif
1689 } 1726 }
1690} 1727}
1691 1728
1692void 1729void
1693rxvt_term::focus_out () 1730rxvt_term::focus_out ()
… …
1695 if (focus) 1732 if (focus)
1696 { 1733 {
1697 focus = 0; 1734 focus = 0;
1698 want_refresh = 1; 1735 want_refresh = 1;
1699 1736
1737 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738
1700#if ENABLE_FRILLS || ISO_14755 1739#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf)
1741 {
1701 iso14755buf = 0; 1742 iso14755buf = 0;
1702#endif 1743# if ISO_14755
1703#if ENABLE_OVERLAY
1704 scr_overlay_off (); 1744 scr_overlay_off ();
1745# endif
1746 }
1705#endif 1747#endif
1706#if USE_XIM 1748#if USE_XIM
1707 if (Input_Context != NULL) 1749 if (Input_Context != NULL)
1708 XUnsetICFocus (Input_Context); 1750 XUnsetICFocus (Input_Context);
1709#endif 1751#endif
1710#if CURSOR_BLINK 1752#if CURSOR_BLINK
1711 if (options & Opt_cursorBlink) 1753 if (option (Opt_cursorBlink))
1712 cursor_blink_ev.stop (); 1754 cursor_blink_ev.stop ();
1755
1713 hidden_cursor = 0; 1756 hidden_cursor = 0;
1714#endif 1757#endif
1715#if OFF_FOCUS_FADING 1758#if OFF_FOCUS_FADING
1716 if (rs[Rs_fade]) 1759 if (rs[Rs_fade])
1717 { 1760 {
… …
1720 } 1763 }
1721#endif 1764#endif
1722 } 1765 }
1723} 1766}
1724 1767
1725#if TRANSPARENT 1768void
1769rxvt_term::update_fade_color (unsigned int idx)
1770{
1771#if OFF_FOCUS_FADING
1772 if (rs[Rs_fade])
1773 {
1774 rgba c;
1775 pix_colors [Color_fade].get (c);
1776 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1777 }
1778#endif
1779}
1780
1781#if ENABLE_TRANSPARENCY || ENABLE_PERL
1726void 1782void
1727rxvt_term::rootwin_cb (XEvent &ev) 1783rxvt_term::rootwin_cb (XEvent &ev)
1728{ 1784{
1729 SET_R (this); 1785 make_current ();
1730 SET_LOCALE (locale);
1731 1786
1787 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1788 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1789 return;
1790
1791# if ENABLE_TRANSPARENCY
1732 switch (ev.type) 1792 switch (ev.type)
1733 { 1793 {
1734 case PropertyNotify: 1794 case PropertyNotify:
1735 /* 1795 /*
1736 * if user used some Esetroot compatible prog to set the root bg, 1796 * 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. 1797 * use the property to determine the pixmap. We use it later on.
1738 */ 1798 */
1739 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1799 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1740 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1800 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1741 return; 1801 {
1802 bgPixmap.set_root_pixmap ();
1803 update_background ();
1804 }
1742 1805
1743 /* FALLTHROUGH */
1744 case ReparentNotify:
1745 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1746 want_refresh = want_full_refresh = 1;
1747 break; 1806 break;
1748 } 1807 }
1808# endif
1809
1810 refresh_check ();
1749} 1811}
1750#endif 1812#endif
1751 1813
1752void 1814void
1753rxvt_term::button_press (XButtonEvent &ev) 1815rxvt_term::button_press (XButtonEvent &ev)
1754{ 1816{
1755 int reportmode = 0, clickintime; 1817 int reportmode = 0, clickintime;
1756 1818
1757 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1819 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1820
1758 if (!bypass_keystate) 1821 if (!bypass_keystate)
1759 reportmode = !! (priv_modes & PrivMode_mouse_report); 1822 reportmode = !! (priv_modes & PrivMode_mouse_report);
1760 1823
1761 /* 1824 /*
1762 * VT window processing of button press 1825 * VT window processing of button press
1763 */ 1826 */
1764 if (ev.window == vt) 1827 if (ev.window == vt)
1765 { 1828 {
1829 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1830 return;
1831
1766#if ISO_14755 1832#if ISO_14755
1767 // 5.4 1833 // 5.4
1768 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1834 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1769 { 1835 {
1770 iso14755_54 (ev.x, ev.y); 1836 iso14755_54 (ev.x, ev.y);
… …
1782#ifdef MOUSE_REPORT_DOUBLECLICK 1848#ifdef MOUSE_REPORT_DOUBLECLICK
1783 if (ev.button == MEvent.button && clickintime) 1849 if (ev.button == MEvent.button && clickintime)
1784 { 1850 {
1785 /* same button, within alloted time */ 1851 /* same button, within alloted time */
1786 MEvent.clicks++; 1852 MEvent.clicks++;
1853
1787 if (MEvent.clicks > 1) 1854 if (MEvent.clicks > 1)
1788 { 1855 {
1789 /* only report double clicks */ 1856 /* only report double clicks */
1790 MEvent.clicks = 2; 1857 MEvent.clicks = 2;
1791 mouse_report (ev); 1858 mouse_report (ev);
… …
1803 mouse_report (ev); 1870 mouse_report (ev);
1804 } 1871 }
1805#else 1872#else
1806 MEvent.button = ev.button; 1873 MEvent.button = ev.button;
1807 mouse_report (ev); 1874 mouse_report (ev);
1808#endif /* MOUSE_REPORT_DOUBLECLICK */ 1875#endif /* MOUSE_REPORT_DOUBLECLICK */
1809 1876
1810 } 1877 }
1811 else 1878 else
1812 { 1879 {
1813 if (ev.button != MEvent.button) 1880 if (ev.button != MEvent.button)
… …
1823#else 1890#else
1824 selection.rect = false; 1891 selection.rect = false;
1825#endif 1892#endif
1826 1893
1827 /* allow shift+left click to extend selection */ 1894 /* allow shift+left click to extend selection */
1828 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1895 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1829 { 1896 {
1830 if (MEvent.button == Button1 && clickintime) 1897 if (MEvent.button == Button1 && clickintime)
1831 selection_rotate (ev.x, ev.y); 1898 selection_rotate (ev.x, ev.y);
1832 else 1899 else
1833 selection_extend (ev.x, ev.y, 1); 1900 selection_extend (ev.x, ev.y, 1);
… …
1861 } 1928 }
1862 1929
1863 /* 1930 /*
1864 * Scrollbar window processing of button press 1931 * Scrollbar window processing of button press
1865 */ 1932 */
1866 if (isScrollbarWindow (ev.window)) 1933 if (scrollBar.state && ev.window == scrollBar.win)
1867 { 1934 {
1868 scrollBar.setIdle (); 1935 page_dirn direction = NO_DIR;
1936
1937 if (scrollBar.upButton (ev.y))
1938 direction = UP; /* up */
1939 else if (scrollBar.dnButton (ev.y))
1940 direction = DN; /* down */
1941
1942 scrollBar.state = STATE_IDLE;
1869 /* 1943 /*
1870 * Rxvt-style scrollbar: 1944 * Rxvt-style scrollbar:
1871 * move up if mouse is above slider 1945 * move up if mouse is above slider
1872 * move dn if mouse is below slider 1946 * move dn if mouse is below slider
1873 * 1947 *
… …
1882 /* 1956 /*
1883 * Mouse report disabled scrollbar: 1957 * Mouse report disabled scrollbar:
1884 * arrow buttons - send up/down 1958 * arrow buttons - send up/down
1885 * click on scrollbar - send pageup/down 1959 * click on scrollbar - send pageup/down
1886 */ 1960 */
1887 if ((scrollBar.style == R_SB_NEXT 1961 if (direction == UP)
1888 && scrollbarnext_upButton (ev.y))
1889 || (scrollBar.style == R_SB_RXVT
1890 && scrollbarrxvt_upButton (ev.y)))
1891 tt_printf ("\033[A"); 1962 tt_printf ("\033[A");
1892 else if ((scrollBar.style == R_SB_NEXT 1963 else if (direction == DN)
1893 && scrollbarnext_dnButton (ev.y))
1894 || (scrollBar.style == R_SB_RXVT
1895 && scrollbarrxvt_dnButton (ev.y)))
1896 tt_printf ("\033[B"); 1964 tt_printf ("\033[B");
1897 else 1965 else
1898 switch (ev.button) 1966 switch (ev.button)
1899 { 1967 {
1900 case Button2: 1968 case Button2:
… …
1907 tt_printf ("\033[5~"); 1975 tt_printf ("\033[5~");
1908 break; 1976 break;
1909 } 1977 }
1910 } 1978 }
1911 else 1979 else
1912#endif /* NO_SCROLLBAR_REPORT */ 1980#endif /* NO_SCROLLBAR_REPORT */
1913
1914 {
1915 char upordown = 0;
1916
1917 if (scrollBar.style == R_SB_NEXT)
1918 { 1981 {
1919 if (scrollbarnext_upButton (ev.y)) 1982 if (direction != NO_DIR)
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)
1932 { 1983 {
1933#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1984#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1985 if (!cont_scroll_ev.is_active ())
1934 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1986 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1935#endif 1987#endif
1936 if (scr_page (upordown < 0 ? UP : DN, 1)) 1988 if (scr_page (direction, 1))
1937 { 1989 {
1938 if (upordown < 0) 1990 if (direction == UP)
1939 scrollBar.setUp (); 1991 scrollBar.state = STATE_UP;
1940 else 1992 else
1941 scrollBar.setDn (); 1993 scrollBar.state = STATE_DOWN;
1942 } 1994 }
1943 } 1995 }
1944 else 1996 else
1945 switch (ev.button) 1997 switch (ev.button)
1946 { 1998 {
1947 case Button2: 1999 case Button2:
1948 switch (scrollbar_align) 2000 switch (scrollBar.align)
1949 { 2001 {
1950 case R_SB_ALIGN_TOP: 2002 case R_SB_ALIGN_TOP:
1951 csrO = 0; 2003 csrO = 0;
1952 break; 2004 break;
1953 case R_SB_ALIGN_CENTRE: 2005 case R_SB_ALIGN_CENTRE:
… …
1961 if (scrollBar.style == R_SB_XTERM 2013 if (scrollBar.style == R_SB_XTERM
1962 || scrollbar_above_slider (ev.y) 2014 || scrollbar_above_slider (ev.y)
1963 || scrollbar_below_slider (ev.y)) 2015 || scrollbar_below_slider (ev.y))
1964 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2016 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1965 2017
1966 scrollBar.setMotion (); 2018 scrollBar.state = STATE_MOTION;
1967 break; 2019 break;
1968 2020
1969 case Button1: 2021 case Button1:
1970 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2022 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1971 csrO = ev.y - scrollBar.top; 2023 csrO = ev.y - scrollBar.top;
1972 /* FALLTHROUGH */ 2024 /* FALLTHROUGH */
1973 2025
1974 case Button3: 2026 case Button3:
1975 if (scrollBar.style != R_SB_XTERM) 2027 if (scrollBar.style != R_SB_XTERM)
… …
1985 scr_page (DN, nrow - 1); 2037 scr_page (DN, nrow - 1);
1986# else 2038# else
1987 scr_page (DN, nrow / 4); 2039 scr_page (DN, nrow / 4);
1988# endif 2040# endif
1989 else 2041 else
1990 scrollBar.setMotion (); 2042 scrollBar.state = STATE_MOTION;
1991 } 2043 }
1992 else 2044 else
1993 { 2045 {
1994 scr_page ((ev.button == Button1 ? DN : UP), 2046 scr_page ((ev.button == Button1 ? DN : UP),
1995 (nrow 2047 (nrow
… …
1998 } 2050 }
1999 2051
2000 break; 2052 break;
2001 } 2053 }
2002 } 2054 }
2055
2003 return; 2056 return;
2004 } 2057 }
2005#if MENUBAR
2006 /*
2007 * Menubar window processing of button press
2008 */
2009 if (isMenuBarWindow (ev.window))
2010 menubar_control (ev);
2011#endif
2012} 2058}
2013 2059
2014void 2060void
2015rxvt_term::button_release (XButtonEvent &ev) 2061rxvt_term::button_release (XButtonEvent &ev)
2016{ 2062{
… …
2018 2064
2019 csrO = 0; /* reset csr Offset */ 2065 csrO = 0; /* reset csr Offset */
2020 if (!bypass_keystate) 2066 if (!bypass_keystate)
2021 reportmode = !! (priv_modes & PrivMode_mouse_report); 2067 reportmode = !! (priv_modes & PrivMode_mouse_report);
2022 2068
2023 if (scrollbar_isUpDn ()) 2069 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2024 { 2070 {
2025 scrollBar.setIdle (); 2071 scrollBar.state = STATE_IDLE;
2026 scrollbar_show (0); 2072 scrollbar_show (0);
2027#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2028 refresh_type &= ~SMOOTH_REFRESH;
2029#endif
2030 } 2073 }
2031 2074
2032#ifdef SELECTION_SCROLLING 2075#ifdef SELECTION_SCROLLING
2033 if (sel_scroll_ev.active)
2034 sel_scroll_ev.stop(); 2076 sel_scroll_ev.stop();
2035#endif 2077#endif
2036 2078
2037 if (ev.window == vt) 2079 if (ev.window == vt)
2038 { 2080 {
2081 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2082 return;
2083
2039#if ISO_14755 2084#if ISO_14755
2040 // 5.4 2085 // 5.4
2041 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2086 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2042 return; 2087 return;
2043#endif 2088#endif
2089
2044 if (reportmode) 2090 if (reportmode)
2045 { 2091 {
2046 /* mouse report from vt window */ 2092 /* mouse report from vt window */
2047 /* don't report release of wheel "buttons" */ 2093 /* don't report release of wheel "buttons" */
2048 if (ev.button >= 4) 2094 if (ev.button >= 4)
… …
2059 mouse_report (ev); 2105 mouse_report (ev);
2060 } 2106 }
2061#else /* MOUSE_REPORT_DOUBLECLICK */ 2107#else /* MOUSE_REPORT_DOUBLECLICK */
2062 MEvent.button = AnyButton; 2108 MEvent.button = AnyButton;
2063 mouse_report (ev); 2109 mouse_report (ev);
2064#endif /* MOUSE_REPORT_DOUBLECLICK */ 2110#endif /* MOUSE_REPORT_DOUBLECLICK */
2065 return; 2111 return;
2066 } 2112 }
2067 2113
2068 /* 2114 /*
2069 * dumb hack to compensate for the failure of click-and-drag 2115 * dumb hack to compensate for the failure of click-and-drag
… …
2078 { 2124 {
2079 case Button1: 2125 case Button1:
2080 case Button3: 2126 case Button3:
2081 selection_make (ev.time); 2127 selection_make (ev.time);
2082 break; 2128 break;
2129
2083 case Button2: 2130 case Button2:
2084 selection_request (ev.time, ev.x, ev.y); 2131 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2132 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2085 break; 2133 break;
2134
2086#ifdef MOUSE_WHEEL 2135#ifdef MOUSE_WHEEL
2087 case Button4: 2136 case Button4:
2088 case Button5: 2137 case Button5:
2089 { 2138 {
2090 int i; 2139 int i;
… …
2092 2141
2093 v = ev.button == Button4 ? UP : DN; 2142 v = ev.button == Button4 ? UP : DN;
2094 2143
2095 if (ev.state & ShiftMask) 2144 if (ev.state & ShiftMask)
2096 i = 1; 2145 i = 1;
2097 else if (options & Opt_mouseWheelScrollPage) 2146 else if (option (Opt_mouseWheelScrollPage))
2098 i = nrow - 1; 2147 i = nrow - 1;
2099 else 2148 else
2100 i = 5; 2149 i = 5;
2101 2150
2102# ifdef MOUSE_SLIP_WHEELING 2151# ifdef MOUSE_SLIP_WHEELING
… …
2104 { 2153 {
2105 mouse_slip_wheel_speed += v ? -1 : 1; 2154 mouse_slip_wheel_speed += v ? -1 : 1;
2106 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2155 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2107 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2156 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2108 2157
2109 if (slip_wheel_ev.at < NOW) 2158 if (!slip_wheel_ev.is_active ())
2110 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2159 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2111
2112 slip_wheel_ev.start ();
2113 } 2160 }
2114 else 2161 else
2162# endif
2115 { 2163 {
2116# endif
2117# ifdef JUMP_MOUSE_WHEEL
2118 scr_page (v, i); 2164 scr_page (v, i);
2119 scr_refresh (SMOOTH_REFRESH);
2120 scrollbar_show (1); 2165 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 } 2166 }
2131#endif
2132 } 2167 }
2133 break; 2168 break;
2134#endif 2169#endif
2135 } 2170 }
2136 } 2171 }
2137#ifdef MENUBAR
2138 else if (isMenuBarWindow (ev.window))
2139 menubar_control (ev);
2140#endif
2141} 2172}
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 2173
2624/*}}} */ 2174/*}}} */
2625 2175
2626bool 2176bool
2627rxvt_term::cmd_parse () 2177rxvt_term::cmd_parse ()
2628{ 2178{
2629 bool flag = false; 2179 bool flag = false;
2630 unicode_t ch = NOCHAR; 2180 wchar_t ch = NOCHAR;
2631 unsigned char *seq_begin; // remember start of esc-sequence here 2181 char *seq_begin; // remember start of esc-sequence here
2632 2182
2633 for (;;) 2183 for (;;)
2634 { 2184 {
2635 if (ch == NOCHAR) 2185 if (ch == NOCHAR)
2636 { 2186 {
2637 seq_begin = cmdbuf_ptr; 2187 seq_begin = cmdbuf_ptr;
2638 ch = next_char (); 2188 ch = next_char ();
2639 }
2640 2189
2641 if (ch == NOCHAR) // TODO: improve 2190 if (ch == NOCHAR)
2642 break; 2191 break;
2192 }
2643 2193
2644 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2194 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2645 { 2195 {
2646 if (!seen_input) 2196 if (!seen_input)
2647 { 2197 {
… …
2656 if (seen_resize && cmd_pid) 2206 if (seen_resize && cmd_pid)
2657 kill (-cmd_pid, SIGWINCH); 2207 kill (-cmd_pid, SIGWINCH);
2658 } 2208 }
2659 2209
2660 /* Read a text string from the input buffer */ 2210 /* Read a text string from the input buffer */
2661 unicode_t buf[UBUFSIZ]; 2211 wchar_t buf[UBUFSIZ];
2662 bool refreshnow = false; 2212 bool refreshnow = false;
2663 int nlines = 0; 2213 int nlines = 0;
2664 unicode_t *str = buf; 2214 wchar_t *str = buf;
2665 unicode_t *eol = str + min (ncol, UBUFSIZ); 2215 wchar_t *eol = str + min (ncol, UBUFSIZ);
2666 2216
2667 for (;;) 2217 for (;;)
2668 { 2218 {
2669 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2219 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2670 break; 2220 break;
… …
2676 if (ch == C0_LF) 2226 if (ch == C0_LF)
2677 nlines++; 2227 nlines++;
2678 2228
2679 refresh_count++; 2229 refresh_count++;
2680 2230
2681 if (!(options & Opt_jumpScroll) 2231 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2682 || (refresh_count >= refresh_limit * (nrow - 1)))
2683 { 2232 {
2233 refresh_count = 0;
2234
2235 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2236 {
2684 refreshnow = true; 2237 refreshnow = true;
2685 ch = NOCHAR; 2238 ch = NOCHAR;
2686 break; 2239 break;
2240 }
2687 } 2241 }
2688 2242
2689 // scr_add_lines only works for nlines <= nrow - 1. 2243 // scr_add_lines only works for nlines <= nrow - 1.
2690 if (nlines >= nrow - 1) 2244 if (nlines >= nrow - 1)
2691 { 2245 {
2246 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2247 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2692 scr_add_lines (buf, nlines, str - buf); 2248 scr_add_lines (buf, str - buf, nlines);
2249
2693 nlines = 0; 2250 nlines = 0;
2694 str = buf; 2251 str = buf;
2695 eol = str + min (ncol, UBUFSIZ); 2252 eol = str + min (ncol, UBUFSIZ);
2696 } 2253 }
2697 2254
… …
2710 2267
2711 seq_begin = cmdbuf_ptr; 2268 seq_begin = cmdbuf_ptr;
2712 ch = next_char (); 2269 ch = next_char ();
2713 } 2270 }
2714 2271
2272 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2273 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2715 scr_add_lines (buf, nlines, str - buf); 2274 scr_add_lines (buf, str - buf, nlines);
2716 2275
2717 /* 2276 /*
2718 * If there have been a lot of new lines, then update the screen 2277 * 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. 2278 * 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 2279 * if skipScroll is enabled.
2721 * is incremented here because we must be doing flat-out scrolling.
2722 */ 2280 */
2723 if (refreshnow) 2281 if (refreshnow)
2724 { 2282 {
2725 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2726 refresh_limit++;
2727 else
2728 {
2729 flag = true; 2283 flag = true;
2730 scr_refresh (refresh_type); 2284 scr_refresh ();
2731 } 2285 want_refresh = 1;
2732 } 2286 }
2733 2287
2734 } 2288 }
2735 else 2289 else
2736 { 2290 {
… …
2750 } 2304 }
2751 2305
2752 return flag; 2306 return flag;
2753} 2307}
2754 2308
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 2309// read the next character
2765unicode_t 2310wchar_t
2766rxvt_term::next_char () 2311rxvt_term::next_char () NOTHROW
2767{ 2312{
2768 while (cmdbuf_ptr < cmdbuf_endp) 2313 while (cmdbuf_ptr < cmdbuf_endp)
2769 { 2314 {
2770 // assume 7-bit to be ascii ALWAYS 2315 // assume 7-bit to be ascii ALWAYS
2771 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2316 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2772 return *cmdbuf_ptr++; 2317 return *cmdbuf_ptr++;
2773 2318
2774 wchar_t wc; 2319 wchar_t wc;
2775 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2320 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2776 2321
2777 if (len == (size_t)-2) 2322 if (len == (size_t)-2)
2778 { 2323 {
2779 // the mbstate stores incomplete sequences. didn't know this :/ 2324 // the mbstate stores incomplete sequences. didn't know this :/
2780 cmdbuf_ptr = cmdbuf_endp; 2325 cmdbuf_ptr = cmdbuf_endp;
2781 break; 2326 break;
2782 } 2327 }
2783 2328
2784 if (len == (size_t)-1) 2329 if (len == (size_t)-1)
2785 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2330 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2786 2331
2787 // assume wchar == unicode 2332 // assume wchar == unicode
2788 cmdbuf_ptr += len; 2333 cmdbuf_ptr += len;
2789 return wc & UNICODE_MASK; 2334 return wc & UNICODE_MASK;
2790 } 2335 }
2791 2336
2792 return NOCHAR; 2337 return NOCHAR;
2793} 2338}
2339
2340// read the next octet
2341uint32_t
2342rxvt_term::next_octet () NOTHROW
2343{
2344 return cmdbuf_ptr < cmdbuf_endp
2345 ? (unsigned char)*cmdbuf_ptr++
2346 : NOCHAR;
2347}
2348
2349static class out_of_input out_of_input;
2794 2350
2795/* rxvt_cmd_getc () - Return next input character */ 2351/* rxvt_cmd_getc () - Return next input character */
2796/* 2352/*
2797 * Return the next input character after first passing any keyboard input 2353 * Return the next input character after first passing any keyboard input
2798 * to the command. 2354 * to the command.
2799 */ 2355 */
2800unicode_t 2356wchar_t
2801rxvt_term::cmd_getc () 2357rxvt_term::cmd_getc () THROW ((class out_of_input))
2802{ 2358{
2803 unicode_t c = next_char (); 2359 wchar_t c = next_char ();
2804 2360
2805 if (c == NOCHAR) 2361 if (c == NOCHAR)
2806 throw out_of_input; 2362 throw out_of_input;
2807 2363
2808 return c; 2364 return c;
2809} 2365}
2810 2366
2811unicode_t 2367uint32_t
2812rxvt_term::cmd_get8 () 2368rxvt_term::cmd_get8 () THROW ((class out_of_input))
2813{ 2369{
2814 unicode_t c = next_octet (); 2370 uint32_t c = next_octet ();
2815 2371
2816 if (c == NOCHAR) 2372 if (c == NOCHAR)
2817 throw out_of_input; 2373 throw out_of_input;
2818 2374
2819 return c; 2375 return c;
… …
2883 { 2439 {
2884 if ((buf[len++] = cmd_getc ()) == 'i') 2440 if ((buf[len++] = cmd_getc ()) == 'i')
2885 break; /* done = 1 */ 2441 break; /* done = 1 */
2886 } 2442 }
2887 } 2443 }
2888 2444
2889 for (i = 0; i < len; i++) 2445 for (i = 0; i < len; i++)
2890 if (putc (buf[i], fd) == EOF) 2446 if (putc (buf[i], fd) == EOF)
2891 { 2447 {
2892 done = 1; 2448 done = 1;
2893 break; 2449 break;
… …
2895 } 2451 }
2896 } 2452 }
2897 2453
2898 pclose_printer (fd); 2454 pclose_printer (fd);
2899} 2455}
2900#endif /* PRINTPIPE */ 2456#endif /* PRINTPIPE */
2901/*}}} */ 2457/*}}} */
2902 2458
2903/* *INDENT-OFF* */ 2459/* *INDENT-OFF* */
2904enum { 2460enum {
2905 C1_40 = 0x40, 2461 C1_40 = 0x40,
… …
2919 case C0_ESC: 2475 case C0_ESC:
2920 process_escape_seq (); 2476 process_escape_seq ();
2921 break; 2477 break;
2922 case C0_ENQ: /* terminal Status */ 2478 case C0_ENQ: /* terminal Status */
2923 if (rs[Rs_answerbackstring]) 2479 if (rs[Rs_answerbackstring])
2924 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2480 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2925 (unsigned int)strlen (rs[Rs_answerbackstring]));
2926 else 2481 else
2927 tt_write ((unsigned char *)VT100_ANS, 2482 tt_write (VT100_ANS, strlen (VT100_ANS));
2928 (unsigned int)strlen (VT100_ANS));
2929 break; 2483 break;
2930 case C0_BEL: /* bell */ 2484 case C0_BEL: /* bell */
2931 scr_bell (); 2485 scr_bell ();
2932 break; 2486 break;
2933 case C0_BS: /* backspace */ 2487 case C0_BS: /* backspace */
… …
2957 process_dcs_seq (); 2511 process_dcs_seq ();
2958 break; 2512 break;
2959 case 0x9b: /* CSI */ 2513 case 0x9b: /* CSI */
2960 process_csi_seq (); 2514 process_csi_seq ();
2961 break; 2515 break;
2962 case 0x9d: /* CSI */ 2516 case 0x9d: /* OSC */
2963 process_osc_seq (); 2517 process_osc_seq ();
2964 break; 2518 break;
2965#endif 2519#endif
2966 } 2520 }
2967} 2521}
… …
3057 scr_charset_set (2, (unsigned int)cmd_getc ()); 2611 scr_charset_set (2, (unsigned int)cmd_getc ());
3058 break; 2612 break;
3059 case '+': 2613 case '+':
3060 scr_charset_set (3, (unsigned int)cmd_getc ()); 2614 scr_charset_set (3, (unsigned int)cmd_getc ());
3061 break; 2615 break;
3062#if ENABLE_FRILLS 2616#if !ENABLE_MINIMAL
3063 case '6': 2617 case '6':
3064 scr_backindex (); 2618 scr_backindex ();
3065 break; 2619 break;
3066#endif 2620#endif
3067 case '7': 2621 case '7':
3068 scr_cursor (SAVE); 2622 scr_cursor (SAVE);
3069 break; 2623 break;
3070 case '8': 2624 case '8':
3071 scr_cursor (RESTORE); 2625 scr_cursor (RESTORE);
3072 break; 2626 break;
3073#if ENABLE_FRILLS 2627#if !ENABLE_MINIMAL
3074 case '9': 2628 case '9':
3075 scr_forwardindex (); 2629 scr_forwardindex ();
3076 break; 2630 break;
3077#endif 2631#endif
3078 case '=': 2632 case '=':
… …
3088 break; 2642 break;
3089 2643
3090 /* 8.3.87: NEXT LINE */ 2644 /* 8.3.87: NEXT LINE */
3091 case C1_NEL: /* ESC E */ 2645 case C1_NEL: /* ESC E */
3092 { 2646 {
3093 unicode_t nlcr[] = { C0_LF, C0_CR }; 2647 wchar_t nlcr[] = { C0_LF, C0_CR };
3094 scr_add_lines (nlcr, 1, 2); 2648 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3095 } 2649 }
3096 break; 2650 break;
3097 2651
3098 /* kidnapped escape sequence: Should be 8.3.48 */ 2652 /* kidnapped escape sequence: Should be 8.3.48 */
3099 case C1_ESA: /* ESC G */ 2653 case C1_ESA: /* ESC G */
… …
3121 process_dcs_seq (); 2675 process_dcs_seq ();
3122 break; 2676 break;
3123 2677
3124 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2678 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3125 case C1_SCI: /* ESC Z */ 2679 case C1_SCI: /* ESC Z */
3126 tt_write ((const unsigned char *)ESCZ_ANSWER, 2680 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3127 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3128 break; /* steal obsolete ESC [ c */ 2681 break; /* steal obsolete ESC [ c */
3129 2682
3130 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2683 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3131 case C1_CSI: /* ESC [ */ 2684 case C1_CSI: /* ESC [ */
3132 process_csi_seq (); 2685 process_csi_seq ();
… …
3194rxvt_term::process_csi_seq () 2747rxvt_term::process_csi_seq ()
3195{ 2748{
3196 unicode_t ch, priv, i; 2749 unicode_t ch, priv, i;
3197 unsigned int nargs, p; 2750 unsigned int nargs, p;
3198 int n, ndef; 2751 int n, ndef;
3199 int arg[ESC_ARGS]; 2752 int arg[ESC_ARGS] = { };
3200 2753
3201 for (nargs = ESC_ARGS; nargs > 0;) 2754 nargs = 0;
3202 arg[--nargs] = 0;
3203 2755
3204 priv = 0; 2756 priv = 0;
3205 ch = cmd_getc (); 2757 ch = cmd_getc ();
3206 if (ch >= '<' && ch <= '?') 2758 if (ch >= '<' && ch <= '?')
2759 {
3207 { /* '<' '=' '>' '?' */ 2760 /* '<' '=' '>' '?' */
3208 priv = ch; 2761 priv = ch;
3209 ch = cmd_getc (); 2762 ch = cmd_getc ();
3210 } 2763 }
3211 2764
3212 /* read any numerical arguments */ 2765 /* read any numerical arguments */
… …
3241 ndef = get_byte_array_bit (csi_defaults, i); 2794 ndef = get_byte_array_bit (csi_defaults, i);
3242 for (p = 0; p < nargs; p++) 2795 for (p = 0; p < nargs; p++)
3243 if (arg[p] == -1) 2796 if (arg[p] == -1)
3244 arg[p] = ndef; 2797 arg[p] = ndef;
3245 2798
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 /* 2799 /*
3254 * private mode handling 2800 * private mode handling
3255 */ 2801 */
3256 if (priv) 2802 if (priv)
3257 { 2803 {
3258 switch (priv) 2804 switch (priv)
3259 { 2805 {
3260 case '>': 2806 case '>':
3261 if (ch == CSI_DA) /* secondary device attributes */ 2807 if (ch == CSI_DA) /* secondary device attributes */
3262 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2808 {
2809 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2810 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2811 //
2812 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2813 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2814 // versions.
2815 //
2816 tt_printf ("\033[>%d;95;0c", 'U');
2817 }
3263 break; 2818 break;
2819
3264 case '?': 2820 case '?':
3265 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2821 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3266 process_terminal_mode (ch, priv, nargs, arg); 2822 process_terminal_mode (ch, priv, nargs, arg);
3267 break; 2823 break;
3268 } 2824 }
… …
3376 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2932 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3377 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 2933 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3378 break; 2934 break;
3379 2935
3380 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2936 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3381 tt_write ((const unsigned char *)VT100_ANS, 2937 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3382 (unsigned int) (sizeof (VT100_ANS) - 1));
3383 break; 2938 break;
3384 2939
3385 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2940 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3386 process_sgr_mode (nargs, arg); 2941 process_sgr_mode (nargs, arg);
3387 break; 2942 break;
… …
3394 break; 2949 break;
3395 case 6: /* CPR requested */ 2950 case 6: /* CPR requested */
3396 scr_report_position (); 2951 scr_report_position ();
3397 break; 2952 break;
3398 case 7: /* unofficial extension */ 2953 case 7: /* unofficial extension */
3399 if (options & Opt_insecure) 2954 if (option (Opt_insecure))
3400 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2955 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3401 break; 2956 break;
3402 case 8: /* unofficial extension */ 2957 case 8: /* unofficial extension */
3403 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2958 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3404 break; 2959 break;
… …
3471 break; 3026 break;
3472 case CSI_75: 3027 case CSI_75:
3473 scr_cursor (RESTORE); 3028 scr_cursor (RESTORE);
3474 break; 3029 break;
3475 3030
3476#if ENABLE_FRILLS 3031#if !ENABLE_MINIMAL
3477 case CSI_74: 3032 case CSI_74:
3478 process_window_ops (arg, nargs); 3033 process_window_ops (arg, nargs);
3479 break; 3034 break;
3480#endif 3035#endif
3481 3036
… …
3488 break; 3043 break;
3489 } 3044 }
3490} 3045}
3491/*}}} */ 3046/*}}} */
3492 3047
3493#if ENABLE_FRILLS 3048#if !ENABLE_MINIMAL
3494/* ARGSUSED */ 3049/* ARGSUSED */
3495void 3050void
3496rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3051rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3497{ 3052{
3498 int x, y; 3053 int x, y;
3499 XWindowAttributes wattr; 3054 XWindowAttributes wattr;
3500 Window wdummy; 3055 Window wdummy;
3501 dDisp; 3056
3057 dLocal (Display *, dpy);
3502 3058
3503 if (nargs == 0) 3059 if (nargs == 0)
3504 return; 3060 return;
3505 3061
3506 switch (args[0]) 3062 switch (args[0])
3507 { 3063 {
3508 /* 3064 /*
3509 * commands 3065 * commands
3510 */ 3066 */
3511 case 1: /* deiconify window */ 3067 case 1: /* deiconify window */
3512 XMapWindow (disp, parent[0]); 3068 XMapWindow (dpy, parent[0]);
3513 break; 3069 break;
3514 case 2: /* iconify window */ 3070 case 2: /* iconify window */
3515 XIconifyWindow (disp, parent[0], display->screen); 3071 XIconifyWindow (dpy, parent[0], display->screen);
3516 break; 3072 break;
3517 case 3: /* set position (pixels) */ 3073 case 3: /* set position (pixels) */
3518 XMoveWindow (disp, parent[0], args[1], args[2]); 3074 XMoveWindow (dpy, parent[0], args[1], args[2]);
3519 break; 3075 break;
3520 case 4: /* set size (pixels) */ 3076 case 4: /* set size (pixels) */
3521 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3077 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3522 break; 3078 break;
3523 case 5: /* raise window */ 3079 case 5: /* raise window */
3524 XRaiseWindow (disp, parent[0]); 3080 XRaiseWindow (dpy, parent[0]);
3525 break; 3081 break;
3526 case 6: /* lower window */ 3082 case 6: /* lower window */
3527 XLowerWindow (disp, parent[0]); 3083 XLowerWindow (dpy, parent[0]);
3528 break; 3084 break;
3529 case 7: /* refresh window */ 3085 case 7: /* refresh window */
3530 scr_touch (true); 3086 scr_touch (true);
3531 break; 3087 break;
3532 case 8: /* set size (chars) */ 3088 case 8: /* set size (chars) */
… …
3539 if (args[0] >= 24) /* set height (chars) */ 3095 if (args[0] >= 24) /* set height (chars) */
3540 set_widthheight ((unsigned int)width, 3096 set_widthheight ((unsigned int)width,
3541 (unsigned int) (args[1] * fheight)); 3097 (unsigned int) (args[1] * fheight));
3542 break; 3098 break;
3543 3099
3544
3545 /* 3100 /*
3546 * reports - some output format copied from XTerm 3101 * reports - some output format copied from XTerm
3547 */ 3102 */
3548 case 11: /* report window state */ 3103 case 11: /* report window state */
3549 XGetWindowAttributes (disp, parent[0], &wattr); 3104 XGetWindowAttributes (dpy, parent[0], &wattr);
3550 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3105 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3551 break; 3106 break;
3552 case 13: /* report window position */ 3107 case 13: /* report window position */
3553 XGetWindowAttributes (disp, parent[0], &wattr); 3108 XGetWindowAttributes (dpy, parent[0], &wattr);
3554 XTranslateCoordinates (disp, parent[0], wattr.root, 3109 XTranslateCoordinates (dpy, parent[0], wattr.root,
3555 -wattr.border_width, -wattr.border_width, 3110 -wattr.border_width, -wattr.border_width,
3556 &x, &y, &wdummy); 3111 &x, &y, &wdummy);
3557 tt_printf ("\033[3;%d;%dt", x, y); 3112 tt_printf ("\033[3;%d;%dt", x, y);
3558 break; 3113 break;
3559 case 14: /* report window size (pixels) */ 3114 case 14: /* report window size (pixels) */
3560 XGetWindowAttributes (disp, parent[0], &wattr); 3115 XGetWindowAttributes (dpy, parent[0], &wattr);
3561 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3116 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3562 break; 3117 break;
3563 case 18: /* report text area size (chars) */ 3118 case 18: /* report text area size (chars) */
3564 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3119 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3565 break; 3120 break;
… …
3567 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3122 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3568 break; 3123 break;
3569 case 20: /* report icon label */ 3124 case 20: /* report icon label */
3570 { 3125 {
3571 char *s; 3126 char *s;
3572 XGetIconName (disp, parent[0], &s); 3127 XGetIconName (dpy, parent[0], &s);
3573 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3128 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3574 XFree (s); 3129 XFree (s);
3575 } 3130 }
3576 break; 3131 break;
3577 case 21: /* report window title */ 3132 case 21: /* report window title */
3578 { 3133 {
3579 char *s; 3134 char *s;
3580 XFetchName (disp, parent[0], &s); 3135 XFetchName (dpy, parent[0], &s);
3581 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3136 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3582 XFree (s); 3137 XFree (s);
3583 } 3138 }
3584 break; 3139 break;
3585 } 3140 }
3586} 3141}
… …
3589/*----------------------------------------------------------------------*/ 3144/*----------------------------------------------------------------------*/
3590/* 3145/*
3591 * get input up until STRING TERMINATOR (or BEL) 3146 * get input up until STRING TERMINATOR (or BEL)
3592 * ends_how is terminator used. returned input must be free()'d 3147 * ends_how is terminator used. returned input must be free()'d
3593 */ 3148 */
3594unsigned char * 3149char *
3595rxvt_term::get_to_st (unicode_t &ends_how) 3150rxvt_term::get_to_st (unicode_t &ends_how)
3596{ 3151{
3597 unicode_t ch; 3152 unicode_t ch;
3598 bool seen_esc = false; 3153 bool seen_esc = false;
3599 unsigned int n = 0; 3154 unsigned int n = 0;
… …
3613 seen_esc = true; 3168 seen_esc = true;
3614 continue; 3169 continue;
3615 } 3170 }
3616 else if (ch == C0_BEL || ch == CHAR_ST) 3171 else if (ch == C0_BEL || ch == CHAR_ST)
3617 break; 3172 break;
3173 else if (ch == C0_SYN)
3174 ch = cmd_get8 ();
3618 else if (ch < 0x20) 3175 else if (ch < 0x20)
3619 return NULL; /* other control character - exit */ 3176 return NULL; /* other control character - exit */
3620 3177
3621 seen_esc = false; 3178 seen_esc = false;
3622 3179
3623 if (n >= STRING_MAX - 1) 3180 if (n >= STRING_MAX - 1)
3624 // stop at some sane length 3181 // stop at some sane length
3625 return NULL; 3182 return NULL;
3626 3183
3627 if (ch == C0_SYN)
3628 string[n++] = cmd_get8 ();
3629 else
3630 string[n++] = ch; 3184 string[n++] = ch;
3631 } 3185 }
3632 3186
3633 string[n++] = '\0'; 3187 string[n++] = '\0';
3634 3188
3635 ends_how = (ch == 0x5c ? C0_ESC : ch); 3189 ends_how = (ch == 0x5c ? C0_ESC : ch);
3636 3190
3637 return (unsigned char *)rxvt_wcstombs (string); 3191 return rxvt_wcstombs (string);
3638} 3192}
3639 3193
3640/*----------------------------------------------------------------------*/ 3194/*----------------------------------------------------------------------*/
3641/* 3195/*
3642 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3196 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3643 */ 3197 */
3644void 3198void
3645rxvt_term::process_dcs_seq () 3199rxvt_term::process_dcs_seq ()
3646{ 3200{
3647 unsigned char *s; 3201 char *s;
3648 unicode_t eh; 3202 unicode_t eh;
3649 3203
3650 /* 3204 /*
3651 * Not handled yet 3205 * Not handled yet
3652 */ 3206 */
… …
3671 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3225 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3672 arg = arg * 10 + (ch - '0'); 3226 arg = arg * 10 + (ch - '0');
3673 3227
3674 if (ch == ';') 3228 if (ch == ';')
3675 { 3229 {
3676 unsigned char *s = get_to_st (eh); 3230 char *s = get_to_st (eh);
3677 3231
3678 if (s) 3232 if (s)
3679 { 3233 {
3680 process_xterm_seq (arg, (char *)s, eh); 3234 process_xterm_seq (arg, s, eh);
3681 free (s); 3235 free (s);
3682 } 3236 }
3683 } 3237 }
3684} 3238}
3685 3239
3686void 3240void
3687rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3241rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3688{ 3242{
3689 if (str[0] == '?' && !str[1]) 3243 if (str[0] == '?' && !str[1])
3690 { 3244 {
3691 unsigned short r, g, b; 3245 rgba c;
3692 pix_colors_focused[color].get (display, r, g, b); 3246 pix_colors_focused[color].get (c);
3247
3248#if XFT
3249 if (c.a != rgba::MAX_CC)
3250 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3251 else
3252#endif
3693 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3253 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3694 } 3254 }
3695 else 3255 else
3696 set_window_color (color, str); 3256 set_window_color (color, str);
3697} 3257}
3698 3258
3699/* 3259/*
3700 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3260 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3701 */ 3261 */
3702void 3262void
3703rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3263rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3704{ 3264{
3705 int changed = 0;
3706 int color; 3265 int color;
3707 char *buf, *name; 3266 char *buf, *name;
3708 bool query = str[0] == '?' && !str[1]; 3267 bool query = str[0] == '?' && !str[1];
3709 int saveop = op; 3268 int saveop = op;
3710 dDisp; 3269
3270 dLocal (Display *, dpy);
3711 3271
3712 assert (str != NULL); 3272 assert (str != NULL);
3273
3274 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3275 return;
3276
3713 switch (op) 3277 switch (op)
3714 { 3278 {
3715 case XTerm_name: 3279 case XTerm_name:
3716 set_title (str); 3280 set_title (str);
3717 /* FALLTHROUGH */ 3281 /* FALLTHROUGH */
… …
3731 unsigned long bytes_after; 3295 unsigned long bytes_after;
3732 unsigned char *value = 0; 3296 unsigned char *value = 0;
3733 const char *str = ""; 3297 const char *str = "";
3734 3298
3735 if (prop 3299 if (prop
3736 && XGetWindowProperty (disp, parent[0], 3300 && XGetWindowProperty (dpy, parent[0],
3737 prop, 0, 1<<16, 0, AnyPropertyType, 3301 prop, 0, 1<<16, 0, AnyPropertyType,
3738 &actual_type, &actual_format, 3302 &actual_type, &actual_format,
3739 &nitems, &bytes_after, &value) == Success 3303 &nitems, &bytes_after, &value) == Success
3740 && actual_type != None 3304 && actual_type != None
3741 && actual_format == 8) 3305 && actual_format == 8)
3742 str = (const char *)(value); 3306 str = (const char *)(value);
3743 3307
3744 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3308 tt_printf ("\033]%d;%s%c", op, str, resp);
3745 3309
3746 XFree (value); 3310 XFree (value);
3747 } 3311 }
3748 else 3312 else
3749 { 3313 {
… …
3753 { 3317 {
3754 *eq = 0; 3318 *eq = 0;
3755 set_utf8_property (display->atom (str), eq + 1); 3319 set_utf8_property (display->atom (str), eq + 1);
3756 } 3320 }
3757 else 3321 else
3758 XDeleteProperty (disp, parent[0], 3322 XDeleteProperty (dpy, parent[0],
3759 display->atom (str)); 3323 display->atom (str));
3760 } 3324 }
3761 break; 3325 break;
3762 3326
3763 case XTerm_Color: 3327 case XTerm_Color:
… …
3765 { 3329 {
3766 if ((name = strchr (buf, ';')) == NULL) 3330 if ((name = strchr (buf, ';')) == NULL)
3767 break; 3331 break;
3768 3332
3769 *name++ = '\0'; 3333 *name++ = '\0';
3770 color = atoi (buf); 3334 color = atoi (buf) + minCOLOR;
3771 3335
3772 if (color < 0 || color >= TOTAL_COLORS) 3336 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3773 break; 3337 break;
3774 3338
3775 if ((buf = strchr (name, ';')) != NULL) 3339 if ((buf = strchr (name, ';')) != NULL)
3776 *buf++ = '\0'; 3340 *buf++ = '\0';
3777 3341
3778 if (name[0] == '?' && !name[1]) 3342 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 } 3343 }
3787 break; 3344 break;
3345 case Rxvt_restoreFG:
3788 case XTerm_Color00: 3346 case XTerm_Color00:
3789 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3347 process_color_seq (op, Color_fg, str, resp);
3790 break; 3348 break;
3349 case Rxvt_restoreBG:
3791 case XTerm_Color01: 3350 case XTerm_Color01:
3792 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3351 process_color_seq (op, Color_bg, str, resp);
3793 break; 3352 break;
3794#ifndef NO_CURSORCOLOR 3353#ifndef NO_CURSORCOLOR
3795 case XTerm_Color_cursor: 3354 case XTerm_Color_cursor:
3796 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3355 process_color_seq (op, Color_cursor, str, resp);
3797 break; 3356 break;
3798#endif 3357#endif
3799 case XTerm_Color_pointer_fg: 3358 case XTerm_Color_pointer_fg:
3800 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3359 process_color_seq (op, Color_pointer_fg, str, resp);
3801 break; 3360 break;
3802 case XTerm_Color_pointer_bg: 3361 case XTerm_Color_pointer_bg:
3803 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3362 process_color_seq (op, Color_pointer_bg, str, resp);
3804 break; 3363 break;
3805#ifndef NO_BOLD_UNDERLINE_REVERSE 3364#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: 3365 case XTerm_Color_RV:
3813 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3366 process_color_seq (op, Color_RV, str, resp);
3367 break;
3368 case Rxvt_Color_BD:
3369 case URxvt_Color_BD:
3370 process_color_seq (op, Color_BD, str, resp);
3371 break;
3372 case Rxvt_Color_UL:
3373 case URxvt_Color_UL:
3374 process_color_seq (op, Color_UL, str, resp);
3814 break; 3375 break;
3815 case URxvt_Color_IT: 3376 case URxvt_Color_IT:
3816 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3377 process_color_seq (op, Color_IT, str, resp);
3817 break; 3378 break;
3818#endif 3379#endif
3819#if TRANSPARENT && TINTING 3380#if ENABLE_TRANSPARENCY
3820 case URxvt_Color_tint: 3381 case URxvt_Color_tint:
3821 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3382 process_color_seq (op, Color_tint, str, resp);
3822 check_our_parents (); 3383 {
3823 if (am_transparent) 3384 bool changed = false;
3824 want_full_refresh = want_refresh = 1;
3825 break;
3826#endif
3827 3385
3386 if (ISSET_PIXCOLOR (Color_tint))
3387 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3388 else
3389 changed = bgPixmap.unset_tint ();
3390
3391 if (changed)
3392 update_background ();
3393 }
3394
3395 break;
3396#endif
3397
3398#if BG_IMAGE_FROM_FILE
3828 case XTerm_Pixmap: 3399 case Rxvt_Pixmap:
3829 if (*str != ';') 3400 if (!strcmp (str, "?"))
3830 { 3401 {
3831#if XPM_BACKGROUND 3402 char str[256];
3832 scale_pixmap (""); /* reset to default scaling */ 3403
3833 set_bgPixmap (str); /* change pixmap */ 3404 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3834#endif 3405 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3835 scr_touch (true); 3406 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3407 process_xterm_seq (XTerm_title, str, CHAR_ST);
3836 } 3408 }
3837 while ((str = strchr (str, ';')) != NULL) 3409 else
3838 { 3410 {
3411 int changed = 0;
3412
3413 if (*str != ';')
3414 {
3415 /* reset to default scaling :*/
3416 bgPixmap.unset_geometry ();
3417 if (bgPixmap.set_file (str)) /* change pixmap */
3418 changed++;
3419 str = strchr (str, ';');
3420 if (str == NULL)
3421 bgPixmap.set_defaultGeometry ();
3422 }
3423
3424 while (str)
3425 {
3839 str++; 3426 str++;
3840#if XPM_BACKGROUND 3427 if (bgPixmap.set_geometry (str))
3841 changed += scale_pixmap (str); 3428 changed++;
3842#endif 3429 str = strchr (str, ';');
3430 }
3431
3432 if (changed)
3433 update_background ();
3843 } 3434 }
3844
3845 if (changed)
3846 {
3847#ifdef XPM_BACKGROUND
3848 resize_pixmap ();
3849#endif
3850 scr_touch (true);
3851 }
3852 break; 3435 break;
3853 3436#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 3437
3861 case XTerm_logfile: 3438 case XTerm_logfile:
3862 // TODO, when secure mode? 3439 // TODO, when secure mode?
3863 break; 3440 break;
3864 3441
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 3442#if 0
3872 case XTerm_dumpscreen: /* no error notices */ 3443 case Rxvt_dumpscreen: /* no error notices */
3873 { 3444 {
3874 int fd; 3445 int fd;
3875 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3446 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3876 { 3447 {
3877 scr_dump (fd); 3448 scr_dump (fd);
… …
3888 case URxvt_italicFont: 3459 case URxvt_italicFont:
3889 case URxvt_boldItalicFont: 3460 case URxvt_boldItalicFont:
3890#endif 3461#endif
3891 if (query) 3462 if (query)
3892 tt_printf ("\33]%d;%-.250s%c", saveop, 3463 tt_printf ("\33]%d;%-.250s%c", saveop,
3893 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3464 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3894 ? fontset[op - URxvt_font]->fontdesc : "", 3465 ? fontset[op - URxvt_font]->fontdesc : "",
3895 resp); 3466 resp);
3896 else 3467 else
3897 { 3468 {
3898 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3469 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3901 allocated.push_back ((void *)res); 3472 allocated.push_back ((void *)res);
3902 set_fonts (); 3473 set_fonts ();
3903 } 3474 }
3904 break; 3475 break;
3905 3476
3906#if ENABLE_FRILLS 3477 case URxvt_version:
3478 if (query)
3479 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3480 op,
3481 rs[Rs_name], VERSION[0], VERSION[2],
3482 resp);
3483 break;
3484
3485#if !ENABLE_MINIMAL
3907 case URxvt_locale: 3486 case URxvt_locale:
3908 if (query) 3487 if (query)
3909 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3488 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3910 else 3489 else
3911 { 3490 {
3912 set_locale (str); 3491 set_locale (str);
3913 pty.set_utf8_mode (enc_utf8); 3492 pty->set_utf8_mode (enc_utf8);
3914 init_xlocale (); 3493 init_xlocale ();
3915 } 3494 }
3916 break; 3495 break;
3917 3496
3918 case URxvt_view_up: 3497 case URxvt_view_up:
3919 case URxvt_view_down: 3498 case URxvt_view_down:
3499 {
3920 int lines = atoi (str); 3500 int lines = atoi (str);
3921 3501
3922 if (lines) 3502 if (lines)
3923 scr_page (op == URxvt_view_up ? UP : DN, lines); 3503 scr_page (op == URxvt_view_up ? UP : DN, lines);
3924 else 3504 else
3925 {
3926 scr_erase_savelines (); 3505 scr_erase_savelines ();
3927 } 3506 }
3928 3507
3508 break;
3509#endif
3510
3511#if ENABLE_PERL
3512 case URxvt_perl:
3513 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3514 ; // no responses yet
3929 break; 3515 break;
3930#endif 3516#endif
3931 } 3517 }
3932} 3518}
3933/*----------------------------------------------------------------------*/ 3519/*----------------------------------------------------------------------*/
… …
3964 return state; 3550 return state;
3965} 3551}
3966 3552
3967/* we're not using priv _yet_ */ 3553/* we're not using priv _yet_ */
3968void 3554void
3969rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3555rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3970{ 3556{
3971 unsigned int i, j; 3557 unsigned int i, j;
3972 int state; 3558 int state;
3973 3559
3974 static const struct 3560 static const struct
3975 { 3561 {
3976 const int argval; 3562 const int argval;
3977 const unsigned long bit; 3563 const unsigned long bit;
3978 }
3979
3980 argtopriv[] = { 3564 } argtopriv[] = {
3981 { 1, PrivMode_aplCUR }, 3565 { 1, PrivMode_aplCUR },
3982 { 2, PrivMode_vt52 }, 3566 { 2, PrivMode_vt52 },
3983 { 3, PrivMode_132 }, 3567 { 3, PrivMode_132 },
3984 { 4, PrivMode_smoothScroll }, 3568 { 4, PrivMode_smoothScroll },
3985 { 5, PrivMode_rVideo }, 3569 { 5, PrivMode_rVideo },
3986 { 6, PrivMode_relOrigin }, 3570 { 6, PrivMode_relOrigin },
3987 { 7, PrivMode_Autowrap }, 3571 { 7, PrivMode_Autowrap },
3988 // 8, bi-directional support mode 3572 // 8, bi-directional support mode
3989 { 9, PrivMode_MouseX10 }, 3573 { 9, PrivMode_MouseX10 },
3990#ifdef menuBar_esc
3991 { menuBar_esc, PrivMode_menuBar },
3992#endif
3993 // 18, 19 printing-related 3574 // 18, 19 printing-related
3994 { 25, PrivMode_VisibleCursor }, 3575 { 25, PrivMode_VisibleCursor },
3995#ifdef scrollBar_esc 3576#ifdef scrollBar_esc
3996 { scrollBar_esc, PrivMode_scrollBar }, 3577 { scrollBar_esc, PrivMode_scrollBar },
3997#endif 3578#endif
… …
4004 { 66, PrivMode_aplKP }, 3585 { 66, PrivMode_aplKP },
4005#ifndef NO_BACKSPACE_KEY 3586#ifndef NO_BACKSPACE_KEY
4006 { 67, PrivMode_BackSpace }, 3587 { 67, PrivMode_BackSpace },
4007#endif 3588#endif
4008 { 1000, PrivMode_MouseX11 }, 3589 { 1000, PrivMode_MouseX11 },
4009 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3590 { 1002, PrivMode_MouseBtnEvent },
4010 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3591 { 1003, PrivMode_MouseAnyEvent },
4011 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4012 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4013 { 1011, PrivMode_Keypress }, // rxvt extension 3593 { 1011, PrivMode_Keypress }, // rxvt extension
4014 // 1035 enable modifiers for alt, numlock NYI 3594 // 1035 enable modifiers for alt, numlock NYI
4015 // 1036 send ESC for meta keys NYI 3595 // 1036 send ESC for meta keys NYI
4016 // 1037 send DEL for keypad delete NYI 3596 // 1037 send DEL for keypad delete NYI
4017 { 1047, PrivMode_Screen }, 3597 { 1047, PrivMode_Screen },
4018 // 1048 save and restore cursor 3598 // 1048 save and restore cursor
4019 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3599 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4020 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3601 { 2004, PrivMode_BracketPaste },
4021 }; 3602 };
4022 3603
4023 if (nargs == 0) 3604 if (nargs == 0)
4024 return; 3605 return;
4025 3606
… …
4042 } 3623 }
4043 3624
4044 /* extra handling for values with state unkept */ 3625 /* extra handling for values with state unkept */
4045 switch (arg[i]) 3626 switch (arg[i])
4046 { 3627 {
3628#if ENABLE_STYLES
3629 case 1021:
3630 set_option (Opt_intensityStyles, mode);
3631
3632 scr_touch (true);
3633 break;
3634#endif
4047 case 1048: /* alternative cursor save */ 3635 case 1048: /* alternative cursor save */
4048 case 1049: 3636 case 1049:
4049 if (options & Opt_secondaryScreen) 3637 if (option (Opt_secondaryScreen))
4050 if (mode == 0) 3638 if (mode == 0)
4051 scr_cursor (RESTORE); 3639 scr_cursor (RESTORE);
4052 else if (mode == 1) 3640 else if (mode == 1)
4053 scr_cursor (SAVE); 3641 scr_cursor (SAVE);
4054 break; 3642 break;
… …
4066 */ 3654 */
4067 PrivMode (1, PrivMode_vt52); 3655 PrivMode (1, PrivMode_vt52);
4068 break; 3656 break;
4069 case 3: /* 80/132 */ 3657 case 3: /* 80/132 */
4070 if (priv_modes & PrivMode_132OK) 3658 if (priv_modes & PrivMode_132OK)
3659 {
3660 scr_poweron ();
4071 set_widthheight (((state ? 132 : 80) * fwidth), height); 3661 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3662 }
4072 break; 3663 break;
4073 case 4: /* smooth scrolling */ 3664 case 4: /* smooth scrolling */
4074 if (state)
4075 options &= ~Opt_jumpScroll;
4076 else
4077 options |= Opt_jumpScroll; 3665 set_option (Opt_jumpScroll, !state);
4078 break; 3666 break;
4079 case 5: /* reverse video */ 3667 case 5: /* reverse video */
4080 scr_rvideo_mode (state); 3668 scr_rvideo_mode (state);
4081 break; 3669 break;
4082 case 6: /* relative/absolute origins */ 3670 case 6: /* relative/absolute origins */
… …
4086 scr_autowrap (state); 3674 scr_autowrap (state);
4087 break; 3675 break;
4088 /* case 8: - auto repeat, can't do on a per window basis */ 3676 /* case 8: - auto repeat, can't do on a per window basis */
4089 case 9: /* X10 mouse reporting */ 3677 case 9: /* X10 mouse reporting */
4090 if (state) /* orthogonal */ 3678 if (state) /* orthogonal */
4091 priv_modes &= ~PrivMode_MouseX11; 3679 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4092 break; 3680 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 3681#ifdef scrollBar_esc
4101 case scrollBar_esc: 3682 case scrollBar_esc:
4102 if (scrollbar_mapping (state)) 3683 if (scrollbar_mapping (state))
4103 { 3684 {
4104 resize_all_windows (0, 0, 0); 3685 resize_all_windows (0, 0, 0);
… …
4116 break; 3697 break;
4117 /* case 66: - application key pad */ 3698 /* case 66: - application key pad */
4118 /* case 67: - backspace key */ 3699 /* case 67: - backspace key */
4119 case 1000: /* X11 mouse reporting */ 3700 case 1000: /* X11 mouse reporting */
4120 if (state) /* orthogonal */ 3701 if (state) /* orthogonal */
4121 priv_modes &= ~PrivMode_MouseX10; 3702 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4122 break; 3703 break;
4123#if 0
4124 case 1001: 3704 case 1002:
4125 break; /* X11 mouse highlighting */ 3705 case 1003:
4126#endif 3706 if (state)
3707 {
3708 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3709 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3710 vt_emask_mouse = PointerMotionMask;
3711 }
3712 else
3713 vt_emask_mouse = NoEventMask;
3714 vt_select_input ();
3715 break;
4127 case 1010: /* scroll to bottom on TTY output inhibit */ 3716 case 1010: /* scroll to bottom on TTY output inhibit */
4128 if (state)
4129 options &= ~Opt_scrollTtyOutput;
4130 else
4131 options |= Opt_scrollTtyOutput; 3717 set_option (Opt_scrollTtyOutput, !state);
4132 break; 3718 break;
4133 case 1011: /* scroll to bottom on key press */ 3719 case 1011: /* scroll to bottom on key press */
4134 if (state)
4135 options |= Opt_scrollTtyKeypress; 3720 set_option (Opt_scrollTtyKeypress, state);
4136 else
4137 options &= ~Opt_scrollTtyKeypress;
4138 break; 3721 break;
4139 case 1047: /* secondary screen w/ clearing last */ 3722 case 1047: /* secondary screen w/ clearing last */
4140 if (options & Opt_secondaryScreen) 3723 if (option (Opt_secondaryScreen))
4141 if (current_screen != PRIMARY) 3724 if (current_screen != PRIMARY)
4142 scr_erase_screen (2); 3725 scr_erase_screen (2);
4143 scr_change_screen (state); 3726 scr_change_screen (state);
4144 break; 3727 break;
4145 case 1049: /* secondary screen w/ clearing first */ 3728 case 1049: /* secondary screen w/ clearing first */
4146 scr_change_screen (state); 3729 scr_change_screen (state);
4147 if (options & Opt_secondaryScreen) 3730 if (option (Opt_secondaryScreen))
4148 if (current_screen != PRIMARY) 3731 if (current_screen != PRIMARY)
4149 scr_erase_screen (2); 3732 scr_erase_screen (2);
4150 break; 3733 break;
4151 default: 3734 default:
4152 break; 3735 break;
… …
4280 scr_color (Color_bg, Color_bg); 3863 scr_color (Color_bg, Color_bg);
4281 break; 3864 break;
4282 3865
4283 //case 50: // not variable spacing 3866 //case 50: // not variable spacing
4284 3867
4285#ifndef NO_BRIGHTCOLOR 3868#if !ENABLE_MINIMAL
4286 case 90: 3869 case 90:
4287 case 91: /* set bright fg color */ 3870 case 91: /* set bright fg color */
4288 case 92: 3871 case 92:
4289 case 93: 3872 case 93:
4290 case 94: 3873 case 94:
… …
4302 case 106: 3885 case 106:
4303 case 107: 3886 case 107:
4304 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3887 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4305 break; 3888 break;
4306#endif 3889#endif
4307
4308 } 3890 }
4309 } 3891 }
4310} 3892}
4311/*}}} */ 3893/*}}} */
4312 3894
… …
4315rxvt_term::process_graphics () 3897rxvt_term::process_graphics ()
4316{ 3898{
4317 unicode_t ch, cmd = cmd_getc (); 3899 unicode_t ch, cmd = cmd_getc ();
4318 3900
4319 if (cmd == 'Q') 3901 if (cmd == 'Q')
3902 {
4320 { /* query graphics */ 3903 /* query graphics */
4321 tt_printf ("\033G0\012"); /* no graphics */ 3904 tt_printf ("\033G0\012"); /* no graphics */
4322 return; 3905 return;
4323 } 3906 }
4324 /* swallow other graphics sequences until terminating ':' */ 3907 /* swallow other graphics sequences until terminating ':' */
4325 do 3908 do
… …
4336 */ 3919 */
4337void 3920void
4338rxvt_term::tt_printf (const char *fmt,...) 3921rxvt_term::tt_printf (const char *fmt,...)
4339{ 3922{
4340 va_list arg_ptr; 3923 va_list arg_ptr;
4341 unsigned char buf[256]; 3924 char buf[256];
4342 3925
4343 va_start (arg_ptr, fmt); 3926 va_start (arg_ptr, fmt);
4344 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3927 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4345 va_end (arg_ptr); 3928 va_end (arg_ptr);
4346 tt_write (buf, strlen (buf)); 3929 tt_write (buf, strlen (buf));
… …
4351 * or generated by us in response to a query ESC sequence. 3934 * or generated by us in response to a query ESC sequence.
4352 */ 3935 */
4353const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3936const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4354 3937
4355void 3938void
4356rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3939rxvt_term::tt_write (const char *data, unsigned int len)
4357{ 3940{
3941 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3942 return;
3943
3944 if (pty->pty < 0)
3945 return;
3946
4358 if (v_buflen == 0) 3947 if (v_buflen == 0)
4359 { 3948 {
4360 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3949 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4361 3950
4362 if ((unsigned int)written == len) 3951 if ((unsigned int)written == len)
4363 return; 3952 return;
4364 3953
4365 data += written; 3954 data += written;
4366 len -= written; 3955 len -= written;
4367 } 3956 }
4368 3957
4369 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 3958 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4370 3959
4371 memcpy (v_buffer + v_buflen, data, len); 3960 memcpy (v_buffer + v_buflen, data, len);
4372 v_buflen += len; 3961 v_buflen += len;
4373 3962
4374 pty_ev.set (EVENT_READ | EVENT_WRITE); 3963 pty_ev.set (ev::READ | ev::WRITE);
4375} 3964}
4376 3965
4377void rxvt_term::pty_write () 3966void rxvt_term::pty_write ()
4378{ 3967{
4379 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3968 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4380 3969
4381 if (written > 0) 3970 if (written > 0)
4382 { 3971 {
4383 v_buflen -= written; 3972 v_buflen -= written;
4384 3973
4385 if (v_buflen == 0) 3974 if (v_buflen == 0)
4386 { 3975 {
4387 free (v_buffer); 3976 free (v_buffer);
4388 v_buffer = 0; 3977 v_buffer = 0;
4389 v_buflen = 0;
4390 3978
4391 pty_ev.set (EVENT_READ); 3979 pty_ev.set (ev::READ);
4392 return; 3980 return;
4393 } 3981 }
4394 3982
4395 memmove (v_buffer, v_buffer + written, v_buflen); 3983 memmove (v_buffer, v_buffer + written, v_buflen);
4396 } 3984 }
4397 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3985 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4398 pty_ev.set (EVENT_READ); 3986 pty_ev.set (ev::READ);
4399} 3987}
4400 3988
4401/*----------------------- end-of-file (C source) -----------------------*/ 3989/*----------------------- end-of-file (C source) -----------------------*/
4402 3990

Diff Legend

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