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

Diff Legend

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