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.275 by root, Fri Jan 20 10:35:25 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
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
1407 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1408 {
1008 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1409 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1009 destroy (); 1410 destroy ();
1411#if ENABLE_EWMH
1412 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1413 XSendEvent (disp, ev.xclient.window = display->root,
1414 False, SubstructureRedirectMask | SubstructureNotifyMask,
1415 &ev);
1416#endif
1417 }
1418#if ENABLE_XEMBED
1419 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1420 {
1421 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1422 focus_in ();
1423 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1424 focus_out ();
1425 }
1426#endif
1010#ifdef OFFIX_DND 1427#ifdef OFFIX_DND
1011 /* OffiX Dnd (drag 'n' drop) protocol */ 1428 /* OffiX Dnd (drag 'n' drop) protocol */
1012 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1429 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1013 && (ev.xclient.data.l[0] == DndFile 1430 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1431 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1432 || ev.xclient.data.l[0] == DndLink))
1016 { 1433 {
1017 /* Get Dnd data */ 1434 /* Get Dnd data */
1018 Atom ActualType; 1435 Atom ActualType;
1019 int ActualFormat; 1436 int ActualFormat;
1020 unsigned char *data; 1437 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1438 unsigned long Size, RemainingBytes;
1022 1439
1023 XGetWindowProperty (display->display, display->root, 1440 XGetWindowProperty (disp, display->root,
1024 xa[XA_DNDSELECTION], 1441 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1442 0L, 1000000L,
1026 False, AnyPropertyType, 1443 False, AnyPropertyType,
1027 &ActualType, &ActualFormat, 1444 &ActualType, &ActualFormat,
1028 &Size, &RemainingBytes, 1445 &Size, &RemainingBytes,
1029 &data); 1446 &data);
1030 XChangeProperty (display->display, display->root, 1447 set_string_property (XA_CUT_BUFFER0, data);
1031 XA_CUT_BUFFER0, XA_STRING, 1448 XFree (data);
1032 8, PropModeReplace,
1033 data, STRLEN (data));
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1449 selection_paste (display->root, XA_CUT_BUFFER0, true);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1450 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1036 } 1451 }
1037#endif /* OFFIX_DND */ 1452#endif /* OFFIX_DND */
1038 break; 1453 break;
1039 1454
1040 case MappingNotify: 1455 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1456 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1457 break;
1043 1458
1044 /* 1459 /*
1045 * XXX: this is not the _current_ arrangement 1460 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1461 * Here's my conclusion:
… …
1065 break; 1480 break;
1066 } 1481 }
1067 break; 1482 break;
1068 1483
1069 case FocusIn: 1484 case FocusIn:
1070 if (!TermWin.focus) 1485 focus_in ();
1486 break;
1487
1488 case FocusOut:
1489 focus_out ();
1490 break;
1491
1492 case ConfigureNotify:
1493 if (ev.xconfigure.window == parent[0])
1071 { 1494 {
1072 TermWin.focus = 1; 1495 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1073 want_refresh = 1; 1496 ;
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 1497
1498 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1499 {
1500 seen_resize = 1;
1501 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1502 }
1503
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1505
1506#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1507 if (OPTION (Opt_transparent))
1508 check_our_parents ();
1509#endif
1083 } 1510 }
1084 break; 1511 break;
1085 1512
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: 1513 case PropertyNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1106 { 1515 && ev.xproperty.state == PropertyNewValue)
1107 int height, width; 1516 selection_property (ev.xproperty.window, ev.xproperty.atom);
1108 1517
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; 1518 break;
1139 1519
1140 case SelectionClear: 1520 case SelectionClear:
1141 selection_clear (); 1521 selection_clear ();
1142 break; 1522 break;
1143 1523
1144 case SelectionNotify: 1524 case SelectionNotify:
1145 if (selection_wait == Sel_normal) 1525 if (selection_wait == Sel_normal)
1146 selection_paste (ev.xselection.requestor, 1526 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1147 ev.xselection.property, True);
1148 break; 1527 break;
1149 1528
1150 case SelectionRequest: 1529 case SelectionRequest:
1151 selection_send (ev.xselectionrequest); 1530 selection_send (ev.xselectionrequest);
1152 break; 1531 break;
1153 1532
1533 case MapNotify:
1534 mapped = 1;
1535#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1537#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break;
1540
1154 case UnmapNotify: 1541 case UnmapNotify:
1155 TermWin.mapped = 0; 1542 mapped = 0;
1156#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1157 text_blink_ev.stop (); 1544 text_blink_ev.stop ();
1158#endif 1545#endif
1159 break; 1546 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; 1547 break;
1167 1548
1168#ifdef TRANSPARENT 1549#ifdef TRANSPARENT
1169 case ReparentNotify: 1550 case ReparentNotify:
1170 rootwin_cb (ev); 1551 rootwin_cb (ev);
1171 break; 1552 break;
1172#endif /* TRANSPARENT */ 1553#endif /* TRANSPARENT */
1173 1554
1174 case GraphicsExpose: 1555 case GraphicsExpose:
1175 case Expose: 1556 case Expose:
1176 if (ev.xany.window == TermWin.vt) 1557 if (ev.xany.window == vt)
1177 { 1558 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1559 do
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1562 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1182 // don't understand this, so commented it out 1563
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565
1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1569
1186 // ev.xexpose.width, TermWin.height, False);
1187#endif
1188 want_refresh = 1; 1570 want_refresh = 1;
1189 } 1571 }
1190 else 1572 else
1191 { 1573 {
1192 XEvent unused_event; 1574 XEvent unused_event;
1193 1575
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1576 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1195 Expose, 1577 ;
1196 &unused_event)) ; 1578 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1579 ;
1198 GraphicsExpose, 1580
1199 &unused_event)) ;
1200 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1201 { 1582 {
1202 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1203 scrollbar_show (0); 1584 scrollbar_show (0);
1204 } 1585 }
1205#ifdef MENUBAR 1586
1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1587#ifdef TRANSPARENT
1207 menubar_expose (); 1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (disp, ev.xany.window);
1208#endif 1590#endif
1209 } 1591 }
1210 break; 1592 break;
1211 1593
1212 case MotionNotify: 1594 case MotionNotify:
1213#ifdef POINTER_BLANK 1595#ifdef POINTER_BLANK
1214 if (hidden_pointer) 1596 if (hidden_pointer)
1215 pointer_unblank (); 1597 pointer_unblank ();
1216#endif 1598#endif
1217#if MENUBAR 1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1218 if (isMenuBarWindow (ev.xany.window)) 1600 break;
1601
1602 if (ev.xany.window == vt)
1219 { 1603 {
1220 menubar_control (ev.xbutton); 1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1221 break; 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1222 } 1606 ; // 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))) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1230 { 1608 {
1231 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1232 ; 1610 ;
1233 1611
1234 XQueryPointer (display->display, TermWin.vt, 1612 XQueryPointer (disp, vt,
1235 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1236 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1237 & (ev.xbutton.x), & (ev.xbutton.y), 1615 &ev.xbutton.x, &ev.xbutton.y,
1238 &unused_mask); 1616 &ev.xbutton.state);
1239#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
1240 /* deal with a `jumpy' mouse */ 1618 /* deal with a `jumpy' mouse */
1241 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1619 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1242 { 1620 {
1243#endif 1621#endif
1622#if ISO_14755
1623 // 5.4
1624 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1625 {
1626 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1627 break;
1628 }
1629#endif
1244 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1630 selection_extend (ev.xbutton.x, ev.xbutton.y,
1245 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1631 ev.xbutton.state & Button3Mask ? 2 : 0);
1632
1246#ifdef SELECTION_SCROLLING 1633#ifdef SELECTION_SCROLLING
1247 if (ev.xbutton.y < TermWin.int_bwidth 1634 if (ev.xbutton.y < int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1635 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1249 { 1636 {
1250 int dist; 1637 int dist;
1251
1252 pending_scroll_selection=1;
1253 1638
1254 /* don't clobber the current delay if we are 1639 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1640 * already in the middle of scrolling.
1256 */ 1641 */
1257 if (scroll_selection_delay<=0) 1642 if (!sel_scroll_ev.active)
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1259 1644
1260 /* save the event params so we can highlight 1645 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1646 * the selection in the pending-scroll loop
1262 */ 1647 */
1263 selection_save_x=ev.xbutton.x; 1648 selection_save_x = ev.xbutton.x;
1264 selection_save_y=ev.xbutton.y; 1649 selection_save_y = ev.xbutton.y;
1265 selection_save_state=
1266 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1650 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1267 1651
1268 /* calc number of lines to scroll */ 1652 /* calc number of lines to scroll */
1269 if (ev.xbutton.y<TermWin.int_bwidth) 1653 if (ev.xbutton.y < int_bwidth)
1270 { 1654 {
1271 scroll_selection_dir = UP; 1655 scroll_selection_dir = UP;
1272 dist = TermWin.int_bwidth - ev.xbutton.y; 1656 dist = int_bwidth - ev.xbutton.y;
1273 } 1657 }
1274 else 1658 else
1275 { 1659 {
1276 scroll_selection_dir = DN; 1660 scroll_selection_dir = DN;
1277 dist = ev.xbutton.y - 1661 dist = ev.xbutton.y - (int_bwidth + height);
1278 (TermWin.int_bwidth + TermWin.height);
1279 } 1662 }
1663
1280 scroll_selection_lines= (Pixel2Height (dist)/ 1664 scroll_selection_lines = Pixel2Height (dist)
1281 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1665 / SELECTION_SCROLL_LINE_SPEEDUP
1666 + 1;
1282 MIN_IT (scroll_selection_lines, 1667 min_it (scroll_selection_lines,
1283 SELECTION_SCROLL_MAX_LINES); 1668 SELECTION_SCROLL_MAX_LINES);
1284 } 1669 }
1285 else 1670 else
1286 { 1671 {
1287 /* we are within the text window, so we 1672 /* we are within the text window, so we
1288 * shouldn't be scrolling 1673 * shouldn't be scrolling
1289 */ 1674 */
1290 pending_scroll_selection = 0; 1675 if (sel_scroll_ev.active)
1676 sel_scroll_ev.stop();
1291 } 1677 }
1292#endif 1678#endif
1293#ifdef MOUSE_THRESHOLD 1679#ifdef MOUSE_THRESHOLD
1294
1295 } 1680 }
1296#endif 1681#endif
1297
1298 } 1682 }
1299 } 1683 }
1300 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1301 { 1685 {
1302 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1686 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1303 MotionNotify, &ev)) ; 1687 MotionNotify, &ev))
1688 ;
1689
1304 XQueryPointer (display->display, scrollBar.win, 1690 XQueryPointer (disp, scrollBar.win,
1305 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1306 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1307 & (ev.xbutton.x), & (ev.xbutton.y), 1693 &ev.xbutton.x, &ev.xbutton.y,
1308 &unused_mask); 1694 &unused_mask);
1309 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1310 scrollbar_size ()); 1696 scrollbar_size ());
1311 scr_refresh (refresh_type); 1697 want_refresh = 1;
1312 refresh_limit = 0; 1698 refresh_limit = 0;
1313 scrollbar_show (1); 1699 scrollbar_show (1);
1314 } 1700 }
1315 break; 1701 break;
1316 } 1702 }
1317}
1318 1703
1704skip_switch: ;
1705
1706#if defined(CURSOR_BLINK)
1707 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1708 {
1709 if (hidden_cursor)
1710 {
1711 hidden_cursor = 0;
1712 want_refresh = 1;
1713 }
1714
1715 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1716 }
1717#endif
1718
1719#if defined(POINTER_BLANK)
1720 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1721 {
1722 if (ev.type == MotionNotify
1723 || ev.type == ButtonPress
1724 || ev.type == ButtonRelease)
1725 if (hidden_pointer)
1726 pointer_unblank ();
1727
1728 if (ev.type == KeyPress && hidden_pointer == 0)
1729 pointer_blank ();
1730 }
1731#endif
1732}
1733
1734void
1735rxvt_term::focus_in ()
1736{
1737 if (!focus)
1738 {
1739 focus = 1;
1740 want_refresh = 1;
1741
1742 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1743
1744#if USE_XIM
1745 if (Input_Context != NULL)
1746 {
1747 IMSetStatusPosition ();
1748 XSetICFocus (Input_Context);
1749 }
1750#endif
1751#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink))
1753 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1754#endif
1755#if OFF_FOCUS_FADING
1756 if (rs[Rs_fade])
1757 {
1758 pix_colors = pix_colors_focused;
1759 scr_recolour ();
1760 }
1761#endif
1762 }
1763}
1764
1765void
1766rxvt_term::focus_out ()
1767{
1768 if (focus)
1769 {
1770 focus = 0;
1771 want_refresh = 1;
1772
1773 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1774
1775#if ENABLE_FRILLS || ISO_14755
1776 if (iso14755buf)
1777 {
1778 iso14755buf = 0;
1779# if ENABLE_OVERLAY
1780 scr_overlay_off ();
1781# endif
1782 }
1783#endif
1784#if USE_XIM
1785 if (Input_Context != NULL)
1786 XUnsetICFocus (Input_Context);
1787#endif
1788#if CURSOR_BLINK
1789 if (OPTION (Opt_cursorBlink))
1790 cursor_blink_ev.stop ();
1791 hidden_cursor = 0;
1792#endif
1793#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade])
1795 {
1796 pix_colors = pix_colors_unfocused;
1797 scr_recolour ();
1798 }
1799#endif
1800 }
1801}
1802
1803#if TRANSPARENT
1319void 1804void
1320rxvt_term::rootwin_cb (XEvent &ev) 1805rxvt_term::rootwin_cb (XEvent &ev)
1321{ 1806{
1322 SET_R (this); 1807 make_current ();
1323 SET_LOCALE (locale);
1324 1808
1325 switch (ev.type) 1809 switch (ev.type)
1326 { 1810 {
1327 case PropertyNotify: 1811 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 /* 1812 /*
1338 * if user used some Esetroot compatible prog to set the root bg, 1813 * 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. 1814 * use the property to determine the pixmap. We use it later on.
1340 */ 1815 */
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]) 1816 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1817 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1345 return; 1818 return;
1346 }
1347 1819
1348 /* FALLTHROUGH */ 1820 /* FALLTHROUGH */
1349 case ReparentNotify: 1821 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ()) 1822 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1351 if (am_transparent)
1352 want_full_refresh = 1; 1823 want_refresh = want_full_refresh = 1;
1353 break; 1824 break;
1354#endif
1355 } 1825 }
1356} 1826}
1827#endif
1357 1828
1358void 1829void
1359rxvt_term::button_press (XButtonEvent &ev) 1830rxvt_term::button_press (XButtonEvent &ev)
1360{ 1831{
1361 int reportmode = 0, clickintime; 1832 int reportmode = 0, clickintime;
1362 1833
1363 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1834 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1835
1364 if (!bypass_keystate) 1836 if (!bypass_keystate)
1365 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1837 reportmode = !! (priv_modes & PrivMode_mouse_report);
1838
1366 /* 1839 /*
1367 * VT window processing of button press 1840 * VT window processing of button press
1368 */ 1841 */
1369 if (ev.window == TermWin.vt) 1842 if (ev.window == vt)
1370 { 1843 {
1844#if ISO_14755
1845 // 5.4
1846 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1847 {
1848 iso14755_54 (ev.x, ev.y);
1849 return;
1850 }
1851#endif
1852
1371 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1853 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1854
1372 if (reportmode) 1855 if (reportmode)
1373 { 1856 {
1374 /* mouse report from vt window */ 1857 /* mouse report from vt window */
1375 /* save the xbutton state (for ButtonRelease) */ 1858 /* save the xbutton state (for ButtonRelease) */
1376 MEvent.state = ev.state; 1859 MEvent.state = ev.state;
1377#ifdef MOUSE_REPORT_DOUBLECLICK 1860#ifdef MOUSE_REPORT_DOUBLECLICK
1378 if (ev.button == MEvent.button && clickintime) 1861 if (ev.button == MEvent.button && clickintime)
1379 { 1862 {
1380 /* same button, within alloted time */ 1863 /* same button, within alloted time */
1381 MEvent.clicks++; 1864 MEvent.clicks++;
1865
1382 if (MEvent.clicks > 1) 1866 if (MEvent.clicks > 1)
1383 { 1867 {
1384 /* only report double clicks */ 1868 /* only report double clicks */
1385 MEvent.clicks = 2; 1869 MEvent.clicks = 2;
1386 mouse_report (ev); 1870 mouse_report (ev);
… …
1405 } 1889 }
1406 else 1890 else
1407 { 1891 {
1408 if (ev.button != MEvent.button) 1892 if (ev.button != MEvent.button)
1409 MEvent.clicks = 0; 1893 MEvent.clicks = 0;
1894
1895 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1410 switch (ev.button) 1896 switch (ev.button)
1411 { 1897 {
1412 case Button1: 1898 case Button1:
1899 /* allow meta + click to select rectangular areas */
1900 /* should be done in screen.C */
1901#if ENABLE_FRILLS
1902 selection.rect = !!(ev.state & ModMetaMask);
1903#else
1904 selection.rect = false;
1905#endif
1906
1413 /* allow shift+left click to extend selection */ 1907 /* allow shift+left click to extend selection */
1414 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1415 { 1909 {
1416 if (MEvent.button == Button1 && clickintime) 1910 if (MEvent.button == Button1 && clickintime)
1417 selection_rotate (ev.x, ev.y); 1911 selection_rotate (ev.x, ev.y);
1418 else 1912 else
1419 selection_extend (ev.x, ev.y, 1); 1913 selection_extend (ev.x, ev.y, 1);
1420 } 1914 }
1421 else 1915 else
1422 { 1916 {
1423 if (MEvent.button == Button1 && clickintime) 1917 if (MEvent.button == Button1 && clickintime)
1424 MEvent.clicks++; 1918 MEvent.clicks++;
1425 else 1919 else
1426 MEvent.clicks = 1; 1920 MEvent.clicks = 1;
1427 1921
1428 selection_click (MEvent.clicks, ev.x, ev.y); 1922 selection_click (MEvent.clicks, ev.x, ev.y);
1429 } 1923 }
1430 1924
1431 MEvent.button = Button1; 1925 MEvent.button = Button1;
1432 break; 1926 break;
1433 1927
1434 case Button3: 1928 case Button3:
1435 if (MEvent.button == Button3 && clickintime) 1929 if (MEvent.button == Button3 && clickintime)
1436 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1437 else 1931 else
1438 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
1933
1439 MEvent.button = Button3; 1934 MEvent.button = Button3;
1440 break; 1935 break;
1441 } 1936 }
1442 } 1937 }
1938
1443 MEvent.time = ev.time; 1939 MEvent.time = ev.time;
1444 return; 1940 return;
1445 } 1941 }
1446 1942
1447 /* 1943 /*
… …
1513 upordown = 1; /* down */ 2009 upordown = 1; /* down */
1514 } 2010 }
1515 if (upordown) 2011 if (upordown)
1516 { 2012 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2013#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2014 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1519#endif 2015#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 2016 if (scr_page (upordown < 0 ? UP : DN, 1))
1521 { 2017 {
1522 if (upordown < 0) 2018 if (upordown < 0)
1523 scrollBar.setUp (); 2019 scrollBar.setUp ();
… …
1539 break; 2035 break;
1540 case R_SB_ALIGN_BOTTOM: 2036 case R_SB_ALIGN_BOTTOM:
1541 csrO = scrollBar.bot - scrollBar.top; 2037 csrO = scrollBar.bot - scrollBar.top;
1542 break; 2038 break;
1543 } 2039 }
2040
1544 if (scrollBar.style == R_SB_XTERM 2041 if (scrollBar.style == R_SB_XTERM
1545 || scrollbar_above_slider (ev.y) 2042 || scrollbar_above_slider (ev.y)
1546 || scrollbar_below_slider (ev.y)) 2043 || scrollbar_below_slider (ev.y))
1547 scr_move_to ( scrollbar_position (ev.y) - csrO, 2044 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1548 scrollbar_size ()); 2045
1549 scrollBar.setMotion (); 2046 scrollBar.setMotion ();
1550 break; 2047 break;
1551 2048
1552 case Button1: 2049 case Button1:
1553 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2050 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1557 case Button3: 2054 case Button3:
1558 if (scrollBar.style != R_SB_XTERM) 2055 if (scrollBar.style != R_SB_XTERM)
1559 { 2056 {
1560 if (scrollbar_above_slider (ev.y)) 2057 if (scrollbar_above_slider (ev.y))
1561# ifdef RXVT_SCROLL_FULL 2058# ifdef RXVT_SCROLL_FULL
1562 scr_page (UP, TermWin.nrow - 1); 2059 scr_page (UP, nrow - 1);
1563# else 2060# else
1564 scr_page (UP, TermWin.nrow / 4); 2061 scr_page (UP, nrow / 4);
1565# endif 2062# endif
1566 else if (scrollbar_below_slider (ev.y)) 2063 else if (scrollbar_below_slider (ev.y))
1567# ifdef RXVT_SCROLL_FULL 2064# ifdef RXVT_SCROLL_FULL
1568 scr_page (DN, TermWin.nrow - 1); 2065 scr_page (DN, nrow - 1);
1569# else 2066# else
1570 scr_page (DN, TermWin.nrow / 4); 2067 scr_page (DN, nrow / 4);
1571# endif 2068# endif
1572 else 2069 else
1573 scrollBar.setMotion (); 2070 scrollBar.setMotion ();
1574 } 2071 }
1575 else 2072 else
1576 { 2073 {
1577 scr_page ((ev.button == Button1 ? DN : UP), 2074 scr_page ((ev.button == Button1 ? DN : UP),
1578 (TermWin.nrow 2075 (nrow
1579 * scrollbar_position (ev.y) 2076 * scrollbar_position (ev.y)
1580 / scrollbar_size ())); 2077 / scrollbar_size ()));
1581 } 2078 }
2079
1582 break; 2080 break;
1583 } 2081 }
1584 } 2082 }
2083
1585 return; 2084 return;
1586 } 2085 }
1587#if MENUBAR
1588 /*
1589 * Menubar window processing of button press
1590 */
1591 if (isMenuBarWindow (ev.window))
1592 menubar_control (ev);
1593#endif
1594} 2086}
1595 2087
1596void 2088void
1597rxvt_term::button_release (XButtonEvent &ev) 2089rxvt_term::button_release (XButtonEvent &ev)
1598{ 2090{
1599 int reportmode = 0; 2091 int reportmode = 0;
1600 2092
1601 csrO = 0; /* reset csr Offset */ 2093 csrO = 0; /* reset csr Offset */
1602 if (!bypass_keystate) 2094 if (!bypass_keystate)
1603 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2095 reportmode = !! (priv_modes & PrivMode_mouse_report);
1604 2096
1605 if (scrollbar_isUpDn ()) 2097 if (scrollbar_isUpDn ())
1606 { 2098 {
1607 scrollBar.setIdle (); 2099 scrollBar.setIdle ();
1608 scrollbar_show (0); 2100 scrollbar_show (0);
1609#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1610 refresh_type &= ~SMOOTH_REFRESH;
1611#endif
1612
1613 } 2101 }
2102
1614#ifdef SELECTION_SCROLLING 2103#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 2104 if (sel_scroll_ev.active)
2105 sel_scroll_ev.stop();
1616#endif 2106#endif
2107
1617 if (ev.window == TermWin.vt) 2108 if (ev.window == vt)
1618 { 2109 {
2110#if ISO_14755
2111 // 5.4
2112 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2113 return;
2114#endif
1619 if (reportmode) 2115 if (reportmode)
1620 { 2116 {
1621 /* mouse report from vt window */ 2117 /* mouse report from vt window */
1622 /* don't report release of wheel "buttons" */ 2118 /* don't report release of wheel "buttons" */
1623 if (ev.button >= 4) 2119 if (ev.button >= 4)
… …
1637 MEvent.button = AnyButton; 2133 MEvent.button = AnyButton;
1638 mouse_report (ev); 2134 mouse_report (ev);
1639#endif /* MOUSE_REPORT_DOUBLECLICK */ 2135#endif /* MOUSE_REPORT_DOUBLECLICK */
1640 return; 2136 return;
1641 } 2137 }
2138
1642 /* 2139 /*
1643 * dumb hack to compensate for the failure of click-and-drag 2140 * dumb hack to compensate for the failure of click-and-drag
1644 * when overriding mouse reporting 2141 * when overriding mouse reporting
1645 */ 2142 */
1646 if (PrivateModes & PrivMode_mouse_report 2143 if (priv_modes & PrivMode_mouse_report
1647 && bypass_keystate 2144 && bypass_keystate
1648 && ev.button == Button1 && MEvent.clicks <= 1) 2145 && ev.button == Button1 && MEvent.clicks <= 1)
1649 selection_extend (ev.x, ev.y, 0); 2146 selection_extend (ev.x, ev.y, 0);
2147
2148 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2149 return;
1650 2150
1651 switch (ev.button) 2151 switch (ev.button)
1652 { 2152 {
1653 case Button1: 2153 case Button1:
1654 case Button3: 2154 case Button3:
1655 selection_make (ev.time); 2155 selection_make (ev.time);
1656 break; 2156 break;
2157
1657 case Button2: 2158 case Button2:
1658 selection_request (ev.time, ev.x, ev.y); 2159 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2160 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
1659 break; 2161 break;
2162
1660#ifdef MOUSE_WHEEL 2163#ifdef MOUSE_WHEEL
1661 case Button4: 2164 case Button4:
1662 case Button5: 2165 case Button5:
1663 { 2166 {
1664 int i; 2167 int i;
1665 page_dirn v; 2168 page_dirn v;
1666 2169
1667 v = (ev.button == Button4) ? UP : DN; 2170 v = ev.button == Button4 ? UP : DN;
2171
1668 if (ev.state & ShiftMask) 2172 if (ev.state & ShiftMask)
1669 i = 1; 2173 i = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 2174 else if (OPTION (Opt_mouseWheelScrollPage))
1671 i = TermWin.nrow - 1; 2175 i = nrow - 1;
1672 else 2176 else
1673 i = 5; 2177 i = 5;
2178
1674# ifdef MOUSE_SLIP_WHEELING 2179# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 2180 if (ev.state & ControlMask)
1676 { 2181 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 2182 mouse_slip_wheel_speed += v ? -1 : 1;
2183 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2184 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2185
2186 if (slip_wheel_ev.at < NOW)
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2187 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2188
2189 slip_wheel_ev.start ();
2190 }
2191 else
2192 {
2193# endif
2194 scr_page (v, i);
2195 scrollbar_show (1);
2196# ifdef MOUSE_SLIP_WHEELING
1679 } 2197 }
1680# endif 2198# 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 } 2199 }
1695 break; 2200 break;
1696#endif 2201#endif
1697
1698 } 2202 }
1699 } 2203 }
1700#ifdef MENUBAR
1701 else if (isMenuBarWindow (ev.window))
1702 menubar_control (ev);
1703#endif
1704} 2204}
1705
1706 2205
1707#ifdef TRANSPARENT 2206#ifdef TRANSPARENT
2207#if TINTING
2208/* taken from aterm-0.4.2 */
2209
2210typedef uint32_t RUINT32T;
2211
2212void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2213{
2214 int sh_r, sh_g, sh_b;
2215 RUINT32T mask_r, mask_g, mask_b;
2216 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2217 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2218 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2219 int i;
2220
2221 Visual *visual = display->visual;
2222
2223 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2224
2225 /* for convenience */
2226 mask_r = visual->red_mask;
2227 mask_g = visual->green_mask;
2228 mask_b = visual->blue_mask;
2229
2230 /* boring lookup table pre-initialization */
2231 switch (srcImage->bits_per_pixel) {
2232 case 15:
2233 if ((mask_r != 0x7c00) ||
2234 (mask_g != 0x03e0) ||
2235 (mask_b != 0x001f))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2238 lookup_r = lookup;
2239 lookup_g = lookup+32;
2240 lookup_b = lookup+32+32;
2241 sh_r = 10;
2242 sh_g = 5;
2243 sh_b = 0;
2244 break;
2245 case 16:
2246 if ((mask_r != 0xf800) ||
2247 (mask_g != 0x07e0) ||
2248 (mask_b != 0x001f))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2251 lookup_r = lookup;
2252 lookup_g = lookup+32;
2253 lookup_b = lookup+32+64;
2254 sh_r = 11;
2255 sh_g = 5;
2256 sh_b = 0;
2257 break;
2258 case 24:
2259 if ((mask_r != 0xff0000) ||
2260 (mask_g != 0x00ff00) ||
2261 (mask_b != 0x0000ff))
2262 return;
2263 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2264 lookup_r = lookup;
2265 lookup_g = lookup+256;
2266 lookup_b = lookup+256+256;
2267 sh_r = 16;
2268 sh_g = 8;
2269 sh_b = 0;
2270 break;
2271 case 32:
2272 if ((mask_r != 0xff0000) ||
2273 (mask_g != 0x00ff00) ||
2274 (mask_b != 0x0000ff))
2275 return;
2276 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2277 lookup_r = lookup;
2278 lookup_g = lookup+256;
2279 lookup_b = lookup+256+256;
2280 sh_r = 16;
2281 sh_g = 8;
2282 sh_b = 0;
2283 break;
2284 default:
2285 return; /* we do not support this color depth */
2286 }
2287
2288 /* prepare limits for color transformation (each channel is handled separately) */
2289 if (shade < 0) {
2290 shade = -shade;
2291 if (shade < 0) shade = 0;
2292 if (shade > 100) shade = 100;
2293
2294 lower_lim_r = 65535-rm;
2295 lower_lim_g = 65535-gm;
2296 lower_lim_b = 65535-bm;
2297
2298 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2299 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2300 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2301
2302 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2303 } else {
2304 if (shade < 0) shade = 0;
2305 if (shade > 100) shade = 100;
2306
2307 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2308
2309 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2310 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2311 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2312 }
2313
2314 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2315 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2316 {
2317 unsigned int tmp;
2318
2319 tmp = lower_lim_r;
2320 lower_lim_r = lower_lim_b;
2321 lower_lim_b = tmp;
2322
2323 tmp = upper_lim_r;
2324 upper_lim_r = upper_lim_b;
2325 upper_lim_b = tmp;
2326 }
2327
2328 /* fill our lookup tables */
2329 for (i = 0; i <= mask_r>>sh_r; i++)
2330 {
2331 RUINT32T tmp;
2332 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2333 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2334 lookup_r[i] = (tmp/65535)<<sh_r;
2335 }
2336 for (i = 0; i <= mask_g>>sh_g; i++)
2337 {
2338 RUINT32T tmp;
2339 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2340 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2341 lookup_g[i] = (tmp/65535)<<sh_g;
2342 }
2343 for (i = 0; i <= mask_b>>sh_b; i++)
2344 {
2345 RUINT32T tmp;
2346 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2347 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2348 lookup_b[i] = (tmp/65535)<<sh_b;
2349 }
2350
2351 /* apply table to input image (replacing colors by newly calculated ones) */
2352 switch (srcImage->bits_per_pixel)
2353 {
2354 case 15:
2355 {
2356 unsigned short *p1, *pf, *p, *pl;
2357 p1 = (unsigned short *) srcImage->data;
2358 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2359 while (p1 < pf)
2360 {
2361 p = p1;
2362 pl = p1 + srcImage->width;
2363 for (; p < pl; p++)
2364 {
2365 *p = lookup_r[(*p & 0x7c00)>>10] |
2366 lookup_g[(*p & 0x03e0)>> 5] |
2367 lookup_b[(*p & 0x001f)];
2368 }
2369 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2370 }
2371 break;
2372 }
2373 case 16:
2374 {
2375 unsigned short *p1, *pf, *p, *pl;
2376 p1 = (unsigned short *) srcImage->data;
2377 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2378 while (p1 < pf)
2379 {
2380 p = p1;
2381 pl = p1 + srcImage->width;
2382 for (; p < pl; p++)
2383 {
2384 *p = lookup_r[(*p & 0xf800)>>11] |
2385 lookup_g[(*p & 0x07e0)>> 5] |
2386 lookup_b[(*p & 0x001f)];
2387 }
2388 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2389 }
2390 break;
2391 }
2392 case 24:
2393 {
2394 unsigned char *p1, *pf, *p, *pl;
2395 p1 = (unsigned char *) srcImage->data;
2396 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width * 3;
2401 for (; p < pl; p += 3)
2402 {
2403 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2404 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2405 p[2] = lookup_r[(p[2] & 0x0000ff)];
2406 }
2407 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2408 }
2409 break;
2410 }
2411 case 32:
2412 {
2413 RUINT32T *p1, *pf, *p, *pl;
2414 p1 = (RUINT32T *) srcImage->data;
2415 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2416
2417 while (p1 < pf)
2418 {
2419 p = p1;
2420 pl = p1 + srcImage->width;
2421 for (; p < pl; p++)
2422 {
2423 *p = lookup_r[(*p & 0xff0000)>>16] |
2424 lookup_g[(*p & 0x00ff00)>> 8] |
2425 lookup_b[(*p & 0x0000ff)] |
2426 (*p & ~0xffffff);
2427 }
2428 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2429 }
2430 break;
2431 }
2432 }
2433
2434 free (lookup);
2435}
2436#endif
2437
1708/* 2438/*
1709 * Check our parents are still who we think they are. 2439 * Check our parents are still who we think they are.
1710 * Do transparency updates if required 2440 * Do transparency updates if required
1711 */ 2441 */
1712int 2442int
1713rxvt_term::check_our_parents () 2443rxvt_term::check_our_parents ()
1714{ 2444{
1715 int i, pchanged, aformat, have_pixmap, rootdepth; 2445 int i, pchanged, aformat, have_pixmap, rootdepth;
1716 unsigned long nitems, bytes_after; 2446 unsigned long nitems, bytes_after;
1717 Atom atype; 2447 Atom atype;
1718 unsigned char *prop = NULL; 2448 unsigned char *prop = NULL;
1719 Window root, oldp, *list; 2449 Window root, oldp, *list;
1720 Pixmap rootpixmap = None; 2450 Pixmap rootpixmap = None;
1721 XWindowAttributes wattr, wrootattr; 2451 XWindowAttributes wattr, wrootattr;
2452 dDisp;
1722 2453
1723 pchanged = 0; 2454 pchanged = 0;
1724 2455
1725 if (! (Options & Opt_transparent)) 2456 if (!OPTION (Opt_transparent))
1726 return pchanged; /* Don't try any more */ 2457 return pchanged; /* Don't try any more */
1727 2458
1728 XGetWindowAttributes (display->display, display->root, &wrootattr); 2459 XGetWindowAttributes (disp, display->root, &wrootattr);
1729 rootdepth = wrootattr.depth; 2460 rootdepth = wrootattr.depth;
1730 2461
1731 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2462 XGetWindowAttributes (disp, parent[0], &wattr);
2463
1732 if (rootdepth != wattr.depth) 2464 if (rootdepth != wattr.depth)
1733 { 2465 {
1734 if (am_transparent) 2466 if (am_transparent)
1735 { 2467 {
1736 pchanged = 1; 2468 pchanged = 1;
1737 XSetWindowBackground (display->display, TermWin.vt, 2469 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1738 PixColors[Color_bg]);
1739 am_transparent = am_pixmap_trans = 0; 2470 am_transparent = am_pixmap_trans = 0;
1740 } 2471 }
2472
1741 return pchanged; /* Don't try any more */ 2473 return pchanged; /* Don't try any more */
1742 } 2474 }
1743 2475
1744 /* Get all X ops out of the queue so that our information is up-to-date. */ 2476 /* Get all X ops out of the queue so that our information is up-to-date. */
1745 XSync (display->display, False); 2477 XSync (disp, False);
1746 2478
1747 /* 2479 /*
1748 * Make the frame window set by the window manager have 2480 * Make the frame window set by the window manager have
1749 * the root background. Some window managers put multiple nested frame 2481 * the root background. Some window managers put multiple nested frame
1750 * windows for each client, so we have to take care about that. 2482 * windows for each client, so we have to take care about that.
1751 */ 2483 */
1752 i = (xa[XA_XROOTPMAPID] != 0 2484 i = (xa[XA_XROOTPMAP_ID]
1753 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2485 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1754 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1755 &nitems, &bytes_after, &prop) == Success)); 2487 &nitems, &bytes_after, &prop) == Success);
2488
1756 if (!i || prop == NULL) 2489 if (!i || prop == NULL)
2490 i = (xa[XA_ESETROOT_PMAP_ID]
2491 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493 &nitems, &bytes_after, &prop) == Success);
2494
2495 if (!i || prop == NULL
2496#if TINTING
2497 || !rs[Rs_color + Color_tint]
2498#endif
2499 )
1757 have_pixmap = 0; 2500 have_pixmap = 0;
1758 else 2501 else
1759 { 2502 {
1760 have_pixmap = 1; 2503 have_pixmap = 1;
1761 rootpixmap = * ((Pixmap *)prop); 2504 rootpixmap = *(Pixmap *)prop;
1762 XFree (prop); 2505 XFree (prop);
1763 } 2506 }
2507
1764 if (have_pixmap) 2508 if (have_pixmap)
1765 { 2509 {
1766 /* 2510 /*
1767 * Copy display->root pixmap transparency 2511 * Copy display->root pixmap transparency
1768 */ 2512 */
… …
1771 Window cr; 2515 Window cr;
1772 XImage *image; 2516 XImage *image;
1773 GC gc; 2517 GC gc;
1774 XGCValues gcvalue; 2518 XGCValues gcvalue;
1775 2519
1776 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2520 XTranslateCoordinates (disp, parent[0], display->root,
1777 0, 0, &sx, &sy, &cr); 2521 0, 0, &sx, &sy, &cr);
1778 nw = (unsigned int)szHint.width; 2522 nw = (unsigned int)szHint.width;
1779 nh = (unsigned int)szHint.height; 2523 nh = (unsigned int)szHint.height;
1780 nx = ny = 0; 2524 nx = ny = 0;
1781 2525
1782 if (sx < 0) 2526 if (sx < 0)
… …
1791 nh += sy; 2535 nh += sy;
1792 ny = -sy; 2536 ny = -sy;
1793 sy = 0; 2537 sy = 0;
1794 } 2538 }
1795 2539
1796 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
1797 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2542
2543 XSync (disp, False);
1798 allowedxerror = -1; 2544 allowedxerror = -1;
1799 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2545 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1800 ZPixmap); 2546
1801 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1802 /* XXX: may need a delay here? */ 2548 /* XXX: may need a delay here? */
1803 allowedxerror = 0; 2549 allowedxerror = 0;
2550
1804 if (image == NULL) 2551 if (image == NULL)
1805 { 2552 {
1806 if (am_transparent && am_pixmap_trans) 2553 if (am_transparent && am_pixmap_trans)
1807 { 2554 {
1808 pchanged = 1; 2555 pchanged = 1;
1809 if (TermWin.pixmap != None) 2556 if (pixmap != None)
1810 { 2557 {
1811 XFreePixmap (display->display, TermWin.pixmap); 2558 XFreePixmap (disp, pixmap);
1812 TermWin.pixmap = None; 2559 pixmap = None;
1813 } 2560 }
1814 } 2561 }
2562
1815 am_pixmap_trans = 0; 2563 am_pixmap_trans = 0;
1816 } 2564 }
1817 else 2565 else
1818 { 2566 {
1819 if (TermWin.pixmap != None) 2567 if (pixmap != None)
1820 XFreePixmap (display->display, TermWin.pixmap); 2568 XFreePixmap (disp, pixmap);
2569
2570#if TINTING
2571 if (ISSET_PIXCOLOR (Color_tint))
2572 {
2573 unsigned short rm, gm, bm;
2574 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2575
2576 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2577
2578 ShadeXImage (display, image, shade, rm, gm, bm);
2579 }
2580#endif
2581
1821 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2582 pixmap = XCreatePixmap (disp, vt,
1822 (unsigned int)szHint.width,
1823 (unsigned int)szHint.height, 2583 szHint.width, szHint.height, image->depth);
1824 (unsigned int)image->depth);
1825 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2584 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
1826 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2585 XPutImage (disp, pixmap, gc, image, 0, 0,
1827 nx, ny, (unsigned int)image->width,
1828 (unsigned int)image->height); 2586 nx, ny, image->width, image->height);
1829 XFreeGC (display->display, gc); 2587 XFreeGC (disp, gc);
1830 XDestroyImage (image); 2588 XDestroyImage (image);
1831 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2589 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
1832 TermWin.pixmap); 2590 XClearWindow (disp, parent[0]);
2591
1833 if (!am_transparent || !am_pixmap_trans) 2592 if (!am_transparent || !am_pixmap_trans)
1834 pchanged = 1; 2593 pchanged = 1;
2594
1835 am_transparent = am_pixmap_trans = 1; 2595 am_transparent = am_pixmap_trans = 1;
1836 } 2596 }
1837 } 2597 }
1838 2598
1839 if (!am_pixmap_trans) 2599 if (am_pixmap_trans)
2600 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2601 else
1840 { 2602 {
1841 unsigned int n; 2603 unsigned int n;
1842 /* 2604 /*
1843 * InheritPixmap transparency 2605 * InheritPixmap transparency
1844 */ 2606 */
1845 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1846 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2607 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
1847 i++)
1848 { 2608 {
1849 oldp = TermWin.parent[i]; 2609 oldp = parent[i];
1850 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2610 XQueryTree (disp, parent[i - 1], &root,
1851 &TermWin.parent[i], &list, &n); 2611 &parent[i], &list, &n);
1852 XFree (list); 2612 XFree (list);
1853 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2613
1854 if (TermWin.parent[i] == display->root) 2614 if (parent[i] == display->root)
1855 { 2615 {
1856 if (oldp != None) 2616 if (oldp != None)
1857 pchanged = 1; 2617 pchanged = 1;
2618
1858 break; 2619 break;
1859 } 2620 }
2621
1860 if (oldp != TermWin.parent[i]) 2622 if (oldp != parent[i])
1861 pchanged = 1; 2623 pchanged = 1;
1862 } 2624 }
1863 2625
1864 n = 0; 2626 n = 0;
1865 2627
1866 if (pchanged) 2628 if (pchanged)
1867 { 2629 {
1868 for (; n < (unsigned int)i; n++) 2630 for (; n < (unsigned int)i; n++)
1869 { 2631 {
1870 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2632 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) 2633 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
1873 { 2634 {
1874 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2635 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
1875 break; 2636 break;
1876 } 2637 }
1877 } 2638 }
1878 } 2639 }
1879 2640
1880 if (n > (int) (sizeof (TermWin.parent) 2641 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
1881 / sizeof (TermWin.parent[0])))
1882 { 2642 {
1883 D_X ((stderr, "InheritPixmap Turning off")); 2643 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
1884 XSetWindowBackground (display->display, TermWin.parent[0], 2644 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; 2645 am_transparent = 0;
1889 /* XXX: also turn off Opt_transparent? */ 2646 /* XXX: also turn off Opt_transparent? */
1890 } 2647 }
1891 else 2648 else
1892 { 2649 {
2650#if WAIT_FOR_WM
1893 /* wait (an arbitrary period) for the WM to do its thing 2651 /* wait (an arbitrary period) for the WM to do its thing
1894 * needed for fvwm2.2.2 (and before?) */ 2652 * 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); 2653 sleep (1);
1903# endif 2654#endif
1904 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
1905 for (n = 0; n < (unsigned int)i; n++) 2655 for (n = 0; n < (unsigned int)i; n++)
1906 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2656 {
1907 ParentRelative); 2657 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
1908 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2658 XClearWindow (disp, parent[n]);
1909 ParentRelative); 2659 }
2660
2661 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
1910 am_transparent = 1; 2662 am_transparent = 1;
1911 } 2663 }
1912 2664
1913 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2665 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
1914 TermWin.parent[i] = None; 2666 parent[i] = None;
2667 }
2668
2669 if (scrollBar.win)
1915 } 2670 {
2671 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2672 scrollBar.setIdle ();
2673 scrollbar_show (0);
2674 }
2675
2676 if (am_transparent)
2677 {
2678 want_refresh = want_full_refresh = 1;
2679 if (am_pixmap_trans)
2680 flush ();
2681 }
2682
1916 return pchanged; 2683 return pchanged;
1917} 2684}
1918#endif 2685#endif
1919 2686
1920/*}}} */ 2687/*}}} */
1921 2688
1922bool 2689bool
1923rxvt_term::cmd_parse () 2690rxvt_term::cmd_parse ()
1924{ 2691{
1925 bool flag = false; 2692 bool flag = false;
1926 unicode_t ch = NOCHAR; 2693 wchar_t ch = NOCHAR;
1927 unsigned char *seq_begin; // remember start of esc-sequence here 2694 char *seq_begin; // remember start of esc-sequence here
1928 2695
1929 for (;;) 2696 for (;;)
1930 { 2697 {
1931 if (ch == NOCHAR) 2698 if (ch == NOCHAR)
1932 { 2699 {
1933 seq_begin = cmdbuf_ptr; 2700 seq_begin = cmdbuf_ptr;
1934 ch = next_char (); 2701 ch = next_char ();
1935 }
1936 2702
1937 if (ch == NOCHAR) // TODO: improve 2703 if (ch == NOCHAR)
1938 break; 2704 break;
1939
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r')
1941 { 2705 }
2706
2707 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2708 {
2709 if (!seen_input)
2710 {
2711 seen_input = 1;
2712 // many badly-written programs (e.g. jed) contain a race condition:
2713 // they first read the screensize and then install a SIGWINCH handler.
2714 // some window managers resize the window early, and these programs
2715 // then sometimes get the size wrong.
2716 // unfortunately other programs are even more buggy and dislike
2717 // being sent SIGWINCH, so only do it when we were in fact being
2718 // resized.
2719 if (seen_resize && cmd_pid)
2720 kill (-cmd_pid, SIGWINCH);
2721 }
2722
1942 /* Read a text string from the input buffer */ 2723 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2724 wchar_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2725 bool refreshnow = false;
1945 int nlines = 0; 2726 int nlines = 0;
1946 unicode_t *str = buf; 2727 wchar_t *str = buf;
1947 2728 wchar_t *eol = str + min (ncol, UBUFSIZ);
1948 *str++ = ch;
1949 2729
1950 for (;;) 2730 for (;;)
1951 { 2731 {
1952 seq_begin = cmdbuf_ptr;
1953 ch = next_char ();
1954
1955 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2732 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
1956 break; 2733 break;
1957 2734
1958 *str++ = ch; 2735 *str++ = ch;
1959 2736
1960 if (ch == '\n') 2737 if (ch == C0_LF || str >= eol)
1961 { 2738 {
2739 if (ch == C0_LF)
1962 nlines++; 2740 nlines++;
2741
1963 refresh_count++; 2742 refresh_count++;
1964 2743
1965 if (! (Options & Opt_jumpScroll) 2744 if (!OPTION (Opt_jumpScroll)
1966 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2745 || (refresh_count >= refresh_limit * (nrow - 1)))
1967 { 2746 {
1968 refreshnow = true; 2747 refreshnow = true;
1969 flag = true; 2748 refresh_count = 0;
1970 ch = NOCHAR; 2749 ch = NOCHAR;
1971 break; 2750 break;
1972 } 2751 }
1973 2752
1974 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2753 // scr_add_lines only works for nlines <= nrow - 1.
1975 if (nlines >= TermWin.nrow - 1) 2754 if (nlines >= nrow - 1)
1976 { 2755 {
2756 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2757 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
1977 scr_add_lines (buf, nlines, str - buf); 2758 scr_add_lines (buf, str - buf, nlines);
2759
1978 nlines = 0; 2760 nlines = 0;
1979 str = buf; 2761 str = buf;
2762 eol = str + min (ncol, UBUFSIZ);
1980 } 2763 }
2764
2765 if (str >= eol)
2766 {
2767 if (eol >= buf + UBUFSIZ)
2768 {
2769 ch = NOCHAR;
2770 break;
2771 }
2772 else
2773 eol = min (eol + ncol, buf + UBUFSIZ);
2774 }
2775
1981 } 2776 }
1982 2777
1983 if (str >= buf + UBUFSIZ) 2778 seq_begin = cmdbuf_ptr;
1984 { 2779 ch = next_char ();
1985 ch = NOCHAR;
1986 break;
1987 }
1988 } 2780 }
1989 2781
2782 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2783 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
1990 scr_add_lines (buf, nlines, str - buf); 2784 scr_add_lines (buf, str - buf, nlines);
1991 2785
1992 /* 2786 /*
1993 * If there have been a lot of new lines, then update the screen 2787 * 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. 2788 * 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 2789 * the number of pages between refreshes is refresh_limit, which
1996 * is incremented here because we must be doing flat-out scrolling. 2790 * 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 */ 2791 */
2001 if (refreshnow) 2792 if (refreshnow)
2002 { 2793 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++; 2795 refresh_limit++;
2005 2796 else
2797 {
2798 flag = true;
2006 scr_refresh (refresh_type); 2799 scr_refresh ();
2800 want_refresh = 1;
2801 }
2007 } 2802 }
2008 2803
2009 } 2804 }
2010 else 2805 else
2011 { 2806 {
… …
2026 2821
2027 return flag; 2822 return flag;
2028} 2823}
2029 2824
2030// read the next character 2825// read the next character
2031unicode_t 2826wchar_t
2032rxvt_term::next_char () 2827rxvt_term::next_char () NOTHROW
2033{ 2828{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2829 while (cmdbuf_ptr < cmdbuf_endp)
2035 { 2830 {
2036 // assume 7-bit to be ascii ALWAYS 2831 // assume 7-bit to be ascii ALWAYS
2037 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2832 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2038 return *cmdbuf_ptr++; 2833 return *cmdbuf_ptr++;
2039 2834
2040 wchar_t wc; 2835 wchar_t wc;
2041 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2836 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2042 2837
2043 if (len == (size_t)-2) 2838 if (len == (size_t)-2)
2044 { 2839 {
2045 // the mbstate stores incomplete sequences. didn't know this :/ 2840 // the mbstate stores incomplete sequences. didn't know this :/
2046 cmdbuf_ptr = cmdbuf_endp; 2841 cmdbuf_ptr = cmdbuf_endp;
2047 break; 2842 break;
2048 } 2843 }
2049 2844
2050 if (len == (size_t)-1) 2845 if (len == (size_t)-1)
2051 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2846 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2052 2847
2053 // assume wchar == unicode 2848 // assume wchar == unicode
2054 cmdbuf_ptr += len; 2849 cmdbuf_ptr += len;
2055 return wc; 2850 return wc & UNICODE_MASK;
2056 } 2851 }
2057 2852
2058 return NOCHAR; 2853 return NOCHAR;
2059} 2854}
2855
2856// read the next octet
2857uint32_t
2858rxvt_term::next_octet () NOTHROW
2859{
2860 return cmdbuf_ptr < cmdbuf_endp
2861 ? (unsigned char)*cmdbuf_ptr++
2862 : NOCHAR;
2863}
2864
2865static class out_of_input out_of_input;
2060 2866
2061/* rxvt_cmd_getc () - Return next input character */ 2867/* rxvt_cmd_getc () - Return next input character */
2062/* 2868/*
2063 * Return the next input character after first passing any keyboard input 2869 * Return the next input character after first passing any keyboard input
2064 * to the command. 2870 * to the command.
2065 */ 2871 */
2066unicode_t 2872wchar_t
2067rxvt_term::cmd_getc () 2873rxvt_term::cmd_getc () THROW ((class out_of_input))
2068{ 2874{
2069 unicode_t c = next_char (); 2875 wchar_t c = next_char ();
2876
2877 if (c == NOCHAR)
2878 throw out_of_input;
2879
2880 return c;
2881}
2882
2883uint32_t
2884rxvt_term::cmd_get8 () THROW ((class out_of_input))
2885{
2886 uint32_t c = next_octet ();
2070 2887
2071 if (c == NOCHAR) 2888 if (c == NOCHAR)
2072 throw out_of_input; 2889 throw out_of_input;
2073 2890
2074 return c; 2891 return c;
… …
2156/*}}} */ 2973/*}}} */
2157 2974
2158/* *INDENT-OFF* */ 2975/* *INDENT-OFF* */
2159enum { 2976enum {
2160 C1_40 = 0x40, 2977 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2978 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, 2979 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, 2980 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 2981 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2982};
2166/* *INDENT-ON* */ 2983/* *INDENT-ON* */
2167 2984
2168/*{{{ process non-printing single characters */ 2985/*{{{ process non-printing single characters */
2169void 2986void
… …
2174 case C0_ESC: 2991 case C0_ESC:
2175 process_escape_seq (); 2992 process_escape_seq ();
2176 break; 2993 break;
2177 case C0_ENQ: /* terminal Status */ 2994 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2995 if (rs[Rs_answerbackstring])
2179 tt_write ( 2996 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 2997 else
2183 tt_write ((unsigned char *)VT100_ANS, 2998 tt_write (VT100_ANS, strlen (VT100_ANS));
2184 (unsigned int)STRLEN (VT100_ANS));
2185 break; 2999 break;
2186 case C0_BEL: /* bell */ 3000 case C0_BEL: /* bell */
2187 scr_bell (); 3001 scr_bell ();
2188 break; 3002 break;
2189 case C0_BS: /* backspace */ 3003 case C0_BS: /* backspace */
… …
2205 break; 3019 break;
2206 case C0_SI: /* shift in - acs */ 3020 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 3021 scr_charset_choose (0);
2208 break; 3022 break;
2209 3023
3024#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 3025 // 8-bit controls
2211 case 0x90: /* DCS */ 3026 case 0x90: /* DCS */
2212 process_dcs_seq (); 3027 process_dcs_seq ();
2213 break; 3028 break;
2214 case 0x9b: /* CSI */ 3029 case 0x9b: /* CSI */
2215 process_csi_seq (); 3030 process_csi_seq ();
2216 break; 3031 break;
2217 case 0x9d: /* CSI */ 3032 case 0x9d: /* CSI */
2218 process_osc_seq (); 3033 process_osc_seq ();
2219 break; 3034 break;
3035#endif
2220 } 3036 }
2221} 3037}
2222/*}}} */ 3038/*}}} */
2223 3039
2224 3040
… …
2286void 3102void
2287rxvt_term::process_escape_seq () 3103rxvt_term::process_escape_seq ()
2288{ 3104{
2289 unicode_t ch = cmd_getc (); 3105 unicode_t ch = cmd_getc ();
2290 3106
2291 if (PrivateModes & PrivMode_vt52) 3107 if (priv_modes & PrivMode_vt52)
2292 { 3108 {
2293 process_escape_vt52 (ch); 3109 process_escape_vt52 (ch);
2294 return; 3110 return;
2295 } 3111 }
2296 3112
… …
2311 scr_charset_set (2, (unsigned int)cmd_getc ()); 3127 scr_charset_set (2, (unsigned int)cmd_getc ());
2312 break; 3128 break;
2313 case '+': 3129 case '+':
2314 scr_charset_set (3, (unsigned int)cmd_getc ()); 3130 scr_charset_set (3, (unsigned int)cmd_getc ());
2315 break; 3131 break;
2316#ifndef NO_FRILLS 3132#if ENABLE_FRILLS
2317 case '6': 3133 case '6':
2318 scr_backindex (); 3134 scr_backindex ();
2319 break; 3135 break;
2320#endif 3136#endif
2321 case '7': 3137 case '7':
2322 scr_cursor (SAVE); 3138 scr_cursor (SAVE);
2323 break; 3139 break;
2324 case '8': 3140 case '8':
2325 scr_cursor (RESTORE); 3141 scr_cursor (RESTORE);
2326 break; 3142 break;
2327#ifndef NO_FRILLS 3143#if ENABLE_FRILLS
2328 case '9': 3144 case '9':
2329 scr_forwardindex (); 3145 scr_forwardindex ();
2330 break; 3146 break;
2331#endif 3147#endif
2332 case '=': 3148 case '=':
… …
2342 break; 3158 break;
2343 3159
2344 /* 8.3.87: NEXT LINE */ 3160 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 3161 case C1_NEL: /* ESC E */
2346 { 3162 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 3163 wchar_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 3164 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2349 } 3165 }
2350 break; 3166 break;
2351 3167
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 3168 /* kidnapped escape sequence: Should be 8.3.48 */
2353 case C1_ESA: /* ESC G */ 3169 case C1_ESA: /* ESC G */
… …
2363 case C1_RI: /* ESC M */ 3179 case C1_RI: /* ESC M */
2364 scr_index (DN); 3180 scr_index (DN);
2365 break; 3181 break;
2366 3182
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 3183 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 3184 /*case C1_SS2: scr_single_shift (2); break; */
2369 3185
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 3186 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 3187 /*case C1_SS3: scr_single_shift (3); break; */
2372 3188
2373 /* 8.3.27: DEVICE CONTROL STRING */ 3189 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 3190 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 3191 process_dcs_seq ();
2376 break; 3192 break;
2377 3193
2378 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3194 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2379 case C1_SCI: /* ESC Z */ 3195 case C1_SCI: /* ESC Z */
2380 tt_write ((const unsigned char *)ESCZ_ANSWER, 3196 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2381 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2382 break; /* steal obsolete ESC [ c */ 3197 break; /* steal obsolete ESC [ c */
2383 3198
2384 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3199 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2385 case C1_CSI: /* ESC [ */ 3200 case C1_CSI: /* ESC [ */
2386 process_csi_seq (); 3201 process_csi_seq ();
… …
2391 process_osc_seq (); 3206 process_osc_seq ();
2392 break; 3207 break;
2393 3208
2394 /* 8.3.106: RESET TO INITIAL STATE */ 3209 /* 8.3.106: RESET TO INITIAL STATE */
2395 case 'c': 3210 case 'c':
3211 mbstate.reset ();
2396 scr_poweron (); 3212 scr_poweron ();
2397 scrollbar_show (1); 3213 scrollbar_show (1);
2398 break; 3214 break;
2399 3215
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3216 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2412 3228
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3229/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 3230/* *INDENT-OFF* */
2415enum { 3231enum {
2416 CSI_ICH = 0x40, 3232 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3233 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 , 3234 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, 3235 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, 3236 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, 3237 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, 3238 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, */ 3253 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, [, \, ], ^, _, */ 3254 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, */ 3255 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, */ 3256 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, */ 3257 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, {, |, }, ~, */ 3258 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 3259 };
2444/* *INDENT-ON* */ 3260/* *INDENT-ON* */
2445 3261
2446void 3262void
2447rxvt_term::process_csi_seq () 3263rxvt_term::process_csi_seq ()
… …
2510 { 3326 {
2511 switch (priv) 3327 switch (priv)
2512 { 3328 {
2513 case '>': 3329 case '>':
2514 if (ch == CSI_DA) /* secondary device attributes */ 3330 if (ch == CSI_DA) /* secondary device attributes */
2515 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3331 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2516 break; 3332 break;
2517 case '?': 3333 case '?':
2518 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3334 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2519 process_terminal_mode (ch, priv, nargs, arg); 3335 process_terminal_mode (ch, priv, nargs, arg);
2520 break; 3336 break;
… …
2625 3441
2626 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3442 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2627 arg[0] = -arg[0]; 3443 arg[0] = -arg[0];
2628 /* FALLTHROUGH */ 3444 /* FALLTHROUGH */
2629 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3445 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2630 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3446 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2631 break; 3447 break;
2632 3448
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3449 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 tt_write ((const unsigned char *)VT100_ANS, 3450 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2635 (unsigned int) (sizeof (VT100_ANS) - 1));
2636 break; 3451 break;
2637 3452
2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3453 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2639 process_sgr_mode (nargs, arg); 3454 process_sgr_mode (nargs, arg);
2640 break; 3455 break;
… …
2646 tt_printf ("\033[0n"); 3461 tt_printf ("\033[0n");
2647 break; 3462 break;
2648 case 6: /* CPR requested */ 3463 case 6: /* CPR requested */
2649 scr_report_position (); 3464 scr_report_position ();
2650 break; 3465 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 3466 case 7: /* unofficial extension */
3467 if (OPTION (Opt_insecure))
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3468 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2654 break; 3469 break;
2655#endif
2656 case 8: /* unofficial extension */ 3470 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3471 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 3472 break;
2659 } 3473 }
2660 break; 3474 break;
2661 3475
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3476 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2695 break; 3509 break;
2696 3510
2697 case CSI_RM: /* 8.3.107: RESET MODE */ 3511 case CSI_RM: /* 8.3.107: RESET MODE */
2698 if (arg[0] == 4) 3512 if (arg[0] == 4)
2699 scr_insert_mode (0); 3513 scr_insert_mode (0);
3514 else if (arg[0] == 20)
3515 priv_modes &= ~PrivMode_LFNL;
2700 break; 3516 break;
2701 3517
2702 case CSI_SM: /* 8.3.126: SET MODE */ 3518 case CSI_SM: /* 8.3.126: SET MODE */
2703 if (arg[0] == 4) 3519 if (arg[0] == 4)
2704 scr_insert_mode (1); 3520 scr_insert_mode (1);
3521 else if (arg[0] == 20)
3522 priv_modes |= PrivMode_LFNL;
2705 break; 3523 break;
2706 3524
2707 /* 3525 /*
2708 * PRIVATE USE beyond this point. All CSI_7? sequences here 3526 * PRIVATE USE beyond this point. All CSI_7? sequences here
2709 */ 3527 */
… …
2721 break; 3539 break;
2722 case CSI_75: 3540 case CSI_75:
2723 scr_cursor (RESTORE); 3541 scr_cursor (RESTORE);
2724 break; 3542 break;
2725 3543
2726#ifndef NO_FRILLS 3544#if ENABLE_FRILLS
2727 case CSI_74: 3545 case CSI_74:
2728 process_window_ops (arg, nargs); 3546 process_window_ops (arg, nargs);
2729 break; 3547 break;
2730#endif 3548#endif
2731 3549
… …
2738 break; 3556 break;
2739 } 3557 }
2740} 3558}
2741/*}}} */ 3559/*}}} */
2742 3560
2743#ifndef NO_FRILLS 3561#if ENABLE_FRILLS
2744/* ARGSUSED */ 3562/* ARGSUSED */
2745void 3563void
2746rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3564rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2747{ 3565{
2748 int x, y; 3566 int x, y;
2749 XWindowAttributes wattr; 3567 XWindowAttributes wattr;
2750 Window wdummy; 3568 Window wdummy;
3569 dDisp;
2751 3570
2752 if (nargs == 0) 3571 if (nargs == 0)
2753 return; 3572 return;
2754 3573
2755 switch (args[0]) 3574 switch (args[0])
2756 { 3575 {
2757 /* 3576 /*
2758 * commands 3577 * commands
2759 */ 3578 */
2760 case 1: /* deiconify window */ 3579 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3580 XMapWindow (disp, parent[0]);
2762 break; 3581 break;
2763 case 2: /* iconify window */ 3582 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3583 XIconifyWindow (disp, parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3584 break;
2767 case 3: /* set position (pixels) */ 3585 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3586 XMoveWindow (disp, parent[0], args[1], args[2]);
2769 break; 3587 break;
2770 case 4: /* set size (pixels) */ 3588 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3589 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3590 break;
2773 case 5: /* raise window */ 3591 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3592 XRaiseWindow (disp, parent[0]);
2775 break; 3593 break;
2776 case 6: /* lower window */ 3594 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3595 XLowerWindow (disp, parent[0]);
2778 break; 3596 break;
2779 case 7: /* refresh window */ 3597 case 7: /* refresh window */
2780 scr_touch (true); 3598 scr_touch (true);
2781 break; 3599 break;
2782 case 8: /* set size (chars) */ 3600 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3601 set_widthheight ((unsigned int) (args[2] * fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3602 (unsigned int) (args[1] * fheight));
2785 break; 3603 break;
2786 3604
2787 //case 9: NYI, TODO, restore maximized window or maximize window 3605 //case 9: NYI, TODO, restore maximized window or maximize window
2788 default: 3606 default:
2789 if (args[0] >= 24) /* set height (chars) */ 3607 if (args[0] >= 24) /* set height (chars) */
2790 set_widthheight ((unsigned int)TermWin.width, 3608 set_widthheight ((unsigned int)width,
2791 (unsigned int) (args[1] * TermWin.fheight)); 3609 (unsigned int) (args[1] * fheight));
2792 break; 3610 break;
2793 3611
2794 3612
2795 /* 3613 /*
2796 * reports - some output format copied from XTerm 3614 * reports - some output format copied from XTerm
2797 */ 3615 */
2798 case 11: /* report window state */ 3616 case 11: /* report window state */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3617 XGetWindowAttributes (disp, parent[0], &wattr);
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3618 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3619 break;
2802 case 13: /* report window position */ 3620 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3621 XGetWindowAttributes (disp, parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3622 XTranslateCoordinates (disp, parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3623 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3624 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3625 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3626 break;
2809 case 14: /* report window size (pixels) */ 3627 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3628 XGetWindowAttributes (disp, parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3629 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2812 break; 3630 break;
2813 case 18: /* report text area size (chars) */ 3631 case 18: /* report text area size (chars) */
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3632 tt_printf ("\033[8;%d;%dt", nrow, ncol);
2815 break; 3633 break;
2816 case 19: /* report window size (chars) */ 3634 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3635 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2818 break; 3636 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3637 case 20: /* report icon label */
3638 {
3639 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3640 XGetIconName (disp, parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3641 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3642 XFree (s);
3643 }
2823 break; 3644 break;
2824 case 21: /* report window title */ 3645 case 21: /* report window title */
3646 {
3647 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3648 XFetchName (disp, parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3649 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3650 XFree (s);
3651 }
2827 break; 3652 break;
2828#endif
2829 } 3653 }
2830} 3654}
2831#endif 3655#endif
2832 3656
2833/*----------------------------------------------------------------------*/ 3657/*----------------------------------------------------------------------*/
2834/* 3658/*
2835 * get input up until STRING TERMINATOR (or BEL) 3659 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3660 * ends_how is terminator used. returned input must be free()'d
2837 */ 3661 */
2838unsigned char * 3662char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3663rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3664{
2841 int seen_esc = 0; /* seen escape? */ 3665 unicode_t ch;
3666 bool seen_esc = false;
2842 unsigned int n = 0; 3667 unsigned int n = 0;
2843 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3668 wchar_t string[STRING_MAX];
2846 3669
2847 while ((ch = cmd_getc ())) 3670 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3671 {
2849 if (ch == C0_BEL 3672 if (seen_esc)
2850 || ch == CHAR_ST 3673 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3674 if (ch == 0x5c) /* 7bit ST */
2852 break; 3675 break;
2853 3676 else
3677 return NULL;
3678 }
2854 if (ch == C0_ESC) 3679 else if (ch == C0_ESC)
2855 { 3680 {
2856 seen_esc = 1; 3681 seen_esc = true;
2857 continue; 3682 continue;
2858 } 3683 }
2859 else if (ch == '\t') 3684 else if (ch == C0_BEL || ch == CHAR_ST)
2860 ch = ' '; /* translate '\t' to space */ 3685 break;
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3686 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3687 return NULL; /* other control character - exit */
2863 3688
2864 if (n < sizeof (string) - 1) 3689 seen_esc = false;
3690
3691 if (n >= STRING_MAX - 1)
3692 // stop at some sane length
3693 return NULL;
3694
3695 if (ch == C0_SYN)
3696 string[n++] = cmd_get8 ();
3697 else
2865 string[n++] = ch; 3698 string[n++] = ch;
2866
2867 seen_esc = 0;
2868 } 3699 }
2869 3700
2870 string[n++] = '\0'; 3701 string[n++] = '\0';
2871 3702
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2873 return NULL;
2874
2875 ends_how = (ch == 0x5c ? C0_ESC : ch); 3703 ends_how = (ch == 0x5c ? C0_ESC : ch);
2876 STRNCPY (s, string, n); 3704
2877 return s; 3705 return rxvt_wcstombs (string);
2878} 3706}
2879 3707
2880/*----------------------------------------------------------------------*/ 3708/*----------------------------------------------------------------------*/
2881/* 3709/*
2882 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3710 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2883 */ 3711 */
2884void 3712void
2885rxvt_term::process_dcs_seq () 3713rxvt_term::process_dcs_seq ()
2886{ 3714{
2887 unsigned char *s; 3715 char *s;
2888 unicode_t eh; 3716 unicode_t eh;
2889 3717
2890 /* 3718 /*
2891 * Not handled yet 3719 * Not handled yet
2892 */ 3720 */
… …
2911 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3739 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2912 arg = arg * 10 + (ch - '0'); 3740 arg = arg * 10 + (ch - '0');
2913 3741
2914 if (ch == ';') 3742 if (ch == ';')
2915 { 3743 {
2916 unsigned char *s = get_to_st (eh); 3744 char *s = get_to_st (eh);
2917 3745
2918 if (s) 3746 if (s)
2919 { 3747 {
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); 3748 process_xterm_seq (arg, s, eh);
2932
2933 free (s); 3749 free (s);
2934 } 3750 }
2935 } 3751 }
2936} 3752}
3753
3754void
3755rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3756{
3757 if (str[0] == '?' && !str[1])
3758 {
3759 unsigned short r, g, b;
3760 pix_colors_focused[color].get (display, r, g, b);
3761 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3762 }
3763 else
3764 set_window_color (color, str);
3765}
3766
2937/* 3767/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3768 * 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 */ 3769 */
2960void 3770void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3771rxvt_term::process_xterm_seq (int op, const char *str, char resp)
2962{ 3772{
2963 int changed = 0;
2964 int color; 3773 int color;
2965 char *buf, *name; 3774 char *buf, *name;
3775 bool query = str[0] == '?' && !str[1];
3776 int saveop = op;
3777 dDisp;
2966 3778
2967 assert (str != NULL); 3779 assert (str != NULL);
2968 switch (op) 3780 switch (op)
2969 { 3781 {
2970 case XTerm_name: 3782 case XTerm_name:
… …
2974 set_icon_name (str); 3786 set_icon_name (str);
2975 break; 3787 break;
2976 case XTerm_title: 3788 case XTerm_title:
2977 set_title (str); 3789 set_title (str);
2978 break; 3790 break;
3791 case XTerm_property:
3792 if (str[0] == '?')
3793 {
3794 Atom prop = display->atom (str + 1);
3795 Atom actual_type;
3796 int actual_format;
3797 unsigned long nitems;
3798 unsigned long bytes_after;
3799 unsigned char *value = 0;
3800 const char *str = "";
3801
3802 if (prop
3803 && XGetWindowProperty (disp, parent[0],
3804 prop, 0, 1<<16, 0, AnyPropertyType,
3805 &actual_type, &actual_format,
3806 &nitems, &bytes_after, &value) == Success
3807 && actual_type != None
3808 && actual_format == 8)
3809 str = (const char *)(value);
3810
3811 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3812
3813 XFree (value);
3814 }
3815 else
3816 {
3817 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3818
3819 if (eq)
3820 {
3821 *eq = 0;
3822 set_utf8_property (display->atom (str), eq + 1);
3823 }
3824 else
3825 XDeleteProperty (disp, parent[0],
3826 display->atom (str));
3827 }
3828 break;
3829
2979 case XTerm_Color: 3830 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3831 for (buf = (char *)str; buf && *buf;)
2981 { 3832 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3833 if ((name = strchr (buf, ';')) == NULL)
2983 break; 3834 break;
2984 3835
2985 *name++ = '\0'; 3836 *name++ = '\0';
2986 color = atoi (buf); 3837 color = atoi (buf) + minCOLOR;
2987 3838
2988 if (color < 0 || color >= TOTAL_COLORS) 3839 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
2989 break; 3840 break;
2990 3841
2991 if ((buf = STRCHR (name, ';')) != NULL) 3842 if ((buf = strchr (name, ';')) != NULL)
2992 *buf++ = '\0'; 3843 *buf++ = '\0';
2993 3844
3845 if (name[0] == '?' && !name[1])
3846 {
3847 unsigned short r, g, b;
3848 pix_colors_focused[color].get (display, r, g, b);
3849 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3850 }
3851 else
2994 set_window_color (color + minCOLOR, name); 3852 set_window_color (color, name);
2995 } 3853 }
3854 break;
3855 case XTerm_Color00:
3856 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3857 break;
3858 case XTerm_Color01:
3859 process_color_seq (XTerm_Color01, Color_bg, str, resp);
2996 break; 3860 break;
2997#ifndef NO_CURSORCOLOR 3861#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3862 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3863 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3000 break; 3864 break;
3001#endif 3865#endif
3002 case XTerm_Color_pointer: 3866 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3867 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3868 break;
3869 case XTerm_Color_pointer_bg:
3870 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3004 break; 3871 break;
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3872#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: 3873 case XTerm_Color_RV:
3013 set_window_color (Color_RV, str); 3874 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3014 break; 3875 break;
3876 case Rxvt_Color_BD:
3877 case URxvt_Color_BD:
3878 process_color_seq (op, Color_BD, str, resp);
3879 break;
3880 case Rxvt_Color_UL:
3881 case URxvt_Color_UL:
3882 process_color_seq (op, Color_UL, str, resp);
3883 break;
3884 case URxvt_Color_IT:
3885 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3886 break;
3015#endif 3887#endif
3888#if TRANSPARENT && TINTING
3889 case URxvt_Color_tint:
3890 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3891 check_our_parents ();
3892 if (am_transparent)
3893 want_full_refresh = want_refresh = 1;
3894 break;
3895#endif
3016 3896
3017 case XTerm_Menu: 3897 case Rxvt_Pixmap:
3018 /* 3898 {
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 != ';') 3899 if (*str != ';')
3025 { 3900 {
3026#if XPM_BACKGROUND 3901#if XPM_BACKGROUND
3027 scale_pixmap (""); /* reset to default scaling */ 3902 scale_pixmap (""); /* reset to default scaling */
3028 set_bgPixmap (str); /* change pixmap */ 3903 set_bgPixmap (str); /* change pixmap */
3029#endif
3030 scr_touch (true); 3904 scr_touch (true);
3905#endif
3031 } 3906 }
3907
3908 int changed = 0;
3909
3032 while ((str = STRCHR (str, ';')) != NULL) 3910 while ((str = strchr (str, ';')) != NULL)
3033 { 3911 {
3034 str++; 3912 str++;
3035#if XPM_BACKGROUND 3913#if XPM_BACKGROUND
3036 changed += scale_pixmap (str); 3914 changed += scale_pixmap (str);
3037#endif 3915#endif
3038
3039 } 3916 }
3917
3040 if (changed) 3918 if (changed)
3041 { 3919 {
3042#ifdef XPM_BACKGROUND 3920#ifdef XPM_BACKGROUND
3043 resize_pixmap (); 3921 resize_pixmap ();
3044#endif
3045 scr_touch (true); 3922 scr_touch (true);
3923#endif
3046 } 3924 }
3925 }
3047 break; 3926 break;
3048 3927
3049 case XTerm_restoreFG: 3928 case Rxvt_restoreFG:
3050 set_window_color (Color_fg, str); 3929 set_window_color (Color_fg, str);
3051 break; 3930 break;
3052 case XTerm_restoreBG: 3931 case Rxvt_restoreBG:
3053 set_window_color (Color_bg, str); 3932 set_window_color (Color_bg, str);
3054 break; 3933 break;
3934
3055 case XTerm_logfile: 3935 case XTerm_logfile:
3056 // TODO, when secure mode? 3936 // TODO, when secure mode?
3057 break; 3937 break;
3058 case XTerm_font: 3938
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 3939#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3940 case Rxvt_dumpscreen: /* no error notices */
3082 { 3941 {
3083 int fd; 3942 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3943 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3944 {
3086 scr_dump (fd); 3945 scr_dump (fd);
3087 close (fd); 3946 close (fd);
3088 } 3947 }
3089 } 3948 }
3949 break;
3950#endif
3951 case XTerm_font:
3952 op = URxvt_font;
3953 case URxvt_font:
3954#if ENABLE_STYLES
3955 case URxvt_boldFont:
3956 case URxvt_italicFont:
3957 case URxvt_boldItalicFont:
3958#endif
3959 if (query)
3960 tt_printf ("\33]%d;%-.250s%c", saveop,
3961 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3962 ? fontset[op - URxvt_font]->fontdesc : "",
3963 resp);
3964 else
3965 {
3966 const char *&res = rs[Rs_font + (op - URxvt_font)];
3967
3968 res = strdup (str);
3969 allocated.push_back ((void *)res);
3970 set_fonts ();
3971 }
3972 break;
3973
3974#if ENABLE_FRILLS
3975 case URxvt_locale:
3976 if (query)
3977 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3978 else
3979 {
3980 set_locale (str);
3981 pty->set_utf8_mode (enc_utf8);
3982 init_xlocale ();
3983 }
3984 break;
3985
3986 case URxvt_view_up:
3987 case URxvt_view_down:
3988 {
3989 int lines = atoi (str);
3990
3991 if (lines)
3992 scr_page (op == URxvt_view_up ? UP : DN, lines);
3993 else
3994 scr_erase_savelines ();
3995 }
3996
3997 break;
3998#endif
3999
4000#if ENABLE_PERL
4001 case URxvt_perl:
4002 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4003 ; // no responses yet
3090 break; 4004 break;
3091#endif 4005#endif
3092 } 4006 }
3093} 4007}
3094/*----------------------------------------------------------------------*/ 4008/*----------------------------------------------------------------------*/
… …
3108{ 4022{
3109 int state; 4023 int state;
3110 4024
3111 if (mode == 's') 4025 if (mode == 's')
3112 { 4026 {
3113 SavedModes |= (PrivateModes & bit); 4027 SavedModes |= (priv_modes & bit);
3114 return -1; 4028 return -1;
3115 } 4029 }
3116 else 4030 else
3117 { 4031 {
3118 if (mode == 'r') 4032 if (mode == 'r')
3119 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4033 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3120 else 4034 else
3121 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4035 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3122 PrivMode (state, bit); 4036 PrivMode (state, bit);
3123 } 4037 }
3124 4038
3125 return state; 4039 return state;
3126} 4040}
3127 4041
3128/* we're not using priv _yet_ */ 4042/* we're not using priv _yet_ */
3129void 4043void
3130rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4044rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3131{ 4045{
3132 unsigned int i, j; 4046 unsigned int i, j;
3133 int state; 4047 int state;
3134 4048
3135 static const struct 4049 static const struct
… …
3144 { 3, PrivMode_132 }, 4058 { 3, PrivMode_132 },
3145 { 4, PrivMode_smoothScroll }, 4059 { 4, PrivMode_smoothScroll },
3146 { 5, PrivMode_rVideo }, 4060 { 5, PrivMode_rVideo },
3147 { 6, PrivMode_relOrigin }, 4061 { 6, PrivMode_relOrigin },
3148 { 7, PrivMode_Autowrap }, 4062 { 7, PrivMode_Autowrap },
4063 // 8, bi-directional support mode
3149 { 9, PrivMode_MouseX10 }, 4064 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 4065 // 18, 19 printing-related
3151 { menuBar_esc, PrivMode_menuBar }, 4066 { 25, PrivMode_VisibleCursor },
3152#endif
3153#ifdef scrollBar_esc 4067#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 4068 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 4069#endif
3156 // 18, 19 printing-related
3157 { 25, PrivMode_VisibleCursor },
3158 // 30 show scrollbar rxvt. extension
3159 { 35, PrivMode_ShiftKeys }, // rxvt extension 4070 { 35, PrivMode_ShiftKeys }, // rxvt extension
3160 { 40, PrivMode_132OK }, 4071 { 40, PrivMode_132OK },
3161 // 41 xterm more fixes NYI 4072 // 41 xterm more fixes NYI
3162 // 45 margin bell NYI 4073 // 45 margin bell NYI
3163 // 46 start logging 4074 // 46 start logging
… …
3175 // 1035 enable modifiers for alt, numlock NYI 4086 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 4087 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 4088 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 4089 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 4090 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4091 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 4092 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 4093 };
3183 4094
3184 if (nargs == 0) 4095 if (nargs == 0)
3185 return; 4096 return;
… …
3203 } 4114 }
3204 4115
3205 /* extra handling for values with state unkept */ 4116 /* extra handling for values with state unkept */
3206 switch (arg[i]) 4117 switch (arg[i])
3207 { 4118 {
4119#if ENABLE_STYLES
4120 case 1021:
4121 set_option (Opt_intensityStyles, mode);
4122
4123 scr_touch (true);
4124 break;
4125#endif
3208 case 1048: /* alternative cursor save */ 4126 case 1048: /* alternative cursor save */
3209 case 1049: 4127 case 1049:
4128 if (OPTION (Opt_secondaryScreen))
3210 if (mode == 0) 4129 if (mode == 0)
3211 scr_cursor (RESTORE); 4130 scr_cursor (RESTORE);
3212 else if (mode == 1) 4131 else if (mode == 1)
3213 scr_cursor (SAVE); 4132 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 4133 break;
3215 } 4134 }
3216 4135
3217 if (state >= 0) 4136 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 4137 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 4138 switch (arg[i])
… …
3225 * within VT52 mode 4144 * within VT52 mode
3226 */ 4145 */
3227 PrivMode (1, PrivMode_vt52); 4146 PrivMode (1, PrivMode_vt52);
3228 break; 4147 break;
3229 case 3: /* 80/132 */ 4148 case 3: /* 80/132 */
3230 if (PrivateModes & PrivMode_132OK) 4149 if (priv_modes & PrivMode_132OK)
3231 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4150 set_widthheight (((state ? 132 : 80) * fwidth), height);
3232 break; 4151 break;
3233 case 4: /* smooth scrolling */ 4152 case 4: /* smooth scrolling */
3234 if (state) 4153 set_option (Opt_jumpScroll, !state);
3235 Options &= ~Opt_jumpScroll;
3236 else
3237 Options |= Opt_jumpScroll;
3238 break; 4154 break;
3239 case 5: /* reverse video */ 4155 case 5: /* reverse video */
3240 scr_rvideo_mode (state); 4156 scr_rvideo_mode (state);
3241 break; 4157 break;
3242 case 6: /* relative/absolute origins */ 4158 case 6: /* relative/absolute origins */
3243 scr_relative_origin (state); 4159 scr_relative_origin (state);
3244 break; 4160 break;
3245 case 7: /* autowrap */ 4161 case 7: /* autowrap */
3246 scr_autowrap (state); 4162 scr_autowrap (state);
3247 break; 4163 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 4164 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 4165 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 4166 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 4167 priv_modes &= ~PrivMode_MouseX11;
3252 break; 4168 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 4169#ifdef scrollBar_esc
3261 case scrollBar_esc: 4170 case scrollBar_esc:
3262 if (scrollbar_mapping (state)) 4171 if (scrollbar_mapping (state))
3263 { 4172 {
3264 resize_all_windows (0, 0, 0); 4173 resize_all_windows (0, 0, 0);
… …
3267 break; 4176 break;
3268#endif 4177#endif
3269 case 25: /* visible/invisible cursor */ 4178 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 4179 scr_cursor_visible (state);
3271 break; 4180 break;
3272 /* case 35: - shift keys */ 4181 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 4182 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 4183 case 47: /* secondary screen */
3275 scr_change_screen (state); 4184 scr_change_screen (state);
3276 break; 4185 break;
3277 /* case 66: - application key pad */ 4186 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 4187 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 4188 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 4189 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 4190 priv_modes &= ~PrivMode_MouseX10;
3282 break; 4191 break;
3283#if 0 4192#if 0
3284 case 1001: 4193 case 1001:
3285 break; /* X11 mouse highlighting */ 4194 break; /* X11 mouse highlighting */
3286#endif 4195#endif
3287 case 1010: /* scroll to bottom on TTY output inhibit */ 4196 case 1010: /* scroll to bottom on TTY output inhibit */
3288 if (state)
3289 Options &= ~Opt_scrollTtyOutput;
3290 else
3291 Options |= Opt_scrollTtyOutput; 4197 set_option (Opt_scrollTtyOutput, !state);
3292 break; 4198 break;
3293 case 1011: /* scroll to bottom on key press */ 4199 case 1011: /* scroll to bottom on key press */
3294 if (state)
3295 Options |= Opt_scrollTtyKeypress; 4200 set_option (Opt_scrollTtyKeypress, state);
3296 else
3297 Options &= ~Opt_scrollTtyKeypress;
3298 break; 4201 break;
3299 case 1047: /* secondary screen w/ clearing */ 4202 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4203 if (OPTION (Opt_secondaryScreen))
3301 if (current_screen != PRIMARY) 4204 if (current_screen != PRIMARY)
3302 scr_erase_screen (2); 4205 scr_erase_screen (2);
3303
3304 scr_change_screen (state); 4206 scr_change_screen (state);
3305 /* FALLTHROUGH */ 4207 break;
4208 case 1049: /* secondary screen w/ clearing first */
4209 scr_change_screen (state);
4210 if (OPTION (Opt_secondaryScreen))
4211 if (current_screen != PRIMARY)
4212 scr_erase_screen (2);
4213 break;
3306 default: 4214 default:
3307 break; 4215 break;
3308 } 4216 }
3309 } 4217 }
3310} 4218}
… …
3333 rendset = 0, rendstyle = ~RS_None; 4241 rendset = 0, rendstyle = ~RS_None;
3334 break; 4242 break;
3335 case 1: 4243 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 4244 rendset = 1, rendstyle = RS_Bold;
3337 break; 4245 break;
4246 //case 2: // low intensity
4247 case 3:
4248 rendset = 1, rendstyle = RS_Italic;
4249 break;
3338 case 4: 4250 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 4251 rendset = 1, rendstyle = RS_Uline;
3340 break; 4252 break;
3341 case 5: 4253 case 5: // slowly blinking
4254 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 4255 rendset = 1, rendstyle = RS_Blink;
3343 break; 4256 break;
4257 //case 6: // scoansi light background
3344 case 7: 4258 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 4259 rendset = 1, rendstyle = RS_RVid;
3346 break; 4260 break;
3347 case 8: 4261 case 8:
3348 // invisible. NYI 4262 // invisible. NYI
3349 break; 4263 break;
3350 case 22: 4264 //case 9: // crossed out
4265 //case 10: // scoansi acs off, primary font
4266 //case 11: // scoansi acs on, first alt font
4267 //case 12: // scoansi acs on, |0x80, second alt font
4268 //...
4269 //case 19: // ninth alt font
4270 //case 20: // gothic
4271 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3351 rendset = 0, rendstyle = RS_Bold; 4272 rendset = 0, rendstyle = RS_Bold;
4273 break;
4274 case 22: // normal intensity
4275 rendset = 0, rendstyle = RS_Bold;
4276 break;
4277 case 23: // disable italic
4278 rendset = 0, rendstyle = RS_Italic;
3352 break; 4279 break;
3353 case 24: 4280 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 4281 rendset = 0, rendstyle = RS_Uline;
3355 break; 4282 break;
3356 case 25: 4283 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 4284 rendset = 0, rendstyle = RS_Blink;
3358 break; 4285 break;
4286 case 26: // variable spacing (iso 8613)
4287 rendset = 0, rendstyle = RS_Blink;
4288 break;
3359 case 27: 4289 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 4290 rendset = 0, rendstyle = RS_RVid;
3361 break; 4291 break;
3362 case 28:
3363 // visible. NYI 4292 //case 28: // visible. NYI
3364 break; 4293 //case 29: // not crossed-out
3365 } 4294 }
3366 4295
3367 if (rendset != -1) 4296 if (rendset != -1)
3368 { 4297 {
3369 scr_rendition (rendset, rendstyle); 4298 scr_rendition (rendset, rendstyle);
… …
3380 case 35: 4309 case 35:
3381 case 36: 4310 case 36:
3382 case 37: 4311 case 37:
3383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4312 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3384 break; 4313 break;
3385#ifdef TTY_256COLOR 4314 case 38: // set fg color, ISO 8613-6
3386 case 38:
3387 if (nargs > i + 2 && arg[i + 1] == 5) 4315 if (nargs > i + 2 && arg[i + 1] == 5)
3388 { 4316 {
3389 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4317 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3390 i += 2; 4318 i += 2;
3391 } 4319 }
3392 break; 4320 break;
3393#endif
3394 case 39: /* default fg */ 4321 case 39: /* default fg */
3395 scr_color (Color_fg, Color_fg); 4322 scr_color (Color_fg, Color_fg);
3396 break; 4323 break;
3397 4324
3398 case 40: 4325 case 40:
… …
3403 case 45: 4330 case 45:
3404 case 46: 4331 case 46:
3405 case 47: 4332 case 47:
3406 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4333 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3407 break; 4334 break;
3408#ifdef TTY_256COLOR 4335 case 48: // set bg color, ISO 8613-6
3409 case 48:
3410 if (nargs > i + 2 && arg[i + 1] == 5) 4336 if (nargs > i + 2 && arg[i + 1] == 5)
3411 { 4337 {
3412 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4338 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3413 i += 2; 4339 i += 2;
3414 } 4340 }
3415 break; 4341 break;
3416#endif
3417 case 49: /* default bg */ 4342 case 49: /* default bg */
3418 scr_color (Color_bg, Color_bg); 4343 scr_color (Color_bg, Color_bg);
3419 break; 4344 break;
3420 4345
3421#ifndef NO_BRIGHTCOLOR 4346 //case 50: // not variable spacing
4347
4348#if ENABLE_FRILLS
3422 case 90: 4349 case 90:
3423 case 91: /* set bright fg color */ 4350 case 91: /* set bright fg color */
3424 case 92: 4351 case 92:
3425 case 93: 4352 case 93:
3426 case 94: 4353 case 94:
3427 case 95: 4354 case 95:
3428 case 96: 4355 case 96:
3429 case 97: 4356 case 97:
3430 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4357 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3431 Color_fg);
3432 break; 4358 break;
3433 case 100: 4359 case 100:
3434 case 101: /* set bright bg color */ 4360 case 101: /* set bright bg color */
3435 case 102: 4361 case 102:
3436 case 103: 4362 case 103:
3437 case 104: 4363 case 104:
3438 case 105: 4364 case 105:
3439 case 106: 4365 case 106:
3440 case 107: 4366 case 107:
3441 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4367 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3442 Color_bg);
3443 break; 4368 break;
3444#endif 4369#endif
3445
3446 } 4370 }
3447 } 4371 }
3448} 4372}
3449/*}}} */ 4373/*}}} */
3450 4374
3451/*{{{ process Rob Nation's own graphics mode sequences */ 4375/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 4376void
3453rxvt_term::process_graphics () 4377rxvt_term::process_graphics ()
3454{ 4378{
3455 unicode_t ch, cmd = cmd_getc (); 4379 unicode_t ch, cmd = cmd_getc ();
3456 4380
3457 if (cmd == 'Q') 4381 if (cmd == 'Q')
3458 { /* query graphics */ 4382 { /* query graphics */
3459 tt_printf ("\033G0\n"); /* no graphics */ 4383 tt_printf ("\033G0\012"); /* no graphics */
3460 return; 4384 return;
3461 } 4385 }
3462 /* swallow other graphics sequences until terminating ':' */ 4386 /* swallow other graphics sequences until terminating ':' */
3463 do 4387 do
3464 ch = cmd_getc (); 4388 ch = cmd_getc ();
… …
3474 */ 4398 */
3475void 4399void
3476rxvt_term::tt_printf (const char *fmt,...) 4400rxvt_term::tt_printf (const char *fmt,...)
3477{ 4401{
3478 va_list arg_ptr; 4402 va_list arg_ptr;
3479 unsigned char buf[256]; 4403 char buf[256];
3480 4404
3481 va_start (arg_ptr, fmt); 4405 va_start (arg_ptr, fmt);
3482 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4406 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3483 va_end (arg_ptr); 4407 va_end (arg_ptr);
3484 tt_write (buf, STRLEN (buf)); 4408 tt_write (buf, strlen (buf));
3485} 4409}
3486 4410
3487/* ---------------------------------------------------------------------- */ 4411/* ---------------------------------------------------------------------- */
3488/* Write data to the pty as typed by the user, pasted with the mouse, 4412/* 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. 4413 * or generated by us in response to a query ESC sequence.
3490 */ 4414 */
4415const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4416
3491void 4417void
3492rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4418rxvt_term::tt_write (const char *data, unsigned int len)
3493{ 4419{
3494 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4420 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4421 return;
3495 4422
3496 if (len) 4423 if (pty->pty < 0)
4424 return;
4425
4426 if (v_buflen == 0)
4427 {
4428 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4429
4430 if ((unsigned int)written == len)
4431 return;
4432
4433 data += written;
4434 len -= written;
3497 { 4435 }
4436
4437 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4438
4439 memcpy (v_buffer + v_buflen, data, len);
4440 v_buflen += len;
4441
4442 pty_ev.set (EVENT_READ | EVENT_WRITE);
4443}
4444
4445void rxvt_term::pty_write ()
4446{
4447 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4448
4449 if (written > 0)
4450 {
4451 v_buflen -= written;
4452
3498 if (v_buflen == 0) 4453 if (v_buflen == 0)
3499 { 4454 {
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); 4455 free (v_buffer);
3527 v_buffer = 0; 4456 v_buffer = 0;
3528 v_buflen = 0; 4457 v_buflen = 0;
3529 4458
3530 pty_ev.set (EVENT_READ); 4459 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; 4460 return;
3543 } 4461 }
4462
4463 memmove (v_buffer, v_buffer + written, v_buflen);
3544 } 4464 }
4465 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4466 pty_ev.set (EVENT_READ);
3545} 4467}
3546 4468
3547/*----------------------- end-of-file (C source) -----------------------*/ 4469/*----------------------- end-of-file (C source) -----------------------*/
3548 4470

Diff Legend

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