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.131 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.249 by root, Sun Jan 8 01:02:15 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;
61 71
62#ifndef NO_FRILLS 72#if ENABLE_FRILLS || ISO_14755
63 73
64#define ISO_14755_KEYCODE_VALID 0x80000000UL
65#define ISO_14755_ACTIVE 0x40000000UL 74#define ISO_14755_STARTED 0x80000000UL
66#define ISO_14755_ESCAPE_NEXT 0x20000000UL 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
67 79
80#if ISO_14755
68static unsigned short iso14755_symtab[] = { 81static unsigned short iso14755_symtab[] = {
69 // keysym, unicode 82 // keysym, unicode
70 XK_Left, 0x2190, 83 XK_Left, 0x2190,
71 XK_KP_Left, 0x2190, 84 XK_KP_Left, 0x2190,
72 XK_Up, 0x2191, 85 XK_Up, 0x2191,
… …
110 XK_Escape, 0x238b, 123 XK_Escape, 0x238b,
111 XK_Undo, 0x238c, 124 XK_Undo, 0x238c,
112 XK_Print, 0x2399, 125 XK_Print, 0x2399,
113 126
114 XK_space, 0x2423, 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,
115 XK_KP_Space, 0x2422, 135 XK_KP_Space, 0x2422,
136#endif
116 0, 137 0,
117}; 138};
118 139
119void 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
120rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
121{ 252{
122 wchar_t ch[2]; 253 wchar_t ch[2];
123 254
124 ch[0] = iso14755buf & 0x1fffffffUL; // actually, unicode needs a 0x1fffff mask 255 ch[0] = iso14755buf & ISO_14755_MASK;
125 ch[1] = 0; 256 ch[1] = 0;
126 257
127 if (iso14755buf & ISO_14755_KEYCODE_VALID) 258 if (iso14755buf & ISO_14755_51)
128 { 259 {
129 char mb[16]; 260 char mb[16];
130 int len; 261 int len;
131 262
132 // allow verbatim 0-bytes and control-bytes to be entered 263 // allow verbatim 0-bytes and control-bytes to be entered
… …
137 mb[0] = ch[0]; 268 mb[0] = ch[0];
138 len = 1; 269 len = 1;
139 } 270 }
140 271
141 if (len > 0) 272 if (len > 0)
142 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
143 else 274 else
144 scr_bell (); 275 scr_bell ();
145 } 276 }
146 277
147 iso14755buf = 0; 278 iso14755buf = 0;
… …
175 KeySym keysym; 306 KeySym keysym;
176#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
177 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
178#endif 309#endif
179 int valid_keysym; 310 int valid_keysym;
180 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
181 312
182 /* 313 /*
183 * 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
184 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
185 * 316 *
186 * Always permit `shift' to override the current setting 317 * Always permit `shift' to override the current setting
187 */ 318 */
188 shft = (ev.state & ShiftMask); 319 shft = ev.state & ShiftMask;
189 ctrl = (ev.state & ControlMask); 320 ctrl = ev.state & ControlMask;
190 meta = (ev.state & ModMetaMask); 321 meta = ev.state & ModMetaMask;
191 322
192 if (numlock_state || (ev.state & ModNumLockMask)) 323 if (numlock_state || (ev.state & ModNumLockMask))
193 { 324 {
194 numlock_state = (ev.state & ModNumLockMask); 325 numlock_state = (ev.state & ModNumLockMask);
195 PrivMode ((!numlock_state), PrivMode_aplKP); 326 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
203 Status status_return; 334 Status status_return;
204 335
205#if 0 336#if 0
206#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
207 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
208 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
209 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
210 else 341 else
211#endif 342#endif
212#endif 343#endif
213 { 344 {
… …
215 346
216 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
217 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
218 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
219 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
220 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
221 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
222 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
223 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
224 SET_LOCALE (locale); 357 SET_LOCALE (locale);
225 358
226 if (status_return == XLookupChars 359 if (status_return == XLookupChars
227 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
… …
248 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
249 } 382 }
250 else 383 else
251#endif 384#endif
252 { 385 {
253 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
254 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
255 } 388 }
256 389
257 if (valid_keysym) 390 if (valid_keysym)
258 { 391 {
392#ifdef KEYSYM_RESOURCE
393 if (keyboard->dispatch (this, keysym, ev.state))
394 return;
395#endif
396
259 if (TermWin.saveLines) 397 if (saveLines)
260 { 398 {
261#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
262 if (!ctrl && !meta) 400 if (!ctrl && !meta)
263#else 401#else
264 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
265#endif 403#endif
266 { 404 {
267 int lnsppg; 405 int lnsppg;
268 406
269#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
270 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
271#else 409#else
272 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
273#endif 411#endif
274 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
275 { 413 {
276 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
277 return; 415 return;
… …
320 if (keysym >= XK_F1 && keysym <= XK_F10) 458 if (keysym >= XK_F1 && keysym <= XK_F10)
321 { 459 {
322 keysym += (XK_F11 - XK_F1); 460 keysym += (XK_F11 - XK_F1);
323 shft = 0; /* turn off Shift */ 461 shft = 0; /* turn off Shift */
324 } 462 }
325 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 463 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
326 { 464 {
327 switch (keysym) 465 switch (keysym)
328 { 466 {
329 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
330 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
331 selection_request (ev.time, 0, 0); 469 selection_request (ev.time, 0, 0);
332 return; 470 return;
333#if TODO // TODO 471#if TODO
334 /* rxvt extras */ 472 /* rxvt extras */
335 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
336 change_font (FONT_UP); 474 change_font (FONT_UP);
337 return; 475 return;
338 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 476 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
341#endif 479#endif
342 } 480 }
343 } 481 }
344 } 482 }
345 483
346#ifndef NO_FRILLS 484#if ENABLE_FRILLS || ISO_14755
347 // ISO 14755 support 485 // ISO 14755 support
348 if (shft && ctrl) 486 if (shft && ctrl)
349 { 487 {
350 int hv; 488 int hv;
351 489
490 if (iso14755buf & ISO_14755_51
352 if (keysym == XK_space || keysym == XK_KP_Space 491 && (keysym == XK_space || keysym == XK_KP_Space
353 || keysym == XK_Return || keysym == XK_KP_Enter) 492 || keysym == XK_Return || keysym == XK_KP_Enter))
354 { 493 {
355 commit_iso14755 (); 494 commit_iso14755 ();
495 iso14755buf = ISO_14755_51;
496# if ISO_14755
497 iso14755_51 (0);
498# endif
356 return; 499 return;
357 } 500 }
358 else if ((hv = hex_keyval (ev)) >= 0) 501 else if ((hv = hex_keyval (ev)) >= 0)
359 { 502 {
360 iso14755buf = (iso14755buf << 4) | hv | ISO_14755_KEYCODE_VALID; 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
361 return; 508 return;
362 } 509 }
363 else 510 else
511 {
512# if ENABLE_OVERLAY
513 scr_overlay_off ();
514# endif
364 iso14755buf = 0; 515 iso14755buf = 0;
516 }
365 } 517 }
366 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
367 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED))
521 {
368 iso14755buf |= ISO_14755_ACTIVE; 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 }
369#endif 528#endif
370 529
371#ifdef PRINTPIPE 530#ifdef PRINTPIPE
372 if (keysym == XK_Print) 531 if (keysym == XK_Print)
373 { 532 {
… …
376 } 535 }
377#endif 536#endif
378 537
379 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 538 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
380 { 539 {
381#ifdef KEYSYM_RESOURCE
382 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
383 {
384 unsigned int l;
385 const unsigned char *kbuf0;
386
387 kbuf0 = (Keysym_map[keysym & 0xFF]);
388 l = (unsigned int)*kbuf0++;
389
390 /* escape prefix */
391 if (meta
392# ifdef META8_OPTION
393 && meta_char == C0_ESC
394# endif
395 )
396 {
397 const unsigned char ch = C0_ESC;
398 tt_write (&ch, 1);
399 }
400
401 tt_write (kbuf0, l);
402 return;
403 }
404 else
405#endif
406 { 540 {
407 newlen = 1; 541 newlen = 1;
408 switch (keysym) 542 switch (keysym)
409 { 543 {
410#ifndef NO_BACKSPACE_KEY 544#ifndef NO_BACKSPACE_KEY
411 case XK_BackSpace: 545 case XK_BackSpace:
412 if (PrivateModes & PrivMode_HaveBackSpace) 546 if (priv_modes & PrivMode_HaveBackSpace)
413 { 547 {
414 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
415 ^ !!ctrl) ? '\b' : '\177'; 549 ^ !!ctrl) ? '\b' : '\177';
416 kbuf[1] = '\0'; 550 kbuf[1] = '\0';
417 } 551 }
418 else 552 else
419 STRCPY (kbuf, key_backspace); 553 strcpy (kbuf, key_backspace);
420 break; 554 break;
421#endif 555#endif
422#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
423 case XK_Delete: 567 case XK_Delete:
424 STRCPY (kbuf, key_delete); 568 strcpy (kbuf, key_delete);
425 break; 569 break;
426#endif 570#endif
427 case XK_Tab: 571 case XK_Tab:
428 if (shft) 572 if (shft)
429 STRCPY (kbuf, "\033[Z"); 573 strcpy (kbuf, "\033[Z");
430 else 574 else
431 { 575 {
432#ifdef CTRL_TAB_MAKES_META 576#ifdef CTRL_TAB_MAKES_META
433 if (ctrl) 577 if (ctrl)
434 meta = 1; 578 meta = 1;
… …
444#ifdef XK_KP_Left 588#ifdef XK_KP_Left
445 case XK_KP_Up: /* \033Ox or standard */ 589 case XK_KP_Up: /* \033Ox or standard */
446 case XK_KP_Down: /* \033Or or standard */ 590 case XK_KP_Down: /* \033Or or standard */
447 case XK_KP_Right: /* \033Ov or standard */ 591 case XK_KP_Right: /* \033Ov or standard */
448 case XK_KP_Left: /* \033Ot or standard */ 592 case XK_KP_Left: /* \033Ot or standard */
449 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
450 { 594 {
451 STRCPY (kbuf, "\033OZ"); 595 strcpy (kbuf, "\033OZ");
452 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 596 kbuf[2] = "txvr"[keysym - XK_KP_Left];
453 break; 597 break;
454 } 598 }
455 else 599 else
456 /* translate to std. cursor key */ 600 /* translate to std. cursor key */
… …
459#endif 603#endif
460 case XK_Up: /* "\033[A" */ 604 case XK_Up: /* "\033[A" */
461 case XK_Down: /* "\033[B" */ 605 case XK_Down: /* "\033[B" */
462 case XK_Right: /* "\033[C" */ 606 case XK_Right: /* "\033[C" */
463 case XK_Left: /* "\033[D" */ 607 case XK_Left: /* "\033[D" */
464 STRCPY (kbuf, "\033[Z"); 608 strcpy (kbuf, "\033[Z");
465 kbuf[2] = "DACB"[keysym - XK_Left]; 609 kbuf[2] = "DACB"[keysym - XK_Left];
466 /* do Shift first */ 610 /* do Shift first */
467 if (shft) 611 if (shft)
468 kbuf[2] = "dacb"[keysym - XK_Left]; 612 kbuf[2] = "dacb"[keysym - XK_Left];
469 else if (ctrl) 613 else if (ctrl)
470 { 614 {
471 kbuf[1] = 'O'; 615 kbuf[1] = 'O';
472 kbuf[2] = "dacb"[keysym - XK_Left]; 616 kbuf[2] = "dacb"[keysym - XK_Left];
473 } 617 }
474 else if (PrivateModes & PrivMode_aplCUR) 618 else if (priv_modes & PrivMode_aplCUR)
475 kbuf[1] = 'O'; 619 kbuf[1] = 'O';
476 break; 620 break;
477 621
478#ifndef UNSHIFTED_SCROLLKEYS 622#ifndef UNSHIFTED_SCROLLKEYS
479# ifdef XK_KP_Prior 623# ifdef XK_KP_Prior
480 case XK_KP_Prior: 624 case XK_KP_Prior:
481 /* allow shift to override */ 625 /* allow shift to override */
482 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
483 { 627 {
484 STRCPY (kbuf, "\033Oy"); 628 strcpy (kbuf, "\033Oy");
485 break; 629 break;
486 } 630 }
487 /* FALLTHROUGH */ 631 /* FALLTHROUGH */
488# endif 632# endif
489 case XK_Prior: 633 case XK_Prior:
490 STRCPY (kbuf, "\033[5~"); 634 strcpy (kbuf, "\033[5~");
491 break; 635 break;
492# ifdef XK_KP_Next 636# ifdef XK_KP_Next
493 case XK_KP_Next: 637 case XK_KP_Next:
494 /* allow shift to override */ 638 /* allow shift to override */
495 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
496 { 640 {
497 STRCPY (kbuf, "\033Os"); 641 strcpy (kbuf, "\033Os");
498 break; 642 break;
499 } 643 }
500 /* FALLTHROUGH */ 644 /* FALLTHROUGH */
501# endif 645# endif
502 case XK_Next: 646 case XK_Next:
503 STRCPY (kbuf, "\033[6~"); 647 strcpy (kbuf, "\033[6~");
504 break; 648 break;
505#endif 649#endif
506 case XK_KP_Enter: 650 case XK_KP_Enter:
507 /* allow shift to override */ 651 /* allow shift to override */
508 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
509 { 653 {
510 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';
511 } 666 }
512 else 667 else
513 { 668 {
514 kbuf[0] = '\r'; 669 kbuf[0] = '\015';
515 kbuf[1] = '\0'; 670 kbuf[1] = '\0';
516 } 671 }
517 break; 672 break;
518 673
519#ifdef XK_KP_Begin 674#ifdef XK_KP_Begin
520 case XK_KP_Begin: 675 case XK_KP_Begin:
521 STRCPY (kbuf, "\033Ou"); 676 strcpy (kbuf, "\033Ou");
522 break; 677 break;
523 678
524 case XK_KP_Insert:
525 STRCPY (kbuf, "\033Op");
526 break;
527
528 case XK_KP_Delete:
529 STRCPY (kbuf, "\033On");
530 break;
531#endif 679#endif
532 case XK_KP_F1: /* "\033OP" */ 680 case XK_KP_F1: /* "\033OP" */
533 case XK_KP_F2: /* "\033OQ" */ 681 case XK_KP_F2: /* "\033OQ" */
534 case XK_KP_F3: /* "\033OR" */ 682 case XK_KP_F3: /* "\033OR" */
535 case XK_KP_F4: /* "\033OS" */ 683 case XK_KP_F4: /* "\033OS" */
536 STRCPY (kbuf, "\033OP"); 684 strcpy (kbuf, "\033OP");
537 kbuf[2] += (keysym - XK_KP_F1); 685 kbuf[2] += (keysym - XK_KP_F1);
538 break; 686 break;
539 687
540 case XK_KP_Multiply: /* "\033Oj" : "*" */ 688 case XK_KP_Multiply: /* "\033Oj" : "*" */
541 case XK_KP_Add: /* "\033Ok" : "+" */ 689 case XK_KP_Add: /* "\033Ok" : "+" */
… …
552 case XK_KP_6: /* "\033Ov" : "6" */ 700 case XK_KP_6: /* "\033Ov" : "6" */
553 case XK_KP_7: /* "\033Ow" : "7" */ 701 case XK_KP_7: /* "\033Ow" : "7" */
554 case XK_KP_8: /* "\033Ox" : "8" */ 702 case XK_KP_8: /* "\033Ox" : "8" */
555 case XK_KP_9: /* "\033Oy" : "9" */ 703 case XK_KP_9: /* "\033Oy" : "9" */
556 /* allow shift to override */ 704 /* allow shift to override */
557 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
558 { 706 {
559 STRCPY (kbuf, "\033Oj"); 707 strcpy (kbuf, "\033Oj");
560 kbuf[2] += (keysym - XK_KP_Multiply); 708 kbuf[2] += (keysym - XK_KP_Multiply);
561 } 709 }
562 else 710 else
563 { 711 {
564 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 712 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
565 kbuf[1] = '\0'; 713 kbuf[1] = '\0';
566 } 714 }
567 break; 715 break;
568 716
569 case XK_Find: 717 case XK_Find:
570 STRCPY (kbuf, "\033[1~"); 718 strcpy (kbuf, "\033[1~");
571 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
572 case XK_Insert: 731 case XK_Insert:
573 STRCPY (kbuf, "\033[2~"); 732 strcpy (kbuf, "\033[2~");
574 break; 733 break;
575#ifdef DXK_Remove /* support for DEC remove like key */ 734#ifdef DXK_Remove /* support for DEC remove like key */
576 case DXK_Remove: 735 case DXK_Remove:
577 /* FALLTHROUGH */ 736 /* FALLTHROUGH */
578#endif 737#endif
579 case XK_Execute: 738 case XK_Execute:
580 STRCPY (kbuf, "\033[3~"); 739 strcpy (kbuf, "\033[3~");
581 break; 740 break;
582 case XK_Select: 741 case XK_Select:
583 STRCPY (kbuf, "\033[4~"); 742 strcpy (kbuf, "\033[4~");
584 break; 743 break;
585#ifdef XK_KP_End 744#ifdef XK_KP_End
586 case XK_KP_End: 745 case XK_KP_End:
587 /* allow shift to override */ 746 /* allow shift to override */
588 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
589 { 748 {
590 STRCPY (kbuf, "\033Oq"); 749 strcpy (kbuf, "\033Oq");
591 break; 750 break;
592 } 751 }
593 /* FALLTHROUGH */ 752 /* FALLTHROUGH */
594#endif 753#endif
595 case XK_End: 754 case XK_End:
596 STRCPY (kbuf, KS_END); 755 strcpy (kbuf, KS_END);
597 break; 756 break;
598#ifdef XK_KP_Home 757#ifdef XK_KP_Home
599 case XK_KP_Home: 758 case XK_KP_Home:
600 /* allow shift to override */ 759 /* allow shift to override */
601 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
602 { 761 {
603 STRCPY (kbuf, "\033Ow"); 762 strcpy (kbuf, "\033Ow");
604 break; 763 break;
605 } 764 }
606 /* FALLTHROUGH */ 765 /* FALLTHROUGH */
607#endif 766#endif
608 case XK_Home: 767 case XK_Home:
609 STRCPY (kbuf, KS_HOME); 768 strcpy (kbuf, KS_HOME);
610 break; 769 break;
611 770
612#define FKEY(n, fkey) \ 771#define FKEY(n, fkey) \
613 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 772 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
614 773
… …
666#undef FKEY 825#undef FKEY
667 default: 826 default:
668 newlen = 0; 827 newlen = 0;
669 break; 828 break;
670 } 829 }
830
671 if (newlen) 831 if (newlen)
672 len = STRLEN (kbuf); 832 len = strlen (kbuf);
673 } 833 }
674 834
675 /* 835 /*
676 * Pass meta for all function keys, if 'meta' option set 836 * Pass meta for all function keys, if 'meta' option set
677 */ 837 */
… …
684 else if (ctrl && keysym == XK_minus) 844 else if (ctrl && keysym == XK_minus)
685 { 845 {
686 len = 1; 846 len = 1;
687 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 847 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
688 } 848 }
849 else if (keysym == XK_ISO_Left_Tab)
850 {
851 strcpy (kbuf, "\033[Z");
852 len = 3;
853 }
689 else 854 else
690 { 855 {
691#ifdef META8_OPTION 856#ifdef META8_OPTION
692 /* set 8-bit on */ 857 /* set 8-bit on */
693 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
694 { 859 {
695 unsigned char *ch; 860 char *ch;
696 861
697 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
698 *ch |= 0x80; 863 *ch |= 0x80;
699 864
700 meta = 0; 865 meta = 0;
… …
702#endif 867#endif
703 /* nil */ ; 868 /* nil */ ;
704 } 869 }
705 } 870 }
706 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
707 if (len <= 0) 875 if (len <= 0)
708 return; /* not mapped */ 876 return; /* not mapped */
709 877
710 if (Options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
711 if (TermWin.view_start) 879 if (view_start)
712 { 880 {
713 TermWin.view_start = 0; 881 view_start = 0;
714 want_refresh = 1; 882 want_refresh = 1;
715 } 883 }
716 884
717 /* 885 /*
718 * these modifications only affect the static keybuffer 886 * these modifications only affect the static keybuffer
… …
733#ifdef META8_OPTION 901#ifdef META8_OPTION
734 && meta_char == C0_ESC 902 && meta_char == C0_ESC
735#endif 903#endif
736 ) 904 )
737 { 905 {
738 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
739 tt_write (&ch, 1); 907 tt_write (&ch, 1);
740 } 908 }
741 909
742#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
743 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
751#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
752 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
753} 921}
754/*}}} */ 922/*}}} */
755 923
756#if (MENUBAR_MAX) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
757/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
758/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
759unsigned int 927unsigned int
760rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
761{ 929{
762 unsigned int n, s; 930 unsigned int n, s;
763 931
764 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
765 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
766 934
767 if (n > 0 && s < count) 935 if (n > 0 && s < count)
768 { 936 {
769 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 937 memmove (cmdbuf_base, cmdbuf_ptr,
770 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 938 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
771 cmdbuf_ptr = cmdbuf_base; 939 cmdbuf_ptr = cmdbuf_base;
772 cmdbuf_endp -= n; 940 cmdbuf_endp -= n;
773 s += n; 941 s += n;
774 } 942 }
… …
784 952
785 cmd_parse (); 953 cmd_parse ();
786 954
787 return 0; 955 return 0;
788} 956}
789#endif /* MENUBAR_MAX */ 957#endif
790 958
791void 959void
792rxvt_term::flush () 960rxvt_term::flush ()
793{ 961{
962 flush_ev.stop ();
963
794#ifdef TRANSPARENT 964#ifdef TRANSPARENT
795 if (want_full_refresh) 965 if (want_full_refresh)
796 { 966 {
797 want_full_refresh = 0; 967 want_full_refresh = 0;
798 scr_clear (); 968 scr_clear ();
… …
800 } 970 }
801#endif 971#endif
802 972
803 if (want_refresh) 973 if (want_refresh)
804 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = -view_start;
978
979 while (row > -nsaved && ROW (row - 1).is_longer ())
980 --row;
981
982 while (row < -view_start + nrow)
983 {
984 int start_row = row;
985 line_t *l;
986
987 do
988 {
989 l = &ROW (row);
990
991 if (!(l->f & LINE_FILTERED))
992 {
993 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED;
995 while (l->is_longer ())
996 {
997 l = &ROW (++row);
998 l->f |= LINE_FILTERED;
999 }
1000
1001 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003
1004 break;
1005 }
1006 }
1007 while (l->is_longer ());
1008
1009 row++;
1010 }
1011
1012 }
1013
805 scr_refresh (refresh_type); 1014 scr_refresh (refresh_type);
806 scrollbar_show (1); 1015 scrollbar_show (1);
807#ifdef USE_XIM 1016#ifdef USE_XIM
808 IMSendSpot (); 1017 IMSendSpot ();
809#endif 1018#endif
810 } 1019 }
811 1020
812 display->flush (); 1021 display->flush ();
813
814 flush_ev.stop ();
815} 1022}
816 1023
817void 1024void
818rxvt_term::check_cb (check_watcher &w) 1025rxvt_term::check_cb (check_watcher &w)
819{ 1026{
… …
821 SET_LOCALE (locale); 1028 SET_LOCALE (locale);
822 1029
823 display->flush (); 1030 display->flush ();
824 1031
825 if (want_refresh && !flush_ev.active) 1032 if (want_refresh && !flush_ev.active)
826 flush_ev.start (NOW + 0.01); 1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
827} 1034}
828 1035
829void 1036void
830rxvt_term::flush_cb (time_watcher &w) 1037rxvt_term::flush_cb (time_watcher &w)
831{ 1038{
… …
895{ 1102{
896 if (mouse_slip_wheel_speed == 0 1103 if (mouse_slip_wheel_speed == 0
897 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
898 : scr_page (UP, mouse_slip_wheel_speed)) 1105 : scr_page (UP, mouse_slip_wheel_speed))
899 { 1106 {
1107 if (view_start == nsaved ||
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0;
1110
900 refresh_type |= SMOOTH_REFRESH; 1111 refresh_type |= SMOOTH_REFRESH;
901 want_refresh = 1; 1112 want_refresh = 1;
902 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
903 } 1114 }
904} 1115}
905#endif 1116#endif
906 1117
1118#if HAVE_SCHED_YIELD
1119static struct event_handler
1120{
1121 check_watcher cw_yield;
1122
1123 void yield (check_watcher &w)
1124 {
1125 sched_yield ();
1126 w.stop ();
1127 }
1128
1129 event_handler ()
1130 : cw_yield (this, &event_handler::yield)
1131 {
1132 }
1133} event_handler;
1134#endif
1135
907bool 1136bool
908rxvt_term::pty_fill () 1137rxvt_term::pty_fill ()
909{ 1138{
910 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1139 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
911 1140
912 if (CBUFSIZ == n) 1141 if (CBUFSIZ == n)
913 { 1142 {
914 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1143 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
915 n = 0; 1144 n = 0;
916 } 1145 }
917 1146
918 memmove (cmdbuf_base, cmdbuf_ptr, n); 1147 memmove (cmdbuf_base, cmdbuf_ptr, n);
919 cmdbuf_ptr = cmdbuf_base; 1148 cmdbuf_ptr = cmdbuf_base;
920 cmdbuf_endp = cmdbuf_ptr + n; 1149 cmdbuf_endp = cmdbuf_ptr + n;
921 1150
922 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
923 1152
924 if (n > 0) 1153 if (r > 0)
925 { 1154 {
926 cmdbuf_endp += n; 1155 cmdbuf_endp += r;
927 return true; 1156 return true;
928 } 1157 }
929 else if (n < 0 && errno != EAGAIN) 1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 {
1160#if HAVE_SCHED_YIELD
1161 if (display->is_local)
1162 event_handler.cw_yield.start ();
1163#endif
1164 }
1165 else
1166 {
1167 pty_ev.stop ();
1168
1169 if (!OPTION (Opt_hold))
930 destroy (); 1170 destroy ();
1171 }
931 1172
932 return false; 1173 return false;
933} 1174}
934 1175
935void 1176void
936rxvt_term::pty_cb (io_watcher &w, short revents) 1177rxvt_term::pty_cb (io_watcher &w, short revents)
937{ 1178{
938 SET_R (this); 1179 SET_R (this);
939 SET_LOCALE (locale); 1180 SET_LOCALE (locale);
940 1181
941 if (revents & EVENT_WRITE)
942 tt_write (0, 0);
943 else if (revents & EVENT_READ) 1182 if (revents & EVENT_READ)
944 // loop, but don't allow a single term to monopolize us 1183 // loop, but don't allow a single term to monopolize us
945 while (pty_fill ()) 1184 while (pty_fill ())
946 if (cmd_parse ()) 1185 if (cmd_parse ())
947 break; 1186 break;
1187
1188 if (revents & EVENT_WRITE)
1189 pty_write ();
948} 1190}
949 1191
950void 1192void
951rxvt_term::pointer_unblank () 1193rxvt_term::pointer_unblank ()
952{ 1194{
953 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1195 XDefineCursor (display->display, vt, TermWin_cursor);
954 recolour_cursor (); 1196 recolour_cursor ();
955 1197
956#ifdef POINTER_BLANK 1198#ifdef POINTER_BLANK
957 hidden_pointer = 0; 1199 hidden_pointer = 0;
958 1200
959 if (Options & Opt_pointerBlank) 1201 if (OPTION (Opt_pointerBlank))
960 pointer_ev.start (NOW + pointerBlankDelay); 1202 pointer_ev.start (NOW + pointerBlankDelay);
961#endif 1203#endif
962} 1204}
963 1205
964#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
965void 1207void
966rxvt_term::pointer_blank () 1208rxvt_term::pointer_blank ()
967{ 1209{
968 if (! (Options & Opt_pointerBlank)) 1210 if (!OPTION (Opt_pointerBlank))
969 return; 1211 return;
970 1212
971 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
972 XFlush (display->display); 1214 XFlush (display->display);
973 1215
974 hidden_pointer = 1; 1216 hidden_pointer = 1;
975} 1217}
976 1218
… …
993 x = ev.x; 1235 x = ev.x;
994 y = ev.y; 1236 y = ev.y;
995 pixel_position (&x, &y); 1237 pixel_position (&x, &y);
996 1238
997 if (MEvent.button == AnyButton) 1239 if (MEvent.button == AnyButton)
998 {
999 button_number = 3; 1240 button_number = 3;
1000 }
1001 else 1241 else
1002 { 1242 {
1003 button_number = MEvent.button - Button1; 1243 button_number = MEvent.button - Button1;
1004 /* add 0x3D for wheel events, like xterm does */ 1244 /* add 0x3D for wheel events, like xterm does */
1005 if (button_number >= 3) 1245 if (button_number >= 3)
1006 button_number += (64 - 3); 1246 button_number += (64 - 3);
1007 } 1247 }
1008 1248
1009 if (PrivateModes & PrivMode_MouseX10) 1249 if (priv_modes & PrivMode_MouseX10)
1010 { 1250 {
1011 /* 1251 /*
1012 * do not report ButtonRelease 1252 * do not report ButtonRelease
1013 * no state info allowed 1253 * no state info allowed
1014 */ 1254 */
… …
1029 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1269 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1030 + ((MEvent.state & ControlMask) ? 16 : 0); 1270 + ((MEvent.state & ControlMask) ? 16 : 0);
1031#ifdef MOUSE_REPORT_DOUBLECLICK 1271#ifdef MOUSE_REPORT_DOUBLECLICK
1032 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1272 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1033#endif 1273#endif
1034
1035 } 1274 }
1036 1275
1037#ifdef DEBUG_MOUSEREPORT 1276#if DEBUG_MOUSEREPORT
1038 fprintf (stderr, "Mouse ["); 1277 fprintf (stderr, "Mouse [");
1039 if (key_state & 16) 1278 if (key_state & 16)
1040 fputc ('C', stderr); 1279 fputc ('C', stderr);
1041 if (key_state & 4) 1280 if (key_state & 4)
1042 fputc ('S', stderr); 1281 fputc ('S', stderr);
… …
1046 fputc ('2', stderr); 1285 fputc ('2', stderr);
1047 fprintf (stderr, "]: <%d>, %d/%d\n", 1286 fprintf (stderr, "]: <%d>, %d/%d\n",
1048 button_number, 1287 button_number,
1049 x + 1, 1288 x + 1,
1050 y + 1); 1289 y + 1);
1051#else 1290#endif
1291
1052 tt_printf ("\033[M%c%c%c", 1292 tt_printf ("\033[M%c%c%c",
1053 (32 + button_number + key_state), 1293 (32 + button_number + key_state),
1054 (32 + x + 1), 1294 (32 + x + 1),
1055 (32 + y + 1)); 1295 (32 + y + 1));
1056#endif
1057} 1296}
1058 1297
1059#ifdef USING_W11LIB 1298#ifdef USING_W11LIB
1060void 1299void
1061rxvt_W11_process_x_event (XEvent *ev) 1300rxvt_W11_process_x_event (XEvent *ev)
… …
1068 1307
1069/*{{{ process an X event */ 1308/*{{{ process an X event */
1070void 1309void
1071rxvt_term::x_cb (XEvent &ev) 1310rxvt_term::x_cb (XEvent &ev)
1072{ 1311{
1312 dDisp;
1313
1073 SET_R (this); 1314 SET_R (this);
1074 SET_LOCALE (locale); 1315 SET_LOCALE (locale);
1075 1316
1076#if defined(CURSOR_BLINK)
1077 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1078 {
1079 if (hidden_cursor)
1080 {
1081 hidden_cursor = 0;
1082 want_refresh = 1;
1083 }
1084
1085 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1086 }
1087#endif
1088
1089#if defined(POINTER_BLANK)
1090 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1091 {
1092 if (ev.type == MotionNotify
1093 || ev.type == ButtonPress
1094 || ev.type == ButtonRelease)
1095 if (hidden_pointer)
1096 pointer_unblank ();
1097
1098 if (ev.type == KeyPress && hidden_pointer == 0)
1099 pointer_blank ();
1100 }
1101#endif
1102
1103#ifdef USE_XIM
1104 if (XFilterEvent (&ev, None))
1105 return;
1106#endif
1107
1108 Window unused_root, unused_child; 1317 Window unused_root, unused_child;
1109 int unused_root_x, unused_root_y; 1318 int unused_root_x, unused_root_y;
1110 unsigned int unused_mask; 1319 unsigned int unused_mask;
1111
1112#ifdef DEBUG_X
1113 const char *const eventnames[] =
1114 { /* mason - this matches my system */
1115 "",
1116 "",
1117 "KeyPress",
1118 "KeyRelease",
1119 "ButtonPress",
1120 "ButtonRelease",
1121 "MotionNotify",
1122 "EnterNotify",
1123 "LeaveNotify",
1124 "FocusIn",
1125 "FocusOut",
1126 "KeymapNotify",
1127 "Expose",
1128 "GraphicsExpose",
1129 "NoExpose",
1130 "VisibilityNotify",
1131 "CreateNotify",
1132 "DestroyNotify",
1133 "UnmapNotify",
1134 "MapNotify",
1135 "MapRequest",
1136 "ReparentNotify",
1137 "ConfigureNotify",
1138 "ConfigureRequest",
1139 "GravityNotify",
1140 "ResizeRequest",
1141 "CirculateNotify",
1142 "CirculateRequest",
1143 "PropertyNotify",
1144 "SelectionClear",
1145 "SelectionRequest",
1146 "SelectionNotify",
1147 "ColormapNotify",
1148 "ClientMessage",
1149 "MappingNotify"
1150 };
1151#endif
1152
1153#ifdef DEBUG_X
1154 struct timeval tp;
1155 struct tm *ltt;
1156 (void)gettimeofday (&tp, NULL);
1157 ltt = localtime (& (tp.tv_sec));
1158 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));
1159#endif
1160 1320
1161 switch (ev.type) 1321 switch (ev.type)
1162 { 1322 {
1163 case KeyPress: 1323 case KeyPress:
1324#if ISO_14755
1164 if (!(iso14755buf & ISO_14755_ESCAPE_NEXT)) 1325 if (!(iso14755buf & ISO_14755_52))
1326#endif
1165 lookup_key (ev.xkey); 1327 lookup_key (ev.xkey);
1166 1328
1167 break; 1329 break;
1168 1330
1169 case KeyRelease: 1331 case KeyRelease:
1170 { 1332 {
1171#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || !defined (NO_FRILLS) 1333#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1172 KeySym ks; 1334 KeySym ks;
1173 1335
1174 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1336 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1175#endif 1337#endif
1176 1338
1177#ifndef NO_FRILLS 1339#if ENABLE_FRILLS || ISO_14755
1178 // ISO 14755 support 1340 // ISO 14755 support
1179 if (iso14755buf) 1341 if (iso14755buf)
1180 if (iso14755buf & ISO_14755_ESCAPE_NEXT) 1342 if (iso14755buf & ISO_14755_52)
1181 { 1343 {
1344# if ENABLE_OVERLAY
1345 scr_overlay_off ();
1346# endif
1347# if ISO_14755
1182 // iso14755 part 5.2 handling: release time 1348 // iso14755 part 5.2 handling: release time
1183 // first: controls 1349 // first: controls
1184 if ((ev.xkey.state & ControlMask) 1350 if ((ev.xkey.state & ControlMask)
1185 && ((ks >= 0x40 && ks <= 0x5f) 1351 && ((ks >= 0x40 && ks <= 0x5f)
1186 || (ks >= 0x61 && ks <= 0x7f))) 1352 || (ks >= 0x61 && ks <= 0x7f)))
1187 { 1353 {
1188 iso14755buf = ISO_14755_KEYCODE_VALID | 0x2400 | (ks & 0x1f); 1354 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1189 commit_iso14755 (); 1355 commit_iso14755 ();
1190 return; // case-break; 1356 goto skip_switch;
1191 } 1357 }
1192 1358
1193 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1359 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1194 if (i[0] == ks) 1360 if (i[0] == ks)
1195 { 1361 {
1196 iso14755buf = ISO_14755_KEYCODE_VALID | i[1]; 1362 iso14755buf = ISO_14755_51 | i[1];
1197 commit_iso14755 (); 1363 commit_iso14755 ();
1198 return; // case-break; 1364 goto skip_switch;
1199 } 1365 }
1200 1366
1367 scr_bell ();
1368# endif
1201 iso14755buf = 0; 1369 iso14755buf = 0;
1202 scr_bell ();
1203 break; 1370 break;
1204 } 1371 }
1205 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 1372 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1206 { 1373 {
1374# if ENABLE_OVERLAY
1375 scr_overlay_off ();
1376# endif
1207 if (iso14755buf & ISO_14755_KEYCODE_VALID) 1377 if (iso14755buf & ISO_14755_51)
1208 commit_iso14755 (); 1378 commit_iso14755 ();
1379#if ISO_14755
1209 else if (iso14755buf & ISO_14755_ACTIVE) 1380 else if (iso14755buf & ISO_14755_STARTED)
1381 {
1210 iso14755buf = ISO_14755_ESCAPE_NEXT; // iso14755 part 5.2: remember empty begin/end pair 1382 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1383
1384 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1385 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1386 }
1387# endif
1388 else
1389 iso14755buf = 0;
1211 } 1390 }
1212#endif 1391#endif
1392
1393 if (ev.xany.window == vt
1394 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1395 break;
1213 1396
1214#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1397#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1215 if (!(ev.xkey.state & ControlMask)) 1398 if (!(ev.xkey.state & ControlMask))
1216 slip_wheel_ev.stop (); 1399 slip_wheel_ev.stop ();
1217 else if (ks == XK_Control_L || ks == XK_Control_R) 1400 else if (ks == XK_Control_L || ks == XK_Control_R)
… …
1228 button_release (ev.xbutton); 1411 button_release (ev.xbutton);
1229 break; 1412 break;
1230 1413
1231 case ClientMessage: 1414 case ClientMessage:
1232 if (ev.xclient.format == 32 1415 if (ev.xclient.format == 32
1416 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1417 {
1233 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1418 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1234 destroy (); 1419 destroy ();
1420#if ENABLE_EWMH
1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1422 XSendEvent (disp, ev.xclient.window = display->root,
1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1424 &ev);
1425#endif
1426 }
1427#if ENABLE_XEMBED
1428 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1429 {
1430 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1431 focus_in ();
1432 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1433 focus_out ();
1434 }
1435#endif
1235#ifdef OFFIX_DND 1436#ifdef OFFIX_DND
1236 /* OffiX Dnd (drag 'n' drop) protocol */ 1437 /* OffiX Dnd (drag 'n' drop) protocol */
1237 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1438 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1238 && (ev.xclient.data.l[0] == DndFile 1439 && (ev.xclient.data.l[0] == DndFile
1239 || ev.xclient.data.l[0] == DndDir 1440 || ev.xclient.data.l[0] == DndDir
1240 || ev.xclient.data.l[0] == DndLink)) 1441 || ev.xclient.data.l[0] == DndLink))
1241 { 1442 {
1242 /* Get Dnd data */ 1443 /* Get Dnd data */
1243 Atom ActualType; 1444 Atom ActualType;
1244 int ActualFormat; 1445 int ActualFormat;
1245 unsigned char *data; 1446 unsigned char *data;
1246 unsigned long Size, RemainingBytes; 1447 unsigned long Size, RemainingBytes;
1247 1448
1248 XGetWindowProperty (display->display, display->root, 1449 XGetWindowProperty (disp, display->root,
1249 xa[XA_DNDSELECTION], 1450 xa[XA_DNDSELECTION],
1250 0L, 1000000L, 1451 0L, 1000000L,
1251 False, AnyPropertyType, 1452 False, AnyPropertyType,
1252 &ActualType, &ActualFormat, 1453 &ActualType, &ActualFormat,
1253 &Size, &RemainingBytes, 1454 &Size, &RemainingBytes,
1254 &data); 1455 &data);
1255 XChangeProperty (display->display, display->root, 1456 set_string_property (XA_CUT_BUFFER0, data);
1256 XA_CUT_BUFFER0, XA_STRING,
1257 8, PropModeReplace,
1258 data, STRLEN (data));
1259 XFree (data); 1457 XFree (data);
1260 selection_paste (display->root, XA_CUT_BUFFER0, True); 1458 selection_paste (display->root, XA_CUT_BUFFER0, true);
1261 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1459 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1262 } 1460 }
1263#endif /* OFFIX_DND */ 1461#endif /* OFFIX_DND */
1264 break; 1462 break;
1265 1463
1266 case MappingNotify: 1464 case MappingNotify:
… …
1291 break; 1489 break;
1292 } 1490 }
1293 break; 1491 break;
1294 1492
1295 case FocusIn: 1493 case FocusIn:
1296 if (!TermWin.focus) 1494 focus_in ();
1495 break;
1496
1497 case FocusOut:
1498 focus_out ();
1499 break;
1500
1501 case ConfigureNotify:
1502 if (ev.xconfigure.window == parent[0])
1297 { 1503 {
1298 TermWin.focus = 1; 1504 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1299 want_refresh = 1; 1505 ;
1300#ifdef USE_XIM 1506
1301 if (Input_Context != NULL) 1507 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1302 XSetICFocus (Input_Context);
1303#endif
1304#ifdef CURSOR_BLINK
1305 if (Options & Opt_cursorBlink)
1306 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1307#endif
1308#ifdef OFF_FOCUS_FADING
1309 if (rs[Rs_fade])
1310 { 1508 {
1311 PixColors = PixColorsFocused; 1509 seen_resize = 1;
1312 set_colorfgbg (); 1510 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1313 scr_clear ();
1314 scr_touch (true);
1315 } 1511 }
1316#endif
1317
1318 }
1319 break;
1320
1321 case FocusOut:
1322 if (TermWin.focus)
1323 {
1324 TermWin.focus = 0;
1325 want_refresh = 1;
1326#ifdef USE_XIM
1327 if (Input_Context != NULL)
1328 XUnsetICFocus (Input_Context);
1329#endif
1330#ifdef CURSOR_BLINK
1331 if (Options & Opt_cursorBlink)
1332 cursor_blink_ev.stop ();
1333 hidden_cursor = 0;
1334#endif
1335#ifdef OFF_FOCUS_FADING
1336 if (rs[Rs_fade])
1337 {
1338 PixColors = PixColorsUnFocused;
1339 set_colorfgbg ();
1340 scr_clear ();
1341 scr_touch (true);
1342 }
1343#endif
1344
1345 }
1346 break;
1347
1348 case ConfigureNotify:
1349 if (ev.xconfigure.window == TermWin.parent[0])
1350 {
1351 int height, width;
1352
1353 do
1354 { /* Wrap lots of configures into one */
1355 width = ev.xconfigure.width;
1356 height = ev.xconfigure.height;
1357 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1358 }
1359 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1360
1361 if (szHint.width != width || szHint.height != height)
1362 resize_all_windows (width, height, 1);
1363 1512
1364#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1513#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1365 if (Options & Opt_transparent) 1514 if (OPTION (Opt_transparent))
1366 {
1367 check_our_parents (); 1515 check_our_parents ();
1368 if (am_transparent)
1369 want_refresh = want_full_refresh = 1;
1370 }
1371#endif 1516#endif
1372 } 1517 }
1373 break; 1518 break;
1374 1519
1375 case PropertyNotify: 1520 case PropertyNotify:
… …
1383 selection_clear (); 1528 selection_clear ();
1384 break; 1529 break;
1385 1530
1386 case SelectionNotify: 1531 case SelectionNotify:
1387 if (selection_wait == Sel_normal) 1532 if (selection_wait == Sel_normal)
1388 selection_paste (ev.xselection.requestor, 1533 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1389 ev.xselection.property, True);
1390 break; 1534 break;
1391 1535
1392 case SelectionRequest: 1536 case SelectionRequest:
1393 selection_send (ev.xselectionrequest); 1537 selection_send (ev.xselectionrequest);
1394 break; 1538 break;
1395 1539
1540 case MapNotify:
1541 mapped = 1;
1542#ifdef TEXT_BLINK
1543 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1544#endif
1545 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1546 break;
1547
1396 case UnmapNotify: 1548 case UnmapNotify:
1397 TermWin.mapped = 0; 1549 mapped = 0;
1398#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1399 text_blink_ev.stop (); 1551 text_blink_ev.stop ();
1400#endif 1552#endif
1401 break; 1553 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1402
1403 case MapNotify:
1404 TermWin.mapped = 1;
1405#ifdef TEXT_BLINK
1406 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1407#endif
1408 break; 1554 break;
1409 1555
1410#ifdef TRANSPARENT 1556#ifdef TRANSPARENT
1411 case ReparentNotify: 1557 case ReparentNotify:
1412 rootwin_cb (ev); 1558 rootwin_cb (ev);
1413 break; 1559 break;
1414#endif /* TRANSPARENT */ 1560#endif /* TRANSPARENT */
1415 1561
1416 case GraphicsExpose: 1562 case GraphicsExpose:
1417 case Expose: 1563 case Expose:
1418 if (ev.xany.window == TermWin.vt) 1564 if (ev.xany.window == vt)
1419 { 1565 {
1420 do 1566 do
1421 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1422 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1423 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1424 1570
1425 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1571 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1426 1572
1427 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1573 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1428 scr_expose (ev.xexpose.x, ev.xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1429 ev.xexpose.width, ev.xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, False);
1430 1576
1431 scr_refresh (refresh_type); 1577 scr_refresh (refresh_type);
1432 } 1578 }
1433 else 1579 else
1434 { 1580 {
1435 XEvent unused_event; 1581 XEvent unused_event;
1436 1582
1437 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1583 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1438 ; 1584 ;
1439 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1585 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1440 ; 1586 ;
1441 1587
1442 if (isScrollbarWindow (ev.xany.window)) 1588 if (isScrollbarWindow (ev.xany.window))
1443 { 1589 {
1444 scrollBar.setIdle (); 1590 scrollBar.setIdle ();
… …
1448 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1594 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1449 menubar_expose (); 1595 menubar_expose ();
1450#endif 1596#endif
1451 1597
1452#ifdef TRANSPARENT 1598#ifdef TRANSPARENT
1453 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1599 if (am_transparent && ev.xany.window == parent[0])
1454 XClearWindow (display->display, ev.xany.window); 1600 XClearWindow (disp, ev.xany.window);
1455#endif 1601#endif
1456 } 1602 }
1457 break; 1603 break;
1458 1604
1459 case MotionNotify: 1605 case MotionNotify:
… …
1466 { 1612 {
1467 menubar_control (ev.xbutton); 1613 menubar_control (ev.xbutton);
1468 break; 1614 break;
1469 } 1615 }
1470#endif 1616#endif
1471 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1617 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1472 break; 1618 break;
1473 1619
1474 if (ev.xany.window == TermWin.vt) 1620 if (ev.xany.window == vt)
1475 { 1621 {
1622 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623 ; // nop
1476 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1477 { 1625 {
1478 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1479 ; 1627 ;
1480 1628
1481 XQueryPointer (display->display, TermWin.vt, 1629 XQueryPointer (disp, vt,
1482 &unused_root, &unused_child, 1630 &unused_root, &unused_child,
1483 &unused_root_x, &unused_root_y, 1631 &unused_root_x, &unused_root_y,
1484 & (ev.xbutton.x), & (ev.xbutton.y), 1632 &ev.xbutton.x, &ev.xbutton.y,
1485 &unused_mask); 1633 &ev.xbutton.state);
1486#ifdef MOUSE_THRESHOLD 1634#ifdef MOUSE_THRESHOLD
1487 /* deal with a `jumpy' mouse */ 1635 /* deal with a `jumpy' mouse */
1488 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1636 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1489 { 1637 {
1490#endif 1638#endif
1639#if ISO_14755
1640 // 5.4
1641 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1642 {
1643 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1644 break;
1645 }
1646#endif
1491 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1647 selection_extend (ev.xbutton.x, ev.xbutton.y,
1492 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1648 ev.xbutton.state & Button3Mask ? 2 : 0);
1649
1493#ifdef SELECTION_SCROLLING 1650#ifdef SELECTION_SCROLLING
1494 if (ev.xbutton.y < TermWin.int_bwidth 1651 if (ev.xbutton.y < int_bwidth
1495 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1652 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1496 { 1653 {
1497 int dist; 1654 int dist;
1498 1655
1499 /* don't clobber the current delay if we are 1656 /* don't clobber the current delay if we are
1500 * already in the middle of scrolling. 1657 * already in the middle of scrolling.
… …
1503 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1660 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1504 1661
1505 /* save the event params so we can highlight 1662 /* save the event params so we can highlight
1506 * the selection in the pending-scroll loop 1663 * the selection in the pending-scroll loop
1507 */ 1664 */
1508 selection_save_x=ev.xbutton.x; 1665 selection_save_x = ev.xbutton.x;
1509 selection_save_y=ev.xbutton.y; 1666 selection_save_y = ev.xbutton.y;
1510 selection_save_state=
1511 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1667 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1512 1668
1513 /* calc number of lines to scroll */ 1669 /* calc number of lines to scroll */
1514 if (ev.xbutton.y<TermWin.int_bwidth) 1670 if (ev.xbutton.y < int_bwidth)
1515 { 1671 {
1516 scroll_selection_dir = UP; 1672 scroll_selection_dir = UP;
1517 dist = TermWin.int_bwidth - ev.xbutton.y; 1673 dist = int_bwidth - ev.xbutton.y;
1518 } 1674 }
1519 else 1675 else
1520 { 1676 {
1521 scroll_selection_dir = DN; 1677 scroll_selection_dir = DN;
1522 dist = ev.xbutton.y - 1678 dist = ev.xbutton.y - (int_bwidth + height);
1523 (TermWin.int_bwidth + TermWin.height);
1524 } 1679 }
1680
1525 scroll_selection_lines= (Pixel2Height (dist)/ 1681 scroll_selection_lines = Pixel2Height (dist)
1526 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1682 / SELECTION_SCROLL_LINE_SPEEDUP
1683 + 1;
1527 MIN_IT (scroll_selection_lines, 1684 min_it (scroll_selection_lines,
1528 SELECTION_SCROLL_MAX_LINES); 1685 SELECTION_SCROLL_MAX_LINES);
1529 } 1686 }
1530 else 1687 else
1531 { 1688 {
1532 /* we are within the text window, so we 1689 /* we are within the text window, so we
1533 * shouldn't be scrolling 1690 * shouldn't be scrolling
… …
1535 if (sel_scroll_ev.active) 1692 if (sel_scroll_ev.active)
1536 sel_scroll_ev.stop(); 1693 sel_scroll_ev.stop();
1537 } 1694 }
1538#endif 1695#endif
1539#ifdef MOUSE_THRESHOLD 1696#ifdef MOUSE_THRESHOLD
1540
1541 } 1697 }
1542#endif 1698#endif
1543
1544 } 1699 }
1545 } 1700 }
1546 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1701 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1547 { 1702 {
1548 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1703 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1549 MotionNotify, &ev)) ; 1704 MotionNotify, &ev))
1705 ;
1706
1550 XQueryPointer (display->display, scrollBar.win, 1707 XQueryPointer (disp, scrollBar.win,
1551 &unused_root, &unused_child, 1708 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1709 &unused_root_x, &unused_root_y,
1553 & (ev.xbutton.x), & (ev.xbutton.y), 1710 &ev.xbutton.x, &ev.xbutton.y,
1554 &unused_mask); 1711 &unused_mask);
1555 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1712 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1556 scrollbar_size ()); 1713 scrollbar_size ());
1557 scr_refresh (refresh_type); 1714 scr_refresh (refresh_type);
1558 refresh_limit = 0; 1715 refresh_limit = 0;
1559 scrollbar_show (1); 1716 scrollbar_show (1);
1560 } 1717 }
1561 break; 1718 break;
1562 } 1719 }
1720
1721skip_switch: ;
1722
1723#if defined(CURSOR_BLINK)
1724 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1725 {
1726 if (hidden_cursor)
1727 {
1728 hidden_cursor = 0;
1729 want_refresh = 1;
1730 }
1731
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1733 }
1734#endif
1735
1736#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 {
1739 if (ev.type == MotionNotify
1740 || ev.type == ButtonPress
1741 || ev.type == ButtonRelease)
1742 if (hidden_pointer)
1743 pointer_unblank ();
1744
1745 if (ev.type == KeyPress && hidden_pointer == 0)
1746 pointer_blank ();
1747 }
1748#endif
1749}
1750
1751void
1752rxvt_term::focus_in ()
1753{
1754 if (!focus)
1755 {
1756 focus = 1;
1757 want_refresh = 1;
1758
1759 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1760
1761#if USE_XIM
1762 if (Input_Context != NULL)
1763 {
1764 IMSetStatusPosition ();
1765 XSetICFocus (Input_Context);
1766 }
1767#endif
1768#if CURSOR_BLINK
1769 if (OPTION (Opt_cursorBlink))
1770 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1771#endif
1772#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade])
1774 {
1775 pix_colors = pix_colors_focused;
1776 scr_recolour ();
1777 }
1778#endif
1779 }
1780}
1781
1782void
1783rxvt_term::focus_out ()
1784{
1785 if (focus)
1786 {
1787 focus = 0;
1788 want_refresh = 1;
1789
1790 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1791
1792#if ENABLE_FRILLS || ISO_14755
1793 if (iso14755buf)
1794 {
1795 iso14755buf = 0;
1796# if ENABLE_OVERLAY
1797 scr_overlay_off ();
1798# endif
1799 }
1800#endif
1801#if USE_XIM
1802 if (Input_Context != NULL)
1803 XUnsetICFocus (Input_Context);
1804#endif
1805#if CURSOR_BLINK
1806 if (OPTION (Opt_cursorBlink))
1807 cursor_blink_ev.stop ();
1808 hidden_cursor = 0;
1809#endif
1810#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade])
1812 {
1813 pix_colors = pix_colors_unfocused;
1814 scr_recolour ();
1815 }
1816#endif
1817 }
1563} 1818}
1564 1819
1565#if TRANSPARENT 1820#if TRANSPARENT
1566void 1821void
1567rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
… …
1574 case PropertyNotify: 1829 case PropertyNotify:
1575 /* 1830 /*
1576 * if user used some Esetroot compatible prog to set the root bg, 1831 * if user used some Esetroot compatible prog to set the root bg,
1577 * use the property to determine the pixmap. We use it later on. 1832 * use the property to determine the pixmap. We use it later on.
1578 */ 1833 */
1579 if (xa[XA_XROOTPMAPID] == 0)
1580 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1581
1582 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1834 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1835 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1583 return; 1836 return;
1584 1837
1585 /* FALLTHROUGH */ 1838 /* FALLTHROUGH */
1586 case ReparentNotify: 1839 case ReparentNotify:
1587 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1840 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1588 want_refresh = want_full_refresh = 1; 1841 want_refresh = want_full_refresh = 1;
1589 break; 1842 break;
1590 } 1843 }
1591} 1844}
1592#endif 1845#endif
… …
1595rxvt_term::button_press (XButtonEvent &ev) 1848rxvt_term::button_press (XButtonEvent &ev)
1596{ 1849{
1597 int reportmode = 0, clickintime; 1850 int reportmode = 0, clickintime;
1598 1851
1599 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1852 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1853
1600 if (!bypass_keystate) 1854 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1855 reportmode = !! (priv_modes & PrivMode_mouse_report);
1856
1602 /* 1857 /*
1603 * VT window processing of button press 1858 * VT window processing of button press
1604 */ 1859 */
1605 if (ev.window == TermWin.vt) 1860 if (ev.window == vt)
1606 { 1861 {
1862#if ISO_14755
1863 // 5.4
1864 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1865 {
1866 iso14755_54 (ev.x, ev.y);
1867 return;
1868 }
1869#endif
1870
1607 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1871 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1872
1608 if (reportmode) 1873 if (reportmode)
1609 { 1874 {
1610 /* mouse report from vt window */ 1875 /* mouse report from vt window */
1611 /* save the xbutton state (for ButtonRelease) */ 1876 /* save the xbutton state (for ButtonRelease) */
1612 MEvent.state = ev.state; 1877 MEvent.state = ev.state;
1613#ifdef MOUSE_REPORT_DOUBLECLICK 1878#ifdef MOUSE_REPORT_DOUBLECLICK
1614 if (ev.button == MEvent.button && clickintime) 1879 if (ev.button == MEvent.button && clickintime)
1615 { 1880 {
1616 /* same button, within alloted time */ 1881 /* same button, within alloted time */
1617 MEvent.clicks++; 1882 MEvent.clicks++;
1883
1618 if (MEvent.clicks > 1) 1884 if (MEvent.clicks > 1)
1619 { 1885 {
1620 /* only report double clicks */ 1886 /* only report double clicks */
1621 MEvent.clicks = 2; 1887 MEvent.clicks = 2;
1622 mouse_report (ev); 1888 mouse_report (ev);
… …
1641 } 1907 }
1642 else 1908 else
1643 { 1909 {
1644 if (ev.button != MEvent.button) 1910 if (ev.button != MEvent.button)
1645 MEvent.clicks = 0; 1911 MEvent.clicks = 0;
1912
1913 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1646 switch (ev.button) 1914 switch (ev.button)
1647 { 1915 {
1648 case Button1: 1916 case Button1:
1917 /* allow meta + click to select rectangular areas */
1918 /* should be done in screen.C */
1919#if ENABLE_FRILLS
1920 selection.rect = !!(ev.state & ModMetaMask);
1921#else
1922 selection.rect = false;
1923#endif
1924
1649 /* allow shift+left click to extend selection */ 1925 /* allow shift+left click to extend selection */
1650 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1926 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1651 { 1927 {
1652 if (MEvent.button == Button1 && clickintime) 1928 if (MEvent.button == Button1 && clickintime)
1653 selection_rotate (ev.x, ev.y); 1929 selection_rotate (ev.x, ev.y);
1654 else 1930 else
1655 selection_extend (ev.x, ev.y, 1); 1931 selection_extend (ev.x, ev.y, 1);
1656 } 1932 }
1657 else 1933 else
1658 { 1934 {
1659 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1660 MEvent.clicks++; 1936 MEvent.clicks++;
1661 else 1937 else
1662 MEvent.clicks = 1; 1938 MEvent.clicks = 1;
1663 1939
1664 selection_click (MEvent.clicks, ev.x, ev.y); 1940 selection_click (MEvent.clicks, ev.x, ev.y);
1665 } 1941 }
1666 1942
1667 MEvent.button = Button1; 1943 MEvent.button = Button1;
1668 break; 1944 break;
1669 1945
1670 case Button3: 1946 case Button3:
1671 if (MEvent.button == Button3 && clickintime) 1947 if (MEvent.button == Button3 && clickintime)
1672 selection_rotate (ev.x, ev.y); 1948 selection_rotate (ev.x, ev.y);
1673 else 1949 else
1674 selection_extend (ev.x, ev.y, 1); 1950 selection_extend (ev.x, ev.y, 1);
1951
1675 MEvent.button = Button3; 1952 MEvent.button = Button3;
1676 break; 1953 break;
1677 } 1954 }
1678 } 1955 }
1956
1679 MEvent.time = ev.time; 1957 MEvent.time = ev.time;
1680 return; 1958 return;
1681 } 1959 }
1682 1960
1683 /* 1961 /*
… …
1794 case Button3: 2072 case Button3:
1795 if (scrollBar.style != R_SB_XTERM) 2073 if (scrollBar.style != R_SB_XTERM)
1796 { 2074 {
1797 if (scrollbar_above_slider (ev.y)) 2075 if (scrollbar_above_slider (ev.y))
1798# ifdef RXVT_SCROLL_FULL 2076# ifdef RXVT_SCROLL_FULL
1799 scr_page (UP, TermWin.nrow - 1); 2077 scr_page (UP, nrow - 1);
1800# else 2078# else
1801 scr_page (UP, TermWin.nrow / 4); 2079 scr_page (UP, nrow / 4);
1802# endif 2080# endif
1803 else if (scrollbar_below_slider (ev.y)) 2081 else if (scrollbar_below_slider (ev.y))
1804# ifdef RXVT_SCROLL_FULL 2082# ifdef RXVT_SCROLL_FULL
1805 scr_page (DN, TermWin.nrow - 1); 2083 scr_page (DN, nrow - 1);
1806# else 2084# else
1807 scr_page (DN, TermWin.nrow / 4); 2085 scr_page (DN, nrow / 4);
1808# endif 2086# endif
1809 else 2087 else
1810 scrollBar.setMotion (); 2088 scrollBar.setMotion ();
1811 } 2089 }
1812 else 2090 else
1813 { 2091 {
1814 scr_page ((ev.button == Button1 ? DN : UP), 2092 scr_page ((ev.button == Button1 ? DN : UP),
1815 (TermWin.nrow 2093 (nrow
1816 * scrollbar_position (ev.y) 2094 * scrollbar_position (ev.y)
1817 / scrollbar_size ())); 2095 / scrollbar_size ()));
1818 } 2096 }
1819 2097
1820 break; 2098 break;
1821 } 2099 }
1822 } 2100 }
2101
1823 return; 2102 return;
1824 } 2103 }
2104
1825#if MENUBAR 2105#if MENUBAR
1826 /* 2106 /*
1827 * Menubar window processing of button press 2107 * Menubar window processing of button press
1828 */ 2108 */
1829 if (isMenuBarWindow (ev.window)) 2109 if (isMenuBarWindow (ev.window))
… …
1836{ 2116{
1837 int reportmode = 0; 2117 int reportmode = 0;
1838 2118
1839 csrO = 0; /* reset csr Offset */ 2119 csrO = 0; /* reset csr Offset */
1840 if (!bypass_keystate) 2120 if (!bypass_keystate)
1841 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2121 reportmode = !! (priv_modes & PrivMode_mouse_report);
1842 2122
1843 if (scrollbar_isUpDn ()) 2123 if (scrollbar_isUpDn ())
1844 { 2124 {
1845 scrollBar.setIdle (); 2125 scrollBar.setIdle ();
1846 scrollbar_show (0); 2126 scrollbar_show (0);
1847#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2127#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1848 refresh_type &= ~SMOOTH_REFRESH; 2128 refresh_type &= ~SMOOTH_REFRESH;
1849#endif 2129#endif
1850
1851 } 2130 }
2131
1852#ifdef SELECTION_SCROLLING 2132#ifdef SELECTION_SCROLLING
1853 if (sel_scroll_ev.active) 2133 if (sel_scroll_ev.active)
1854 sel_scroll_ev.stop(); 2134 sel_scroll_ev.stop();
1855#endif 2135#endif
2136
1856 if (ev.window == TermWin.vt) 2137 if (ev.window == vt)
1857 { 2138 {
2139#if ISO_14755
2140 // 5.4
2141 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2142 return;
2143#endif
1858 if (reportmode) 2144 if (reportmode)
1859 { 2145 {
1860 /* mouse report from vt window */ 2146 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */ 2147 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4) 2148 if (ev.button >= 4)
… …
1876 MEvent.button = AnyButton; 2162 MEvent.button = AnyButton;
1877 mouse_report (ev); 2163 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2164#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2165 return;
1880 } 2166 }
2167
1881 /* 2168 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2169 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2170 * when overriding mouse reporting
1884 */ 2171 */
1885 if (PrivateModes & PrivMode_mouse_report 2172 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2173 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2174 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2175 selection_extend (ev.x, ev.y, 0);
2176
2177 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2178 return;
1889 2179
1890 switch (ev.button) 2180 switch (ev.button)
1891 { 2181 {
1892 case Button1: 2182 case Button1:
1893 case Button3: 2183 case Button3:
… …
1905 2195
1906 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
1907 2197
1908 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
1909 i = 1; 2199 i = 1;
1910 else if (Options & Opt_mouseWheelScrollPage) 2200 else if (OPTION (Opt_mouseWheelScrollPage))
1911 i = TermWin.nrow - 1; 2201 i = nrow - 1;
1912 else 2202 else
1913 i = 5; 2203 i = 5;
1914 2204
1915# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
1916 if (ev.state & ControlMask) 2206 if (ev.state & ControlMask)
1917 { 2207 {
1918 mouse_slip_wheel_speed += v ? -1 : 1; 2208 mouse_slip_wheel_speed += v ? -1 : 1;
1919 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;
1920 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2210 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1921 2211
1922 if (slip_wheel_ev.at < NOW) 2212 if (slip_wheel_ev.at < NOW)
1923 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2213 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1924 2214
1925 slip_wheel_ev.start (); 2215 slip_wheel_ev.start ();
… …
1966 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2256 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1967 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2257 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1968 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2258 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1969 int i; 2259 int i;
1970 2260
1971 Visual* visual = display->visual; 2261 Visual *visual = display->visual;
1972 2262
1973 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2263 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1974 2264
1975 /* for convenience */ 2265 /* for convenience */
1976 mask_r = visual->red_mask; 2266 mask_r = visual->red_mask;
… …
2197 Atom atype; 2487 Atom atype;
2198 unsigned char *prop = NULL; 2488 unsigned char *prop = NULL;
2199 Window root, oldp, *list; 2489 Window root, oldp, *list;
2200 Pixmap rootpixmap = None; 2490 Pixmap rootpixmap = None;
2201 XWindowAttributes wattr, wrootattr; 2491 XWindowAttributes wattr, wrootattr;
2492 dDisp;
2202 2493
2203 pchanged = 0; 2494 pchanged = 0;
2204 2495
2205 if (!(Options & Opt_transparent)) 2496 if (!OPTION (Opt_transparent))
2206 return pchanged; /* Don't try any more */ 2497 return pchanged; /* Don't try any more */
2207 2498
2208 XGetWindowAttributes (display->display, display->root, &wrootattr); 2499 XGetWindowAttributes (disp, display->root, &wrootattr);
2209 rootdepth = wrootattr.depth; 2500 rootdepth = wrootattr.depth;
2210 2501
2211 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2502 XGetWindowAttributes (disp, parent[0], &wattr);
2212 2503
2213 if (rootdepth != wattr.depth) 2504 if (rootdepth != wattr.depth)
2214 { 2505 {
2215 if (am_transparent) 2506 if (am_transparent)
2216 { 2507 {
2217 pchanged = 1; 2508 pchanged = 1;
2218 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2509 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2219 am_transparent = am_pixmap_trans = 0; 2510 am_transparent = am_pixmap_trans = 0;
2220 } 2511 }
2221 2512
2222 return pchanged; /* Don't try any more */ 2513 return pchanged; /* Don't try any more */
2223 } 2514 }
2224 2515
2225 /* Get all X ops out of the queue so that our information is up-to-date. */ 2516 /* Get all X ops out of the queue so that our information is up-to-date. */
2226 XSync (display->display, False); 2517 XSync (disp, False);
2227 2518
2228 /* 2519 /*
2229 * Make the frame window set by the window manager have 2520 * Make the frame window set by the window manager have
2230 * the root background. Some window managers put multiple nested frame 2521 * the root background. Some window managers put multiple nested frame
2231 * windows for each client, so we have to take care about that. 2522 * windows for each client, so we have to take care about that.
2232 */ 2523 */
2233 i = (xa[XA_XROOTPMAPID] 2524 i = (xa[XA_XROOTPMAP_ID]
2234 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2525 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2235 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2526 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2236 &nitems, &bytes_after, &prop) == Success); 2527 &nitems, &bytes_after, &prop) == Success);
2237 2528
2238 if (!i || prop == NULL) 2529 if (!i || prop == NULL)
2239 i = (xa[XA_XSETROOTID] 2530 i = (xa[XA_ESETROOT_PMAP_ID]
2240 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2531 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2241 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2532 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2242 &nitems, &bytes_after, &prop) == Success); 2533 &nitems, &bytes_after, &prop) == Success);
2243 2534
2244 if (!i || prop == NULL 2535 if (!i || prop == NULL
2245#if TINTING 2536#if TINTING
… …
2264 Window cr; 2555 Window cr;
2265 XImage *image; 2556 XImage *image;
2266 GC gc; 2557 GC gc;
2267 XGCValues gcvalue; 2558 XGCValues gcvalue;
2268 2559
2269 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2560 XTranslateCoordinates (disp, parent[0], display->root,
2270 0, 0, &sx, &sy, &cr); 2561 0, 0, &sx, &sy, &cr);
2271 nw = (unsigned int)szHint.width; 2562 nw = (unsigned int)szHint.width;
2272 nh = (unsigned int)szHint.height; 2563 nh = (unsigned int)szHint.height;
2273 nx = ny = 0; 2564 nx = ny = 0;
2274 2565
… …
2284 nh += sy; 2575 nh += sy;
2285 ny = -sy; 2576 ny = -sy;
2286 sy = 0; 2577 sy = 0;
2287 } 2578 }
2288 2579
2289 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2580 min_it (nw, (unsigned int) (wrootattr.width - sx));
2290 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2581 min_it (nh, (unsigned int) (wrootattr.height - sy));
2582
2583 XSync (disp, False);
2291 allowedxerror = -1; 2584 allowedxerror = -1;
2292 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2585 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2293 2586
2294 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2587 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2295 /* XXX: may need a delay here? */ 2588 /* XXX: may need a delay here? */
2296 allowedxerror = 0; 2589 allowedxerror = 0;
2297 2590
2298 if (image == NULL) 2591 if (image == NULL)
2299 { 2592 {
2300 if (am_transparent && am_pixmap_trans) 2593 if (am_transparent && am_pixmap_trans)
2301 { 2594 {
2302 pchanged = 1; 2595 pchanged = 1;
2303 if (TermWin.pixmap != None) 2596 if (pixmap != None)
2304 { 2597 {
2305 XFreePixmap (display->display, TermWin.pixmap); 2598 XFreePixmap (disp, pixmap);
2306 TermWin.pixmap = None; 2599 pixmap = None;
2307 } 2600 }
2308 } 2601 }
2309 2602
2310 am_pixmap_trans = 0; 2603 am_pixmap_trans = 0;
2311 } 2604 }
2312 else 2605 else
2313 { 2606 {
2314 if (TermWin.pixmap != None) 2607 if (pixmap != None)
2315 XFreePixmap (display->display, TermWin.pixmap); 2608 XFreePixmap (disp, pixmap);
2316 2609
2317#if TINTING 2610#if TINTING
2318 if (ISSET_PIXCOLOR (Color_tint)) 2611 if (ISSET_PIXCOLOR (Color_tint))
2319 { 2612 {
2320 unsigned short rm, gm, bm; 2613 unsigned short rm, gm, bm;
2321 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2614 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2322 2615
2323 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2616 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2324 2617
2325 ShadeXImage (display, image, shade, rm, gm, bm); 2618 ShadeXImage (display, image, shade, rm, gm, bm);
2326 } 2619 }
2327#endif 2620#endif
2328 2621
2329 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2622 pixmap = XCreatePixmap (disp, vt,
2330 szHint.width, szHint.height, image->depth); 2623 szHint.width, szHint.height, image->depth);
2331 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2624 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2332 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2625 XPutImage (disp, pixmap, gc, image, 0, 0,
2333 nx, ny, image->width, image->height); 2626 nx, ny, image->width, image->height);
2334 XFreeGC (display->display, gc); 2627 XFreeGC (disp, gc);
2335 XDestroyImage (image); 2628 XDestroyImage (image);
2336 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2629 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2337 XClearWindow (display->display, TermWin.parent[0]); 2630 XClearWindow (disp, parent[0]);
2338 2631
2339 if (!am_transparent || !am_pixmap_trans) 2632 if (!am_transparent || !am_pixmap_trans)
2340 pchanged = 1; 2633 pchanged = 1;
2341 2634
2342 am_transparent = am_pixmap_trans = 1; 2635 am_transparent = am_pixmap_trans = 1;
2343 } 2636 }
2344 } 2637 }
2345 2638
2346 if (!am_pixmap_trans) 2639 if (am_pixmap_trans)
2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2641 else
2347 { 2642 {
2348 unsigned int n; 2643 unsigned int n;
2349 /* 2644 /*
2350 * InheritPixmap transparency 2645 * InheritPixmap transparency
2351 */ 2646 */
2352 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2353 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2647 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2354 { 2648 {
2355 oldp = TermWin.parent[i]; 2649 oldp = parent[i];
2356 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2650 XQueryTree (disp, parent[i - 1], &root,
2357 &TermWin.parent[i], &list, &n); 2651 &parent[i], &list, &n);
2358 XFree (list); 2652 XFree (list);
2359 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2360 2653
2361 if (TermWin.parent[i] == display->root) 2654 if (parent[i] == display->root)
2362 { 2655 {
2363 if (oldp != None) 2656 if (oldp != None)
2364 pchanged = 1; 2657 pchanged = 1;
2365 2658
2366 break; 2659 break;
2367 } 2660 }
2368 2661
2369 if (oldp != TermWin.parent[i]) 2662 if (oldp != parent[i])
2370 pchanged = 1; 2663 pchanged = 1;
2371 } 2664 }
2372 2665
2373 n = 0; 2666 n = 0;
2374 2667
2375 if (pchanged) 2668 if (pchanged)
2376 { 2669 {
2377 for (; n < (unsigned int)i; n++) 2670 for (; n < (unsigned int)i; n++)
2378 { 2671 {
2379 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2672 XGetWindowAttributes (disp, parent[n], &wattr);
2380 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2381 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2673 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2382 { 2674 {
2383 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2675 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2384 break; 2676 break;
2385 } 2677 }
2386 } 2678 }
2387 } 2679 }
2388 2680
2389 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2681 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2390 { 2682 {
2391 D_X ((stderr, "InheritPixmap Turning off"));
2392 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2683 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2393 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2684 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2394 am_transparent = 0; 2685 am_transparent = 0;
2395 /* XXX: also turn off Opt_transparent? */ 2686 /* XXX: also turn off Opt_transparent? */
2396 } 2687 }
2397 else 2688 else
2398 { 2689 {
2399#if WAIT_FOR_WM 2690#if WAIT_FOR_WM
2400 /* wait (an arbitrary period) for the WM to do its thing 2691 /* wait (an arbitrary period) for the WM to do its thing
2401 * needed for fvwm2.2.2 (and before?) */ 2692 * needed for fvwm2.2.2 (and before?) */
2402 sleep (1); 2693 sleep (1);
2403#endif 2694#endif
2404 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2405 for (n = 0; n < (unsigned int)i; n++) 2695 for (n = 0; n < (unsigned int)i; n++)
2406 { 2696 {
2407 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2697 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2408 XClearWindow (display->display, TermWin.parent[n]); 2698 XClearWindow (disp, parent[n]);
2409 } 2699 }
2410 2700
2411 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2701 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2412 am_transparent = 1; 2702 am_transparent = 1;
2413 } 2703 }
2414 2704
2415 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2705 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2416 TermWin.parent[i] = None; 2706 parent[i] = None;
2417 } 2707 }
2418 2708
2419 // this is experimental
2420 if (scrollBar.win) 2709 if (scrollBar.win)
2421 { 2710 {
2422 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2711 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2423 XClearWindow (display->display, scrollBar.win);
2424 scrollBar.setIdle (); 2712 scrollBar.setIdle ();
2425 scrollbar_show (0); 2713 scrollbar_show (0);
2426 } 2714 }
2427 2715
2716 if (am_transparent)
2717 {
2718 want_refresh = want_full_refresh = 1;
2719 if (am_pixmap_trans)
2720 flush ();
2721 }
2722
2428 return pchanged; 2723 return pchanged;
2429} 2724}
2430#endif 2725#endif
2431 2726
2432/*}}} */ 2727/*}}} */
2433 2728
2434bool 2729bool
2435rxvt_term::cmd_parse () 2730rxvt_term::cmd_parse ()
2436{ 2731{
2437 bool flag = false; 2732 bool flag = false;
2438 unicode_t ch = NOCHAR; 2733 wchar_t ch = NOCHAR;
2439 unsigned char *seq_begin; // remember start of esc-sequence here 2734 char *seq_begin; // remember start of esc-sequence here
2440 2735
2441 for (;;) 2736 for (;;)
2442 { 2737 {
2443 if (ch == NOCHAR) 2738 if (ch == NOCHAR)
2444 { 2739 {
2445 seq_begin = cmdbuf_ptr; 2740 seq_begin = cmdbuf_ptr;
2446 ch = next_char (); 2741 ch = next_char ();
2447 }
2448 2742
2449 if (ch == NOCHAR) // TODO: improve 2743 if (ch == NOCHAR)
2450 break; 2744 break;
2745 }
2451 2746
2452 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2747 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2453 { 2748 {
2749 if (!seen_input)
2750 {
2751 seen_input = 1;
2752 // many badly-written programs (e.g. jed) contain a race condition:
2753 // they first read the screensize and then install a SIGWINCH handler.
2754 // some window managers resize the window early, and these programs
2755 // then sometimes get the size wrong.
2756 // unfortunately other programs are even more buggy and dislike
2757 // being sent SIGWINCH, so only do it when we were in fact being
2758 // resized.
2759 if (seen_resize && cmd_pid)
2760 kill (-cmd_pid, SIGWINCH);
2761 }
2762
2454 /* Read a text string from the input buffer */ 2763 /* Read a text string from the input buffer */
2455 unicode_t buf[UBUFSIZ]; 2764 wchar_t buf[UBUFSIZ];
2456 bool refreshnow = false; 2765 bool refreshnow = false;
2457 int nlines = 0; 2766 int nlines = 0;
2458 unicode_t *str = buf; 2767 wchar_t *str = buf;
2768 wchar_t *eol = str + min (ncol, UBUFSIZ);
2459 2769
2460 for (;;) 2770 for (;;)
2461 { 2771 {
2462 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2772 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2463 break; 2773 break;
2464 2774
2465 *str++ = ch; 2775 *str++ = ch;
2466 2776
2467 if (ch == C0_LF) 2777 if (ch == C0_LF || str >= eol)
2468 { 2778 {
2779 if (ch == C0_LF)
2469 nlines++; 2780 nlines++;
2781
2470 refresh_count++; 2782 refresh_count++;
2471 2783
2472 if (!(Options & Opt_jumpScroll) 2784 if (!OPTION (Opt_jumpScroll)
2473 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2785 || (refresh_count >= refresh_limit * (nrow - 1)))
2474 { 2786 {
2475 refreshnow = true; 2787 refreshnow = true;
2788 refresh_count = 0;
2476 ch = NOCHAR; 2789 ch = NOCHAR;
2477 break; 2790 break;
2478 } 2791 }
2479 2792
2480 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2793 // scr_add_lines only works for nlines <= nrow - 1.
2481 if (nlines >= TermWin.nrow - 1) 2794 if (nlines >= nrow - 1)
2482 { 2795 {
2796 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2483 scr_add_lines (buf, nlines, str - buf); 2797 scr_add_lines (buf, str - buf, nlines);
2798
2484 nlines = 0; 2799 nlines = 0;
2485 str = buf; 2800 str = buf;
2801 eol = str + min (ncol, UBUFSIZ);
2486 } 2802 }
2487 }
2488 2803
2489 if (str >= buf + UBUFSIZ) 2804 if (str >= eol)
2490 { 2805 {
2806 if (eol >= buf + UBUFSIZ)
2807 {
2491 ch = NOCHAR; 2808 ch = NOCHAR;
2492 break; 2809 break;
2810 }
2811 else
2812 eol = min (eol + ncol, buf + UBUFSIZ);
2813 }
2814
2493 } 2815 }
2494 2816
2495 seq_begin = cmdbuf_ptr; 2817 seq_begin = cmdbuf_ptr;
2496 ch = next_char (); 2818 ch = next_char ();
2497 } 2819 }
2498 2820
2821 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2499 scr_add_lines (buf, nlines, str - buf); 2822 scr_add_lines (buf, str - buf, nlines);
2500 2823
2501 /* 2824 /*
2502 * If there have been a lot of new lines, then update the screen 2825 * If there have been a lot of new lines, then update the screen
2503 * What the heck I'll cheat and only refresh less than every page-full. 2826 * What the heck I'll cheat and only refresh less than every page-full.
2504 * the number of pages between refreshes is refresh_limit, which 2827 * the number of pages between refreshes is refresh_limit, which
2505 * is incremented here because we must be doing flat-out scrolling. 2828 * is incremented here because we must be doing flat-out scrolling.
2506 */ 2829 */
2507 if (refreshnow) 2830 if (refreshnow)
2508 { 2831 {
2509 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2832 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2510 refresh_limit++; 2833 refresh_limit++;
2511 else 2834 else
2512 { 2835 {
2513 flag = true; 2836 flag = true;
2514 scr_refresh (refresh_type); 2837 scr_refresh (refresh_type);
2838 flush_ev.stop ();
2515 } 2839 }
2516 } 2840 }
2517 2841
2518 } 2842 }
2519 else 2843 else
… …
2534 } 2858 }
2535 2859
2536 return flag; 2860 return flag;
2537} 2861}
2538 2862
2539// read the next octet
2540unicode_t
2541rxvt_term::next_octet ()
2542{
2543 return cmdbuf_ptr < cmdbuf_endp
2544 ? *cmdbuf_ptr++
2545 : NOCHAR;
2546}
2547
2548// read the next character 2863// read the next character
2549unicode_t 2864wchar_t
2550rxvt_term::next_char () 2865rxvt_term::next_char ()
2551{ 2866{
2552 while (cmdbuf_ptr < cmdbuf_endp) 2867 while (cmdbuf_ptr < cmdbuf_endp)
2553 { 2868 {
2554 // assume 7-bit to be ascii ALWAYS 2869 // assume 7-bit to be ascii ALWAYS
2555 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2870 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2556 return *cmdbuf_ptr++; 2871 return *cmdbuf_ptr++;
2557 2872
2558 wchar_t wc; 2873 wchar_t wc;
2559 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2874 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2560 2875
2561 if (len == (size_t)-2) 2876 if (len == (size_t)-2)
2562 { 2877 {
2563 // the mbstate stores incomplete sequences. didn't know this :/ 2878 // the mbstate stores incomplete sequences. didn't know this :/
2564 cmdbuf_ptr = cmdbuf_endp; 2879 cmdbuf_ptr = cmdbuf_endp;
2565 break; 2880 break;
2566 } 2881 }
2567 2882
2568 if (len == (size_t)-1) 2883 if (len == (size_t)-1)
2569 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2884 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2570 2885
2571 // assume wchar == unicode 2886 // assume wchar == unicode
2572 cmdbuf_ptr += len; 2887 cmdbuf_ptr += len;
2573 return wc; 2888 return wc & UNICODE_MASK;
2574 } 2889 }
2575 2890
2576 return NOCHAR; 2891 return NOCHAR;
2892}
2893
2894// read the next octet
2895uint32_t
2896rxvt_term::next_octet ()
2897{
2898 return cmdbuf_ptr < cmdbuf_endp
2899 ? (unsigned char)*cmdbuf_ptr++
2900 : NOCHAR;
2577} 2901}
2578 2902
2579/* rxvt_cmd_getc () - Return next input character */ 2903/* rxvt_cmd_getc () - Return next input character */
2580/* 2904/*
2581 * Return the next input character after first passing any keyboard input 2905 * Return the next input character after first passing any keyboard input
2582 * to the command. 2906 * to the command.
2583 */ 2907 */
2584unicode_t 2908wchar_t
2585rxvt_term::cmd_getc () 2909rxvt_term::cmd_getc ()
2586{ 2910{
2587 unicode_t c = next_char (); 2911 wchar_t c = next_char ();
2588 2912
2589 if (c == NOCHAR) 2913 if (c == NOCHAR)
2590 throw out_of_input; 2914 throw out_of_input;
2591 2915
2592 return c; 2916 return c;
2593} 2917}
2594 2918
2595unicode_t 2919uint32_t
2596rxvt_term::cmd_get8 () 2920rxvt_term::cmd_get8 ()
2597{ 2921{
2598 unicode_t c = next_octet (); 2922 uint32_t c = next_octet ();
2599 2923
2600 if (c == NOCHAR) 2924 if (c == NOCHAR)
2601 throw out_of_input; 2925 throw out_of_input;
2602 2926
2603 return c; 2927 return c;
… …
2703 case C0_ESC: 3027 case C0_ESC:
2704 process_escape_seq (); 3028 process_escape_seq ();
2705 break; 3029 break;
2706 case C0_ENQ: /* terminal Status */ 3030 case C0_ENQ: /* terminal Status */
2707 if (rs[Rs_answerbackstring]) 3031 if (rs[Rs_answerbackstring])
2708 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3032 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2709 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2710 else 3033 else
2711 tt_write ((unsigned char *)VT100_ANS, 3034 tt_write (VT100_ANS, strlen (VT100_ANS));
2712 (unsigned int)STRLEN (VT100_ANS));
2713 break; 3035 break;
2714 case C0_BEL: /* bell */ 3036 case C0_BEL: /* bell */
2715 scr_bell (); 3037 scr_bell ();
2716 break; 3038 break;
2717 case C0_BS: /* backspace */ 3039 case C0_BS: /* backspace */
… …
2816void 3138void
2817rxvt_term::process_escape_seq () 3139rxvt_term::process_escape_seq ()
2818{ 3140{
2819 unicode_t ch = cmd_getc (); 3141 unicode_t ch = cmd_getc ();
2820 3142
2821 if (PrivateModes & PrivMode_vt52) 3143 if (priv_modes & PrivMode_vt52)
2822 { 3144 {
2823 process_escape_vt52 (ch); 3145 process_escape_vt52 (ch);
2824 return; 3146 return;
2825 } 3147 }
2826 3148
… …
2841 scr_charset_set (2, (unsigned int)cmd_getc ()); 3163 scr_charset_set (2, (unsigned int)cmd_getc ());
2842 break; 3164 break;
2843 case '+': 3165 case '+':
2844 scr_charset_set (3, (unsigned int)cmd_getc ()); 3166 scr_charset_set (3, (unsigned int)cmd_getc ());
2845 break; 3167 break;
2846#ifndef NO_FRILLS 3168#if ENABLE_FRILLS
2847 case '6': 3169 case '6':
2848 scr_backindex (); 3170 scr_backindex ();
2849 break; 3171 break;
2850#endif 3172#endif
2851 case '7': 3173 case '7':
2852 scr_cursor (SAVE); 3174 scr_cursor (SAVE);
2853 break; 3175 break;
2854 case '8': 3176 case '8':
2855 scr_cursor (RESTORE); 3177 scr_cursor (RESTORE);
2856 break; 3178 break;
2857#ifndef NO_FRILLS 3179#if ENABLE_FRILLS
2858 case '9': 3180 case '9':
2859 scr_forwardindex (); 3181 scr_forwardindex ();
2860 break; 3182 break;
2861#endif 3183#endif
2862 case '=': 3184 case '=':
… …
2872 break; 3194 break;
2873 3195
2874 /* 8.3.87: NEXT LINE */ 3196 /* 8.3.87: NEXT LINE */
2875 case C1_NEL: /* ESC E */ 3197 case C1_NEL: /* ESC E */
2876 { 3198 {
2877 unicode_t nlcr[] = { C0_LF, C0_CR }; 3199 wchar_t nlcr[] = { C0_LF, C0_CR };
2878 scr_add_lines (nlcr, 1, 2); 3200 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2879 } 3201 }
2880 break; 3202 break;
2881 3203
2882 /* kidnapped escape sequence: Should be 8.3.48 */ 3204 /* kidnapped escape sequence: Should be 8.3.48 */
2883 case C1_ESA: /* ESC G */ 3205 case C1_ESA: /* ESC G */
… …
2905 process_dcs_seq (); 3227 process_dcs_seq ();
2906 break; 3228 break;
2907 3229
2908 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3230 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2909 case C1_SCI: /* ESC Z */ 3231 case C1_SCI: /* ESC Z */
2910 tt_write ((const unsigned char *)ESCZ_ANSWER, 3232 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2911 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2912 break; /* steal obsolete ESC [ c */ 3233 break; /* steal obsolete ESC [ c */
2913 3234
2914 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3235 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2915 case C1_CSI: /* ESC [ */ 3236 case C1_CSI: /* ESC [ */
2916 process_csi_seq (); 3237 process_csi_seq ();
… …
3041 { 3362 {
3042 switch (priv) 3363 switch (priv)
3043 { 3364 {
3044 case '>': 3365 case '>':
3045 if (ch == CSI_DA) /* secondary device attributes */ 3366 if (ch == CSI_DA) /* secondary device attributes */
3046 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3367 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3047 break; 3368 break;
3048 case '?': 3369 case '?':
3049 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3370 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3050 process_terminal_mode (ch, priv, nargs, arg); 3371 process_terminal_mode (ch, priv, nargs, arg);
3051 break; 3372 break;
… …
3156 3477
3157 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3478 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3158 arg[0] = -arg[0]; 3479 arg[0] = -arg[0];
3159 /* FALLTHROUGH */ 3480 /* FALLTHROUGH */
3160 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3481 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3161 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3482 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3162 break; 3483 break;
3163 3484
3164 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3485 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3165 tt_write ((const unsigned char *)VT100_ANS, 3486 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3166 (unsigned int) (sizeof (VT100_ANS) - 1));
3167 break; 3487 break;
3168 3488
3169 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3489 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3170 process_sgr_mode (nargs, arg); 3490 process_sgr_mode (nargs, arg);
3171 break; 3491 break;
… …
3178 break; 3498 break;
3179 case 6: /* CPR requested */ 3499 case 6: /* CPR requested */
3180 scr_report_position (); 3500 scr_report_position ();
3181 break; 3501 break;
3182 case 7: /* unofficial extension */ 3502 case 7: /* unofficial extension */
3183 if (Options & Opt_insecure) 3503 if (OPTION (Opt_insecure))
3184 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3504 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3185 break; 3505 break;
3186 case 8: /* unofficial extension */ 3506 case 8: /* unofficial extension */
3187 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3507 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3188 break; 3508 break;
3189 } 3509 }
… …
3225 break; 3545 break;
3226 3546
3227 case CSI_RM: /* 8.3.107: RESET MODE */ 3547 case CSI_RM: /* 8.3.107: RESET MODE */
3228 if (arg[0] == 4) 3548 if (arg[0] == 4)
3229 scr_insert_mode (0); 3549 scr_insert_mode (0);
3550 else if (arg[0] == 20)
3551 priv_modes &= ~PrivMode_LFNL;
3230 break; 3552 break;
3231 3553
3232 case CSI_SM: /* 8.3.126: SET MODE */ 3554 case CSI_SM: /* 8.3.126: SET MODE */
3233 if (arg[0] == 4) 3555 if (arg[0] == 4)
3234 scr_insert_mode (1); 3556 scr_insert_mode (1);
3557 else if (arg[0] == 20)
3558 priv_modes |= PrivMode_LFNL;
3235 break; 3559 break;
3236 3560
3237 /* 3561 /*
3238 * PRIVATE USE beyond this point. All CSI_7? sequences here 3562 * PRIVATE USE beyond this point. All CSI_7? sequences here
3239 */ 3563 */
… …
3251 break; 3575 break;
3252 case CSI_75: 3576 case CSI_75:
3253 scr_cursor (RESTORE); 3577 scr_cursor (RESTORE);
3254 break; 3578 break;
3255 3579
3256#ifndef NO_FRILLS 3580#if ENABLE_FRILLS
3257 case CSI_74: 3581 case CSI_74:
3258 process_window_ops (arg, nargs); 3582 process_window_ops (arg, nargs);
3259 break; 3583 break;
3260#endif 3584#endif
3261 3585
… …
3268 break; 3592 break;
3269 } 3593 }
3270} 3594}
3271/*}}} */ 3595/*}}} */
3272 3596
3273#ifndef NO_FRILLS 3597#if ENABLE_FRILLS
3274/* ARGSUSED */ 3598/* ARGSUSED */
3275void 3599void
3276rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3600rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3277{ 3601{
3278 int x, y; 3602 int x, y;
3279 XWindowAttributes wattr; 3603 XWindowAttributes wattr;
3280 Window wdummy; 3604 Window wdummy;
3605 dDisp;
3281 3606
3282 if (nargs == 0) 3607 if (nargs == 0)
3283 return; 3608 return;
3284 3609
3285 switch (args[0]) 3610 switch (args[0])
3286 { 3611 {
3287 /* 3612 /*
3288 * commands 3613 * commands
3289 */ 3614 */
3290 case 1: /* deiconify window */ 3615 case 1: /* deiconify window */
3291 XMapWindow (display->display, TermWin.parent[0]); 3616 XMapWindow (disp, parent[0]);
3292 break; 3617 break;
3293 case 2: /* iconify window */ 3618 case 2: /* iconify window */
3294 XIconifyWindow (display->display, TermWin.parent[0], 3619 XIconifyWindow (disp, parent[0], display->screen);
3295 DefaultScreen (display->display));
3296 break; 3620 break;
3297 case 3: /* set position (pixels) */ 3621 case 3: /* set position (pixels) */
3298 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3622 XMoveWindow (disp, parent[0], args[1], args[2]);
3299 break; 3623 break;
3300 case 4: /* set size (pixels) */ 3624 case 4: /* set size (pixels) */
3301 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3625 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3302 break; 3626 break;
3303 case 5: /* raise window */ 3627 case 5: /* raise window */
3304 XRaiseWindow (display->display, TermWin.parent[0]); 3628 XRaiseWindow (disp, parent[0]);
3305 break; 3629 break;
3306 case 6: /* lower window */ 3630 case 6: /* lower window */
3307 XLowerWindow (display->display, TermWin.parent[0]); 3631 XLowerWindow (disp, parent[0]);
3308 break; 3632 break;
3309 case 7: /* refresh window */ 3633 case 7: /* refresh window */
3310 scr_touch (true); 3634 scr_touch (true);
3311 break; 3635 break;
3312 case 8: /* set size (chars) */ 3636 case 8: /* set size (chars) */
3313 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3637 set_widthheight ((unsigned int) (args[2] * fwidth),
3314 (unsigned int) (args[1] * TermWin.fheight)); 3638 (unsigned int) (args[1] * fheight));
3315 break; 3639 break;
3316 3640
3317 //case 9: NYI, TODO, restore maximized window or maximize window 3641 //case 9: NYI, TODO, restore maximized window or maximize window
3318 default: 3642 default:
3319 if (args[0] >= 24) /* set height (chars) */ 3643 if (args[0] >= 24) /* set height (chars) */
3320 set_widthheight ((unsigned int)TermWin.width, 3644 set_widthheight ((unsigned int)width,
3321 (unsigned int) (args[1] * TermWin.fheight)); 3645 (unsigned int) (args[1] * fheight));
3322 break; 3646 break;
3323 3647
3324 3648
3325 /* 3649 /*
3326 * reports - some output format copied from XTerm 3650 * reports - some output format copied from XTerm
3327 */ 3651 */
3328 case 11: /* report window state */ 3652 case 11: /* report window state */
3329 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3653 XGetWindowAttributes (disp, parent[0], &wattr);
3330 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3654 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3331 break; 3655 break;
3332 case 13: /* report window position */ 3656 case 13: /* report window position */
3333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3657 XGetWindowAttributes (disp, parent[0], &wattr);
3334 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3658 XTranslateCoordinates (disp, parent[0], wattr.root,
3335 -wattr.border_width, -wattr.border_width, 3659 -wattr.border_width, -wattr.border_width,
3336 &x, &y, &wdummy); 3660 &x, &y, &wdummy);
3337 tt_printf ("\033[3;%d;%dt", x, y); 3661 tt_printf ("\033[3;%d;%dt", x, y);
3338 break; 3662 break;
3339 case 14: /* report window size (pixels) */ 3663 case 14: /* report window size (pixels) */
3340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3664 XGetWindowAttributes (disp, parent[0], &wattr);
3341 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3665 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3342 break; 3666 break;
3343 case 18: /* report text area size (chars) */ 3667 case 18: /* report text area size (chars) */
3344 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3668 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3345 break; 3669 break;
3346 case 19: /* report window size (chars) */ 3670 case 19: /* report window size (chars) */
3347 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3671 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3348 break; 3672 break;
3349 case 20: /* report icon label */ 3673 case 20: /* report icon label */
3350 { 3674 {
3351 char *s; 3675 char *s;
3352 XGetIconName (display->display, TermWin.parent[0], &s); 3676 XGetIconName (disp, parent[0], &s);
3353 tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3677 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3354 XFree (s); 3678 XFree (s);
3355 } 3679 }
3356 break; 3680 break;
3357 case 21: /* report window title */ 3681 case 21: /* report window title */
3358 { 3682 {
3359 char *s; 3683 char *s;
3360 XFetchName (display->display, TermWin.parent[0], &s); 3684 XFetchName (disp, parent[0], &s);
3361 tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3685 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3362 XFree (s); 3686 XFree (s);
3363 } 3687 }
3364 break; 3688 break;
3365 } 3689 }
3366} 3690}
… …
3369/*----------------------------------------------------------------------*/ 3693/*----------------------------------------------------------------------*/
3370/* 3694/*
3371 * get input up until STRING TERMINATOR (or BEL) 3695 * get input up until STRING TERMINATOR (or BEL)
3372 * ends_how is terminator used. returned input must be free()'d 3696 * ends_how is terminator used. returned input must be free()'d
3373 */ 3697 */
3374unsigned char * 3698char *
3375rxvt_term::get_to_st (unicode_t &ends_how) 3699rxvt_term::get_to_st (unicode_t &ends_how)
3376{ 3700{
3377 unicode_t prev = 0, ch; 3701 unicode_t ch;
3702 bool seen_esc = false;
3378 unsigned int n = 0; 3703 unsigned int n = 0;
3379 unsigned char *s;
3380 unsigned char string[STRING_MAX]; 3704 wchar_t string[STRING_MAX];
3381 3705
3382 while ((ch = cmd_getc ()) != NOCHAR) 3706 while ((ch = cmd_getc ()) != NOCHAR)
3383 { 3707 {
3384 if (prev == C0_ESC) 3708 if (seen_esc)
3385 { 3709 {
3386 if (ch == 0x5c) /* 7bit ST */ 3710 if (ch == 0x5c) /* 7bit ST */
3387 break; 3711 break;
3388 else 3712 else
3389 return NULL; 3713 return NULL;
3390 } 3714 }
3715 else if (ch == C0_ESC)
3716 {
3717 seen_esc = true;
3718 continue;
3719 }
3391 else if (ch == C0_BEL || ch == CHAR_ST) 3720 else if (ch == C0_BEL || ch == CHAR_ST)
3392 break; 3721 break;
3393 else if (ch < 0x20) 3722 else if (ch < 0x20)
3394 return NULL; /* other control character - exit */ 3723 return NULL; /* other control character - exit */
3395 3724
3396 if (n >= sizeof (string) - 1) 3725 seen_esc = false;
3726
3727 if (n >= STRING_MAX - 1)
3397 // stop at some sane length 3728 // stop at some sane length
3398 return NULL; 3729 return NULL;
3399 3730
3400 if (ch == C0_SYN) 3731 if (ch == C0_SYN)
3401 {
3402 string[n++] = cmd_get8 (); 3732 string[n++] = cmd_get8 ();
3403 prev = 0;
3404 }
3405 else 3733 else
3406 string[n++] = prev = ch; 3734 string[n++] = ch;
3407 } 3735 }
3408 3736
3409 string[n++] = '\0'; 3737 string[n++] = '\0';
3410 3738
3411 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3412 return NULL;
3413
3414 ends_how = (ch == 0x5c ? C0_ESC : ch); 3739 ends_how = (ch == 0x5c ? C0_ESC : ch);
3415 STRNCPY (s, string, n); 3740
3416 return s; 3741 return rxvt_wcstombs (string);
3417} 3742}
3418 3743
3419/*----------------------------------------------------------------------*/ 3744/*----------------------------------------------------------------------*/
3420/* 3745/*
3421 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3746 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3422 */ 3747 */
3423void 3748void
3424rxvt_term::process_dcs_seq () 3749rxvt_term::process_dcs_seq ()
3425{ 3750{
3426 unsigned char *s; 3751 char *s;
3427 unicode_t eh; 3752 unicode_t eh;
3428 3753
3429 /* 3754 /*
3430 * Not handled yet 3755 * Not handled yet
3431 */ 3756 */
… …
3450 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3775 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3451 arg = arg * 10 + (ch - '0'); 3776 arg = arg * 10 + (ch - '0');
3452 3777
3453 if (ch == ';') 3778 if (ch == ';')
3454 { 3779 {
3455 unsigned char *s = get_to_st (eh); 3780 char *s = get_to_st (eh);
3456 3781
3457 if (s) 3782 if (s)
3458 { 3783 {
3459 process_xterm_seq (arg, (char *)s, eh); 3784 process_xterm_seq (arg, s, eh);
3460 free (s); 3785 free (s);
3461 } 3786 }
3462 } 3787 }
3463} 3788}
3464 3789
3465void 3790void
3466rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3791rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3467{ 3792{
3468 if (str[0] == '?' && !str[1]) 3793 if (str[0] == '?' && !str[1])
3469 { 3794 {
3470 unsigned short r, g, b; 3795 unsigned short r, g, b;
3471 PixColorsFocused[color].get (display, r, g, b); 3796 pix_colors_focused[color].get (display, r, g, b);
3472 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3797 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3473 } 3798 }
3474 else 3799 else
3475 set_window_color (color, str); 3800 set_window_color (color, str);
3476} 3801}
3477 3802
3478/* 3803/*
3479 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3804 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3480 * 0 = change iconName/title
3481 * 1 = change iconName
3482 * 2 = change title
3483 * 4 = change color
3484 * 10 = change fg color
3485 * 11 = change bg color
3486 * 12 = change text color
3487 * 13 = change mouse foreground color
3488 * 17 = change highlight character colour
3489 * 18 = change bold character color
3490 * 19 = change underlined character color
3491 * 46 = change logfile (not implemented)
3492 * 50 = change font
3493 *
3494 * rxvt extensions:
3495 * 20 = bg pixmap
3496 * 39 = change default fg color
3497 * 49 = change default bg color
3498 * 55 = dump scrollback buffer and all of screen
3499 * 701 = change locale
3500 * 702 = find font
3501 * 703 = menu
3502 */ 3805 */
3503void 3806void
3504rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3807rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3505{ 3808{
3506 int changed = 0; 3809 int changed = 0;
3507 int color; 3810 int color;
3508 char *buf, *name; 3811 char *buf, *name;
3509 bool query = str[0] == '?' && !str[1]; 3812 bool query = str[0] == '?' && !str[1];
3813 int saveop = op;
3814 dDisp;
3510 3815
3511 assert (str != NULL); 3816 assert (str != NULL);
3512 switch (op) 3817 switch (op)
3513 { 3818 {
3514 case XTerm_name: 3819 case XTerm_name:
… …
3521 set_title (str); 3826 set_title (str);
3522 break; 3827 break;
3523 case XTerm_property: 3828 case XTerm_property:
3524 if (str[0] == '?') 3829 if (str[0] == '?')
3525 { 3830 {
3526 Atom prop = XInternAtom (display->display, str + 1, True); 3831 Atom prop = display->atom (str + 1);
3527 Atom actual_type; 3832 Atom actual_type;
3528 int actual_format; 3833 int actual_format;
3529 unsigned long nitems; 3834 unsigned long nitems;
3530 unsigned long bytes_after; 3835 unsigned long bytes_after;
3531 unsigned char *value = 0; 3836 unsigned char *value = 0;
3532 const char *str = ""; 3837 const char *str = "";
3533 3838
3534 if (prop 3839 if (prop
3535 && XGetWindowProperty (display->display, TermWin.parent[0], 3840 && XGetWindowProperty (disp, parent[0],
3536 prop, 0, 1<<16, 0, AnyPropertyType, 3841 prop, 0, 1<<16, 0, AnyPropertyType,
3537 &actual_type, &actual_format, 3842 &actual_type, &actual_format,
3538 &nitems, &bytes_after, &value) == Success 3843 &nitems, &bytes_after, &value) == Success
3539 && actual_type != None 3844 && actual_type != None
3540 && actual_format == 8) 3845 && actual_format == 8)
… …
3549 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3854 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3550 3855
3551 if (eq) 3856 if (eq)
3552 { 3857 {
3553 *eq = 0; 3858 *eq = 0;
3554 XChangeProperty (display->display, TermWin.parent[0], 3859 set_utf8_property (display->atom (str), eq + 1);
3555 display->atom (str), XA_STRING, 8,
3556 PropModeReplace, (unsigned char *)eq + 1,
3557 strlen (eq + 1));
3558 } 3860 }
3559 else 3861 else
3560 XDeleteProperty (display->display, TermWin.parent[0], 3862 XDeleteProperty (disp, parent[0],
3561 display->atom (str)); 3863 display->atom (str));
3562 } 3864 }
3563 break; 3865 break;
3564 3866
3565 case XTerm_Color: 3867 case XTerm_Color:
3566 for (buf = (char *)str; buf && *buf;) 3868 for (buf = (char *)str; buf && *buf;)
3567 { 3869 {
3568 if ((name = STRCHR (buf, ';')) == NULL) 3870 if ((name = strchr (buf, ';')) == NULL)
3569 break; 3871 break;
3570 3872
3571 *name++ = '\0'; 3873 *name++ = '\0';
3572 color = atoi (buf); 3874 color = atoi (buf);
3573 3875
3574 if (color < 0 || color >= TOTAL_COLORS) 3876 if (color < 0 || color >= TOTAL_COLORS)
3575 break; 3877 break;
3576 3878
3577 if ((buf = STRCHR (name, ';')) != NULL) 3879 if ((buf = strchr (name, ';')) != NULL)
3578 *buf++ = '\0'; 3880 *buf++ = '\0';
3579 3881
3580 if (name[0] == '?' && !name[1]) 3882 if (name[0] == '?' && !name[1])
3581 { 3883 {
3582 unsigned short r, g, b; 3884 unsigned short r, g, b;
3583 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3885 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3584 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3886 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3585 } 3887 }
3586 else 3888 else
3587 set_window_color (color + minCOLOR, name); 3889 set_window_color (color + minCOLOR, name);
3588 } 3890 }
… …
3611 case XTerm_Color_UL: 3913 case XTerm_Color_UL:
3612 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3914 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3613 break; 3915 break;
3614 case XTerm_Color_RV: 3916 case XTerm_Color_RV:
3615 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3917 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3918 break;
3919 case URxvt_Color_IT:
3920 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3921 break;
3922#endif
3923#if TRANSPARENT && TINTING
3924 case URxvt_Color_tint:
3925 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3926 check_our_parents ();
3927 if (am_transparent)
3928 want_full_refresh = want_refresh = 1;
3616 break; 3929 break;
3617#endif 3930#endif
3618 3931
3619 case XTerm_Pixmap: 3932 case XTerm_Pixmap:
3620 if (*str != ';') 3933 if (*str != ';')
… …
3623 scale_pixmap (""); /* reset to default scaling */ 3936 scale_pixmap (""); /* reset to default scaling */
3624 set_bgPixmap (str); /* change pixmap */ 3937 set_bgPixmap (str); /* change pixmap */
3625#endif 3938#endif
3626 scr_touch (true); 3939 scr_touch (true);
3627 } 3940 }
3628 while ((str = STRCHR (str, ';')) != NULL) 3941 while ((str = strchr (str, ';')) != NULL)
3629 { 3942 {
3630 str++; 3943 str++;
3631#if XPM_BACKGROUND 3944#if XPM_BACKGROUND
3632 changed += scale_pixmap (str); 3945 changed += scale_pixmap (str);
3633#endif 3946#endif
3634
3635 } 3947 }
3948
3636 if (changed) 3949 if (changed)
3637 { 3950 {
3638#ifdef XPM_BACKGROUND 3951#ifdef XPM_BACKGROUND
3639 resize_pixmap (); 3952 resize_pixmap ();
3640#endif 3953#endif
… …
3651 3964
3652 case XTerm_logfile: 3965 case XTerm_logfile:
3653 // TODO, when secure mode? 3966 // TODO, when secure mode?
3654 break; 3967 break;
3655 3968
3656 case XTerm_font:
3657 if (query)
3658 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3659 (Options & Opt_insecure) && TermWin.fontset->fontdesc
3660 ? TermWin.fontset->fontdesc : "",
3661 resp);
3662 else
3663 change_font (str);
3664 break;
3665
3666#ifndef NO_FRILLS
3667 case XTerm_locale:
3668 if (query)
3669 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (Options & Opt_insecure) ? locale : "", resp);
3670 else
3671 {
3672 set_locale (str);
3673# ifdef USE_XIM
3674 im_cb ();
3675# endif
3676 }
3677 break;
3678
3679 case XTerm_findfont:
3680 {
3681 int fid = TermWin.fontset->find_font (atoi (str));
3682 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3683 fid,
3684 (Options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3685 resp);
3686 }
3687 break;
3688#endif
3689
3690#ifdef MENUBAR 3969#ifdef MENUBAR
3691 case XTerm_Menu: 3970 case URxvt_Menu:
3692 if (Options & Opt_insecure) 3971 if (OPTION (Opt_insecure))
3693 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3972 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3694 break; 3973 break;
3695#endif 3974#endif
3696#if 0 3975#if 0
3697 case XTerm_dumpscreen: /* no error notices */ 3976 case XTerm_dumpscreen: /* no error notices */
… …
3701 { 3980 {
3702 scr_dump (fd); 3981 scr_dump (fd);
3703 close (fd); 3982 close (fd);
3704 } 3983 }
3705 } 3984 }
3985 break;
3986#endif
3987 case XTerm_font:
3988 op = URxvt_font;
3989 case URxvt_font:
3990#if ENABLE_STYLES
3991 case URxvt_boldFont:
3992 case URxvt_italicFont:
3993 case URxvt_boldItalicFont:
3994#endif
3995 if (query)
3996 tt_printf ("\33]%d;%-.250s%c", saveop,
3997 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3998 ? fontset[op - URxvt_font]->fontdesc : "",
3999 resp);
4000 else
4001 {
4002 const char *&res = rs[Rs_font + (op - URxvt_font)];
4003
4004 res = strdup (str);
4005 allocated.push_back ((void *)res);
4006 set_fonts ();
4007 }
4008 break;
4009
4010#if ENABLE_FRILLS
4011 case URxvt_locale:
4012 if (query)
4013 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4014 else
4015 {
4016 set_locale (str);
4017 pty.set_utf8_mode (enc_utf8);
4018 init_xlocale ();
4019 }
4020 break;
4021
4022 case URxvt_view_up:
4023 case URxvt_view_down:
4024 {
4025 int lines = atoi (str);
4026
4027 if (lines)
4028 scr_page (op == URxvt_view_up ? UP : DN, lines);
4029 else
4030 scr_erase_savelines ();
4031 }
4032
4033 break;
4034#endif
4035
4036#if ENABLE_PERL
4037 case URxvt_perl:
4038 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4039 ; // no responses yet
3706 break; 4040 break;
3707#endif 4041#endif
3708 } 4042 }
3709} 4043}
3710/*----------------------------------------------------------------------*/ 4044/*----------------------------------------------------------------------*/
… …
3724{ 4058{
3725 int state; 4059 int state;
3726 4060
3727 if (mode == 's') 4061 if (mode == 's')
3728 { 4062 {
3729 SavedModes |= (PrivateModes & bit); 4063 SavedModes |= (priv_modes & bit);
3730 return -1; 4064 return -1;
3731 } 4065 }
3732 else 4066 else
3733 { 4067 {
3734 if (mode == 'r') 4068 if (mode == 'r')
3735 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4069 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3736 else 4070 else
3737 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4071 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3738 PrivMode (state, bit); 4072 PrivMode (state, bit);
3739 } 4073 }
3740 4074
3741 return state; 4075 return state;
3742} 4076}
… …
3760 { 3, PrivMode_132 }, 4094 { 3, PrivMode_132 },
3761 { 4, PrivMode_smoothScroll }, 4095 { 4, PrivMode_smoothScroll },
3762 { 5, PrivMode_rVideo }, 4096 { 5, PrivMode_rVideo },
3763 { 6, PrivMode_relOrigin }, 4097 { 6, PrivMode_relOrigin },
3764 { 7, PrivMode_Autowrap }, 4098 { 7, PrivMode_Autowrap },
4099 // 8, bi-directional support mode
3765 { 9, PrivMode_MouseX10 }, 4100 { 9, PrivMode_MouseX10 },
3766#ifdef menuBar_esc 4101#ifdef menuBar_esc
3767 { menuBar_esc, PrivMode_menuBar }, 4102 { menuBar_esc, PrivMode_menuBar },
3768#endif 4103#endif
4104 // 18, 19 printing-related
4105 { 25, PrivMode_VisibleCursor },
3769#ifdef scrollBar_esc 4106#ifdef scrollBar_esc
3770 { scrollBar_esc, PrivMode_scrollBar }, 4107 { scrollBar_esc, PrivMode_scrollBar },
3771#endif 4108#endif
3772 // 18, 19 printing-related
3773 { 25, PrivMode_VisibleCursor },
3774 // 30 show scrollbar rxvt. extension
3775 { 35, PrivMode_ShiftKeys }, // rxvt extension 4109 { 35, PrivMode_ShiftKeys }, // rxvt extension
3776 { 40, PrivMode_132OK }, 4110 { 40, PrivMode_132OK },
3777 // 41 xterm more fixes NYI 4111 // 41 xterm more fixes NYI
3778 // 45 margin bell NYI 4112 // 45 margin bell NYI
3779 // 46 start logging 4113 // 46 start logging
… …
3819 } 4153 }
3820 4154
3821 /* extra handling for values with state unkept */ 4155 /* extra handling for values with state unkept */
3822 switch (arg[i]) 4156 switch (arg[i])
3823 { 4157 {
4158#if ENABLE_STYLES
4159 case 1021:
4160 set_option (Opt_intensityStyles, mode);
4161
4162 scr_touch (true);
4163 break;
4164#endif
3824 case 1048: /* alternative cursor save */ 4165 case 1048: /* alternative cursor save */
4166 case 1049:
3825 if (Options & Opt_secondaryScreen) 4167 if (OPTION (Opt_secondaryScreen))
3826 if (mode == 0) 4168 if (mode == 0)
3827 scr_cursor (RESTORE); 4169 scr_cursor (RESTORE);
3828 else if (mode == 1) 4170 else if (mode == 1)
3829 scr_cursor (SAVE); 4171 scr_cursor (SAVE);
3830 break; 4172 break;
… …
3841 * within VT52 mode 4183 * within VT52 mode
3842 */ 4184 */
3843 PrivMode (1, PrivMode_vt52); 4185 PrivMode (1, PrivMode_vt52);
3844 break; 4186 break;
3845 case 3: /* 80/132 */ 4187 case 3: /* 80/132 */
3846 if (PrivateModes & PrivMode_132OK) 4188 if (priv_modes & PrivMode_132OK)
3847 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4189 set_widthheight (((state ? 132 : 80) * fwidth), height);
3848 break; 4190 break;
3849 case 4: /* smooth scrolling */ 4191 case 4: /* smooth scrolling */
3850 if (state) 4192 set_option (Opt_jumpScroll, !state);
3851 Options &= ~Opt_jumpScroll;
3852 else
3853 Options |= Opt_jumpScroll;
3854 break; 4193 break;
3855 case 5: /* reverse video */ 4194 case 5: /* reverse video */
3856 scr_rvideo_mode (state); 4195 scr_rvideo_mode (state);
3857 break; 4196 break;
3858 case 6: /* relative/absolute origins */ 4197 case 6: /* relative/absolute origins */
… …
3862 scr_autowrap (state); 4201 scr_autowrap (state);
3863 break; 4202 break;
3864 /* case 8: - auto repeat, can't do on a per window basis */ 4203 /* case 8: - auto repeat, can't do on a per window basis */
3865 case 9: /* X10 mouse reporting */ 4204 case 9: /* X10 mouse reporting */
3866 if (state) /* orthogonal */ 4205 if (state) /* orthogonal */
3867 PrivateModes &= ~PrivMode_MouseX11; 4206 priv_modes &= ~PrivMode_MouseX11;
3868 break; 4207 break;
3869#ifdef menuBar_esc 4208#ifdef menuBar_esc
3870 case menuBar_esc: 4209 case menuBar_esc:
3871#ifdef MENUBAR 4210#ifdef MENUBAR
3872 map_menuBar (state); 4211 map_menuBar (state);
… …
3892 break; 4231 break;
3893 /* case 66: - application key pad */ 4232 /* case 66: - application key pad */
3894 /* case 67: - backspace key */ 4233 /* case 67: - backspace key */
3895 case 1000: /* X11 mouse reporting */ 4234 case 1000: /* X11 mouse reporting */
3896 if (state) /* orthogonal */ 4235 if (state) /* orthogonal */
3897 PrivateModes &= ~PrivMode_MouseX10; 4236 priv_modes &= ~PrivMode_MouseX10;
3898 break; 4237 break;
3899#if 0 4238#if 0
3900 case 1001: 4239 case 1001:
3901 break; /* X11 mouse highlighting */ 4240 break; /* X11 mouse highlighting */
3902#endif 4241#endif
3903 case 1010: /* scroll to bottom on TTY output inhibit */ 4242 case 1010: /* scroll to bottom on TTY output inhibit */
3904 if (state)
3905 Options &= ~Opt_scrollTtyOutput;
3906 else
3907 Options |= Opt_scrollTtyOutput; 4243 set_option (Opt_scrollTtyOutput, !state);
3908 break; 4244 break;
3909 case 1011: /* scroll to bottom on key press */ 4245 case 1011: /* scroll to bottom on key press */
3910 if (state)
3911 Options |= Opt_scrollTtyKeypress; 4246 set_option (Opt_scrollTtyKeypress, state);
3912 else
3913 Options &= ~Opt_scrollTtyKeypress;
3914 break; 4247 break;
3915 case 1047: /* secondary screen w/ clearing last */ 4248 case 1047: /* secondary screen w/ clearing last */
3916 if (Options & Opt_secondaryScreen) 4249 if (OPTION (Opt_secondaryScreen))
3917 if (current_screen != PRIMARY) 4250 if (current_screen != PRIMARY)
3918 scr_erase_screen (2); 4251 scr_erase_screen (2);
3919 scr_change_screen (state); 4252 scr_change_screen (state);
3920 break; 4253 break;
3921 case 1049: /* secondary screen w/ clearing first */ 4254 case 1049: /* secondary screen w/ clearing first */
3922 scr_change_screen (state); 4255 scr_change_screen (state);
3923 if (Options & Opt_secondaryScreen) 4256 if (OPTION (Opt_secondaryScreen))
3924 if (current_screen != PRIMARY) 4257 if (current_screen != PRIMARY)
3925 scr_erase_screen (2); 4258 scr_erase_screen (2);
3926 break; 4259 break;
3927 default: 4260 default:
3928 break; 4261 break;
… …
3954 rendset = 0, rendstyle = ~RS_None; 4287 rendset = 0, rendstyle = ~RS_None;
3955 break; 4288 break;
3956 case 1: 4289 case 1:
3957 rendset = 1, rendstyle = RS_Bold; 4290 rendset = 1, rendstyle = RS_Bold;
3958 break; 4291 break;
3959 //case 2: // faint or second colour 4292 //case 2: // low intensity
4293 case 3:
4294 rendset = 1, rendstyle = RS_Italic;
4295 break;
3960 case 4: 4296 case 4:
3961 rendset = 1, rendstyle = RS_Uline; 4297 rendset = 1, rendstyle = RS_Uline;
3962 break; 4298 break;
3963 case 5: // slowly blinking 4299 case 5: // slowly blinking
3964 case 6: // rapidly blinking 4300 case 6: // rapidly blinking
… …
3976 //case 11: // scoansi acs on, first alt font 4312 //case 11: // scoansi acs on, first alt font
3977 //case 12: // scoansi acs on, |0x80, second alt font 4313 //case 12: // scoansi acs on, |0x80, second alt font
3978 //... 4314 //...
3979 //case 19: // ninth alt font 4315 //case 19: // ninth alt font
3980 //case 20: // gothic 4316 //case 20: // gothic
3981 case 21: // disable bold, faint 4317 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3982 rendset = 0, rendstyle = RS_Bold; 4318 rendset = 0, rendstyle = RS_Bold;
3983 break; 4319 break;
3984 case 22: 4320 case 22: // normal intensity
3985 rendset = 0, rendstyle = RS_Bold; 4321 rendset = 0, rendstyle = RS_Bold;
3986 break; 4322 break;
3987 //case 23: disable italic 4323 case 23: // disable italic
4324 rendset = 0, rendstyle = RS_Italic;
4325 break;
3988 case 24: 4326 case 24:
3989 rendset = 0, rendstyle = RS_Uline; 4327 rendset = 0, rendstyle = RS_Uline;
3990 break; 4328 break;
3991 case 25: 4329 case 25:
4330 rendset = 0, rendstyle = RS_Blink;
4331 break;
4332 case 26: // variable spacing (iso 8613)
3992 rendset = 0, rendstyle = RS_Blink; 4333 rendset = 0, rendstyle = RS_Blink;
3993 break; 4334 break;
3994 case 27: 4335 case 27:
3995 rendset = 0, rendstyle = RS_RVid; 4336 rendset = 0, rendstyle = RS_RVid;
3996 break; 4337 break;
… …
4014 case 35: 4355 case 35:
4015 case 36: 4356 case 36:
4016 case 37: 4357 case 37:
4017 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4358 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4018 break; 4359 break;
4019#ifdef TTY_256COLOR 4360 case 38: // set fg color, ISO 8613-6
4020 case 38:
4021 if (nargs > i + 2 && arg[i + 1] == 5) 4361 if (nargs > i + 2 && arg[i + 1] == 5)
4022 { 4362 {
4023 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4363 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4024 i += 2; 4364 i += 2;
4025 } 4365 }
4026 break; 4366 break;
4027#endif
4028 case 39: /* default fg */ 4367 case 39: /* default fg */
4029 scr_color (Color_fg, Color_fg); 4368 scr_color (Color_fg, Color_fg);
4030 break; 4369 break;
4031 4370
4032 case 40: 4371 case 40:
… …
4037 case 45: 4376 case 45:
4038 case 46: 4377 case 46:
4039 case 47: 4378 case 47:
4040 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4379 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4041 break; 4380 break;
4042#ifdef TTY_256COLOR 4381 case 48: // set bg color, ISO 8613-6
4043 case 48:
4044 if (nargs > i + 2 && arg[i + 1] == 5) 4382 if (nargs > i + 2 && arg[i + 1] == 5)
4045 { 4383 {
4046 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4384 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4047 i += 2; 4385 i += 2;
4048 } 4386 }
4049 break; 4387 break;
4050#endif
4051 case 49: /* default bg */ 4388 case 49: /* default bg */
4052 scr_color (Color_bg, Color_bg); 4389 scr_color (Color_bg, Color_bg);
4053 break; 4390 break;
4054 4391
4055#ifndef NO_BRIGHTCOLOR 4392 //case 50: // not variable spacing
4393
4394#if ENABLE_FRILLS
4056 case 90: 4395 case 90:
4057 case 91: /* set bright fg color */ 4396 case 91: /* set bright fg color */
4058 case 92: 4397 case 92:
4059 case 93: 4398 case 93:
4060 case 94: 4399 case 94:
4061 case 95: 4400 case 95:
4062 case 96: 4401 case 96:
4063 case 97: 4402 case 97:
4064 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4403 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4065 Color_fg);
4066 break; 4404 break;
4067 case 100: 4405 case 100:
4068 case 101: /* set bright bg color */ 4406 case 101: /* set bright bg color */
4069 case 102: 4407 case 102:
4070 case 103: 4408 case 103:
4071 case 104: 4409 case 104:
4072 case 105: 4410 case 105:
4073 case 106: 4411 case 106:
4074 case 107: 4412 case 107:
4075 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4413 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4076 Color_bg);
4077 break; 4414 break;
4078#endif 4415#endif
4079
4080 } 4416 }
4081 } 4417 }
4082} 4418}
4083/*}}} */ 4419/*}}} */
4084 4420
… …
4088{ 4424{
4089 unicode_t ch, cmd = cmd_getc (); 4425 unicode_t ch, cmd = cmd_getc ();
4090 4426
4091 if (cmd == 'Q') 4427 if (cmd == 'Q')
4092 { /* query graphics */ 4428 { /* query graphics */
4093 tt_printf ("\033G0\n"); /* no graphics */ 4429 tt_printf ("\033G0\012"); /* no graphics */
4094 return; 4430 return;
4095 } 4431 }
4096 /* swallow other graphics sequences until terminating ':' */ 4432 /* swallow other graphics sequences until terminating ':' */
4097 do 4433 do
4098 ch = cmd_getc (); 4434 ch = cmd_getc ();
… …
4108 */ 4444 */
4109void 4445void
4110rxvt_term::tt_printf (const char *fmt,...) 4446rxvt_term::tt_printf (const char *fmt,...)
4111{ 4447{
4112 va_list arg_ptr; 4448 va_list arg_ptr;
4113 unsigned char buf[256]; 4449 char buf[256];
4114 4450
4115 va_start (arg_ptr, fmt); 4451 va_start (arg_ptr, fmt);
4116 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4452 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4117 va_end (arg_ptr); 4453 va_end (arg_ptr);
4118 tt_write (buf, STRLEN (buf)); 4454 tt_write (buf, strlen (buf));
4119} 4455}
4120 4456
4121/* ---------------------------------------------------------------------- */ 4457/* ---------------------------------------------------------------------- */
4122/* Write data to the pty as typed by the user, pasted with the mouse, 4458/* Write data to the pty as typed by the user, pasted with the mouse,
4123 * or generated by us in response to a query ESC sequence. 4459 * or generated by us in response to a query ESC sequence.
4124 */ 4460 */
4461const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4462
4125void 4463void
4126rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4464rxvt_term::tt_write (const char *data, unsigned int len)
4127{ 4465{
4128 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4466 if (pty.pty < 0)
4467 return;
4129 4468
4130 if (len) 4469 if (v_buflen == 0)
4470 {
4471 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4472
4473 if ((unsigned int)written == len)
4474 return;
4475
4476 data += written;
4477 len -= written;
4131 { 4478 }
4479
4480 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4481
4482 memcpy (v_buffer + v_buflen, data, len);
4483 v_buflen += len;
4484
4485 pty_ev.set (EVENT_READ | EVENT_WRITE);
4486}
4487
4488void rxvt_term::pty_write ()
4489{
4490 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4491
4492 if (written > 0)
4493 {
4494 v_buflen -= written;
4495
4132 if (v_buflen == 0) 4496 if (v_buflen == 0)
4133 { 4497 {
4134 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
4135
4136 if ((unsigned int)written == len)
4137 return;
4138
4139 data += written;
4140 len -= written;
4141 }
4142
4143
4144 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4145
4146 memcpy (v_buffer + v_buflen, data, len);
4147 v_buflen += len;
4148 }
4149
4150 for (;;)
4151 {
4152 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
4153
4154 if (written > 0)
4155 {
4156 v_buflen -= written;
4157
4158 if (v_buflen == 0)
4159 {
4160 free (v_buffer); 4498 free (v_buffer);
4161 v_buffer = 0; 4499 v_buffer = 0;
4162 v_buflen = 0; 4500 v_buflen = 0;
4163 4501
4164 pty_ev.set (EVENT_READ); 4502 pty_ev.set (EVENT_READ);
4165 return;
4166 }
4167
4168 memmove (v_buffer, v_buffer + written, v_buflen);
4169 }
4170 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4171 // original code just ignores this...
4172 destroy ();
4173 else
4174 {
4175 pty_ev.set (EVENT_READ | EVENT_WRITE);
4176 return; 4503 return;
4177 } 4504 }
4505
4506 memmove (v_buffer, v_buffer + written, v_buflen);
4178 } 4507 }
4508 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4509 pty_ev.set (EVENT_READ);
4179} 4510}
4180 4511
4181/*----------------------- end-of-file (C source) -----------------------*/ 4512/*----------------------- end-of-file (C source) -----------------------*/
4182 4513

Diff Legend

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