ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

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

Diff Legend

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