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

Diff Legend

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