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.278 by root, Fri Jan 20 18:50:49 2006 UTC

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

Diff Legend

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