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.302 by root, Tue Jan 31 21:35:39 2006 UTC

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

Diff Legend

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