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.197 by root, Thu Feb 17 15:07:48 2005 UTC vs.
Revision 1.409 by ayin, Sat Feb 16 15:39:20 2008 UTC

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

Diff Legend

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