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

Diff Legend

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