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.247 by root, Sat Jan 7 20:23:52 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) 1317#if defined(CURSOR_BLINK)
1077 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1078 { 1319 {
1079 if (hidden_cursor) 1320 if (hidden_cursor)
1080 { 1321 {
1081 hidden_cursor = 0; 1322 hidden_cursor = 0;
1082 want_refresh = 1; 1323 want_refresh = 1;
… …
1085 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1086 } 1327 }
1087#endif 1328#endif
1088 1329
1089#if defined(POINTER_BLANK) 1330#if defined(POINTER_BLANK)
1090 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1091 { 1332 {
1092 if (ev.type == MotionNotify 1333 if (ev.type == MotionNotify
1093 || ev.type == ButtonPress 1334 || ev.type == ButtonPress
1094 || ev.type == ButtonRelease) 1335 || ev.type == ButtonRelease)
1095 if (hidden_pointer) 1336 if (hidden_pointer)
… …
1098 if (ev.type == KeyPress && hidden_pointer == 0) 1339 if (ev.type == KeyPress && hidden_pointer == 0)
1099 pointer_blank (); 1340 pointer_blank ();
1100 } 1341 }
1101#endif 1342#endif
1102 1343
1103#ifdef USE_XIM
1104 if (XFilterEvent (&ev, None))
1105 return;
1106#endif
1107
1108 Window unused_root, unused_child; 1344 Window unused_root, unused_child;
1109 int unused_root_x, unused_root_y; 1345 int unused_root_x, unused_root_y;
1110 unsigned int unused_mask; 1346 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 1347
1161 switch (ev.type) 1348 switch (ev.type)
1162 { 1349 {
1163 case KeyPress: 1350 case KeyPress:
1351#if ISO_14755
1164 if (!(iso14755buf & ISO_14755_ESCAPE_NEXT)) 1352 if (!(iso14755buf & ISO_14755_52))
1353#endif
1165 lookup_key (ev.xkey); 1354 lookup_key (ev.xkey);
1166 1355
1167 break; 1356 break;
1168 1357
1169 case KeyRelease: 1358 case KeyRelease:
1170 { 1359 {
1171#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || !defined (NO_FRILLS) 1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1172 KeySym ks; 1361 KeySym ks;
1173 1362
1174 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1363 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1175#endif 1364#endif
1176 1365
1177#ifndef NO_FRILLS 1366#if ENABLE_FRILLS || ISO_14755
1178 // ISO 14755 support 1367 // ISO 14755 support
1179 if (iso14755buf) 1368 if (iso14755buf)
1180 if (iso14755buf & ISO_14755_ESCAPE_NEXT) 1369 if (iso14755buf & ISO_14755_52)
1181 { 1370 {
1371# if ENABLE_OVERLAY
1372 scr_overlay_off ();
1373# endif
1374# if ISO_14755
1182 // iso14755 part 5.2 handling: release time 1375 // iso14755 part 5.2 handling: release time
1183 // first: controls 1376 // first: controls
1184 if ((ev.xkey.state & ControlMask) 1377 if ((ev.xkey.state & ControlMask)
1185 && ((ks >= 0x40 && ks <= 0x5f) 1378 && ((ks >= 0x40 && ks <= 0x5f)
1186 || (ks >= 0x61 && ks <= 0x7f))) 1379 || (ks >= 0x61 && ks <= 0x7f)))
1187 { 1380 {
1188 iso14755buf = ISO_14755_KEYCODE_VALID | 0x2400 | (ks & 0x1f); 1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1189 commit_iso14755 (); 1382 commit_iso14755 ();
1190 return; // case-break; 1383 return; // case-break;
1191 } 1384 }
1192 1385
1193 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1194 if (i[0] == ks) 1387 if (i[0] == ks)
1195 { 1388 {
1196 iso14755buf = ISO_14755_KEYCODE_VALID | i[1]; 1389 iso14755buf = ISO_14755_51 | i[1];
1197 commit_iso14755 (); 1390 commit_iso14755 ();
1198 return; // case-break; 1391 return; // case-break;
1199 } 1392 }
1200 1393
1394 scr_bell ();
1395# endif
1201 iso14755buf = 0; 1396 iso14755buf = 0;
1202 scr_bell ();
1203 break; 1397 break;
1204 } 1398 }
1205 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 1399 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1206 { 1400 {
1401# if ENABLE_OVERLAY
1402 scr_overlay_off ();
1403# endif
1207 if (iso14755buf & ISO_14755_KEYCODE_VALID) 1404 if (iso14755buf & ISO_14755_51)
1208 commit_iso14755 (); 1405 commit_iso14755 ();
1406#if ISO_14755
1209 else if (iso14755buf & ISO_14755_ACTIVE) 1407 else if (iso14755buf & ISO_14755_STARTED)
1408 {
1210 iso14755buf = ISO_14755_ESCAPE_NEXT; // iso14755 part 5.2: remember empty begin/end pair 1409 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1410
1411 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1412 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1413 }
1414# endif
1415 else
1416 iso14755buf = 0;
1211 } 1417 }
1212#endif 1418#endif
1419
1420 if (ev.xany.window == vt
1421 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1422 break;
1213 1423
1214#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1424#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1215 if (!(ev.xkey.state & ControlMask)) 1425 if (!(ev.xkey.state & ControlMask))
1216 slip_wheel_ev.stop (); 1426 slip_wheel_ev.stop ();
1217 else if (ks == XK_Control_L || ks == XK_Control_R) 1427 else if (ks == XK_Control_L || ks == XK_Control_R)
… …
1228 button_release (ev.xbutton); 1438 button_release (ev.xbutton);
1229 break; 1439 break;
1230 1440
1231 case ClientMessage: 1441 case ClientMessage:
1232 if (ev.xclient.format == 32 1442 if (ev.xclient.format == 32
1443 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1444 {
1233 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1445 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1234 destroy (); 1446 destroy ();
1447#if ENABLE_EWMH
1448 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1449 XSendEvent (disp, ev.xclient.window = display->root,
1450 False, SubstructureRedirectMask | SubstructureNotifyMask,
1451 &ev);
1452#endif
1453 }
1454#if ENABLE_XEMBED
1455 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1456 {
1457 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1458 focus_in ();
1459 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1460 focus_out ();
1461 }
1462#endif
1235#ifdef OFFIX_DND 1463#ifdef OFFIX_DND
1236 /* OffiX Dnd (drag 'n' drop) protocol */ 1464 /* OffiX Dnd (drag 'n' drop) protocol */
1237 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1465 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1238 && (ev.xclient.data.l[0] == DndFile 1466 && (ev.xclient.data.l[0] == DndFile
1239 || ev.xclient.data.l[0] == DndDir 1467 || ev.xclient.data.l[0] == DndDir
1240 || ev.xclient.data.l[0] == DndLink)) 1468 || ev.xclient.data.l[0] == DndLink))
1241 { 1469 {
1242 /* Get Dnd data */ 1470 /* Get Dnd data */
1243 Atom ActualType; 1471 Atom ActualType;
1244 int ActualFormat; 1472 int ActualFormat;
1245 unsigned char *data; 1473 unsigned char *data;
1246 unsigned long Size, RemainingBytes; 1474 unsigned long Size, RemainingBytes;
1247 1475
1248 XGetWindowProperty (display->display, display->root, 1476 XGetWindowProperty (disp, display->root,
1249 xa[XA_DNDSELECTION], 1477 xa[XA_DNDSELECTION],
1250 0L, 1000000L, 1478 0L, 1000000L,
1251 False, AnyPropertyType, 1479 False, AnyPropertyType,
1252 &ActualType, &ActualFormat, 1480 &ActualType, &ActualFormat,
1253 &Size, &RemainingBytes, 1481 &Size, &RemainingBytes,
1254 &data); 1482 &data);
1255 XChangeProperty (display->display, display->root, 1483 set_string_property (XA_CUT_BUFFER0, data);
1256 XA_CUT_BUFFER0, XA_STRING,
1257 8, PropModeReplace,
1258 data, STRLEN (data));
1259 XFree (data); 1484 XFree (data);
1260 selection_paste (display->root, XA_CUT_BUFFER0, True); 1485 selection_paste (display->root, XA_CUT_BUFFER0, true);
1261 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1486 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1262 } 1487 }
1263#endif /* OFFIX_DND */ 1488#endif /* OFFIX_DND */
1264 break; 1489 break;
1265 1490
1266 case MappingNotify: 1491 case MappingNotify:
… …
1291 break; 1516 break;
1292 } 1517 }
1293 break; 1518 break;
1294 1519
1295 case FocusIn: 1520 case FocusIn:
1296 if (!TermWin.focus) 1521 focus_in ();
1522 break;
1523
1524 case FocusOut:
1525 focus_out ();
1526 break;
1527
1528 case ConfigureNotify:
1529 if (ev.xconfigure.window == parent[0])
1297 { 1530 {
1298 TermWin.focus = 1; 1531 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1299 want_refresh = 1; 1532 ;
1300#ifdef USE_XIM 1533
1301 if (Input_Context != NULL) 1534 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 { 1535 {
1311 PixColors = PixColorsFocused; 1536 seen_resize = 1;
1312 set_colorfgbg (); 1537 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1313 scr_clear ();
1314 scr_touch (true);
1315 } 1538 }
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 1539
1364#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1540#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1365 if (Options & Opt_transparent) 1541 if (OPTION (Opt_transparent))
1366 {
1367 check_our_parents (); 1542 check_our_parents ();
1368 if (am_transparent)
1369 want_refresh = want_full_refresh = 1;
1370 }
1371#endif 1543#endif
1372 } 1544 }
1373 break; 1545 break;
1374 1546
1375 case PropertyNotify: 1547 case PropertyNotify:
… …
1383 selection_clear (); 1555 selection_clear ();
1384 break; 1556 break;
1385 1557
1386 case SelectionNotify: 1558 case SelectionNotify:
1387 if (selection_wait == Sel_normal) 1559 if (selection_wait == Sel_normal)
1388 selection_paste (ev.xselection.requestor, 1560 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1389 ev.xselection.property, True);
1390 break; 1561 break;
1391 1562
1392 case SelectionRequest: 1563 case SelectionRequest:
1393 selection_send (ev.xselectionrequest); 1564 selection_send (ev.xselectionrequest);
1394 break; 1565 break;
1395 1566
1567 case MapNotify:
1568 mapped = 1;
1569#ifdef TEXT_BLINK
1570 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1571#endif
1572 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1573 break;
1574
1396 case UnmapNotify: 1575 case UnmapNotify:
1397 TermWin.mapped = 0; 1576 mapped = 0;
1398#ifdef TEXT_BLINK 1577#ifdef TEXT_BLINK
1399 text_blink_ev.stop (); 1578 text_blink_ev.stop ();
1400#endif 1579#endif
1401 break; 1580 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; 1581 break;
1409 1582
1410#ifdef TRANSPARENT 1583#ifdef TRANSPARENT
1411 case ReparentNotify: 1584 case ReparentNotify:
1412 rootwin_cb (ev); 1585 rootwin_cb (ev);
1413 break; 1586 break;
1414#endif /* TRANSPARENT */ 1587#endif /* TRANSPARENT */
1415 1588
1416 case GraphicsExpose: 1589 case GraphicsExpose:
1417 case Expose: 1590 case Expose:
1418 if (ev.xany.window == TermWin.vt) 1591 if (ev.xany.window == vt)
1419 { 1592 {
1420 do 1593 do
1421 scr_expose (ev.xexpose.x, ev.xexpose.y, 1594 scr_expose (ev.xexpose.x, ev.xexpose.y,
1422 ev.xexpose.width, ev.xexpose.height, False); 1595 ev.xexpose.width, ev.xexpose.height, False);
1423 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1596 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1424 1597
1425 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1598 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1426 1599
1427 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1600 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1428 scr_expose (ev.xexpose.x, ev.xexpose.y, 1601 scr_expose (ev.xexpose.x, ev.xexpose.y,
1429 ev.xexpose.width, ev.xexpose.height, False); 1602 ev.xexpose.width, ev.xexpose.height, False);
1430 1603
1431 scr_refresh (refresh_type); 1604 scr_refresh (refresh_type);
1432 } 1605 }
1433 else 1606 else
1434 { 1607 {
1435 XEvent unused_event; 1608 XEvent unused_event;
1436 1609
1437 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1610 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1438 ; 1611 ;
1439 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1612 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1440 ; 1613 ;
1441 1614
1442 if (isScrollbarWindow (ev.xany.window)) 1615 if (isScrollbarWindow (ev.xany.window))
1443 { 1616 {
1444 scrollBar.setIdle (); 1617 scrollBar.setIdle ();
… …
1448 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1621 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1449 menubar_expose (); 1622 menubar_expose ();
1450#endif 1623#endif
1451 1624
1452#ifdef TRANSPARENT 1625#ifdef TRANSPARENT
1453 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1626 if (am_transparent && ev.xany.window == parent[0])
1454 XClearWindow (display->display, ev.xany.window); 1627 XClearWindow (disp, ev.xany.window);
1455#endif 1628#endif
1456 } 1629 }
1457 break; 1630 break;
1458 1631
1459 case MotionNotify: 1632 case MotionNotify:
… …
1466 { 1639 {
1467 menubar_control (ev.xbutton); 1640 menubar_control (ev.xbutton);
1468 break; 1641 break;
1469 } 1642 }
1470#endif 1643#endif
1471 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1644 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1472 break; 1645 break;
1473 1646
1474 if (ev.xany.window == TermWin.vt) 1647 if (ev.xany.window == vt)
1475 { 1648 {
1649 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1650 ; // nop
1476 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1651 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1477 { 1652 {
1478 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1653 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1479 ; 1654 ;
1480 1655
1481 XQueryPointer (display->display, TermWin.vt, 1656 XQueryPointer (disp, vt,
1482 &unused_root, &unused_child, 1657 &unused_root, &unused_child,
1483 &unused_root_x, &unused_root_y, 1658 &unused_root_x, &unused_root_y,
1484 & (ev.xbutton.x), & (ev.xbutton.y), 1659 &ev.xbutton.x, &ev.xbutton.y,
1485 &unused_mask); 1660 &ev.xbutton.state);
1486#ifdef MOUSE_THRESHOLD 1661#ifdef MOUSE_THRESHOLD
1487 /* deal with a `jumpy' mouse */ 1662 /* deal with a `jumpy' mouse */
1488 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1663 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1489 { 1664 {
1490#endif 1665#endif
1666#if ISO_14755
1667 // 5.4
1668 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1669 {
1670 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1671 break;
1672 }
1673#endif
1491 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1674 selection_extend (ev.xbutton.x, ev.xbutton.y,
1492 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1675 ev.xbutton.state & Button3Mask ? 2 : 0);
1676
1493#ifdef SELECTION_SCROLLING 1677#ifdef SELECTION_SCROLLING
1494 if (ev.xbutton.y < TermWin.int_bwidth 1678 if (ev.xbutton.y < int_bwidth
1495 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1679 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1496 { 1680 {
1497 int dist; 1681 int dist;
1498 1682
1499 /* don't clobber the current delay if we are 1683 /* don't clobber the current delay if we are
1500 * already in the middle of scrolling. 1684 * already in the middle of scrolling.
… …
1503 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1687 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1504 1688
1505 /* save the event params so we can highlight 1689 /* save the event params so we can highlight
1506 * the selection in the pending-scroll loop 1690 * the selection in the pending-scroll loop
1507 */ 1691 */
1508 selection_save_x=ev.xbutton.x; 1692 selection_save_x = ev.xbutton.x;
1509 selection_save_y=ev.xbutton.y; 1693 selection_save_y = ev.xbutton.y;
1510 selection_save_state=
1511 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1694 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1512 1695
1513 /* calc number of lines to scroll */ 1696 /* calc number of lines to scroll */
1514 if (ev.xbutton.y<TermWin.int_bwidth) 1697 if (ev.xbutton.y < int_bwidth)
1515 { 1698 {
1516 scroll_selection_dir = UP; 1699 scroll_selection_dir = UP;
1517 dist = TermWin.int_bwidth - ev.xbutton.y; 1700 dist = int_bwidth - ev.xbutton.y;
1518 } 1701 }
1519 else 1702 else
1520 { 1703 {
1521 scroll_selection_dir = DN; 1704 scroll_selection_dir = DN;
1522 dist = ev.xbutton.y - 1705 dist = ev.xbutton.y - (int_bwidth + height);
1523 (TermWin.int_bwidth + TermWin.height);
1524 } 1706 }
1707
1525 scroll_selection_lines= (Pixel2Height (dist)/ 1708 scroll_selection_lines = Pixel2Height (dist)
1526 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1709 / SELECTION_SCROLL_LINE_SPEEDUP
1710 + 1;
1527 MIN_IT (scroll_selection_lines, 1711 min_it (scroll_selection_lines,
1528 SELECTION_SCROLL_MAX_LINES); 1712 SELECTION_SCROLL_MAX_LINES);
1529 } 1713 }
1530 else 1714 else
1531 { 1715 {
1532 /* we are within the text window, so we 1716 /* we are within the text window, so we
1533 * shouldn't be scrolling 1717 * shouldn't be scrolling
… …
1535 if (sel_scroll_ev.active) 1719 if (sel_scroll_ev.active)
1536 sel_scroll_ev.stop(); 1720 sel_scroll_ev.stop();
1537 } 1721 }
1538#endif 1722#endif
1539#ifdef MOUSE_THRESHOLD 1723#ifdef MOUSE_THRESHOLD
1540
1541 } 1724 }
1542#endif 1725#endif
1543
1544 } 1726 }
1545 } 1727 }
1546 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1728 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1547 { 1729 {
1548 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1730 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1549 MotionNotify, &ev)) ; 1731 MotionNotify, &ev))
1732 ;
1733
1550 XQueryPointer (display->display, scrollBar.win, 1734 XQueryPointer (disp, scrollBar.win,
1551 &unused_root, &unused_child, 1735 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1736 &unused_root_x, &unused_root_y,
1553 & (ev.xbutton.x), & (ev.xbutton.y), 1737 &ev.xbutton.x, &ev.xbutton.y,
1554 &unused_mask); 1738 &unused_mask);
1555 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1739 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1556 scrollbar_size ()); 1740 scrollbar_size ());
1557 scr_refresh (refresh_type); 1741 scr_refresh (refresh_type);
1558 refresh_limit = 0; 1742 refresh_limit = 0;
… …
1560 } 1744 }
1561 break; 1745 break;
1562 } 1746 }
1563} 1747}
1564 1748
1749void
1750rxvt_term::focus_in ()
1751{
1752 if (!focus)
1753 {
1754 focus = 1;
1755 want_refresh = 1;
1756
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1758
1759#if USE_XIM
1760 if (Input_Context != NULL)
1761 {
1762 IMSetStatusPosition ();
1763 XSetICFocus (Input_Context);
1764 }
1765#endif
1766#if CURSOR_BLINK
1767 if (OPTION (Opt_cursorBlink))
1768 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1769#endif
1770#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade])
1772 {
1773 pix_colors = pix_colors_focused;
1774 scr_recolour ();
1775 }
1776#endif
1777 }
1778}
1779
1780void
1781rxvt_term::focus_out ()
1782{
1783 if (focus)
1784 {
1785 focus = 0;
1786 want_refresh = 1;
1787
1788 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1789
1790#if ENABLE_FRILLS || ISO_14755
1791 if (iso14755buf)
1792 {
1793 iso14755buf = 0;
1794# if ENABLE_OVERLAY
1795 scr_overlay_off ();
1796# endif
1797 }
1798#endif
1799#if USE_XIM
1800 if (Input_Context != NULL)
1801 XUnsetICFocus (Input_Context);
1802#endif
1803#if CURSOR_BLINK
1804 if (OPTION (Opt_cursorBlink))
1805 cursor_blink_ev.stop ();
1806 hidden_cursor = 0;
1807#endif
1808#if OFF_FOCUS_FADING
1809 if (rs[Rs_fade])
1810 {
1811 pix_colors = pix_colors_unfocused;
1812 scr_recolour ();
1813 }
1814#endif
1815 }
1816}
1817
1565#if TRANSPARENT 1818#if TRANSPARENT
1566void 1819void
1567rxvt_term::rootwin_cb (XEvent &ev) 1820rxvt_term::rootwin_cb (XEvent &ev)
1568{ 1821{
1569 SET_R (this); 1822 SET_R (this);
… …
1574 case PropertyNotify: 1827 case PropertyNotify:
1575 /* 1828 /*
1576 * if user used some Esetroot compatible prog to set the root bg, 1829 * 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. 1830 * use the property to determine the pixmap. We use it later on.
1578 */ 1831 */
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]) 1832 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1833 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1583 return; 1834 return;
1584 1835
1585 /* FALLTHROUGH */ 1836 /* FALLTHROUGH */
1586 case ReparentNotify: 1837 case ReparentNotify:
1587 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1838 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1588 want_refresh = want_full_refresh = 1; 1839 want_refresh = want_full_refresh = 1;
1589 break; 1840 break;
1590 } 1841 }
1591} 1842}
1592#endif 1843#endif
… …
1595rxvt_term::button_press (XButtonEvent &ev) 1846rxvt_term::button_press (XButtonEvent &ev)
1596{ 1847{
1597 int reportmode = 0, clickintime; 1848 int reportmode = 0, clickintime;
1598 1849
1599 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1850 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1851
1600 if (!bypass_keystate) 1852 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1853 reportmode = !! (priv_modes & PrivMode_mouse_report);
1854
1602 /* 1855 /*
1603 * VT window processing of button press 1856 * VT window processing of button press
1604 */ 1857 */
1605 if (ev.window == TermWin.vt) 1858 if (ev.window == vt)
1606 { 1859 {
1860#if ISO_14755
1861 // 5.4
1862 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1863 {
1864 iso14755_54 (ev.x, ev.y);
1865 return;
1866 }
1867#endif
1868
1607 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1869 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1870
1608 if (reportmode) 1871 if (reportmode)
1609 { 1872 {
1610 /* mouse report from vt window */ 1873 /* mouse report from vt window */
1611 /* save the xbutton state (for ButtonRelease) */ 1874 /* save the xbutton state (for ButtonRelease) */
1612 MEvent.state = ev.state; 1875 MEvent.state = ev.state;
1613#ifdef MOUSE_REPORT_DOUBLECLICK 1876#ifdef MOUSE_REPORT_DOUBLECLICK
1614 if (ev.button == MEvent.button && clickintime) 1877 if (ev.button == MEvent.button && clickintime)
1615 { 1878 {
1616 /* same button, within alloted time */ 1879 /* same button, within alloted time */
1617 MEvent.clicks++; 1880 MEvent.clicks++;
1881
1618 if (MEvent.clicks > 1) 1882 if (MEvent.clicks > 1)
1619 { 1883 {
1620 /* only report double clicks */ 1884 /* only report double clicks */
1621 MEvent.clicks = 2; 1885 MEvent.clicks = 2;
1622 mouse_report (ev); 1886 mouse_report (ev);
… …
1641 } 1905 }
1642 else 1906 else
1643 { 1907 {
1644 if (ev.button != MEvent.button) 1908 if (ev.button != MEvent.button)
1645 MEvent.clicks = 0; 1909 MEvent.clicks = 0;
1910
1911 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1646 switch (ev.button) 1912 switch (ev.button)
1647 { 1913 {
1648 case Button1: 1914 case Button1:
1915 /* allow meta + click to select rectangular areas */
1916 /* should be done in screen.C */
1917#if ENABLE_FRILLS
1918 selection.rect = !!(ev.state & ModMetaMask);
1919#else
1920 selection.rect = false;
1921#endif
1922
1649 /* allow shift+left click to extend selection */ 1923 /* allow shift+left click to extend selection */
1650 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1924 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1651 { 1925 {
1652 if (MEvent.button == Button1 && clickintime) 1926 if (MEvent.button == Button1 && clickintime)
1653 selection_rotate (ev.x, ev.y); 1927 selection_rotate (ev.x, ev.y);
1654 else 1928 else
1655 selection_extend (ev.x, ev.y, 1); 1929 selection_extend (ev.x, ev.y, 1);
1656 } 1930 }
1657 else 1931 else
1658 { 1932 {
1659 if (MEvent.button == Button1 && clickintime) 1933 if (MEvent.button == Button1 && clickintime)
1660 MEvent.clicks++; 1934 MEvent.clicks++;
1661 else 1935 else
1662 MEvent.clicks = 1; 1936 MEvent.clicks = 1;
1663 1937
1664 selection_click (MEvent.clicks, ev.x, ev.y); 1938 selection_click (MEvent.clicks, ev.x, ev.y);
1665 } 1939 }
1666 1940
1667 MEvent.button = Button1; 1941 MEvent.button = Button1;
1668 break; 1942 break;
1669 1943
1670 case Button3: 1944 case Button3:
1671 if (MEvent.button == Button3 && clickintime) 1945 if (MEvent.button == Button3 && clickintime)
1672 selection_rotate (ev.x, ev.y); 1946 selection_rotate (ev.x, ev.y);
1673 else 1947 else
1674 selection_extend (ev.x, ev.y, 1); 1948 selection_extend (ev.x, ev.y, 1);
1949
1675 MEvent.button = Button3; 1950 MEvent.button = Button3;
1676 break; 1951 break;
1677 } 1952 }
1678 } 1953 }
1954
1679 MEvent.time = ev.time; 1955 MEvent.time = ev.time;
1680 return; 1956 return;
1681 } 1957 }
1682 1958
1683 /* 1959 /*
… …
1794 case Button3: 2070 case Button3:
1795 if (scrollBar.style != R_SB_XTERM) 2071 if (scrollBar.style != R_SB_XTERM)
1796 { 2072 {
1797 if (scrollbar_above_slider (ev.y)) 2073 if (scrollbar_above_slider (ev.y))
1798# ifdef RXVT_SCROLL_FULL 2074# ifdef RXVT_SCROLL_FULL
1799 scr_page (UP, TermWin.nrow - 1); 2075 scr_page (UP, nrow - 1);
1800# else 2076# else
1801 scr_page (UP, TermWin.nrow / 4); 2077 scr_page (UP, nrow / 4);
1802# endif 2078# endif
1803 else if (scrollbar_below_slider (ev.y)) 2079 else if (scrollbar_below_slider (ev.y))
1804# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
1805 scr_page (DN, TermWin.nrow - 1); 2081 scr_page (DN, nrow - 1);
1806# else 2082# else
1807 scr_page (DN, TermWin.nrow / 4); 2083 scr_page (DN, nrow / 4);
1808# endif 2084# endif
1809 else 2085 else
1810 scrollBar.setMotion (); 2086 scrollBar.setMotion ();
1811 } 2087 }
1812 else 2088 else
1813 { 2089 {
1814 scr_page ((ev.button == Button1 ? DN : UP), 2090 scr_page ((ev.button == Button1 ? DN : UP),
1815 (TermWin.nrow 2091 (nrow
1816 * scrollbar_position (ev.y) 2092 * scrollbar_position (ev.y)
1817 / scrollbar_size ())); 2093 / scrollbar_size ()));
1818 } 2094 }
1819 2095
1820 break; 2096 break;
1821 } 2097 }
1822 } 2098 }
2099
1823 return; 2100 return;
1824 } 2101 }
2102
1825#if MENUBAR 2103#if MENUBAR
1826 /* 2104 /*
1827 * Menubar window processing of button press 2105 * Menubar window processing of button press
1828 */ 2106 */
1829 if (isMenuBarWindow (ev.window)) 2107 if (isMenuBarWindow (ev.window))
… …
1836{ 2114{
1837 int reportmode = 0; 2115 int reportmode = 0;
1838 2116
1839 csrO = 0; /* reset csr Offset */ 2117 csrO = 0; /* reset csr Offset */
1840 if (!bypass_keystate) 2118 if (!bypass_keystate)
1841 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2119 reportmode = !! (priv_modes & PrivMode_mouse_report);
1842 2120
1843 if (scrollbar_isUpDn ()) 2121 if (scrollbar_isUpDn ())
1844 { 2122 {
1845 scrollBar.setIdle (); 2123 scrollBar.setIdle ();
1846 scrollbar_show (0); 2124 scrollbar_show (0);
1847#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2125#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1848 refresh_type &= ~SMOOTH_REFRESH; 2126 refresh_type &= ~SMOOTH_REFRESH;
1849#endif 2127#endif
1850
1851 } 2128 }
2129
1852#ifdef SELECTION_SCROLLING 2130#ifdef SELECTION_SCROLLING
1853 if (sel_scroll_ev.active) 2131 if (sel_scroll_ev.active)
1854 sel_scroll_ev.stop(); 2132 sel_scroll_ev.stop();
1855#endif 2133#endif
2134
1856 if (ev.window == TermWin.vt) 2135 if (ev.window == vt)
1857 { 2136 {
2137#if ISO_14755
2138 // 5.4
2139 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2140 return;
2141#endif
1858 if (reportmode) 2142 if (reportmode)
1859 { 2143 {
1860 /* mouse report from vt window */ 2144 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */ 2145 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4) 2146 if (ev.button >= 4)
… …
1876 MEvent.button = AnyButton; 2160 MEvent.button = AnyButton;
1877 mouse_report (ev); 2161 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2162#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2163 return;
1880 } 2164 }
2165
1881 /* 2166 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2167 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2168 * when overriding mouse reporting
1884 */ 2169 */
1885 if (PrivateModes & PrivMode_mouse_report 2170 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2171 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2172 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2173 selection_extend (ev.x, ev.y, 0);
2174
2175 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2176 return;
1889 2177
1890 switch (ev.button) 2178 switch (ev.button)
1891 { 2179 {
1892 case Button1: 2180 case Button1:
1893 case Button3: 2181 case Button3:
… …
1905 2193
1906 v = ev.button == Button4 ? UP : DN; 2194 v = ev.button == Button4 ? UP : DN;
1907 2195
1908 if (ev.state & ShiftMask) 2196 if (ev.state & ShiftMask)
1909 i = 1; 2197 i = 1;
1910 else if (Options & Opt_mouseWheelScrollPage) 2198 else if (OPTION (Opt_mouseWheelScrollPage))
1911 i = TermWin.nrow - 1; 2199 i = nrow - 1;
1912 else 2200 else
1913 i = 5; 2201 i = 5;
1914 2202
1915# ifdef MOUSE_SLIP_WHEELING 2203# ifdef MOUSE_SLIP_WHEELING
1916 if (ev.state & ControlMask) 2204 if (ev.state & ControlMask)
1917 { 2205 {
1918 mouse_slip_wheel_speed += v ? -1 : 1; 2206 mouse_slip_wheel_speed += v ? -1 : 1;
1919 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2207 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; 2208 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1921 2209
1922 if (slip_wheel_ev.at < NOW) 2210 if (slip_wheel_ev.at < NOW)
1923 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2211 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1924 2212
1925 slip_wheel_ev.start (); 2213 slip_wheel_ev.start ();
… …
1966 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2254 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1967 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2255 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1968 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2256 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1969 int i; 2257 int i;
1970 2258
1971 Visual* visual = display->visual; 2259 Visual *visual = display->visual;
1972 2260
1973 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2261 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1974 2262
1975 /* for convenience */ 2263 /* for convenience */
1976 mask_r = visual->red_mask; 2264 mask_r = visual->red_mask;
… …
2197 Atom atype; 2485 Atom atype;
2198 unsigned char *prop = NULL; 2486 unsigned char *prop = NULL;
2199 Window root, oldp, *list; 2487 Window root, oldp, *list;
2200 Pixmap rootpixmap = None; 2488 Pixmap rootpixmap = None;
2201 XWindowAttributes wattr, wrootattr; 2489 XWindowAttributes wattr, wrootattr;
2490 dDisp;
2202 2491
2203 pchanged = 0; 2492 pchanged = 0;
2204 2493
2205 if (!(Options & Opt_transparent)) 2494 if (!OPTION (Opt_transparent))
2206 return pchanged; /* Don't try any more */ 2495 return pchanged; /* Don't try any more */
2207 2496
2208 XGetWindowAttributes (display->display, display->root, &wrootattr); 2497 XGetWindowAttributes (disp, display->root, &wrootattr);
2209 rootdepth = wrootattr.depth; 2498 rootdepth = wrootattr.depth;
2210 2499
2211 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2500 XGetWindowAttributes (disp, parent[0], &wattr);
2212 2501
2213 if (rootdepth != wattr.depth) 2502 if (rootdepth != wattr.depth)
2214 { 2503 {
2215 if (am_transparent) 2504 if (am_transparent)
2216 { 2505 {
2217 pchanged = 1; 2506 pchanged = 1;
2218 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2507 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2219 am_transparent = am_pixmap_trans = 0; 2508 am_transparent = am_pixmap_trans = 0;
2220 } 2509 }
2221 2510
2222 return pchanged; /* Don't try any more */ 2511 return pchanged; /* Don't try any more */
2223 } 2512 }
2224 2513
2225 /* Get all X ops out of the queue so that our information is up-to-date. */ 2514 /* Get all X ops out of the queue so that our information is up-to-date. */
2226 XSync (display->display, False); 2515 XSync (disp, False);
2227 2516
2228 /* 2517 /*
2229 * Make the frame window set by the window manager have 2518 * Make the frame window set by the window manager have
2230 * the root background. Some window managers put multiple nested frame 2519 * the root background. Some window managers put multiple nested frame
2231 * windows for each client, so we have to take care about that. 2520 * windows for each client, so we have to take care about that.
2232 */ 2521 */
2233 i = (xa[XA_XROOTPMAPID] 2522 i = (xa[XA_XROOTPMAP_ID]
2234 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2523 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2235 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2524 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2236 &nitems, &bytes_after, &prop) == Success); 2525 &nitems, &bytes_after, &prop) == Success);
2237 2526
2238 if (!i || prop == NULL) 2527 if (!i || prop == NULL)
2239 i = (xa[XA_XSETROOTID] 2528 i = (xa[XA_ESETROOT_PMAP_ID]
2240 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2529 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2241 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2530 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2242 &nitems, &bytes_after, &prop) == Success); 2531 &nitems, &bytes_after, &prop) == Success);
2243 2532
2244 if (!i || prop == NULL 2533 if (!i || prop == NULL
2245#if TINTING 2534#if TINTING
… …
2264 Window cr; 2553 Window cr;
2265 XImage *image; 2554 XImage *image;
2266 GC gc; 2555 GC gc;
2267 XGCValues gcvalue; 2556 XGCValues gcvalue;
2268 2557
2269 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2558 XTranslateCoordinates (disp, parent[0], display->root,
2270 0, 0, &sx, &sy, &cr); 2559 0, 0, &sx, &sy, &cr);
2271 nw = (unsigned int)szHint.width; 2560 nw = (unsigned int)szHint.width;
2272 nh = (unsigned int)szHint.height; 2561 nh = (unsigned int)szHint.height;
2273 nx = ny = 0; 2562 nx = ny = 0;
2274 2563
… …
2284 nh += sy; 2573 nh += sy;
2285 ny = -sy; 2574 ny = -sy;
2286 sy = 0; 2575 sy = 0;
2287 } 2576 }
2288 2577
2289 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2578 min_it (nw, (unsigned int) (wrootattr.width - sx));
2290 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2579 min_it (nh, (unsigned int) (wrootattr.height - sy));
2580
2581 XSync (disp, False);
2291 allowedxerror = -1; 2582 allowedxerror = -1;
2292 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2583 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2293 2584
2294 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2585 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2295 /* XXX: may need a delay here? */ 2586 /* XXX: may need a delay here? */
2296 allowedxerror = 0; 2587 allowedxerror = 0;
2297 2588
2298 if (image == NULL) 2589 if (image == NULL)
2299 { 2590 {
2300 if (am_transparent && am_pixmap_trans) 2591 if (am_transparent && am_pixmap_trans)
2301 { 2592 {
2302 pchanged = 1; 2593 pchanged = 1;
2303 if (TermWin.pixmap != None) 2594 if (pixmap != None)
2304 { 2595 {
2305 XFreePixmap (display->display, TermWin.pixmap); 2596 XFreePixmap (disp, pixmap);
2306 TermWin.pixmap = None; 2597 pixmap = None;
2307 } 2598 }
2308 } 2599 }
2309 2600
2310 am_pixmap_trans = 0; 2601 am_pixmap_trans = 0;
2311 } 2602 }
2312 else 2603 else
2313 { 2604 {
2314 if (TermWin.pixmap != None) 2605 if (pixmap != None)
2315 XFreePixmap (display->display, TermWin.pixmap); 2606 XFreePixmap (disp, pixmap);
2316 2607
2317#if TINTING 2608#if TINTING
2318 if (ISSET_PIXCOLOR (Color_tint)) 2609 if (ISSET_PIXCOLOR (Color_tint))
2319 { 2610 {
2320 unsigned short rm, gm, bm; 2611 unsigned short rm, gm, bm;
2321 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2612 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2322 2613
2323 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2614 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2324 2615
2325 ShadeXImage (display, image, shade, rm, gm, bm); 2616 ShadeXImage (display, image, shade, rm, gm, bm);
2326 } 2617 }
2327#endif 2618#endif
2328 2619
2329 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2620 pixmap = XCreatePixmap (disp, vt,
2330 szHint.width, szHint.height, image->depth); 2621 szHint.width, szHint.height, image->depth);
2331 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2622 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2332 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2623 XPutImage (disp, pixmap, gc, image, 0, 0,
2333 nx, ny, image->width, image->height); 2624 nx, ny, image->width, image->height);
2334 XFreeGC (display->display, gc); 2625 XFreeGC (disp, gc);
2335 XDestroyImage (image); 2626 XDestroyImage (image);
2336 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2627 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2337 XClearWindow (display->display, TermWin.parent[0]); 2628 XClearWindow (disp, parent[0]);
2338 2629
2339 if (!am_transparent || !am_pixmap_trans) 2630 if (!am_transparent || !am_pixmap_trans)
2340 pchanged = 1; 2631 pchanged = 1;
2341 2632
2342 am_transparent = am_pixmap_trans = 1; 2633 am_transparent = am_pixmap_trans = 1;
2343 } 2634 }
2344 } 2635 }
2345 2636
2346 if (!am_pixmap_trans) 2637 if (am_pixmap_trans)
2638 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2639 else
2347 { 2640 {
2348 unsigned int n; 2641 unsigned int n;
2349 /* 2642 /*
2350 * InheritPixmap transparency 2643 * InheritPixmap transparency
2351 */ 2644 */
2352 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2353 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2645 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2354 { 2646 {
2355 oldp = TermWin.parent[i]; 2647 oldp = parent[i];
2356 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2648 XQueryTree (disp, parent[i - 1], &root,
2357 &TermWin.parent[i], &list, &n); 2649 &parent[i], &list, &n);
2358 XFree (list); 2650 XFree (list);
2359 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2360 2651
2361 if (TermWin.parent[i] == display->root) 2652 if (parent[i] == display->root)
2362 { 2653 {
2363 if (oldp != None) 2654 if (oldp != None)
2364 pchanged = 1; 2655 pchanged = 1;
2365 2656
2366 break; 2657 break;
2367 } 2658 }
2368 2659
2369 if (oldp != TermWin.parent[i]) 2660 if (oldp != parent[i])
2370 pchanged = 1; 2661 pchanged = 1;
2371 } 2662 }
2372 2663
2373 n = 0; 2664 n = 0;
2374 2665
2375 if (pchanged) 2666 if (pchanged)
2376 { 2667 {
2377 for (; n < (unsigned int)i; n++) 2668 for (; n < (unsigned int)i; n++)
2378 { 2669 {
2379 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2670 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) 2671 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2382 { 2672 {
2383 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2673 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2384 break; 2674 break;
2385 } 2675 }
2386 } 2676 }
2387 } 2677 }
2388 2678
2389 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2679 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2390 { 2680 {
2391 D_X ((stderr, "InheritPixmap Turning off"));
2392 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2681 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2393 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2682 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2394 am_transparent = 0; 2683 am_transparent = 0;
2395 /* XXX: also turn off Opt_transparent? */ 2684 /* XXX: also turn off Opt_transparent? */
2396 } 2685 }
2397 else 2686 else
2398 { 2687 {
2399#if WAIT_FOR_WM 2688#if WAIT_FOR_WM
2400 /* wait (an arbitrary period) for the WM to do its thing 2689 /* wait (an arbitrary period) for the WM to do its thing
2401 * needed for fvwm2.2.2 (and before?) */ 2690 * needed for fvwm2.2.2 (and before?) */
2402 sleep (1); 2691 sleep (1);
2403#endif 2692#endif
2404 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2405 for (n = 0; n < (unsigned int)i; n++) 2693 for (n = 0; n < (unsigned int)i; n++)
2406 { 2694 {
2407 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2695 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2408 XClearWindow (display->display, TermWin.parent[n]); 2696 XClearWindow (disp, parent[n]);
2409 } 2697 }
2410 2698
2411 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2699 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2412 am_transparent = 1; 2700 am_transparent = 1;
2413 } 2701 }
2414 2702
2415 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2703 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2416 TermWin.parent[i] = None; 2704 parent[i] = None;
2417 } 2705 }
2418 2706
2419 // this is experimental
2420 if (scrollBar.win) 2707 if (scrollBar.win)
2421 { 2708 {
2422 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2709 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2423 XClearWindow (display->display, scrollBar.win);
2424 scrollBar.setIdle (); 2710 scrollBar.setIdle ();
2425 scrollbar_show (0); 2711 scrollbar_show (0);
2426 } 2712 }
2427 2713
2714 if (am_transparent)
2715 {
2716 want_refresh = want_full_refresh = 1;
2717 if (am_pixmap_trans)
2718 flush ();
2719 }
2720
2428 return pchanged; 2721 return pchanged;
2429} 2722}
2430#endif 2723#endif
2431 2724
2432/*}}} */ 2725/*}}} */
2433 2726
2434bool 2727bool
2435rxvt_term::cmd_parse () 2728rxvt_term::cmd_parse ()
2436{ 2729{
2437 bool flag = false; 2730 bool flag = false;
2438 unicode_t ch = NOCHAR; 2731 wchar_t ch = NOCHAR;
2439 unsigned char *seq_begin; // remember start of esc-sequence here 2732 char *seq_begin; // remember start of esc-sequence here
2440 2733
2441 for (;;) 2734 for (;;)
2442 { 2735 {
2443 if (ch == NOCHAR) 2736 if (ch == NOCHAR)
2444 { 2737 {
2445 seq_begin = cmdbuf_ptr; 2738 seq_begin = cmdbuf_ptr;
2446 ch = next_char (); 2739 ch = next_char ();
2447 }
2448 2740
2449 if (ch == NOCHAR) // TODO: improve 2741 if (ch == NOCHAR)
2450 break; 2742 break;
2743 }
2451 2744
2452 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2745 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2453 { 2746 {
2747 if (!seen_input)
2748 {
2749 seen_input = 1;
2750 // many badly-written programs (e.g. jed) contain a race condition:
2751 // they first read the screensize and then install a SIGWINCH handler.
2752 // some window managers resize the window early, and these programs
2753 // then sometimes get the size wrong.
2754 // unfortunately other programs are even more buggy and dislike
2755 // being sent SIGWINCH, so only do it when we were in fact being
2756 // resized.
2757 if (seen_resize && cmd_pid)
2758 kill (-cmd_pid, SIGWINCH);
2759 }
2760
2454 /* Read a text string from the input buffer */ 2761 /* Read a text string from the input buffer */
2455 unicode_t buf[UBUFSIZ]; 2762 wchar_t buf[UBUFSIZ];
2456 bool refreshnow = false; 2763 bool refreshnow = false;
2457 int nlines = 0; 2764 int nlines = 0;
2458 unicode_t *str = buf; 2765 wchar_t *str = buf;
2766 wchar_t *eol = str + min (ncol, UBUFSIZ);
2459 2767
2460 for (;;) 2768 for (;;)
2461 { 2769 {
2462 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2770 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2463 break; 2771 break;
2464 2772
2465 *str++ = ch; 2773 *str++ = ch;
2466 2774
2467 if (ch == C0_LF) 2775 if (ch == C0_LF || str >= eol)
2468 { 2776 {
2777 if (ch == C0_LF)
2469 nlines++; 2778 nlines++;
2779
2470 refresh_count++; 2780 refresh_count++;
2471 2781
2472 if (!(Options & Opt_jumpScroll) 2782 if (!OPTION (Opt_jumpScroll)
2473 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2783 || (refresh_count >= refresh_limit * (nrow - 1)))
2474 { 2784 {
2475 refreshnow = true; 2785 refreshnow = true;
2786 refresh_count = 0;
2476 ch = NOCHAR; 2787 ch = NOCHAR;
2477 break; 2788 break;
2478 } 2789 }
2479 2790
2480 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2791 // scr_add_lines only works for nlines <= nrow - 1.
2481 if (nlines >= TermWin.nrow - 1) 2792 if (nlines >= nrow - 1)
2482 { 2793 {
2794 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2483 scr_add_lines (buf, nlines, str - buf); 2795 scr_add_lines (buf, str - buf, nlines);
2796
2484 nlines = 0; 2797 nlines = 0;
2485 str = buf; 2798 str = buf;
2799 eol = str + min (ncol, UBUFSIZ);
2486 } 2800 }
2487 }
2488 2801
2489 if (str >= buf + UBUFSIZ) 2802 if (str >= eol)
2490 { 2803 {
2804 if (eol >= buf + UBUFSIZ)
2805 {
2491 ch = NOCHAR; 2806 ch = NOCHAR;
2492 break; 2807 break;
2808 }
2809 else
2810 eol = min (eol + ncol, buf + UBUFSIZ);
2811 }
2812
2493 } 2813 }
2494 2814
2495 seq_begin = cmdbuf_ptr; 2815 seq_begin = cmdbuf_ptr;
2496 ch = next_char (); 2816 ch = next_char ();
2497 } 2817 }
2498 2818
2819 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2499 scr_add_lines (buf, nlines, str - buf); 2820 scr_add_lines (buf, str - buf, nlines);
2500 2821
2501 /* 2822 /*
2502 * If there have been a lot of new lines, then update the screen 2823 * 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. 2824 * 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 2825 * the number of pages between refreshes is refresh_limit, which
2505 * is incremented here because we must be doing flat-out scrolling. 2826 * is incremented here because we must be doing flat-out scrolling.
2506 */ 2827 */
2507 if (refreshnow) 2828 if (refreshnow)
2508 { 2829 {
2509 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2830 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2510 refresh_limit++; 2831 refresh_limit++;
2511 else 2832 else
2512 { 2833 {
2513 flag = true; 2834 flag = true;
2514 scr_refresh (refresh_type); 2835 scr_refresh (refresh_type);
2836 flush_ev.stop ();
2515 } 2837 }
2516 } 2838 }
2517 2839
2518 } 2840 }
2519 else 2841 else
… …
2534 } 2856 }
2535 2857
2536 return flag; 2858 return flag;
2537} 2859}
2538 2860
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 2861// read the next character
2549unicode_t 2862wchar_t
2550rxvt_term::next_char () 2863rxvt_term::next_char ()
2551{ 2864{
2552 while (cmdbuf_ptr < cmdbuf_endp) 2865 while (cmdbuf_ptr < cmdbuf_endp)
2553 { 2866 {
2554 // assume 7-bit to be ascii ALWAYS 2867 // assume 7-bit to be ascii ALWAYS
2555 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2868 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2556 return *cmdbuf_ptr++; 2869 return *cmdbuf_ptr++;
2557 2870
2558 wchar_t wc; 2871 wchar_t wc;
2559 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2872 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2560 2873
2561 if (len == (size_t)-2) 2874 if (len == (size_t)-2)
2562 { 2875 {
2563 // the mbstate stores incomplete sequences. didn't know this :/ 2876 // the mbstate stores incomplete sequences. didn't know this :/
2564 cmdbuf_ptr = cmdbuf_endp; 2877 cmdbuf_ptr = cmdbuf_endp;
2565 break; 2878 break;
2566 } 2879 }
2567 2880
2568 if (len == (size_t)-1) 2881 if (len == (size_t)-1)
2569 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2882 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2570 2883
2571 // assume wchar == unicode 2884 // assume wchar == unicode
2572 cmdbuf_ptr += len; 2885 cmdbuf_ptr += len;
2573 return wc; 2886 return wc & UNICODE_MASK;
2574 } 2887 }
2575 2888
2576 return NOCHAR; 2889 return NOCHAR;
2890}
2891
2892// read the next octet
2893uint32_t
2894rxvt_term::next_octet ()
2895{
2896 return cmdbuf_ptr < cmdbuf_endp
2897 ? (unsigned char)*cmdbuf_ptr++
2898 : NOCHAR;
2577} 2899}
2578 2900
2579/* rxvt_cmd_getc () - Return next input character */ 2901/* rxvt_cmd_getc () - Return next input character */
2580/* 2902/*
2581 * Return the next input character after first passing any keyboard input 2903 * Return the next input character after first passing any keyboard input
2582 * to the command. 2904 * to the command.
2583 */ 2905 */
2584unicode_t 2906wchar_t
2585rxvt_term::cmd_getc () 2907rxvt_term::cmd_getc ()
2586{ 2908{
2587 unicode_t c = next_char (); 2909 wchar_t c = next_char ();
2588 2910
2589 if (c == NOCHAR) 2911 if (c == NOCHAR)
2590 throw out_of_input; 2912 throw out_of_input;
2591 2913
2592 return c; 2914 return c;
2593} 2915}
2594 2916
2595unicode_t 2917uint32_t
2596rxvt_term::cmd_get8 () 2918rxvt_term::cmd_get8 ()
2597{ 2919{
2598 unicode_t c = next_octet (); 2920 uint32_t c = next_octet ();
2599 2921
2600 if (c == NOCHAR) 2922 if (c == NOCHAR)
2601 throw out_of_input; 2923 throw out_of_input;
2602 2924
2603 return c; 2925 return c;
… …
2703 case C0_ESC: 3025 case C0_ESC:
2704 process_escape_seq (); 3026 process_escape_seq ();
2705 break; 3027 break;
2706 case C0_ENQ: /* terminal Status */ 3028 case C0_ENQ: /* terminal Status */
2707 if (rs[Rs_answerbackstring]) 3029 if (rs[Rs_answerbackstring])
2708 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3030 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2709 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2710 else 3031 else
2711 tt_write ((unsigned char *)VT100_ANS, 3032 tt_write (VT100_ANS, strlen (VT100_ANS));
2712 (unsigned int)STRLEN (VT100_ANS));
2713 break; 3033 break;
2714 case C0_BEL: /* bell */ 3034 case C0_BEL: /* bell */
2715 scr_bell (); 3035 scr_bell ();
2716 break; 3036 break;
2717 case C0_BS: /* backspace */ 3037 case C0_BS: /* backspace */
… …
2816void 3136void
2817rxvt_term::process_escape_seq () 3137rxvt_term::process_escape_seq ()
2818{ 3138{
2819 unicode_t ch = cmd_getc (); 3139 unicode_t ch = cmd_getc ();
2820 3140
2821 if (PrivateModes & PrivMode_vt52) 3141 if (priv_modes & PrivMode_vt52)
2822 { 3142 {
2823 process_escape_vt52 (ch); 3143 process_escape_vt52 (ch);
2824 return; 3144 return;
2825 } 3145 }
2826 3146
… …
2841 scr_charset_set (2, (unsigned int)cmd_getc ()); 3161 scr_charset_set (2, (unsigned int)cmd_getc ());
2842 break; 3162 break;
2843 case '+': 3163 case '+':
2844 scr_charset_set (3, (unsigned int)cmd_getc ()); 3164 scr_charset_set (3, (unsigned int)cmd_getc ());
2845 break; 3165 break;
2846#ifndef NO_FRILLS 3166#if ENABLE_FRILLS
2847 case '6': 3167 case '6':
2848 scr_backindex (); 3168 scr_backindex ();
2849 break; 3169 break;
2850#endif 3170#endif
2851 case '7': 3171 case '7':
2852 scr_cursor (SAVE); 3172 scr_cursor (SAVE);
2853 break; 3173 break;
2854 case '8': 3174 case '8':
2855 scr_cursor (RESTORE); 3175 scr_cursor (RESTORE);
2856 break; 3176 break;
2857#ifndef NO_FRILLS 3177#if ENABLE_FRILLS
2858 case '9': 3178 case '9':
2859 scr_forwardindex (); 3179 scr_forwardindex ();
2860 break; 3180 break;
2861#endif 3181#endif
2862 case '=': 3182 case '=':
… …
2872 break; 3192 break;
2873 3193
2874 /* 8.3.87: NEXT LINE */ 3194 /* 8.3.87: NEXT LINE */
2875 case C1_NEL: /* ESC E */ 3195 case C1_NEL: /* ESC E */
2876 { 3196 {
2877 unicode_t nlcr[] = { C0_LF, C0_CR }; 3197 wchar_t nlcr[] = { C0_LF, C0_CR };
2878 scr_add_lines (nlcr, 1, 2); 3198 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2879 } 3199 }
2880 break; 3200 break;
2881 3201
2882 /* kidnapped escape sequence: Should be 8.3.48 */ 3202 /* kidnapped escape sequence: Should be 8.3.48 */
2883 case C1_ESA: /* ESC G */ 3203 case C1_ESA: /* ESC G */
… …
2905 process_dcs_seq (); 3225 process_dcs_seq ();
2906 break; 3226 break;
2907 3227
2908 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3228 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2909 case C1_SCI: /* ESC Z */ 3229 case C1_SCI: /* ESC Z */
2910 tt_write ((const unsigned char *)ESCZ_ANSWER, 3230 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2911 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2912 break; /* steal obsolete ESC [ c */ 3231 break; /* steal obsolete ESC [ c */
2913 3232
2914 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3233 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2915 case C1_CSI: /* ESC [ */ 3234 case C1_CSI: /* ESC [ */
2916 process_csi_seq (); 3235 process_csi_seq ();
… …
3041 { 3360 {
3042 switch (priv) 3361 switch (priv)
3043 { 3362 {
3044 case '>': 3363 case '>':
3045 if (ch == CSI_DA) /* secondary device attributes */ 3364 if (ch == CSI_DA) /* secondary device attributes */
3046 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3365 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3047 break; 3366 break;
3048 case '?': 3367 case '?':
3049 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3368 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3050 process_terminal_mode (ch, priv, nargs, arg); 3369 process_terminal_mode (ch, priv, nargs, arg);
3051 break; 3370 break;
… …
3156 3475
3157 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3476 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3158 arg[0] = -arg[0]; 3477 arg[0] = -arg[0];
3159 /* FALLTHROUGH */ 3478 /* FALLTHROUGH */
3160 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3479 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3161 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3480 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3162 break; 3481 break;
3163 3482
3164 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3483 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3165 tt_write ((const unsigned char *)VT100_ANS, 3484 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3166 (unsigned int) (sizeof (VT100_ANS) - 1));
3167 break; 3485 break;
3168 3486
3169 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3487 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3170 process_sgr_mode (nargs, arg); 3488 process_sgr_mode (nargs, arg);
3171 break; 3489 break;
… …
3178 break; 3496 break;
3179 case 6: /* CPR requested */ 3497 case 6: /* CPR requested */
3180 scr_report_position (); 3498 scr_report_position ();
3181 break; 3499 break;
3182 case 7: /* unofficial extension */ 3500 case 7: /* unofficial extension */
3183 if (Options & Opt_insecure) 3501 if (OPTION (Opt_insecure))
3184 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3502 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3185 break; 3503 break;
3186 case 8: /* unofficial extension */ 3504 case 8: /* unofficial extension */
3187 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3505 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3188 break; 3506 break;
3189 } 3507 }
… …
3225 break; 3543 break;
3226 3544
3227 case CSI_RM: /* 8.3.107: RESET MODE */ 3545 case CSI_RM: /* 8.3.107: RESET MODE */
3228 if (arg[0] == 4) 3546 if (arg[0] == 4)
3229 scr_insert_mode (0); 3547 scr_insert_mode (0);
3548 else if (arg[0] == 20)
3549 priv_modes &= ~PrivMode_LFNL;
3230 break; 3550 break;
3231 3551
3232 case CSI_SM: /* 8.3.126: SET MODE */ 3552 case CSI_SM: /* 8.3.126: SET MODE */
3233 if (arg[0] == 4) 3553 if (arg[0] == 4)
3234 scr_insert_mode (1); 3554 scr_insert_mode (1);
3555 else if (arg[0] == 20)
3556 priv_modes |= PrivMode_LFNL;
3235 break; 3557 break;
3236 3558
3237 /* 3559 /*
3238 * PRIVATE USE beyond this point. All CSI_7? sequences here 3560 * PRIVATE USE beyond this point. All CSI_7? sequences here
3239 */ 3561 */
… …
3251 break; 3573 break;
3252 case CSI_75: 3574 case CSI_75:
3253 scr_cursor (RESTORE); 3575 scr_cursor (RESTORE);
3254 break; 3576 break;
3255 3577
3256#ifndef NO_FRILLS 3578#if ENABLE_FRILLS
3257 case CSI_74: 3579 case CSI_74:
3258 process_window_ops (arg, nargs); 3580 process_window_ops (arg, nargs);
3259 break; 3581 break;
3260#endif 3582#endif
3261 3583
… …
3268 break; 3590 break;
3269 } 3591 }
3270} 3592}
3271/*}}} */ 3593/*}}} */
3272 3594
3273#ifndef NO_FRILLS 3595#if ENABLE_FRILLS
3274/* ARGSUSED */ 3596/* ARGSUSED */
3275void 3597void
3276rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3598rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3277{ 3599{
3278 int x, y; 3600 int x, y;
3279 XWindowAttributes wattr; 3601 XWindowAttributes wattr;
3280 Window wdummy; 3602 Window wdummy;
3603 dDisp;
3281 3604
3282 if (nargs == 0) 3605 if (nargs == 0)
3283 return; 3606 return;
3284 3607
3285 switch (args[0]) 3608 switch (args[0])
3286 { 3609 {
3287 /* 3610 /*
3288 * commands 3611 * commands
3289 */ 3612 */
3290 case 1: /* deiconify window */ 3613 case 1: /* deiconify window */
3291 XMapWindow (display->display, TermWin.parent[0]); 3614 XMapWindow (disp, parent[0]);
3292 break; 3615 break;
3293 case 2: /* iconify window */ 3616 case 2: /* iconify window */
3294 XIconifyWindow (display->display, TermWin.parent[0], 3617 XIconifyWindow (disp, parent[0], display->screen);
3295 DefaultScreen (display->display));
3296 break; 3618 break;
3297 case 3: /* set position (pixels) */ 3619 case 3: /* set position (pixels) */
3298 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3620 XMoveWindow (disp, parent[0], args[1], args[2]);
3299 break; 3621 break;
3300 case 4: /* set size (pixels) */ 3622 case 4: /* set size (pixels) */
3301 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3623 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3302 break; 3624 break;
3303 case 5: /* raise window */ 3625 case 5: /* raise window */
3304 XRaiseWindow (display->display, TermWin.parent[0]); 3626 XRaiseWindow (disp, parent[0]);
3305 break; 3627 break;
3306 case 6: /* lower window */ 3628 case 6: /* lower window */
3307 XLowerWindow (display->display, TermWin.parent[0]); 3629 XLowerWindow (disp, parent[0]);
3308 break; 3630 break;
3309 case 7: /* refresh window */ 3631 case 7: /* refresh window */
3310 scr_touch (true); 3632 scr_touch (true);
3311 break; 3633 break;
3312 case 8: /* set size (chars) */ 3634 case 8: /* set size (chars) */
3313 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3635 set_widthheight ((unsigned int) (args[2] * fwidth),
3314 (unsigned int) (args[1] * TermWin.fheight)); 3636 (unsigned int) (args[1] * fheight));
3315 break; 3637 break;
3316 3638
3317 //case 9: NYI, TODO, restore maximized window or maximize window 3639 //case 9: NYI, TODO, restore maximized window or maximize window
3318 default: 3640 default:
3319 if (args[0] >= 24) /* set height (chars) */ 3641 if (args[0] >= 24) /* set height (chars) */
3320 set_widthheight ((unsigned int)TermWin.width, 3642 set_widthheight ((unsigned int)width,
3321 (unsigned int) (args[1] * TermWin.fheight)); 3643 (unsigned int) (args[1] * fheight));
3322 break; 3644 break;
3323 3645
3324 3646
3325 /* 3647 /*
3326 * reports - some output format copied from XTerm 3648 * reports - some output format copied from XTerm
3327 */ 3649 */
3328 case 11: /* report window state */ 3650 case 11: /* report window state */
3329 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3651 XGetWindowAttributes (disp, parent[0], &wattr);
3330 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3652 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3331 break; 3653 break;
3332 case 13: /* report window position */ 3654 case 13: /* report window position */
3333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3655 XGetWindowAttributes (disp, parent[0], &wattr);
3334 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3656 XTranslateCoordinates (disp, parent[0], wattr.root,
3335 -wattr.border_width, -wattr.border_width, 3657 -wattr.border_width, -wattr.border_width,
3336 &x, &y, &wdummy); 3658 &x, &y, &wdummy);
3337 tt_printf ("\033[3;%d;%dt", x, y); 3659 tt_printf ("\033[3;%d;%dt", x, y);
3338 break; 3660 break;
3339 case 14: /* report window size (pixels) */ 3661 case 14: /* report window size (pixels) */
3340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3662 XGetWindowAttributes (disp, parent[0], &wattr);
3341 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3663 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3342 break; 3664 break;
3343 case 18: /* report text area size (chars) */ 3665 case 18: /* report text area size (chars) */
3344 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3666 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3345 break; 3667 break;
3346 case 19: /* report window size (chars) */ 3668 case 19: /* report window size (chars) */
3347 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3669 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3348 break; 3670 break;
3349 case 20: /* report icon label */ 3671 case 20: /* report icon label */
3350 { 3672 {
3351 char *s; 3673 char *s;
3352 XGetIconName (display->display, TermWin.parent[0], &s); 3674 XGetIconName (disp, parent[0], &s);
3353 tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3675 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3354 XFree (s); 3676 XFree (s);
3355 } 3677 }
3356 break; 3678 break;
3357 case 21: /* report window title */ 3679 case 21: /* report window title */
3358 { 3680 {
3359 char *s; 3681 char *s;
3360 XFetchName (display->display, TermWin.parent[0], &s); 3682 XFetchName (disp, parent[0], &s);
3361 tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3683 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3362 XFree (s); 3684 XFree (s);
3363 } 3685 }
3364 break; 3686 break;
3365 } 3687 }
3366} 3688}
… …
3369/*----------------------------------------------------------------------*/ 3691/*----------------------------------------------------------------------*/
3370/* 3692/*
3371 * get input up until STRING TERMINATOR (or BEL) 3693 * get input up until STRING TERMINATOR (or BEL)
3372 * ends_how is terminator used. returned input must be free()'d 3694 * ends_how is terminator used. returned input must be free()'d
3373 */ 3695 */
3374unsigned char * 3696char *
3375rxvt_term::get_to_st (unicode_t &ends_how) 3697rxvt_term::get_to_st (unicode_t &ends_how)
3376{ 3698{
3377 unicode_t prev = 0, ch; 3699 unicode_t ch;
3700 bool seen_esc = false;
3378 unsigned int n = 0; 3701 unsigned int n = 0;
3379 unsigned char *s;
3380 unsigned char string[STRING_MAX]; 3702 wchar_t string[STRING_MAX];
3381 3703
3382 while ((ch = cmd_getc ()) != NOCHAR) 3704 while ((ch = cmd_getc ()) != NOCHAR)
3383 { 3705 {
3384 if (prev == C0_ESC) 3706 if (seen_esc)
3385 { 3707 {
3386 if (ch == 0x5c) /* 7bit ST */ 3708 if (ch == 0x5c) /* 7bit ST */
3387 break; 3709 break;
3388 else 3710 else
3389 return NULL; 3711 return NULL;
3390 } 3712 }
3713 else if (ch == C0_ESC)
3714 {
3715 seen_esc = true;
3716 continue;
3717 }
3391 else if (ch == C0_BEL || ch == CHAR_ST) 3718 else if (ch == C0_BEL || ch == CHAR_ST)
3392 break; 3719 break;
3393 else if (ch < 0x20) 3720 else if (ch < 0x20)
3394 return NULL; /* other control character - exit */ 3721 return NULL; /* other control character - exit */
3395 3722
3396 if (n >= sizeof (string) - 1) 3723 seen_esc = false;
3724
3725 if (n >= STRING_MAX - 1)
3397 // stop at some sane length 3726 // stop at some sane length
3398 return NULL; 3727 return NULL;
3399 3728
3400 if (ch == C0_SYN) 3729 if (ch == C0_SYN)
3401 {
3402 string[n++] = cmd_get8 (); 3730 string[n++] = cmd_get8 ();
3403 prev = 0;
3404 }
3405 else 3731 else
3406 string[n++] = prev = ch; 3732 string[n++] = ch;
3407 } 3733 }
3408 3734
3409 string[n++] = '\0'; 3735 string[n++] = '\0';
3410 3736
3411 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3412 return NULL;
3413
3414 ends_how = (ch == 0x5c ? C0_ESC : ch); 3737 ends_how = (ch == 0x5c ? C0_ESC : ch);
3415 STRNCPY (s, string, n); 3738
3416 return s; 3739 return rxvt_wcstombs (string);
3417} 3740}
3418 3741
3419/*----------------------------------------------------------------------*/ 3742/*----------------------------------------------------------------------*/
3420/* 3743/*
3421 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3744 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3422 */ 3745 */
3423void 3746void
3424rxvt_term::process_dcs_seq () 3747rxvt_term::process_dcs_seq ()
3425{ 3748{
3426 unsigned char *s; 3749 char *s;
3427 unicode_t eh; 3750 unicode_t eh;
3428 3751
3429 /* 3752 /*
3430 * Not handled yet 3753 * Not handled yet
3431 */ 3754 */
… …
3450 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3773 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3451 arg = arg * 10 + (ch - '0'); 3774 arg = arg * 10 + (ch - '0');
3452 3775
3453 if (ch == ';') 3776 if (ch == ';')
3454 { 3777 {
3455 unsigned char *s = get_to_st (eh); 3778 char *s = get_to_st (eh);
3456 3779
3457 if (s) 3780 if (s)
3458 { 3781 {
3459 process_xterm_seq (arg, (char *)s, eh); 3782 process_xterm_seq (arg, s, eh);
3460 free (s); 3783 free (s);
3461 } 3784 }
3462 } 3785 }
3463} 3786}
3464 3787
3465void 3788void
3466rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3789rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3467{ 3790{
3468 if (str[0] == '?' && !str[1]) 3791 if (str[0] == '?' && !str[1])
3469 { 3792 {
3470 unsigned short r, g, b; 3793 unsigned short r, g, b;
3471 PixColorsFocused[color].get (display, r, g, b); 3794 pix_colors_focused[color].get (display, r, g, b);
3472 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3795 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3473 } 3796 }
3474 else 3797 else
3475 set_window_color (color, str); 3798 set_window_color (color, str);
3476} 3799}
3477 3800
3478/* 3801/*
3479 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3802 * 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 */ 3803 */
3503void 3804void
3504rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3805rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3505{ 3806{
3506 int changed = 0; 3807 int changed = 0;
3507 int color; 3808 int color;
3508 char *buf, *name; 3809 char *buf, *name;
3509 bool query = str[0] == '?' && !str[1]; 3810 bool query = str[0] == '?' && !str[1];
3811 int saveop = op;
3812 dDisp;
3510 3813
3511 assert (str != NULL); 3814 assert (str != NULL);
3512 switch (op) 3815 switch (op)
3513 { 3816 {
3514 case XTerm_name: 3817 case XTerm_name:
… …
3521 set_title (str); 3824 set_title (str);
3522 break; 3825 break;
3523 case XTerm_property: 3826 case XTerm_property:
3524 if (str[0] == '?') 3827 if (str[0] == '?')
3525 { 3828 {
3526 Atom prop = XInternAtom (display->display, str + 1, True); 3829 Atom prop = display->atom (str + 1);
3527 Atom actual_type; 3830 Atom actual_type;
3528 int actual_format; 3831 int actual_format;
3529 unsigned long nitems; 3832 unsigned long nitems;
3530 unsigned long bytes_after; 3833 unsigned long bytes_after;
3531 unsigned char *value = 0; 3834 unsigned char *value = 0;
3532 const char *str = ""; 3835 const char *str = "";
3533 3836
3534 if (prop 3837 if (prop
3535 && XGetWindowProperty (display->display, TermWin.parent[0], 3838 && XGetWindowProperty (disp, parent[0],
3536 prop, 0, 1<<16, 0, AnyPropertyType, 3839 prop, 0, 1<<16, 0, AnyPropertyType,
3537 &actual_type, &actual_format, 3840 &actual_type, &actual_format,
3538 &nitems, &bytes_after, &value) == Success 3841 &nitems, &bytes_after, &value) == Success
3539 && actual_type != None 3842 && actual_type != None
3540 && actual_format == 8) 3843 && actual_format == 8)
… …
3549 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3852 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3550 3853
3551 if (eq) 3854 if (eq)
3552 { 3855 {
3553 *eq = 0; 3856 *eq = 0;
3554 XChangeProperty (display->display, TermWin.parent[0], 3857 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 } 3858 }
3559 else 3859 else
3560 XDeleteProperty (display->display, TermWin.parent[0], 3860 XDeleteProperty (disp, parent[0],
3561 display->atom (str)); 3861 display->atom (str));
3562 } 3862 }
3563 break; 3863 break;
3564 3864
3565 case XTerm_Color: 3865 case XTerm_Color:
3566 for (buf = (char *)str; buf && *buf;) 3866 for (buf = (char *)str; buf && *buf;)
3567 { 3867 {
3568 if ((name = STRCHR (buf, ';')) == NULL) 3868 if ((name = strchr (buf, ';')) == NULL)
3569 break; 3869 break;
3570 3870
3571 *name++ = '\0'; 3871 *name++ = '\0';
3572 color = atoi (buf); 3872 color = atoi (buf);
3573 3873
3574 if (color < 0 || color >= TOTAL_COLORS) 3874 if (color < 0 || color >= TOTAL_COLORS)
3575 break; 3875 break;
3576 3876
3577 if ((buf = STRCHR (name, ';')) != NULL) 3877 if ((buf = strchr (name, ';')) != NULL)
3578 *buf++ = '\0'; 3878 *buf++ = '\0';
3579 3879
3580 if (name[0] == '?' && !name[1]) 3880 if (name[0] == '?' && !name[1])
3581 { 3881 {
3582 unsigned short r, g, b; 3882 unsigned short r, g, b;
3583 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3883 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); 3884 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3585 } 3885 }
3586 else 3886 else
3587 set_window_color (color + minCOLOR, name); 3887 set_window_color (color + minCOLOR, name);
3588 } 3888 }
… …
3611 case XTerm_Color_UL: 3911 case XTerm_Color_UL:
3612 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3912 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3613 break; 3913 break;
3614 case XTerm_Color_RV: 3914 case XTerm_Color_RV:
3615 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3915 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3916 break;
3917 case URxvt_Color_IT:
3918 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3919 break;
3920#endif
3921#if TRANSPARENT && TINTING
3922 case URxvt_Color_tint:
3923 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3924 check_our_parents ();
3925 if (am_transparent)
3926 want_full_refresh = want_refresh = 1;
3616 break; 3927 break;
3617#endif 3928#endif
3618 3929
3619 case XTerm_Pixmap: 3930 case XTerm_Pixmap:
3620 if (*str != ';') 3931 if (*str != ';')
… …
3623 scale_pixmap (""); /* reset to default scaling */ 3934 scale_pixmap (""); /* reset to default scaling */
3624 set_bgPixmap (str); /* change pixmap */ 3935 set_bgPixmap (str); /* change pixmap */
3625#endif 3936#endif
3626 scr_touch (true); 3937 scr_touch (true);
3627 } 3938 }
3628 while ((str = STRCHR (str, ';')) != NULL) 3939 while ((str = strchr (str, ';')) != NULL)
3629 { 3940 {
3630 str++; 3941 str++;
3631#if XPM_BACKGROUND 3942#if XPM_BACKGROUND
3632 changed += scale_pixmap (str); 3943 changed += scale_pixmap (str);
3633#endif 3944#endif
3634
3635 } 3945 }
3946
3636 if (changed) 3947 if (changed)
3637 { 3948 {
3638#ifdef XPM_BACKGROUND 3949#ifdef XPM_BACKGROUND
3639 resize_pixmap (); 3950 resize_pixmap ();
3640#endif 3951#endif
… …
3651 3962
3652 case XTerm_logfile: 3963 case XTerm_logfile:
3653 // TODO, when secure mode? 3964 // TODO, when secure mode?
3654 break; 3965 break;
3655 3966
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 3967#ifdef MENUBAR
3691 case XTerm_Menu: 3968 case URxvt_Menu:
3692 if (Options & Opt_insecure) 3969 if (OPTION (Opt_insecure))
3693 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3970 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3694 break; 3971 break;
3695#endif 3972#endif
3696#if 0 3973#if 0
3697 case XTerm_dumpscreen: /* no error notices */ 3974 case XTerm_dumpscreen: /* no error notices */
… …
3701 { 3978 {
3702 scr_dump (fd); 3979 scr_dump (fd);
3703 close (fd); 3980 close (fd);
3704 } 3981 }
3705 } 3982 }
3983 break;
3984#endif
3985 case XTerm_font:
3986 op = URxvt_font;
3987 case URxvt_font:
3988#if ENABLE_STYLES
3989 case URxvt_boldFont:
3990 case URxvt_italicFont:
3991 case URxvt_boldItalicFont:
3992#endif
3993 if (query)
3994 tt_printf ("\33]%d;%-.250s%c", saveop,
3995 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3996 ? fontset[op - URxvt_font]->fontdesc : "",
3997 resp);
3998 else
3999 {
4000 const char *&res = rs[Rs_font + (op - URxvt_font)];
4001
4002 res = strdup (str);
4003 allocated.push_back ((void *)res);
4004 set_fonts ();
4005 }
4006 break;
4007
4008#if ENABLE_FRILLS
4009 case URxvt_locale:
4010 if (query)
4011 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4012 else
4013 {
4014 set_locale (str);
4015 pty.set_utf8_mode (enc_utf8);
4016 init_xlocale ();
4017 }
4018 break;
4019
4020 case URxvt_view_up:
4021 case URxvt_view_down:
4022 {
4023 int lines = atoi (str);
4024
4025 if (lines)
4026 scr_page (op == URxvt_view_up ? UP : DN, lines);
4027 else
4028 scr_erase_savelines ();
4029 }
4030
4031 break;
4032#endif
4033
4034#if ENABLE_PERL
4035 case URxvt_perl:
4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4037 ; // no responses yet
3706 break; 4038 break;
3707#endif 4039#endif
3708 } 4040 }
3709} 4041}
3710/*----------------------------------------------------------------------*/ 4042/*----------------------------------------------------------------------*/
… …
3724{ 4056{
3725 int state; 4057 int state;
3726 4058
3727 if (mode == 's') 4059 if (mode == 's')
3728 { 4060 {
3729 SavedModes |= (PrivateModes & bit); 4061 SavedModes |= (priv_modes & bit);
3730 return -1; 4062 return -1;
3731 } 4063 }
3732 else 4064 else
3733 { 4065 {
3734 if (mode == 'r') 4066 if (mode == 'r')
3735 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4067 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3736 else 4068 else
3737 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4069 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3738 PrivMode (state, bit); 4070 PrivMode (state, bit);
3739 } 4071 }
3740 4072
3741 return state; 4073 return state;
3742} 4074}
… …
3760 { 3, PrivMode_132 }, 4092 { 3, PrivMode_132 },
3761 { 4, PrivMode_smoothScroll }, 4093 { 4, PrivMode_smoothScroll },
3762 { 5, PrivMode_rVideo }, 4094 { 5, PrivMode_rVideo },
3763 { 6, PrivMode_relOrigin }, 4095 { 6, PrivMode_relOrigin },
3764 { 7, PrivMode_Autowrap }, 4096 { 7, PrivMode_Autowrap },
4097 // 8, bi-directional support mode
3765 { 9, PrivMode_MouseX10 }, 4098 { 9, PrivMode_MouseX10 },
3766#ifdef menuBar_esc 4099#ifdef menuBar_esc
3767 { menuBar_esc, PrivMode_menuBar }, 4100 { menuBar_esc, PrivMode_menuBar },
3768#endif 4101#endif
4102 // 18, 19 printing-related
4103 { 25, PrivMode_VisibleCursor },
3769#ifdef scrollBar_esc 4104#ifdef scrollBar_esc
3770 { scrollBar_esc, PrivMode_scrollBar }, 4105 { scrollBar_esc, PrivMode_scrollBar },
3771#endif 4106#endif
3772 // 18, 19 printing-related
3773 { 25, PrivMode_VisibleCursor },
3774 // 30 show scrollbar rxvt. extension
3775 { 35, PrivMode_ShiftKeys }, // rxvt extension 4107 { 35, PrivMode_ShiftKeys }, // rxvt extension
3776 { 40, PrivMode_132OK }, 4108 { 40, PrivMode_132OK },
3777 // 41 xterm more fixes NYI 4109 // 41 xterm more fixes NYI
3778 // 45 margin bell NYI 4110 // 45 margin bell NYI
3779 // 46 start logging 4111 // 46 start logging
… …
3819 } 4151 }
3820 4152
3821 /* extra handling for values with state unkept */ 4153 /* extra handling for values with state unkept */
3822 switch (arg[i]) 4154 switch (arg[i])
3823 { 4155 {
4156#if ENABLE_STYLES
4157 case 1021:
4158 if (mode)
4159 SET_OPTION (Opt_intensityStyles);
4160 else
4161 CLR_OPTION (Opt_intensityStyles);
4162
4163 scr_touch (true);
4164 break;
4165#endif
3824 case 1048: /* alternative cursor save */ 4166 case 1048: /* alternative cursor save */
4167 case 1049:
3825 if (Options & Opt_secondaryScreen) 4168 if (OPTION (Opt_secondaryScreen))
3826 if (mode == 0) 4169 if (mode == 0)
3827 scr_cursor (RESTORE); 4170 scr_cursor (RESTORE);
3828 else if (mode == 1) 4171 else if (mode == 1)
3829 scr_cursor (SAVE); 4172 scr_cursor (SAVE);
3830 break; 4173 break;
… …
3841 * within VT52 mode 4184 * within VT52 mode
3842 */ 4185 */
3843 PrivMode (1, PrivMode_vt52); 4186 PrivMode (1, PrivMode_vt52);
3844 break; 4187 break;
3845 case 3: /* 80/132 */ 4188 case 3: /* 80/132 */
3846 if (PrivateModes & PrivMode_132OK) 4189 if (priv_modes & PrivMode_132OK)
3847 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4190 set_widthheight (((state ? 132 : 80) * fwidth), height);
3848 break; 4191 break;
3849 case 4: /* smooth scrolling */ 4192 case 4: /* smooth scrolling */
3850 if (state) 4193 if (!state)
3851 Options &= ~Opt_jumpScroll; 4194 SET_OPTION (Opt_jumpScroll);
3852 else 4195 else
3853 Options |= Opt_jumpScroll; 4196 CLR_OPTION (Opt_jumpScroll);
3854 break; 4197 break;
3855 case 5: /* reverse video */ 4198 case 5: /* reverse video */
3856 scr_rvideo_mode (state); 4199 scr_rvideo_mode (state);
3857 break; 4200 break;
3858 case 6: /* relative/absolute origins */ 4201 case 6: /* relative/absolute origins */
… …
3862 scr_autowrap (state); 4205 scr_autowrap (state);
3863 break; 4206 break;
3864 /* case 8: - auto repeat, can't do on a per window basis */ 4207 /* case 8: - auto repeat, can't do on a per window basis */
3865 case 9: /* X10 mouse reporting */ 4208 case 9: /* X10 mouse reporting */
3866 if (state) /* orthogonal */ 4209 if (state) /* orthogonal */
3867 PrivateModes &= ~PrivMode_MouseX11; 4210 priv_modes &= ~PrivMode_MouseX11;
3868 break; 4211 break;
3869#ifdef menuBar_esc 4212#ifdef menuBar_esc
3870 case menuBar_esc: 4213 case menuBar_esc:
3871#ifdef MENUBAR 4214#ifdef MENUBAR
3872 map_menuBar (state); 4215 map_menuBar (state);
… …
3892 break; 4235 break;
3893 /* case 66: - application key pad */ 4236 /* case 66: - application key pad */
3894 /* case 67: - backspace key */ 4237 /* case 67: - backspace key */
3895 case 1000: /* X11 mouse reporting */ 4238 case 1000: /* X11 mouse reporting */
3896 if (state) /* orthogonal */ 4239 if (state) /* orthogonal */
3897 PrivateModes &= ~PrivMode_MouseX10; 4240 priv_modes &= ~PrivMode_MouseX10;
3898 break; 4241 break;
3899#if 0 4242#if 0
3900 case 1001: 4243 case 1001:
3901 break; /* X11 mouse highlighting */ 4244 break; /* X11 mouse highlighting */
3902#endif 4245#endif
3903 case 1010: /* scroll to bottom on TTY output inhibit */ 4246 case 1010: /* scroll to bottom on TTY output inhibit */
3904 if (state) 4247 if (!state)
3905 Options &= ~Opt_scrollTtyOutput; 4248 SET_OPTION (Opt_scrollTtyOutput);
3906 else 4249 else
3907 Options |= Opt_scrollTtyOutput; 4250 CLR_OPTION (Opt_scrollTtyOutput);
3908 break; 4251 break;
3909 case 1011: /* scroll to bottom on key press */ 4252 case 1011: /* scroll to bottom on key press */
3910 if (state) 4253 if (state)
3911 Options |= Opt_scrollTtyKeypress; 4254 SET_OPTION (Opt_scrollTtyKeypress);
3912 else 4255 else
3913 Options &= ~Opt_scrollTtyKeypress; 4256 CLR_OPTION (Opt_scrollTtyKeypress);
3914 break; 4257 break;
3915 case 1047: /* secondary screen w/ clearing last */ 4258 case 1047: /* secondary screen w/ clearing last */
3916 if (Options & Opt_secondaryScreen) 4259 if (OPTION (Opt_secondaryScreen))
3917 if (current_screen != PRIMARY) 4260 if (current_screen != PRIMARY)
3918 scr_erase_screen (2); 4261 scr_erase_screen (2);
3919 scr_change_screen (state); 4262 scr_change_screen (state);
3920 break; 4263 break;
3921 case 1049: /* secondary screen w/ clearing first */ 4264 case 1049: /* secondary screen w/ clearing first */
3922 scr_change_screen (state); 4265 scr_change_screen (state);
3923 if (Options & Opt_secondaryScreen) 4266 if (OPTION (Opt_secondaryScreen))
3924 if (current_screen != PRIMARY) 4267 if (current_screen != PRIMARY)
3925 scr_erase_screen (2); 4268 scr_erase_screen (2);
3926 break; 4269 break;
3927 default: 4270 default:
3928 break; 4271 break;
… …
3954 rendset = 0, rendstyle = ~RS_None; 4297 rendset = 0, rendstyle = ~RS_None;
3955 break; 4298 break;
3956 case 1: 4299 case 1:
3957 rendset = 1, rendstyle = RS_Bold; 4300 rendset = 1, rendstyle = RS_Bold;
3958 break; 4301 break;
3959 //case 2: // faint or second colour 4302 //case 2: // low intensity
4303 case 3:
4304 rendset = 1, rendstyle = RS_Italic;
4305 break;
3960 case 4: 4306 case 4:
3961 rendset = 1, rendstyle = RS_Uline; 4307 rendset = 1, rendstyle = RS_Uline;
3962 break; 4308 break;
3963 case 5: // slowly blinking 4309 case 5: // slowly blinking
3964 case 6: // rapidly blinking 4310 case 6: // rapidly blinking
… …
3976 //case 11: // scoansi acs on, first alt font 4322 //case 11: // scoansi acs on, first alt font
3977 //case 12: // scoansi acs on, |0x80, second alt font 4323 //case 12: // scoansi acs on, |0x80, second alt font
3978 //... 4324 //...
3979 //case 19: // ninth alt font 4325 //case 19: // ninth alt font
3980 //case 20: // gothic 4326 //case 20: // gothic
3981 case 21: // disable bold, faint 4327 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3982 rendset = 0, rendstyle = RS_Bold; 4328 rendset = 0, rendstyle = RS_Bold;
3983 break; 4329 break;
3984 case 22: 4330 case 22: // normal intensity
3985 rendset = 0, rendstyle = RS_Bold; 4331 rendset = 0, rendstyle = RS_Bold;
3986 break; 4332 break;
3987 //case 23: disable italic 4333 case 23: // disable italic
4334 rendset = 0, rendstyle = RS_Italic;
4335 break;
3988 case 24: 4336 case 24:
3989 rendset = 0, rendstyle = RS_Uline; 4337 rendset = 0, rendstyle = RS_Uline;
3990 break; 4338 break;
3991 case 25: 4339 case 25:
4340 rendset = 0, rendstyle = RS_Blink;
4341 break;
4342 case 26: // variable spacing (iso 8613)
3992 rendset = 0, rendstyle = RS_Blink; 4343 rendset = 0, rendstyle = RS_Blink;
3993 break; 4344 break;
3994 case 27: 4345 case 27:
3995 rendset = 0, rendstyle = RS_RVid; 4346 rendset = 0, rendstyle = RS_RVid;
3996 break; 4347 break;
… …
4014 case 35: 4365 case 35:
4015 case 36: 4366 case 36:
4016 case 37: 4367 case 37:
4017 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4368 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4018 break; 4369 break;
4019#ifdef TTY_256COLOR 4370 case 38: // set fg color, ISO 8613-6
4020 case 38:
4021 if (nargs > i + 2 && arg[i + 1] == 5) 4371 if (nargs > i + 2 && arg[i + 1] == 5)
4022 { 4372 {
4023 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4373 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4024 i += 2; 4374 i += 2;
4025 } 4375 }
4026 break; 4376 break;
4027#endif
4028 case 39: /* default fg */ 4377 case 39: /* default fg */
4029 scr_color (Color_fg, Color_fg); 4378 scr_color (Color_fg, Color_fg);
4030 break; 4379 break;
4031 4380
4032 case 40: 4381 case 40:
… …
4037 case 45: 4386 case 45:
4038 case 46: 4387 case 46:
4039 case 47: 4388 case 47:
4040 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4389 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4041 break; 4390 break;
4042#ifdef TTY_256COLOR 4391 case 48: // set bg color, ISO 8613-6
4043 case 48:
4044 if (nargs > i + 2 && arg[i + 1] == 5) 4392 if (nargs > i + 2 && arg[i + 1] == 5)
4045 { 4393 {
4046 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4394 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4047 i += 2; 4395 i += 2;
4048 } 4396 }
4049 break; 4397 break;
4050#endif
4051 case 49: /* default bg */ 4398 case 49: /* default bg */
4052 scr_color (Color_bg, Color_bg); 4399 scr_color (Color_bg, Color_bg);
4053 break; 4400 break;
4054 4401
4055#ifndef NO_BRIGHTCOLOR 4402 //case 50: // not variable spacing
4403
4404#if ENABLE_FRILLS
4056 case 90: 4405 case 90:
4057 case 91: /* set bright fg color */ 4406 case 91: /* set bright fg color */
4058 case 92: 4407 case 92:
4059 case 93: 4408 case 93:
4060 case 94: 4409 case 94:
4061 case 95: 4410 case 95:
4062 case 96: 4411 case 96:
4063 case 97: 4412 case 97:
4064 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4413 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4065 Color_fg);
4066 break; 4414 break;
4067 case 100: 4415 case 100:
4068 case 101: /* set bright bg color */ 4416 case 101: /* set bright bg color */
4069 case 102: 4417 case 102:
4070 case 103: 4418 case 103:
4071 case 104: 4419 case 104:
4072 case 105: 4420 case 105:
4073 case 106: 4421 case 106:
4074 case 107: 4422 case 107:
4075 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4423 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4076 Color_bg);
4077 break; 4424 break;
4078#endif 4425#endif
4079
4080 } 4426 }
4081 } 4427 }
4082} 4428}
4083/*}}} */ 4429/*}}} */
4084 4430
… …
4088{ 4434{
4089 unicode_t ch, cmd = cmd_getc (); 4435 unicode_t ch, cmd = cmd_getc ();
4090 4436
4091 if (cmd == 'Q') 4437 if (cmd == 'Q')
4092 { /* query graphics */ 4438 { /* query graphics */
4093 tt_printf ("\033G0\n"); /* no graphics */ 4439 tt_printf ("\033G0\012"); /* no graphics */
4094 return; 4440 return;
4095 } 4441 }
4096 /* swallow other graphics sequences until terminating ':' */ 4442 /* swallow other graphics sequences until terminating ':' */
4097 do 4443 do
4098 ch = cmd_getc (); 4444 ch = cmd_getc ();
… …
4108 */ 4454 */
4109void 4455void
4110rxvt_term::tt_printf (const char *fmt,...) 4456rxvt_term::tt_printf (const char *fmt,...)
4111{ 4457{
4112 va_list arg_ptr; 4458 va_list arg_ptr;
4113 unsigned char buf[256]; 4459 char buf[256];
4114 4460
4115 va_start (arg_ptr, fmt); 4461 va_start (arg_ptr, fmt);
4116 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4462 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4117 va_end (arg_ptr); 4463 va_end (arg_ptr);
4118 tt_write (buf, STRLEN (buf)); 4464 tt_write (buf, strlen (buf));
4119} 4465}
4120 4466
4121/* ---------------------------------------------------------------------- */ 4467/* ---------------------------------------------------------------------- */
4122/* Write data to the pty as typed by the user, pasted with the mouse, 4468/* 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. 4469 * or generated by us in response to a query ESC sequence.
4124 */ 4470 */
4471const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4472
4125void 4473void
4126rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4474rxvt_term::tt_write (const char *data, unsigned int len)
4127{ 4475{
4128 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4476 if (pty.pty < 0)
4477 return;
4129 4478
4130 if (len) 4479 if (v_buflen == 0)
4480 {
4481 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4482
4483 if ((unsigned int)written == len)
4484 return;
4485
4486 data += written;
4487 len -= written;
4131 { 4488 }
4489
4490 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4491
4492 memcpy (v_buffer + v_buflen, data, len);
4493 v_buflen += len;
4494
4495 pty_ev.set (EVENT_READ | EVENT_WRITE);
4496}
4497
4498void rxvt_term::pty_write ()
4499{
4500 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4501
4502 if (written > 0)
4503 {
4504 v_buflen -= written;
4505
4132 if (v_buflen == 0) 4506 if (v_buflen == 0)
4133 { 4507 {
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); 4508 free (v_buffer);
4161 v_buffer = 0; 4509 v_buffer = 0;
4162 v_buflen = 0; 4510 v_buflen = 0;
4163 4511
4164 pty_ev.set (EVENT_READ); 4512 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; 4513 return;
4177 } 4514 }
4515
4516 memmove (v_buffer, v_buffer + written, v_buflen);
4178 } 4517 }
4518 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4519 pty_ev.set (EVENT_READ);
4179} 4520}
4180 4521
4181/*----------------------- end-of-file (C source) -----------------------*/ 4522/*----------------------- end-of-file (C source) -----------------------*/
4182 4523

Diff Legend

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