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.93 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.326 by root, Sat Jun 9 13:04:27 2007 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-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * 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 33 * 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 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#include <wchar.h> 54#ifdef KEYSYM_RESOURCE
55# include "keyboard.h"
56#endif
57
58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
54 63
55/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
56 65
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 67
59// exception thrown when the command parser runs out of input data 68#if ENABLE_FRILLS || ISO_14755
60class out_of_input { } out_of_input;
61 69
62/*{{{ Convert the keypress event into a string */ 70#define ISO_14755_STARTED 0x80000000UL
71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
72#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
73#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
74#define ISO_14755_MASK 0x0fffffffUL
75
76#if ISO_14755
77static unsigned short iso14755_symtab[] = {
78 // keysym, unicode
79 XK_Left, 0x2190,
80 XK_KP_Left, 0x2190,
81 XK_Up, 0x2191,
82 XK_KP_Up, 0x2191,
83 XK_Right, 0x2192,
84 XK_KP_Right, 0x2192,
85 XK_Down, 0x2193,
86 XK_KP_Down, 0x2193,
87 XK_Linefeed, 0x21b4,
88 XK_Return, 0x21b5,
89 XK_KP_Enter, 0x21b5,
90
91 XK_Prior, 0x21de,
92 XK_Next, 0x21df,
93 XK_Tab, 0x21e5,
94 XK_ISO_Left_Tab, 0x21e6,
95 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7,
97
98 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0,
106 XK_Home, 0x21f1,
107 XK_End, 0x21f2,
108
109 XK_Execute, 0x2318,
110 XK_Begin, 0x2320,
111 XK_Delete, 0x2326,
112 XK_Clear, 0x2327,
113 XK_BackSpace, 0x232b,
114 XK_Insert, 0x2380,
115 XK_Control_L, 0x2388,
116 XK_Control_R, 0x2388,
117 XK_Pause, 0x2389,
118 XK_Break, 0x238a,
119 XK_Escape, 0x238b,
120 XK_Undo, 0x238c,
121 XK_Print, 0x2399,
122
123 XK_space, 0x2423,
124
125#ifdef XK_KP_Begin
126 XK_KP_Prior, 0x21de,
127 XK_KP_Next, 0x21df,
128 XK_KP_Begin, 0x2320,
129 XK_KP_Insert, 0x2380,
130 XK_KP_Delete, 0x2326,
131 XK_KP_Space, 0x2422,
132#endif
133 0,
134};
135
63void 136void
137rxvt_term::iso14755_54 (int x, int y)
138{
139 x = Pixel2Col (x);
140 y = Pixel2Row (y);
141
142 if (!IN_RANGE_EXC (x, 0, ncol)
143 || !IN_RANGE_EXC (y, 0, nrow))
144 return;
145
146 for (;;)
147 {
148 const line_t &l = ROW(y + view_start);
149
150 text_t t = l.t[x];
151
152 if (t != NOCHAR || !x)
153 {
154 iso14755_51 (l.t[x], l.r[x], x, y);
155 iso14755buf = ISO_14755_54;
156 break;
157 }
158
159 x--;
160 }
161}
162
163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{
166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname;
169 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172
173# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch))
175 {
176 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr);
179 }
180 else
181# endif
182 {
183 ch2 = ch;
184
185 alloc = 0;
186 chr = &ch2;
187 len = 1;
188 }
189
190 char attr[80]; // plenty
191
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 + hey
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);
214
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216
217 for (int y = 0; y < len; y++)
218 {
219 char buf[9];
220
221 ch = *chr++;
222
223 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '=');
226# if !UNICODE3
227 if (ch >= 0x10000)
228 ch = 0xfffd;
229# endif
230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r);
234 }
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);
242 scr_overlay_set (0, len + 1, fname);
243
244 free (fname);
245
246# if ENABLE_COMBINING
247 if (alloc)
248 delete [] alloc;
249# endif
250}
251#endif
252
253void
254rxvt_term::commit_iso14755 ()
255{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260
261 if (iso14755buf & ISO_14755_51)
262 {
263 char mb[16];
264 int len;
265
266 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20)
268 len = wcstombs (mb, ch, 16);
269 else
270 {
271 mb[0] = ch[0];
272 len = 1;
273 }
274
275 if (len > 0)
276 tt_write (mb, len);
277 else
278 scr_bell ();
279 }
280
281 iso14755buf = 0;
282}
283
284int
64rxvt_term::lookup_key (XKeyEvent &ev) 285rxvt_term::hex_keyval (XKeyEvent &ev)
286{
287 // check wether this event corresponds to a hex digit
288 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++)
290 {
291 KeySym k = XLookupKeysym (&ev, index);
292
293 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
294 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
295 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
296 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
297 }
298
299 return -1;
300}
301#endif
302
303void
304rxvt_term::key_press (XKeyEvent &ev)
65{ 305{
66 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
67 unsigned int newlen; 307 unsigned int newlen;
68 KeySym keysym; 308 KeySym keysym;
69#ifdef DEBUG_CMD
70 static int debug_key = 1; /* accessible by a debugger only */
71#endif
72 int valid_keysym; 309 int valid_keysym;
73 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
74 316
75 /* 317 /*
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
78 * 320 *
79 * Always permit `shift' to override the current setting 321 * Always permit `shift' to override the current setting
80 */ 322 */
81 shft = (ev.state & ShiftMask); 323 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 324 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 325 meta = ev.state & ModMetaMask;
84 326
85 if (numlock_state || (ev.state & ModNumLockMask)) 327 if (numlock_state || (ev.state & ModNumLockMask))
86 { 328 {
87 numlock_state = (ev.state & ModNumLockMask); 329 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 330 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
96 Status status_return; 338 Status status_return;
97 339
98#if 0 340#if 0
99#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 342 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
102 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
103 else 345 else
104#endif 346#endif
105#endif 347#endif
106 { 348 {
… …
108 350
109 // the XOpenIM manpage lies about hardcoding the locale 351 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 352 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 353 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 354 SET_LOCALE (rs[Rs_imLocale]);
355
113 // assume wchar_t == unicode or better 356 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 357 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 358 KBUFSZ, &keysym, &status_return);
359
116 if (rs[Rs_imLocale]) 360 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 361 SET_LOCALE (locale);
118 362
119 if (status_return == XLookupChars 363 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 364 || status_return == XLookupBoth)
… …
141 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
142 } 386 }
143 else 387 else
144#endif 388#endif
145 { 389 {
146 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
147 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
148 } 392 }
149 393
150 if (valid_keysym) 394 if (valid_keysym)
151 { 395 {
396#ifdef KEYSYM_RESOURCE
397 if (keyboard->dispatch (this, keysym, ev.state))
398 return;
399#endif
400
152 if (TermWin.saveLines) 401 if (saveLines)
153 { 402 {
154#ifdef UNSHIFTED_SCROLLKEYS 403#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 404 if (!ctrl && !meta)
156 {
157#else 405#else
158 if (IS_SCROLL_MOD) 406 if (IS_SCROLL_MOD)
407#endif
159 { 408 {
160#endif
161 int lnsppg; 409 int lnsppg;
162 410
163#ifdef PAGING_CONTEXT_LINES 411#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 412 lnsppg = nrow - PAGING_CONTEXT_LINES;
165#else 413#else
166 lnsppg = TermWin.nrow * 4 / 5; 414 lnsppg = nrow * 4 / 5;
167#endif 415#endif
168 if (keysym == XK_Prior) 416 if (keysym == XK_Prior)
169 { 417 {
170 scr_page (UP, lnsppg); 418 scr_page (UP, lnsppg);
171 return; 419 return;
… …
199 scr_move_to (0, 1); 447 scr_move_to (0, 1);
200 return; 448 return;
201 } 449 }
202 else if (keysym == XK_End) 450 else if (keysym == XK_End)
203 { 451 {
204 scr_move_to (1, 0); 452 scr_move_to (1, 1);
205 return; 453 return;
206 } 454 }
207 } 455 }
208#endif 456#endif
209 } 457 }
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 462 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 463 {
216 keysym += (XK_F11 - XK_F1); 464 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 465 shft = 0; /* turn off Shift */
218 } 466 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 467 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 468 {
221 switch (keysym) 469 switch (keysym)
222 { 470 {
223 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
226 return; 474 return;
475#if TODO
227 /* rxvt extras */ 476 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 478 change_font (FONT_UP);
230 return; 479 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 481 change_font (FONT_DN);
233 return; 482 return;
483#endif
234 } 484 }
235 } 485 }
236 } 486 }
237#ifdef PRINTPIPE 487
238 if (keysym == XK_Print) 488#if ENABLE_FRILLS || ISO_14755
239 { 489 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 490 if (shft && ctrl)
241 return;
242 } 491 {
243#endif 492 int hv;
244 493
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 494 if (iso14755buf & ISO_14755_51
246 { 495 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 496 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 497 {
250 unsigned int l; 498 commit_iso14755 ();
251 const unsigned char *kbuf0; 499 iso14755buf = ISO_14755_51;
252 500# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 501 iso14755_51 (0);
254 l = (unsigned int)*kbuf0++;
255
256 /* escape prefix */
257 if (meta
258# ifdef META8_OPTION
259 && meta_char == C0_ESC
260# endif 502# endif
261 ) 503 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 504 }
266 505 else if (keysym == XK_BackSpace)
267 tt_write (kbuf0, l); 506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
510# endif
511 return;
512 }
513 else if ((hv = hex_keyval (ev)) >= 0)
514 {
515 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
516 | hv | ISO_14755_51;
517# if ISO_14755
518 iso14755_51 (iso14755buf & ISO_14755_MASK);
519# endif
268 return; 520 return;
269 } 521 }
270 else 522 else
523 {
524# if ENABLE_OVERLAY
525 scr_overlay_off ();
271#endif 526# endif
527 iso14755buf = 0;
528 }
529 }
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
532 if (!(iso14755buf & ISO_14755_STARTED))
533 {
534 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif
539 }
540#endif
541
542#ifdef PRINTPIPE
543 if (keysym == XK_Print)
544 {
545 scr_printscreen (ctrl | shft);
546 return;
547 }
548#endif
549
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 {
272 { 552 {
273 newlen = 1; 553 newlen = 1;
274 switch (keysym) 554 switch (keysym)
275 { 555 {
276#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 557 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 558 if (priv_modes & PrivMode_HaveBackSpace)
279 { 559 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
283 } 563 }
284 else 564 else
285 STRCPY (kbuf, key_backspace); 565 strcpy (kbuf, key_backspace);
286 break; 566 break;
287#endif 567#endif
288#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
289 case XK_Delete: 579 case XK_Delete:
290 STRCPY (kbuf, key_delete); 580 strcpy (kbuf, key_delete);
291 break; 581 break;
292#endif 582#endif
293 case XK_Tab: 583 case XK_Tab:
294 if (shft) 584 if (shft)
295 STRCPY (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
296 else 586 else
297 { 587 {
298#ifdef CTRL_TAB_MAKES_META 588#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 589 if (ctrl)
300 meta = 1; 590 meta = 1;
… …
306 newlen = 0; 596 newlen = 0;
307 } 597 }
308 break; 598 break;
309 599
310#ifdef XK_KP_Left 600#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 606 {
317 STRCPY (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 609 break;
320 } 610 }
321 else 611 else
322 /* translate to std. cursor key */ 612 /* translate to std. cursor key */
… …
325#endif 615#endif
326 case XK_Up: /* "\033[A" */ 616 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 617 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 618 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 619 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 620 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 621 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 622 /* do Shift first */
333 if (shft) 623 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 624 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 625 else if (ctrl)
336 { 626 {
337 kbuf[1] = 'O'; 627 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 628 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 629 }
340 else if (PrivateModes & PrivMode_aplCUR) 630 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 631 kbuf[1] = 'O';
342 break; 632 break;
343 633
344#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
346 case XK_KP_Prior: 636 case XK_KP_Prior:
347 /* allow shift to override */ 637 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 639 {
350 STRCPY (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
351 break; 641 break;
352 } 642 }
353 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
354# endif 644# endif
355 case XK_Prior: 645 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
357 break; 647 break;
358# ifdef XK_KP_Next 648# ifdef XK_KP_Next
359 case XK_KP_Next: 649 case XK_KP_Next:
360 /* allow shift to override */ 650 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 652 {
363 STRCPY (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
364 break; 654 break;
365 } 655 }
366 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
367# endif 657# endif
368 case XK_Next: 658 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
370 break; 660 break;
371#endif 661#endif
372 case XK_KP_Enter: 662 case XK_KP_Enter:
373 /* allow shift to override */ 663 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 665 {
376 STRCPY (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
377 } 678 }
378 else 679 else
379 { 680 {
380 kbuf[0] = '\r'; 681 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 682 kbuf[1] = '\0';
382 } 683 }
383 break; 684 break;
384 685
385#ifdef XK_KP_Begin 686#ifdef XK_KP_Begin
386 case XK_KP_Begin: 687 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 688 strcpy (kbuf, "\033Ou");
388 break; 689 break;
389 690
390 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op");
392 break;
393
394 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On");
396 break;
397#endif 691#endif
398 case XK_KP_F1: /* "\033OP" */ 692 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 693 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 694 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 695 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 696 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 697 kbuf[2] += (keysym - XK_KP_F1);
404 break; 698 break;
405 699
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 700 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 701 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 716 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 718 {
425 STRCPY (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 721 }
428 else 722 else
429 { 723 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 725 kbuf[1] = '\0';
432 } 726 }
433 break; 727 break;
434 728
435 case XK_Find: 729 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
437 break; 731 break;
732
733#ifdef XK_KP_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
438 case XK_Insert: 743 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 744 strcpy (kbuf, "\033[2~");
440 break; 745 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 746#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 747 case DXK_Remove:
443 /* FALLTHROUGH */ 748 /* FALLTHROUGH */
444#endif 749#endif
445 case XK_Execute: 750 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 751 strcpy (kbuf, "\033[3~");
447 break; 752 break;
448 case XK_Select: 753 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
450 break; 755 break;
451#ifdef XK_KP_End 756#ifdef XK_KP_End
452 case XK_KP_End: 757 case XK_KP_End:
453 /* allow shift to override */ 758 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 760 {
456 STRCPY (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
457 break; 762 break;
458 } 763 }
459 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
460#endif 765#endif
461 case XK_End: 766 case XK_End:
462 STRCPY (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
463 break; 768 break;
464#ifdef XK_KP_Home 769#ifdef XK_KP_Home
465 case XK_KP_Home: 770 case XK_KP_Home:
466 /* allow shift to override */ 771 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 772 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 773 {
469 STRCPY (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
470 break; 775 break;
471 } 776 }
472 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
473#endif 778#endif
474 case XK_Home: 779 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 780 strcpy (kbuf, KS_HOME);
476 break; 781 break;
477 782
478#define FKEY(n, fkey) \ 783#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 785
… …
532#undef FKEY 837#undef FKEY
533 default: 838 default:
534 newlen = 0; 839 newlen = 0;
535 break; 840 break;
536 } 841 }
842
537 if (newlen) 843 if (newlen)
538 len = STRLEN (kbuf); 844 len = strlen (kbuf);
539 } 845 }
540 846
541 /* 847 /*
542 * Pass meta for all function keys, if 'meta' option set 848 * Pass meta for all function keys, if 'meta' option set
543 */ 849 */
… …
550 else if (ctrl && keysym == XK_minus) 856 else if (ctrl && keysym == XK_minus)
551 { 857 {
552 len = 1; 858 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 859 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 860 }
861 else if (keysym == XK_ISO_Left_Tab)
862 {
863 strcpy (kbuf, "\033[Z");
864 len = 3;
865 }
555 else 866 else
556 { 867 {
557#ifdef META8_OPTION 868#ifdef META8_OPTION
558 /* set 8-bit on */ 869 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
560 { 871 {
561 unsigned char *ch; 872 char *ch;
562 873
563 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
564 *ch |= 0x80; 875 *ch |= 0x80;
565 876
566 meta = 0; 877 meta = 0;
… …
568#endif 879#endif
569 /* nil */ ; 880 /* nil */ ;
570 } 881 }
571 } 882 }
572 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
573 if (len <= 0) 887 if (len <= 0)
574 return; /* not mapped */ 888 return; /* not mapped */
575 889
576 if (Options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
577 if (TermWin.view_start) 891 if (view_start)
578 { 892 {
579 TermWin.view_start = 0; 893 view_start = 0;
580 want_refresh = 1; 894 want_refresh = 1;
581 } 895 }
582 896
583 /* 897 /*
584 * these modifications only affect the static keybuffer 898 * these modifications only affect the static keybuffer
… …
599#ifdef META8_OPTION 913#ifdef META8_OPTION
600 && meta_char == C0_ESC 914 && meta_char == C0_ESC
601#endif 915#endif
602 ) 916 )
603 { 917 {
604 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
605 tt_write (&ch, 1); 919 tt_write (&ch, 1);
606 } 920 }
607 921
608#if defined(DEBUG_CMD)
609 /* Display keyboard buffer contents */
610 unsigned char *p;
611 int i;
612
613 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
614 for (i = 0, p = kbuf; i < len; i++, p++)
615 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
616 fprintf (stderr, "'\n");
617#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
619} 923}
620/*}}} */
621 924
622#if (MENUBAR_MAX) 925void
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 926rxvt_term::key_release (XKeyEvent &ev)
624/* attempt to `write' count to the input buffer */ 927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
1002#if defined (KEYSYM_RESOURCE)
625unsigned int 1003unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
627{ 1005{
628 unsigned int n, s; 1006 unsigned int n, s;
629 1007
630 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 1010
633 if (n > 0 && s < count) 1011 if (n > 0 && s < count)
634 { 1012 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 1013 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 1015 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 1016 cmdbuf_endp -= n;
639 s += n; 1017 s += n;
640 } 1018 }
… …
650 1028
651 cmd_parse (); 1029 cmd_parse ();
652 1030
653 return 0; 1031 return 0;
654} 1032}
655#endif /* MENUBAR_MAX */ 1033#endif
656 1034
657void 1035void
658rxvt_term::flush () 1036rxvt_term::flush ()
659{ 1037{
1038 flush_ev.stop ();
1039
660#ifdef TRANSPARENT 1040#ifdef TRANSPARENT
661 if (want_full_refresh) 1041 if (want_full_refresh)
662 { 1042 {
663 want_full_refresh = 0; 1043 want_full_refresh = 0;
664 scr_clear (); 1044 scr_clear ();
665 scr_touch (false); 1045 scr_touch (false);
666 want_refresh = 1;
667 } 1046 }
668#endif 1047#endif
669 1048
670 if (want_refresh) 1049 if (want_refresh)
671 { 1050 {
1051 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1052 {
1053 int row = view_start;
1054 int end_row = row + nrow;
1055
1056 while (row > top_row && ROW (row - 1).is_longer ())
1057 --row;
1058
1059 do
1060 {
1061 int start_row = row;
1062 line_t *l;
1063
1064 do
1065 {
1066 l = &ROW (row++);
1067
1068 if (!(l->f & LINE_FILTERED))
1069 {
1070 // line not filtered, mark it as filtered
1071 l->f |= LINE_FILTERED;
1072 while (l->is_longer ())
1073 {
1074 l = &ROW (row++);
1075 l->f |= LINE_FILTERED;
1076 }
1077
1078 // and filter it
1079 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1080
1081 break;
1082 }
1083 }
1084 while (l->is_longer () && row < end_row);
1085 }
1086 while (row < end_row);
1087 }
1088
672 scr_refresh (refresh_type); 1089 scr_refresh ();
673 scrollbar_show (1); 1090 scrollbar_show (1);
674#ifdef USE_XIM 1091#ifdef USE_XIM
675 IMSendSpot (); 1092 IMSendSpot ();
676#endif 1093#endif
677 } 1094 }
… …
680} 1097}
681 1098
682void 1099void
683rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
684{ 1101{
685 SET_R (this); 1102 make_current ();
686 SET_LOCALE (locale);
687 1103
1104 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108}
1109
1110void
1111rxvt_term::flush_cb (time_watcher &w)
1112{
1113 make_current ();
1114
1115 refresh_limit = 1;
1116 refresh_count = 0;
688 flush (); 1117 flush ();
689} 1118}
690 1119
691#ifdef CURSOR_BLINK 1120#ifdef CURSOR_BLINK
692void 1121void
693rxvt_term::cursor_blink_cb (time_watcher &w) 1122rxvt_term::cursor_blink_cb (time_watcher &w)
694{ 1123{
695 hidden_cursor = !hidden_cursor; 1124 hidden_cursor = !hidden_cursor;
696 want_refresh = 1; 1125 want_refresh = 1;
697 1126
698 w.start (w.at + BLINK_INTERVAL); 1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
699} 1128}
700#endif 1129#endif
701 1130
702#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
703void 1132void
… …
710 w.start (w.at + TEXT_BLINK_INTERVAL); 1139 w.start (w.at + TEXT_BLINK_INTERVAL);
711 } 1140 }
712} 1141}
713#endif 1142#endif
714 1143
1144#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1145void
1146rxvt_term::cont_scroll_cb (time_watcher &w)
1147{
1148 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1149 scr_page (scrollbar_isUp() ? UP : DN, 1))
1150 {
1151 want_refresh = 1;
1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1153 }
1154}
1155#endif
1156
1157#ifdef SELECTION_SCROLLING
1158void
1159rxvt_term::sel_scroll_cb (time_watcher &w)
1160{
1161 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1162 {
1163 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1164 want_refresh = 1;
1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1166 }
1167}
1168#endif
1169
1170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1171void
1172rxvt_term::slip_wheel_cb (time_watcher &w)
1173{
1174 if (mouse_slip_wheel_speed == 0
1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1176 : scr_page (UP, mouse_slip_wheel_speed))
1177 {
1178 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0;
1180
1181 want_refresh = 1;
1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1183 }
1184}
1185#endif
1186
1187#if LINUX_YIELD_HACK
1188static struct event_handler
1189{
1190 check_watcher yield_ev;
1191
1192 void yield_cb (check_watcher &w)
1193 {
1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1202 w.stop ();
1203 }
1204
1205 event_handler ()
1206 : yield_ev (this, &event_handler::yield_cb)
1207 {
1208 }
1209} event_handler;
1210#endif
1211
715bool 1212bool
716rxvt_term::pty_fill () 1213rxvt_term::pty_fill ()
717{ 1214{
718 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1215 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
719 1216
720 if (CBUFSIZ == n) 1217 if (CBUFSIZ == n)
721 { 1218 {
722 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1219 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
723 n = 0; 1220 n = 0;
724 } 1221 }
725 1222
726 memmove (cmdbuf_base, cmdbuf_ptr, n); 1223 memmove (cmdbuf_base, cmdbuf_ptr, n);
727 cmdbuf_ptr = cmdbuf_base; 1224 cmdbuf_ptr = cmdbuf_base;
728 cmdbuf_endp = cmdbuf_ptr + n; 1225 cmdbuf_endp = cmdbuf_ptr + n;
729 1226
730 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1227 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
731 1228
732 if (n > 0) 1229 if (r > 0)
733 { 1230 {
734 cmdbuf_endp += n; 1231 cmdbuf_endp += r;
735 return true; 1232 return true;
736 } 1233 }
737 else if (n < 0 && errno != EAGAIN) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1235 {
1236#if LINUX_YIELD_HACK
1237 if (display->is_local)
1238 event_handler.yield_ev.start ();
1239#endif
1240 }
1241 else
1242 {
1243 pty_ev.stop ();
1244
1245 if (!option (Opt_hold))
738 destroy (); 1246 destroy ();
1247 }
739 1248
740 return false; 1249 return false;
741} 1250}
742 1251
743void 1252void
744rxvt_term::pty_cb (io_watcher &w, short revents) 1253rxvt_term::pty_cb (io_watcher &w, short revents)
745{ 1254{
746 SET_R (this); 1255 make_current ();
747 SET_LOCALE (locale);
748 1256
749 if (revents & EVENT_WRITE)
750 tt_write (0, 0);
751 else if (revents & EVENT_READ) 1257 if (revents & EVENT_READ)
752 // loop, but don't allow a single term to monopolize us 1258 // loop, but don't allow a single term to monopolize us
753 while (pty_fill ()) 1259 while (pty_fill ())
754 if (cmd_parse ()) 1260 if (cmd_parse ())
755 break; 1261 break;
1262
1263 if (revents & EVENT_WRITE)
1264 pty_write ();
1265}
1266
1267void
1268rxvt_term::pointer_unblank ()
1269{
1270 XDefineCursor (dpy, vt, TermWin_cursor);
1271 recolour_cursor ();
1272
1273#ifdef POINTER_BLANK
1274 hidden_pointer = 0;
1275
1276 if (option (Opt_pointerBlank))
1277 pointer_ev.start (NOW + pointerBlankDelay);
1278#endif
756} 1279}
757 1280
758#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
759void 1282void
760rxvt_term::pointer_unblank ()
761{
762 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
763 recolour_cursor ();
764
765 hidden_pointer = 0;
766
767 if (Options & Opt_pointerBlank)
768 pointer_ev.start (NOW + pointerBlankDelay);
769}
770
771void
772rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
773{ 1284{
774 if (! (Options & Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
775 return; 1286 return;
776 1287
777 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
778 XFlush (display->display); 1289 XFlush (dpy);
779 1290
780 hidden_pointer = 1; 1291 hidden_pointer = 1;
781} 1292}
782 1293
783void 1294void
784rxvt_term::pointer_cb (time_watcher &w) 1295rxvt_term::pointer_cb (time_watcher &w)
785{ 1296{
786 SET_R (this); 1297 make_current ();
787 SET_LOCALE (locale);
788 1298
789 pointer_blank (); 1299 pointer_blank ();
790} 1300}
791#endif 1301#endif
792 1302
… …
799 x = ev.x; 1309 x = ev.x;
800 y = ev.y; 1310 y = ev.y;
801 pixel_position (&x, &y); 1311 pixel_position (&x, &y);
802 1312
803 if (MEvent.button == AnyButton) 1313 if (MEvent.button == AnyButton)
804 {
805 button_number = 3; 1314 button_number = 3;
806 }
807 else 1315 else
808 { 1316 {
809 button_number = MEvent.button - Button1; 1317 button_number = MEvent.button - Button1;
810 /* add 0x3D for wheel events, like xterm does */ 1318 /* add 0x3D for wheel events, like xterm does */
811 if (button_number >= 3) 1319 if (button_number >= 3)
812 button_number += (64 - 3); 1320 button_number += (64 - 3);
813 } 1321 }
814 1322
815 if (PrivateModes & PrivMode_MouseX10) 1323 if (priv_modes & PrivMode_MouseX10)
816 { 1324 {
817 /* 1325 /*
818 * do not report ButtonRelease 1326 * do not report ButtonRelease
819 * no state info allowed 1327 * no state info allowed
820 */ 1328 */
… …
835 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1343 + ((MEvent.state & ModMetaMask) ? 8 : 0)
836 + ((MEvent.state & ControlMask) ? 16 : 0); 1344 + ((MEvent.state & ControlMask) ? 16 : 0);
837#ifdef MOUSE_REPORT_DOUBLECLICK 1345#ifdef MOUSE_REPORT_DOUBLECLICK
838 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1346 key_state += ((MEvent.clicks > 1) ? 32 : 0);
839#endif 1347#endif
840
841 } 1348 }
842 1349
843#ifdef DEBUG_MOUSEREPORT 1350#if DEBUG_MOUSEREPORT
844 fprintf (stderr, "Mouse ["); 1351 fprintf (stderr, "Mouse [");
845 if (key_state & 16) 1352 if (key_state & 16)
846 fputc ('C', stderr); 1353 fputc ('C', stderr);
847 if (key_state & 4) 1354 if (key_state & 4)
848 fputc ('S', stderr); 1355 fputc ('S', stderr);
… …
852 fputc ('2', stderr); 1359 fputc ('2', stderr);
853 fprintf (stderr, "]: <%d>, %d/%d\n", 1360 fprintf (stderr, "]: <%d>, %d/%d\n",
854 button_number, 1361 button_number,
855 x + 1, 1362 x + 1,
856 y + 1); 1363 y + 1);
857#else 1364#endif
1365
858 tt_printf ("\033[M%c%c%c", 1366 tt_printf ("\033[M%c%c%c",
859 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
860 (32 + x + 1), 1368 (32 + x + 1),
861 (32 + y + 1)); 1369 (32 + y + 1));
862#endif
863} 1370}
864
865#ifdef USING_W11LIB
866void
867rxvt_W11_process_x_event (XEvent *ev)
868{
869 rxvt_t *r = rxvt_get_r ();
870
871 x_cb (*ev);
872}
873#endif
874 1371
875/*{{{ process an X event */ 1372/*{{{ process an X event */
876void 1373void
877rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
878{ 1375{
879 SET_R (this); 1376 make_current ();
880 SET_LOCALE (locale);
881 1377
882#if defined(CURSOR_BLINK) 1378 dLocal (Display *, dpy);
883 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
884 {
885 if (hidden_cursor)
886 {
887 hidden_cursor = 0;
888 want_refresh = 1;
889 }
890 1379
891 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1380 if (ev.xany.window == vt
892 } 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
893#endif 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
894
895#if defined(POINTER_BLANK)
896 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
897 {
898 if (ev.type == MotionNotify
899 || ev.type == ButtonPress
900 || ev.type == ButtonRelease)
901 if (hidden_pointer)
902 pointer_unblank ();
903
904 if (ev.type == KeyPress && hidden_pointer == 0)
905 pointer_blank ();
906 }
907#endif
908
909#ifdef USE_XIM
910 if (XFilterEvent (&ev, None))
911 return; 1383 return;
912#endif
913 1384
1385 // for XQueryPointer
914 Window unused_root, unused_child; 1386 Window unused_root, unused_child;
915 int unused_root_x, unused_root_y; 1387 int unused_root_x, unused_root_y;
916 unsigned int unused_mask; 1388 unsigned int unused_mask;
917
918#ifdef DEBUG_X
919 const char *const eventnames[] =
920 { /* mason - this matches my system */
921 "",
922 "",
923 "KeyPress",
924 "KeyRelease",
925 "ButtonPress",
926 "ButtonRelease",
927 "MotionNotify",
928 "EnterNotify",
929 "LeaveNotify",
930 "FocusIn",
931 "FocusOut",
932 "KeymapNotify",
933 "Expose",
934 "GraphicsExpose",
935 "NoExpose",
936 "VisibilityNotify",
937 "CreateNotify",
938 "DestroyNotify",
939 "UnmapNotify",
940 "MapNotify",
941 "MapRequest",
942 "ReparentNotify",
943 "ConfigureNotify",
944 "ConfigureRequest",
945 "GravityNotify",
946 "ResizeRequest",
947 "CirculateNotify",
948 "CirculateRequest",
949 "PropertyNotify",
950 "SelectionClear",
951 "SelectionRequest",
952 "SelectionNotify",
953 "ColormapNotify",
954 "ClientMessage",
955 "MappingNotify"
956 };
957#endif
958
959#ifdef DEBUG_X
960 struct timeval tp;
961 struct tm *ltt;
962 (void)gettimeofday (&tp, NULL);
963 ltt = localtime (& (tp.tv_sec));
964 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
965#endif
966 1389
967 switch (ev.type) 1390 switch (ev.type)
968 { 1391 {
969 case KeyPress: 1392 case KeyPress:
970 lookup_key (ev.xkey); 1393 key_press (ev.xkey);
971 break; 1394 break;
972 1395
973#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
974 case KeyRelease: 1396 case KeyRelease:
975 { 1397 key_release (ev.xkey);
976 if (! (ev.xkey.state & ControlMask))
977 mouse_slip_wheel_speed = 0;
978 else
979 {
980 KeySym ks;
981
982 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
983 if (ks == XK_Control_L || ks == XK_Control_R)
984 mouse_slip_wheel_speed = 0;
985 }
986 break; 1398 break;
987 }
988#endif
989 1399
990 case ButtonPress: 1400 case ButtonPress:
991 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
992 break; 1402 break;
993 1403
… …
995 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
996 break; 1406 break;
997 1407
998 case ClientMessage: 1408 case ClientMessage:
999 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1000 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1410 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1001 destroy ();
1002#ifdef OFFIX_DND
1003 /* OffiX Dnd (drag 'n' drop) protocol */
1004 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1005 && (ev.xclient.data.l[0] == DndFile
1006 || ev.xclient.data.l[0] == DndDir
1007 || ev.xclient.data.l[0] == DndLink))
1008 { 1411 {
1009 /* Get Dnd data */ 1412 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1010 Atom ActualType; 1413 {
1011 int ActualFormat; 1414 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1012 unsigned char *data; 1415 {
1013 unsigned long Size, RemainingBytes; 1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1014 1417 {
1015 XGetWindowProperty (display->display, display->root, 1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1016 xa[XA_DNDSELECTION], 1419 destroy ();
1017 0L, 1000000L, 1420 }
1018 False, AnyPropertyType, 1421#if ENABLE_EWMH
1019 &ActualType, &ActualFormat, 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1020 &Size, &RemainingBytes, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1021 &data); 1425 &ev);
1022 XChangeProperty (display->display, display->root, 1426#endif
1023 XA_CUT_BUFFER0, XA_STRING, 1427 }
1024 8, PropModeReplace, 1428 }
1025 data, STRLEN (data)); 1429#if ENABLE_XEMBED
1026 XFree (data); 1430 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1027 selection_paste (display->root, XA_CUT_BUFFER0, True); 1431 {
1028 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1432 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1433 focus_in ();
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out ();
1436 }
1437#endif
1029 } 1438 }
1030#endif /* OFFIX_DND */
1031 break; 1439 break;
1032 1440
1033 case MappingNotify: 1441 case MappingNotify:
1034 XRefreshKeyboardMapping (& (ev.xmapping)); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1035 break; 1443 break;
1036 1444
1037 /* 1445 /*
1038 * XXX: this is not the _current_ arrangement 1446 * XXX: this is not the _current_ arrangement
1039 * Here's my conclusion: 1447 * Here's my conclusion:
… …
1058 break; 1466 break;
1059 } 1467 }
1060 break; 1468 break;
1061 1469
1062 case FocusIn: 1470 case FocusIn:
1063 if (!TermWin.focus) 1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1474 focus_in ();
1475 break;
1476
1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1481 focus_out ();
1482 break;
1483
1484 case ConfigureNotify:
1485 if (ev.xconfigure.window == parent[0])
1064 { 1486 {
1065 TermWin.focus = 1; 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1066 want_refresh = 1; 1488 ;
1067#ifdef USE_XIM
1068 if (Input_Context != NULL)
1069 XSetICFocus (Input_Context);
1070#endif
1071#ifdef CURSOR_BLINK
1072 if (Options & Opt_cursorBlink)
1073 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1074#endif
1075 1489
1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1491 {
1492 seen_resize = 1;
1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND
1495 if (!option(Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1498 scr_touch (true);
1499 }
1500#endif
1501 }
1502
1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505#ifdef TRANSPARENT
1506 if (option (Opt_transparent))
1507 check_our_parents ();
1508#endif
1076 } 1509 }
1077 break; 1510 break;
1078 1511
1079 case FocusOut:
1080 if (TermWin.focus)
1081 {
1082 TermWin.focus = 0;
1083 want_refresh = 1;
1084#ifdef USE_XIM
1085 if (Input_Context != NULL)
1086 XUnsetICFocus (Input_Context);
1087#endif
1088#ifdef CURSOR_BLINK
1089 if (Options & Opt_cursorBlink)
1090 cursor_blink_ev.stop ();
1091 hidden_cursor = 0;
1092#endif
1093
1094 }
1095 break;
1096
1097 case ConfigureNotify: 1512 case PropertyNotify:
1098 if (ev.xconfigure.window == TermWin.parent[0]) 1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1099 { 1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1100 int height, width; 1515 && ev.xproperty.state == PropertyNewValue)
1516 selection_property (ev.xproperty.window, ev.xproperty.atom);
1101 1517
1102 do
1103 { /* Wrap lots of configures into one */
1104 width = ev.xconfigure.width;
1105 height = ev.xconfigure.height;
1106 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1107 }
1108 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1109
1110 if (szHint.width != width || szHint.height != height)
1111 {
1112 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1113 resize_all_windows (width, height, 1);
1114 }
1115#ifdef DEBUG_SIZE
1116 else
1117 {
1118 D_SIZE ((stderr, "Size: Not resizing"));
1119 }
1120#endif
1121#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1122 if (Options & Opt_transparent)
1123 {
1124 check_our_parents ();
1125 if (am_transparent)
1126 want_full_refresh = 1;
1127 }
1128#endif
1129 }
1130 break; 1518 break;
1131 1519
1132 case SelectionClear: 1520 case SelectionClear:
1133 selection_clear (); 1521 selection_clear ();
1134 break; 1522 break;
1135 1523
1136 case SelectionNotify: 1524 case SelectionNotify:
1137 if (selection_wait == Sel_normal) 1525 if (selection_wait == Sel_normal)
1138 selection_paste (ev.xselection.requestor, 1526 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1139 ev.xselection.property, True);
1140 break; 1527 break;
1141 1528
1142 case SelectionRequest: 1529 case SelectionRequest:
1143 selection_send (ev.xselectionrequest); 1530 selection_send (ev.xselectionrequest);
1144 break; 1531 break;
1145 1532
1533 case MapNotify:
1534 mapped = 1;
1535#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1537#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break;
1540
1146 case UnmapNotify: 1541 case UnmapNotify:
1147 TermWin.mapped = 0; 1542 mapped = 0;
1148#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1149 text_blink_ev.stop (); 1544 text_blink_ev.stop ();
1150#endif 1545#endif
1151 break; 1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1152
1153 case MapNotify:
1154 TermWin.mapped = 1;
1155#ifdef TEXT_BLINK
1156 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1157#endif
1158 break; 1547 break;
1159 1548
1160#ifdef TRANSPARENT 1549#ifdef TRANSPARENT
1161 case ReparentNotify: 1550 case ReparentNotify:
1162 rootwin_cb (ev); 1551 rootwin_cb (ev);
1163 break; 1552 break;
1164#endif /* TRANSPARENT */ 1553#endif /* TRANSPARENT */
1165 1554
1166 case GraphicsExpose: 1555 case GraphicsExpose:
1167 case Expose: 1556 case Expose:
1168 if (ev.xany.window == TermWin.vt) 1557 if (ev.xany.window == vt)
1169 { 1558 {
1170#ifdef NO_SLOW_LINK_SUPPORT 1559 do
1171 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1172 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1173#else 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1174 // don't understand this, so commented it out 1563
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565
1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1175 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1176 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1177 //scr_expose (ev.xexpose.x, 0, 1569
1178 // ev.xexpose.width, TermWin.height, False);
1179#endif
1180 want_refresh = 1; 1570 want_refresh = 1;
1181 } 1571 }
1182 else 1572 else
1183 { 1573 {
1184 XEvent unused_event; 1574 XEvent unused_event;
1185 1575
1186 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1187 Expose, 1577 ;
1188 &unused_event)) ; 1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1189 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1579 ;
1190 GraphicsExpose, 1580
1191 &unused_event)) ;
1192 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1193 { 1582 {
1194 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1195 scrollbar_show (0); 1584 scrollbar_show (0);
1196 } 1585 }
1197#ifdef MENUBAR 1586
1198 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1587#ifdef TRANSPARENT
1199 menubar_expose (); 1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (dpy, ev.xany.window);
1200#endif 1590#endif
1201 } 1591 }
1202 break; 1592 break;
1203 1593
1204 case MotionNotify: 1594 case MotionNotify:
1205#ifdef POINTER_BLANK 1595#ifdef POINTER_BLANK
1206 if (hidden_pointer) 1596 if (hidden_pointer)
1207 pointer_unblank (); 1597 pointer_unblank ();
1208#endif 1598#endif
1209#if MENUBAR 1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1210 if (isMenuBarWindow (ev.xany.window)) 1600 break;
1601
1602 if (ev.xany.window == vt)
1211 { 1603 {
1212 menubar_control (ev.xbutton); 1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1213 break; 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1214 } 1606 ; // nop
1215#endif
1216 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1217 break;
1218
1219 if (ev.xany.window == TermWin.vt)
1220 {
1221 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1222 { 1608 {
1223 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1224 ; 1610 ;
1225 1611
1226 XQueryPointer (display->display, TermWin.vt, 1612 XQueryPointer (dpy, vt,
1227 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1228 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1229 & (ev.xbutton.x), & (ev.xbutton.y), 1615 &ev.xbutton.x, &ev.xbutton.y,
1230 &unused_mask); 1616 &ev.xbutton.state);
1231#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
1232 /* deal with a `jumpy' mouse */ 1618 /* deal with a `jumpy' mouse */
1233 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1619 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1234 { 1620 {
1235#endif 1621#endif
1622#if ISO_14755
1623 // 5.4
1624 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1625 {
1626 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1627 break;
1628 }
1629#endif
1236 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1630 selection_extend (ev.xbutton.x, ev.xbutton.y,
1237 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1631 ev.xbutton.state & Button3Mask ? 2 : 0);
1632
1238#ifdef SELECTION_SCROLLING 1633#ifdef SELECTION_SCROLLING
1239 if (ev.xbutton.y < TermWin.int_bwidth 1634 if (ev.xbutton.y < int_bwidth
1240 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1635 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1241 { 1636 {
1242 int dist; 1637 int dist;
1243
1244 pending_scroll_selection=1;
1245 1638
1246 /* don't clobber the current delay if we are 1639 /* don't clobber the current delay if we are
1247 * already in the middle of scrolling. 1640 * already in the middle of scrolling.
1248 */ 1641 */
1249 if (scroll_selection_delay<=0) 1642 if (!sel_scroll_ev.active)
1250 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1251 1644
1252 /* save the event params so we can highlight 1645 /* save the event params so we can highlight
1253 * the selection in the pending-scroll loop 1646 * the selection in the pending-scroll loop
1254 */ 1647 */
1255 selection_save_x=ev.xbutton.x; 1648 selection_save_x = ev.xbutton.x;
1256 selection_save_y=ev.xbutton.y; 1649 selection_save_y = ev.xbutton.y;
1257 selection_save_state=
1258 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1650 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1259 1651
1260 /* calc number of lines to scroll */ 1652 /* calc number of lines to scroll */
1261 if (ev.xbutton.y<TermWin.int_bwidth) 1653 if (ev.xbutton.y < int_bwidth)
1262 { 1654 {
1263 scroll_selection_dir = UP; 1655 scroll_selection_dir = UP;
1264 dist = TermWin.int_bwidth - ev.xbutton.y; 1656 dist = int_bwidth - ev.xbutton.y;
1265 } 1657 }
1266 else 1658 else
1267 { 1659 {
1268 scroll_selection_dir = DN; 1660 scroll_selection_dir = DN;
1269 dist = ev.xbutton.y - 1661 dist = ev.xbutton.y - (int_bwidth + height);
1270 (TermWin.int_bwidth + TermWin.height);
1271 } 1662 }
1663
1272 scroll_selection_lines= (Pixel2Height (dist)/ 1664 scroll_selection_lines = Pixel2Height (dist)
1273 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1665 / SELECTION_SCROLL_LINE_SPEEDUP
1666 + 1;
1274 MIN_IT (scroll_selection_lines, 1667 min_it (scroll_selection_lines,
1275 SELECTION_SCROLL_MAX_LINES); 1668 SELECTION_SCROLL_MAX_LINES);
1276 } 1669 }
1277 else 1670 else
1278 { 1671 {
1279 /* we are within the text window, so we 1672 /* we are within the text window, so we
1280 * shouldn't be scrolling 1673 * shouldn't be scrolling
1281 */ 1674 */
1282 pending_scroll_selection = 0; 1675 if (sel_scroll_ev.active)
1676 sel_scroll_ev.stop();
1283 } 1677 }
1284#endif 1678#endif
1285#ifdef MOUSE_THRESHOLD 1679#ifdef MOUSE_THRESHOLD
1286
1287 } 1680 }
1288#endif 1681#endif
1289
1290 } 1682 }
1291 } 1683 }
1292 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1293 { 1685 {
1294 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1295 MotionNotify, &ev)) ; 1687 MotionNotify, &ev))
1688 ;
1689
1296 XQueryPointer (display->display, scrollBar.win, 1690 XQueryPointer (dpy, scrollBar.win,
1297 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1298 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1299 & (ev.xbutton.x), & (ev.xbutton.y), 1693 &ev.xbutton.x, &ev.xbutton.y,
1300 &unused_mask); 1694 &unused_mask);
1301 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1302 scrollbar_size ()); 1696 scrollbar_size ());
1303 scr_refresh (refresh_type); 1697 want_refresh = 1;
1304 refresh_limit = 0; 1698 refresh_limit = 0;
1305 scrollbar_show (1); 1699 scrollbar_show (1);
1306 } 1700 }
1307 break; 1701 break;
1308 } 1702 }
1309}
1310 1703
1704#if defined(CURSOR_BLINK)
1705 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1706 {
1707 if (hidden_cursor)
1708 {
1709 hidden_cursor = 0;
1710 want_refresh = 1;
1711 }
1712
1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1714 }
1715#endif
1716
1717#if defined(POINTER_BLANK)
1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1719 {
1720 if (ev.type == MotionNotify
1721 || ev.type == ButtonPress
1722 || ev.type == ButtonRelease)
1723 if (hidden_pointer)
1724 pointer_unblank ();
1725
1726 if (ev.type == KeyPress && hidden_pointer == 0)
1727 pointer_blank ();
1728 }
1729#endif
1730}
1731
1732void
1733rxvt_term::focus_in ()
1734{
1735 if (!focus)
1736 {
1737 focus = 1;
1738 want_refresh = 1;
1739
1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1741
1742#if USE_XIM
1743 if (Input_Context != NULL)
1744 {
1745 IMSetPosition ();
1746 XSetICFocus (Input_Context);
1747 }
1748#endif
1749#if CURSOR_BLINK
1750 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1752#endif
1753#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade])
1755 {
1756 pix_colors = pix_colors_focused;
1757 scr_recolour ();
1758 }
1759#endif
1760#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell))
1762 {
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]);
1766 if (h != NULL)
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1771 }
1772#endif
1773 }
1774}
1775
1776void
1777rxvt_term::focus_out ()
1778{
1779 if (focus)
1780 {
1781 focus = 0;
1782 want_refresh = 1;
1783
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1785
1786#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf)
1788 {
1789 iso14755buf = 0;
1790# if ENABLE_OVERLAY
1791 scr_overlay_off ();
1792# endif
1793 }
1794#endif
1795#if USE_XIM
1796 if (Input_Context != NULL)
1797 XUnsetICFocus (Input_Context);
1798#endif
1799#if CURSOR_BLINK
1800 if (option (Opt_cursorBlink))
1801 cursor_blink_ev.stop ();
1802 hidden_cursor = 0;
1803#endif
1804#if OFF_FOCUS_FADING
1805 if (rs[Rs_fade])
1806 {
1807 pix_colors = pix_colors_unfocused;
1808 scr_recolour ();
1809 }
1810#endif
1811 }
1812}
1813
1814void
1815rxvt_term::update_fade_color (unsigned int idx)
1816{
1817#if OFF_FOCUS_FADING
1818 if (rs[Rs_fade])
1819 {
1820 rgba c;
1821 pix_colors [Color_fade].get (c);
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 }
1824#endif
1825}
1826
1827#if TRANSPARENT || ENABLE_PERL
1311void 1828void
1312rxvt_term::rootwin_cb (XEvent &ev) 1829rxvt_term::rootwin_cb (XEvent &ev)
1313{ 1830{
1314 SET_R (this); 1831 make_current ();
1315 SET_LOCALE (locale);
1316 1832
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return;
1836
1837# if TRANSPARENT
1317 switch (ev.type) 1838 switch (ev.type)
1318 { 1839 {
1319 case PropertyNotify: 1840 case PropertyNotify:
1320 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1321 {
1322 if (ev.xproperty.state == PropertyNewValue)
1323 selection_property (ev.xproperty.window, ev.xproperty.atom);
1324 break;
1325 }
1326#ifdef TRANSPARENT
1327 else
1328 {
1329 /* 1841 /*
1330 * if user used some Esetroot compatible prog to set the root bg, 1842 * if user used some Esetroot compatible prog to set the root bg,
1331 * use the property to determine the pixmap. We use it later on. 1843 * use the property to determine the pixmap. We use it later on.
1332 */ 1844 */
1333 if (xa[XA_XROOTPMAPID] == 0)
1334 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1335
1336 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1845 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1337 return; 1847 return;
1338 }
1339 1848
1340 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1341 case ReparentNotify: 1850 case ReparentNotify:
1342 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1343 want_full_refresh = 1; 1852 check_our_parents ();
1344 break; 1853 break;
1854 }
1345#endif 1855# endif
1346 }
1347} 1856}
1857#endif
1348 1858
1349void 1859void
1350rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
1351{ 1861{
1352 int reportmode = 0, clickintime; 1862 int reportmode = 0, clickintime;
1353 1863
1354 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1864 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1865
1355 if (!bypass_keystate) 1866 if (!bypass_keystate)
1356 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1867 reportmode = !! (priv_modes & PrivMode_mouse_report);
1868
1357 /* 1869 /*
1358 * VT window processing of button press 1870 * VT window processing of button press
1359 */ 1871 */
1360 if (ev.window == TermWin.vt) 1872 if (ev.window == vt)
1361 { 1873 {
1874 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1875 return;
1876
1877#if ISO_14755
1878 // 5.4
1879 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1880 {
1881 iso14755_54 (ev.x, ev.y);
1882 return;
1883 }
1884#endif
1885
1362 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1886 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1887
1363 if (reportmode) 1888 if (reportmode)
1364 { 1889 {
1365 /* mouse report from vt window */ 1890 /* mouse report from vt window */
1366 /* save the xbutton state (for ButtonRelease) */ 1891 /* save the xbutton state (for ButtonRelease) */
1367 MEvent.state = ev.state; 1892 MEvent.state = ev.state;
1368#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1369 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1370 { 1895 {
1371 /* same button, within alloted time */ 1896 /* same button, within alloted time */
1372 MEvent.clicks++; 1897 MEvent.clicks++;
1898
1373 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1374 { 1900 {
1375 /* only report double clicks */ 1901 /* only report double clicks */
1376 MEvent.clicks = 2; 1902 MEvent.clicks = 2;
1377 mouse_report (ev); 1903 mouse_report (ev);
… …
1396 } 1922 }
1397 else 1923 else
1398 { 1924 {
1399 if (ev.button != MEvent.button) 1925 if (ev.button != MEvent.button)
1400 MEvent.clicks = 0; 1926 MEvent.clicks = 0;
1927
1401 switch (ev.button) 1928 switch (ev.button)
1402 { 1929 {
1403 case Button1: 1930 case Button1:
1931 /* allow meta + click to select rectangular areas */
1932 /* should be done in screen.C */
1933#if ENABLE_FRILLS
1934 selection.rect = !!(ev.state & ModMetaMask);
1935#else
1936 selection.rect = false;
1937#endif
1938
1404 /* allow shift+left click to extend selection */ 1939 /* allow shift+left click to extend selection */
1405 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1940 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1406 { 1941 {
1407 if (MEvent.button == Button1 && clickintime) 1942 if (MEvent.button == Button1 && clickintime)
1408 selection_rotate (ev.x, ev.y); 1943 selection_rotate (ev.x, ev.y);
1409 else 1944 else
1410 selection_extend (ev.x, ev.y, 1); 1945 selection_extend (ev.x, ev.y, 1);
… …
1425 case Button3: 1960 case Button3:
1426 if (MEvent.button == Button3 && clickintime) 1961 if (MEvent.button == Button3 && clickintime)
1427 selection_rotate (ev.x, ev.y); 1962 selection_rotate (ev.x, ev.y);
1428 else 1963 else
1429 selection_extend (ev.x, ev.y, 1); 1964 selection_extend (ev.x, ev.y, 1);
1965
1430 MEvent.button = Button3; 1966 MEvent.button = Button3;
1431 break; 1967 break;
1432 } 1968 }
1433 } 1969 }
1970
1434 MEvent.time = ev.time; 1971 MEvent.time = ev.time;
1435 return; 1972 return;
1436 } 1973 }
1437 1974
1438 /* 1975 /*
… …
1504 upordown = 1; /* down */ 2041 upordown = 1; /* down */
1505 } 2042 }
1506 if (upordown) 2043 if (upordown)
1507 { 2044 {
1508#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1509 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2046 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1510#endif 2047#endif
1511 if (scr_page (upordown < 0 ? UP : DN, 1)) 2048 if (scr_page (upordown < 0 ? UP : DN, 1))
1512 { 2049 {
1513 if (upordown < 0) 2050 if (upordown < 0)
1514 scrollBar.setUp (); 2051 scrollBar.setUp ();
… …
1530 break; 2067 break;
1531 case R_SB_ALIGN_BOTTOM: 2068 case R_SB_ALIGN_BOTTOM:
1532 csrO = scrollBar.bot - scrollBar.top; 2069 csrO = scrollBar.bot - scrollBar.top;
1533 break; 2070 break;
1534 } 2071 }
2072
1535 if (scrollBar.style == R_SB_XTERM 2073 if (scrollBar.style == R_SB_XTERM
1536 || scrollbar_above_slider (ev.y) 2074 || scrollbar_above_slider (ev.y)
1537 || scrollbar_below_slider (ev.y)) 2075 || scrollbar_below_slider (ev.y))
1538 scr_move_to ( scrollbar_position (ev.y) - csrO, 2076 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1539 scrollbar_size ()); 2077
1540 scrollBar.setMotion (); 2078 scrollBar.setMotion ();
1541 break; 2079 break;
1542 2080
1543 case Button1: 2081 case Button1:
1544 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2082 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1548 case Button3: 2086 case Button3:
1549 if (scrollBar.style != R_SB_XTERM) 2087 if (scrollBar.style != R_SB_XTERM)
1550 { 2088 {
1551 if (scrollbar_above_slider (ev.y)) 2089 if (scrollbar_above_slider (ev.y))
1552# ifdef RXVT_SCROLL_FULL 2090# ifdef RXVT_SCROLL_FULL
1553 scr_page (UP, TermWin.nrow - 1); 2091 scr_page (UP, nrow - 1);
1554# else 2092# else
1555 scr_page (UP, TermWin.nrow / 4); 2093 scr_page (UP, nrow / 4);
1556# endif 2094# endif
1557 else if (scrollbar_below_slider (ev.y)) 2095 else if (scrollbar_below_slider (ev.y))
1558# ifdef RXVT_SCROLL_FULL 2096# ifdef RXVT_SCROLL_FULL
1559 scr_page (DN, TermWin.nrow - 1); 2097 scr_page (DN, nrow - 1);
1560# else 2098# else
1561 scr_page (DN, TermWin.nrow / 4); 2099 scr_page (DN, nrow / 4);
1562# endif 2100# endif
1563 else 2101 else
1564 scrollBar.setMotion (); 2102 scrollBar.setMotion ();
1565 } 2103 }
1566 else 2104 else
1567 { 2105 {
1568 scr_page ((ev.button == Button1 ? DN : UP), 2106 scr_page ((ev.button == Button1 ? DN : UP),
1569 (TermWin.nrow 2107 (nrow
1570 * scrollbar_position (ev.y) 2108 * scrollbar_position (ev.y)
1571 / scrollbar_size ())); 2109 / scrollbar_size ()));
1572 } 2110 }
2111
1573 break; 2112 break;
1574 } 2113 }
1575 } 2114 }
2115
1576 return; 2116 return;
1577 } 2117 }
1578#if MENUBAR
1579 /*
1580 * Menubar window processing of button press
1581 */
1582 if (isMenuBarWindow (ev.window))
1583 menubar_control (ev);
1584#endif
1585} 2118}
1586 2119
1587void 2120void
1588rxvt_term::button_release (XButtonEvent &ev) 2121rxvt_term::button_release (XButtonEvent &ev)
1589{ 2122{
1590 int reportmode = 0; 2123 int reportmode = 0;
1591 2124
1592 csrO = 0; /* reset csr Offset */ 2125 csrO = 0; /* reset csr Offset */
1593 if (!bypass_keystate) 2126 if (!bypass_keystate)
1594 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2127 reportmode = !! (priv_modes & PrivMode_mouse_report);
1595 2128
1596 if (scrollbar_isUpDn ()) 2129 if (scrollbar_isUpDn ())
1597 { 2130 {
1598 scrollBar.setIdle (); 2131 scrollBar.setIdle ();
1599 scrollbar_show (0); 2132 scrollbar_show (0);
1600#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1601 refresh_type &= ~SMOOTH_REFRESH;
1602#endif
1603
1604 } 2133 }
2134
1605#ifdef SELECTION_SCROLLING 2135#ifdef SELECTION_SCROLLING
1606 pending_scroll_selection=0; 2136 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop();
1607#endif 2138#endif
2139
1608 if (ev.window == TermWin.vt) 2140 if (ev.window == vt)
1609 { 2141 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2143 return;
2144
2145#if ISO_14755
2146 // 5.4
2147 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2148 return;
2149#endif
2150
1610 if (reportmode) 2151 if (reportmode)
1611 { 2152 {
1612 /* mouse report from vt window */ 2153 /* mouse report from vt window */
1613 /* don't report release of wheel "buttons" */ 2154 /* don't report release of wheel "buttons" */
1614 if (ev.button >= 4) 2155 if (ev.button >= 4)
… …
1628 MEvent.button = AnyButton; 2169 MEvent.button = AnyButton;
1629 mouse_report (ev); 2170 mouse_report (ev);
1630#endif /* MOUSE_REPORT_DOUBLECLICK */ 2171#endif /* MOUSE_REPORT_DOUBLECLICK */
1631 return; 2172 return;
1632 } 2173 }
2174
1633 /* 2175 /*
1634 * dumb hack to compensate for the failure of click-and-drag 2176 * dumb hack to compensate for the failure of click-and-drag
1635 * when overriding mouse reporting 2177 * when overriding mouse reporting
1636 */ 2178 */
1637 if (PrivateModes & PrivMode_mouse_report 2179 if (priv_modes & PrivMode_mouse_report
1638 && bypass_keystate 2180 && bypass_keystate
1639 && ev.button == Button1 && MEvent.clicks <= 1) 2181 && ev.button == Button1 && MEvent.clicks <= 1)
1640 selection_extend (ev.x, ev.y, 0); 2182 selection_extend (ev.x, ev.y, 0);
1641 2183
1642 switch (ev.button) 2184 switch (ev.button)
1643 { 2185 {
1644 case Button1: 2186 case Button1:
1645 case Button3: 2187 case Button3:
1646 selection_make (ev.time); 2188 selection_make (ev.time);
1647 break; 2189 break;
2190
1648 case Button2: 2191 case Button2:
1649 selection_request (ev.time, ev.x, ev.y); 2192 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1650 break; 2194 break;
2195
1651#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
1652 case Button4: 2197 case Button4:
1653 case Button5: 2198 case Button5:
1654 { 2199 {
1655 int i; 2200 int i;
1656 page_dirn v; 2201 page_dirn v;
1657 2202
1658 v = (ev.button == Button4) ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2204
1659 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
1660 i = 1; 2206 i = 1;
1661 else if ((Options & Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
1662 i = TermWin.nrow - 1; 2208 i = nrow - 1;
1663 else 2209 else
1664 i = 5; 2210 i = 5;
2211
1665# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
1666 if (ev.state & ControlMask) 2213 if (ev.state & ControlMask)
1667 { 2214 {
1668 mouse_slip_wheel_speed += (v ? -1 : 1); 2215 mouse_slip_wheel_speed += v ? -1 : 1;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218
2219 if (slip_wheel_ev.at < NOW)
1669 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2220 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2221
2222 slip_wheel_ev.start ();
2223 }
2224 else
2225 {
2226# endif
2227 scr_page (v, i);
2228 scrollbar_show (1);
2229# ifdef MOUSE_SLIP_WHEELING
1670 } 2230 }
1671# endif 2231# endif
1672# ifdef JUMP_MOUSE_WHEEL
1673 scr_page (v, i);
1674 scr_refresh (SMOOTH_REFRESH);
1675 scrollbar_show (1);
1676# else
1677 while (i--)
1678 {
1679 scr_page (v, 1);
1680 scr_refresh (SMOOTH_REFRESH);
1681 scrollbar_show (1);
1682 }
1683# endif
1684
1685 } 2232 }
1686 break; 2233 break;
1687#endif 2234#endif
1688
1689 } 2235 }
1690 } 2236 }
1691#ifdef MENUBAR
1692 else if (isMenuBarWindow (ev.window))
1693 menubar_control (ev);
1694#endif
1695} 2237}
1696 2238
1697#ifdef TRANSPARENT 2239#ifdef TRANSPARENT
1698#if TINTING 2240#if TINTING && !defined(HAVE_AFTERIMAGE)
1699/* shading taken from eterm-0.9.2 */ 2241/* taken from aterm-0.4.2 */
1700/* RGB 15 */
1701 2242
1702static void 2243typedef uint32_t RUINT32T;
1703shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1704{
1705 unsigned char *ptr;
1706 int x, y;
1707 2244
1708 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2245void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
1709 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2246{
1710 /* No saturation */ 2247 int sh_r, sh_g, sh_b;
1711 for (y = h; --y >= 0;) { 2248 RUINT32T mask_r, mask_g, mask_b;
1712 for (x = -w; x < 0; x++) { 2249 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1713 int r, g, b; 2250 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2251 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2252 int i;
1714 2253
1715 b = ((uint16_t *) ptr)[x]; 2254 Visual *visual = term->visual;
1716 r = (b & 0x7c00) * rm; 2255
1717 g = (b & 0x3e0) * gm; 2256 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1718 b = (b & 0x1f) * bm; 2257
1719 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2258 /* for convenience */
1720 | ((g >> 8) & 0x3e0) 2259 mask_r = visual->red_mask;
1721 | ((b >> 8) & 0x1f); 2260 mask_g = visual->green_mask;
1722 } 2261 mask_b = visual->blue_mask;
1723 ptr += bpl; 2262
1724 } 2263 /* boring lookup table pre-initialization */
2264 switch (srcImage->bits_per_pixel) {
2265 case 15:
2266 if ((mask_r != 0x7c00) ||
2267 (mask_g != 0x03e0) ||
2268 (mask_b != 0x001f))
2269 return;
2270 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2271 lookup_r = lookup;
2272 lookup_g = lookup+32;
2273 lookup_b = lookup+32+32;
2274 sh_r = 10;
2275 sh_g = 5;
2276 sh_b = 0;
2277 break;
2278 case 16:
2279 if ((mask_r != 0xf800) ||
2280 (mask_g != 0x07e0) ||
2281 (mask_b != 0x001f))
2282 return;
2283 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2284 lookup_r = lookup;
2285 lookup_g = lookup+32;
2286 lookup_b = lookup+32+64;
2287 sh_r = 11;
2288 sh_g = 5;
2289 sh_b = 0;
2290 break;
2291 case 24:
2292 if ((mask_r != 0xff0000) ||
2293 (mask_g != 0x00ff00) ||
2294 (mask_b != 0x0000ff))
2295 return;
2296 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2297 lookup_r = lookup;
2298 lookup_g = lookup+256;
2299 lookup_b = lookup+256+256;
2300 sh_r = 16;
2301 sh_g = 8;
2302 sh_b = 0;
2303 break;
2304 case 32:
2305 if ((mask_r != 0xff0000) ||
2306 (mask_g != 0x00ff00) ||
2307 (mask_b != 0x0000ff))
2308 return;
2309 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2310 lookup_r = lookup;
2311 lookup_g = lookup+256;
2312 lookup_b = lookup+256+256;
2313 sh_r = 16;
2314 sh_g = 8;
2315 sh_b = 0;
2316 break;
2317 default:
2318 return; /* we do not support this color depth */
2319 }
2320
2321 /* prepare limits for color transformation (each channel is handled separately) */
2322 if (shade < 0) {
2323 shade = -shade;
2324 if (shade < 0) shade = 0;
2325 if (shade > 100) shade = 100;
2326
2327 lower_lim_r = 65535-rm;
2328 lower_lim_g = 65535-gm;
2329 lower_lim_b = 65535-bm;
2330
2331 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2332 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2333 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2334
2335 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1725 } else { 2336 } else {
1726 for (y = h; --y >= 0;) { 2337 if (shade < 0) shade = 0;
1727 for (x = -w; x < 0; x++) { 2338 if (shade > 100) shade = 100;
1728 int r, g, b;
1729 2339
1730 b = ((uint16_t *) ptr)[x]; 2340 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1731 r = (b & 0x7c00) * rm; 2341
1732 g = (b & 0x3e0) * gm; 2342 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1733 b = (b & 0x1f) * bm; 2343 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1734 r |= (!(r >> 15) - 1); 2344 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1735 g |= (!(g >> 10) - 1); 2345 }
1736 b |= (!(b >> 5) - 1); 2346
1737 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2347 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1738 | ((g >> 8) & 0x3e0) 2348 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1739 | ((b >> 8) & 0x1f); 2349 {
1740 } 2350 unsigned int tmp;
1741 ptr += bpl; 2351
2352 tmp = lower_lim_r;
2353 lower_lim_r = lower_lim_b;
2354 lower_lim_b = tmp;
2355
2356 tmp = upper_lim_r;
2357 upper_lim_r = upper_lim_b;
2358 upper_lim_b = tmp;
2359 }
2360
2361 /* fill our lookup tables */
2362 for (i = 0; i <= mask_r>>sh_r; i++)
2363 {
2364 RUINT32T tmp;
2365 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2366 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2367 lookup_r[i] = (tmp/65535)<<sh_r;
2368 }
2369 for (i = 0; i <= mask_g>>sh_g; i++)
2370 {
2371 RUINT32T tmp;
2372 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2373 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2374 lookup_g[i] = (tmp/65535)<<sh_g;
2375 }
2376 for (i = 0; i <= mask_b>>sh_b; i++)
2377 {
2378 RUINT32T tmp;
2379 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2380 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2381 lookup_b[i] = (tmp/65535)<<sh_b;
2382 }
2383
2384 /* apply table to input image (replacing colors by newly calculated ones) */
2385 switch (srcImage->bits_per_pixel)
2386 {
2387 case 15:
2388 {
2389 unsigned short *p1, *pf, *p, *pl;
2390 p1 = (unsigned short *) srcImage->data;
2391 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2392 while (p1 < pf)
2393 {
2394 p = p1;
2395 pl = p1 + srcImage->width;
2396 for (; p < pl; p++)
1742 } 2397 {
2398 *p = lookup_r[(*p & 0x7c00)>>10] |
2399 lookup_g[(*p & 0x03e0)>> 5] |
2400 lookup_b[(*p & 0x001f)];
2401 }
2402 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1743 } 2403 }
1744} 2404 break;
1745 2405 }
1746/* RGB 16 */ 2406 case 16:
1747static void 2407 {
1748shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2408 unsigned short *p1, *pf, *p, *pl;
1749{ 2409 p1 = (unsigned short *) srcImage->data;
1750 unsigned char *ptr; 2410 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1751 int x, y; 2411 while (p1 < pf)
1752 2412 {
1753 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2413 p = p1;
1754 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2414 pl = p1 + srcImage->width;
1755 /* No saturation */ 2415 for (; p < pl; p++)
1756 for (y = h; --y >= 0;) {
1757 for (x = -w; x < 0; x++) {
1758 int r, g, b;
1759
1760 b = ((uint16_t *) ptr)[x];
1761 r = (b & 0xf800) * rm;
1762 g = (b & 0x7e0) * gm;
1763 b = (b & 0x1f) * bm;
1764 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1765 | ((g >> 8) & 0x7e0)
1766 | ((b >> 8) & 0x1f);
1767 }
1768 ptr += bpl;
1769 } 2416 {
1770 } else { 2417 *p = lookup_r[(*p & 0xf800)>>11] |
1771 for (y = h; --y >= 0;) { 2418 lookup_g[(*p & 0x07e0)>> 5] |
1772 for (x = -w; x < 0; x++) { 2419 lookup_b[(*p & 0x001f)];
1773 int r, g, b;
1774
1775 b = ((uint16_t *) ptr)[x];
1776 r = (b & 0xf800) * rm;
1777 g = (b & 0x7e0) * gm;
1778 b = (b & 0x1f) * bm;
1779 r |= (!(r >> 16) - 1);
1780 g |= (!(g >> 11) - 1);
1781 b |= (!(b >> 5) - 1);
1782 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1783 | ((g >> 8) & 0x7e0)
1784 | ((b >> 8) & 0x1f);
1785 } 2420 }
1786 ptr += bpl; 2421 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2422 }
2423 break;
2424 }
2425 case 24:
2426 {
2427 unsigned char *p1, *pf, *p, *pl;
2428 p1 = (unsigned char *) srcImage->data;
2429 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2430 while (p1 < pf)
2431 {
2432 p = p1;
2433 pl = p1 + srcImage->width * 3;
2434 for (; p < pl; p += 3)
1787 } 2435 {
2436 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2437 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2438 p[2] = lookup_r[(p[2] & 0x0000ff)];
2439 }
2440 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1788 } 2441 }
1789} 2442 break;
2443 }
2444 case 32:
2445 {
2446 RUINT32T *p1, *pf, *p, *pl;
2447 p1 = (RUINT32T *) srcImage->data;
2448 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1790 2449
1791/* RGB 24 */ 2450 while (p1 < pf)
1792static void 2451 {
1793shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2452 p = p1;
1794{ 2453 pl = p1 + srcImage->width;
1795 unsigned char *ptr; 2454 for (; p < pl; p++)
1796 int x, y;
1797
1798 ptr = (unsigned char *)data + (w * 3);
1799 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1800 /* No saturation */
1801 for (y = h; --y >= 0;) {
1802 for (x = -(w * 3); x < 0; x += 3) {
1803 int r, g, b;
1804
1805 if (byteorder.big_endian()) {
1806 r = (ptr[x + 0] * rm) >> 8;
1807 g = (ptr[x + 1] * gm) >> 8;
1808 b = (ptr[x + 2] * bm) >> 8;
1809 ptr[x + 0] = r;
1810 ptr[x + 1] = g;
1811 ptr[x + 2] = b;
1812 } else {
1813 r = (ptr[x + 2] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 0] * bm) >> 8;
1816 ptr[x + 2] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 0] = b;
1819 }
1820 }
1821 ptr += bpl;
1822 } 2455 {
1823 } else { 2456 *p = lookup_r[(*p & 0xff0000)>>16] |
1824 for (y = h; --y >= 0;) { 2457 lookup_g[(*p & 0x00ff00)>> 8] |
1825 for (x = -(w * 3); x < 0; x += 3) { 2458 lookup_b[(*p & 0x0000ff)] |
1826 int r, g, b; 2459 (*p & ~0xffffff);
1827
1828 if (byteorder.big_endian()) {
1829 r = (ptr[x + 0] * rm) >> 8;
1830 g = (ptr[x + 1] * gm) >> 8;
1831 b = (ptr[x + 2] * bm) >> 8;
1832
1833 r |= (!(r >> 8) - 1);
1834 g |= (!(g >> 8) - 1);
1835 b |= (!(b >> 8) - 1);
1836
1837 ptr[x + 0] = r;
1838 ptr[x + 1] = g;
1839 ptr[x + 2] = b;
1840 } else {
1841 r = (ptr[x + 2] * rm) >> 8;
1842 g = (ptr[x + 1] * gm) >> 8;
1843 b = (ptr[x + 0] * bm) >> 8;
1844
1845 r |= (!(r >> 8) - 1);
1846 g |= (!(g >> 8) - 1);
1847 b |= (!(b >> 8) - 1);
1848
1849 ptr[x + 2] = r;
1850 ptr[x + 1] = g;
1851 ptr[x + 0] = b;
1852 }
1853 } 2460 }
1854 ptr += bpl; 2461 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1855 } 2462 }
2463 break;
2464 }
1856 } 2465 }
1857}
1858 2466
1859/* RGB 32 */ 2467 free (lookup);
1860static void
1861shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1862{
1863 unsigned char *ptr;
1864 int x, y;
1865
1866 ptr = (unsigned char *)data + (w * 4);
1867 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1868 /* No saturation */
1869 for (y = h; --y >= 0;) {
1870 if (byteorder.big_endian()) {
1871 for (x = -(w * 4); x < 0; x += 4) {
1872 int r, g, b;
1873
1874 r = (ptr[x + 1] * rm) >> 8;
1875 g = (ptr[x + 2] * gm) >> 8;
1876 b = (ptr[x + 3] * bm) >> 8;
1877 ptr[x + 1] = r;
1878 ptr[x + 2] = g;
1879 ptr[x + 3] = b;
1880 }
1881 } else {
1882 for (x = -(w * 4); x < 0; x += 4) {
1883 int r, g, b;
1884
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888 ptr[x + 2] = r;
1889 ptr[x + 1] = g;
1890 ptr[x + 0] = b;
1891 }
1892 }
1893 ptr += bpl;
1894 }
1895 } else {
1896 for (y = h; --y >= 0;) {
1897 for (x = -(w * 4); x < 0; x += 4) {
1898 int r, g, b;
1899
1900 if (byteorder.big_endian()) {
1901 r = (ptr[x + 1] * rm) >> 8;
1902 g = (ptr[x + 2] * gm) >> 8;
1903 b = (ptr[x + 3] * bm) >> 8;
1904
1905 r |= (!(r >> 8) - 1);
1906 g |= (!(g >> 8) - 1);
1907 b |= (!(b >> 8) - 1);
1908
1909 ptr[x + 1] = r;
1910 ptr[x + 2] = g;
1911 ptr[x + 3] = b;
1912 } else {
1913 r = (ptr[x + 2] * rm) >> 8;
1914 g = (ptr[x + 1] * gm) >> 8;
1915 b = (ptr[x + 0] * bm) >> 8;
1916
1917 r |= (!(r >> 8) - 1);
1918 g |= (!(g >> 8) - 1);
1919 b |= (!(b >> 8) - 1);
1920
1921 ptr[x + 2] = r;
1922 ptr[x + 1] = g;
1923 ptr[x + 0] = b;
1924 }
1925 }
1926 ptr += bpl;
1927 }
1928 }
1929} 2468}
1930
1931#endif 2469#endif
1932 2470
1933/* 2471/*
1934 * Check our parents are still who we think they are. 2472 * Check our parents are still who we think they are.
1935 * Do transparency updates if required 2473 * Do transparency updates if required
1936 */ 2474 */
1937int 2475int
1938rxvt_term::check_our_parents () 2476rxvt_term::check_our_parents ()
2477{
2478#if TRANSPARENT || ENABLE_PERL
2479 check_our_parents_ev.stop ();
2480 check_our_parents_ev.start (NOW + .1);
2481#endif
2482 return 0;
2483}
2484
2485void
2486rxvt_term::check_our_parents_cb (time_watcher &w)
1939{ 2487{
1940 int i, pchanged, aformat, have_pixmap, rootdepth; 2488 int i, pchanged, aformat, have_pixmap, rootdepth;
1941 unsigned long nitems, bytes_after; 2489 unsigned long nitems, bytes_after;
1942 Atom atype; 2490 Atom atype;
1943 unsigned char *prop = NULL; 2491 unsigned char *prop = NULL;
1944 Window root, oldp, *list; 2492 Window root, oldp, *list;
1945 Pixmap rootpixmap = None; 2493 Pixmap rootpixmap = None;
1946 XWindowAttributes wattr, wrootattr; 2494 XWindowAttributes wattr, wrootattr;
2495 int sx, sy;
2496 Window cr;
1947 2497
1948 pchanged = 0; 2498 pchanged = 0;
1949 2499
1950 if (!(Options & Opt_transparent)) 2500 if (!option (Opt_transparent))
1951 return pchanged; /* Don't try any more */ 2501 return /*pchanged*/; /* Don't try any more */
1952 2502
1953 XGetWindowAttributes (display->display, display->root, &wrootattr); 2503 XGetWindowAttributes (dpy, display->root, &wrootattr);
1954 rootdepth = wrootattr.depth; 2504 rootdepth = wrootattr.depth;
1955 2505
1956 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2506 XGetWindowAttributes (dpy, parent[0], &wattr);
1957 2507
1958 if (rootdepth != wattr.depth) 2508 if (rootdepth != wattr.depth)
1959 { 2509 {
1960 if (am_transparent) 2510 if (am_transparent)
1961 { 2511 {
1962 pchanged = 1; 2512 pchanged = 1;
1963 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2513 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
1964 am_transparent = am_pixmap_trans = 0; 2514 am_transparent = am_pixmap_trans = 0;
1965 } 2515 }
1966 2516
1967 return pchanged; /* Don't try any more */ 2517 return /*pchanged*/; /* Don't try any more */
1968 } 2518 }
1969 2519
1970 /* Get all X ops out of the queue so that our information is up-to-date. */ 2520 /* Get all X ops out of the queue so that our information is up-to-date. */
1971 XSync (display->display, False); 2521 XSync (dpy, False);
1972 2522
2523 XTranslateCoordinates (dpy, parent[0], display->root,
2524 0, 0, &sx, &sy, &cr);
2525
2526 /* check if we are outside of the visible part of the virtual screen : */
2527 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
2528 || sx >= wrootattr.width || sy >= wrootattr.height )
2529 return /* 0 */ ;
1973 /* 2530 /*
1974 * Make the frame window set by the window manager have 2531 * Make the frame window set by the window manager have
1975 * the root background. Some window managers put multiple nested frame 2532 * the root background. Some window managers put multiple nested frame
1976 * windows for each client, so we have to take care about that. 2533 * windows for each client, so we have to take care about that.
1977 */ 2534 */
1978 i = (xa[XA_XROOTPMAPID] 2535 i = (xa[XA_XROOTPMAP_ID]
1979 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2536 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
1980 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2537 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1981 &nitems, &bytes_after, &prop) == Success); 2538 &nitems, &bytes_after, &prop) == Success);
1982 2539
1983 if (!i || prop == NULL) 2540 if (!i || prop == NULL)
1984 i = (xa[XA_XSETROOTID] 2541 i = (xa[XA_ESETROOT_PMAP_ID]
1985 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2542 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
1986 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2543 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1987 &nitems, &bytes_after, &prop) == Success); 2544 &nitems, &bytes_after, &prop) == Success);
1988 2545
1989 if (!i || prop == NULL) 2546 if (!i || prop == NULL
2547#if TINTING
2548 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
2549#ifdef HAVE_AFTERIMAGE
2550 && original_asim == NULL && rs[Rs_blurradius] == NULL
2551#endif
2552 )
2553#endif
2554 )
1990 have_pixmap = 0; 2555 have_pixmap = 0;
1991 else 2556 else
1992 { 2557 {
1993 have_pixmap = 1; 2558 have_pixmap = 1;
1994 rootpixmap = *(Pixmap *)prop; 2559 rootpixmap = *(Pixmap *)prop;
1995 XFree (prop); 2560 XFree (prop);
1996 } 2561 }
1997 2562
1998 if (have_pixmap) 2563 if (have_pixmap)
1999 { 2564 {
2565 Bool success = False ;
2566 GC gc;
2567 XGCValues gcvalue;
2568#ifdef HAVE_AFTERIMAGE
2569 {
2570 Pixmap tmp_pmap = None ;
2571 ShadingInfo shade;
2572 ARGB32 tint ;
2573 unsigned int pmap_w = 0, pmap_h = 0;
2574
2575 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h ))
2576 {
2577 int root_x = 0, root_y = 0;
2578
2579 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2580 if (ISSET_PIXCOLOR (Color_tint))
2581 {
2582 rgba c;
2583 pix_colors_focused [Color_tint].get (c);
2584 shade.tintColor.red = c.r;
2585 shade.tintColor.green = c.g;
2586 shade.tintColor.blue = c.b;
2587 }
2588 else
2589 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
2590 tint = shading2tint32( &shade );
2591 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2592 if (GetWinPosition (parent[0], &root_x, &root_y) )
2593 {
2594 ASImageLayer *layers = create_image_layers( 2 );
2595 ASImage *merged_im = NULL;
2596 int back_x, back_y, back_w, back_h;
2597 /* merge_layers does good job at tiling background appropriately,
2598 so all we need is to cut out smallest possible piece : */
2599#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
2600 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
2601 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
2602 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
2603 back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
2604 else \
2605 { /* small background - need the whole of it for successfull tiling :*/ \
2606 back_##xy = 0; \
2607 back_##wh = pmap_##wh; \
2608 }}while(0)
2609
2610 MAKE_ROOTPMAP_GEOM(x,w,width);
2611 MAKE_ROOTPMAP_GEOM(y,h,height);
2612
2613 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
2614 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
2615 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
2616 layers[0].clip_width = szHint.width;
2617 layers[0].clip_height = szHint.height;
2618 layers[0].tint = tint;
2619 if (rs[Rs_blurradius] && layers[0].im)
2620 {
2621 double r = atof(rs[Rs_blurradius]);
2622 ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
2623 if( tmp )
2624 {
2625 destroy_asimage( &layers[0].im );
2626 layers[0].im = tmp;
2627 }
2628 }
2629 if (original_asim != NULL)
2630 {
2631 int fore_w, fore_h;
2632 layers[1].im = original_asim;
2633 if( bgPixmap.auto_resize )
2634 {
2635 fore_w = szHint.width;
2636 fore_h = szHint.height;
2637 }
2638 else
2639 {
2640 fore_w = bgPixmap.w;
2641 fore_h = bgPixmap.h;
2642 }
2643 if (fore_w != original_asim->width
2644 || fore_h != original_asim->height)
2645 {
2646 layers[1].im = scale_asimage( display->asv,
2647 original_asim,
2648 fore_w, fore_h,
2649 ASA_ASImage, 100,
2650 ASIMAGE_QUALITY_DEFAULT );
2651 }
2652
2653 layers[1].clip_width = szHint.width;
2654 layers[1].clip_height = szHint.height;
2655
2656 if (rs[Rs_blendtype])
2657 {
2658 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);
2659 if( layers[1].merge_scanlines == NULL )
2660 layers[1].merge_scanlines = alphablend_scanlines;
2661 }
2662 }
2663 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1,
2664 szHint.width, szHint.height,
2665 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
2666 if (layers[1].im != original_asim)
2667 destroy_asimage( &(layers[1].im) );
2668 destroy_asimage( &(layers[0].im) );
2669 if (merged_im != NULL)
2670 {
2671 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
2672 destroy_asimage( &merged_im );
2673 }
2674 free( layers );
2675 }
2676 }
2677 if (tmp_pmap != None)
2678 {
2679 success = True;
2680 if (pixmap != None)
2681 XFreePixmap (dpy, pixmap);
2682 pixmap = tmp_pmap;
2683 }
2684 }
2685#else /* HAVE_AFTERIMAGE */
2686 {
2000 /* 2687 /*
2001 * Copy display->root pixmap transparency 2688 * Copy display->root pixmap transparency
2002 */ 2689 */
2003 int sx, sy, nx, ny; 2690 int nx, ny;
2004 unsigned int nw, nh; 2691 unsigned int nw, nh;
2005 Window cr;
2006 XImage *image; 2692 XImage *image;
2007 GC gc;
2008 XGCValues gcvalue;
2009 2693
2010 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2011 0, 0, &sx, &sy, &cr);
2012 nw = (unsigned int)szHint.width; 2694 nw = (unsigned int)szHint.width;
2013 nh = (unsigned int)szHint.height; 2695 nh = (unsigned int)szHint.height;
2014 nx = ny = 0; 2696 nx = ny = 0;
2015 2697
2016 if (sx < 0) 2698 if (sx < 0)
2017 { 2699 {
2018 nw += sx; 2700 nw += sx;
2019 nx = -sx; 2701 nx = -sx;
2020 sx = 0; 2702 sx = 0;
2021 } 2703 }
2022 2704
2023 if (sy < 0) 2705 if (sy < 0)
2024 { 2706 {
2025 nh += sy; 2707 nh += sy;
2026 ny = -sy; 2708 ny = -sy;
2027 sy = 0; 2709 sy = 0;
2028 } 2710 }
2029 2711
2030 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2712 min_it (nw, (unsigned int) (wrootattr.width - sx));
2031 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2713 min_it (nh, (unsigned int) (wrootattr.height - sy));
2714
2715 XSync (dpy, False);
2032 allowedxerror = -1; 2716 allowedxerror = -1;
2033 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2717 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2034 2718
2035 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2719 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2036 /* XXX: may need a delay here? */ 2720 /* XXX: may need a delay here? */
2037 allowedxerror = 0; 2721 allowedxerror = 0;
2038
2039 if (image == NULL) 2722 if (image != NULL)
2723 {
2724 if (pixmap != None)
2725 XFreePixmap (dpy, pixmap);
2726
2727#if TINTING
2728 if (ISSET_PIXCOLOR (Color_tint))
2729 {
2730 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2731
2732 rgba c;
2733 pix_colors_focused [Color_tint].get (c);
2734 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2735 }
2736#endif
2737
2738 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2739 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2740 XPutImage (dpy, pixmap, gc, image, 0, 0,
2741 nx, ny, image->width, image->height);
2742 XDestroyImage (image);
2743 success = True ;
2744 }
2745 }
2746#endif /* HAVE_AFTERIMAGE */
2747 if (gc != NULL)
2748 XFreeGC (dpy, gc);
2749
2750 if (!success)
2040 { 2751 {
2041 if (am_transparent && am_pixmap_trans) 2752 if (am_transparent && am_pixmap_trans)
2042 { 2753 {
2043 pchanged = 1; 2754 pchanged = 1;
2044 if (TermWin.pixmap != None) 2755 if (pixmap != None)
2045 { 2756 {
2046 XFreePixmap (display->display, TermWin.pixmap); 2757 XFreePixmap (dpy, pixmap);
2047 TermWin.pixmap = None; 2758 pixmap = None;
2048 } 2759 }
2049 } 2760 }
2050 2761
2051 am_pixmap_trans = 0; 2762 am_pixmap_trans = 0;
2052 } 2763 }
2053 else 2764 else
2054 { 2765 {
2055 if (TermWin.pixmap != None) 2766 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2056 XFreePixmap (display->display, TermWin.pixmap); 2767 XClearWindow (dpy, parent[0]);
2057
2058#if TINTING
2059 if (ISSET_PIXCOLOR (Color_tint))
2060 {
2061 unsigned short shade, rm, gm, bm;
2062
2063 PixColors[Color_tint].get (display, rm, gm, bm);
2064
2065 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...
2066
2067 /* Determine bitshift and bitmask values */
2068 switch (image->bits_per_pixel)
2069 {
2070 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2074 }
2075 }
2076#endif
2077
2078 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2079 szHint.width, szHint.height, image->depth);
2080 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2081 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2082 nx, ny, image->width, image->height);
2083 XFreeGC (display->display, gc);
2084 XDestroyImage (image);
2085 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2086 TermWin.pixmap);
2087 2768
2088 if (!am_transparent || !am_pixmap_trans) 2769 if (!am_transparent || !am_pixmap_trans)
2089 pchanged = 1; 2770 pchanged = 1;
2090 2771
2091 am_transparent = am_pixmap_trans = 1; 2772 am_transparent = am_pixmap_trans = 1;
2092 } 2773 }
2093 } 2774 }
2094 2775
2095 if (!am_pixmap_trans) 2776 if (am_pixmap_trans)
2777 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2778 else
2096 { 2779 {
2097 unsigned int n; 2780 unsigned int n;
2098 /* 2781 /*
2099 * InheritPixmap transparency 2782 * InheritPixmap transparency
2100 */ 2783 */
2101 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2102 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2784 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2103 { 2785 {
2104 oldp = TermWin.parent[i]; 2786 oldp = parent[i];
2105 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2787 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2106 &TermWin.parent[i], &list, &n);
2107 XFree (list); 2788 XFree (list);
2108 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2109 2789
2110 if (TermWin.parent[i] == display->root) 2790 if (parent[i] == display->root)
2111 { 2791 {
2112 if (oldp != None) 2792 if (oldp != None)
2113 pchanged = 1; 2793 pchanged = 1;
2114 2794
2115 break; 2795 break;
2116 } 2796 }
2117 2797
2118 if (oldp != TermWin.parent[i]) 2798 if (oldp != parent[i])
2119 pchanged = 1; 2799 pchanged = 1;
2120 } 2800 }
2121 2801
2122 n = 0; 2802 n = 0;
2123 2803
2124 if (pchanged) 2804 if (pchanged)
2125 {
2126 for (; n < (unsigned int)i; n++) 2805 for (; n < (unsigned int)i; n++)
2127 { 2806 {
2128 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2807 XGetWindowAttributes (dpy, parent[n], &wattr);
2129 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2808
2130 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2809 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2131 { 2810 {
2132 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2811 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2133 break; 2812 break;
2134 } 2813 }
2135 } 2814 }
2815
2816 if (n > (sizeof (parent) / sizeof (parent[0])))
2136 } 2817 {
2137
2138 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2139 {
2140 D_X ((stderr, "InheritPixmap Turning off"));
2141 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2818 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2142 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2819 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2143 am_transparent = 0; 2820 am_transparent = 0;
2144 /* XXX: also turn off Opt_transparent? */ 2821 /* XXX: also turn off Opt_transparent? */
2145 } 2822 }
2146 else 2823 else
2147 { 2824 {
2148#if WAIT_FOR_WM
2149 /* wait (an arbitrary period) for the WM to do its thing
2150 * needed for fvwm2.2.2 (and before?) */
2151 sleep (1);
2152#endif
2153 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2154 for (n = 0; n < (unsigned int)i; n++) 2825 for (n = 0; n < (unsigned int)i; n++)
2826 {
2155 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2827 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2828 XClearWindow (dpy, parent[n]);
2829 }
2156 2830
2157 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2831 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2158 am_transparent = 1; 2832 am_transparent = 1;
2159 } 2833 }
2160 2834
2161 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2835 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2162 TermWin.parent[i] = None; 2836 parent[i] = None;
2837 }
2838
2839 if (scrollBar.win)
2163 } 2840 {
2841 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2842 scrollBar.setIdle ();
2843 scrollbar_show (0);
2844 }
2164 2845
2846 if (am_transparent)
2847 {
2848 want_refresh = want_full_refresh = 1;
2849 if (am_pixmap_trans)
2850 flush ();
2851 }
2852
2165 return pchanged; 2853// return pchanged;
2166} 2854}
2167#endif 2855#endif
2168 2856
2169/*}}} */ 2857/*}}} */
2170 2858
2171bool 2859bool
2172rxvt_term::cmd_parse () 2860rxvt_term::cmd_parse ()
2173{ 2861{
2174 bool flag = false; 2862 bool flag = false;
2175 unicode_t ch = NOCHAR; 2863 wchar_t ch = NOCHAR;
2176 unsigned char *seq_begin; // remember start of esc-sequence here 2864 char *seq_begin; // remember start of esc-sequence here
2177 2865
2178 for (;;) 2866 for (;;)
2179 { 2867 {
2180 if (ch == NOCHAR) 2868 if (ch == NOCHAR)
2181 { 2869 {
2182 seq_begin = cmdbuf_ptr; 2870 seq_begin = cmdbuf_ptr;
2183 ch = next_char (); 2871 ch = next_char ();
2184 }
2185 2872
2186 if (ch == NOCHAR) // TODO: improve 2873 if (ch == NOCHAR)
2187 break; 2874 break;
2875 }
2188 2876
2189 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2877 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2190 { 2878 {
2879 if (!seen_input)
2880 {
2881 seen_input = 1;
2882 // many badly-written programs (e.g. jed) contain a race condition:
2883 // they first read the screensize and then install a SIGWINCH handler.
2884 // some window managers resize the window early, and these programs
2885 // then sometimes get the size wrong.
2886 // unfortunately other programs are even more buggy and dislike
2887 // being sent SIGWINCH, so only do it when we were in fact being
2888 // resized.
2889 if (seen_resize && cmd_pid)
2890 kill (-cmd_pid, SIGWINCH);
2891 }
2892
2191 /* Read a text string from the input buffer */ 2893 /* Read a text string from the input buffer */
2192 unicode_t buf[UBUFSIZ]; 2894 wchar_t buf[UBUFSIZ];
2193 bool refreshnow = false; 2895 bool refreshnow = false;
2194 int nlines = 0; 2896 int nlines = 0;
2195 unicode_t *str = buf; 2897 wchar_t *str = buf;
2196 2898 wchar_t *eol = str + min (ncol, UBUFSIZ);
2197 *str++ = ch;
2198 2899
2199 for (;;) 2900 for (;;)
2200 { 2901 {
2201 seq_begin = cmdbuf_ptr;
2202 ch = next_char ();
2203
2204 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2902 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2205 break; 2903 break;
2206 2904
2207 *str++ = ch; 2905 *str++ = ch;
2208 2906
2209 if (ch == C0_LF) 2907 if (ch == C0_LF || str >= eol)
2210 { 2908 {
2909 if (ch == C0_LF)
2211 nlines++; 2910 nlines++;
2911
2212 refresh_count++; 2912 refresh_count++;
2213 2913
2214 if (! (Options & Opt_jumpScroll) 2914 if (!option (Opt_jumpScroll)
2215 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2915 || (refresh_count >= refresh_limit * (nrow - 1)))
2216 { 2916 {
2217 refreshnow = true; 2917 refreshnow = true;
2218 flag = true; 2918 refresh_count = 0;
2219 ch = NOCHAR; 2919 ch = NOCHAR;
2220 break; 2920 break;
2221 } 2921 }
2222 2922
2223 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2923 // scr_add_lines only works for nlines <= nrow - 1.
2224 if (nlines >= TermWin.nrow - 1) 2924 if (nlines >= nrow - 1)
2225 { 2925 {
2926 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2927 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2226 scr_add_lines (buf, nlines, str - buf); 2928 scr_add_lines (buf, str - buf, nlines);
2929
2227 nlines = 0; 2930 nlines = 0;
2228 str = buf; 2931 str = buf;
2932 eol = str + min (ncol, UBUFSIZ);
2229 } 2933 }
2934
2935 if (str >= eol)
2936 {
2937 if (eol >= buf + UBUFSIZ)
2938 {
2939 ch = NOCHAR;
2940 break;
2941 }
2942 else
2943 eol = min (eol + ncol, buf + UBUFSIZ);
2944 }
2945
2230 } 2946 }
2231 2947
2232 if (str >= buf + UBUFSIZ) 2948 seq_begin = cmdbuf_ptr;
2233 { 2949 ch = next_char ();
2234 ch = NOCHAR;
2235 break;
2236 }
2237 } 2950 }
2238 2951
2952 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2953 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2239 scr_add_lines (buf, nlines, str - buf); 2954 scr_add_lines (buf, str - buf, nlines);
2240 2955
2241 /* 2956 /*
2242 * If there have been a lot of new lines, then update the screen 2957 * If there have been a lot of new lines, then update the screen
2243 * What the heck I'll cheat and only refresh less than every page-full. 2958 * What the heck I'll cheat and only refresh less than every page-full.
2244 * the number of pages between refreshes is refresh_limit, which 2959 * the number of pages between refreshes is refresh_limit, which
2245 * is incremented here because we must be doing flat-out scrolling. 2960 * is incremented here because we must be doing flat-out scrolling.
2246 *
2247 * refreshing should be correct for small scrolls, because of the
2248 * time-out
2249 */ 2961 */
2250 if (refreshnow) 2962 if (refreshnow)
2251 { 2963 {
2252 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2964 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2253 refresh_limit++; 2965 refresh_limit++;
2254 else 2966 else
2967 {
2968 flag = true;
2969 //TODO: due to popular request, implement "skipscroll" option here
2255 scr_refresh (refresh_type); 2970 scr_refresh ();
2971 want_refresh = 1;
2972 }
2256 } 2973 }
2257 2974
2258 } 2975 }
2259 else 2976 else
2260 { 2977 {
… …
2275 2992
2276 return flag; 2993 return flag;
2277} 2994}
2278 2995
2279// read the next character 2996// read the next character
2280unicode_t 2997wchar_t
2281rxvt_term::next_char () 2998rxvt_term::next_char () NOTHROW
2282{ 2999{
2283 while (cmdbuf_ptr < cmdbuf_endp) 3000 while (cmdbuf_ptr < cmdbuf_endp)
2284 { 3001 {
2285 // assume 7-bit to be ascii ALWAYS 3002 // assume 7-bit to be ascii ALWAYS
2286 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 3003 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2287 return *cmdbuf_ptr++; 3004 return *cmdbuf_ptr++;
2288 3005
2289 wchar_t wc; 3006 wchar_t wc;
2290 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 3007 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2291 3008
2292 if (len == (size_t)-2) 3009 if (len == (size_t)-2)
2293 { 3010 {
2294 // the mbstate stores incomplete sequences. didn't know this :/ 3011 // the mbstate stores incomplete sequences. didn't know this :/
2295 cmdbuf_ptr = cmdbuf_endp; 3012 cmdbuf_ptr = cmdbuf_endp;
2296 break; 3013 break;
2297 } 3014 }
2298 3015
2299 if (len == (size_t)-1) 3016 if (len == (size_t)-1)
2300 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 3017 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2301 3018
2302 // assume wchar == unicode 3019 // assume wchar == unicode
2303 cmdbuf_ptr += len; 3020 cmdbuf_ptr += len;
2304 return wc; 3021 return wc & UNICODE_MASK;
2305 } 3022 }
2306 3023
2307 return NOCHAR; 3024 return NOCHAR;
2308} 3025}
3026
3027// read the next octet
3028uint32_t
3029rxvt_term::next_octet () NOTHROW
3030{
3031 return cmdbuf_ptr < cmdbuf_endp
3032 ? (unsigned char)*cmdbuf_ptr++
3033 : NOCHAR;
3034}
3035
3036static class out_of_input out_of_input;
2309 3037
2310/* rxvt_cmd_getc () - Return next input character */ 3038/* rxvt_cmd_getc () - Return next input character */
2311/* 3039/*
2312 * Return the next input character after first passing any keyboard input 3040 * Return the next input character after first passing any keyboard input
2313 * to the command. 3041 * to the command.
2314 */ 3042 */
2315unicode_t 3043wchar_t
2316rxvt_term::cmd_getc () 3044rxvt_term::cmd_getc () THROW ((class out_of_input))
2317{ 3045{
2318 unicode_t c = next_char (); 3046 wchar_t c = next_char ();
3047
3048 if (c == NOCHAR)
3049 throw out_of_input;
3050
3051 return c;
3052}
3053
3054uint32_t
3055rxvt_term::cmd_get8 () THROW ((class out_of_input))
3056{
3057 uint32_t c = next_octet ();
2319 3058
2320 if (c == NOCHAR) 3059 if (c == NOCHAR)
2321 throw out_of_input; 3060 throw out_of_input;
2322 3061
2323 return c; 3062 return c;
… …
2423 case C0_ESC: 3162 case C0_ESC:
2424 process_escape_seq (); 3163 process_escape_seq ();
2425 break; 3164 break;
2426 case C0_ENQ: /* terminal Status */ 3165 case C0_ENQ: /* terminal Status */
2427 if (rs[Rs_answerbackstring]) 3166 if (rs[Rs_answerbackstring])
2428 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3167 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2429 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2430 else 3168 else
2431 tt_write ((unsigned char *)VT100_ANS, 3169 tt_write (VT100_ANS, strlen (VT100_ANS));
2432 (unsigned int)STRLEN (VT100_ANS));
2433 break; 3170 break;
2434 case C0_BEL: /* bell */ 3171 case C0_BEL: /* bell */
2435 scr_bell (); 3172 scr_bell ();
2436 break; 3173 break;
2437 case C0_BS: /* backspace */ 3174 case C0_BS: /* backspace */
… …
2453 break; 3190 break;
2454 case C0_SI: /* shift in - acs */ 3191 case C0_SI: /* shift in - acs */
2455 scr_charset_choose (0); 3192 scr_charset_choose (0);
2456 break; 3193 break;
2457 3194
3195#ifdef EIGHT_BIT_CONTROLS
2458 // 8-bit controls 3196 // 8-bit controls
2459 case 0x90: /* DCS */ 3197 case 0x90: /* DCS */
2460 process_dcs_seq (); 3198 process_dcs_seq ();
2461 break; 3199 break;
2462 case 0x9b: /* CSI */ 3200 case 0x9b: /* CSI */
2463 process_csi_seq (); 3201 process_csi_seq ();
2464 break; 3202 break;
2465 case 0x9d: /* CSI */ 3203 case 0x9d: /* CSI */
2466 process_osc_seq (); 3204 process_osc_seq ();
2467 break; 3205 break;
3206#endif
2468 } 3207 }
2469} 3208}
2470/*}}} */ 3209/*}}} */
2471 3210
2472 3211
… …
2534void 3273void
2535rxvt_term::process_escape_seq () 3274rxvt_term::process_escape_seq ()
2536{ 3275{
2537 unicode_t ch = cmd_getc (); 3276 unicode_t ch = cmd_getc ();
2538 3277
2539 if (PrivateModes & PrivMode_vt52) 3278 if (priv_modes & PrivMode_vt52)
2540 { 3279 {
2541 process_escape_vt52 (ch); 3280 process_escape_vt52 (ch);
2542 return; 3281 return;
2543 } 3282 }
2544 3283
… …
2559 scr_charset_set (2, (unsigned int)cmd_getc ()); 3298 scr_charset_set (2, (unsigned int)cmd_getc ());
2560 break; 3299 break;
2561 case '+': 3300 case '+':
2562 scr_charset_set (3, (unsigned int)cmd_getc ()); 3301 scr_charset_set (3, (unsigned int)cmd_getc ());
2563 break; 3302 break;
2564#ifndef NO_FRILLS 3303#if !ENABLE_MINIMAL
2565 case '6': 3304 case '6':
2566 scr_backindex (); 3305 scr_backindex ();
2567 break; 3306 break;
2568#endif 3307#endif
2569 case '7': 3308 case '7':
2570 scr_cursor (SAVE); 3309 scr_cursor (SAVE);
2571 break; 3310 break;
2572 case '8': 3311 case '8':
2573 scr_cursor (RESTORE); 3312 scr_cursor (RESTORE);
2574 break; 3313 break;
2575#ifndef NO_FRILLS 3314#if !ENABLE_MINIMAL
2576 case '9': 3315 case '9':
2577 scr_forwardindex (); 3316 scr_forwardindex ();
2578 break; 3317 break;
2579#endif 3318#endif
2580 case '=': 3319 case '=':
… …
2590 break; 3329 break;
2591 3330
2592 /* 8.3.87: NEXT LINE */ 3331 /* 8.3.87: NEXT LINE */
2593 case C1_NEL: /* ESC E */ 3332 case C1_NEL: /* ESC E */
2594 { 3333 {
2595 unicode_t nlcr[] = { C0_LF, C0_CR }; 3334 wchar_t nlcr[] = { C0_LF, C0_CR };
2596 scr_add_lines (nlcr, 1, 2); 3335 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2597 } 3336 }
2598 break; 3337 break;
2599 3338
2600 /* kidnapped escape sequence: Should be 8.3.48 */ 3339 /* kidnapped escape sequence: Should be 8.3.48 */
2601 case C1_ESA: /* ESC G */ 3340 case C1_ESA: /* ESC G */
… …
2623 process_dcs_seq (); 3362 process_dcs_seq ();
2624 break; 3363 break;
2625 3364
2626 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3365 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2627 case C1_SCI: /* ESC Z */ 3366 case C1_SCI: /* ESC Z */
2628 tt_write ((const unsigned char *)ESCZ_ANSWER, 3367 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2629 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2630 break; /* steal obsolete ESC [ c */ 3368 break; /* steal obsolete ESC [ c */
2631 3369
2632 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3370 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2633 case C1_CSI: /* ESC [ */ 3371 case C1_CSI: /* ESC [ */
2634 process_csi_seq (); 3372 process_csi_seq ();
… …
2661 3399
2662/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3400/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2663/* *INDENT-OFF* */ 3401/* *INDENT-OFF* */
2664enum { 3402enum {
2665 CSI_ICH = 0x40, 3403 CSI_ICH = 0x40,
2666 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3404 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2667 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3405 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2668 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3406 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2669 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3407 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2670 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3408 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2671 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3409 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2743 ndef = get_byte_array_bit (csi_defaults, i); 3481 ndef = get_byte_array_bit (csi_defaults, i);
2744 for (p = 0; p < nargs; p++) 3482 for (p = 0; p < nargs; p++)
2745 if (arg[p] == -1) 3483 if (arg[p] == -1)
2746 arg[p] = ndef; 3484 arg[p] = ndef;
2747 3485
2748#ifdef DEBUG_CMD
2749 fprintf (stderr, "CSI ");
2750 for (p = 0; p < nargs; p++)
2751 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2752 fprintf (stderr, "%c\n", ch);
2753#endif
2754
2755 /* 3486 /*
2756 * private mode handling 3487 * private mode handling
2757 */ 3488 */
2758 if (priv) 3489 if (priv)
2759 { 3490 {
2760 switch (priv) 3491 switch (priv)
2761 { 3492 {
2762 case '>': 3493 case '>':
2763 if (ch == CSI_DA) /* secondary device attributes */ 3494 if (ch == CSI_DA) /* secondary device attributes */
3495 {
3496 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3497 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3498 //
3499 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3500 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3501 // that we do not support xterm mouse reporting (should be 95 when we do).
3502 //
2764 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3503 tt_printf ("\033[>%d;94;0c", 'U');
3504 }
2765 break; 3505 break;
2766 case '?': 3506 case '?':
2767 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3507 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2768 process_terminal_mode (ch, priv, nargs, arg); 3508 process_terminal_mode (ch, priv, nargs, arg);
2769 break; 3509 break;
… …
2874 3614
2875 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3615 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2876 arg[0] = -arg[0]; 3616 arg[0] = -arg[0];
2877 /* FALLTHROUGH */ 3617 /* FALLTHROUGH */
2878 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3618 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2879 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3619 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2880 break; 3620 break;
2881 3621
2882 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3622 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2883 tt_write ((const unsigned char *)VT100_ANS, 3623 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2884 (unsigned int) (sizeof (VT100_ANS) - 1));
2885 break; 3624 break;
2886 3625
2887 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3626 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2888 process_sgr_mode (nargs, arg); 3627 process_sgr_mode (nargs, arg);
2889 break; 3628 break;
… …
2896 break; 3635 break;
2897 case 6: /* CPR requested */ 3636 case 6: /* CPR requested */
2898 scr_report_position (); 3637 scr_report_position ();
2899 break; 3638 break;
2900 case 7: /* unofficial extension */ 3639 case 7: /* unofficial extension */
2901 if (Options & Opt_insecure) 3640 if (option (Opt_insecure))
2902 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3641 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2903 break; 3642 break;
2904 case 8: /* unofficial extension */ 3643 case 8: /* unofficial extension */
2905 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3644 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2906 break; 3645 break;
2907 } 3646 }
… …
2943 break; 3682 break;
2944 3683
2945 case CSI_RM: /* 8.3.107: RESET MODE */ 3684 case CSI_RM: /* 8.3.107: RESET MODE */
2946 if (arg[0] == 4) 3685 if (arg[0] == 4)
2947 scr_insert_mode (0); 3686 scr_insert_mode (0);
3687 else if (arg[0] == 20)
3688 priv_modes &= ~PrivMode_LFNL;
2948 break; 3689 break;
2949 3690
2950 case CSI_SM: /* 8.3.126: SET MODE */ 3691 case CSI_SM: /* 8.3.126: SET MODE */
2951 if (arg[0] == 4) 3692 if (arg[0] == 4)
2952 scr_insert_mode (1); 3693 scr_insert_mode (1);
3694 else if (arg[0] == 20)
3695 priv_modes |= PrivMode_LFNL;
2953 break; 3696 break;
2954 3697
2955 /* 3698 /*
2956 * PRIVATE USE beyond this point. All CSI_7? sequences here 3699 * PRIVATE USE beyond this point. All CSI_7? sequences here
2957 */ 3700 */
… …
2969 break; 3712 break;
2970 case CSI_75: 3713 case CSI_75:
2971 scr_cursor (RESTORE); 3714 scr_cursor (RESTORE);
2972 break; 3715 break;
2973 3716
2974#ifndef NO_FRILLS 3717#if !ENABLE_MINIMAL
2975 case CSI_74: 3718 case CSI_74:
2976 process_window_ops (arg, nargs); 3719 process_window_ops (arg, nargs);
2977 break; 3720 break;
2978#endif 3721#endif
2979 3722
… …
2986 break; 3729 break;
2987 } 3730 }
2988} 3731}
2989/*}}} */ 3732/*}}} */
2990 3733
2991#ifndef NO_FRILLS 3734#if !ENABLE_MINIMAL
2992/* ARGSUSED */ 3735/* ARGSUSED */
2993void 3736void
2994rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3737rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2995{ 3738{
2996 int x, y; 3739 int x, y;
2997 XWindowAttributes wattr; 3740 XWindowAttributes wattr;
2998 Window wdummy; 3741 Window wdummy;
3742
3743 dLocal (Display *, dpy);
2999 3744
3000 if (nargs == 0) 3745 if (nargs == 0)
3001 return; 3746 return;
3002 3747
3003 switch (args[0]) 3748 switch (args[0])
3004 { 3749 {
3005 /* 3750 /*
3006 * commands 3751 * commands
3007 */ 3752 */
3008 case 1: /* deiconify window */ 3753 case 1: /* deiconify window */
3009 XMapWindow (display->display, TermWin.parent[0]); 3754 XMapWindow (dpy, parent[0]);
3010 break; 3755 break;
3011 case 2: /* iconify window */ 3756 case 2: /* iconify window */
3012 XIconifyWindow (display->display, TermWin.parent[0], 3757 XIconifyWindow (dpy, parent[0], display->screen);
3013 DefaultScreen (display->display));
3014 break; 3758 break;
3015 case 3: /* set position (pixels) */ 3759 case 3: /* set position (pixels) */
3016 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3760 XMoveWindow (dpy, parent[0], args[1], args[2]);
3017 break; 3761 break;
3018 case 4: /* set size (pixels) */ 3762 case 4: /* set size (pixels) */
3019 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3763 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3020 break; 3764 break;
3021 case 5: /* raise window */ 3765 case 5: /* raise window */
3022 XRaiseWindow (display->display, TermWin.parent[0]); 3766 XRaiseWindow (dpy, parent[0]);
3023 break; 3767 break;
3024 case 6: /* lower window */ 3768 case 6: /* lower window */
3025 XLowerWindow (display->display, TermWin.parent[0]); 3769 XLowerWindow (dpy, parent[0]);
3026 break; 3770 break;
3027 case 7: /* refresh window */ 3771 case 7: /* refresh window */
3028 scr_touch (true); 3772 scr_touch (true);
3029 break; 3773 break;
3030 case 8: /* set size (chars) */ 3774 case 8: /* set size (chars) */
3031 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3775 set_widthheight ((unsigned int) (args[2] * fwidth),
3032 (unsigned int) (args[1] * TermWin.fheight)); 3776 (unsigned int) (args[1] * fheight));
3033 break; 3777 break;
3034 3778
3035 //case 9: NYI, TODO, restore maximized window or maximize window 3779 //case 9: NYI, TODO, restore maximized window or maximize window
3036 default: 3780 default:
3037 if (args[0] >= 24) /* set height (chars) */ 3781 if (args[0] >= 24) /* set height (chars) */
3038 set_widthheight ((unsigned int)TermWin.width, 3782 set_widthheight ((unsigned int)width,
3039 (unsigned int) (args[1] * TermWin.fheight)); 3783 (unsigned int) (args[1] * fheight));
3040 break; 3784 break;
3041
3042 3785
3043 /* 3786 /*
3044 * reports - some output format copied from XTerm 3787 * reports - some output format copied from XTerm
3045 */ 3788 */
3046 case 11: /* report window state */ 3789 case 11: /* report window state */
3047 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3790 XGetWindowAttributes (dpy, parent[0], &wattr);
3048 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3791 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3049 break; 3792 break;
3050 case 13: /* report window position */ 3793 case 13: /* report window position */
3051 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3794 XGetWindowAttributes (dpy, parent[0], &wattr);
3052 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3795 XTranslateCoordinates (dpy, parent[0], wattr.root,
3053 -wattr.border_width, -wattr.border_width, 3796 -wattr.border_width, -wattr.border_width,
3054 &x, &y, &wdummy); 3797 &x, &y, &wdummy);
3055 tt_printf ("\033[3;%d;%dt", x, y); 3798 tt_printf ("\033[3;%d;%dt", x, y);
3056 break; 3799 break;
3057 case 14: /* report window size (pixels) */ 3800 case 14: /* report window size (pixels) */
3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3801 XGetWindowAttributes (dpy, parent[0], &wattr);
3059 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3802 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3060 break; 3803 break;
3061 case 18: /* report text area size (chars) */ 3804 case 18: /* report text area size (chars) */
3062 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3805 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3063 break; 3806 break;
3064 case 19: /* report window size (chars) */ 3807 case 19: /* report window size (chars) */
3065 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3808 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3066 break; 3809 break;
3067 case 20: /* report icon label */ 3810 case 20: /* report icon label */
3068 if (Options & Opt_insecure)
3069 { 3811 {
3070 char *s; 3812 char *s;
3071 XGetIconName (display->display, TermWin.parent[0], &s); 3813 XGetIconName (dpy, parent[0], &s);
3072 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3814 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3815 XFree (s);
3073 } 3816 }
3074 break; 3817 break;
3075 case 21: /* report window title */ 3818 case 21: /* report window title */
3076 if (Options & Opt_insecure)
3077 { 3819 {
3078 char *s; 3820 char *s;
3079 XFetchName (display->display, TermWin.parent[0], &s); 3821 XFetchName (dpy, parent[0], &s);
3080 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3822 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3823 XFree (s);
3081 } 3824 }
3082 break; 3825 break;
3083 } 3826 }
3084} 3827}
3085#endif 3828#endif
3086 3829
3087/*----------------------------------------------------------------------*/ 3830/*----------------------------------------------------------------------*/
3088/* 3831/*
3089 * get input up until STRING TERMINATOR (or BEL) 3832 * get input up until STRING TERMINATOR (or BEL)
3090 * ends_how is terminator used. returned input must be free()'d 3833 * ends_how is terminator used. returned input must be free()'d
3091 */ 3834 */
3092unsigned char * 3835char *
3093rxvt_term::get_to_st (unicode_t &ends_how) 3836rxvt_term::get_to_st (unicode_t &ends_how)
3094{ 3837{
3095 int seen_esc = 0; /* seen escape? */ 3838 unicode_t ch;
3839 bool seen_esc = false;
3096 unsigned int n = 0; 3840 unsigned int n = 0;
3097 unsigned char *s;
3098 unicode_t ch;
3099 unsigned char string[STRING_MAX]; 3841 wchar_t string[STRING_MAX];
3100 3842
3101 while ((ch = cmd_getc ())) 3843 while ((ch = cmd_getc ()) != NOCHAR)
3102 { 3844 {
3103 if (ch == C0_BEL || ch == CHAR_ST)
3104 break;
3105
3106 if (seen_esc) 3845 if (seen_esc)
3846 {
3107 if (ch == 0x5c) /* 7bit ST */ 3847 if (ch == 0x5c) /* 7bit ST */
3108 break; 3848 break;
3109 else 3849 else
3110 return NULL; 3850 return NULL;
3111 3851 }
3112 if (ch == C0_ESC) 3852 else if (ch == C0_ESC)
3113 { 3853 {
3114 seen_esc = 1; 3854 seen_esc = true;
3115 continue; 3855 continue;
3116 } 3856 }
3857 else if (ch == C0_BEL || ch == CHAR_ST)
3858 break;
3117 else if (ch == C0_HT) 3859 else if (ch == C0_SYN)
3118 ch = ' '; /* translate '\t' to space */ 3860 ch = cmd_get8 ();
3119 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR)) 3861 else if (ch < 0x20)
3120 return NULL; /* other control character - exit */ 3862 return NULL; /* other control character - exit */
3121 3863
3122 if (n >= sizeof (string) - 1) 3864 seen_esc = false;
3865
3866 if (n >= STRING_MAX - 1)
3123 // stop at some sane length 3867 // stop at some sane length
3124 return NULL; 3868 return NULL;
3125 3869
3126 string[n++] = ch; 3870 string[n++] = ch;
3127 seen_esc = 0;
3128 } 3871 }
3129 3872
3130 string[n++] = '\0'; 3873 string[n++] = '\0';
3131 3874
3132 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3133 return NULL;
3134
3135 ends_how = (ch == 0x5c ? C0_ESC : ch); 3875 ends_how = (ch == 0x5c ? C0_ESC : ch);
3136 STRNCPY (s, string, n); 3876
3137 return s; 3877 return rxvt_wcstombs (string);
3138} 3878}
3139 3879
3140/*----------------------------------------------------------------------*/ 3880/*----------------------------------------------------------------------*/
3141/* 3881/*
3142 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3882 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3143 */ 3883 */
3144void 3884void
3145rxvt_term::process_dcs_seq () 3885rxvt_term::process_dcs_seq ()
3146{ 3886{
3147 unsigned char *s; 3887 char *s;
3148 unicode_t eh; 3888 unicode_t eh;
3149 3889
3150 /* 3890 /*
3151 * Not handled yet 3891 * Not handled yet
3152 */ 3892 */
… …
3171 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3911 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3172 arg = arg * 10 + (ch - '0'); 3912 arg = arg * 10 + (ch - '0');
3173 3913
3174 if (ch == ';') 3914 if (ch == ';')
3175 { 3915 {
3176 unsigned char *s = get_to_st (eh); 3916 char *s = get_to_st (eh);
3177 3917
3178 if (s) 3918 if (s)
3179 { 3919 {
3180 process_xterm_seq (arg, (char *)s, eh); 3920 process_xterm_seq (arg, s, eh);
3181 free (s); 3921 free (s);
3182 } 3922 }
3183 } 3923 }
3184} 3924}
3185 3925
3186void 3926void
3187rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3927rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3188{ 3928{
3189 if (str[0] == '?' && !str[1]) 3929 if (str[0] == '?' && !str[1])
3190 { 3930 {
3191 if (Options & Opt_insecure) 3931 rgba c;
3192 { 3932 pix_colors_focused[color].get (c);
3193 unsigned short r, g, b; 3933
3194 PixColors[color].get (display, r, g, b); 3934#if XFT
3935 if (c.a != rgba::MAX_CC)
3936 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3937 else
3938#endif
3195 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3939 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3196 }
3197 } 3940 }
3198 else 3941 else
3199 set_window_color (color, str); 3942 set_window_color (color, str);
3200} 3943}
3201 3944
3202/* 3945/*
3203 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3946 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3204 * 0 = change iconName/title
3205 * 1 = change iconName
3206 * 2 = change title
3207 * 4 = change color
3208 * 10 = change fg color
3209 * 11 = change bg color
3210 * 12 = change text color
3211 * 13 = change mouse foreground color
3212 * 17 = change highlight character colour
3213 * 18 = change bold character color
3214 * 19 = change underlined character color
3215 * 46 = change logfile (not implemented)
3216 * 50 = change font
3217 *
3218 * rxvt extensions:
3219 * 20 = bg pixmap
3220 * 39 = change default fg color
3221 * 49 = change default bg color
3222 * 55 = dump scrollback buffer and all of screen
3223 * 701 = change locale
3224 * 702 = find font
3225 * 703 = menu
3226 */ 3947 */
3227void 3948void
3228rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3949rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3229{ 3950{
3230 int changed = 0;
3231 int color; 3951 int color;
3232 char *buf, *name; 3952 char *buf, *name;
3233 bool query = str[0] == '?' && !str[1]; 3953 bool query = str[0] == '?' && !str[1];
3954 int saveop = op;
3955
3956 dLocal (Display *, dpy);
3234 3957
3235 assert (str != NULL); 3958 assert (str != NULL);
3959
3960 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3961 return;
3962
3236 switch (op) 3963 switch (op)
3237 { 3964 {
3238 case XTerm_name: 3965 case XTerm_name:
3239 set_title (str); 3966 set_title (str);
3240 /* FALLTHROUGH */ 3967 /* FALLTHROUGH */
… …
3245 set_title (str); 3972 set_title (str);
3246 break; 3973 break;
3247 case XTerm_property: 3974 case XTerm_property:
3248 if (str[0] == '?') 3975 if (str[0] == '?')
3249 { 3976 {
3250 Atom prop = XInternAtom (display->display, str + 1, True); 3977 Atom prop = display->atom (str + 1);
3251 Atom actual_type; 3978 Atom actual_type;
3252 int actual_format; 3979 int actual_format;
3253 unsigned long nitems; 3980 unsigned long nitems;
3254 unsigned long bytes_after; 3981 unsigned long bytes_after;
3255 unsigned char *value = 0; 3982 unsigned char *value = 0;
3256 const char *str = ""; 3983 const char *str = "";
3257 3984
3258 if (prop 3985 if (prop
3259 && XGetWindowProperty (display->display, TermWin.parent[0], 3986 && XGetWindowProperty (dpy, parent[0],
3260 prop, 0, 1<<16, 0, AnyPropertyType, 3987 prop, 0, 1<<16, 0, AnyPropertyType,
3261 &actual_type, &actual_format, 3988 &actual_type, &actual_format,
3262 &nitems, &bytes_after, &value) == Success 3989 &nitems, &bytes_after, &value) == Success
3263 && actual_type != None 3990 && actual_type != None
3264 && actual_format == 8) 3991 && actual_format == 8)
3265 str = (const char *)(value); 3992 str = (const char *)(value);
3266 3993
3267 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3994 tt_printf ("\033]%d;%s%c", op, str, resp);
3268 3995
3269 XFree (value); 3996 XFree (value);
3270 } 3997 }
3271 else 3998 else
3272 { 3999 {
3273 char *eq = strchr (str, '='); // constness lost, but verified to be ok 4000 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3274 4001
3275 if (eq) 4002 if (eq)
3276 { 4003 {
3277 *eq = 0; 4004 *eq = 0;
3278 XChangeProperty (display->display, TermWin.parent[0], 4005 set_utf8_property (display->atom (str), eq + 1);
3279 display->atom (str), XA_STRING, 8,
3280 PropModeReplace, (unsigned char *)eq + 1,
3281 strlen (eq + 1));
3282 } 4006 }
3283 else 4007 else
3284 XDeleteProperty (display->display, TermWin.parent[0], 4008 XDeleteProperty (dpy, parent[0],
3285 display->atom (str)); 4009 display->atom (str));
3286 } 4010 }
3287 break; 4011 break;
3288 4012
3289 case XTerm_Color: 4013 case XTerm_Color:
3290 for (buf = (char *)str; buf && *buf;) 4014 for (buf = (char *)str; buf && *buf;)
3291 { 4015 {
3292 if ((name = STRCHR (buf, ';')) == NULL) 4016 if ((name = strchr (buf, ';')) == NULL)
3293 break; 4017 break;
3294 4018
3295 *name++ = '\0'; 4019 *name++ = '\0';
3296 color = atoi (buf); 4020 color = atoi (buf) + minCOLOR;
3297 4021
3298 if (color < 0 || color >= TOTAL_COLORS) 4022 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3299 break; 4023 break;
3300 4024
3301 if ((buf = STRCHR (name, ';')) != NULL) 4025 if ((buf = strchr (name, ';')) != NULL)
3302 *buf++ = '\0'; 4026 *buf++ = '\0';
3303 4027
3304 if (name[0] == '?' && !name[1]) 4028 process_color_seq (op, color, name, resp);
3305 {
3306 if (Options & Opt_insecure)
3307 {
3308 unsigned short r, g, b;
3309 PixColors[color + minCOLOR].get (display, r, g, b);
3310 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3311 }
3312 }
3313 else
3314 set_window_color (color + minCOLOR, name);
3315 } 4029 }
3316 break; 4030 break;
3317 case XTerm_Color00: 4031 case XTerm_Color00:
3318 process_color_seq (XTerm_Color00, Color_fg, str, resp); 4032 process_color_seq (op, Color_fg, str, resp);
3319 break; 4033 break;
3320 case XTerm_Color01: 4034 case XTerm_Color01:
3321 process_color_seq (XTerm_Color00, Color_bg, str, resp); 4035 process_color_seq (op, Color_bg, str, resp);
3322 break; 4036 break;
3323#ifndef NO_CURSORCOLOR 4037#ifndef NO_CURSORCOLOR
3324 case XTerm_Color_cursor: 4038 case XTerm_Color_cursor:
3325 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 4039 process_color_seq (op, Color_cursor, str, resp);
3326 break; 4040 break;
3327#endif 4041#endif
3328 case XTerm_Color_pointer_fg: 4042 case XTerm_Color_pointer_fg:
3329 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 4043 process_color_seq (op, Color_pointer_fg, str, resp);
3330 break; 4044 break;
3331 case XTerm_Color_pointer_bg: 4045 case XTerm_Color_pointer_bg:
3332 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 4046 process_color_seq (op, Color_pointer_bg, str, resp);
3333 break; 4047 break;
3334#ifndef NO_BOLD_UNDERLINE_REVERSE 4048#ifndef NO_BOLD_UNDERLINE_REVERSE
3335 case XTerm_Color_BD:
3336 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3337 break;
3338 case XTerm_Color_UL:
3339 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3340 break;
3341 case XTerm_Color_RV: 4049 case XTerm_Color_RV:
3342 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 4050 process_color_seq (op, Color_RV, str, resp);
3343 break; 4051 break;
4052 case Rxvt_Color_BD:
4053 case URxvt_Color_BD:
4054 process_color_seq (op, Color_BD, str, resp);
4055 break;
4056 case Rxvt_Color_UL:
4057 case URxvt_Color_UL:
4058 process_color_seq (op, Color_UL, str, resp);
4059 break;
4060 case URxvt_Color_IT:
4061 process_color_seq (op, Color_IT, str, resp);
4062 break;
3344#endif 4063#endif
4064#if TRANSPARENT && TINTING
4065 case URxvt_Color_tint:
4066 process_color_seq (op, Color_tint, str, resp);
3345 4067
4068 check_our_parents ();
4069
4070 if (am_transparent)
4071 want_full_refresh = want_refresh = 1;
4072
4073 break;
4074#endif
4075
3346 case XTerm_Pixmap: 4076 case Rxvt_Pixmap:
4077 {
3347 if (*str != ';') 4078 if (*str != ';')
3348 { 4079 {
3349#if XPM_BACKGROUND 4080#if XPM_BACKGROUND
3350 scale_pixmap (""); /* reset to default scaling */ 4081 scale_pixmap (""); /* reset to default scaling */
3351 set_bgPixmap (str); /* change pixmap */ 4082 set_bgPixmap (str); /* change pixmap */
3352#endif
3353 scr_touch (true); 4083 scr_touch (true);
4084#endif
3354 } 4085 }
4086
4087 int changed = 0;
4088
3355 while ((str = STRCHR (str, ';')) != NULL) 4089 while ((str = strchr (str, ';')) != NULL)
3356 { 4090 {
3357 str++; 4091 str++;
3358#if XPM_BACKGROUND 4092#if XPM_BACKGROUND
3359 changed += scale_pixmap (str); 4093 changed += scale_pixmap (str);
3360#endif 4094#endif
3361
3362 } 4095 }
4096
3363 if (changed) 4097 if (changed)
3364 { 4098 {
3365#ifdef XPM_BACKGROUND 4099#ifdef XPM_BACKGROUND
3366 resize_pixmap (); 4100 resize_pixmap ();
3367#endif
3368 scr_touch (true); 4101 scr_touch (true);
4102#endif
3369 } 4103 }
4104#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
4105 if (option(Opt_transparent))
4106 check_our_parents ();
4107#endif
4108
4109 }
3370 break; 4110 break;
3371 4111
3372 case XTerm_restoreFG: 4112 case Rxvt_restoreFG:
3373 set_window_color (Color_fg, str); 4113 set_window_color (Color_fg, str);
3374 break; 4114 break;
3375 case XTerm_restoreBG: 4115 case Rxvt_restoreBG:
3376 set_window_color (Color_bg, str); 4116 set_window_color (Color_bg, str);
3377 break; 4117 break;
3378 4118
3379 case XTerm_logfile: 4119 case XTerm_logfile:
3380 // TODO, when secure mode? 4120 // TODO, when secure mode?
3381 break; 4121 break;
3382 4122
3383 case XTerm_font:
3384 if (query)
3385 {
3386 if (Options & Opt_insecure)
3387 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3388 TermWin.fontset->fontdesc
3389 ? TermWin.fontset->fontdesc
3390 : "",
3391 resp);
3392 }
3393 else
3394 change_font (str);
3395 break;
3396
3397#ifndef NO_FRILLS
3398 case XTerm_locale:
3399 if (query)
3400 {
3401 if (Options & Opt_insecure)
3402 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3403 }
3404 else
3405 {
3406 set_locale (str);
3407# ifdef USE_XIM
3408 im_cb ();
3409# endif
3410 }
3411 break;
3412
3413 case XTerm_findfont:
3414 if (Options & Opt_insecure)
3415 {
3416 int fid = TermWin.fontset->find_font (atoi (str));
3417 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3418 fid, (*TermWin.fontset)[fid]->name, resp);
3419 }
3420 break;
3421#endif
3422
3423#ifdef MENUBAR
3424 case XTerm_Menu:
3425 if (Options & Opt_insecure)
3426 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3427 break;
3428#endif
3429#if 0 4123#if 0
3430 case XTerm_dumpscreen: /* no error notices */ 4124 case Rxvt_dumpscreen: /* no error notices */
3431 { 4125 {
3432 int fd; 4126 int fd;
3433 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4127 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3434 { 4128 {
3435 scr_dump (fd); 4129 scr_dump (fd);
3436 close (fd); 4130 close (fd);
3437 } 4131 }
3438 } 4132 }
4133 break;
4134#endif
4135 case XTerm_font:
4136 op = URxvt_font;
4137 case URxvt_font:
4138#if ENABLE_STYLES
4139 case URxvt_boldFont:
4140 case URxvt_italicFont:
4141 case URxvt_boldItalicFont:
4142#endif
4143 if (query)
4144 tt_printf ("\33]%d;%-.250s%c", saveop,
4145 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
4146 ? fontset[op - URxvt_font]->fontdesc : "",
4147 resp);
4148 else
4149 {
4150 const char *&res = rs[Rs_font + (op - URxvt_font)];
4151
4152 res = strdup (str);
4153 allocated.push_back ((void *)res);
4154 set_fonts ();
4155 }
4156 break;
4157
4158 case URxvt_version:
4159 if (query)
4160 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
4161 op,
4162 rs[Rs_name], VERSION[0], VERSION[2],
4163 resp);
4164 break;
4165
4166#if !ENABLE_MINIMAL
4167 case URxvt_locale:
4168 if (query)
4169 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4170 else
4171 {
4172 set_locale (str);
4173 pty->set_utf8_mode (enc_utf8);
4174 init_xlocale ();
4175 }
4176 break;
4177
4178 case URxvt_view_up:
4179 case URxvt_view_down:
4180 {
4181 int lines = atoi (str);
4182
4183 if (lines)
4184 scr_page (op == URxvt_view_up ? UP : DN, lines);
4185 else
4186 scr_erase_savelines ();
4187 }
4188
4189 break;
4190#endif
4191
4192#if ENABLE_PERL
4193 case URxvt_perl:
4194 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4195 ; // no responses yet
3439 break; 4196 break;
3440#endif 4197#endif
3441 } 4198 }
3442} 4199}
3443/*----------------------------------------------------------------------*/ 4200/*----------------------------------------------------------------------*/
… …
3457{ 4214{
3458 int state; 4215 int state;
3459 4216
3460 if (mode == 's') 4217 if (mode == 's')
3461 { 4218 {
3462 SavedModes |= (PrivateModes & bit); 4219 SavedModes |= (priv_modes & bit);
3463 return -1; 4220 return -1;
3464 } 4221 }
3465 else 4222 else
3466 { 4223 {
3467 if (mode == 'r') 4224 if (mode == 'r')
3468 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4225 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3469 else 4226 else
3470 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4227 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3471 PrivMode (state, bit); 4228 PrivMode (state, bit);
3472 } 4229 }
3473 4230
3474 return state; 4231 return state;
3475} 4232}
3476 4233
3477/* we're not using priv _yet_ */ 4234/* we're not using priv _yet_ */
3478void 4235void
3479rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4236rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3480{ 4237{
3481 unsigned int i, j; 4238 unsigned int i, j;
3482 int state; 4239 int state;
3483 4240
3484 static const struct 4241 static const struct
… …
3493 { 3, PrivMode_132 }, 4250 { 3, PrivMode_132 },
3494 { 4, PrivMode_smoothScroll }, 4251 { 4, PrivMode_smoothScroll },
3495 { 5, PrivMode_rVideo }, 4252 { 5, PrivMode_rVideo },
3496 { 6, PrivMode_relOrigin }, 4253 { 6, PrivMode_relOrigin },
3497 { 7, PrivMode_Autowrap }, 4254 { 7, PrivMode_Autowrap },
4255 // 8, bi-directional support mode
3498 { 9, PrivMode_MouseX10 }, 4256 { 9, PrivMode_MouseX10 },
3499#ifdef menuBar_esc 4257 // 18, 19 printing-related
3500 { menuBar_esc, PrivMode_menuBar }, 4258 { 25, PrivMode_VisibleCursor },
3501#endif
3502#ifdef scrollBar_esc 4259#ifdef scrollBar_esc
3503 { scrollBar_esc, PrivMode_scrollBar }, 4260 { scrollBar_esc, PrivMode_scrollBar },
3504#endif 4261#endif
3505 // 18, 19 printing-related
3506 { 25, PrivMode_VisibleCursor },
3507 // 30 show scrollbar rxvt. extension
3508 { 35, PrivMode_ShiftKeys }, // rxvt extension 4262 { 35, PrivMode_ShiftKeys }, // rxvt extension
3509 { 40, PrivMode_132OK }, 4263 { 40, PrivMode_132OK },
3510 // 41 xterm more fixes NYI 4264 // 41 xterm more fixes NYI
3511 // 45 margin bell NYI 4265 // 45 margin bell NYI
3512 // 46 start logging 4266 // 46 start logging
… …
3552 } 4306 }
3553 4307
3554 /* extra handling for values with state unkept */ 4308 /* extra handling for values with state unkept */
3555 switch (arg[i]) 4309 switch (arg[i])
3556 { 4310 {
4311#if ENABLE_STYLES
4312 case 1021:
4313 set_option (Opt_intensityStyles, mode);
4314
4315 scr_touch (true);
4316 break;
4317#endif
3557 case 1048: /* alternative cursor save */ 4318 case 1048: /* alternative cursor save */
4319 case 1049:
3558 if (Options & Opt_secondaryScreen) 4320 if (option (Opt_secondaryScreen))
3559 if (mode == 0) 4321 if (mode == 0)
3560 scr_cursor (RESTORE); 4322 scr_cursor (RESTORE);
3561 else if (mode == 1) 4323 else if (mode == 1)
3562 scr_cursor (SAVE); 4324 scr_cursor (SAVE);
3563 break; 4325 break;
… …
3574 * within VT52 mode 4336 * within VT52 mode
3575 */ 4337 */
3576 PrivMode (1, PrivMode_vt52); 4338 PrivMode (1, PrivMode_vt52);
3577 break; 4339 break;
3578 case 3: /* 80/132 */ 4340 case 3: /* 80/132 */
3579 if (PrivateModes & PrivMode_132OK) 4341 if (priv_modes & PrivMode_132OK)
3580 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4342 set_widthheight (((state ? 132 : 80) * fwidth), height);
3581 break; 4343 break;
3582 case 4: /* smooth scrolling */ 4344 case 4: /* smooth scrolling */
3583 if (state) 4345 set_option (Opt_jumpScroll, !state);
3584 Options &= ~Opt_jumpScroll;
3585 else
3586 Options |= Opt_jumpScroll;
3587 break; 4346 break;
3588 case 5: /* reverse video */ 4347 case 5: /* reverse video */
3589 scr_rvideo_mode (state); 4348 scr_rvideo_mode (state);
3590 break; 4349 break;
3591 case 6: /* relative/absolute origins */ 4350 case 6: /* relative/absolute origins */
… …
3595 scr_autowrap (state); 4354 scr_autowrap (state);
3596 break; 4355 break;
3597 /* case 8: - auto repeat, can't do on a per window basis */ 4356 /* case 8: - auto repeat, can't do on a per window basis */
3598 case 9: /* X10 mouse reporting */ 4357 case 9: /* X10 mouse reporting */
3599 if (state) /* orthogonal */ 4358 if (state) /* orthogonal */
3600 PrivateModes &= ~PrivMode_MouseX11; 4359 priv_modes &= ~PrivMode_MouseX11;
3601 break; 4360 break;
3602#ifdef menuBar_esc
3603 case menuBar_esc:
3604#ifdef MENUBAR
3605 map_menuBar (state);
3606#endif
3607 break;
3608#endif
3609#ifdef scrollBar_esc 4361#ifdef scrollBar_esc
3610 case scrollBar_esc: 4362 case scrollBar_esc:
3611 if (scrollbar_mapping (state)) 4363 if (scrollbar_mapping (state))
3612 { 4364 {
3613 resize_all_windows (0, 0, 0); 4365 resize_all_windows (0, 0, 0);
… …
3625 break; 4377 break;
3626 /* case 66: - application key pad */ 4378 /* case 66: - application key pad */
3627 /* case 67: - backspace key */ 4379 /* case 67: - backspace key */
3628 case 1000: /* X11 mouse reporting */ 4380 case 1000: /* X11 mouse reporting */
3629 if (state) /* orthogonal */ 4381 if (state) /* orthogonal */
3630 PrivateModes &= ~PrivMode_MouseX10; 4382 priv_modes &= ~PrivMode_MouseX10;
3631 break; 4383 break;
3632#if 0 4384#if 0
3633 case 1001: 4385 case 1001:
3634 break; /* X11 mouse highlighting */ 4386 break; /* X11 mouse highlighting */
3635#endif 4387#endif
3636 case 1010: /* scroll to bottom on TTY output inhibit */ 4388 case 1010: /* scroll to bottom on TTY output inhibit */
3637 if (state)
3638 Options &= ~Opt_scrollTtyOutput;
3639 else
3640 Options |= Opt_scrollTtyOutput; 4389 set_option (Opt_scrollTtyOutput, !state);
3641 break; 4390 break;
3642 case 1011: /* scroll to bottom on key press */ 4391 case 1011: /* scroll to bottom on key press */
3643 if (state)
3644 Options |= Opt_scrollTtyKeypress; 4392 set_option (Opt_scrollTtyKeypress, state);
3645 else
3646 Options &= ~Opt_scrollTtyKeypress;
3647 break; 4393 break;
3648 case 1047: /* secondary screen w/ clearing last */ 4394 case 1047: /* secondary screen w/ clearing last */
3649 if (Options & Opt_secondaryScreen) 4395 if (option (Opt_secondaryScreen))
3650 if (current_screen != PRIMARY) 4396 if (current_screen != PRIMARY)
3651 scr_erase_screen (2); 4397 scr_erase_screen (2);
3652 scr_change_screen (state); 4398 scr_change_screen (state);
3653 break; 4399 break;
3654 case 1049: /* secondary screen w/ clearing first */ 4400 case 1049: /* secondary screen w/ clearing first */
3655 scr_change_screen (state); 4401 scr_change_screen (state);
3656 if (Options & Opt_secondaryScreen) 4402 if (option (Opt_secondaryScreen))
3657 if (current_screen != PRIMARY) 4403 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4404 scr_erase_screen (2);
3659 break; 4405 break;
3660 default: 4406 default:
3661 break; 4407 break;
… …
3687 rendset = 0, rendstyle = ~RS_None; 4433 rendset = 0, rendstyle = ~RS_None;
3688 break; 4434 break;
3689 case 1: 4435 case 1:
3690 rendset = 1, rendstyle = RS_Bold; 4436 rendset = 1, rendstyle = RS_Bold;
3691 break; 4437 break;
4438 //case 2: // low intensity
4439 case 3:
4440 rendset = 1, rendstyle = RS_Italic;
4441 break;
3692 case 4: 4442 case 4:
3693 rendset = 1, rendstyle = RS_Uline; 4443 rendset = 1, rendstyle = RS_Uline;
3694 break; 4444 break;
3695 case 5: 4445 case 5: // slowly blinking
4446 case 6: // rapidly blinking
3696 rendset = 1, rendstyle = RS_Blink; 4447 rendset = 1, rendstyle = RS_Blink;
3697 break; 4448 break;
3698 //case 6: // scoansi light background 4449 //case 6: // scoansi light background
3699 case 7: 4450 case 7:
3700 rendset = 1, rendstyle = RS_RVid; 4451 rendset = 1, rendstyle = RS_RVid;
3701 break; 4452 break;
3702 case 8: 4453 case 8:
3703 // invisible. NYI 4454 // invisible. NYI
3704 break; 4455 break;
4456 //case 9: // crossed out
3705 //case 10: // scoansi acs off 4457 //case 10: // scoansi acs off, primary font
3706 //case 11: // scoansi acs on 4458 //case 11: // scoansi acs on, first alt font
3707 //case 12: // scoansi acs on, |0x80 4459 //case 12: // scoansi acs on, |0x80, second alt font
3708 case 21: // disable bold, blink and invis (some terminals use this) 4460 //...
4461 //case 19: // ninth alt font
4462 //case 20: // gothic
4463 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3709 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4464 rendset = 0, rendstyle = RS_Bold;
3710 break; 4465 break;
3711 case 22: 4466 case 22: // normal intensity
3712 rendset = 0, rendstyle = RS_Bold; 4467 rendset = 0, rendstyle = RS_Bold;
4468 break;
4469 case 23: // disable italic
4470 rendset = 0, rendstyle = RS_Italic;
3713 break; 4471 break;
3714 case 24: 4472 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4473 rendset = 0, rendstyle = RS_Uline;
3716 break; 4474 break;
3717 case 25: 4475 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4476 rendset = 0, rendstyle = RS_Blink;
3719 break; 4477 break;
4478 case 26: // variable spacing (iso 8613)
4479 rendset = 0, rendstyle = RS_Blink;
4480 break;
3720 case 27: 4481 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4482 rendset = 0, rendstyle = RS_RVid;
3722 break; 4483 break;
3723 case 28:
3724 // visible. NYI 4484 //case 28: // visible. NYI
3725 break; 4485 //case 29: // not crossed-out
3726 } 4486 }
3727 4487
3728 if (rendset != -1) 4488 if (rendset != -1)
3729 { 4489 {
3730 scr_rendition (rendset, rendstyle); 4490 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 4501 case 35:
3742 case 36: 4502 case 36:
3743 case 37: 4503 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4504 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 4505 break;
3746#ifdef TTY_256COLOR 4506 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 4507 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 4508 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4509 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 4510 i += 2;
3752 } 4511 }
3753 break; 4512 break;
3754#endif
3755 case 39: /* default fg */ 4513 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 4514 scr_color (Color_fg, Color_fg);
3757 break; 4515 break;
3758 4516
3759 case 40: 4517 case 40:
… …
3764 case 45: 4522 case 45:
3765 case 46: 4523 case 46:
3766 case 47: 4524 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4525 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 4526 break;
3769#ifdef TTY_256COLOR 4527 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 4528 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 4529 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4530 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 4531 i += 2;
3775 } 4532 }
3776 break; 4533 break;
3777#endif
3778 case 49: /* default bg */ 4534 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 4535 scr_color (Color_bg, Color_bg);
3780 break; 4536 break;
3781 4537
3782#ifndef NO_BRIGHTCOLOR 4538 //case 50: // not variable spacing
4539
4540#if !ENABLE_MINIMAL
3783 case 90: 4541 case 90:
3784 case 91: /* set bright fg color */ 4542 case 91: /* set bright fg color */
3785 case 92: 4543 case 92:
3786 case 93: 4544 case 93:
3787 case 94: 4545 case 94:
3788 case 95: 4546 case 95:
3789 case 96: 4547 case 96:
3790 case 97: 4548 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4549 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 4550 break;
3794 case 100: 4551 case 100:
3795 case 101: /* set bright bg color */ 4552 case 101: /* set bright bg color */
3796 case 102: 4553 case 102:
3797 case 103: 4554 case 103:
3798 case 104: 4555 case 104:
3799 case 105: 4556 case 105:
3800 case 106: 4557 case 106:
3801 case 107: 4558 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4559 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 4560 break;
3805#endif 4561#endif
3806
3807 } 4562 }
3808 } 4563 }
3809} 4564}
3810/*}}} */ 4565/*}}} */
3811 4566
… …
3815{ 4570{
3816 unicode_t ch, cmd = cmd_getc (); 4571 unicode_t ch, cmd = cmd_getc ();
3817 4572
3818 if (cmd == 'Q') 4573 if (cmd == 'Q')
3819 { /* query graphics */ 4574 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4575 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4576 return;
3822 } 4577 }
3823 /* swallow other graphics sequences until terminating ':' */ 4578 /* swallow other graphics sequences until terminating ':' */
3824 do 4579 do
3825 ch = cmd_getc (); 4580 ch = cmd_getc ();
… …
3835 */ 4590 */
3836void 4591void
3837rxvt_term::tt_printf (const char *fmt,...) 4592rxvt_term::tt_printf (const char *fmt,...)
3838{ 4593{
3839 va_list arg_ptr; 4594 va_list arg_ptr;
3840 unsigned char buf[256]; 4595 char buf[256];
3841 4596
3842 va_start (arg_ptr, fmt); 4597 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4598 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4599 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4600 tt_write (buf, strlen (buf));
3846} 4601}
3847 4602
3848/* ---------------------------------------------------------------------- */ 4603/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 4604/* Write data to the pty as typed by the user, pasted with the mouse,
3850 * or generated by us in response to a query ESC sequence. 4605 * or generated by us in response to a query ESC sequence.
3851 */ 4606 */
4607const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4608
3852void 4609void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4610rxvt_term::tt_write (const char *data, unsigned int len)
3854{ 4611{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4612 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4613 return;
3856 4614
3857 if (len) 4615 if (pty->pty < 0)
4616 return;
4617
4618 if (v_buflen == 0)
4619 {
4620 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4621
4622 if ((unsigned int)written == len)
4623 return;
4624
4625 data += written;
4626 len -= written;
3858 { 4627 }
4628
4629 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4630
4631 memcpy (v_buffer + v_buflen, data, len);
4632 v_buflen += len;
4633
4634 pty_ev.set (EVENT_READ | EVENT_WRITE);
4635}
4636
4637void rxvt_term::pty_write ()
4638{
4639 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4640
4641 if (written > 0)
4642 {
4643 v_buflen -= written;
4644
3859 if (v_buflen == 0) 4645 if (v_buflen == 0)
3860 { 4646 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3862
3863 if ((unsigned int)written == len)
3864 return;
3865
3866 data += written;
3867 len -= written;
3868 }
3869
3870
3871 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3872
3873 memcpy (v_buffer + v_buflen, data, len);
3874 v_buflen += len;
3875 }
3876
3877 for (;;)
3878 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3880
3881 if (written > 0)
3882 {
3883 v_buflen -= written;
3884
3885 if (v_buflen == 0)
3886 {
3887 free (v_buffer); 4647 free (v_buffer);
3888 v_buffer = 0; 4648 v_buffer = 0;
3889 v_buflen = 0; 4649 v_buflen = 0;
3890 4650
3891 pty_ev.set (EVENT_READ); 4651 pty_ev.set (EVENT_READ);
3892 return;
3893 }
3894
3895 memmove (v_buffer, v_buffer + written, v_buflen);
3896 }
3897 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3898 // original code just ignores this...
3899 destroy ();
3900 else
3901 {
3902 pty_ev.set (EVENT_READ | EVENT_WRITE);
3903 return; 4652 return;
3904 } 4653 }
4654
4655 memmove (v_buffer, v_buffer + written, v_buflen);
3905 } 4656 }
4657 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4658 pty_ev.set (EVENT_READ);
3906} 4659}
3907 4660
3908/*----------------------- end-of-file (C source) -----------------------*/ 4661/*----------------------- end-of-file (C source) -----------------------*/
3909 4662

Diff Legend

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