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.261 by root, Fri Jan 13 15:42:50 2006 UTC

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

Diff Legend

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