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.193 by root, Sun Feb 13 08:56:27 2005 UTC vs.
Revision 1.347 by sasha, Wed Aug 15 22:41:52 2007 UTC

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

Diff Legend

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