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

Diff Legend

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