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

Diff Legend

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