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.192 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.382 by root, Fri Dec 14 06:04:56 2007 UTC

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

Diff Legend

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