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

Diff Legend

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