ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.201 by root, Mon Feb 21 19:26:07 2005 UTC vs.
Revision 1.396 by ayin, Sun Jan 20 14:12:39 2008 UTC

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

Diff Legend

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