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

Diff Legend

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