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

Diff Legend

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