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.304 by root, Tue Jan 31 22:01:25 2006 UTC

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

Diff Legend

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