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.93 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.254 by root, Wed Jan 11 02:13:56 2006 UTC

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

Diff Legend

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