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.201 by root, Mon Feb 21 19:26:07 2005 UTC vs.
Revision 1.408 by ayin, Sat Feb 16 13:36:10 2008 UTC

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

Diff Legend

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