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.214 by root, Thu Dec 22 21:56:19 2005 UTC vs.
Revision 1.476 by sf-exg, Fri Feb 11 01:24:46 2011 UTC

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

Diff Legend

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