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.95 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.327 by ayin, Mon Jun 11 13:33:34 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 // I don't understand this, so I changed it :) 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, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1187 ; 1577 ;
1188 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1189 ; 1579 ;
1190 1580
1191 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1192 { 1582 {
1193 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1194 scrollbar_show (0); 1584 scrollbar_show (0);
1195 } 1585 }
1196#ifdef MENUBAR 1586
1197 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1587#ifdef TRANSPARENT
1198 menubar_expose (); 1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (dpy, ev.xany.window);
1199#endif 1590#endif
1200 } 1591 }
1201 break; 1592 break;
1202 1593
1203 case MotionNotify: 1594 case MotionNotify:
1204#ifdef POINTER_BLANK 1595#ifdef POINTER_BLANK
1205 if (hidden_pointer) 1596 if (hidden_pointer)
1206 pointer_unblank (); 1597 pointer_unblank ();
1207#endif 1598#endif
1208#if MENUBAR 1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1209 if (isMenuBarWindow (ev.xany.window)) 1600 break;
1601
1602 if (ev.xany.window == vt)
1210 { 1603 {
1211 menubar_control (ev.xbutton); 1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1212 break; 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1213 } 1606 ; // nop
1214#endif
1215 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1216 break;
1217
1218 if (ev.xany.window == TermWin.vt)
1219 {
1220 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1221 { 1608 {
1222 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1223 ; 1610 ;
1224 1611
1225 XQueryPointer (display->display, TermWin.vt, 1612 XQueryPointer (dpy, vt,
1226 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1227 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1228 & (ev.xbutton.x), & (ev.xbutton.y), 1615 &ev.xbutton.x, &ev.xbutton.y,
1229 &unused_mask); 1616 &ev.xbutton.state);
1230#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
1231 /* deal with a `jumpy' mouse */ 1618 /* deal with a `jumpy' mouse */
1232 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1619 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1233 { 1620 {
1234#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
1235 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1630 selection_extend (ev.xbutton.x, ev.xbutton.y,
1236 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1631 ev.xbutton.state & Button3Mask ? 2 : 0);
1632
1237#ifdef SELECTION_SCROLLING 1633#ifdef SELECTION_SCROLLING
1238 if (ev.xbutton.y < TermWin.int_bwidth 1634 if (ev.xbutton.y < int_bwidth
1239 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1635 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1240 { 1636 {
1241 int dist; 1637 int dist;
1242
1243 pending_scroll_selection=1;
1244 1638
1245 /* don't clobber the current delay if we are 1639 /* don't clobber the current delay if we are
1246 * already in the middle of scrolling. 1640 * already in the middle of scrolling.
1247 */ 1641 */
1248 if (scroll_selection_delay<=0) 1642 if (!sel_scroll_ev.active)
1249 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1250 1644
1251 /* save the event params so we can highlight 1645 /* save the event params so we can highlight
1252 * the selection in the pending-scroll loop 1646 * the selection in the pending-scroll loop
1253 */ 1647 */
1254 selection_save_x=ev.xbutton.x; 1648 selection_save_x = ev.xbutton.x;
1255 selection_save_y=ev.xbutton.y; 1649 selection_save_y = ev.xbutton.y;
1256 selection_save_state=
1257 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1650 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1258 1651
1259 /* calc number of lines to scroll */ 1652 /* calc number of lines to scroll */
1260 if (ev.xbutton.y<TermWin.int_bwidth) 1653 if (ev.xbutton.y < int_bwidth)
1261 { 1654 {
1262 scroll_selection_dir = UP; 1655 scroll_selection_dir = UP;
1263 dist = TermWin.int_bwidth - ev.xbutton.y; 1656 dist = int_bwidth - ev.xbutton.y;
1264 } 1657 }
1265 else 1658 else
1266 { 1659 {
1267 scroll_selection_dir = DN; 1660 scroll_selection_dir = DN;
1268 dist = ev.xbutton.y - 1661 dist = ev.xbutton.y - (int_bwidth + height);
1269 (TermWin.int_bwidth + TermWin.height);
1270 } 1662 }
1663
1271 scroll_selection_lines= (Pixel2Height (dist)/ 1664 scroll_selection_lines = Pixel2Height (dist)
1272 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1665 / SELECTION_SCROLL_LINE_SPEEDUP
1666 + 1;
1273 MIN_IT (scroll_selection_lines, 1667 min_it (scroll_selection_lines,
1274 SELECTION_SCROLL_MAX_LINES); 1668 SELECTION_SCROLL_MAX_LINES);
1275 } 1669 }
1276 else 1670 else
1277 { 1671 {
1278 /* we are within the text window, so we 1672 /* we are within the text window, so we
1279 * shouldn't be scrolling 1673 * shouldn't be scrolling
1280 */ 1674 */
1281 pending_scroll_selection = 0; 1675 if (sel_scroll_ev.active)
1676 sel_scroll_ev.stop();
1282 } 1677 }
1283#endif 1678#endif
1284#ifdef MOUSE_THRESHOLD 1679#ifdef MOUSE_THRESHOLD
1285
1286 } 1680 }
1287#endif 1681#endif
1288
1289 } 1682 }
1290 } 1683 }
1291 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1292 { 1685 {
1293 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1294 MotionNotify, &ev)) ; 1687 MotionNotify, &ev))
1688 ;
1689
1295 XQueryPointer (display->display, scrollBar.win, 1690 XQueryPointer (dpy, scrollBar.win,
1296 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1297 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1298 & (ev.xbutton.x), & (ev.xbutton.y), 1693 &ev.xbutton.x, &ev.xbutton.y,
1299 &unused_mask); 1694 &unused_mask);
1300 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1301 scrollbar_size ()); 1696 scrollbar_size ());
1302 scr_refresh (refresh_type); 1697 want_refresh = 1;
1303 refresh_limit = 0; 1698 refresh_limit = 0;
1304 scrollbar_show (1); 1699 scrollbar_show (1);
1305 } 1700 }
1306 break; 1701 break;
1307 } 1702 }
1308}
1309 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
1310void 1828void
1311rxvt_term::rootwin_cb (XEvent &ev) 1829rxvt_term::rootwin_cb (XEvent &ev)
1312{ 1830{
1313 SET_R (this); 1831 make_current ();
1314 SET_LOCALE (locale);
1315 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
1316 switch (ev.type) 1838 switch (ev.type)
1317 { 1839 {
1318 case PropertyNotify: 1840 case PropertyNotify:
1319 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1320 {
1321 if (ev.xproperty.state == PropertyNewValue)
1322 selection_property (ev.xproperty.window, ev.xproperty.atom);
1323 break;
1324 }
1325#ifdef TRANSPARENT
1326 else
1327 {
1328 /* 1841 /*
1329 * 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,
1330 * 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.
1331 */ 1844 */
1332 if (xa[XA_XROOTPMAPID] == 0)
1333 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1334
1335 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])
1336 return; 1847 return;
1337 }
1338 1848
1339 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1340 case ReparentNotify: 1850 case ReparentNotify:
1341 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1342 want_full_refresh = 1; 1852 check_our_parents ();
1343 break; 1853 break;
1854 }
1344#endif 1855# endif
1345 }
1346} 1856}
1857#endif
1347 1858
1348void 1859void
1349rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
1350{ 1861{
1351 int reportmode = 0, clickintime; 1862 int reportmode = 0, clickintime;
1352 1863
1353 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1864 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1865
1354 if (!bypass_keystate) 1866 if (!bypass_keystate)
1355 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1867 reportmode = !! (priv_modes & PrivMode_mouse_report);
1868
1356 /* 1869 /*
1357 * VT window processing of button press 1870 * VT window processing of button press
1358 */ 1871 */
1359 if (ev.window == TermWin.vt) 1872 if (ev.window == vt)
1360 { 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
1361 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1886 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1887
1362 if (reportmode) 1888 if (reportmode)
1363 { 1889 {
1364 /* mouse report from vt window */ 1890 /* mouse report from vt window */
1365 /* save the xbutton state (for ButtonRelease) */ 1891 /* save the xbutton state (for ButtonRelease) */
1366 MEvent.state = ev.state; 1892 MEvent.state = ev.state;
1367#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1368 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1369 { 1895 {
1370 /* same button, within alloted time */ 1896 /* same button, within alloted time */
1371 MEvent.clicks++; 1897 MEvent.clicks++;
1898
1372 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1373 { 1900 {
1374 /* only report double clicks */ 1901 /* only report double clicks */
1375 MEvent.clicks = 2; 1902 MEvent.clicks = 2;
1376 mouse_report (ev); 1903 mouse_report (ev);
… …
1395 } 1922 }
1396 else 1923 else
1397 { 1924 {
1398 if (ev.button != MEvent.button) 1925 if (ev.button != MEvent.button)
1399 MEvent.clicks = 0; 1926 MEvent.clicks = 0;
1927
1400 switch (ev.button) 1928 switch (ev.button)
1401 { 1929 {
1402 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
1403 /* allow shift+left click to extend selection */ 1939 /* allow shift+left click to extend selection */
1404 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1940 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1405 { 1941 {
1406 if (MEvent.button == Button1 && clickintime) 1942 if (MEvent.button == Button1 && clickintime)
1407 selection_rotate (ev.x, ev.y); 1943 selection_rotate (ev.x, ev.y);
1408 else 1944 else
1409 selection_extend (ev.x, ev.y, 1); 1945 selection_extend (ev.x, ev.y, 1);
… …
1424 case Button3: 1960 case Button3:
1425 if (MEvent.button == Button3 && clickintime) 1961 if (MEvent.button == Button3 && clickintime)
1426 selection_rotate (ev.x, ev.y); 1962 selection_rotate (ev.x, ev.y);
1427 else 1963 else
1428 selection_extend (ev.x, ev.y, 1); 1964 selection_extend (ev.x, ev.y, 1);
1965
1429 MEvent.button = Button3; 1966 MEvent.button = Button3;
1430 break; 1967 break;
1431 } 1968 }
1432 } 1969 }
1970
1433 MEvent.time = ev.time; 1971 MEvent.time = ev.time;
1434 return; 1972 return;
1435 } 1973 }
1436 1974
1437 /* 1975 /*
… …
1503 upordown = 1; /* down */ 2041 upordown = 1; /* down */
1504 } 2042 }
1505 if (upordown) 2043 if (upordown)
1506 { 2044 {
1507#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1508 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2046 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1509#endif 2047#endif
1510 if (scr_page (upordown < 0 ? UP : DN, 1)) 2048 if (scr_page (upordown < 0 ? UP : DN, 1))
1511 { 2049 {
1512 if (upordown < 0) 2050 if (upordown < 0)
1513 scrollBar.setUp (); 2051 scrollBar.setUp ();
… …
1529 break; 2067 break;
1530 case R_SB_ALIGN_BOTTOM: 2068 case R_SB_ALIGN_BOTTOM:
1531 csrO = scrollBar.bot - scrollBar.top; 2069 csrO = scrollBar.bot - scrollBar.top;
1532 break; 2070 break;
1533 } 2071 }
2072
1534 if (scrollBar.style == R_SB_XTERM 2073 if (scrollBar.style == R_SB_XTERM
1535 || scrollbar_above_slider (ev.y) 2074 || scrollbar_above_slider (ev.y)
1536 || scrollbar_below_slider (ev.y)) 2075 || scrollbar_below_slider (ev.y))
1537 scr_move_to ( scrollbar_position (ev.y) - csrO, 2076 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1538 scrollbar_size ()); 2077
1539 scrollBar.setMotion (); 2078 scrollBar.setMotion ();
1540 break; 2079 break;
1541 2080
1542 case Button1: 2081 case Button1:
1543 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2082 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1547 case Button3: 2086 case Button3:
1548 if (scrollBar.style != R_SB_XTERM) 2087 if (scrollBar.style != R_SB_XTERM)
1549 { 2088 {
1550 if (scrollbar_above_slider (ev.y)) 2089 if (scrollbar_above_slider (ev.y))
1551# ifdef RXVT_SCROLL_FULL 2090# ifdef RXVT_SCROLL_FULL
1552 scr_page (UP, TermWin.nrow - 1); 2091 scr_page (UP, nrow - 1);
1553# else 2092# else
1554 scr_page (UP, TermWin.nrow / 4); 2093 scr_page (UP, nrow / 4);
1555# endif 2094# endif
1556 else if (scrollbar_below_slider (ev.y)) 2095 else if (scrollbar_below_slider (ev.y))
1557# ifdef RXVT_SCROLL_FULL 2096# ifdef RXVT_SCROLL_FULL
1558 scr_page (DN, TermWin.nrow - 1); 2097 scr_page (DN, nrow - 1);
1559# else 2098# else
1560 scr_page (DN, TermWin.nrow / 4); 2099 scr_page (DN, nrow / 4);
1561# endif 2100# endif
1562 else 2101 else
1563 scrollBar.setMotion (); 2102 scrollBar.setMotion ();
1564 } 2103 }
1565 else 2104 else
1566 { 2105 {
1567 scr_page ((ev.button == Button1 ? DN : UP), 2106 scr_page ((ev.button == Button1 ? DN : UP),
1568 (TermWin.nrow 2107 (nrow
1569 * scrollbar_position (ev.y) 2108 * scrollbar_position (ev.y)
1570 / scrollbar_size ())); 2109 / scrollbar_size ()));
1571 } 2110 }
2111
1572 break; 2112 break;
1573 } 2113 }
1574 } 2114 }
2115
1575 return; 2116 return;
1576 } 2117 }
1577#if MENUBAR
1578 /*
1579 * Menubar window processing of button press
1580 */
1581 if (isMenuBarWindow (ev.window))
1582 menubar_control (ev);
1583#endif
1584} 2118}
1585 2119
1586void 2120void
1587rxvt_term::button_release (XButtonEvent &ev) 2121rxvt_term::button_release (XButtonEvent &ev)
1588{ 2122{
1589 int reportmode = 0; 2123 int reportmode = 0;
1590 2124
1591 csrO = 0; /* reset csr Offset */ 2125 csrO = 0; /* reset csr Offset */
1592 if (!bypass_keystate) 2126 if (!bypass_keystate)
1593 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2127 reportmode = !! (priv_modes & PrivMode_mouse_report);
1594 2128
1595 if (scrollbar_isUpDn ()) 2129 if (scrollbar_isUpDn ())
1596 { 2130 {
1597 scrollBar.setIdle (); 2131 scrollBar.setIdle ();
1598 scrollbar_show (0); 2132 scrollbar_show (0);
1599#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1600 refresh_type &= ~SMOOTH_REFRESH;
1601#endif
1602
1603 } 2133 }
2134
1604#ifdef SELECTION_SCROLLING 2135#ifdef SELECTION_SCROLLING
1605 pending_scroll_selection=0; 2136 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop();
1606#endif 2138#endif
2139
1607 if (ev.window == TermWin.vt) 2140 if (ev.window == vt)
1608 { 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
1609 if (reportmode) 2151 if (reportmode)
1610 { 2152 {
1611 /* mouse report from vt window */ 2153 /* mouse report from vt window */
1612 /* don't report release of wheel "buttons" */ 2154 /* don't report release of wheel "buttons" */
1613 if (ev.button >= 4) 2155 if (ev.button >= 4)
… …
1627 MEvent.button = AnyButton; 2169 MEvent.button = AnyButton;
1628 mouse_report (ev); 2170 mouse_report (ev);
1629#endif /* MOUSE_REPORT_DOUBLECLICK */ 2171#endif /* MOUSE_REPORT_DOUBLECLICK */
1630 return; 2172 return;
1631 } 2173 }
2174
1632 /* 2175 /*
1633 * dumb hack to compensate for the failure of click-and-drag 2176 * dumb hack to compensate for the failure of click-and-drag
1634 * when overriding mouse reporting 2177 * when overriding mouse reporting
1635 */ 2178 */
1636 if (PrivateModes & PrivMode_mouse_report 2179 if (priv_modes & PrivMode_mouse_report
1637 && bypass_keystate 2180 && bypass_keystate
1638 && ev.button == Button1 && MEvent.clicks <= 1) 2181 && ev.button == Button1 && MEvent.clicks <= 1)
1639 selection_extend (ev.x, ev.y, 0); 2182 selection_extend (ev.x, ev.y, 0);
1640 2183
1641 switch (ev.button) 2184 switch (ev.button)
1642 { 2185 {
1643 case Button1: 2186 case Button1:
1644 case Button3: 2187 case Button3:
1645 selection_make (ev.time); 2188 selection_make (ev.time);
1646 break; 2189 break;
2190
1647 case Button2: 2191 case Button2:
1648 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);
1649 break; 2194 break;
2195
1650#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
1651 case Button4: 2197 case Button4:
1652 case Button5: 2198 case Button5:
1653 { 2199 {
1654 int i; 2200 int i;
1655 page_dirn v; 2201 page_dirn v;
1656 2202
1657 v = (ev.button == Button4) ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2204
1658 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
1659 i = 1; 2206 i = 1;
1660 else if ((Options & Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
1661 i = TermWin.nrow - 1; 2208 i = nrow - 1;
1662 else 2209 else
1663 i = 5; 2210 i = 5;
2211
1664# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
1665 if (ev.state & ControlMask) 2213 if (ev.state & ControlMask)
1666 { 2214 {
1667 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)
1668 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
1669 } 2230 }
1670# endif 2231# endif
1671# ifdef JUMP_MOUSE_WHEEL
1672 scr_page (v, i);
1673 scr_refresh (SMOOTH_REFRESH);
1674 scrollbar_show (1);
1675# else
1676 while (i--)
1677 {
1678 scr_page (v, 1);
1679 scr_refresh (SMOOTH_REFRESH);
1680 scrollbar_show (1);
1681 }
1682# endif
1683
1684 } 2232 }
1685 break; 2233 break;
1686#endif 2234#endif
1687
1688 } 2235 }
1689 } 2236 }
1690#ifdef MENUBAR
1691 else if (isMenuBarWindow (ev.window))
1692 menubar_control (ev);
1693#endif
1694} 2237}
1695 2238
1696#ifdef TRANSPARENT 2239#ifdef TRANSPARENT
1697#if TINTING 2240#if TINTING && !defined(HAVE_AFTERIMAGE)
1698/* shading taken from eterm-0.9.2 */ 2241/* taken from aterm-0.4.2 */
1699/* RGB 15 */
1700 2242
1701static void 2243typedef uint32_t RUINT32T;
1702shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1703{
1704 unsigned char *ptr;
1705 int x, y;
1706 2244
1707 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2245void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
1708 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2246{
1709 /* No saturation */ 2247 int sh_r, sh_g, sh_b;
1710 for (y = h; --y >= 0;) { 2248 RUINT32T mask_r, mask_g, mask_b;
1711 for (x = -w; x < 0; x++) { 2249 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1712 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;
1713 2253
1714 b = ((uint16_t *) ptr)[x]; 2254 Visual *visual = term->visual;
1715 r = (b & 0x7c00) * rm; 2255
1716 g = (b & 0x3e0) * gm; 2256 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1717 b = (b & 0x1f) * bm; 2257
1718 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2258 /* for convenience */
1719 | ((g >> 8) & 0x3e0) 2259 mask_r = visual->red_mask;
1720 | ((b >> 8) & 0x1f); 2260 mask_g = visual->green_mask;
1721 } 2261 mask_b = visual->blue_mask;
1722 ptr += bpl; 2262
1723 } 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;
1724 } else { 2336 } else {
1725 for (y = h; --y >= 0;) { 2337 if (shade < 0) shade = 0;
1726 for (x = -w; x < 0; x++) { 2338 if (shade > 100) shade = 100;
1727 int r, g, b;
1728 2339
1729 b = ((uint16_t *) ptr)[x]; 2340 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1730 r = (b & 0x7c00) * rm; 2341
1731 g = (b & 0x3e0) * gm; 2342 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1732 b = (b & 0x1f) * bm; 2343 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1733 r |= (!(r >> 15) - 1); 2344 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1734 g |= (!(g >> 10) - 1); 2345 }
1735 b |= (!(b >> 5) - 1); 2346
1736 ((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 */
1737 | ((g >> 8) & 0x3e0) 2348 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1738 | ((b >> 8) & 0x1f); 2349 {
1739 } 2350 unsigned int tmp;
1740 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++)
1741 } 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);
1742 } 2403 }
1743} 2404 break;
1744 2405 }
1745/* RGB 16 */ 2406 case 16:
1746static void 2407 {
1747shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2408 unsigned short *p1, *pf, *p, *pl;
1748{ 2409 p1 = (unsigned short *) srcImage->data;
1749 unsigned char *ptr; 2410 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1750 int x, y; 2411 while (p1 < pf)
1751 2412 {
1752 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2413 p = p1;
1753 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2414 pl = p1 + srcImage->width;
1754 /* No saturation */ 2415 for (; p < pl; p++)
1755 for (y = h; --y >= 0;) {
1756 for (x = -w; x < 0; x++) {
1757 int r, g, b;
1758
1759 b = ((uint16_t *) ptr)[x];
1760 r = (b & 0xf800) * rm;
1761 g = (b & 0x7e0) * gm;
1762 b = (b & 0x1f) * bm;
1763 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1764 | ((g >> 8) & 0x7e0)
1765 | ((b >> 8) & 0x1f);
1766 }
1767 ptr += bpl;
1768 } 2416 {
1769 } else { 2417 *p = lookup_r[(*p & 0xf800)>>11] |
1770 for (y = h; --y >= 0;) { 2418 lookup_g[(*p & 0x07e0)>> 5] |
1771 for (x = -w; x < 0; x++) { 2419 lookup_b[(*p & 0x001f)];
1772 int r, g, b;
1773
1774 b = ((uint16_t *) ptr)[x];
1775 r = (b & 0xf800) * rm;
1776 g = (b & 0x7e0) * gm;
1777 b = (b & 0x1f) * bm;
1778 r |= (!(r >> 16) - 1);
1779 g |= (!(g >> 11) - 1);
1780 b |= (!(b >> 5) - 1);
1781 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1782 | ((g >> 8) & 0x7e0)
1783 | ((b >> 8) & 0x1f);
1784 } 2420 }
1785 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)
1786 } 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);
1787 } 2441 }
1788} 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);
1789 2449
1790/* RGB 24 */ 2450 while (p1 < pf)
1791static void 2451 {
1792shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2452 p = p1;
1793{ 2453 pl = p1 + srcImage->width;
1794 unsigned char *ptr; 2454 for (; p < pl; p++)
1795 int x, y;
1796
1797 ptr = (unsigned char *)data + (w * 3);
1798 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1799 /* No saturation */
1800 for (y = h; --y >= 0;) {
1801 for (x = -(w * 3); x < 0; x += 3) {
1802 int r, g, b;
1803
1804 if (byteorder.big_endian()) {
1805 r = (ptr[x + 0] * rm) >> 8;
1806 g = (ptr[x + 1] * gm) >> 8;
1807 b = (ptr[x + 2] * bm) >> 8;
1808 ptr[x + 0] = r;
1809 ptr[x + 1] = g;
1810 ptr[x + 2] = b;
1811 } else {
1812 r = (ptr[x + 2] * rm) >> 8;
1813 g = (ptr[x + 1] * gm) >> 8;
1814 b = (ptr[x + 0] * bm) >> 8;
1815 ptr[x + 2] = r;
1816 ptr[x + 1] = g;
1817 ptr[x + 0] = b;
1818 }
1819 }
1820 ptr += bpl;
1821 } 2455 {
1822 } else { 2456 *p = lookup_r[(*p & 0xff0000)>>16] |
1823 for (y = h; --y >= 0;) { 2457 lookup_g[(*p & 0x00ff00)>> 8] |
1824 for (x = -(w * 3); x < 0; x += 3) { 2458 lookup_b[(*p & 0x0000ff)] |
1825 int r, g, b; 2459 (*p & ~0xffffff);
1826
1827 if (byteorder.big_endian()) {
1828 r = (ptr[x + 0] * rm) >> 8;
1829 g = (ptr[x + 1] * gm) >> 8;
1830 b = (ptr[x + 2] * bm) >> 8;
1831
1832 r |= (!(r >> 8) - 1);
1833 g |= (!(g >> 8) - 1);
1834 b |= (!(b >> 8) - 1);
1835
1836 ptr[x + 0] = r;
1837 ptr[x + 1] = g;
1838 ptr[x + 2] = b;
1839 } else {
1840 r = (ptr[x + 2] * rm) >> 8;
1841 g = (ptr[x + 1] * gm) >> 8;
1842 b = (ptr[x + 0] * bm) >> 8;
1843
1844 r |= (!(r >> 8) - 1);
1845 g |= (!(g >> 8) - 1);
1846 b |= (!(b >> 8) - 1);
1847
1848 ptr[x + 2] = r;
1849 ptr[x + 1] = g;
1850 ptr[x + 0] = b;
1851 }
1852 } 2460 }
1853 ptr += bpl; 2461 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1854 } 2462 }
2463 break;
2464 }
1855 } 2465 }
1856}
1857 2466
1858/* RGB 32 */ 2467 free (lookup);
1859static void
1860shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1861{
1862 unsigned char *ptr;
1863 int x, y;
1864
1865 ptr = (unsigned char *)data + (w * 4);
1866 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1867 /* No saturation */
1868 for (y = h; --y >= 0;) {
1869 if (byteorder.big_endian()) {
1870 for (x = -(w * 4); x < 0; x += 4) {
1871 int r, g, b;
1872
1873 r = (ptr[x + 1] * rm) >> 8;
1874 g = (ptr[x + 2] * gm) >> 8;
1875 b = (ptr[x + 3] * bm) >> 8;
1876 ptr[x + 1] = r;
1877 ptr[x + 2] = g;
1878 ptr[x + 3] = b;
1879 }
1880 } else {
1881 for (x = -(w * 4); x < 0; x += 4) {
1882 int r, g, b;
1883
1884 r = (ptr[x + 2] * rm) >> 8;
1885 g = (ptr[x + 1] * gm) >> 8;
1886 b = (ptr[x + 0] * bm) >> 8;
1887 ptr[x + 2] = r;
1888 ptr[x + 1] = g;
1889 ptr[x + 0] = b;
1890 }
1891 }
1892 ptr += bpl;
1893 }
1894 } else {
1895 for (y = h; --y >= 0;) {
1896 for (x = -(w * 4); x < 0; x += 4) {
1897 int r, g, b;
1898
1899 if (byteorder.big_endian()) {
1900 r = (ptr[x + 1] * rm) >> 8;
1901 g = (ptr[x + 2] * gm) >> 8;
1902 b = (ptr[x + 3] * bm) >> 8;
1903
1904 r |= (!(r >> 8) - 1);
1905 g |= (!(g >> 8) - 1);
1906 b |= (!(b >> 8) - 1);
1907
1908 ptr[x + 1] = r;
1909 ptr[x + 2] = g;
1910 ptr[x + 3] = b;
1911 } else {
1912 r = (ptr[x + 2] * rm) >> 8;
1913 g = (ptr[x + 1] * gm) >> 8;
1914 b = (ptr[x + 0] * bm) >> 8;
1915
1916 r |= (!(r >> 8) - 1);
1917 g |= (!(g >> 8) - 1);
1918 b |= (!(b >> 8) - 1);
1919
1920 ptr[x + 2] = r;
1921 ptr[x + 1] = g;
1922 ptr[x + 0] = b;
1923 }
1924 }
1925 ptr += bpl;
1926 }
1927 }
1928} 2468}
1929
1930#endif 2469#endif
1931 2470
1932/* 2471/*
1933 * Check our parents are still who we think they are. 2472 * Check our parents are still who we think they are.
1934 * Do transparency updates if required 2473 * Do transparency updates if required
1935 */ 2474 */
1936int 2475int
1937rxvt_term::check_our_parents () 2476rxvt_term::check_our_parents ()
2477{
2478 check_our_parents_ev.stop ();
2479 check_our_parents_ev.start (NOW + .1);
2480 return 0;
2481}
2482
2483void
2484rxvt_term::check_our_parents_cb (time_watcher &w)
1938{ 2485{
1939 int i, pchanged, aformat, have_pixmap, rootdepth; 2486 int i, pchanged, aformat, have_pixmap, rootdepth;
1940 unsigned long nitems, bytes_after; 2487 unsigned long nitems, bytes_after;
1941 Atom atype; 2488 Atom atype;
1942 unsigned char *prop = NULL; 2489 unsigned char *prop = NULL;
1943 Window root, oldp, *list; 2490 Window root, oldp, *list;
1944 Pixmap rootpixmap = None; 2491 Pixmap rootpixmap = None;
1945 XWindowAttributes wattr, wrootattr; 2492 XWindowAttributes wattr, wrootattr;
2493 int sx, sy;
2494 Window cr;
1946 2495
1947 pchanged = 0; 2496 pchanged = 0;
1948 2497
1949 if (!(Options & Opt_transparent)) 2498 if (!option (Opt_transparent))
1950 return pchanged; /* Don't try any more */ 2499 return /*pchanged*/; /* Don't try any more */
1951 2500
1952 XGetWindowAttributes (display->display, display->root, &wrootattr); 2501 XGetWindowAttributes (dpy, display->root, &wrootattr);
1953 rootdepth = wrootattr.depth; 2502 rootdepth = wrootattr.depth;
1954 2503
1955 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2504 XGetWindowAttributes (dpy, parent[0], &wattr);
1956 2505
1957 if (rootdepth != wattr.depth) 2506 if (rootdepth != wattr.depth)
1958 { 2507 {
1959 if (am_transparent) 2508 if (am_transparent)
1960 { 2509 {
1961 pchanged = 1; 2510 pchanged = 1;
1962 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2511 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
1963 am_transparent = am_pixmap_trans = 0; 2512 am_transparent = am_pixmap_trans = 0;
1964 } 2513 }
1965 2514
1966 return pchanged; /* Don't try any more */ 2515 return /*pchanged*/; /* Don't try any more */
1967 } 2516 }
1968 2517
1969 /* Get all X ops out of the queue so that our information is up-to-date. */ 2518 /* Get all X ops out of the queue so that our information is up-to-date. */
1970 XSync (display->display, False); 2519 XSync (dpy, False);
1971 2520
2521 XTranslateCoordinates (dpy, parent[0], display->root,
2522 0, 0, &sx, &sy, &cr);
2523
2524 /* check if we are outside of the visible part of the virtual screen : */
2525 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
2526 || sx >= wrootattr.width || sy >= wrootattr.height )
2527 return /* 0 */ ;
1972 /* 2528 /*
1973 * Make the frame window set by the window manager have 2529 * Make the frame window set by the window manager have
1974 * the root background. Some window managers put multiple nested frame 2530 * the root background. Some window managers put multiple nested frame
1975 * windows for each client, so we have to take care about that. 2531 * windows for each client, so we have to take care about that.
1976 */ 2532 */
1977 i = (xa[XA_XROOTPMAPID] 2533 i = (xa[XA_XROOTPMAP_ID]
1978 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2534 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
1979 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2535 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1980 &nitems, &bytes_after, &prop) == Success); 2536 &nitems, &bytes_after, &prop) == Success);
1981 2537
1982 if (!i || prop == NULL) 2538 if (!i || prop == NULL)
1983 i = (xa[XA_XSETROOTID] 2539 i = (xa[XA_ESETROOT_PMAP_ID]
1984 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2540 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
1985 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2541 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1986 &nitems, &bytes_after, &prop) == Success); 2542 &nitems, &bytes_after, &prop) == Success);
1987 2543
1988 if (!i || prop == NULL) 2544 if (!i || prop == NULL
2545#if TINTING
2546 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
2547#ifdef HAVE_AFTERIMAGE
2548 && original_asim == NULL && rs[Rs_blurradius] == NULL
2549#endif
2550 )
2551#endif
2552 )
1989 have_pixmap = 0; 2553 have_pixmap = 0;
1990 else 2554 else
1991 { 2555 {
1992 have_pixmap = 1; 2556 have_pixmap = 1;
1993 rootpixmap = *(Pixmap *)prop; 2557 rootpixmap = *(Pixmap *)prop;
1994 XFree (prop); 2558 XFree (prop);
1995 } 2559 }
1996 2560
1997 if (have_pixmap) 2561 if (have_pixmap)
1998 { 2562 {
2563 Bool success = False ;
2564 GC gc;
2565 XGCValues gcvalue;
2566#ifdef HAVE_AFTERIMAGE
2567 {
2568 Pixmap tmp_pmap = None ;
2569 ShadingInfo shade;
2570 ARGB32 tint ;
2571 unsigned int pmap_w = 0, pmap_h = 0;
2572
2573 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h ))
2574 {
2575 int root_x = 0, root_y = 0;
2576
2577 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2578 if (ISSET_PIXCOLOR (Color_tint))
2579 {
2580 rgba c;
2581 pix_colors_focused [Color_tint].get (c);
2582 shade.tintColor.red = c.r;
2583 shade.tintColor.green = c.g;
2584 shade.tintColor.blue = c.b;
2585 }
2586 else
2587 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
2588 tint = shading2tint32( &shade );
2589 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2590 if (GetWinPosition (parent[0], &root_x, &root_y) )
2591 {
2592 ASImageLayer *layers = create_image_layers( 2 );
2593 ASImage *merged_im = NULL;
2594 int back_x, back_y, back_w, back_h;
2595 /* merge_layers does good job at tiling background appropriately,
2596 so all we need is to cut out smallest possible piece : */
2597#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
2598 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
2599 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
2600 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
2601 back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
2602 else \
2603 { /* small background - need the whole of it for successfull tiling :*/ \
2604 back_##xy = 0; \
2605 back_##wh = pmap_##wh; \
2606 }}while(0)
2607
2608 MAKE_ROOTPMAP_GEOM(x,w,width);
2609 MAKE_ROOTPMAP_GEOM(y,h,height);
2610
2611 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
2612 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
2613 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
2614 layers[0].clip_width = szHint.width;
2615 layers[0].clip_height = szHint.height;
2616 layers[0].tint = tint;
2617 if (rs[Rs_blurradius] && layers[0].im)
2618 {
2619 double r = atof(rs[Rs_blurradius]);
2620 ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
2621 if( tmp )
2622 {
2623 destroy_asimage( &layers[0].im );
2624 layers[0].im = tmp;
2625 }
2626 }
2627 if (original_asim != NULL)
2628 {
2629 int fore_w, fore_h;
2630 layers[1].im = original_asim;
2631 if( bgPixmap.auto_resize )
2632 {
2633 fore_w = szHint.width;
2634 fore_h = szHint.height;
2635 }
2636 else
2637 {
2638 fore_w = bgPixmap.w;
2639 fore_h = bgPixmap.h;
2640 }
2641 if (fore_w != original_asim->width
2642 || fore_h != original_asim->height)
2643 {
2644 layers[1].im = scale_asimage( display->asv,
2645 original_asim,
2646 fore_w, fore_h,
2647 ASA_ASImage, 100,
2648 ASIMAGE_QUALITY_DEFAULT );
2649 }
2650
2651 layers[1].clip_width = szHint.width;
2652 layers[1].clip_height = szHint.height;
2653
2654 if (rs[Rs_blendtype])
2655 {
2656 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);
2657 if( layers[1].merge_scanlines == NULL )
2658 layers[1].merge_scanlines = alphablend_scanlines;
2659 }
2660 }
2661 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1,
2662 szHint.width, szHint.height,
2663 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
2664 if (layers[1].im != original_asim)
2665 destroy_asimage( &(layers[1].im) );
2666 destroy_asimage( &(layers[0].im) );
2667 if (merged_im != NULL)
2668 {
2669 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
2670 destroy_asimage( &merged_im );
2671 }
2672 free( layers );
2673 }
2674 }
2675 if (tmp_pmap != None)
2676 {
2677 success = True;
2678 if (pixmap != None)
2679 XFreePixmap (dpy, pixmap);
2680 pixmap = tmp_pmap;
2681 }
2682 }
2683#else /* HAVE_AFTERIMAGE */
2684 {
1999 /* 2685 /*
2000 * Copy display->root pixmap transparency 2686 * Copy display->root pixmap transparency
2001 */ 2687 */
2002 int sx, sy, nx, ny; 2688 int nx, ny;
2003 unsigned int nw, nh; 2689 unsigned int nw, nh;
2004 Window cr;
2005 XImage *image; 2690 XImage *image;
2006 GC gc;
2007 XGCValues gcvalue;
2008 2691
2009 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2010 0, 0, &sx, &sy, &cr);
2011 nw = (unsigned int)szHint.width; 2692 nw = (unsigned int)szHint.width;
2012 nh = (unsigned int)szHint.height; 2693 nh = (unsigned int)szHint.height;
2013 nx = ny = 0; 2694 nx = ny = 0;
2014 2695
2015 if (sx < 0) 2696 if (sx < 0)
2016 { 2697 {
2017 nw += sx; 2698 nw += sx;
2018 nx = -sx; 2699 nx = -sx;
2019 sx = 0; 2700 sx = 0;
2020 } 2701 }
2021 2702
2022 if (sy < 0) 2703 if (sy < 0)
2023 { 2704 {
2024 nh += sy; 2705 nh += sy;
2025 ny = -sy; 2706 ny = -sy;
2026 sy = 0; 2707 sy = 0;
2027 } 2708 }
2028 2709
2029 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2710 min_it (nw, (unsigned int) (wrootattr.width - sx));
2030 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2711 min_it (nh, (unsigned int) (wrootattr.height - sy));
2712
2713 XSync (dpy, False);
2031 allowedxerror = -1; 2714 allowedxerror = -1;
2032 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2715 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2033 2716
2034 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2717 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2035 /* XXX: may need a delay here? */ 2718 /* XXX: may need a delay here? */
2036 allowedxerror = 0; 2719 allowedxerror = 0;
2037
2038 if (image == NULL) 2720 if (image != NULL)
2721 {
2722 if (pixmap != None)
2723 XFreePixmap (dpy, pixmap);
2724
2725#if TINTING
2726 if (ISSET_PIXCOLOR (Color_tint))
2727 {
2728 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2729
2730 rgba c;
2731 pix_colors_focused [Color_tint].get (c);
2732 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2733 }
2734#endif
2735
2736 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2737 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2738 XPutImage (dpy, pixmap, gc, image, 0, 0,
2739 nx, ny, image->width, image->height);
2740 XDestroyImage (image);
2741 success = True ;
2742 }
2743 }
2744#endif /* HAVE_AFTERIMAGE */
2745 if (gc != NULL)
2746 XFreeGC (dpy, gc);
2747
2748 if (!success)
2039 { 2749 {
2040 if (am_transparent && am_pixmap_trans) 2750 if (am_transparent && am_pixmap_trans)
2041 { 2751 {
2042 pchanged = 1; 2752 pchanged = 1;
2043 if (TermWin.pixmap != None) 2753 if (pixmap != None)
2044 { 2754 {
2045 XFreePixmap (display->display, TermWin.pixmap); 2755 XFreePixmap (dpy, pixmap);
2046 TermWin.pixmap = None; 2756 pixmap = None;
2047 } 2757 }
2048 } 2758 }
2049 2759
2050 am_pixmap_trans = 0; 2760 am_pixmap_trans = 0;
2051 } 2761 }
2052 else 2762 else
2053 { 2763 {
2054 if (TermWin.pixmap != None) 2764 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2055 XFreePixmap (display->display, TermWin.pixmap); 2765 XClearWindow (dpy, parent[0]);
2056
2057#if TINTING
2058 if (ISSET_PIXCOLOR (Color_tint))
2059 {
2060 unsigned short shade, rm, gm, bm;
2061
2062 PixColors[Color_tint].get (display, rm, gm, bm);
2063
2064 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...
2065
2066 /* Determine bitshift and bitmask values */
2067 switch (image->bits_per_pixel)
2068 {
2069 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2070 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073 }
2074 }
2075#endif
2076
2077 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2078 szHint.width, szHint.height, image->depth);
2079 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2080 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2081 nx, ny, image->width, image->height);
2082 XFreeGC (display->display, gc);
2083 XDestroyImage (image);
2084 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2085 TermWin.pixmap);
2086 2766
2087 if (!am_transparent || !am_pixmap_trans) 2767 if (!am_transparent || !am_pixmap_trans)
2088 pchanged = 1; 2768 pchanged = 1;
2089 2769
2090 am_transparent = am_pixmap_trans = 1; 2770 am_transparent = am_pixmap_trans = 1;
2091 } 2771 }
2092 } 2772 }
2093 2773
2094 if (!am_pixmap_trans) 2774 if (am_pixmap_trans)
2775 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2776 else
2095 { 2777 {
2096 unsigned int n; 2778 unsigned int n;
2097 /* 2779 /*
2098 * InheritPixmap transparency 2780 * InheritPixmap transparency
2099 */ 2781 */
2100 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2101 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2782 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2102 { 2783 {
2103 oldp = TermWin.parent[i]; 2784 oldp = parent[i];
2104 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2785 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2105 &TermWin.parent[i], &list, &n);
2106 XFree (list); 2786 XFree (list);
2107 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2108 2787
2109 if (TermWin.parent[i] == display->root) 2788 if (parent[i] == display->root)
2110 { 2789 {
2111 if (oldp != None) 2790 if (oldp != None)
2112 pchanged = 1; 2791 pchanged = 1;
2113 2792
2114 break; 2793 break;
2115 } 2794 }
2116 2795
2117 if (oldp != TermWin.parent[i]) 2796 if (oldp != parent[i])
2118 pchanged = 1; 2797 pchanged = 1;
2119 } 2798 }
2120 2799
2121 n = 0; 2800 n = 0;
2122 2801
2123 if (pchanged) 2802 if (pchanged)
2124 {
2125 for (; n < (unsigned int)i; n++) 2803 for (; n < (unsigned int)i; n++)
2126 { 2804 {
2127 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2805 XGetWindowAttributes (dpy, parent[n], &wattr);
2128 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2806
2129 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2807 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2130 { 2808 {
2131 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2809 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2132 break; 2810 break;
2133 } 2811 }
2134 } 2812 }
2813
2814 if (n > (sizeof (parent) / sizeof (parent[0])))
2135 } 2815 {
2136
2137 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2138 {
2139 D_X ((stderr, "InheritPixmap Turning off"));
2140 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2816 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2141 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2817 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2142 am_transparent = 0; 2818 am_transparent = 0;
2143 /* XXX: also turn off Opt_transparent? */ 2819 /* XXX: also turn off Opt_transparent? */
2144 } 2820 }
2145 else 2821 else
2146 { 2822 {
2147#if WAIT_FOR_WM
2148 /* wait (an arbitrary period) for the WM to do its thing
2149 * needed for fvwm2.2.2 (and before?) */
2150 sleep (1);
2151#endif
2152 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2153 for (n = 0; n < (unsigned int)i; n++) 2823 for (n = 0; n < (unsigned int)i; n++)
2824 {
2154 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2825 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2826 XClearWindow (dpy, parent[n]);
2827 }
2155 2828
2156 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2829 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2157 am_transparent = 1; 2830 am_transparent = 1;
2158 } 2831 }
2159 2832
2160 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2833 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2161 TermWin.parent[i] = None; 2834 parent[i] = None;
2835 }
2836
2837 if (scrollBar.win)
2162 } 2838 {
2839 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2840 scrollBar.setIdle ();
2841 scrollbar_show (0);
2842 }
2163 2843
2844 if (am_transparent)
2845 {
2846 want_refresh = want_full_refresh = 1;
2847 if (am_pixmap_trans)
2848 flush ();
2849 }
2850
2164 return pchanged; 2851// return pchanged;
2165} 2852}
2166#endif 2853#endif
2167 2854
2168/*}}} */ 2855/*}}} */
2169 2856
2170bool 2857bool
2171rxvt_term::cmd_parse () 2858rxvt_term::cmd_parse ()
2172{ 2859{
2173 bool flag = false; 2860 bool flag = false;
2174 unicode_t ch = NOCHAR; 2861 wchar_t ch = NOCHAR;
2175 unsigned char *seq_begin; // remember start of esc-sequence here 2862 char *seq_begin; // remember start of esc-sequence here
2176 2863
2177 for (;;) 2864 for (;;)
2178 { 2865 {
2179 if (ch == NOCHAR) 2866 if (ch == NOCHAR)
2180 { 2867 {
2181 seq_begin = cmdbuf_ptr; 2868 seq_begin = cmdbuf_ptr;
2182 ch = next_char (); 2869 ch = next_char ();
2183 }
2184 2870
2185 if (ch == NOCHAR) // TODO: improve 2871 if (ch == NOCHAR)
2186 break; 2872 break;
2873 }
2187 2874
2188 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2875 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2189 { 2876 {
2877 if (!seen_input)
2878 {
2879 seen_input = 1;
2880 // many badly-written programs (e.g. jed) contain a race condition:
2881 // they first read the screensize and then install a SIGWINCH handler.
2882 // some window managers resize the window early, and these programs
2883 // then sometimes get the size wrong.
2884 // unfortunately other programs are even more buggy and dislike
2885 // being sent SIGWINCH, so only do it when we were in fact being
2886 // resized.
2887 if (seen_resize && cmd_pid)
2888 kill (-cmd_pid, SIGWINCH);
2889 }
2890
2190 /* Read a text string from the input buffer */ 2891 /* Read a text string from the input buffer */
2191 unicode_t buf[UBUFSIZ]; 2892 wchar_t buf[UBUFSIZ];
2192 bool refreshnow = false; 2893 bool refreshnow = false;
2193 int nlines = 0; 2894 int nlines = 0;
2194 unicode_t *str = buf; 2895 wchar_t *str = buf;
2195 2896 wchar_t *eol = str + min (ncol, UBUFSIZ);
2196 *str++ = ch;
2197 2897
2198 for (;;) 2898 for (;;)
2199 { 2899 {
2200 seq_begin = cmdbuf_ptr;
2201 ch = next_char ();
2202
2203 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2900 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2204 break; 2901 break;
2205 2902
2206 *str++ = ch; 2903 *str++ = ch;
2207 2904
2208 if (ch == C0_LF) 2905 if (ch == C0_LF || str >= eol)
2209 { 2906 {
2907 if (ch == C0_LF)
2210 nlines++; 2908 nlines++;
2909
2211 refresh_count++; 2910 refresh_count++;
2212 2911
2213 if (! (Options & Opt_jumpScroll) 2912 if (!option (Opt_jumpScroll)
2214 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2913 || (refresh_count >= refresh_limit * (nrow - 1)))
2215 { 2914 {
2216 refreshnow = true; 2915 refreshnow = true;
2217 flag = true; 2916 refresh_count = 0;
2218 ch = NOCHAR; 2917 ch = NOCHAR;
2219 break; 2918 break;
2220 } 2919 }
2221 2920
2222 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2921 // scr_add_lines only works for nlines <= nrow - 1.
2223 if (nlines >= TermWin.nrow - 1) 2922 if (nlines >= nrow - 1)
2224 { 2923 {
2924 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2925 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2225 scr_add_lines (buf, nlines, str - buf); 2926 scr_add_lines (buf, str - buf, nlines);
2927
2226 nlines = 0; 2928 nlines = 0;
2227 str = buf; 2929 str = buf;
2930 eol = str + min (ncol, UBUFSIZ);
2228 } 2931 }
2932
2933 if (str >= eol)
2934 {
2935 if (eol >= buf + UBUFSIZ)
2936 {
2937 ch = NOCHAR;
2938 break;
2939 }
2940 else
2941 eol = min (eol + ncol, buf + UBUFSIZ);
2942 }
2943
2229 } 2944 }
2230 2945
2231 if (str >= buf + UBUFSIZ) 2946 seq_begin = cmdbuf_ptr;
2232 { 2947 ch = next_char ();
2233 ch = NOCHAR;
2234 break;
2235 }
2236 } 2948 }
2237 2949
2950 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2951 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2238 scr_add_lines (buf, nlines, str - buf); 2952 scr_add_lines (buf, str - buf, nlines);
2239 2953
2240 /* 2954 /*
2241 * If there have been a lot of new lines, then update the screen 2955 * If there have been a lot of new lines, then update the screen
2242 * What the heck I'll cheat and only refresh less than every page-full. 2956 * What the heck I'll cheat and only refresh less than every page-full.
2243 * the number of pages between refreshes is refresh_limit, which 2957 * the number of pages between refreshes is refresh_limit, which
2244 * is incremented here because we must be doing flat-out scrolling. 2958 * is incremented here because we must be doing flat-out scrolling.
2245 *
2246 * refreshing should be correct for small scrolls, because of the
2247 * time-out
2248 */ 2959 */
2249 if (refreshnow) 2960 if (refreshnow)
2250 { 2961 {
2251 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2962 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2252 refresh_limit++; 2963 refresh_limit++;
2253 else 2964 else
2965 {
2966 flag = true;
2967 //TODO: due to popular request, implement "skipscroll" option here
2254 scr_refresh (refresh_type); 2968 scr_refresh ();
2969 want_refresh = 1;
2970 }
2255 } 2971 }
2256 2972
2257 } 2973 }
2258 else 2974 else
2259 { 2975 {
… …
2274 2990
2275 return flag; 2991 return flag;
2276} 2992}
2277 2993
2278// read the next character 2994// read the next character
2279unicode_t 2995wchar_t
2280rxvt_term::next_char () 2996rxvt_term::next_char () NOTHROW
2281{ 2997{
2282 while (cmdbuf_ptr < cmdbuf_endp) 2998 while (cmdbuf_ptr < cmdbuf_endp)
2283 { 2999 {
2284 // assume 7-bit to be ascii ALWAYS 3000 // assume 7-bit to be ascii ALWAYS
2285 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 3001 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2286 return *cmdbuf_ptr++; 3002 return *cmdbuf_ptr++;
2287 3003
2288 wchar_t wc; 3004 wchar_t wc;
2289 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 3005 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2290 3006
2291 if (len == (size_t)-2) 3007 if (len == (size_t)-2)
2292 { 3008 {
2293 // the mbstate stores incomplete sequences. didn't know this :/ 3009 // the mbstate stores incomplete sequences. didn't know this :/
2294 cmdbuf_ptr = cmdbuf_endp; 3010 cmdbuf_ptr = cmdbuf_endp;
2295 break; 3011 break;
2296 } 3012 }
2297 3013
2298 if (len == (size_t)-1) 3014 if (len == (size_t)-1)
2299 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 3015 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2300 3016
2301 // assume wchar == unicode 3017 // assume wchar == unicode
2302 cmdbuf_ptr += len; 3018 cmdbuf_ptr += len;
2303 return wc; 3019 return wc & UNICODE_MASK;
2304 } 3020 }
2305 3021
2306 return NOCHAR; 3022 return NOCHAR;
2307} 3023}
3024
3025// read the next octet
3026uint32_t
3027rxvt_term::next_octet () NOTHROW
3028{
3029 return cmdbuf_ptr < cmdbuf_endp
3030 ? (unsigned char)*cmdbuf_ptr++
3031 : NOCHAR;
3032}
3033
3034static class out_of_input out_of_input;
2308 3035
2309/* rxvt_cmd_getc () - Return next input character */ 3036/* rxvt_cmd_getc () - Return next input character */
2310/* 3037/*
2311 * Return the next input character after first passing any keyboard input 3038 * Return the next input character after first passing any keyboard input
2312 * to the command. 3039 * to the command.
2313 */ 3040 */
2314unicode_t 3041wchar_t
2315rxvt_term::cmd_getc () 3042rxvt_term::cmd_getc () THROW ((class out_of_input))
2316{ 3043{
2317 unicode_t c = next_char (); 3044 wchar_t c = next_char ();
3045
3046 if (c == NOCHAR)
3047 throw out_of_input;
3048
3049 return c;
3050}
3051
3052uint32_t
3053rxvt_term::cmd_get8 () THROW ((class out_of_input))
3054{
3055 uint32_t c = next_octet ();
2318 3056
2319 if (c == NOCHAR) 3057 if (c == NOCHAR)
2320 throw out_of_input; 3058 throw out_of_input;
2321 3059
2322 return c; 3060 return c;
… …
2422 case C0_ESC: 3160 case C0_ESC:
2423 process_escape_seq (); 3161 process_escape_seq ();
2424 break; 3162 break;
2425 case C0_ENQ: /* terminal Status */ 3163 case C0_ENQ: /* terminal Status */
2426 if (rs[Rs_answerbackstring]) 3164 if (rs[Rs_answerbackstring])
2427 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3165 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2428 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2429 else 3166 else
2430 tt_write ((unsigned char *)VT100_ANS, 3167 tt_write (VT100_ANS, strlen (VT100_ANS));
2431 (unsigned int)STRLEN (VT100_ANS));
2432 break; 3168 break;
2433 case C0_BEL: /* bell */ 3169 case C0_BEL: /* bell */
2434 scr_bell (); 3170 scr_bell ();
2435 break; 3171 break;
2436 case C0_BS: /* backspace */ 3172 case C0_BS: /* backspace */
… …
2452 break; 3188 break;
2453 case C0_SI: /* shift in - acs */ 3189 case C0_SI: /* shift in - acs */
2454 scr_charset_choose (0); 3190 scr_charset_choose (0);
2455 break; 3191 break;
2456 3192
3193#ifdef EIGHT_BIT_CONTROLS
2457 // 8-bit controls 3194 // 8-bit controls
2458 case 0x90: /* DCS */ 3195 case 0x90: /* DCS */
2459 process_dcs_seq (); 3196 process_dcs_seq ();
2460 break; 3197 break;
2461 case 0x9b: /* CSI */ 3198 case 0x9b: /* CSI */
2462 process_csi_seq (); 3199 process_csi_seq ();
2463 break; 3200 break;
2464 case 0x9d: /* CSI */ 3201 case 0x9d: /* CSI */
2465 process_osc_seq (); 3202 process_osc_seq ();
2466 break; 3203 break;
3204#endif
2467 } 3205 }
2468} 3206}
2469/*}}} */ 3207/*}}} */
2470 3208
2471 3209
… …
2533void 3271void
2534rxvt_term::process_escape_seq () 3272rxvt_term::process_escape_seq ()
2535{ 3273{
2536 unicode_t ch = cmd_getc (); 3274 unicode_t ch = cmd_getc ();
2537 3275
2538 if (PrivateModes & PrivMode_vt52) 3276 if (priv_modes & PrivMode_vt52)
2539 { 3277 {
2540 process_escape_vt52 (ch); 3278 process_escape_vt52 (ch);
2541 return; 3279 return;
2542 } 3280 }
2543 3281
… …
2558 scr_charset_set (2, (unsigned int)cmd_getc ()); 3296 scr_charset_set (2, (unsigned int)cmd_getc ());
2559 break; 3297 break;
2560 case '+': 3298 case '+':
2561 scr_charset_set (3, (unsigned int)cmd_getc ()); 3299 scr_charset_set (3, (unsigned int)cmd_getc ());
2562 break; 3300 break;
2563#ifndef NO_FRILLS 3301#if !ENABLE_MINIMAL
2564 case '6': 3302 case '6':
2565 scr_backindex (); 3303 scr_backindex ();
2566 break; 3304 break;
2567#endif 3305#endif
2568 case '7': 3306 case '7':
2569 scr_cursor (SAVE); 3307 scr_cursor (SAVE);
2570 break; 3308 break;
2571 case '8': 3309 case '8':
2572 scr_cursor (RESTORE); 3310 scr_cursor (RESTORE);
2573 break; 3311 break;
2574#ifndef NO_FRILLS 3312#if !ENABLE_MINIMAL
2575 case '9': 3313 case '9':
2576 scr_forwardindex (); 3314 scr_forwardindex ();
2577 break; 3315 break;
2578#endif 3316#endif
2579 case '=': 3317 case '=':
… …
2589 break; 3327 break;
2590 3328
2591 /* 8.3.87: NEXT LINE */ 3329 /* 8.3.87: NEXT LINE */
2592 case C1_NEL: /* ESC E */ 3330 case C1_NEL: /* ESC E */
2593 { 3331 {
2594 unicode_t nlcr[] = { C0_LF, C0_CR }; 3332 wchar_t nlcr[] = { C0_LF, C0_CR };
2595 scr_add_lines (nlcr, 1, 2); 3333 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2596 } 3334 }
2597 break; 3335 break;
2598 3336
2599 /* kidnapped escape sequence: Should be 8.3.48 */ 3337 /* kidnapped escape sequence: Should be 8.3.48 */
2600 case C1_ESA: /* ESC G */ 3338 case C1_ESA: /* ESC G */
… …
2622 process_dcs_seq (); 3360 process_dcs_seq ();
2623 break; 3361 break;
2624 3362
2625 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3363 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2626 case C1_SCI: /* ESC Z */ 3364 case C1_SCI: /* ESC Z */
2627 tt_write ((const unsigned char *)ESCZ_ANSWER, 3365 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2628 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2629 break; /* steal obsolete ESC [ c */ 3366 break; /* steal obsolete ESC [ c */
2630 3367
2631 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3368 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2632 case C1_CSI: /* ESC [ */ 3369 case C1_CSI: /* ESC [ */
2633 process_csi_seq (); 3370 process_csi_seq ();
… …
2742 ndef = get_byte_array_bit (csi_defaults, i); 3479 ndef = get_byte_array_bit (csi_defaults, i);
2743 for (p = 0; p < nargs; p++) 3480 for (p = 0; p < nargs; p++)
2744 if (arg[p] == -1) 3481 if (arg[p] == -1)
2745 arg[p] = ndef; 3482 arg[p] = ndef;
2746 3483
2747#ifdef DEBUG_CMD
2748 fprintf (stderr, "CSI ");
2749 for (p = 0; p < nargs; p++)
2750 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2751 fprintf (stderr, "%c\n", ch);
2752#endif
2753
2754 /* 3484 /*
2755 * private mode handling 3485 * private mode handling
2756 */ 3486 */
2757 if (priv) 3487 if (priv)
2758 { 3488 {
2759 switch (priv) 3489 switch (priv)
2760 { 3490 {
2761 case '>': 3491 case '>':
2762 if (ch == CSI_DA) /* secondary device attributes */ 3492 if (ch == CSI_DA) /* secondary device attributes */
3493 {
3494 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3495 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3496 //
3497 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3498 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3499 // that we do not support xterm mouse reporting (should be 95 when we do).
3500 //
2763 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3501 tt_printf ("\033[>%d;94;0c", 'U');
3502 }
2764 break; 3503 break;
2765 case '?': 3504 case '?':
2766 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3505 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2767 process_terminal_mode (ch, priv, nargs, arg); 3506 process_terminal_mode (ch, priv, nargs, arg);
2768 break; 3507 break;
… …
2873 3612
2874 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3613 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2875 arg[0] = -arg[0]; 3614 arg[0] = -arg[0];
2876 /* FALLTHROUGH */ 3615 /* FALLTHROUGH */
2877 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3616 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2878 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3617 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2879 break; 3618 break;
2880 3619
2881 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3620 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2882 tt_write ((const unsigned char *)VT100_ANS, 3621 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2883 (unsigned int) (sizeof (VT100_ANS) - 1));
2884 break; 3622 break;
2885 3623
2886 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3624 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2887 process_sgr_mode (nargs, arg); 3625 process_sgr_mode (nargs, arg);
2888 break; 3626 break;
… …
2895 break; 3633 break;
2896 case 6: /* CPR requested */ 3634 case 6: /* CPR requested */
2897 scr_report_position (); 3635 scr_report_position ();
2898 break; 3636 break;
2899 case 7: /* unofficial extension */ 3637 case 7: /* unofficial extension */
2900 if (Options & Opt_insecure) 3638 if (option (Opt_insecure))
2901 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3639 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2902 break; 3640 break;
2903 case 8: /* unofficial extension */ 3641 case 8: /* unofficial extension */
2904 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3642 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2905 break; 3643 break;
2906 } 3644 }
… …
2942 break; 3680 break;
2943 3681
2944 case CSI_RM: /* 8.3.107: RESET MODE */ 3682 case CSI_RM: /* 8.3.107: RESET MODE */
2945 if (arg[0] == 4) 3683 if (arg[0] == 4)
2946 scr_insert_mode (0); 3684 scr_insert_mode (0);
3685 else if (arg[0] == 20)
3686 priv_modes &= ~PrivMode_LFNL;
2947 break; 3687 break;
2948 3688
2949 case CSI_SM: /* 8.3.126: SET MODE */ 3689 case CSI_SM: /* 8.3.126: SET MODE */
2950 if (arg[0] == 4) 3690 if (arg[0] == 4)
2951 scr_insert_mode (1); 3691 scr_insert_mode (1);
3692 else if (arg[0] == 20)
3693 priv_modes |= PrivMode_LFNL;
2952 break; 3694 break;
2953 3695
2954 /* 3696 /*
2955 * PRIVATE USE beyond this point. All CSI_7? sequences here 3697 * PRIVATE USE beyond this point. All CSI_7? sequences here
2956 */ 3698 */
… …
2968 break; 3710 break;
2969 case CSI_75: 3711 case CSI_75:
2970 scr_cursor (RESTORE); 3712 scr_cursor (RESTORE);
2971 break; 3713 break;
2972 3714
2973#ifndef NO_FRILLS 3715#if !ENABLE_MINIMAL
2974 case CSI_74: 3716 case CSI_74:
2975 process_window_ops (arg, nargs); 3717 process_window_ops (arg, nargs);
2976 break; 3718 break;
2977#endif 3719#endif
2978 3720
… …
2985 break; 3727 break;
2986 } 3728 }
2987} 3729}
2988/*}}} */ 3730/*}}} */
2989 3731
2990#ifndef NO_FRILLS 3732#if !ENABLE_MINIMAL
2991/* ARGSUSED */ 3733/* ARGSUSED */
2992void 3734void
2993rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3735rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2994{ 3736{
2995 int x, y; 3737 int x, y;
2996 XWindowAttributes wattr; 3738 XWindowAttributes wattr;
2997 Window wdummy; 3739 Window wdummy;
3740
3741 dLocal (Display *, dpy);
2998 3742
2999 if (nargs == 0) 3743 if (nargs == 0)
3000 return; 3744 return;
3001 3745
3002 switch (args[0]) 3746 switch (args[0])
3003 { 3747 {
3004 /* 3748 /*
3005 * commands 3749 * commands
3006 */ 3750 */
3007 case 1: /* deiconify window */ 3751 case 1: /* deiconify window */
3008 XMapWindow (display->display, TermWin.parent[0]); 3752 XMapWindow (dpy, parent[0]);
3009 break; 3753 break;
3010 case 2: /* iconify window */ 3754 case 2: /* iconify window */
3011 XIconifyWindow (display->display, TermWin.parent[0], 3755 XIconifyWindow (dpy, parent[0], display->screen);
3012 DefaultScreen (display->display));
3013 break; 3756 break;
3014 case 3: /* set position (pixels) */ 3757 case 3: /* set position (pixels) */
3015 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3758 XMoveWindow (dpy, parent[0], args[1], args[2]);
3016 break; 3759 break;
3017 case 4: /* set size (pixels) */ 3760 case 4: /* set size (pixels) */
3018 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3761 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3019 break; 3762 break;
3020 case 5: /* raise window */ 3763 case 5: /* raise window */
3021 XRaiseWindow (display->display, TermWin.parent[0]); 3764 XRaiseWindow (dpy, parent[0]);
3022 break; 3765 break;
3023 case 6: /* lower window */ 3766 case 6: /* lower window */
3024 XLowerWindow (display->display, TermWin.parent[0]); 3767 XLowerWindow (dpy, parent[0]);
3025 break; 3768 break;
3026 case 7: /* refresh window */ 3769 case 7: /* refresh window */
3027 scr_touch (true); 3770 scr_touch (true);
3028 break; 3771 break;
3029 case 8: /* set size (chars) */ 3772 case 8: /* set size (chars) */
3030 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3773 set_widthheight ((unsigned int) (args[2] * fwidth),
3031 (unsigned int) (args[1] * TermWin.fheight)); 3774 (unsigned int) (args[1] * fheight));
3032 break; 3775 break;
3033 3776
3034 //case 9: NYI, TODO, restore maximized window or maximize window 3777 //case 9: NYI, TODO, restore maximized window or maximize window
3035 default: 3778 default:
3036 if (args[0] >= 24) /* set height (chars) */ 3779 if (args[0] >= 24) /* set height (chars) */
3037 set_widthheight ((unsigned int)TermWin.width, 3780 set_widthheight ((unsigned int)width,
3038 (unsigned int) (args[1] * TermWin.fheight)); 3781 (unsigned int) (args[1] * fheight));
3039 break; 3782 break;
3040
3041 3783
3042 /* 3784 /*
3043 * reports - some output format copied from XTerm 3785 * reports - some output format copied from XTerm
3044 */ 3786 */
3045 case 11: /* report window state */ 3787 case 11: /* report window state */
3046 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3788 XGetWindowAttributes (dpy, parent[0], &wattr);
3047 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3789 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3048 break; 3790 break;
3049 case 13: /* report window position */ 3791 case 13: /* report window position */
3050 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3792 XGetWindowAttributes (dpy, parent[0], &wattr);
3051 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3793 XTranslateCoordinates (dpy, parent[0], wattr.root,
3052 -wattr.border_width, -wattr.border_width, 3794 -wattr.border_width, -wattr.border_width,
3053 &x, &y, &wdummy); 3795 &x, &y, &wdummy);
3054 tt_printf ("\033[3;%d;%dt", x, y); 3796 tt_printf ("\033[3;%d;%dt", x, y);
3055 break; 3797 break;
3056 case 14: /* report window size (pixels) */ 3798 case 14: /* report window size (pixels) */
3057 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3799 XGetWindowAttributes (dpy, parent[0], &wattr);
3058 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3800 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3059 break; 3801 break;
3060 case 18: /* report text area size (chars) */ 3802 case 18: /* report text area size (chars) */
3061 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3803 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3062 break; 3804 break;
3063 case 19: /* report window size (chars) */ 3805 case 19: /* report window size (chars) */
3064 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3806 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3065 break; 3807 break;
3066 case 20: /* report icon label */ 3808 case 20: /* report icon label */
3067 if (Options & Opt_insecure)
3068 { 3809 {
3069 char *s; 3810 char *s;
3070 XGetIconName (display->display, TermWin.parent[0], &s); 3811 XGetIconName (dpy, parent[0], &s);
3071 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3812 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3813 XFree (s);
3072 } 3814 }
3073 break; 3815 break;
3074 case 21: /* report window title */ 3816 case 21: /* report window title */
3075 if (Options & Opt_insecure)
3076 { 3817 {
3077 char *s; 3818 char *s;
3078 XFetchName (display->display, TermWin.parent[0], &s); 3819 XFetchName (dpy, parent[0], &s);
3079 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3820 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3821 XFree (s);
3080 } 3822 }
3081 break; 3823 break;
3082 } 3824 }
3083} 3825}
3084#endif 3826#endif
3085 3827
3086/*----------------------------------------------------------------------*/ 3828/*----------------------------------------------------------------------*/
3087/* 3829/*
3088 * get input up until STRING TERMINATOR (or BEL) 3830 * get input up until STRING TERMINATOR (or BEL)
3089 * ends_how is terminator used. returned input must be free()'d 3831 * ends_how is terminator used. returned input must be free()'d
3090 */ 3832 */
3091unsigned char * 3833char *
3092rxvt_term::get_to_st (unicode_t &ends_how) 3834rxvt_term::get_to_st (unicode_t &ends_how)
3093{ 3835{
3094 int seen_esc = 0; /* seen escape? */ 3836 unicode_t ch;
3837 bool seen_esc = false;
3095 unsigned int n = 0; 3838 unsigned int n = 0;
3096 unsigned char *s;
3097 unicode_t ch;
3098 unsigned char string[STRING_MAX]; 3839 wchar_t string[STRING_MAX];
3099 3840
3100 while ((ch = cmd_getc ())) 3841 while ((ch = cmd_getc ()) != NOCHAR)
3101 { 3842 {
3102 if (ch == C0_BEL || ch == CHAR_ST)
3103 break;
3104
3105 if (seen_esc) 3843 if (seen_esc)
3844 {
3106 if (ch == 0x5c) /* 7bit ST */ 3845 if (ch == 0x5c) /* 7bit ST */
3107 break; 3846 break;
3108 else 3847 else
3109 return NULL; 3848 return NULL;
3110 3849 }
3111 if (ch == C0_ESC) 3850 else if (ch == C0_ESC)
3112 { 3851 {
3113 seen_esc = 1; 3852 seen_esc = true;
3114 continue; 3853 continue;
3115 } 3854 }
3855 else if (ch == C0_BEL || ch == CHAR_ST)
3856 break;
3116 else if (ch == C0_HT) 3857 else if (ch == C0_SYN)
3117 ch = ' '; /* translate '\t' to space */ 3858 ch = cmd_get8 ();
3118 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR)) 3859 else if (ch < 0x20)
3119 return NULL; /* other control character - exit */ 3860 return NULL; /* other control character - exit */
3120 3861
3121 if (n >= sizeof (string) - 1) 3862 seen_esc = false;
3863
3864 if (n >= STRING_MAX - 1)
3122 // stop at some sane length 3865 // stop at some sane length
3123 return NULL; 3866 return NULL;
3124 3867
3125 string[n++] = ch; 3868 string[n++] = ch;
3126 seen_esc = 0;
3127 } 3869 }
3128 3870
3129 string[n++] = '\0'; 3871 string[n++] = '\0';
3130 3872
3131 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3132 return NULL;
3133
3134 ends_how = (ch == 0x5c ? C0_ESC : ch); 3873 ends_how = (ch == 0x5c ? C0_ESC : ch);
3135 STRNCPY (s, string, n); 3874
3136 return s; 3875 return rxvt_wcstombs (string);
3137} 3876}
3138 3877
3139/*----------------------------------------------------------------------*/ 3878/*----------------------------------------------------------------------*/
3140/* 3879/*
3141 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3880 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3142 */ 3881 */
3143void 3882void
3144rxvt_term::process_dcs_seq () 3883rxvt_term::process_dcs_seq ()
3145{ 3884{
3146 unsigned char *s; 3885 char *s;
3147 unicode_t eh; 3886 unicode_t eh;
3148 3887
3149 /* 3888 /*
3150 * Not handled yet 3889 * Not handled yet
3151 */ 3890 */
… …
3170 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3909 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3171 arg = arg * 10 + (ch - '0'); 3910 arg = arg * 10 + (ch - '0');
3172 3911
3173 if (ch == ';') 3912 if (ch == ';')
3174 { 3913 {
3175 unsigned char *s = get_to_st (eh); 3914 char *s = get_to_st (eh);
3176 3915
3177 if (s) 3916 if (s)
3178 { 3917 {
3179 process_xterm_seq (arg, (char *)s, eh); 3918 process_xterm_seq (arg, s, eh);
3180 free (s); 3919 free (s);
3181 } 3920 }
3182 } 3921 }
3183} 3922}
3184 3923
3185void 3924void
3186rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3925rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3187{ 3926{
3188 if (str[0] == '?' && !str[1]) 3927 if (str[0] == '?' && !str[1])
3189 { 3928 {
3190 if (Options & Opt_insecure) 3929 rgba c;
3191 { 3930 pix_colors_focused[color].get (c);
3192 unsigned short r, g, b; 3931
3193 PixColors[color].get (display, r, g, b); 3932#if XFT
3933 if (c.a != rgba::MAX_CC)
3934 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3935 else
3936#endif
3194 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3937 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3195 }
3196 } 3938 }
3197 else 3939 else
3198 set_window_color (color, str); 3940 set_window_color (color, str);
3199} 3941}
3200 3942
3201/* 3943/*
3202 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3944 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3203 * 0 = change iconName/title
3204 * 1 = change iconName
3205 * 2 = change title
3206 * 4 = change color
3207 * 10 = change fg color
3208 * 11 = change bg color
3209 * 12 = change text color
3210 * 13 = change mouse foreground color
3211 * 17 = change highlight character colour
3212 * 18 = change bold character color
3213 * 19 = change underlined character color
3214 * 46 = change logfile (not implemented)
3215 * 50 = change font
3216 *
3217 * rxvt extensions:
3218 * 20 = bg pixmap
3219 * 39 = change default fg color
3220 * 49 = change default bg color
3221 * 55 = dump scrollback buffer and all of screen
3222 * 701 = change locale
3223 * 702 = find font
3224 * 703 = menu
3225 */ 3945 */
3226void 3946void
3227rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3947rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3228{ 3948{
3229 int changed = 0;
3230 int color; 3949 int color;
3231 char *buf, *name; 3950 char *buf, *name;
3232 bool query = str[0] == '?' && !str[1]; 3951 bool query = str[0] == '?' && !str[1];
3952 int saveop = op;
3953
3954 dLocal (Display *, dpy);
3233 3955
3234 assert (str != NULL); 3956 assert (str != NULL);
3957
3958 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3959 return;
3960
3235 switch (op) 3961 switch (op)
3236 { 3962 {
3237 case XTerm_name: 3963 case XTerm_name:
3238 set_title (str); 3964 set_title (str);
3239 /* FALLTHROUGH */ 3965 /* FALLTHROUGH */
… …
3244 set_title (str); 3970 set_title (str);
3245 break; 3971 break;
3246 case XTerm_property: 3972 case XTerm_property:
3247 if (str[0] == '?') 3973 if (str[0] == '?')
3248 { 3974 {
3249 Atom prop = XInternAtom (display->display, str + 1, True); 3975 Atom prop = display->atom (str + 1);
3250 Atom actual_type; 3976 Atom actual_type;
3251 int actual_format; 3977 int actual_format;
3252 unsigned long nitems; 3978 unsigned long nitems;
3253 unsigned long bytes_after; 3979 unsigned long bytes_after;
3254 unsigned char *value = 0; 3980 unsigned char *value = 0;
3255 const char *str = ""; 3981 const char *str = "";
3256 3982
3257 if (prop 3983 if (prop
3258 && XGetWindowProperty (display->display, TermWin.parent[0], 3984 && XGetWindowProperty (dpy, parent[0],
3259 prop, 0, 1<<16, 0, AnyPropertyType, 3985 prop, 0, 1<<16, 0, AnyPropertyType,
3260 &actual_type, &actual_format, 3986 &actual_type, &actual_format,
3261 &nitems, &bytes_after, &value) == Success 3987 &nitems, &bytes_after, &value) == Success
3262 && actual_type != None 3988 && actual_type != None
3263 && actual_format == 8) 3989 && actual_format == 8)
3264 str = (const char *)(value); 3990 str = (const char *)(value);
3265 3991
3266 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3992 tt_printf ("\033]%d;%s%c", op, str, resp);
3267 3993
3268 XFree (value); 3994 XFree (value);
3269 } 3995 }
3270 else 3996 else
3271 { 3997 {
3272 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3998 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3273 3999
3274 if (eq) 4000 if (eq)
3275 { 4001 {
3276 *eq = 0; 4002 *eq = 0;
3277 XChangeProperty (display->display, TermWin.parent[0], 4003 set_utf8_property (display->atom (str), eq + 1);
3278 display->atom (str), XA_STRING, 8,
3279 PropModeReplace, (unsigned char *)eq + 1,
3280 strlen (eq + 1));
3281 } 4004 }
3282 else 4005 else
3283 XDeleteProperty (display->display, TermWin.parent[0], 4006 XDeleteProperty (dpy, parent[0],
3284 display->atom (str)); 4007 display->atom (str));
3285 } 4008 }
3286 break; 4009 break;
3287 4010
3288 case XTerm_Color: 4011 case XTerm_Color:
3289 for (buf = (char *)str; buf && *buf;) 4012 for (buf = (char *)str; buf && *buf;)
3290 { 4013 {
3291 if ((name = STRCHR (buf, ';')) == NULL) 4014 if ((name = strchr (buf, ';')) == NULL)
3292 break; 4015 break;
3293 4016
3294 *name++ = '\0'; 4017 *name++ = '\0';
3295 color = atoi (buf); 4018 color = atoi (buf) + minCOLOR;
3296 4019
3297 if (color < 0 || color >= TOTAL_COLORS) 4020 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3298 break; 4021 break;
3299 4022
3300 if ((buf = STRCHR (name, ';')) != NULL) 4023 if ((buf = strchr (name, ';')) != NULL)
3301 *buf++ = '\0'; 4024 *buf++ = '\0';
3302 4025
3303 if (name[0] == '?' && !name[1]) 4026 process_color_seq (op, color, name, resp);
3304 {
3305 if (Options & Opt_insecure)
3306 {
3307 unsigned short r, g, b;
3308 PixColors[color + minCOLOR].get (display, r, g, b);
3309 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3310 }
3311 }
3312 else
3313 set_window_color (color + minCOLOR, name);
3314 } 4027 }
3315 break; 4028 break;
3316 case XTerm_Color00: 4029 case XTerm_Color00:
3317 process_color_seq (XTerm_Color00, Color_fg, str, resp); 4030 process_color_seq (op, Color_fg, str, resp);
3318 break; 4031 break;
3319 case XTerm_Color01: 4032 case XTerm_Color01:
3320 process_color_seq (XTerm_Color00, Color_bg, str, resp); 4033 process_color_seq (op, Color_bg, str, resp);
3321 break; 4034 break;
3322#ifndef NO_CURSORCOLOR 4035#ifndef NO_CURSORCOLOR
3323 case XTerm_Color_cursor: 4036 case XTerm_Color_cursor:
3324 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 4037 process_color_seq (op, Color_cursor, str, resp);
3325 break; 4038 break;
3326#endif 4039#endif
3327 case XTerm_Color_pointer_fg: 4040 case XTerm_Color_pointer_fg:
3328 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 4041 process_color_seq (op, Color_pointer_fg, str, resp);
3329 break; 4042 break;
3330 case XTerm_Color_pointer_bg: 4043 case XTerm_Color_pointer_bg:
3331 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 4044 process_color_seq (op, Color_pointer_bg, str, resp);
3332 break; 4045 break;
3333#ifndef NO_BOLD_UNDERLINE_REVERSE 4046#ifndef NO_BOLD_UNDERLINE_REVERSE
3334 case XTerm_Color_BD:
3335 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3336 break;
3337 case XTerm_Color_UL:
3338 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3339 break;
3340 case XTerm_Color_RV: 4047 case XTerm_Color_RV:
3341 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 4048 process_color_seq (op, Color_RV, str, resp);
3342 break; 4049 break;
4050 case Rxvt_Color_BD:
4051 case URxvt_Color_BD:
4052 process_color_seq (op, Color_BD, str, resp);
4053 break;
4054 case Rxvt_Color_UL:
4055 case URxvt_Color_UL:
4056 process_color_seq (op, Color_UL, str, resp);
4057 break;
4058 case URxvt_Color_IT:
4059 process_color_seq (op, Color_IT, str, resp);
4060 break;
3343#endif 4061#endif
4062#if TRANSPARENT && TINTING
4063 case URxvt_Color_tint:
4064 process_color_seq (op, Color_tint, str, resp);
3344 4065
4066 check_our_parents ();
4067
4068 if (am_transparent)
4069 want_full_refresh = want_refresh = 1;
4070
4071 break;
4072#endif
4073
3345 case XTerm_Pixmap: 4074 case Rxvt_Pixmap:
4075 {
3346 if (*str != ';') 4076 if (*str != ';')
3347 { 4077 {
3348#if XPM_BACKGROUND 4078#if XPM_BACKGROUND
3349 scale_pixmap (""); /* reset to default scaling */ 4079 scale_pixmap (""); /* reset to default scaling */
3350 set_bgPixmap (str); /* change pixmap */ 4080 set_bgPixmap (str); /* change pixmap */
3351#endif
3352 scr_touch (true); 4081 scr_touch (true);
4082#endif
3353 } 4083 }
4084
4085 int changed = 0;
4086
3354 while ((str = STRCHR (str, ';')) != NULL) 4087 while ((str = strchr (str, ';')) != NULL)
3355 { 4088 {
3356 str++; 4089 str++;
3357#if XPM_BACKGROUND 4090#if XPM_BACKGROUND
3358 changed += scale_pixmap (str); 4091 changed += scale_pixmap (str);
3359#endif 4092#endif
3360
3361 } 4093 }
4094
3362 if (changed) 4095 if (changed)
3363 { 4096 {
3364#ifdef XPM_BACKGROUND 4097#ifdef XPM_BACKGROUND
3365 resize_pixmap (); 4098 resize_pixmap ();
3366#endif
3367 scr_touch (true); 4099 scr_touch (true);
4100#endif
3368 } 4101 }
4102#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
4103 if (option(Opt_transparent))
4104 check_our_parents ();
4105#endif
4106
4107 }
3369 break; 4108 break;
3370 4109
3371 case XTerm_restoreFG: 4110 case Rxvt_restoreFG:
3372 set_window_color (Color_fg, str); 4111 set_window_color (Color_fg, str);
3373 break; 4112 break;
3374 case XTerm_restoreBG: 4113 case Rxvt_restoreBG:
3375 set_window_color (Color_bg, str); 4114 set_window_color (Color_bg, str);
3376 break; 4115 break;
3377 4116
3378 case XTerm_logfile: 4117 case XTerm_logfile:
3379 // TODO, when secure mode? 4118 // TODO, when secure mode?
3380 break; 4119 break;
3381 4120
3382 case XTerm_font:
3383 if (query)
3384 {
3385 if (Options & Opt_insecure)
3386 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3387 TermWin.fontset->fontdesc
3388 ? TermWin.fontset->fontdesc
3389 : "",
3390 resp);
3391 }
3392 else
3393 change_font (str);
3394 break;
3395
3396#ifndef NO_FRILLS
3397 case XTerm_locale:
3398 if (query)
3399 {
3400 if (Options & Opt_insecure)
3401 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3402 }
3403 else
3404 {
3405 set_locale (str);
3406# ifdef USE_XIM
3407 im_cb ();
3408# endif
3409 }
3410 break;
3411
3412 case XTerm_findfont:
3413 if (Options & Opt_insecure)
3414 {
3415 int fid = TermWin.fontset->find_font (atoi (str));
3416 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3417 fid, (*TermWin.fontset)[fid]->name, resp);
3418 }
3419 break;
3420#endif
3421
3422#ifdef MENUBAR
3423 case XTerm_Menu:
3424 if (Options & Opt_insecure)
3425 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3426 break;
3427#endif
3428#if 0 4121#if 0
3429 case XTerm_dumpscreen: /* no error notices */ 4122 case Rxvt_dumpscreen: /* no error notices */
3430 { 4123 {
3431 int fd; 4124 int fd;
3432 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4125 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3433 { 4126 {
3434 scr_dump (fd); 4127 scr_dump (fd);
3435 close (fd); 4128 close (fd);
3436 } 4129 }
3437 } 4130 }
4131 break;
4132#endif
4133 case XTerm_font:
4134 op = URxvt_font;
4135 case URxvt_font:
4136#if ENABLE_STYLES
4137 case URxvt_boldFont:
4138 case URxvt_italicFont:
4139 case URxvt_boldItalicFont:
4140#endif
4141 if (query)
4142 tt_printf ("\33]%d;%-.250s%c", saveop,
4143 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
4144 ? fontset[op - URxvt_font]->fontdesc : "",
4145 resp);
4146 else
4147 {
4148 const char *&res = rs[Rs_font + (op - URxvt_font)];
4149
4150 res = strdup (str);
4151 allocated.push_back ((void *)res);
4152 set_fonts ();
4153 }
4154 break;
4155
4156 case URxvt_version:
4157 if (query)
4158 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
4159 op,
4160 rs[Rs_name], VERSION[0], VERSION[2],
4161 resp);
4162 break;
4163
4164#if !ENABLE_MINIMAL
4165 case URxvt_locale:
4166 if (query)
4167 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4168 else
4169 {
4170 set_locale (str);
4171 pty->set_utf8_mode (enc_utf8);
4172 init_xlocale ();
4173 }
4174 break;
4175
4176 case URxvt_view_up:
4177 case URxvt_view_down:
4178 {
4179 int lines = atoi (str);
4180
4181 if (lines)
4182 scr_page (op == URxvt_view_up ? UP : DN, lines);
4183 else
4184 scr_erase_savelines ();
4185 }
4186
4187 break;
4188#endif
4189
4190#if ENABLE_PERL
4191 case URxvt_perl:
4192 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4193 ; // no responses yet
3438 break; 4194 break;
3439#endif 4195#endif
3440 } 4196 }
3441} 4197}
3442/*----------------------------------------------------------------------*/ 4198/*----------------------------------------------------------------------*/
… …
3456{ 4212{
3457 int state; 4213 int state;
3458 4214
3459 if (mode == 's') 4215 if (mode == 's')
3460 { 4216 {
3461 SavedModes |= (PrivateModes & bit); 4217 SavedModes |= (priv_modes & bit);
3462 return -1; 4218 return -1;
3463 } 4219 }
3464 else 4220 else
3465 { 4221 {
3466 if (mode == 'r') 4222 if (mode == 'r')
3467 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4223 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3468 else 4224 else
3469 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4225 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3470 PrivMode (state, bit); 4226 PrivMode (state, bit);
3471 } 4227 }
3472 4228
3473 return state; 4229 return state;
3474} 4230}
3475 4231
3476/* we're not using priv _yet_ */ 4232/* we're not using priv _yet_ */
3477void 4233void
3478rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4234rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3479{ 4235{
3480 unsigned int i, j; 4236 unsigned int i, j;
3481 int state; 4237 int state;
3482 4238
3483 static const struct 4239 static const struct
… …
3492 { 3, PrivMode_132 }, 4248 { 3, PrivMode_132 },
3493 { 4, PrivMode_smoothScroll }, 4249 { 4, PrivMode_smoothScroll },
3494 { 5, PrivMode_rVideo }, 4250 { 5, PrivMode_rVideo },
3495 { 6, PrivMode_relOrigin }, 4251 { 6, PrivMode_relOrigin },
3496 { 7, PrivMode_Autowrap }, 4252 { 7, PrivMode_Autowrap },
4253 // 8, bi-directional support mode
3497 { 9, PrivMode_MouseX10 }, 4254 { 9, PrivMode_MouseX10 },
3498#ifdef menuBar_esc 4255 // 18, 19 printing-related
3499 { menuBar_esc, PrivMode_menuBar }, 4256 { 25, PrivMode_VisibleCursor },
3500#endif
3501#ifdef scrollBar_esc 4257#ifdef scrollBar_esc
3502 { scrollBar_esc, PrivMode_scrollBar }, 4258 { scrollBar_esc, PrivMode_scrollBar },
3503#endif 4259#endif
3504 // 18, 19 printing-related
3505 { 25, PrivMode_VisibleCursor },
3506 // 30 show scrollbar rxvt. extension
3507 { 35, PrivMode_ShiftKeys }, // rxvt extension 4260 { 35, PrivMode_ShiftKeys }, // rxvt extension
3508 { 40, PrivMode_132OK }, 4261 { 40, PrivMode_132OK },
3509 // 41 xterm more fixes NYI 4262 // 41 xterm more fixes NYI
3510 // 45 margin bell NYI 4263 // 45 margin bell NYI
3511 // 46 start logging 4264 // 46 start logging
… …
3551 } 4304 }
3552 4305
3553 /* extra handling for values with state unkept */ 4306 /* extra handling for values with state unkept */
3554 switch (arg[i]) 4307 switch (arg[i])
3555 { 4308 {
4309#if ENABLE_STYLES
4310 case 1021:
4311 set_option (Opt_intensityStyles, mode);
4312
4313 scr_touch (true);
4314 break;
4315#endif
3556 case 1048: /* alternative cursor save */ 4316 case 1048: /* alternative cursor save */
4317 case 1049:
3557 if (Options & Opt_secondaryScreen) 4318 if (option (Opt_secondaryScreen))
3558 if (mode == 0) 4319 if (mode == 0)
3559 scr_cursor (RESTORE); 4320 scr_cursor (RESTORE);
3560 else if (mode == 1) 4321 else if (mode == 1)
3561 scr_cursor (SAVE); 4322 scr_cursor (SAVE);
3562 break; 4323 break;
… …
3573 * within VT52 mode 4334 * within VT52 mode
3574 */ 4335 */
3575 PrivMode (1, PrivMode_vt52); 4336 PrivMode (1, PrivMode_vt52);
3576 break; 4337 break;
3577 case 3: /* 80/132 */ 4338 case 3: /* 80/132 */
3578 if (PrivateModes & PrivMode_132OK) 4339 if (priv_modes & PrivMode_132OK)
3579 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4340 set_widthheight (((state ? 132 : 80) * fwidth), height);
3580 break; 4341 break;
3581 case 4: /* smooth scrolling */ 4342 case 4: /* smooth scrolling */
3582 if (state) 4343 set_option (Opt_jumpScroll, !state);
3583 Options &= ~Opt_jumpScroll;
3584 else
3585 Options |= Opt_jumpScroll;
3586 break; 4344 break;
3587 case 5: /* reverse video */ 4345 case 5: /* reverse video */
3588 scr_rvideo_mode (state); 4346 scr_rvideo_mode (state);
3589 break; 4347 break;
3590 case 6: /* relative/absolute origins */ 4348 case 6: /* relative/absolute origins */
… …
3594 scr_autowrap (state); 4352 scr_autowrap (state);
3595 break; 4353 break;
3596 /* case 8: - auto repeat, can't do on a per window basis */ 4354 /* case 8: - auto repeat, can't do on a per window basis */
3597 case 9: /* X10 mouse reporting */ 4355 case 9: /* X10 mouse reporting */
3598 if (state) /* orthogonal */ 4356 if (state) /* orthogonal */
3599 PrivateModes &= ~PrivMode_MouseX11; 4357 priv_modes &= ~PrivMode_MouseX11;
3600 break; 4358 break;
3601#ifdef menuBar_esc
3602 case menuBar_esc:
3603#ifdef MENUBAR
3604 map_menuBar (state);
3605#endif
3606 break;
3607#endif
3608#ifdef scrollBar_esc 4359#ifdef scrollBar_esc
3609 case scrollBar_esc: 4360 case scrollBar_esc:
3610 if (scrollbar_mapping (state)) 4361 if (scrollbar_mapping (state))
3611 { 4362 {
3612 resize_all_windows (0, 0, 0); 4363 resize_all_windows (0, 0, 0);
… …
3624 break; 4375 break;
3625 /* case 66: - application key pad */ 4376 /* case 66: - application key pad */
3626 /* case 67: - backspace key */ 4377 /* case 67: - backspace key */
3627 case 1000: /* X11 mouse reporting */ 4378 case 1000: /* X11 mouse reporting */
3628 if (state) /* orthogonal */ 4379 if (state) /* orthogonal */
3629 PrivateModes &= ~PrivMode_MouseX10; 4380 priv_modes &= ~PrivMode_MouseX10;
3630 break; 4381 break;
3631#if 0 4382#if 0
3632 case 1001: 4383 case 1001:
3633 break; /* X11 mouse highlighting */ 4384 break; /* X11 mouse highlighting */
3634#endif 4385#endif
3635 case 1010: /* scroll to bottom on TTY output inhibit */ 4386 case 1010: /* scroll to bottom on TTY output inhibit */
3636 if (state)
3637 Options &= ~Opt_scrollTtyOutput;
3638 else
3639 Options |= Opt_scrollTtyOutput; 4387 set_option (Opt_scrollTtyOutput, !state);
3640 break; 4388 break;
3641 case 1011: /* scroll to bottom on key press */ 4389 case 1011: /* scroll to bottom on key press */
3642 if (state)
3643 Options |= Opt_scrollTtyKeypress; 4390 set_option (Opt_scrollTtyKeypress, state);
3644 else
3645 Options &= ~Opt_scrollTtyKeypress;
3646 break; 4391 break;
3647 case 1047: /* secondary screen w/ clearing last */ 4392 case 1047: /* secondary screen w/ clearing last */
3648 if (Options & Opt_secondaryScreen) 4393 if (option (Opt_secondaryScreen))
3649 if (current_screen != PRIMARY) 4394 if (current_screen != PRIMARY)
3650 scr_erase_screen (2); 4395 scr_erase_screen (2);
3651 scr_change_screen (state); 4396 scr_change_screen (state);
3652 break; 4397 break;
3653 case 1049: /* secondary screen w/ clearing first */ 4398 case 1049: /* secondary screen w/ clearing first */
3654 scr_change_screen (state); 4399 scr_change_screen (state);
3655 if (Options & Opt_secondaryScreen) 4400 if (option (Opt_secondaryScreen))
3656 if (current_screen != PRIMARY) 4401 if (current_screen != PRIMARY)
3657 scr_erase_screen (2); 4402 scr_erase_screen (2);
3658 break; 4403 break;
3659 default: 4404 default:
3660 break; 4405 break;
… …
3686 rendset = 0, rendstyle = ~RS_None; 4431 rendset = 0, rendstyle = ~RS_None;
3687 break; 4432 break;
3688 case 1: 4433 case 1:
3689 rendset = 1, rendstyle = RS_Bold; 4434 rendset = 1, rendstyle = RS_Bold;
3690 break; 4435 break;
4436 //case 2: // low intensity
4437 case 3:
4438 rendset = 1, rendstyle = RS_Italic;
4439 break;
3691 case 4: 4440 case 4:
3692 rendset = 1, rendstyle = RS_Uline; 4441 rendset = 1, rendstyle = RS_Uline;
3693 break; 4442 break;
3694 case 5: 4443 case 5: // slowly blinking
4444 case 6: // rapidly blinking
3695 rendset = 1, rendstyle = RS_Blink; 4445 rendset = 1, rendstyle = RS_Blink;
3696 break; 4446 break;
3697 //case 6: // scoansi light background 4447 //case 6: // scoansi light background
3698 case 7: 4448 case 7:
3699 rendset = 1, rendstyle = RS_RVid; 4449 rendset = 1, rendstyle = RS_RVid;
3700 break; 4450 break;
3701 case 8: 4451 case 8:
3702 // invisible. NYI 4452 // invisible. NYI
3703 break; 4453 break;
4454 //case 9: // crossed out
3704 //case 10: // scoansi acs off 4455 //case 10: // scoansi acs off, primary font
3705 //case 11: // scoansi acs on 4456 //case 11: // scoansi acs on, first alt font
3706 //case 12: // scoansi acs on, |0x80 4457 //case 12: // scoansi acs on, |0x80, second alt font
3707 case 21: // disable bold, blink and invis (some terminals use this) 4458 //...
4459 //case 19: // ninth alt font
4460 //case 20: // gothic
4461 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3708 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4462 rendset = 0, rendstyle = RS_Bold;
3709 break; 4463 break;
3710 case 22: 4464 case 22: // normal intensity
3711 rendset = 0, rendstyle = RS_Bold; 4465 rendset = 0, rendstyle = RS_Bold;
4466 break;
4467 case 23: // disable italic
4468 rendset = 0, rendstyle = RS_Italic;
3712 break; 4469 break;
3713 case 24: 4470 case 24:
3714 rendset = 0, rendstyle = RS_Uline; 4471 rendset = 0, rendstyle = RS_Uline;
3715 break; 4472 break;
3716 case 25: 4473 case 25:
3717 rendset = 0, rendstyle = RS_Blink; 4474 rendset = 0, rendstyle = RS_Blink;
3718 break; 4475 break;
4476 case 26: // variable spacing (iso 8613)
4477 rendset = 0, rendstyle = RS_Blink;
4478 break;
3719 case 27: 4479 case 27:
3720 rendset = 0, rendstyle = RS_RVid; 4480 rendset = 0, rendstyle = RS_RVid;
3721 break; 4481 break;
3722 case 28:
3723 // visible. NYI 4482 //case 28: // visible. NYI
3724 break; 4483 //case 29: // not crossed-out
3725 } 4484 }
3726 4485
3727 if (rendset != -1) 4486 if (rendset != -1)
3728 { 4487 {
3729 scr_rendition (rendset, rendstyle); 4488 scr_rendition (rendset, rendstyle);
… …
3740 case 35: 4499 case 35:
3741 case 36: 4500 case 36:
3742 case 37: 4501 case 37:
3743 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4502 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3744 break; 4503 break;
3745#ifdef TTY_256COLOR 4504 case 38: // set fg color, ISO 8613-6
3746 case 38:
3747 if (nargs > i + 2 && arg[i + 1] == 5) 4505 if (nargs > i + 2 && arg[i + 1] == 5)
3748 { 4506 {
3749 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4507 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3750 i += 2; 4508 i += 2;
3751 } 4509 }
3752 break; 4510 break;
3753#endif
3754 case 39: /* default fg */ 4511 case 39: /* default fg */
3755 scr_color (Color_fg, Color_fg); 4512 scr_color (Color_fg, Color_fg);
3756 break; 4513 break;
3757 4514
3758 case 40: 4515 case 40:
… …
3763 case 45: 4520 case 45:
3764 case 46: 4521 case 46:
3765 case 47: 4522 case 47:
3766 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4523 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3767 break; 4524 break;
3768#ifdef TTY_256COLOR 4525 case 48: // set bg color, ISO 8613-6
3769 case 48:
3770 if (nargs > i + 2 && arg[i + 1] == 5) 4526 if (nargs > i + 2 && arg[i + 1] == 5)
3771 { 4527 {
3772 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4528 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3773 i += 2; 4529 i += 2;
3774 } 4530 }
3775 break; 4531 break;
3776#endif
3777 case 49: /* default bg */ 4532 case 49: /* default bg */
3778 scr_color (Color_bg, Color_bg); 4533 scr_color (Color_bg, Color_bg);
3779 break; 4534 break;
3780 4535
3781#ifndef NO_BRIGHTCOLOR 4536 //case 50: // not variable spacing
4537
4538#if !ENABLE_MINIMAL
3782 case 90: 4539 case 90:
3783 case 91: /* set bright fg color */ 4540 case 91: /* set bright fg color */
3784 case 92: 4541 case 92:
3785 case 93: 4542 case 93:
3786 case 94: 4543 case 94:
3787 case 95: 4544 case 95:
3788 case 96: 4545 case 96:
3789 case 97: 4546 case 97:
3790 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4547 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3791 Color_fg);
3792 break; 4548 break;
3793 case 100: 4549 case 100:
3794 case 101: /* set bright bg color */ 4550 case 101: /* set bright bg color */
3795 case 102: 4551 case 102:
3796 case 103: 4552 case 103:
3797 case 104: 4553 case 104:
3798 case 105: 4554 case 105:
3799 case 106: 4555 case 106:
3800 case 107: 4556 case 107:
3801 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4557 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3802 Color_bg);
3803 break; 4558 break;
3804#endif 4559#endif
3805
3806 } 4560 }
3807 } 4561 }
3808} 4562}
3809/*}}} */ 4563/*}}} */
3810 4564
… …
3814{ 4568{
3815 unicode_t ch, cmd = cmd_getc (); 4569 unicode_t ch, cmd = cmd_getc ();
3816 4570
3817 if (cmd == 'Q') 4571 if (cmd == 'Q')
3818 { /* query graphics */ 4572 { /* query graphics */
3819 tt_printf ("\033G0\n"); /* no graphics */ 4573 tt_printf ("\033G0\012"); /* no graphics */
3820 return; 4574 return;
3821 } 4575 }
3822 /* swallow other graphics sequences until terminating ':' */ 4576 /* swallow other graphics sequences until terminating ':' */
3823 do 4577 do
3824 ch = cmd_getc (); 4578 ch = cmd_getc ();
… …
3834 */ 4588 */
3835void 4589void
3836rxvt_term::tt_printf (const char *fmt,...) 4590rxvt_term::tt_printf (const char *fmt,...)
3837{ 4591{
3838 va_list arg_ptr; 4592 va_list arg_ptr;
3839 unsigned char buf[256]; 4593 char buf[256];
3840 4594
3841 va_start (arg_ptr, fmt); 4595 va_start (arg_ptr, fmt);
3842 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4596 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3843 va_end (arg_ptr); 4597 va_end (arg_ptr);
3844 tt_write (buf, STRLEN (buf)); 4598 tt_write (buf, strlen (buf));
3845} 4599}
3846 4600
3847/* ---------------------------------------------------------------------- */ 4601/* ---------------------------------------------------------------------- */
3848/* Write data to the pty as typed by the user, pasted with the mouse, 4602/* Write data to the pty as typed by the user, pasted with the mouse,
3849 * or generated by us in response to a query ESC sequence. 4603 * or generated by us in response to a query ESC sequence.
3850 */ 4604 */
4605const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4606
3851void 4607void
3852rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4608rxvt_term::tt_write (const char *data, unsigned int len)
3853{ 4609{
3854 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4610 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4611 return;
3855 4612
3856 if (len) 4613 if (pty->pty < 0)
4614 return;
4615
4616 if (v_buflen == 0)
4617 {
4618 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4619
4620 if ((unsigned int)written == len)
4621 return;
4622
4623 data += written;
4624 len -= written;
3857 { 4625 }
4626
4627 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4628
4629 memcpy (v_buffer + v_buflen, data, len);
4630 v_buflen += len;
4631
4632 pty_ev.set (EVENT_READ | EVENT_WRITE);
4633}
4634
4635void rxvt_term::pty_write ()
4636{
4637 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4638
4639 if (written > 0)
4640 {
4641 v_buflen -= written;
4642
3858 if (v_buflen == 0) 4643 if (v_buflen == 0)
3859 { 4644 {
3860 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3861
3862 if ((unsigned int)written == len)
3863 return;
3864
3865 data += written;
3866 len -= written;
3867 }
3868
3869
3870 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3871
3872 memcpy (v_buffer + v_buflen, data, len);
3873 v_buflen += len;
3874 }
3875
3876 for (;;)
3877 {
3878 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3879
3880 if (written > 0)
3881 {
3882 v_buflen -= written;
3883
3884 if (v_buflen == 0)
3885 {
3886 free (v_buffer); 4645 free (v_buffer);
3887 v_buffer = 0; 4646 v_buffer = 0;
3888 v_buflen = 0; 4647 v_buflen = 0;
3889 4648
3890 pty_ev.set (EVENT_READ); 4649 pty_ev.set (EVENT_READ);
3891 return;
3892 }
3893
3894 memmove (v_buffer, v_buffer + written, v_buflen);
3895 }
3896 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3897 // original code just ignores this...
3898 destroy ();
3899 else
3900 {
3901 pty_ev.set (EVENT_READ | EVENT_WRITE);
3902 return; 4650 return;
3903 } 4651 }
4652
4653 memmove (v_buffer, v_buffer + written, v_buflen);
3904 } 4654 }
4655 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4656 pty_ev.set (EVENT_READ);
3905} 4657}
3906 4658
3907/*----------------------- end-of-file (C source) -----------------------*/ 4659/*----------------------- end-of-file (C source) -----------------------*/
3908 4660

Diff Legend

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