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

Diff Legend

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