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.183 by root, Tue Dec 21 06:43:00 2004 UTC vs.
Revision 1.362 by ayin, Sat Nov 10 16:04:49 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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
53#include <cwchar> 54#ifdef KEYSYM_RESOURCE
55# include "keyboard.h"
56#endif
57
54#include <csignal> 58#include <csignal>
55 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
56/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
57 65
58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59
60// exception thrown when the command parser runs out of input data
61class out_of_input { } out_of_input;
62 67
63#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
64 69
65#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
66#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
90 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
91 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
92 97
93 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
94 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
95 XK_ISO_Lock, 0x21eb,
96 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
97 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
98 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
99 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
100 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
114 XK_Escape, 0x238b, 118 XK_Escape, 0x238b,
115 XK_Undo, 0x238c, 119 XK_Undo, 0x238c,
116 XK_Print, 0x2399, 120 XK_Print, 0x2399,
117 121
118 XK_space, 0x2423, 122 XK_space, 0x2423,
123
124#ifdef XK_KP_Begin
125 XK_KP_Prior, 0x21de,
126 XK_KP_Next, 0x21df,
127 XK_KP_Begin, 0x2320,
128 XK_KP_Insert, 0x2380,
129 XK_KP_Delete, 0x2326,
119 XK_KP_Space, 0x2422, 130 XK_KP_Space, 0x2422,
131#endif
120 0, 132 0,
121}; 133};
122 134
123void 135void
124rxvt_term::iso14755_54 (int x, int y) 136rxvt_term::iso14755_54 (int x, int y)
125{ 137{
126 x = Pixel2Col (x); 138 x = Pixel2Col (x);
127 y = Pixel2Row (y); 139 y = Pixel2Row (y);
128 140
129 if (x < 0 || x >= TermWin.ncol 141 if (!IN_RANGE_EXC (x, 0, ncol)
130 || y < 0 || y >= TermWin.nrow) 142 || !IN_RANGE_EXC (y, 0, nrow))
131 return; 143 return;
132 144
133 for (;;) 145 for (;;)
134 { 146 {
135 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 147 const line_t &l = ROW(y + view_start);
148
149 text_t t = l.t[x];
136 150
137 if (t != NOCHAR || !x) 151 if (t != NOCHAR || !x)
138 { 152 {
139 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 153 iso14755_51 (l.t[x], l.r[x], x, y);
140 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141 iso14755buf = ISO_14755_54; 154 iso14755buf = ISO_14755_54;
142 break; 155 break;
143 } 156 }
144 157
145 x--; 158 x--;
146 } 159 }
147
148} 160}
149#endif
150 161
151#if ENABLE_OVERLAY
152void 162void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
154{ 164{
155 rxvt_fontset *fs = FONTSET (r); 165 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)]; 166 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2; 167 wchar_t *chr, *alloc, ch2, *fname;
158 int len; 168 int len;
159 169
170 fname = rxvt_utf8towcs (f->name);
171
160#if ENABLE_COMBINING 172# if ENABLE_COMBINING
161 if (IS_COMPOSE (ch)) 173 if (IS_COMPOSE (ch))
162 { 174 {
163 len = rxvt_composite.expand (ch, 0); 175 len = rxvt_composite.expand (ch, 0);
164 alloc = chr = new wchar_t[len]; 176 alloc = chr = new wchar_t[len];
165 rxvt_composite.expand (ch, chr); 177 rxvt_composite.expand (ch, chr);
166 } 178 }
167 else 179 else
168#endif 180# endif
169 { 181 {
170 ch2 = ch; 182 ch2 = ch;
171 183
172 alloc = 0; 184 alloc = 0;
173 chr = &ch2; 185 chr = &ch2;
174 len = 1; 186 len = 1;
175 } 187 }
176 188
177 int width = strlen (f->name); 189 char attr[80]; // plenty
178 190
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 191 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
192 (int)r,
193 fgcolor_of (r), bgcolor_of (r),
194 r & RS_Bold ? " bold" : "",
195 r & RS_Italic ? " italic" : "",
196 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : "");
200
201 int width = wcswidth (fname, wcslen (fname));
202
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr));
205
206 if (y >= 0)
207 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0;
210 }
211
212 scr_overlay_new (x, y, width, len + 2);
180 213
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182 215
183 for (int y = 0; y < len; y++) 216 for (int y = 0; y < len; y++)
184 { 217 {
… …
187 ch = *chr++; 220 ch = *chr++;
188 221
189 sprintf (buf, "%8x", ch); 222 sprintf (buf, "%8x", ch);
190 scr_overlay_set (0, y, buf); 223 scr_overlay_set (0, y, buf);
191 scr_overlay_set (9, y, '='); 224 scr_overlay_set (9, y, '=');
192#if !UNICODE3 225# if !UNICODE3
193 if (ch >= 0x10000) 226 if (ch >= 0x10000)
194 ch = 0xfffd; 227 ch = 0xfffd;
195#endif 228# endif
196 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
197 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
198 } 233 }
199 234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
240 scr_overlay_set (0, len , attr);
200 scr_overlay_set (0, len, f->name); 241 scr_overlay_set (0, len + 1, fname);
201 242
243 free (fname);
244
202#if ENABLE_COMBINING 245# if ENABLE_COMBINING
203 if (alloc) 246 if (alloc)
204 delete [] alloc; 247 delete [] alloc;
205#endif 248# endif
206} 249}
207#endif 250#endif
208 251
209void 252void
210rxvt_term::commit_iso14755 () 253rxvt_term::commit_iso14755 ()
… …
227 mb[0] = ch[0]; 270 mb[0] = ch[0];
228 len = 1; 271 len = 1;
229 } 272 }
230 273
231 if (len > 0) 274 if (len > 0)
232 tt_write ((unsigned char *)mb, len); 275 tt_write (mb, len);
233 else 276 else
234 scr_bell (); 277 scr_bell ();
235 } 278 }
236 279
237 iso14755buf = 0; 280 iso14755buf = 0;
… …
254 297
255 return -1; 298 return -1;
256} 299}
257#endif 300#endif
258 301
259/*{{{ Convert the keypress event into a string */
260void 302void
261rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
262{ 304{
263 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
264 unsigned int newlen; 306 unsigned int newlen;
265 KeySym keysym; 307 KeySym keysym;
266#ifdef DEBUG_CMD
267 static int debug_key = 1; /* accessible by a debugger only */
268#endif
269 int valid_keysym; 308 int valid_keysym;
270 unsigned char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
271 315
272 /* 316 /*
273 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
275 * 319 *
276 * Always permit `shift' to override the current setting 320 * Always permit `shift' to override the current setting
277 */ 321 */
278 shft = (ev.state & ShiftMask); 322 shft = ev.state & ShiftMask;
279 ctrl = (ev.state & ControlMask); 323 ctrl = ev.state & ControlMask;
280 meta = (ev.state & ModMetaMask); 324 meta = ev.state & ModMetaMask;
281 325
282 if (numlock_state || (ev.state & ModNumLockMask)) 326 if (numlock_state || (ev.state & ModNumLockMask))
283 { 327 {
284 numlock_state = (ev.state & ModNumLockMask); 328 numlock_state = (ev.state & ModNumLockMask);
285 PrivMode ((!numlock_state), PrivMode_aplKP); 329 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
293 Status status_return; 337 Status status_return;
294 338
295#if 0 339#if 0
296#ifdef X_HAVE_UTF8_STRING 340#ifdef X_HAVE_UTF8_STRING
297 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 341 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
298 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 342 len = Xutf8LookupString (Input_Context, &ev, kbuf,
299 KBUFSZ, &keysym, &status_return); 343 KBUFSZ, &keysym, &status_return);
300 else 344 else
301#endif 345#endif
302#endif 346#endif
303 { 347 {
… …
305 349
306 // the XOpenIM manpage lies about hardcoding the locale 350 // the XOpenIM manpage lies about hardcoding the locale
307 // at the point of XOpenIM, so temporarily switch locales 351 // at the point of XOpenIM, so temporarily switch locales
308 if (rs[Rs_imLocale]) 352 if (rs[Rs_imLocale])
309 SET_LOCALE (rs[Rs_imLocale]); 353 SET_LOCALE (rs[Rs_imLocale]);
354
310 // assume wchar_t == unicode or better 355 // assume wchar_t == unicode or better
311 len = XwcLookupString (Input_Context, &ev, wkbuf, 356 len = XwcLookupString (Input_Context, &ev, wkbuf,
312 KBUFSZ, &keysym, &status_return); 357 KBUFSZ, &keysym, &status_return);
358
313 if (rs[Rs_imLocale]) 359 if (rs[Rs_imLocale])
314 SET_LOCALE (locale); 360 SET_LOCALE (locale);
315 361
316 if (status_return == XLookupChars 362 if (status_return == XLookupChars
317 || status_return == XLookupBoth) 363 || status_return == XLookupBoth)
… …
338 || status_return == XLookupBoth; 384 || status_return == XLookupBoth;
339 } 385 }
340 else 386 else
341#endif 387#endif
342 { 388 {
343 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
344 valid_keysym = keysym != NoSymbol; 390 valid_keysym = keysym != NoSymbol;
345 } 391 }
346 392
347 if (valid_keysym) 393 if (valid_keysym)
348 { 394 {
395#ifdef KEYSYM_RESOURCE
396 if (keyboard->dispatch (this, keysym, ev.state))
397 return;
398#endif
399
349 if (TermWin.saveLines) 400 if (saveLines)
350 { 401 {
351#ifdef UNSHIFTED_SCROLLKEYS 402#ifdef UNSHIFTED_SCROLLKEYS
352 if (!ctrl && !meta) 403 if (!ctrl && !meta)
353#else 404#else
354 if (IS_SCROLL_MOD) 405 if (IS_SCROLL_MOD)
355#endif 406#endif
356 { 407 {
357 int lnsppg; 408 int lnsppg;
358 409
359#ifdef PAGING_CONTEXT_LINES 410#ifdef PAGING_CONTEXT_LINES
360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 411 lnsppg = nrow - PAGING_CONTEXT_LINES;
361#else 412#else
362 lnsppg = TermWin.nrow * 4 / 5; 413 lnsppg = nrow * 4 / 5;
363#endif 414#endif
364 if (keysym == XK_Prior) 415 if (keysym == XK_Prior)
365 { 416 {
366 scr_page (UP, lnsppg); 417 scr_page (UP, lnsppg);
367 return; 418 return;
… …
395 scr_move_to (0, 1); 446 scr_move_to (0, 1);
396 return; 447 return;
397 } 448 }
398 else if (keysym == XK_End) 449 else if (keysym == XK_End)
399 { 450 {
400 scr_move_to (1, 0); 451 scr_move_to (1, 1);
401 return; 452 return;
402 } 453 }
403 } 454 }
404#endif 455#endif
405 } 456 }
… …
416 { 467 {
417 switch (keysym) 468 switch (keysym)
418 { 469 {
419 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
420 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
421 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
422 return; 473 return;
423#if TODO 474#if TODO
424 /* rxvt extras */ 475 /* rxvt extras */
425 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
426 change_font (FONT_UP); 477 change_font (FONT_UP);
… …
445 { 496 {
446 commit_iso14755 (); 497 commit_iso14755 ();
447 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
448# if ISO_14755 499# if ISO_14755
449 iso14755_51 (0); 500 iso14755_51 (0);
501# endif
502 return;
503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
450# endif 509# endif
451 return; 510 return;
452 } 511 }
453 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
454 { 513 {
… …
459# endif 518# endif
460 return; 519 return;
461 } 520 }
462 else 521 else
463 { 522 {
464# if ENABLE_OVERLAY 523# if ISO_14755
465 scr_overlay_off (); 524 scr_overlay_off ();
466# endif 525# endif
467 iso14755buf = 0; 526 iso14755buf = 0;
468 } 527 }
469 } 528 }
470 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
471 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
472 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
473 { 532 {
474 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
475# if ENABLE_OVERLAY 534# if ISO_14755
476 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
477 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
478# endif 537# endif
479 } 538 }
480#endif 539#endif
481 540
482#ifdef PRINTPIPE 541#ifdef PRINTPIPE
483 if (keysym == XK_Print) 542 if (keysym == XK_Print)
484 { 543 {
485 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
486 return; 545 return;
487 } 546 }
488#endif 547#endif
489 548
490 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491 { 550 {
492#ifdef KEYSYM_RESOURCE
493 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
494 { 551 {
495 unsigned int l; 552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
496 const unsigned char *kbuf0;
497
498 kbuf0 = (Keysym_map[keysym & 0xFF]);
499 l = (unsigned int)*kbuf0++;
500
501 /* escape prefix */
502 if (meta
503# ifdef META8_OPTION
504 && meta_char == C0_ESC
505# endif
506 )
507 {
508 const unsigned char ch = C0_ESC;
509 tt_write (&ch, 1);
510 }
511
512 tt_write (kbuf0, l);
513 return;
514 }
515 else
516#endif
517 {
518 newlen = 1; 553 newlen = 1;
519 switch (keysym) 554 switch (keysym)
520 { 555 {
521#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
522 case XK_BackSpace: 557 case XK_BackSpace:
… …
525 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
526 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
527 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
528 } 563 }
529 else 564 else
530 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
531 break; 566 break;
532#endif 567#endif
533#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
534 case XK_Delete: 579 case XK_Delete:
535 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
536 break; 581 break;
537#endif 582#endif
538 case XK_Tab: 583 case XK_Tab:
539 if (shft) 584 if (shft)
540 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
… …
551 newlen = 0; 596 newlen = 0;
552 } 597 }
553 break; 598 break;
554 599
555#ifdef XK_KP_Left 600#ifdef XK_KP_Left
601 case XK_KP_Left: /* \033Ot or standard */
556 case XK_KP_Up: /* \033Ox or standard */ 602 case XK_KP_Up: /* \033Ox or standard */
603 case XK_KP_Right: /* \033Ov or standard */
557 case XK_KP_Down: /* \033Or or standard */ 604 case XK_KP_Down: /* \033Or or standard */
558 case XK_KP_Right: /* \033Ov or standard */ 605 if (kp)
559 case XK_KP_Left: /* \033Ot or standard */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 { 606 {
562 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
563 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
564 break; 609 break;
565 } 610 }
… …
588 633
589#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
590# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
591 case XK_KP_Prior: 636 case XK_KP_Prior:
592 /* allow shift to override */ 637 /* allow shift to override */
593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
594 { 639 {
595 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
596 break; 641 break;
597 } 642 }
598 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
… …
601 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
602 break; 647 break;
603# ifdef XK_KP_Next 648# ifdef XK_KP_Next
604 case XK_KP_Next: 649 case XK_KP_Next:
605 /* allow shift to override */ 650 /* allow shift to override */
606 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
607 { 652 {
608 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
609 break; 654 break;
610 } 655 }
611 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
… …
614 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
615 break; 660 break;
616#endif 661#endif
617 case XK_KP_Enter: 662 case XK_KP_Enter:
618 /* allow shift to override */ 663 /* allow shift to override */
619 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
620 { 665 {
621 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
622 break; 667 break;
623 } 668 }
624 669
… …
641#ifdef XK_KP_Begin 686#ifdef XK_KP_Begin
642 case XK_KP_Begin: 687 case XK_KP_Begin:
643 strcpy (kbuf, "\033Ou"); 688 strcpy (kbuf, "\033Ou");
644 break; 689 break;
645 690
646 case XK_KP_Insert:
647 strcpy (kbuf, "\033Op");
648 break;
649
650 case XK_KP_Delete:
651 strcpy (kbuf, "\033On");
652 break;
653#endif 691#endif
654 case XK_KP_F1: /* "\033OP" */ 692 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */ 693 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */ 694 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */ 695 case XK_KP_F4: /* "\033OS" */
… …
674 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
675 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
676 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
677 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
678 /* allow shift to override */ 716 /* allow shift to override */
679 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
680 { 718 {
681 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
682 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
683 } 721 }
684 else 722 else
… …
689 break; 727 break;
690 728
691 case XK_Find: 729 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
693 break; 731 break;
732
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
694 case XK_Insert: 743 case XK_Insert:
695 strcpy (kbuf, "\033[2~"); 744 strcpy (kbuf, "\033[2~");
696 break; 745 break;
697#ifdef DXK_Remove /* support for DEC remove like key */ 746#ifdef DXK_Remove /* support for DEC remove like key */
698 case DXK_Remove: 747 case DXK_Remove:
… …
705 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
706 break; 755 break;
707#ifdef XK_KP_End 756#ifdef XK_KP_End
708 case XK_KP_End: 757 case XK_KP_End:
709 /* allow shift to override */ 758 /* allow shift to override */
710 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
711 { 760 {
712 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
713 break; 762 break;
714 } 763 }
715 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
… …
718 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
719 break; 768 break;
720#ifdef XK_KP_Home 769#ifdef XK_KP_Home
721 case XK_KP_Home: 770 case XK_KP_Home:
722 /* allow shift to override */ 771 /* allow shift to override */
723 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
724 { 773 {
725 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
726 break; 775 break;
727 } 776 }
728 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
… …
785 case XK_F35: /* "\033[49~" */ 834 case XK_F35: /* "\033[49~" */
786 FKEY (31, XK_F17); 835 FKEY (31, XK_F17);
787 break; 836 break;
788#undef FKEY 837#undef FKEY
789 default: 838 default:
790 if (len == 0 839 newlen = 0;
791 && (keysym & 0xfff0) != 0xff70 840 break;
792 && (keysym & 0xfff0) != 0xffe0)
793 /* generate a keycode for every remaining keypress */
794 sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
795 } 841 }
796 842
797 if (newlen) 843 if (newlen)
798 len = strlen (kbuf); 844 len = strlen (kbuf);
799 } 845 }
… …
815 else if (keysym == XK_ISO_Left_Tab) 861 else if (keysym == XK_ISO_Left_Tab)
816 { 862 {
817 strcpy (kbuf, "\033[Z"); 863 strcpy (kbuf, "\033[Z");
818 len = 3; 864 len = 3;
819 } 865 }
820 else if (len == 0
821 && (keysym & 0xffe0) != 0xfe00
822 && (keysym < 0xfe50 || keysym > 0xfe6f))
823 {
824 /* generate a keycode for every remaining keypress */
825 len = sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
826 }
827 else 866 else
828 { 867 {
829#ifdef META8_OPTION 868#ifdef META8_OPTION
830 /* set 8-bit on */ 869 /* set 8-bit on */
831 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
832 { 871 {
833 unsigned char *ch; 872 char *ch;
834 873
835 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
836 *ch |= 0x80; 875 *ch |= 0x80;
837 876
838 meta = 0; 877 meta = 0;
… …
840#endif 879#endif
841 /* nil */ ; 880 /* nil */ ;
842 } 881 }
843 } 882 }
844 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
845 if (len <= 0) 887 if (len <= 0)
846 return; /* not mapped */ 888 return; /* not mapped */
847 889
848 if (options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
849 if (TermWin.view_start) 891 if (view_start)
850 { 892 {
851 TermWin.view_start = 0; 893 view_start = 0;
852 want_refresh = 1; 894 want_refresh = 1;
853 } 895 }
854 896
855 /* 897 /*
856 * these modifications only affect the static keybuffer 898 * these modifications only affect the static keybuffer
… …
871#ifdef META8_OPTION 913#ifdef META8_OPTION
872 && meta_char == C0_ESC 914 && meta_char == C0_ESC
873#endif 915#endif
874 ) 916 )
875 { 917 {
876 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
877 tt_write (&ch, 1); 919 tt_write (&ch, 1);
878 } 920 }
879 921
880#if defined(DEBUG_CMD)
881 /* Display keyboard buffer contents */
882 unsigned char *p;
883 int i;
884
885 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
886 for (i = 0, p = kbuf; i < len; i++, p++)
887 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
888 fprintf (stderr, "'\n");
889#endif /* DEBUG_CMD */
890 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
891} 923}
892/*}}} */
893 924
894#if (MENUBAR_MAX) 925void
895/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 926rxvt_term::key_release (XKeyEvent &ev)
896/* attempt to `write' count to the input buffer */ 927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ISO_14755
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
1002#if defined (KEYSYM_RESOURCE)
897unsigned int 1003unsigned int
898rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
899{ 1005{
900 unsigned int n, s; 1006 unsigned int n, s;
901 1007
902 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
903 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
922 1028
923 cmd_parse (); 1029 cmd_parse ();
924 1030
925 return 0; 1031 return 0;
926} 1032}
927#endif /* MENUBAR_MAX */ 1033#endif
928 1034
929void 1035void
930rxvt_term::flush () 1036rxvt_term::flush ()
931{ 1037{
932 flush_ev.stop (); 1038 flush_ev.stop ();
933 1039
934#ifdef TRANSPARENT 1040#ifdef HAVE_BG_PIXMAP
935 if (want_full_refresh) 1041 if (bgPixmap.check_clearChanged ())
936 { 1042 {
937 want_full_refresh = 0; 1043// scr_clear (true); This needs to be researched further!
938 scr_clear ();
939 scr_touch (false); 1044 scr_touch (false);
940 } 1045 }
941#endif 1046#endif
942 1047
943 if (want_refresh) 1048 if (want_refresh)
944 { 1049 {
1050 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1051 {
1052 int row = view_start;
1053 int end_row = row + nrow;
1054
1055 while (row > top_row && ROW (row - 1).is_longer ())
1056 --row;
1057
1058 do
1059 {
1060 int start_row = row;
1061 line_t *l;
1062
1063 do
1064 {
1065 l = &ROW (row++);
1066
1067 if (!(l->f & LINE_FILTERED))
1068 {
1069 // line not filtered, mark it as filtered
1070 l->f |= LINE_FILTERED;
1071 while (l->is_longer ())
1072 {
1073 l = &ROW (row++);
1074 l->f |= LINE_FILTERED;
1075 }
1076
1077 // and filter it
1078 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1079
1080 break;
1081 }
1082 }
1083 while (l->is_longer () && row < end_row);
1084 }
1085 while (row < end_row);
1086 }
1087
945 scr_refresh (refresh_type); 1088 scr_refresh ();
946 scrollbar_show (1); 1089 scrollbar_show (1);
947#ifdef USE_XIM 1090#ifdef USE_XIM
948 IMSendSpot (); 1091 IMSendSpot ();
949#endif 1092#endif
950 } 1093 }
… …
953} 1096}
954 1097
955void 1098void
956rxvt_term::check_cb (check_watcher &w) 1099rxvt_term::check_cb (check_watcher &w)
957{ 1100{
958 SET_R (this); 1101 make_current ();
959 SET_LOCALE (locale);
960 1102
961 display->flush (); 1103 display->flush ();
962 1104
963 if (want_refresh && !flush_ev.active) 1105 if (want_refresh && !flush_ev.active)
964 flush_ev.start (NOW + 0.01); 1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
965} 1107}
966 1108
967void 1109void
968rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (time_watcher &w)
969{ 1111{
970 SET_R (this); 1112 make_current ();
971 SET_LOCALE (locale);
972 1113
973 refresh_limit = 1;
974 refresh_count = 0; 1114 refresh_count = 0;
975 flush (); 1115 flush ();
976} 1116}
977 1117
978#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
… …
980rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (time_watcher &w)
981{ 1121{
982 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
983 want_refresh = 1; 1123 want_refresh = 1;
984 1124
985 w.start (w.at + BLINK_INTERVAL); 1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
986} 1126}
987#endif 1127#endif
988 1128
989#ifdef TEXT_BLINK 1129#ifdef TEXT_BLINK
990void 1130void
… …
1004rxvt_term::cont_scroll_cb (time_watcher &w) 1144rxvt_term::cont_scroll_cb (time_watcher &w)
1005{ 1145{
1006 if ((scrollbar_isUp() || scrollbar_isDn()) && 1146 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1007 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1147 scr_page (scrollbar_isUp() ? UP : DN, 1))
1008 { 1148 {
1009 refresh_type |= SMOOTH_REFRESH;
1010 want_refresh = 1; 1149 want_refresh = 1;
1011 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1012 } 1151 }
1013} 1152}
1014#endif 1153#endif
… …
1018rxvt_term::sel_scroll_cb (time_watcher &w) 1157rxvt_term::sel_scroll_cb (time_watcher &w)
1019{ 1158{
1020 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1159 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1021 { 1160 {
1022 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1161 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1023 refresh_type |= SMOOTH_REFRESH;
1024 want_refresh = 1; 1162 want_refresh = 1;
1025 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1026 } 1164 }
1027} 1165}
1028#endif 1166#endif
… …
1033{ 1171{
1034 if (mouse_slip_wheel_speed == 0 1172 if (mouse_slip_wheel_speed == 0
1035 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1036 : scr_page (UP, mouse_slip_wheel_speed)) 1174 : scr_page (UP, mouse_slip_wheel_speed))
1037 { 1175 {
1038 refresh_type |= SMOOTH_REFRESH; 1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1039 want_refresh = 1; 1179 want_refresh = 1;
1040 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1041 } 1181 }
1042} 1182}
1043#endif 1183#endif
1044 1184
1185#if LINUX_YIELD_HACK
1186static struct event_handler
1187{
1188 check_watcher yield_ev;
1189
1190 void yield_cb (check_watcher &w)
1191 {
1192 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than
1194 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS.
1196
1197 struct timespec ts = { 0, 0 };
1198 nanosleep (&ts, 0);
1199
1200 w.stop ();
1201 }
1202
1203 event_handler ()
1204 : yield_ev (this, &event_handler::yield_cb)
1205 {
1206 }
1207} event_handler;
1208#endif
1209
1045bool 1210bool
1046rxvt_term::pty_fill () 1211rxvt_term::pty_fill ()
1047{ 1212{
1048 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1213 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1049 1214
1050 if (CBUFSIZ == n) 1215 if (CBUFSIZ == n)
1051 { 1216 {
1052 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1217 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1053 n = 0; 1218 n = 0;
1054 } 1219 }
1055 1220
1056 memmove (cmdbuf_base, cmdbuf_ptr, n); 1221 memmove (cmdbuf_base, cmdbuf_ptr, n);
1057 cmdbuf_ptr = cmdbuf_base; 1222 cmdbuf_ptr = cmdbuf_base;
1058 cmdbuf_endp = cmdbuf_ptr + n; 1223 cmdbuf_endp = cmdbuf_ptr + n;
1059 1224
1060 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1225 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1061 1226
1062 if (n > 0) 1227 if (r > 0)
1063 { 1228 {
1064 cmdbuf_endp += n; 1229 cmdbuf_endp += r;
1065 return true; 1230 return true;
1066 } 1231 }
1067 else if (n < 0 && errno != EAGAIN) 1232 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1233 {
1234#if LINUX_YIELD_HACK
1235 if (display->is_local)
1236 event_handler.yield_ev.start ();
1237#endif
1238 }
1239 else
1240 {
1241 pty_ev.stop ();
1242
1243 if (!option (Opt_hold))
1068 destroy (); 1244 destroy ();
1069 1245 }
1246
1070 return false; 1247 return false;
1071} 1248}
1072 1249
1073void 1250void
1074rxvt_term::pty_cb (io_watcher &w, short revents) 1251rxvt_term::pty_cb (io_watcher &w, short revents)
1075{ 1252{
1076 SET_R (this); 1253 make_current ();
1077 SET_LOCALE (locale);
1078 1254
1079 if (revents & EVENT_READ) 1255 if (revents & EVENT_READ)
1080 // loop, but don't allow a single term to monopolize us 1256 // loop, but don't allow a single term to monopolize us
1081 while (pty_fill ()) 1257 while (pty_fill ())
1082 if (cmd_parse ()) 1258 if (cmd_parse ())
… …
1087} 1263}
1088 1264
1089void 1265void
1090rxvt_term::pointer_unblank () 1266rxvt_term::pointer_unblank ()
1091{ 1267{
1092 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1268 XDefineCursor (dpy, vt, TermWin_cursor);
1093 recolour_cursor (); 1269 recolour_cursor ();
1094 1270
1095#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1096 hidden_pointer = 0; 1272 hidden_pointer = 0;
1097 1273
1098 if (options & Opt_pointerBlank) 1274 if (option (Opt_pointerBlank))
1099 pointer_ev.start (NOW + pointerBlankDelay); 1275 pointer_ev.start (NOW + pointerBlankDelay);
1100#endif 1276#endif
1101} 1277}
1102 1278
1103#ifdef POINTER_BLANK 1279#ifdef POINTER_BLANK
1104void 1280void
1105rxvt_term::pointer_blank () 1281rxvt_term::pointer_blank ()
1106{ 1282{
1107 if (! (options & Opt_pointerBlank)) 1283 if (!option (Opt_pointerBlank))
1108 return; 1284 return;
1109 1285
1110 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1286 XDefineCursor (dpy, vt, display->blank_cursor);
1111 XFlush (display->display); 1287 XFlush (dpy);
1112 1288
1113 hidden_pointer = 1; 1289 hidden_pointer = 1;
1114} 1290}
1115 1291
1116void 1292void
1117rxvt_term::pointer_cb (time_watcher &w) 1293rxvt_term::pointer_cb (time_watcher &w)
1118{ 1294{
1119 SET_R (this); 1295 make_current ();
1120 SET_LOCALE (locale);
1121 1296
1122 pointer_blank (); 1297 pointer_blank ();
1123} 1298}
1124#endif 1299#endif
1125 1300
1126void 1301void
1127rxvt_term::mouse_report (XButtonEvent &ev) 1302rxvt_term::mouse_report (XButtonEvent &ev)
1128{ 1303{
1129 int button_number, key_state = 0; 1304 int button_number, key_state = 0;
1130 int x, y; 1305 int x, y;
1306 int code = 32;
1131 1307
1132 x = ev.x; 1308 x = Pixel2Col (ev.x);
1133 y = ev.y; 1309 y = Pixel2Row (ev.y);
1134 pixel_position (&x, &y); 1310 if (ev.type == MotionNotify) {
1311 if (x == mouse_row && y == mouse_col)
1312 return;
1313 mouse_row = x;
1314 mouse_col = y;
1315 code += 32;
1316 }
1135 1317
1136 if (MEvent.button == AnyButton) 1318 if (MEvent.button == AnyButton)
1137 button_number = 3; 1319 button_number = 3;
1138 else 1320 else
1139 { 1321 {
… …
1185 x + 1, 1367 x + 1,
1186 y + 1); 1368 y + 1);
1187#endif 1369#endif
1188 1370
1189 tt_printf ("\033[M%c%c%c", 1371 tt_printf ("\033[M%c%c%c",
1190 (32 + button_number + key_state), 1372 (code + button_number + key_state),
1191 (32 + x + 1), 1373 (32 + x + 1),
1192 (32 + y + 1)); 1374 (32 + y + 1));
1193} 1375}
1194
1195#ifdef USING_W11LIB
1196void
1197rxvt_W11_process_x_event (XEvent *ev)
1198{
1199 rxvt_t *r = rxvt_get_r ();
1200
1201 x_cb (*ev);
1202}
1203#endif
1204 1376
1205/*{{{ process an X event */ 1377/*{{{ process an X event */
1206void 1378void
1207rxvt_term::x_cb (XEvent &ev) 1379rxvt_term::x_cb (XEvent &ev)
1208{ 1380{
1209 SET_R (this); 1381 make_current ();
1210 SET_LOCALE (locale);
1211 1382
1212#if defined(CURSOR_BLINK) 1383 dLocal (Display *, dpy);
1213 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1214 {
1215 if (hidden_cursor)
1216 {
1217 hidden_cursor = 0;
1218 want_refresh = 1;
1219 }
1220 1384
1221 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1385 if (ev.xany.window == vt
1222 } 1386 && SHOULD_INVOKE (HOOK_X_EVENT)
1223#endif 1387 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1388 return;
1224 1389
1225#if defined(POINTER_BLANK) 1390 // for XQueryPointer
1226 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1227 {
1228 if (ev.type == MotionNotify
1229 || ev.type == ButtonPress
1230 || ev.type == ButtonRelease)
1231 if (hidden_pointer)
1232 pointer_unblank ();
1233
1234 if (ev.type == KeyPress && hidden_pointer == 0)
1235 pointer_blank ();
1236 }
1237#endif
1238
1239 Window unused_root, unused_child; 1391 Window unused_root, unused_child;
1240 int unused_root_x, unused_root_y; 1392 int unused_root_x, unused_root_y;
1241 unsigned int unused_mask; 1393 unsigned int unused_mask;
1242 1394
1243 switch (ev.type) 1395 switch (ev.type)
1244 { 1396 {
1245 case KeyPress: 1397 case KeyPress:
1246#if ISO_14755 1398 key_press (ev.xkey);
1247 if (!(iso14755buf & ISO_14755_52))
1248#endif
1249 lookup_key (ev.xkey);
1250
1251 break; 1399 break;
1252 1400
1253 case KeyRelease: 1401 case KeyRelease:
1254 { 1402 key_release (ev.xkey);
1255#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1256 KeySym ks;
1257
1258 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1259#endif
1260
1261#if ENABLE_FRILLS || ISO_14755
1262 // ISO 14755 support
1263 if (iso14755buf)
1264 if (iso14755buf & ISO_14755_52)
1265 {
1266# if ENABLE_OVERLAY
1267 scr_overlay_off ();
1268# endif
1269# if ISO_14755
1270 // iso14755 part 5.2 handling: release time
1271 // first: controls
1272 if ((ev.xkey.state & ControlMask)
1273 && ((ks >= 0x40 && ks <= 0x5f)
1274 || (ks >= 0x61 && ks <= 0x7f)))
1275 {
1276 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1277 commit_iso14755 ();
1278 return; // case-break;
1279 }
1280
1281 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1282 if (i[0] == ks)
1283 {
1284 iso14755buf = ISO_14755_51 | i[1];
1285 commit_iso14755 ();
1286 return; // case-break;
1287 }
1288
1289 scr_bell ();
1290# endif
1291 iso14755buf = 0;
1292 break;
1293 }
1294 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1295 {
1296# if ENABLE_OVERLAY
1297 scr_overlay_off ();
1298# endif
1299 if (iso14755buf & ISO_14755_51)
1300 commit_iso14755 ();
1301#if ISO_14755
1302 else if (iso14755buf & ISO_14755_STARTED)
1303 {
1304 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1305
1306 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1307 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1308 }
1309# endif
1310 else
1311 iso14755buf = 0;
1312 }
1313#endif
1314
1315#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1316 if (!(ev.xkey.state & ControlMask))
1317 slip_wheel_ev.stop ();
1318 else if (ks == XK_Control_L || ks == XK_Control_R)
1319 mouse_slip_wheel_speed = 0;
1320#endif
1321 break; 1403 break;
1322 }
1323 1404
1324 case ButtonPress: 1405 case ButtonPress:
1325 button_press (ev.xbutton); 1406 button_press (ev.xbutton);
1326 break; 1407 break;
1327 1408
… …
1329 button_release (ev.xbutton); 1410 button_release (ev.xbutton);
1330 break; 1411 break;
1331 1412
1332 case ClientMessage: 1413 case ClientMessage:
1333 if (ev.xclient.format == 32 1414 if (ev.xclient.format == 32
1334 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1415 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1335 destroy ();
1336#ifdef OFFIX_DND
1337 /* OffiX Dnd (drag 'n' drop) protocol */
1338 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1339 && (ev.xclient.data.l[0] == DndFile
1340 || ev.xclient.data.l[0] == DndDir
1341 || ev.xclient.data.l[0] == DndLink))
1342 { 1416 {
1343 /* Get Dnd data */ 1417 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1344 Atom ActualType; 1418 {
1345 int ActualFormat; 1419 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1346 unsigned char *data; 1420 {
1347 unsigned long Size, RemainingBytes; 1421 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1348 1422 {
1349 XGetWindowProperty (display->display, display->root, 1423 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1350 xa[XA_DNDSELECTION], 1424 destroy ();
1351 0L, 1000000L, 1425 }
1352 False, AnyPropertyType, 1426#if ENABLE_EWMH
1353 &ActualType, &ActualFormat, 1427 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1354 &Size, &RemainingBytes, 1428 XSendEvent (dpy, ev.xclient.window = display->root,
1429 False, SubstructureRedirectMask | SubstructureNotifyMask,
1355 &data); 1430 &ev);
1356 set_string_property (XA_CUT_BUFFER0, data); 1431#endif
1357 XFree (data); 1432 }
1358 selection_paste (display->root, XA_CUT_BUFFER0, true); 1433 }
1359 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1434#if ENABLE_XEMBED
1435 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1436 {
1437 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1438 focus_in ();
1439 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1440 focus_out ();
1441 }
1442#endif
1360 } 1443 }
1361#endif /* OFFIX_DND */
1362 break;
1363
1364 case MappingNotify:
1365 XRefreshKeyboardMapping (&ev.xmapping);
1366 break; 1444 break;
1367 1445
1368 /* 1446 /*
1369 * XXX: this is not the _current_ arrangement 1447 * XXX: this is not the _current_ arrangement
1370 * Here's my conclusion: 1448 * Here's my conclusion:
… …
1389 break; 1467 break;
1390 } 1468 }
1391 break; 1469 break;
1392 1470
1393 case FocusIn: 1471 case FocusIn:
1394 if (!TermWin.focus) 1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1475 focus_in ();
1476 break;
1477
1478 case FocusOut:
1479 if (ev.xfocus.detail != NotifyInferior
1480 && ev.xfocus.detail != NotifyPointer
1481 && ev.xfocus.mode != NotifyGrab)
1482 focus_out ();
1483 break;
1484
1485 case ConfigureNotify:
1486 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1487 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1488 szHint.width, szHint.height); */
1489 if (ev.xconfigure.window == parent[0])
1395 { 1490 {
1396 TermWin.focus = 1; 1491 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1397 want_refresh = 1;
1398#ifdef USE_XIM
1399 if (Input_Context != NULL)
1400 { 1492 ;
1401 IMSetStatusPosition ();
1402 XSetICFocus (Input_Context);
1403 }
1404#endif
1405#ifdef CURSOR_BLINK
1406 if (options & Opt_cursorBlink)
1407 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1408#endif
1409#ifdef OFF_FOCUS_FADING
1410 if (rs[Rs_fade])
1411 {
1412 pix_colors = pix_colors_focused;
1413 scr_recolour ();
1414 }
1415#endif
1416 1493
1417 }
1418 break;
1419
1420 case FocusOut:
1421 if (TermWin.focus)
1422 {
1423 TermWin.focus = 0;
1424 want_refresh = 1;
1425
1426#if ENABLE_FRILLS || ISO_14755
1427 iso14755buf = 0;
1428#endif
1429#if ENABLE_OVERLAY
1430 scr_overlay_off ();
1431#endif
1432#ifdef USE_XIM
1433 if (Input_Context != NULL)
1434 XUnsetICFocus (Input_Context);
1435#endif
1436#ifdef CURSOR_BLINK
1437 if (options & Opt_cursorBlink)
1438 cursor_blink_ev.stop ();
1439 hidden_cursor = 0;
1440#endif
1441#ifdef OFF_FOCUS_FADING
1442 if (rs[Rs_fade])
1443 {
1444 pix_colors = pix_colors_unfocused;
1445 scr_recolour ();
1446 }
1447#endif
1448 }
1449 break;
1450
1451 case ConfigureNotify:
1452 if (ev.xconfigure.window == TermWin.parent[0])
1453 {
1454 int height, width;
1455
1456 do
1457 { /* Wrap lots of configures into one */
1458 width = ev.xconfigure.width;
1459 height = ev.xconfigure.height;
1460 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1461 }
1462 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1463
1464 if (szHint.width != width || szHint.height != height) 1494 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1465 { 1495 {
1466 seen_resize = 1; 1496 seen_resize = 1;
1467 resize_all_windows (width, height, 1); 1497 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1468 } 1498 }
1469 1499 else
1470#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1500 {
1471 if (options & Opt_transparent) 1501#ifdef HAVE_BG_PIXMAP
1472 check_our_parents (); 1502 if (bgPixmap.window_position_sensitive ())
1503 update_background ();
1473#endif 1504#endif
1505 }
1506 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1474 } 1507 }
1475 break; 1508 break;
1476 1509
1477 case PropertyNotify: 1510 case PropertyNotify:
1511 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1478 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1512 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1479 && ev.xproperty.state == PropertyNewValue) 1513 && ev.xproperty.state == PropertyNewValue)
1480 selection_property (ev.xproperty.window, ev.xproperty.atom); 1514 selection_property (ev.xproperty.window, ev.xproperty.atom);
1481 1515
1482 break; 1516 break;
1483 1517
1484 case SelectionClear: 1518 case SelectionClear:
1485 selection_clear (); 1519 selection_clear ();
… …
1492 1526
1493 case SelectionRequest: 1527 case SelectionRequest:
1494 selection_send (ev.xselectionrequest); 1528 selection_send (ev.xselectionrequest);
1495 break; 1529 break;
1496 1530
1531 case MapNotify:
1532 mapped = 1;
1533#ifdef TEXT_BLINK
1534 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1535#endif
1536 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1537 break;
1538
1497 case UnmapNotify: 1539 case UnmapNotify:
1498 TermWin.mapped = 0; 1540 mapped = 0;
1499#ifdef TEXT_BLINK 1541#ifdef TEXT_BLINK
1500 text_blink_ev.stop (); 1542 text_blink_ev.stop ();
1501#endif 1543#endif
1544 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1502 break; 1545 break;
1503
1504 case MapNotify:
1505 TermWin.mapped = 1;
1506#ifdef TEXT_BLINK
1507 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1508#endif
1509 break;
1510
1511#ifdef TRANSPARENT
1512 case ReparentNotify:
1513 rootwin_cb (ev);
1514 break;
1515#endif /* TRANSPARENT */
1516 1546
1517 case GraphicsExpose: 1547 case GraphicsExpose:
1518 case Expose: 1548 case Expose:
1519 if (ev.xany.window == TermWin.vt) 1549 if (ev.xany.window == vt)
1520 { 1550 {
1521 do 1551 do
1552 {
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1555 }
1524 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1556 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1525 1557
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1558 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527 1559
1528 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1560 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1561 {
1529 scr_expose (ev.xexpose.x, ev.xexpose.y, 1562 scr_expose (ev.xexpose.x, ev.xexpose.y,
1530 ev.xexpose.width, ev.xexpose.height, False); 1563 ev.xexpose.width, ev.xexpose.height, False);
1531 1564 }
1532 scr_refresh (refresh_type); 1565 want_refresh = 1;
1533 } 1566 }
1534 else 1567 else
1535 { 1568 {
1536 XEvent unused_event; 1569 XEvent unused_event;
1537 1570
1538 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1539 ; 1572 ;
1540 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1541 ; 1574 ;
1542 1575
1543 if (isScrollbarWindow (ev.xany.window)) 1576 if (isScrollbarWindow (ev.xany.window))
1544 { 1577 {
1545 scrollBar.setIdle (); 1578 scrollBar.setIdle ();
1546 scrollbar_show (0); 1579 scrollbar_show (0);
1547 } 1580 }
1548#ifdef MENUBAR
1549 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1550 menubar_expose ();
1551#endif
1552
1553#ifdef TRANSPARENT
1554 if (am_transparent && ev.xany.window == TermWin.parent[0])
1555 XClearWindow (display->display, ev.xany.window);
1556#endif
1557 } 1581 }
1558 break; 1582 break;
1559 1583
1560 case MotionNotify: 1584 case MotionNotify:
1561#ifdef POINTER_BLANK 1585#ifdef POINTER_BLANK
1562 if (hidden_pointer) 1586 if (hidden_pointer)
1563 pointer_unblank (); 1587 pointer_unblank ();
1564#endif 1588#endif
1565#if MENUBAR 1589 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1566 if (isMenuBarWindow (ev.xany.window)) 1590 || priv_modes & PrivMode_MouseAnyEvent)
1567 {
1568 menubar_control (ev.xbutton); 1591 mouse_report (ev.xbutton);
1569 break;
1570 }
1571#endif
1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1573 break; 1593 break;
1574 1594
1575 if (ev.xany.window == TermWin.vt) 1595 if (ev.xany.window == vt)
1576 { 1596 {
1597 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1598 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1599 ; // nop
1577 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1600 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1578 { 1601 {
1579 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1580 ; 1603 ;
1581 1604
1582 XQueryPointer (display->display, TermWin.vt, 1605 XQueryPointer (dpy, vt,
1583 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1584 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1585 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1586 &ev.xbutton.state); 1609 &ev.xbutton.state);
1587#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
… …
1599#endif 1622#endif
1600 selection_extend (ev.xbutton.x, ev.xbutton.y, 1623 selection_extend (ev.xbutton.x, ev.xbutton.y,
1601 ev.xbutton.state & Button3Mask ? 2 : 0); 1624 ev.xbutton.state & Button3Mask ? 2 : 0);
1602 1625
1603#ifdef SELECTION_SCROLLING 1626#ifdef SELECTION_SCROLLING
1604 if (ev.xbutton.y < TermWin.int_bwidth 1627 if (ev.xbutton.y < int_bwidth
1605 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1628 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1606 { 1629 {
1607 int dist; 1630 int dist;
1608 1631
1609 /* don't clobber the current delay if we are 1632 /* don't clobber the current delay if we are
1610 * already in the middle of scrolling. 1633 * already in the middle of scrolling.
… …
1618 selection_save_x = ev.xbutton.x; 1641 selection_save_x = ev.xbutton.x;
1619 selection_save_y = ev.xbutton.y; 1642 selection_save_y = ev.xbutton.y;
1620 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1643 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1621 1644
1622 /* calc number of lines to scroll */ 1645 /* calc number of lines to scroll */
1623 if (ev.xbutton.y < TermWin.int_bwidth) 1646 if (ev.xbutton.y < int_bwidth)
1624 { 1647 {
1625 scroll_selection_dir = UP; 1648 scroll_selection_dir = UP;
1626 dist = TermWin.int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1627 } 1650 }
1628 else 1651 else
1629 { 1652 {
1630 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1631 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1654 dist = ev.xbutton.y - (int_bwidth + height);
1632 } 1655 }
1633 1656
1634 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1635 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1636 + 1; 1659 + 1;
1637 MIN_IT (scroll_selection_lines, 1660 min_it (scroll_selection_lines,
1638 SELECTION_SCROLL_MAX_LINES); 1661 SELECTION_SCROLL_MAX_LINES);
1639 } 1662 }
1640 else 1663 else
1641 { 1664 {
1642 /* we are within the text window, so we 1665 /* we are within the text window, so we
… …
1651#endif 1674#endif
1652 } 1675 }
1653 } 1676 }
1654 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1655 { 1678 {
1656 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1657 MotionNotify, &ev)) 1680 MotionNotify, &ev))
1658 ; 1681 ;
1659 1682
1660 XQueryPointer (display->display, scrollBar.win, 1683 XQueryPointer (dpy, scrollBar.win,
1661 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1662 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1663 &ev.xbutton.x, &ev.xbutton.y, 1686 &ev.xbutton.x, &ev.xbutton.y,
1664 &unused_mask); 1687 &unused_mask);
1665 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1666 scrollbar_size ()); 1689 scrollbar_size ());
1667 scr_refresh (refresh_type);
1668 refresh_limit = 0; 1690 want_refresh = 1;
1669 scrollbar_show (1); 1691 scrollbar_show (1);
1670 } 1692 }
1671 break; 1693 break;
1672 } 1694 }
1673}
1674 1695
1675#if TRANSPARENT 1696#if defined(CURSOR_BLINK)
1697 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1698 {
1699 if (hidden_cursor)
1700 {
1701 hidden_cursor = 0;
1702 want_refresh = 1;
1703 }
1704
1705 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1706 }
1707#endif
1708
1709#if defined(POINTER_BLANK)
1710 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1711 {
1712 if (ev.type == MotionNotify
1713 || ev.type == ButtonPress
1714 || ev.type == ButtonRelease)
1715 if (hidden_pointer)
1716 pointer_unblank ();
1717
1718 if (ev.type == KeyPress && hidden_pointer == 0)
1719 pointer_blank ();
1720 }
1721#endif
1722}
1723
1724void
1725rxvt_term::focus_in ()
1726{
1727 if (!focus)
1728 {
1729 focus = 1;
1730 want_refresh = 1;
1731
1732 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1733
1734#if USE_XIM
1735 if (Input_Context != NULL)
1736 {
1737 IMSetPosition ();
1738 XSetICFocus (Input_Context);
1739 }
1740#endif
1741#if CURSOR_BLINK
1742 if (option (Opt_cursorBlink))
1743 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1744#endif
1745#if OFF_FOCUS_FADING
1746 if (rs[Rs_fade])
1747 {
1748 pix_colors = pix_colors_focused;
1749 scr_recolour ();
1750 }
1751#endif
1752#if ENABLE_FRILLS
1753 if (option (Opt_urgentOnBell))
1754 {
1755 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1756 {
1757 h->flags &= ~XUrgencyHint;
1758 XSetWMHints (dpy, parent[0], h);
1759 }
1760 }
1761#endif
1762 }
1763}
1764
1765void
1766rxvt_term::focus_out ()
1767{
1768 if (focus)
1769 {
1770 focus = 0;
1771 want_refresh = 1;
1772
1773 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1774
1775#if ENABLE_FRILLS || ISO_14755
1776 if (iso14755buf)
1777 {
1778 iso14755buf = 0;
1779# if ISO_14755
1780 scr_overlay_off ();
1781# endif
1782 }
1783#endif
1784#if USE_XIM
1785 if (Input_Context != NULL)
1786 XUnsetICFocus (Input_Context);
1787#endif
1788#if CURSOR_BLINK
1789 if (option (Opt_cursorBlink))
1790 cursor_blink_ev.stop ();
1791 hidden_cursor = 0;
1792#endif
1793#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade])
1795 {
1796 pix_colors = pix_colors_unfocused;
1797 scr_recolour ();
1798 }
1799#endif
1800 }
1801}
1802
1803void
1804rxvt_term::update_fade_color (unsigned int idx)
1805{
1806#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade])
1808 {
1809 rgba c;
1810 pix_colors [Color_fade].get (c);
1811 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1812 }
1813#endif
1814}
1815
1816#if ENABLE_TRANSPARENCY || ENABLE_PERL
1676void 1817void
1677rxvt_term::rootwin_cb (XEvent &ev) 1818rxvt_term::rootwin_cb (XEvent &ev)
1678{ 1819{
1679 SET_R (this); 1820 make_current ();
1680 SET_LOCALE (locale);
1681 1821
1822 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1823 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1824 return;
1825
1826# if ENABLE_TRANSPARENCY
1682 switch (ev.type) 1827 switch (ev.type)
1683 { 1828 {
1684 case PropertyNotify: 1829 case PropertyNotify:
1685 /* 1830 /*
1686 * if user used some Esetroot compatible prog to set the root bg, 1831 * if user used some Esetroot compatible prog to set the root bg,
1687 * use the property to determine the pixmap. We use it later on. 1832 * use the property to determine the pixmap. We use it later on.
1688 */ 1833 */
1689 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1690 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1691 return; 1836 {
1692 1837 bgPixmap.set_root_pixmap ();
1693 /* FALLTHROUGH */ 1838 update_background ();
1694 case ReparentNotify: 1839 }
1695 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1696 want_refresh = want_full_refresh = 1;
1697 break; 1840 break;
1698 } 1841 }
1842# endif
1699} 1843}
1700#endif 1844#endif
1701 1845
1702void 1846void
1703rxvt_term::button_press (XButtonEvent &ev) 1847rxvt_term::button_press (XButtonEvent &ev)
1704{ 1848{
1705 int reportmode = 0, clickintime; 1849 int reportmode = 0, clickintime;
1706 1850
1707 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1851 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1852
1708 if (!bypass_keystate) 1853 if (!bypass_keystate)
1709 reportmode = !! (priv_modes & PrivMode_mouse_report); 1854 reportmode = !! (priv_modes & PrivMode_mouse_report);
1710 1855
1711 /* 1856 /*
1712 * VT window processing of button press 1857 * VT window processing of button press
1713 */ 1858 */
1714 if (ev.window == TermWin.vt) 1859 if (ev.window == vt)
1715 { 1860 {
1861 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1862 return;
1863
1716#if ISO_14755 1864#if ISO_14755
1717 // 5.4 1865 // 5.4
1718 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1866 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1719 { 1867 {
1720 iso14755_54 (ev.x, ev.y); 1868 iso14755_54 (ev.x, ev.y);
… …
1732#ifdef MOUSE_REPORT_DOUBLECLICK 1880#ifdef MOUSE_REPORT_DOUBLECLICK
1733 if (ev.button == MEvent.button && clickintime) 1881 if (ev.button == MEvent.button && clickintime)
1734 { 1882 {
1735 /* same button, within alloted time */ 1883 /* same button, within alloted time */
1736 MEvent.clicks++; 1884 MEvent.clicks++;
1885
1737 if (MEvent.clicks > 1) 1886 if (MEvent.clicks > 1)
1738 { 1887 {
1739 /* only report double clicks */ 1888 /* only report double clicks */
1740 MEvent.clicks = 2; 1889 MEvent.clicks = 2;
1741 mouse_report (ev); 1890 mouse_report (ev);
… …
1767 { 1916 {
1768 case Button1: 1917 case Button1:
1769 /* allow meta + click to select rectangular areas */ 1918 /* allow meta + click to select rectangular areas */
1770 /* should be done in screen.C */ 1919 /* should be done in screen.C */
1771#if ENABLE_FRILLS 1920#if ENABLE_FRILLS
1772 selection.rect = !! (ev.state & ModMetaMask); 1921 selection.rect = !!(ev.state & ModMetaMask);
1773#else 1922#else
1774 selection.rect = false; 1923 selection.rect = false;
1775#endif 1924#endif
1776 1925
1777 /* allow shift+left click to extend selection */ 1926 /* allow shift+left click to extend selection */
1778 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1927 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1779 { 1928 {
1780 if (MEvent.button == Button1 && clickintime) 1929 if (MEvent.button == Button1 && clickintime)
1781 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1782 else 1931 else
1783 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
… …
1924 case Button3: 2073 case Button3:
1925 if (scrollBar.style != R_SB_XTERM) 2074 if (scrollBar.style != R_SB_XTERM)
1926 { 2075 {
1927 if (scrollbar_above_slider (ev.y)) 2076 if (scrollbar_above_slider (ev.y))
1928# ifdef RXVT_SCROLL_FULL 2077# ifdef RXVT_SCROLL_FULL
1929 scr_page (UP, TermWin.nrow - 1); 2078 scr_page (UP, nrow - 1);
1930# else 2079# else
1931 scr_page (UP, TermWin.nrow / 4); 2080 scr_page (UP, nrow / 4);
1932# endif 2081# endif
1933 else if (scrollbar_below_slider (ev.y)) 2082 else if (scrollbar_below_slider (ev.y))
1934# ifdef RXVT_SCROLL_FULL 2083# ifdef RXVT_SCROLL_FULL
1935 scr_page (DN, TermWin.nrow - 1); 2084 scr_page (DN, nrow - 1);
1936# else 2085# else
1937 scr_page (DN, TermWin.nrow / 4); 2086 scr_page (DN, nrow / 4);
1938# endif 2087# endif
1939 else 2088 else
1940 scrollBar.setMotion (); 2089 scrollBar.setMotion ();
1941 } 2090 }
1942 else 2091 else
1943 { 2092 {
1944 scr_page ((ev.button == Button1 ? DN : UP), 2093 scr_page ((ev.button == Button1 ? DN : UP),
1945 (TermWin.nrow 2094 (nrow
1946 * scrollbar_position (ev.y) 2095 * scrollbar_position (ev.y)
1947 / scrollbar_size ())); 2096 / scrollbar_size ()));
1948 } 2097 }
1949 2098
1950 break; 2099 break;
1951 } 2100 }
1952 } 2101 }
2102
1953 return; 2103 return;
1954 } 2104 }
1955#if MENUBAR
1956 /*
1957 * Menubar window processing of button press
1958 */
1959 if (isMenuBarWindow (ev.window))
1960 menubar_control (ev);
1961#endif
1962} 2105}
1963 2106
1964void 2107void
1965rxvt_term::button_release (XButtonEvent &ev) 2108rxvt_term::button_release (XButtonEvent &ev)
1966{ 2109{
… …
1972 2115
1973 if (scrollbar_isUpDn ()) 2116 if (scrollbar_isUpDn ())
1974 { 2117 {
1975 scrollBar.setIdle (); 2118 scrollBar.setIdle ();
1976 scrollbar_show (0); 2119 scrollbar_show (0);
1977#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1978 refresh_type &= ~SMOOTH_REFRESH;
1979#endif
1980 } 2120 }
1981 2121
1982#ifdef SELECTION_SCROLLING 2122#ifdef SELECTION_SCROLLING
1983 if (sel_scroll_ev.active) 2123 if (sel_scroll_ev.active)
1984 sel_scroll_ev.stop(); 2124 sel_scroll_ev.stop();
1985#endif 2125#endif
1986 2126
1987 if (ev.window == TermWin.vt) 2127 if (ev.window == vt)
1988 { 2128 {
2129 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2130 return;
2131
1989#if ISO_14755 2132#if ISO_14755
1990 // 5.4 2133 // 5.4
1991 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2134 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1992 return; 2135 return;
1993#endif 2136#endif
2137
1994 if (reportmode) 2138 if (reportmode)
1995 { 2139 {
1996 /* mouse report from vt window */ 2140 /* mouse report from vt window */
1997 /* don't report release of wheel "buttons" */ 2141 /* don't report release of wheel "buttons" */
1998 if (ev.button >= 4) 2142 if (ev.button >= 4)
… …
2028 { 2172 {
2029 case Button1: 2173 case Button1:
2030 case Button3: 2174 case Button3:
2031 selection_make (ev.time); 2175 selection_make (ev.time);
2032 break; 2176 break;
2177
2033 case Button2: 2178 case Button2:
2034 selection_request (ev.time, ev.x, ev.y); 2179 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2180 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2035 break; 2181 break;
2182
2036#ifdef MOUSE_WHEEL 2183#ifdef MOUSE_WHEEL
2037 case Button4: 2184 case Button4:
2038 case Button5: 2185 case Button5:
2039 { 2186 {
2040 int i; 2187 int i;
… …
2042 2189
2043 v = ev.button == Button4 ? UP : DN; 2190 v = ev.button == Button4 ? UP : DN;
2044 2191
2045 if (ev.state & ShiftMask) 2192 if (ev.state & ShiftMask)
2046 i = 1; 2193 i = 1;
2047 else if (options & Opt_mouseWheelScrollPage) 2194 else if (option (Opt_mouseWheelScrollPage))
2048 i = TermWin.nrow - 1; 2195 i = nrow - 1;
2049 else 2196 else
2050 i = 5; 2197 i = 5;
2051 2198
2052# ifdef MOUSE_SLIP_WHEELING 2199# ifdef MOUSE_SLIP_WHEELING
2053 if (ev.state & ControlMask) 2200 if (ev.state & ControlMask)
2054 { 2201 {
2055 mouse_slip_wheel_speed += v ? -1 : 1; 2202 mouse_slip_wheel_speed += v ? -1 : 1;
2056 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2203 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2057 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2204 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2058 2205
2059 if (slip_wheel_ev.at < NOW) 2206 if (slip_wheel_ev.at < NOW)
2060 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2207 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2061 2208
2062 slip_wheel_ev.start (); 2209 slip_wheel_ev.start ();
2063 } 2210 }
2064 else 2211 else
2065 { 2212 {
2066# endif 2213# endif
2067# ifdef JUMP_MOUSE_WHEEL
2068 scr_page (v, i); 2214 scr_page (v, i);
2069 scr_refresh (SMOOTH_REFRESH);
2070 scrollbar_show (1); 2215 scrollbar_show (1);
2071# else
2072 while (i--)
2073 {
2074 scr_page (v, 1);
2075 scr_refresh (SMOOTH_REFRESH);
2076 scrollbar_show (1);
2077 }
2078# endif
2079# ifdef MOUSE_SLIP_WHEELING 2216# ifdef MOUSE_SLIP_WHEELING
2080 } 2217 }
2081#endif 2218# endif
2082 } 2219 }
2083 break; 2220 break;
2084#endif 2221#endif
2085 } 2222 }
2086 } 2223 }
2087#ifdef MENUBAR
2088 else if (isMenuBarWindow (ev.window))
2089 menubar_control (ev);
2090#endif
2091} 2224}
2092
2093#ifdef TRANSPARENT
2094#if TINTING
2095/* taken from aterm-0.4.2 */
2096
2097typedef uint32_t RUINT32T;
2098
2099void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2100{
2101 int sh_r, sh_g, sh_b;
2102 RUINT32T mask_r, mask_g, mask_b;
2103 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2104 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2105 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2106 int i;
2107
2108 Visual* visual = display->visual;
2109
2110 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2111
2112 /* for convenience */
2113 mask_r = visual->red_mask;
2114 mask_g = visual->green_mask;
2115 mask_b = visual->blue_mask;
2116
2117 /* boring lookup table pre-initialization */
2118 switch (srcImage->bits_per_pixel) {
2119 case 15:
2120 if ((mask_r != 0x7c00) ||
2121 (mask_g != 0x03e0) ||
2122 (mask_b != 0x001f))
2123 return;
2124 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2125 lookup_r = lookup;
2126 lookup_g = lookup+32;
2127 lookup_b = lookup+32+32;
2128 sh_r = 10;
2129 sh_g = 5;
2130 sh_b = 0;
2131 break;
2132 case 16:
2133 if ((mask_r != 0xf800) ||
2134 (mask_g != 0x07e0) ||
2135 (mask_b != 0x001f))
2136 return;
2137 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2138 lookup_r = lookup;
2139 lookup_g = lookup+32;
2140 lookup_b = lookup+32+64;
2141 sh_r = 11;
2142 sh_g = 5;
2143 sh_b = 0;
2144 break;
2145 case 24:
2146 if ((mask_r != 0xff0000) ||
2147 (mask_g != 0x00ff00) ||
2148 (mask_b != 0x0000ff))
2149 return;
2150 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2151 lookup_r = lookup;
2152 lookup_g = lookup+256;
2153 lookup_b = lookup+256+256;
2154 sh_r = 16;
2155 sh_g = 8;
2156 sh_b = 0;
2157 break;
2158 case 32:
2159 if ((mask_r != 0xff0000) ||
2160 (mask_g != 0x00ff00) ||
2161 (mask_b != 0x0000ff))
2162 return;
2163 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2164 lookup_r = lookup;
2165 lookup_g = lookup+256;
2166 lookup_b = lookup+256+256;
2167 sh_r = 16;
2168 sh_g = 8;
2169 sh_b = 0;
2170 break;
2171 default:
2172 return; /* we do not support this color depth */
2173 }
2174
2175 /* prepare limits for color transformation (each channel is handled separately) */
2176 if (shade < 0) {
2177 shade = -shade;
2178 if (shade < 0) shade = 0;
2179 if (shade > 100) shade = 100;
2180
2181 lower_lim_r = 65535-rm;
2182 lower_lim_g = 65535-gm;
2183 lower_lim_b = 65535-bm;
2184
2185 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2186 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2187 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2188
2189 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2190 } else {
2191 if (shade < 0) shade = 0;
2192 if (shade > 100) shade = 100;
2193
2194 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2195
2196 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2197 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2198 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2199 }
2200
2201 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2202 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2203 {
2204 unsigned int tmp;
2205
2206 tmp = lower_lim_r;
2207 lower_lim_r = lower_lim_b;
2208 lower_lim_b = tmp;
2209
2210 tmp = upper_lim_r;
2211 upper_lim_r = upper_lim_b;
2212 upper_lim_b = tmp;
2213 }
2214
2215 /* fill our lookup tables */
2216 for (i = 0; i <= mask_r>>sh_r; i++)
2217 {
2218 RUINT32T tmp;
2219 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2220 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2221 lookup_r[i] = (tmp/65535)<<sh_r;
2222 }
2223 for (i = 0; i <= mask_g>>sh_g; i++)
2224 {
2225 RUINT32T tmp;
2226 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2227 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2228 lookup_g[i] = (tmp/65535)<<sh_g;
2229 }
2230 for (i = 0; i <= mask_b>>sh_b; i++)
2231 {
2232 RUINT32T tmp;
2233 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2234 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2235 lookup_b[i] = (tmp/65535)<<sh_b;
2236 }
2237
2238 /* apply table to input image (replacing colors by newly calculated ones) */
2239 switch (srcImage->bits_per_pixel)
2240 {
2241 case 15:
2242 {
2243 unsigned short *p1, *pf, *p, *pl;
2244 p1 = (unsigned short *) srcImage->data;
2245 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2246 while (p1 < pf)
2247 {
2248 p = p1;
2249 pl = p1 + srcImage->width;
2250 for (; p < pl; p++)
2251 {
2252 *p = lookup_r[(*p & 0x7c00)>>10] |
2253 lookup_g[(*p & 0x03e0)>> 5] |
2254 lookup_b[(*p & 0x001f)];
2255 }
2256 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2257 }
2258 break;
2259 }
2260 case 16:
2261 {
2262 unsigned short *p1, *pf, *p, *pl;
2263 p1 = (unsigned short *) srcImage->data;
2264 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2265 while (p1 < pf)
2266 {
2267 p = p1;
2268 pl = p1 + srcImage->width;
2269 for (; p < pl; p++)
2270 {
2271 *p = lookup_r[(*p & 0xf800)>>11] |
2272 lookup_g[(*p & 0x07e0)>> 5] |
2273 lookup_b[(*p & 0x001f)];
2274 }
2275 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2276 }
2277 break;
2278 }
2279 case 24:
2280 {
2281 unsigned char *p1, *pf, *p, *pl;
2282 p1 = (unsigned char *) srcImage->data;
2283 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2284 while (p1 < pf)
2285 {
2286 p = p1;
2287 pl = p1 + srcImage->width * 3;
2288 for (; p < pl; p += 3)
2289 {
2290 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2291 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2292 p[2] = lookup_r[(p[2] & 0x0000ff)];
2293 }
2294 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2295 }
2296 break;
2297 }
2298 case 32:
2299 {
2300 RUINT32T *p1, *pf, *p, *pl;
2301 p1 = (RUINT32T *) srcImage->data;
2302 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2303
2304 while (p1 < pf)
2305 {
2306 p = p1;
2307 pl = p1 + srcImage->width;
2308 for (; p < pl; p++)
2309 {
2310 *p = lookup_r[(*p & 0xff0000)>>16] |
2311 lookup_g[(*p & 0x00ff00)>> 8] |
2312 lookup_b[(*p & 0x0000ff)] |
2313 (*p & ~0xffffff);
2314 }
2315 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2316 }
2317 break;
2318 }
2319 }
2320
2321 free (lookup);
2322}
2323#endif
2324
2325/*
2326 * Check our parents are still who we think they are.
2327 * Do transparency updates if required
2328 */
2329int
2330rxvt_term::check_our_parents ()
2331{
2332 int i, pchanged, aformat, have_pixmap, rootdepth;
2333 unsigned long nitems, bytes_after;
2334 Atom atype;
2335 unsigned char *prop = NULL;
2336 Window root, oldp, *list;
2337 Pixmap rootpixmap = None;
2338 XWindowAttributes wattr, wrootattr;
2339
2340 pchanged = 0;
2341
2342 if (!(options & Opt_transparent))
2343 return pchanged; /* Don't try any more */
2344
2345 XGetWindowAttributes (display->display, display->root, &wrootattr);
2346 rootdepth = wrootattr.depth;
2347
2348 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2349
2350 if (rootdepth != wattr.depth)
2351 {
2352 if (am_transparent)
2353 {
2354 pchanged = 1;
2355 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2356 am_transparent = am_pixmap_trans = 0;
2357 }
2358
2359 return pchanged; /* Don't try any more */
2360 }
2361
2362 /* Get all X ops out of the queue so that our information is up-to-date. */
2363 XSync (display->display, False);
2364
2365 /*
2366 * Make the frame window set by the window manager have
2367 * the root background. Some window managers put multiple nested frame
2368 * windows for each client, so we have to take care about that.
2369 */
2370 i = (xa[XA_XROOTPMAP_ID]
2371 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],
2372 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2373 &nitems, &bytes_after, &prop) == Success);
2374
2375 if (!i || prop == NULL)
2376 i = (xa[XA_ESETROOT_PMAP_ID]
2377 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],
2378 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2379 &nitems, &bytes_after, &prop) == Success);
2380
2381 if (!i || prop == NULL
2382#if TINTING
2383 || !rs[Rs_color + Color_tint]
2384#endif
2385 )
2386 have_pixmap = 0;
2387 else
2388 {
2389 have_pixmap = 1;
2390 rootpixmap = *(Pixmap *)prop;
2391 XFree (prop);
2392 }
2393
2394 if (have_pixmap)
2395 {
2396 /*
2397 * Copy display->root pixmap transparency
2398 */
2399 int sx, sy, nx, ny;
2400 unsigned int nw, nh;
2401 Window cr;
2402 XImage *image;
2403 GC gc;
2404 XGCValues gcvalue;
2405
2406 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2407 0, 0, &sx, &sy, &cr);
2408 nw = (unsigned int)szHint.width;
2409 nh = (unsigned int)szHint.height;
2410 nx = ny = 0;
2411
2412 if (sx < 0)
2413 {
2414 nw += sx;
2415 nx = -sx;
2416 sx = 0;
2417 }
2418
2419 if (sy < 0)
2420 {
2421 nh += sy;
2422 ny = -sy;
2423 sy = 0;
2424 }
2425
2426 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2427 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2428
2429 XSync (display->display, False);
2430 allowedxerror = -1;
2431 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2432
2433 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2434 /* XXX: may need a delay here? */
2435 allowedxerror = 0;
2436
2437 if (image == NULL)
2438 {
2439 if (am_transparent && am_pixmap_trans)
2440 {
2441 pchanged = 1;
2442 if (TermWin.pixmap != None)
2443 {
2444 XFreePixmap (display->display, TermWin.pixmap);
2445 TermWin.pixmap = None;
2446 }
2447 }
2448
2449 am_pixmap_trans = 0;
2450 }
2451 else
2452 {
2453 if (TermWin.pixmap != None)
2454 XFreePixmap (display->display, TermWin.pixmap);
2455
2456#if TINTING
2457 if (ISSET_PIXCOLOR (Color_tint))
2458 {
2459 unsigned short rm, gm, bm;
2460 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2461
2462 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2463
2464 ShadeXImage (display, image, shade, rm, gm, bm);
2465 }
2466#endif
2467
2468 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2469 szHint.width, szHint.height, image->depth);
2470 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2471 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2472 nx, ny, image->width, image->height);
2473 XFreeGC (display->display, gc);
2474 XDestroyImage (image);
2475 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2476 XClearWindow (display->display, TermWin.parent[0]);
2477
2478 if (!am_transparent || !am_pixmap_trans)
2479 pchanged = 1;
2480
2481 am_transparent = am_pixmap_trans = 1;
2482 }
2483 }
2484
2485 if (am_pixmap_trans)
2486 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2487 else
2488 {
2489 unsigned int n;
2490 /*
2491 * InheritPixmap transparency
2492 */
2493 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2494 {
2495 oldp = TermWin.parent[i];
2496 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2497 &TermWin.parent[i], &list, &n);
2498 XFree (list);
2499
2500 if (TermWin.parent[i] == display->root)
2501 {
2502 if (oldp != None)
2503 pchanged = 1;
2504
2505 break;
2506 }
2507
2508 if (oldp != TermWin.parent[i])
2509 pchanged = 1;
2510 }
2511
2512 n = 0;
2513
2514 if (pchanged)
2515 {
2516 for (; n < (unsigned int)i; n++)
2517 {
2518 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2519 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2520 {
2521 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2522 break;
2523 }
2524 }
2525 }
2526
2527 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2528 {
2529 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2530 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2531 am_transparent = 0;
2532 /* XXX: also turn off Opt_transparent? */
2533 }
2534 else
2535 {
2536#if WAIT_FOR_WM
2537 /* wait (an arbitrary period) for the WM to do its thing
2538 * needed for fvwm2.2.2 (and before?) */
2539 sleep (1);
2540#endif
2541 for (n = 0; n < (unsigned int)i; n++)
2542 {
2543 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2544 XClearWindow (display->display, TermWin.parent[n]);
2545 }
2546
2547 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2548 am_transparent = 1;
2549 }
2550
2551 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2552 TermWin.parent[i] = None;
2553 }
2554
2555 if (scrollBar.win)
2556 {
2557 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2558 scrollBar.setIdle ();
2559 scrollbar_show (0);
2560 }
2561
2562 if (am_transparent)
2563 {
2564 want_refresh = want_full_refresh = 1;
2565 if (am_pixmap_trans)
2566 flush ();
2567 }
2568
2569 return pchanged;
2570}
2571#endif
2572 2225
2573/*}}} */ 2226/*}}} */
2574 2227
2575bool 2228bool
2576rxvt_term::cmd_parse () 2229rxvt_term::cmd_parse ()
2577{ 2230{
2578 bool flag = false; 2231 bool flag = false;
2579 unicode_t ch = NOCHAR; 2232 wchar_t ch = NOCHAR;
2580 unsigned char *seq_begin; // remember start of esc-sequence here 2233 char *seq_begin; // remember start of esc-sequence here
2581 2234
2582 for (;;) 2235 for (;;)
2583 { 2236 {
2584 if (ch == NOCHAR) 2237 if (ch == NOCHAR)
2585 { 2238 {
2586 seq_begin = cmdbuf_ptr; 2239 seq_begin = cmdbuf_ptr;
2587 ch = next_char (); 2240 ch = next_char ();
2588 }
2589 2241
2590 if (ch == NOCHAR) // TODO: improve 2242 if (ch == NOCHAR)
2591 break; 2243 break;
2244 }
2592 2245
2593 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2246 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2594 { 2247 {
2595 if (!seen_input) 2248 if (!seen_input)
2596 { 2249 {
… …
2600 // some window managers resize the window early, and these programs 2253 // some window managers resize the window early, and these programs
2601 // then sometimes get the size wrong. 2254 // then sometimes get the size wrong.
2602 // unfortunately other programs are even more buggy and dislike 2255 // unfortunately other programs are even more buggy and dislike
2603 // being sent SIGWINCH, so only do it when we were in fact being 2256 // being sent SIGWINCH, so only do it when we were in fact being
2604 // resized. 2257 // resized.
2605 if (seen_resize) 2258 if (seen_resize && cmd_pid)
2606 kill (-cmd_pid, SIGWINCH); 2259 kill (-cmd_pid, SIGWINCH);
2607 } 2260 }
2608 2261
2609 /* Read a text string from the input buffer */ 2262 /* Read a text string from the input buffer */
2610 unicode_t buf[UBUFSIZ]; 2263 wchar_t buf[UBUFSIZ];
2611 bool refreshnow = false; 2264 bool refreshnow = false;
2612 int nlines = 0; 2265 int nlines = 0;
2613 unicode_t *str = buf; 2266 wchar_t *str = buf;
2267 wchar_t *eol = str + min (ncol, UBUFSIZ);
2614 2268
2615 for (;;) 2269 for (;;)
2616 { 2270 {
2617 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2271 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2618 break; 2272 break;
2619 2273
2620 *str++ = ch; 2274 *str++ = ch;
2621 2275
2622 if (ch == C0_LF) 2276 if (ch == C0_LF || str >= eol)
2623 { 2277 {
2278 if (ch == C0_LF)
2624 nlines++; 2279 nlines++;
2280
2625 refresh_count++; 2281 refresh_count++;
2626 2282
2627 if (!(options & Opt_jumpScroll) 2283 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2628 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2629 { 2284 {
2285 refresh_count = 0;
2286
2287 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2288 {
2630 refreshnow = true; 2289 refreshnow = true;
2631 ch = NOCHAR; 2290 ch = NOCHAR;
2632 break; 2291 break;
2292 }
2633 } 2293 }
2634 2294
2635 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2295 // scr_add_lines only works for nlines <= nrow - 1.
2636 if (nlines >= TermWin.nrow - 1) 2296 if (nlines >= nrow - 1)
2637 { 2297 {
2298 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2299 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2638 scr_add_lines (buf, nlines, str - buf); 2300 scr_add_lines (buf, str - buf, nlines);
2301
2639 nlines = 0; 2302 nlines = 0;
2640 str = buf; 2303 str = buf;
2304 eol = str + min (ncol, UBUFSIZ);
2641 } 2305 }
2642 }
2643 2306
2644 if (str >= buf + UBUFSIZ) 2307 if (str >= eol)
2645 { 2308 {
2309 if (eol >= buf + UBUFSIZ)
2310 {
2646 ch = NOCHAR; 2311 ch = NOCHAR;
2647 break; 2312 break;
2313 }
2314 else
2315 eol = min (eol + ncol, buf + UBUFSIZ);
2316 }
2317
2648 } 2318 }
2649 2319
2650 seq_begin = cmdbuf_ptr; 2320 seq_begin = cmdbuf_ptr;
2651 ch = next_char (); 2321 ch = next_char ();
2652 } 2322 }
2653 2323
2324 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2325 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2654 scr_add_lines (buf, nlines, str - buf); 2326 scr_add_lines (buf, str - buf, nlines);
2655 2327
2656 /* 2328 /*
2657 * If there have been a lot of new lines, then update the screen 2329 * If there have been a lot of new lines, then update the screen
2658 * What the heck I'll cheat and only refresh less than every page-full. 2330 * What the heck we'll cheat and only refresh less than every page-full.
2659 * the number of pages between refreshes is refresh_limit, which 2331 * if skipScroll is enabled.
2660 * is incremented here because we must be doing flat-out scrolling.
2661 */ 2332 */
2662 if (refreshnow) 2333 if (refreshnow)
2663 { 2334 {
2664 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2665 refresh_limit++;
2666 else
2667 {
2668 flag = true; 2335 flag = true;
2669 scr_refresh (refresh_type); 2336 scr_refresh ();
2670 } 2337 want_refresh = 1;
2671 } 2338 }
2672 2339
2673 } 2340 }
2674 else 2341 else
2675 { 2342 {
… …
2689 } 2356 }
2690 2357
2691 return flag; 2358 return flag;
2692} 2359}
2693 2360
2694// read the next octet
2695unicode_t
2696rxvt_term::next_octet ()
2697{
2698 return cmdbuf_ptr < cmdbuf_endp
2699 ? *cmdbuf_ptr++
2700 : NOCHAR;
2701}
2702
2703// read the next character 2361// read the next character
2704unicode_t 2362wchar_t
2705rxvt_term::next_char () 2363rxvt_term::next_char () NOTHROW
2706{ 2364{
2707 while (cmdbuf_ptr < cmdbuf_endp) 2365 while (cmdbuf_ptr < cmdbuf_endp)
2708 { 2366 {
2709 // assume 7-bit to be ascii ALWAYS 2367 // assume 7-bit to be ascii ALWAYS
2710 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2368 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2711 return *cmdbuf_ptr++; 2369 return *cmdbuf_ptr++;
2712 2370
2713 wchar_t wc; 2371 wchar_t wc;
2714 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2372 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2715 2373
2716 if (len == (size_t)-2) 2374 if (len == (size_t)-2)
2717 { 2375 {
2718 // the mbstate stores incomplete sequences. didn't know this :/ 2376 // the mbstate stores incomplete sequences. didn't know this :/
2719 cmdbuf_ptr = cmdbuf_endp; 2377 cmdbuf_ptr = cmdbuf_endp;
2720 break; 2378 break;
2721 } 2379 }
2722 2380
2723 if (len == (size_t)-1) 2381 if (len == (size_t)-1)
2724 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2382 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2725 2383
2726 // assume wchar == unicode 2384 // assume wchar == unicode
2727 cmdbuf_ptr += len; 2385 cmdbuf_ptr += len;
2728 return wc & UNICODE_MASK; 2386 return wc & UNICODE_MASK;
2729 } 2387 }
2730 2388
2731 return NOCHAR; 2389 return NOCHAR;
2732} 2390}
2391
2392// read the next octet
2393uint32_t
2394rxvt_term::next_octet () NOTHROW
2395{
2396 return cmdbuf_ptr < cmdbuf_endp
2397 ? (unsigned char)*cmdbuf_ptr++
2398 : NOCHAR;
2399}
2400
2401static class out_of_input out_of_input;
2733 2402
2734/* rxvt_cmd_getc () - Return next input character */ 2403/* rxvt_cmd_getc () - Return next input character */
2735/* 2404/*
2736 * Return the next input character after first passing any keyboard input 2405 * Return the next input character after first passing any keyboard input
2737 * to the command. 2406 * to the command.
2738 */ 2407 */
2739unicode_t 2408wchar_t
2740rxvt_term::cmd_getc () 2409rxvt_term::cmd_getc () THROW ((class out_of_input))
2741{ 2410{
2742 unicode_t c = next_char (); 2411 wchar_t c = next_char ();
2743 2412
2744 if (c == NOCHAR) 2413 if (c == NOCHAR)
2745 throw out_of_input; 2414 throw out_of_input;
2746 2415
2747 return c; 2416 return c;
2748} 2417}
2749 2418
2750unicode_t 2419uint32_t
2751rxvt_term::cmd_get8 () 2420rxvt_term::cmd_get8 () THROW ((class out_of_input))
2752{ 2421{
2753 unicode_t c = next_octet (); 2422 uint32_t c = next_octet ();
2754 2423
2755 if (c == NOCHAR) 2424 if (c == NOCHAR)
2756 throw out_of_input; 2425 throw out_of_input;
2757 2426
2758 return c; 2427 return c;
… …
2822 { 2491 {
2823 if ((buf[len++] = cmd_getc ()) == 'i') 2492 if ((buf[len++] = cmd_getc ()) == 'i')
2824 break; /* done = 1 */ 2493 break; /* done = 1 */
2825 } 2494 }
2826 } 2495 }
2827 2496
2828 for (i = 0; i < len; i++) 2497 for (i = 0; i < len; i++)
2829 if (putc (buf[i], fd) == EOF) 2498 if (putc (buf[i], fd) == EOF)
2830 { 2499 {
2831 done = 1; 2500 done = 1;
2832 break; 2501 break;
… …
2858 case C0_ESC: 2527 case C0_ESC:
2859 process_escape_seq (); 2528 process_escape_seq ();
2860 break; 2529 break;
2861 case C0_ENQ: /* terminal Status */ 2530 case C0_ENQ: /* terminal Status */
2862 if (rs[Rs_answerbackstring]) 2531 if (rs[Rs_answerbackstring])
2863 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2532 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2864 (unsigned int)strlen (rs[Rs_answerbackstring]));
2865 else 2533 else
2866 tt_write ((unsigned char *)VT100_ANS, 2534 tt_write (VT100_ANS, strlen (VT100_ANS));
2867 (unsigned int)strlen (VT100_ANS));
2868 break; 2535 break;
2869 case C0_BEL: /* bell */ 2536 case C0_BEL: /* bell */
2870 scr_bell (); 2537 scr_bell ();
2871 break; 2538 break;
2872 case C0_BS: /* backspace */ 2539 case C0_BS: /* backspace */
… …
2896 process_dcs_seq (); 2563 process_dcs_seq ();
2897 break; 2564 break;
2898 case 0x9b: /* CSI */ 2565 case 0x9b: /* CSI */
2899 process_csi_seq (); 2566 process_csi_seq ();
2900 break; 2567 break;
2901 case 0x9d: /* CSI */ 2568 case 0x9d: /* OSC */
2902 process_osc_seq (); 2569 process_osc_seq ();
2903 break; 2570 break;
2904#endif 2571#endif
2905 } 2572 }
2906} 2573}
… …
2996 scr_charset_set (2, (unsigned int)cmd_getc ()); 2663 scr_charset_set (2, (unsigned int)cmd_getc ());
2997 break; 2664 break;
2998 case '+': 2665 case '+':
2999 scr_charset_set (3, (unsigned int)cmd_getc ()); 2666 scr_charset_set (3, (unsigned int)cmd_getc ());
3000 break; 2667 break;
3001#if ENABLE_FRILLS 2668#if !ENABLE_MINIMAL
3002 case '6': 2669 case '6':
3003 scr_backindex (); 2670 scr_backindex ();
3004 break; 2671 break;
3005#endif 2672#endif
3006 case '7': 2673 case '7':
3007 scr_cursor (SAVE); 2674 scr_cursor (SAVE);
3008 break; 2675 break;
3009 case '8': 2676 case '8':
3010 scr_cursor (RESTORE); 2677 scr_cursor (RESTORE);
3011 break; 2678 break;
3012#if ENABLE_FRILLS 2679#if !ENABLE_MINIMAL
3013 case '9': 2680 case '9':
3014 scr_forwardindex (); 2681 scr_forwardindex ();
3015 break; 2682 break;
3016#endif 2683#endif
3017 case '=': 2684 case '=':
… …
3027 break; 2694 break;
3028 2695
3029 /* 8.3.87: NEXT LINE */ 2696 /* 8.3.87: NEXT LINE */
3030 case C1_NEL: /* ESC E */ 2697 case C1_NEL: /* ESC E */
3031 { 2698 {
3032 unicode_t nlcr[] = { C0_LF, C0_CR }; 2699 wchar_t nlcr[] = { C0_LF, C0_CR };
3033 scr_add_lines (nlcr, 1, 2); 2700 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3034 } 2701 }
3035 break; 2702 break;
3036 2703
3037 /* kidnapped escape sequence: Should be 8.3.48 */ 2704 /* kidnapped escape sequence: Should be 8.3.48 */
3038 case C1_ESA: /* ESC G */ 2705 case C1_ESA: /* ESC G */
… …
3060 process_dcs_seq (); 2727 process_dcs_seq ();
3061 break; 2728 break;
3062 2729
3063 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2730 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3064 case C1_SCI: /* ESC Z */ 2731 case C1_SCI: /* ESC Z */
3065 tt_write ((const unsigned char *)ESCZ_ANSWER, 2732 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3066 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3067 break; /* steal obsolete ESC [ c */ 2733 break; /* steal obsolete ESC [ c */
3068 2734
3069 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2735 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3070 case C1_CSI: /* ESC [ */ 2736 case C1_CSI: /* ESC [ */
3071 process_csi_seq (); 2737 process_csi_seq ();
… …
3133rxvt_term::process_csi_seq () 2799rxvt_term::process_csi_seq ()
3134{ 2800{
3135 unicode_t ch, priv, i; 2801 unicode_t ch, priv, i;
3136 unsigned int nargs, p; 2802 unsigned int nargs, p;
3137 int n, ndef; 2803 int n, ndef;
3138 int arg[ESC_ARGS]; 2804 int arg[ESC_ARGS] = { };
3139 2805
3140 for (nargs = ESC_ARGS; nargs > 0;) 2806 nargs = 0;
3141 arg[--nargs] = 0;
3142 2807
3143 priv = 0; 2808 priv = 0;
3144 ch = cmd_getc (); 2809 ch = cmd_getc ();
3145 if (ch >= '<' && ch <= '?') 2810 if (ch >= '<' && ch <= '?')
3146 { /* '<' '=' '>' '?' */ 2811 { /* '<' '=' '>' '?' */
… …
3180 ndef = get_byte_array_bit (csi_defaults, i); 2845 ndef = get_byte_array_bit (csi_defaults, i);
3181 for (p = 0; p < nargs; p++) 2846 for (p = 0; p < nargs; p++)
3182 if (arg[p] == -1) 2847 if (arg[p] == -1)
3183 arg[p] = ndef; 2848 arg[p] = ndef;
3184 2849
3185#ifdef DEBUG_CMD
3186 fprintf (stderr, "CSI ");
3187 for (p = 0; p < nargs; p++)
3188 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3189 fprintf (stderr, "%c\n", ch);
3190#endif
3191
3192 /* 2850 /*
3193 * private mode handling 2851 * private mode handling
3194 */ 2852 */
3195 if (priv) 2853 if (priv)
3196 { 2854 {
3197 switch (priv) 2855 switch (priv)
3198 { 2856 {
3199 case '>': 2857 case '>':
3200 if (ch == CSI_DA) /* secondary device attributes */ 2858 if (ch == CSI_DA) /* secondary device attributes */
2859 {
2860 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2861 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2862 //
2863 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2864 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2865 // versions.
2866 //
3201 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2867 tt_printf ("\033[>%d;95;0c", 'U');
2868 }
3202 break; 2869 break;
3203 case '?': 2870 case '?':
3204 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2871 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3205 process_terminal_mode (ch, priv, nargs, arg); 2872 process_terminal_mode (ch, priv, nargs, arg);
3206 break; 2873 break;
… …
3311 2978
3312 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2979 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3313 arg[0] = -arg[0]; 2980 arg[0] = -arg[0];
3314 /* FALLTHROUGH */ 2981 /* FALLTHROUGH */
3315 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2982 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3316 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2983 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3317 break; 2984 break;
3318 2985
3319 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2986 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3320 tt_write ((const unsigned char *)VT100_ANS, 2987 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3321 (unsigned int) (sizeof (VT100_ANS) - 1));
3322 break; 2988 break;
3323 2989
3324 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2990 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3325 process_sgr_mode (nargs, arg); 2991 process_sgr_mode (nargs, arg);
3326 break; 2992 break;
… …
3333 break; 2999 break;
3334 case 6: /* CPR requested */ 3000 case 6: /* CPR requested */
3335 scr_report_position (); 3001 scr_report_position ();
3336 break; 3002 break;
3337 case 7: /* unofficial extension */ 3003 case 7: /* unofficial extension */
3338 if (options & Opt_insecure) 3004 if (option (Opt_insecure))
3339 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3005 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3340 break; 3006 break;
3341 case 8: /* unofficial extension */ 3007 case 8: /* unofficial extension */
3342 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3008 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3343 break; 3009 break;
… …
3410 break; 3076 break;
3411 case CSI_75: 3077 case CSI_75:
3412 scr_cursor (RESTORE); 3078 scr_cursor (RESTORE);
3413 break; 3079 break;
3414 3080
3415#if ENABLE_FRILLS 3081#if !ENABLE_MINIMAL
3416 case CSI_74: 3082 case CSI_74:
3417 process_window_ops (arg, nargs); 3083 process_window_ops (arg, nargs);
3418 break; 3084 break;
3419#endif 3085#endif
3420 3086
… …
3427 break; 3093 break;
3428 } 3094 }
3429} 3095}
3430/*}}} */ 3096/*}}} */
3431 3097
3432#if ENABLE_FRILLS 3098#if !ENABLE_MINIMAL
3433/* ARGSUSED */ 3099/* ARGSUSED */
3434void 3100void
3435rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3101rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3436{ 3102{
3437 int x, y; 3103 int x, y;
3438 XWindowAttributes wattr; 3104 XWindowAttributes wattr;
3439 Window wdummy; 3105 Window wdummy;
3106
3107 dLocal (Display *, dpy);
3440 3108
3441 if (nargs == 0) 3109 if (nargs == 0)
3442 return; 3110 return;
3443 3111
3444 switch (args[0]) 3112 switch (args[0])
3445 { 3113 {
3446 /* 3114 /*
3447 * commands 3115 * commands
3448 */ 3116 */
3449 case 1: /* deiconify window */ 3117 case 1: /* deiconify window */
3450 XMapWindow (display->display, TermWin.parent[0]); 3118 XMapWindow (dpy, parent[0]);
3451 break; 3119 break;
3452 case 2: /* iconify window */ 3120 case 2: /* iconify window */
3453 XIconifyWindow (display->display, TermWin.parent[0], 3121 XIconifyWindow (dpy, parent[0], display->screen);
3454 DefaultScreen (display->display));
3455 break; 3122 break;
3456 case 3: /* set position (pixels) */ 3123 case 3: /* set position (pixels) */
3457 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3124 XMoveWindow (dpy, parent[0], args[1], args[2]);
3458 break; 3125 break;
3459 case 4: /* set size (pixels) */ 3126 case 4: /* set size (pixels) */
3460 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3127 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3461 break; 3128 break;
3462 case 5: /* raise window */ 3129 case 5: /* raise window */
3463 XRaiseWindow (display->display, TermWin.parent[0]); 3130 XRaiseWindow (dpy, parent[0]);
3464 break; 3131 break;
3465 case 6: /* lower window */ 3132 case 6: /* lower window */
3466 XLowerWindow (display->display, TermWin.parent[0]); 3133 XLowerWindow (dpy, parent[0]);
3467 break; 3134 break;
3468 case 7: /* refresh window */ 3135 case 7: /* refresh window */
3469 scr_touch (true); 3136 scr_touch (true);
3470 break; 3137 break;
3471 case 8: /* set size (chars) */ 3138 case 8: /* set size (chars) */
3472 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3139 set_widthheight ((unsigned int) (args[2] * fwidth),
3473 (unsigned int) (args[1] * TermWin.fheight)); 3140 (unsigned int) (args[1] * fheight));
3474 break; 3141 break;
3475 3142
3476 //case 9: NYI, TODO, restore maximized window or maximize window 3143 //case 9: NYI, TODO, restore maximized window or maximize window
3477 default: 3144 default:
3478 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3479 set_widthheight ((unsigned int)TermWin.width, 3146 set_widthheight ((unsigned int)width,
3480 (unsigned int) (args[1] * TermWin.fheight)); 3147 (unsigned int) (args[1] * fheight));
3481 break; 3148 break;
3482
3483 3149
3484 /* 3150 /*
3485 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
3486 */ 3152 */
3487 case 11: /* report window state */ 3153 case 11: /* report window state */
3488 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent[0], &wattr);
3489 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3155 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3490 break; 3156 break;
3491 case 13: /* report window position */ 3157 case 13: /* report window position */
3492 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent[0], &wattr);
3493 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3159 XTranslateCoordinates (dpy, parent[0], wattr.root,
3494 -wattr.border_width, -wattr.border_width, 3160 -wattr.border_width, -wattr.border_width,
3495 &x, &y, &wdummy); 3161 &x, &y, &wdummy);
3496 tt_printf ("\033[3;%d;%dt", x, y); 3162 tt_printf ("\033[3;%d;%dt", x, y);
3497 break; 3163 break;
3498 case 14: /* report window size (pixels) */ 3164 case 14: /* report window size (pixels) */
3499 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3165 XGetWindowAttributes (dpy, parent[0], &wattr);
3500 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3166 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3501 break; 3167 break;
3502 case 18: /* report text area size (chars) */ 3168 case 18: /* report text area size (chars) */
3503 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3169 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3504 break; 3170 break;
3505 case 19: /* report window size (chars) */ 3171 case 19: /* report window size (chars) */
3506 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3172 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3507 break; 3173 break;
3508 case 20: /* report icon label */ 3174 case 20: /* report icon label */
3509 { 3175 {
3510 char *s; 3176 char *s;
3511 XGetIconName (display->display, TermWin.parent[0], &s); 3177 XGetIconName (dpy, parent[0], &s);
3512 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3178 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3513 XFree (s); 3179 XFree (s);
3514 } 3180 }
3515 break; 3181 break;
3516 case 21: /* report window title */ 3182 case 21: /* report window title */
3517 { 3183 {
3518 char *s; 3184 char *s;
3519 XFetchName (display->display, TermWin.parent[0], &s); 3185 XFetchName (dpy, parent[0], &s);
3520 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3186 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3521 XFree (s); 3187 XFree (s);
3522 } 3188 }
3523 break; 3189 break;
3524 } 3190 }
3525} 3191}
… …
3528/*----------------------------------------------------------------------*/ 3194/*----------------------------------------------------------------------*/
3529/* 3195/*
3530 * get input up until STRING TERMINATOR (or BEL) 3196 * get input up until STRING TERMINATOR (or BEL)
3531 * ends_how is terminator used. returned input must be free()'d 3197 * ends_how is terminator used. returned input must be free()'d
3532 */ 3198 */
3533unsigned char * 3199char *
3534rxvt_term::get_to_st (unicode_t &ends_how) 3200rxvt_term::get_to_st (unicode_t &ends_how)
3535{ 3201{
3536 unicode_t ch; 3202 unicode_t ch;
3537 bool seen_esc = false; 3203 bool seen_esc = false;
3538 unsigned int n = 0; 3204 unsigned int n = 0;
… …
3552 seen_esc = true; 3218 seen_esc = true;
3553 continue; 3219 continue;
3554 } 3220 }
3555 else if (ch == C0_BEL || ch == CHAR_ST) 3221 else if (ch == C0_BEL || ch == CHAR_ST)
3556 break; 3222 break;
3223 else if (ch == C0_SYN)
3224 ch = cmd_get8 ();
3557 else if (ch < 0x20) 3225 else if (ch < 0x20)
3558 return NULL; /* other control character - exit */ 3226 return NULL; /* other control character - exit */
3559 3227
3560 seen_esc = false; 3228 seen_esc = false;
3561 3229
3562 if (n >= sizeof (string) - 1) 3230 if (n >= STRING_MAX - 1)
3563 // stop at some sane length 3231 // stop at some sane length
3564 return NULL; 3232 return NULL;
3565 3233
3566 if (ch == C0_SYN)
3567 string[n++] = cmd_get8 ();
3568 else
3569 string[n++] = ch; 3234 string[n++] = ch;
3570 } 3235 }
3571 3236
3572 string[n++] = '\0'; 3237 string[n++] = '\0';
3573 3238
3574 ends_how = (ch == 0x5c ? C0_ESC : ch); 3239 ends_how = (ch == 0x5c ? C0_ESC : ch);
3575 3240
3576 return (unsigned char *)rxvt_wcstombs (string); 3241 return rxvt_wcstombs (string);
3577} 3242}
3578 3243
3579/*----------------------------------------------------------------------*/ 3244/*----------------------------------------------------------------------*/
3580/* 3245/*
3581 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3246 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3582 */ 3247 */
3583void 3248void
3584rxvt_term::process_dcs_seq () 3249rxvt_term::process_dcs_seq ()
3585{ 3250{
3586 unsigned char *s; 3251 char *s;
3587 unicode_t eh; 3252 unicode_t eh;
3588 3253
3589 /* 3254 /*
3590 * Not handled yet 3255 * Not handled yet
3591 */ 3256 */
… …
3610 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3275 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3611 arg = arg * 10 + (ch - '0'); 3276 arg = arg * 10 + (ch - '0');
3612 3277
3613 if (ch == ';') 3278 if (ch == ';')
3614 { 3279 {
3615 unsigned char *s = get_to_st (eh); 3280 char *s = get_to_st (eh);
3616 3281
3617 if (s) 3282 if (s)
3618 { 3283 {
3619 process_xterm_seq (arg, (char *)s, eh); 3284 process_xterm_seq (arg, s, eh);
3620 free (s); 3285 free (s);
3621 } 3286 }
3622 } 3287 }
3623} 3288}
3624 3289
3625void 3290void
3626rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3291rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3627{ 3292{
3628 if (str[0] == '?' && !str[1]) 3293 if (str[0] == '?' && !str[1])
3629 { 3294 {
3630 unsigned short r, g, b; 3295 rgba c;
3631 pix_colors_focused[color].get (display, r, g, b); 3296 pix_colors_focused[color].get (c);
3297
3298#if XFT
3299 if (c.a != rgba::MAX_CC)
3300 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3301 else
3302#endif
3632 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3303 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3633 } 3304 }
3634 else 3305 else
3635 set_window_color (color, str); 3306 set_window_color (color, str);
3636} 3307}
3637 3308
3638/* 3309/*
3639 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3310 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3640 * 0 = change iconName/title
3641 * 1 = change iconName
3642 * 2 = change title
3643 * 4 = change color
3644 * 10 = change fg color
3645 * 11 = change bg color
3646 * 12 = change text color
3647 * 13 = change mouse foreground color
3648 * 17 = change highlight character colour
3649 * 18 = change bold character color
3650 * 19 = change underlined character color
3651 * 46 = change logfile (not implemented)
3652 * 50 = change font
3653 *
3654 * rxvt extensions:
3655 * 20 = bg pixmap
3656 * 39 = change default fg color
3657 * 49 = change default bg color
3658 * 55 = dump scrollback buffer and all of screen
3659 * 701 = change locale
3660 * 702 = find font
3661 * 703 = menu
3662 */ 3311 */
3663void 3312void
3664rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3313rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3665{ 3314{
3666 int changed = 0;
3667 int color; 3315 int color;
3668 char *buf, *name; 3316 char *buf, *name;
3669 bool query = str[0] == '?' && !str[1]; 3317 bool query = str[0] == '?' && !str[1];
3670 int saveop = op; 3318 int saveop = op;
3671 3319
3320 dLocal (Display *, dpy);
3321
3672 assert (str != NULL); 3322 assert (str != NULL);
3323
3324 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3325 return;
3326
3673 switch (op) 3327 switch (op)
3674 { 3328 {
3675 case XTerm_name: 3329 case XTerm_name:
3676 set_title (str); 3330 set_title (str);
3677 /* FALLTHROUGH */ 3331 /* FALLTHROUGH */
… …
3691 unsigned long bytes_after; 3345 unsigned long bytes_after;
3692 unsigned char *value = 0; 3346 unsigned char *value = 0;
3693 const char *str = ""; 3347 const char *str = "";
3694 3348
3695 if (prop 3349 if (prop
3696 && XGetWindowProperty (display->display, TermWin.parent[0], 3350 && XGetWindowProperty (dpy, parent[0],
3697 prop, 0, 1<<16, 0, AnyPropertyType, 3351 prop, 0, 1<<16, 0, AnyPropertyType,
3698 &actual_type, &actual_format, 3352 &actual_type, &actual_format,
3699 &nitems, &bytes_after, &value) == Success 3353 &nitems, &bytes_after, &value) == Success
3700 && actual_type != None 3354 && actual_type != None
3701 && actual_format == 8) 3355 && actual_format == 8)
3702 str = (const char *)(value); 3356 str = (const char *)(value);
3703 3357
3704 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3358 tt_printf ("\033]%d;%s%c", op, str, resp);
3705 3359
3706 XFree (value); 3360 XFree (value);
3707 } 3361 }
3708 else 3362 else
3709 { 3363 {
… …
3713 { 3367 {
3714 *eq = 0; 3368 *eq = 0;
3715 set_utf8_property (display->atom (str), eq + 1); 3369 set_utf8_property (display->atom (str), eq + 1);
3716 } 3370 }
3717 else 3371 else
3718 XDeleteProperty (display->display, TermWin.parent[0], 3372 XDeleteProperty (dpy, parent[0],
3719 display->atom (str)); 3373 display->atom (str));
3720 } 3374 }
3721 break; 3375 break;
3722 3376
3723 case XTerm_Color: 3377 case XTerm_Color:
… …
3725 { 3379 {
3726 if ((name = strchr (buf, ';')) == NULL) 3380 if ((name = strchr (buf, ';')) == NULL)
3727 break; 3381 break;
3728 3382
3729 *name++ = '\0'; 3383 *name++ = '\0';
3730 color = atoi (buf); 3384 color = atoi (buf) + minCOLOR;
3731 3385
3732 if (color < 0 || color >= TOTAL_COLORS) 3386 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3733 break; 3387 break;
3734 3388
3735 if ((buf = strchr (name, ';')) != NULL) 3389 if ((buf = strchr (name, ';')) != NULL)
3736 *buf++ = '\0'; 3390 *buf++ = '\0';
3737 3391
3738 if (name[0] == '?' && !name[1]) 3392 process_color_seq (op, color, name, resp);
3739 {
3740 unsigned short r, g, b;
3741 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3742 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3743 }
3744 else
3745 set_window_color (color + minCOLOR, name);
3746 } 3393 }
3747 break; 3394 break;
3748 case XTerm_Color00: 3395 case XTerm_Color00:
3749 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3396 process_color_seq (op, Color_fg, str, resp);
3750 break; 3397 break;
3751 case XTerm_Color01: 3398 case XTerm_Color01:
3752 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3399 process_color_seq (op, Color_bg, str, resp);
3753 break; 3400 break;
3754#ifndef NO_CURSORCOLOR 3401#ifndef NO_CURSORCOLOR
3755 case XTerm_Color_cursor: 3402 case XTerm_Color_cursor:
3756 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3403 process_color_seq (op, Color_cursor, str, resp);
3757 break; 3404 break;
3758#endif 3405#endif
3759 case XTerm_Color_pointer_fg: 3406 case XTerm_Color_pointer_fg:
3760 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3407 process_color_seq (op, Color_pointer_fg, str, resp);
3761 break; 3408 break;
3762 case XTerm_Color_pointer_bg: 3409 case XTerm_Color_pointer_bg:
3763 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3410 process_color_seq (op, Color_pointer_bg, str, resp);
3764 break; 3411 break;
3765#ifndef NO_BOLD_UNDERLINE_REVERSE 3412#ifndef NO_BOLD_UNDERLINE_REVERSE
3766 case XTerm_Color_BD:
3767 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3768 break;
3769 case XTerm_Color_IT:
3770 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3771 break;
3772 case XTerm_Color_UL:
3773 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3774 break;
3775 case XTerm_Color_RV: 3413 case XTerm_Color_RV:
3776 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3414 process_color_seq (op, Color_RV, str, resp);
3777 break; 3415 break;
3416 case Rxvt_Color_BD:
3417 case URxvt_Color_BD:
3418 process_color_seq (op, Color_BD, str, resp);
3419 break;
3420 case Rxvt_Color_UL:
3421 case URxvt_Color_UL:
3422 process_color_seq (op, Color_UL, str, resp);
3423 break;
3424 case URxvt_Color_IT:
3425 process_color_seq (op, Color_IT, str, resp);
3426 break;
3778#endif 3427#endif
3779#if TRANSPARENT && TINTING 3428#if ENABLE_TRANSPARENCY
3780 case XTerm_Color_tint: 3429 case URxvt_Color_tint:
3781 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3430 process_color_seq (op, Color_tint, str, resp);
3782 check_our_parents (); 3431 {
3783 if (am_transparent) 3432 bool changed = false;
3784 want_full_refresh = want_refresh = 1; 3433 if (ISSET_PIXCOLOR (Color_tint))
3785 break; 3434 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3786#endif 3435 else
3436 changed = bgPixmap.unset_tint ();
3437 if (changed)
3438 update_background ();
3439 }
3787 3440
3441 break;
3442#endif
3443
3444#if BG_IMAGE_FROM_FILE
3788 case XTerm_Pixmap: 3445 case Rxvt_Pixmap:
3789 if (*str != ';') 3446 if (!strcmp (str, "?"))
3790 { 3447 {
3791#if XPM_BACKGROUND 3448 char str[256];
3792 scale_pixmap (""); /* reset to default scaling */ 3449
3793 set_bgPixmap (str); /* change pixmap */ 3450 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3794#endif 3451 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3795 scr_touch (true); 3452 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3796 } 3454 }
3797 while ((str = strchr (str, ';')) != NULL) 3455 else
3798 { 3456 {
3457 int changed = 0;
3458
3459 if (*str != ';')
3460 {
3461 /* reset to default scaling :*/
3462 bgPixmap.unset_geometry ();
3463 if (bgPixmap.set_file (str)) /* change pixmap */
3464 changed++;
3465 str = strchr (str, ';');
3466 if (str == NULL)
3467 bgPixmap.set_defaultGeometry ();
3468 }
3469 while (str)
3470 {
3799 str++; 3471 str++;
3800#if XPM_BACKGROUND 3472 if (bgPixmap.set_geometry (str))
3801 changed += scale_pixmap (str); 3473 changed++;
3802#endif 3474 str = strchr (str, ';');
3803 3475 }
3476 if (changed)
3477 update_background ();
3804 } 3478 }
3805 if (changed)
3806 {
3807#ifdef XPM_BACKGROUND
3808 resize_pixmap ();
3809#endif
3810 scr_touch (true);
3811 }
3812 break; 3479 break;
3480#endif
3813 3481
3814 case XTerm_restoreFG: 3482 case Rxvt_restoreFG:
3815 set_window_color (Color_fg, str); 3483 set_window_color (Color_fg, str);
3816 break; 3484 break;
3817 case XTerm_restoreBG: 3485 case Rxvt_restoreBG:
3818 set_window_color (Color_bg, str); 3486 set_window_color (Color_bg, str);
3819 break; 3487 break;
3820 3488
3821 case XTerm_logfile: 3489 case XTerm_logfile:
3822 // TODO, when secure mode? 3490 // TODO, when secure mode?
3823 break; 3491 break;
3824 3492
3493#if 0
3494 case Rxvt_dumpscreen: /* no error notices */
3495 {
3496 int fd;
3497 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3498 {
3499 scr_dump (fd);
3500 close (fd);
3501 }
3502 }
3503 break;
3504#endif
3825 case XTerm_font: 3505 case XTerm_font:
3826 op = URxvt_font; 3506 op = URxvt_font;
3827 case URxvt_font: 3507 case URxvt_font:
3828#if ENABLE_STYLES 3508#if ENABLE_STYLES
3829 case URxvt_boldFont: 3509 case URxvt_boldFont:
3830 case URxvt_italicFont: 3510 case URxvt_italicFont:
3831 case URxvt_boldItalicFont: 3511 case URxvt_boldItalicFont:
3832#endif 3512#endif
3833 if (query) 3513 if (query)
3834 tt_printf ("\33]%d;%-.250s%c", saveop, 3514 tt_printf ("\33]%d;%-.250s%c", saveop,
3835 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3515 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3836 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3516 ? fontset[op - URxvt_font]->fontdesc : "",
3837 resp); 3517 resp);
3838 else 3518 else
3839 { 3519 {
3840 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3520 const char *&res = rs[Rs_font + (op - URxvt_font)];
3841 3521
… …
3843 allocated.push_back ((void *)res); 3523 allocated.push_back ((void *)res);
3844 set_fonts (); 3524 set_fonts ();
3845 } 3525 }
3846 break; 3526 break;
3847 3527
3848#if ENABLE_FRILLS 3528 case URxvt_version:
3849 case XTerm_locale:
3850 if (query) 3529 if (query)
3530 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3531 op,
3532 rs[Rs_name], VERSION[0], VERSION[2],
3533 resp);
3534 break;
3535
3536#if !ENABLE_MINIMAL
3537 case URxvt_locale:
3538 if (query)
3851 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3539 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3852 else 3540 else
3853 { 3541 {
3854 set_locale (str); 3542 set_locale (str);
3855# ifdef USE_XIM 3543 pty->set_utf8_mode (enc_utf8);
3856 im_cb (); 3544 init_xlocale ();
3857# endif
3858 } 3545 }
3859 break; 3546 break;
3860#endif
3861 3547
3862#ifdef MENUBAR 3548 case URxvt_view_up:
3863 case XTerm_Menu: 3549 case URxvt_view_down:
3864 if (options & Opt_insecure) 3550 {
3865 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3551 int lines = atoi (str);
3552
3553 if (lines)
3554 scr_page (op == URxvt_view_up ? UP : DN, lines);
3555 else
3556 scr_erase_savelines ();
3557 }
3558
3866 break; 3559 break;
3867#endif 3560#endif
3868#if 0 3561
3869 case XTerm_dumpscreen: /* no error notices */ 3562#if ENABLE_PERL
3870 { 3563 case URxvt_perl:
3871 int fd; 3564 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3872 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3565 ; // no responses yet
3873 {
3874 scr_dump (fd);
3875 close (fd);
3876 }
3877 }
3878 break; 3566 break;
3879#endif 3567#endif
3880 } 3568 }
3881} 3569}
3882/*----------------------------------------------------------------------*/ 3570/*----------------------------------------------------------------------*/
… …
3913 return state; 3601 return state;
3914} 3602}
3915 3603
3916/* we're not using priv _yet_ */ 3604/* we're not using priv _yet_ */
3917void 3605void
3918rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3606rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3919{ 3607{
3920 unsigned int i, j; 3608 unsigned int i, j;
3921 int state; 3609 int state;
3922 3610
3923 static const struct 3611 static const struct
3924 { 3612 {
3925 const int argval; 3613 const int argval;
3926 const unsigned long bit; 3614 const unsigned long bit;
3927 }
3928
3929 argtopriv[] = { 3615 } argtopriv[] = {
3930 { 1, PrivMode_aplCUR }, 3616 { 1, PrivMode_aplCUR },
3931 { 2, PrivMode_vt52 }, 3617 { 2, PrivMode_vt52 },
3932 { 3, PrivMode_132 }, 3618 { 3, PrivMode_132 },
3933 { 4, PrivMode_smoothScroll }, 3619 { 4, PrivMode_smoothScroll },
3934 { 5, PrivMode_rVideo }, 3620 { 5, PrivMode_rVideo },
3935 { 6, PrivMode_relOrigin }, 3621 { 6, PrivMode_relOrigin },
3936 { 7, PrivMode_Autowrap }, 3622 { 7, PrivMode_Autowrap },
3937 // 8, bi-directional support mode 3623 // 8, bi-directional support mode
3938 { 9, PrivMode_MouseX10 }, 3624 { 9, PrivMode_MouseX10 },
3939#ifdef menuBar_esc
3940 { menuBar_esc, PrivMode_menuBar },
3941#endif
3942 // 18, 19 printing-related 3625 // 18, 19 printing-related
3943 { 25, PrivMode_VisibleCursor }, 3626 { 25, PrivMode_VisibleCursor },
3944#ifdef scrollBar_esc 3627#ifdef scrollBar_esc
3945 { scrollBar_esc, PrivMode_scrollBar }, 3628 { scrollBar_esc, PrivMode_scrollBar },
3946#endif 3629#endif
… …
3954#ifndef NO_BACKSPACE_KEY 3637#ifndef NO_BACKSPACE_KEY
3955 { 67, PrivMode_BackSpace }, 3638 { 67, PrivMode_BackSpace },
3956#endif 3639#endif
3957 { 1000, PrivMode_MouseX11 }, 3640 { 1000, PrivMode_MouseX11 },
3958 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3641 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3959 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3642 { 1002, PrivMode_MouseBtnEvent },
3960 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3643 { 1003, PrivMode_MouseAnyEvent },
3961 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3644 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3962 { 1011, PrivMode_Keypress }, // rxvt extension 3645 { 1011, PrivMode_Keypress }, // rxvt extension
3963 // 1035 enable modifiers for alt, numlock NYI 3646 // 1035 enable modifiers for alt, numlock NYI
3964 // 1036 send ESC for meta keys NYI 3647 // 1036 send ESC for meta keys NYI
3965 // 1037 send DEL for keypad delete NYI 3648 // 1037 send DEL for keypad delete NYI
… …
3991 } 3674 }
3992 3675
3993 /* extra handling for values with state unkept */ 3676 /* extra handling for values with state unkept */
3994 switch (arg[i]) 3677 switch (arg[i])
3995 { 3678 {
3679#if ENABLE_STYLES
3680 case 1021:
3681 set_option (Opt_intensityStyles, mode);
3682
3683 scr_touch (true);
3684 break;
3685#endif
3996 case 1048: /* alternative cursor save */ 3686 case 1048: /* alternative cursor save */
3997 case 1049: 3687 case 1049:
3998 if (options & Opt_secondaryScreen) 3688 if (option (Opt_secondaryScreen))
3999 if (mode == 0) 3689 if (mode == 0)
4000 scr_cursor (RESTORE); 3690 scr_cursor (RESTORE);
4001 else if (mode == 1) 3691 else if (mode == 1)
4002 scr_cursor (SAVE); 3692 scr_cursor (SAVE);
4003 break; 3693 break;
… …
4015 */ 3705 */
4016 PrivMode (1, PrivMode_vt52); 3706 PrivMode (1, PrivMode_vt52);
4017 break; 3707 break;
4018 case 3: /* 80/132 */ 3708 case 3: /* 80/132 */
4019 if (priv_modes & PrivMode_132OK) 3709 if (priv_modes & PrivMode_132OK)
4020 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3710 set_widthheight (((state ? 132 : 80) * fwidth), height);
4021 break; 3711 break;
4022 case 4: /* smooth scrolling */ 3712 case 4: /* smooth scrolling */
4023 if (state)
4024 options &= ~Opt_jumpScroll;
4025 else
4026 options |= Opt_jumpScroll; 3713 set_option (Opt_jumpScroll, !state);
4027 break; 3714 break;
4028 case 5: /* reverse video */ 3715 case 5: /* reverse video */
4029 scr_rvideo_mode (state); 3716 scr_rvideo_mode (state);
4030 break; 3717 break;
4031 case 6: /* relative/absolute origins */ 3718 case 6: /* relative/absolute origins */
… …
4035 scr_autowrap (state); 3722 scr_autowrap (state);
4036 break; 3723 break;
4037 /* case 8: - auto repeat, can't do on a per window basis */ 3724 /* case 8: - auto repeat, can't do on a per window basis */
4038 case 9: /* X10 mouse reporting */ 3725 case 9: /* X10 mouse reporting */
4039 if (state) /* orthogonal */ 3726 if (state) /* orthogonal */
4040 priv_modes &= ~PrivMode_MouseX11; 3727 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4041 break; 3728 break;
4042#ifdef menuBar_esc
4043 case menuBar_esc:
4044#ifdef MENUBAR
4045 map_menuBar (state);
4046#endif
4047 break;
4048#endif
4049#ifdef scrollBar_esc 3729#ifdef scrollBar_esc
4050 case scrollBar_esc: 3730 case scrollBar_esc:
4051 if (scrollbar_mapping (state)) 3731 if (scrollbar_mapping (state))
4052 { 3732 {
4053 resize_all_windows (0, 0, 0); 3733 resize_all_windows (0, 0, 0);
… …
4065 break; 3745 break;
4066 /* case 66: - application key pad */ 3746 /* case 66: - application key pad */
4067 /* case 67: - backspace key */ 3747 /* case 67: - backspace key */
4068 case 1000: /* X11 mouse reporting */ 3748 case 1000: /* X11 mouse reporting */
4069 if (state) /* orthogonal */ 3749 if (state) /* orthogonal */
4070 priv_modes &= ~PrivMode_MouseX10; 3750 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4071 break; 3751 break;
4072#if 0 3752#if 0
4073 case 1001: 3753 case 1001:
4074 break; /* X11 mouse highlighting */ 3754 break; /* X11 mouse highlighting */
4075#endif 3755#endif
3756 case 1002:
3757 case 1003:
3758 if (state) {
3759 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3760 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3761 vt_emask_mouse = PointerMotionMask;
3762 } else
3763 vt_emask_mouse = NoEventMask;
3764 vt_select_input ();
3765 break;
4076 case 1010: /* scroll to bottom on TTY output inhibit */ 3766 case 1010: /* scroll to bottom on TTY output inhibit */
4077 if (state)
4078 options &= ~Opt_scrollTtyOutput;
4079 else
4080 options |= Opt_scrollTtyOutput; 3767 set_option (Opt_scrollTtyOutput, !state);
4081 break; 3768 break;
4082 case 1011: /* scroll to bottom on key press */ 3769 case 1011: /* scroll to bottom on key press */
4083 if (state)
4084 options |= Opt_scrollTtyKeypress; 3770 set_option (Opt_scrollTtyKeypress, state);
4085 else
4086 options &= ~Opt_scrollTtyKeypress;
4087 break; 3771 break;
4088 case 1047: /* secondary screen w/ clearing last */ 3772 case 1047: /* secondary screen w/ clearing last */
4089 if (options & Opt_secondaryScreen) 3773 if (option (Opt_secondaryScreen))
4090 if (current_screen != PRIMARY) 3774 if (current_screen != PRIMARY)
4091 scr_erase_screen (2); 3775 scr_erase_screen (2);
4092 scr_change_screen (state); 3776 scr_change_screen (state);
4093 break; 3777 break;
4094 case 1049: /* secondary screen w/ clearing first */ 3778 case 1049: /* secondary screen w/ clearing first */
4095 scr_change_screen (state); 3779 scr_change_screen (state);
4096 if (options & Opt_secondaryScreen) 3780 if (option (Opt_secondaryScreen))
4097 if (current_screen != PRIMARY) 3781 if (current_screen != PRIMARY)
4098 scr_erase_screen (2); 3782 scr_erase_screen (2);
4099 break; 3783 break;
4100 default: 3784 default:
4101 break; 3785 break;
… …
4229 scr_color (Color_bg, Color_bg); 3913 scr_color (Color_bg, Color_bg);
4230 break; 3914 break;
4231 3915
4232 //case 50: // not variable spacing 3916 //case 50: // not variable spacing
4233 3917
4234#ifndef NO_BRIGHTCOLOR 3918#if !ENABLE_MINIMAL
4235 case 90: 3919 case 90:
4236 case 91: /* set bright fg color */ 3920 case 91: /* set bright fg color */
4237 case 92: 3921 case 92:
4238 case 93: 3922 case 93:
4239 case 94: 3923 case 94:
… …
4251 case 106: 3935 case 106:
4252 case 107: 3936 case 107:
4253 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3937 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4254 break; 3938 break;
4255#endif 3939#endif
4256
4257 } 3940 }
4258 } 3941 }
4259} 3942}
4260/*}}} */ 3943/*}}} */
4261 3944
… …
4285 */ 3968 */
4286void 3969void
4287rxvt_term::tt_printf (const char *fmt,...) 3970rxvt_term::tt_printf (const char *fmt,...)
4288{ 3971{
4289 va_list arg_ptr; 3972 va_list arg_ptr;
4290 unsigned char buf[256]; 3973 char buf[256];
4291 3974
4292 va_start (arg_ptr, fmt); 3975 va_start (arg_ptr, fmt);
4293 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3976 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4294 va_end (arg_ptr); 3977 va_end (arg_ptr);
4295 tt_write (buf, strlen (buf)); 3978 tt_write (buf, strlen (buf));
… …
4300 * or generated by us in response to a query ESC sequence. 3983 * or generated by us in response to a query ESC sequence.
4301 */ 3984 */
4302const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3985const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4303 3986
4304void 3987void
4305rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3988rxvt_term::tt_write (const char *data, unsigned int len)
4306{ 3989{
3990 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3991 return;
3992
3993 if (pty->pty < 0)
3994 return;
3995
4307 if (v_buflen == 0) 3996 if (v_buflen == 0)
4308 { 3997 {
4309 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3998 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4310 3999
4311 if ((unsigned int)written == len) 4000 if ((unsigned int)written == len)
4312 return; 4001 return;
4313 4002
4314 data += written; 4003 data += written;
4315 len -= written; 4004 len -= written;
4316 } 4005 }
4317 4006
4318 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4007 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4319 4008
4320 memcpy (v_buffer + v_buflen, data, len); 4009 memcpy (v_buffer + v_buflen, data, len);
4321 v_buflen += len; 4010 v_buflen += len;
4322 4011
4323 pty_ev.set (EVENT_READ | EVENT_WRITE); 4012 pty_ev.set (EVENT_READ | EVENT_WRITE);
4324} 4013}
4325 4014
4326void rxvt_term::pty_write () 4015void rxvt_term::pty_write ()
4327{ 4016{
4328 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4017 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4329 4018
4330 if (written > 0) 4019 if (written > 0)
4331 { 4020 {
4332 v_buflen -= written; 4021 v_buflen -= written;
4333 4022
4334 if (v_buflen == 0) 4023 if (v_buflen == 0)
4335 { 4024 {
4336 free (v_buffer); 4025 free (v_buffer);
4337 v_buffer = 0; 4026 v_buffer = 0;
4338 v_buflen = 0;
4339 4027
4340 pty_ev.set (EVENT_READ); 4028 pty_ev.set (EVENT_READ);
4341 return; 4029 return;
4342 } 4030 }
4343 4031
4344 memmove (v_buffer, v_buffer + written, v_buflen); 4032 memmove (v_buffer, v_buffer + written, v_buflen);
4345 } 4033 }
4346 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4034 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4347 // original code just ignores this... 4035 pty_ev.set (EVENT_READ);
4348 destroy ();
4349} 4036}
4350 4037
4351/*----------------------- end-of-file (C source) -----------------------*/ 4038/*----------------------- end-of-file (C source) -----------------------*/
4352 4039

Diff Legend

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