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

Diff Legend

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