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

Diff Legend

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