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.227 by root, Mon Jan 2 15:35:43 2006 UTC vs.
Revision 1.515 by root, Tue Jun 5 11:00:40 2012 UTC

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

Diff Legend

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