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.295 by root, Tue Jan 31 00:25:16 2006 UTC

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

Diff Legend

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