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.191 by root, Wed Jan 26 07:08:15 2005 UTC vs.
Revision 1.379 by root, Fri Dec 14 02:29:48 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
929void 1046void
930rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
931{ 1048{
932 SET_R (this); 1049 make_current ();
933 SET_LOCALE (locale);
934 1050
935 display->flush (); 1051 display->flush ();
936 1052
937 if (want_refresh && !flush_ev.active) 1053 if (want_refresh && !flush_ev.is_active ())
938 flush_ev.start (NOW + 0.01); 1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
939} 1055}
940 1056
941void 1057void
942rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
943{ 1059{
944 SET_R (this); 1060 make_current ();
945 SET_LOCALE (locale);
946 1061
947 refresh_limit = 1;
948 refresh_count = 0; 1062 refresh_count = 0;
949 flush (); 1063 flush ();
950} 1064}
951 1065
952#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
953void 1067void
954rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
955{ 1069{
956 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
957 want_refresh = 1; 1071 want_refresh = 1;
958
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);
972 } 1083 }
1084 else
1085 w.stop ();
973} 1086}
974#endif 1087#endif
975 1088
976#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
977void 1090void
978rxvt_term::cont_scroll_cb (time_watcher &w) 1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
979{ 1092{
980 if ((scrollbar_isUp() || scrollbar_isDn()) && 1093 if ((scrollbar_isUp() || scrollbar_isDn()) &&
981 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1094 scr_page (scrollbar_isUp() ? UP : DN, 1))
982 {
983 refresh_type |= SMOOTH_REFRESH;
984 want_refresh = 1; 1095 want_refresh = 1;
985 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 else
986 } 1097 w.stop ();
987} 1098}
988#endif 1099#endif
989 1100
990#ifdef SELECTION_SCROLLING 1101#ifdef SELECTION_SCROLLING
991void 1102void
992rxvt_term::sel_scroll_cb (time_watcher &w) 1103rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
993{ 1104{
994 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1105 if (scr_page (scroll_selection_dir, scroll_selection_lines))
995 { 1106 {
996 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1107 selection_extend (selection_save_x, selection_save_y, selection_save_state);
997 refresh_type |= SMOOTH_REFRESH;
998 want_refresh = 1; 1108 want_refresh = 1;
999 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1000 } 1109 }
1110 else
1111 w.stop ();
1001} 1112}
1002#endif 1113#endif
1003 1114
1004#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1005void 1116void
1006rxvt_term::slip_wheel_cb (time_watcher &w) 1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1007{ 1118{
1008 if (mouse_slip_wheel_speed == 0 1119 if (scr_page (mouse_slip_wheel_speed < 0 ? DN : UP, abs (mouse_slip_wheel_speed)))
1009 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1120 want_refresh = 1;
1010 : scr_page (UP, mouse_slip_wheel_speed)) 1121
1122 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1011 { 1123 {
1012 if (TermWin.view_start == TermWin.nscrolled ||
1013 TermWin.view_start == 0)
1014 mouse_slip_wheel_speed = 0; 1124 mouse_slip_wheel_speed = 0;
1125 w.stop ();
1126 }
1127}
1128#endif
1015 1129
1016 refresh_type |= SMOOTH_REFRESH; 1130#if LINUX_YIELD_HACK
1017 want_refresh = 1; 1131static struct event_handler
1018 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1132{
1133 ev::prepare yield_ev;
1134
1135 void yield_cb (ev::prepare &w, int revents)
1136 {
1137 // this should really be sched_yield(), but the linux guys thought
1138 // that giving a process calling sched_yield () less cpu time than
1139 // ones with high nice levels is a useful thing to do. It surely is is
1140 // allowed by the sus... as is returning ENOSYS.
1141
1142 struct timespec ts = { 0, 0 };
1143 nanosleep (&ts, 0);
1144
1145 w.stop ();
1019 } 1146 }
1020} 1147
1148 event_handler ()
1149 : yield_ev (this, &event_handler::yield_cb)
1150 {
1151 }
1152} event_handler;
1021#endif 1153#endif
1022 1154
1023bool 1155bool
1024rxvt_term::pty_fill () 1156rxvt_term::pty_fill ()
1025{ 1157{
1026 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1158 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1027 1159
1028 if (CBUFSIZ == n) 1160 if (CBUFSIZ == n)
1029 { 1161 {
1030 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1162 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1031 n = 0; 1163 n = 0;
1032 } 1164 }
1033 1165
1034 memmove (cmdbuf_base, cmdbuf_ptr, n); 1166 memmove (cmdbuf_base, cmdbuf_ptr, n);
1035 cmdbuf_ptr = cmdbuf_base; 1167 cmdbuf_ptr = cmdbuf_base;
1036 cmdbuf_endp = cmdbuf_ptr + n; 1168 cmdbuf_endp = cmdbuf_ptr + n;
1037 1169
1038 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1170 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1039 1171
1040 if (n > 0) 1172 if (r > 0)
1041 { 1173 {
1042 cmdbuf_endp += n; 1174 cmdbuf_endp += r;
1043 return true; 1175 return true;
1044 } 1176 }
1045 else if (n < 0 && errno != EAGAIN) 1177 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1178 {
1179#if LINUX_YIELD_HACK
1180 if (display->is_local)
1181 event_handler.yield_ev.start ();
1182#endif
1183 }
1184 else
1185 {
1186 pty_ev.stop ();
1187
1188 if (!option (Opt_hold))
1046 destroy (); 1189 destroy ();
1047 1190 }
1191
1048 return false; 1192 return false;
1049} 1193}
1050 1194
1051void 1195void
1052rxvt_term::pty_cb (io_watcher &w, short revents) 1196rxvt_term::pty_cb (ev::io &w, int revents)
1053{ 1197{
1054 SET_R (this); 1198 make_current ();
1055 SET_LOCALE (locale);
1056 1199
1057 if (revents & EVENT_READ) 1200 if (revents & ev::READ)
1058 // loop, but don't allow a single term to monopolize us 1201 // loop, but don't allow a single term to monopolize us
1059 while (pty_fill ()) 1202 while (pty_fill ())
1060 if (cmd_parse ()) 1203 if (cmd_parse ())
1061 break; 1204 break;
1062 1205
1063 if (revents & EVENT_WRITE) 1206 if (revents & ev::WRITE)
1064 pty_write (); 1207 pty_write ();
1065} 1208}
1066 1209
1067void 1210void
1068rxvt_term::pointer_unblank () 1211rxvt_term::pointer_unblank ()
1069{ 1212{
1070 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1213 XDefineCursor (dpy, vt, TermWin_cursor);
1071 recolour_cursor (); 1214 recolour_cursor ();
1072 1215
1073#ifdef POINTER_BLANK 1216#ifdef POINTER_BLANK
1074 hidden_pointer = 0; 1217 hidden_pointer = 0;
1075 1218
1076 if (options & Opt_pointerBlank) 1219 if (option (Opt_pointerBlank))
1077 pointer_ev.start (NOW + pointerBlankDelay); 1220 pointer_ev.start (pointerBlankDelay);
1078#endif 1221#endif
1079} 1222}
1080 1223
1081#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
1082void 1225void
1083rxvt_term::pointer_blank () 1226rxvt_term::pointer_blank ()
1084{ 1227{
1085 if (! (options & Opt_pointerBlank)) 1228 if (!option (Opt_pointerBlank))
1086 return; 1229 return;
1087 1230
1088 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1231 XDefineCursor (dpy, vt, display->blank_cursor);
1089 XFlush (display->display); 1232 XFlush (dpy);
1090 1233
1091 hidden_pointer = 1; 1234 hidden_pointer = 1;
1092} 1235}
1093 1236
1094void 1237void
1095rxvt_term::pointer_cb (time_watcher &w) 1238rxvt_term::pointer_cb (ev::timer &w, int revents)
1096{ 1239{
1097 SET_R (this); 1240 make_current ();
1098 SET_LOCALE (locale);
1099 1241
1100 pointer_blank (); 1242 pointer_blank ();
1101} 1243}
1102#endif 1244#endif
1103 1245
1104void 1246void
1105rxvt_term::mouse_report (XButtonEvent &ev) 1247rxvt_term::mouse_report (XButtonEvent &ev)
1106{ 1248{
1107 int button_number, key_state = 0; 1249 int button_number, key_state = 0;
1108 int x, y; 1250 int x, y;
1251 int code = 32;
1109 1252
1110 x = ev.x; 1253 x = Pixel2Col (ev.x);
1111 y = ev.y; 1254 y = Pixel2Row (ev.y);
1112 pixel_position (&x, &y); 1255 if (ev.type == MotionNotify)
1256 {
1257 if (x == mouse_row && y == mouse_col)
1258 return;
1259 mouse_row = x;
1260 mouse_col = y;
1261 code += 32;
1262 }
1113 1263
1114 if (MEvent.button == AnyButton) 1264 if (MEvent.button == AnyButton)
1115 button_number = 3; 1265 button_number = 3;
1116 else 1266 else
1117 { 1267 {
… …
1163 x + 1, 1313 x + 1,
1164 y + 1); 1314 y + 1);
1165#endif 1315#endif
1166 1316
1167 tt_printf ("\033[M%c%c%c", 1317 tt_printf ("\033[M%c%c%c",
1168 (32 + button_number + key_state), 1318 (code + button_number + key_state),
1169 (32 + x + 1), 1319 (32 + x + 1),
1170 (32 + y + 1)); 1320 (32 + y + 1));
1171} 1321}
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 1322
1183/*{{{ process an X event */ 1323/*{{{ process an X event */
1184void 1324void
1185rxvt_term::x_cb (XEvent &ev) 1325rxvt_term::x_cb (XEvent &ev)
1186{ 1326{
1187 SET_R (this); 1327 make_current ();
1188 SET_LOCALE (locale);
1189 1328
1190#if defined(CURSOR_BLINK) 1329 dLocal (Display *, dpy);
1191 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1192 {
1193 if (hidden_cursor)
1194 {
1195 hidden_cursor = 0;
1196 want_refresh = 1;
1197 }
1198 1330
1199 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1331 if (ev.xany.window == vt
1200 } 1332 && SHOULD_INVOKE (HOOK_X_EVENT)
1201#endif 1333 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1334 return;
1202 1335
1203#if defined(POINTER_BLANK) 1336 // for XQueryPointer
1204 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1205 {
1206 if (ev.type == MotionNotify
1207 || ev.type == ButtonPress
1208 || ev.type == ButtonRelease)
1209 if (hidden_pointer)
1210 pointer_unblank ();
1211
1212 if (ev.type == KeyPress && hidden_pointer == 0)
1213 pointer_blank ();
1214 }
1215#endif
1216
1217 Window unused_root, unused_child; 1337 Window unused_root, unused_child;
1218 int unused_root_x, unused_root_y; 1338 int unused_root_x, unused_root_y;
1219 unsigned int unused_mask; 1339 unsigned int unused_mask;
1220 1340
1221 switch (ev.type) 1341 switch (ev.type)
1222 { 1342 {
1223 case KeyPress: 1343 case KeyPress:
1224#if ISO_14755 1344 key_press (ev.xkey);
1225 if (!(iso14755buf & ISO_14755_52))
1226#endif
1227 lookup_key (ev.xkey);
1228
1229 break; 1345 break;
1230 1346
1231 case KeyRelease: 1347 case KeyRelease:
1232 { 1348 key_release (ev.xkey);
1233#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1234 KeySym ks;
1235
1236 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1237#endif
1238
1239#if ENABLE_FRILLS || ISO_14755
1240 // ISO 14755 support
1241 if (iso14755buf)
1242 if (iso14755buf & ISO_14755_52)
1243 {
1244# if ENABLE_OVERLAY
1245 scr_overlay_off ();
1246# endif
1247# if ISO_14755
1248 // iso14755 part 5.2 handling: release time
1249 // first: controls
1250 if ((ev.xkey.state & ControlMask)
1251 && ((ks >= 0x40 && ks <= 0x5f)
1252 || (ks >= 0x61 && ks <= 0x7f)))
1253 {
1254 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1255 commit_iso14755 ();
1256 return; // case-break;
1257 }
1258
1259 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1260 if (i[0] == ks)
1261 {
1262 iso14755buf = ISO_14755_51 | i[1];
1263 commit_iso14755 ();
1264 return; // case-break;
1265 }
1266
1267 scr_bell ();
1268# endif
1269 iso14755buf = 0;
1270 break;
1271 }
1272 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1273 {
1274# if ENABLE_OVERLAY
1275 scr_overlay_off ();
1276# endif
1277 if (iso14755buf & ISO_14755_51)
1278 commit_iso14755 ();
1279#if ISO_14755
1280 else if (iso14755buf & ISO_14755_STARTED)
1281 {
1282 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1283
1284 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1285 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1286 }
1287# endif
1288 else
1289 iso14755buf = 0;
1290 }
1291#endif
1292
1293#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1294 if (!(ev.xkey.state & ControlMask))
1295 slip_wheel_ev.stop ();
1296 else if (ks == XK_Control_L || ks == XK_Control_R)
1297 mouse_slip_wheel_speed = 0;
1298#endif
1299 break; 1349 break;
1300 }
1301 1350
1302 case ButtonPress: 1351 case ButtonPress:
1303 button_press (ev.xbutton); 1352 button_press (ev.xbutton);
1304 break; 1353 break;
1305 1354
… …
1307 button_release (ev.xbutton); 1356 button_release (ev.xbutton);
1308 break; 1357 break;
1309 1358
1310 case ClientMessage: 1359 case ClientMessage:
1311 if (ev.xclient.format == 32 1360 if (ev.xclient.format == 32
1312 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1361 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1313 destroy ();
1314#ifdef OFFIX_DND
1315 /* OffiX Dnd (drag 'n' drop) protocol */
1316 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1317 && (ev.xclient.data.l[0] == DndFile
1318 || ev.xclient.data.l[0] == DndDir
1319 || ev.xclient.data.l[0] == DndLink))
1320 { 1362 {
1321 /* Get Dnd data */ 1363 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1322 Atom ActualType; 1364 {
1323 int ActualFormat; 1365 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1324 unsigned char *data; 1366 {
1325 unsigned long Size, RemainingBytes; 1367 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1326 1368 {
1327 XGetWindowProperty (display->display, display->root, 1369 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1328 xa[XA_DNDSELECTION], 1370 destroy ();
1329 0L, 1000000L, 1371 }
1330 False, AnyPropertyType, 1372#if ENABLE_EWMH
1331 &ActualType, &ActualFormat, 1373 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1332 &Size, &RemainingBytes, 1374 XSendEvent (dpy, ev.xclient.window = display->root,
1375 False, SubstructureRedirectMask | SubstructureNotifyMask,
1333 &data); 1376 &ev);
1334 set_string_property (XA_CUT_BUFFER0, data); 1377#endif
1335 XFree (data); 1378 }
1336 selection_paste (display->root, XA_CUT_BUFFER0, true); 1379 }
1337 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1380#if ENABLE_XEMBED
1381 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1382 {
1383 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1384 focus_in ();
1385 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1386 focus_out ();
1387 }
1388#endif
1338 } 1389 }
1339#endif /* OFFIX_DND */
1340 break;
1341
1342 case MappingNotify:
1343 XRefreshKeyboardMapping (&ev.xmapping);
1344 break; 1390 break;
1345 1391
1346 /* 1392 /*
1347 * XXX: this is not the _current_ arrangement 1393 * XXX: this is not the _current_ arrangement
1348 * Here's my conclusion: 1394 * Here's my conclusion:
… …
1367 break; 1413 break;
1368 } 1414 }
1369 break; 1415 break;
1370 1416
1371 case FocusIn: 1417 case FocusIn:
1372 if (!TermWin.focus) 1418 if (ev.xfocus.detail != NotifyInferior
1419 && ev.xfocus.detail != NotifyPointer
1420 && ev.xfocus.mode != NotifyGrab)
1421 focus_in ();
1422 break;
1423
1424 case FocusOut:
1425 if (ev.xfocus.detail != NotifyInferior
1426 && ev.xfocus.detail != NotifyPointer
1427 && ev.xfocus.mode != NotifyGrab)
1428 focus_out ();
1429 break;
1430
1431 case ConfigureNotify:
1432 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1433 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1434 szHint.width, szHint.height); */
1435 if (ev.xconfigure.window == parent[0])
1373 { 1436 {
1374 TermWin.focus = 1; 1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1375 want_refresh = 1;
1376#ifdef USE_XIM
1377 if (Input_Context != NULL)
1378 { 1438 ;
1379 IMSetStatusPosition ();
1380 XSetICFocus (Input_Context);
1381 }
1382#endif
1383#ifdef CURSOR_BLINK
1384 if (options & Opt_cursorBlink)
1385 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1386#endif
1387#ifdef OFF_FOCUS_FADING
1388 if (rs[Rs_fade])
1389 {
1390 pix_colors = pix_colors_focused;
1391 scr_recolour ();
1392 }
1393#endif
1394 1439
1395 }
1396 break;
1397
1398 case FocusOut:
1399 if (TermWin.focus)
1400 {
1401 TermWin.focus = 0;
1402 want_refresh = 1;
1403
1404#if ENABLE_FRILLS || ISO_14755
1405 iso14755buf = 0;
1406#endif
1407#if ENABLE_OVERLAY
1408 scr_overlay_off ();
1409#endif
1410#ifdef USE_XIM
1411 if (Input_Context != NULL)
1412 XUnsetICFocus (Input_Context);
1413#endif
1414#ifdef CURSOR_BLINK
1415 if (options & Opt_cursorBlink)
1416 cursor_blink_ev.stop ();
1417 hidden_cursor = 0;
1418#endif
1419#ifdef OFF_FOCUS_FADING
1420 if (rs[Rs_fade])
1421 {
1422 pix_colors = pix_colors_unfocused;
1423 scr_recolour ();
1424 }
1425#endif
1426 }
1427 break;
1428
1429 case ConfigureNotify:
1430 if (ev.xconfigure.window == TermWin.parent[0])
1431 {
1432 int height, width;
1433
1434 do
1435 { /* Wrap lots of configures into one */
1436 width = ev.xconfigure.width;
1437 height = ev.xconfigure.height;
1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1439 }
1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1441
1442 if (szHint.width != width || szHint.height != height) 1440 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443 { 1441 {
1444 seen_resize = 1; 1442 seen_resize = 1;
1445 resize_all_windows (width, height, 1); 1443 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1446 } 1444 }
1447 1445 else
1448#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1446 {
1449 if (options & Opt_transparent) 1447#ifdef HAVE_BG_PIXMAP
1450 check_our_parents (); 1448 if (bgPixmap.window_position_sensitive ())
1449 update_background ();
1451#endif 1450#endif
1451 }
1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1452 } 1453 }
1453 break; 1454 break;
1454 1455
1455 case PropertyNotify: 1456 case PropertyNotify:
1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1456 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1458 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1457 && ev.xproperty.state == PropertyNewValue) 1459 && ev.xproperty.state == PropertyNewValue)
1458 selection_property (ev.xproperty.window, ev.xproperty.atom); 1460 selection_property (ev.xproperty.window, ev.xproperty.atom);
1459 1461
1460 break; 1462 break;
1461 1463
1462 case SelectionClear: 1464 case SelectionClear:
1463 selection_clear (); 1465 selection_clear ();
… …
1470 1472
1471 case SelectionRequest: 1473 case SelectionRequest:
1472 selection_send (ev.xselectionrequest); 1474 selection_send (ev.xselectionrequest);
1473 break; 1475 break;
1474 1476
1477 case MapNotify:
1478 mapped = 1;
1479#ifdef TEXT_BLINK
1480 text_blink_ev.start ();
1481#endif
1482 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1483 break;
1484
1475 case UnmapNotify: 1485 case UnmapNotify:
1476 TermWin.mapped = 0; 1486 mapped = 0;
1477#ifdef TEXT_BLINK 1487#ifdef TEXT_BLINK
1478 text_blink_ev.stop (); 1488 text_blink_ev.stop ();
1479#endif 1489#endif
1490 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1480 break; 1491 break;
1481
1482 case MapNotify:
1483 TermWin.mapped = 1;
1484#ifdef TEXT_BLINK
1485 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1486#endif
1487 break;
1488
1489#ifdef TRANSPARENT
1490 case ReparentNotify:
1491 rootwin_cb (ev);
1492 break;
1493#endif /* TRANSPARENT */
1494 1492
1495 case GraphicsExpose: 1493 case GraphicsExpose:
1496 case Expose: 1494 case Expose:
1497 if (ev.xany.window == TermWin.vt) 1495 if (ev.xany.window == vt)
1498 { 1496 {
1499 do 1497 do
1498 {
1500 scr_expose (ev.xexpose.x, ev.xexpose.y, 1499 scr_expose (ev.xexpose.x, ev.xexpose.y,
1501 ev.xexpose.width, ev.xexpose.height, False); 1500 ev.xexpose.width, ev.xexpose.height, False);
1501 }
1502 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1502 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1503 1503
1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1505 1505
1506 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1506 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1507 {
1507 scr_expose (ev.xexpose.x, ev.xexpose.y, 1508 scr_expose (ev.xexpose.x, ev.xexpose.y,
1508 ev.xexpose.width, ev.xexpose.height, False); 1509 ev.xexpose.width, ev.xexpose.height, False);
1509 1510 }
1510 scr_refresh (refresh_type); 1511 want_refresh = 1;
1511 } 1512 }
1512 else 1513 else
1513 { 1514 {
1514 XEvent unused_event; 1515 XEvent unused_event;
1515 1516
1516 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1517 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1517 ; 1518 ;
1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1519 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1519 ; 1520 ;
1520 1521
1521 if (isScrollbarWindow (ev.xany.window)) 1522 if (isScrollbarWindow (ev.xany.window))
1522 { 1523 {
1523 scrollBar.setIdle (); 1524 scrollBar.setIdle ();
1524 scrollbar_show (0); 1525 scrollbar_show (0);
1525 } 1526 }
1526#ifdef MENUBAR
1527 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1528 menubar_expose ();
1529#endif
1530
1531#ifdef TRANSPARENT
1532 if (am_transparent && ev.xany.window == TermWin.parent[0])
1533 XClearWindow (display->display, ev.xany.window);
1534#endif
1535 } 1527 }
1536 break; 1528 break;
1537 1529
1538 case MotionNotify: 1530 case MotionNotify:
1539#ifdef POINTER_BLANK 1531#ifdef POINTER_BLANK
1540 if (hidden_pointer) 1532 if (hidden_pointer)
1541 pointer_unblank (); 1533 pointer_unblank ();
1542#endif 1534#endif
1543#if MENUBAR 1535 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1544 if (isMenuBarWindow (ev.xany.window)) 1536 || priv_modes & PrivMode_MouseAnyEvent)
1545 {
1546 menubar_control (ev.xbutton); 1537 mouse_report (ev.xbutton);
1547 break;
1548 }
1549#endif
1550 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1538 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1551 break; 1539 break;
1552 1540
1553 if (ev.xany.window == TermWin.vt) 1541 if (ev.xany.window == vt)
1554 { 1542 {
1543 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1544 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1545 ; // nop
1555 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1546 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1556 { 1547 {
1557 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1548 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1558 ; 1549 ;
1559 1550
1560 XQueryPointer (display->display, TermWin.vt, 1551 XQueryPointer (dpy, vt,
1561 &unused_root, &unused_child, 1552 &unused_root, &unused_child,
1562 &unused_root_x, &unused_root_y, 1553 &unused_root_x, &unused_root_y,
1563 &ev.xbutton.x, &ev.xbutton.y, 1554 &ev.xbutton.x, &ev.xbutton.y,
1564 &ev.xbutton.state); 1555 &ev.xbutton.state);
1565#ifdef MOUSE_THRESHOLD 1556#ifdef MOUSE_THRESHOLD
… …
1577#endif 1568#endif
1578 selection_extend (ev.xbutton.x, ev.xbutton.y, 1569 selection_extend (ev.xbutton.x, ev.xbutton.y,
1579 ev.xbutton.state & Button3Mask ? 2 : 0); 1570 ev.xbutton.state & Button3Mask ? 2 : 0);
1580 1571
1581#ifdef SELECTION_SCROLLING 1572#ifdef SELECTION_SCROLLING
1582 if (ev.xbutton.y < TermWin.int_bwidth 1573 if (ev.xbutton.y < int_bwidth
1583 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1574 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1584 { 1575 {
1585 int dist; 1576 int dist;
1586 1577
1587 /* don't clobber the current delay if we are 1578 /* don't clobber the current delay if we are
1588 * already in the middle of scrolling. 1579 * already in the middle of scrolling.
1589 */ 1580 */
1590 if (!sel_scroll_ev.active) 1581 if (!sel_scroll_ev.is_active ())
1591 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1582 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1592 1583
1593 /* save the event params so we can highlight 1584 /* save the event params so we can highlight
1594 * the selection in the pending-scroll loop 1585 * the selection in the pending-scroll loop
1595 */ 1586 */
1596 selection_save_x = ev.xbutton.x; 1587 selection_save_x = ev.xbutton.x;
1597 selection_save_y = ev.xbutton.y; 1588 selection_save_y = ev.xbutton.y;
1598 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1599 1590
1600 /* calc number of lines to scroll */ 1591 /* calc number of lines to scroll */
1601 if (ev.xbutton.y < TermWin.int_bwidth) 1592 if (ev.xbutton.y < int_bwidth)
1602 { 1593 {
1603 scroll_selection_dir = UP; 1594 scroll_selection_dir = UP;
1604 dist = TermWin.int_bwidth - ev.xbutton.y; 1595 dist = int_bwidth - ev.xbutton.y;
1605 } 1596 }
1606 else 1597 else
1607 { 1598 {
1608 scroll_selection_dir = DN; 1599 scroll_selection_dir = DN;
1609 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1600 dist = ev.xbutton.y - (int_bwidth + height);
1610 } 1601 }
1611 1602
1612 scroll_selection_lines = Pixel2Height (dist) 1603 scroll_selection_lines = Pixel2Height (dist)
1613 / SELECTION_SCROLL_LINE_SPEEDUP 1604 / SELECTION_SCROLL_LINE_SPEEDUP
1614 + 1; 1605 + 1;
1615 MIN_IT (scroll_selection_lines, 1606 min_it (scroll_selection_lines,
1616 SELECTION_SCROLL_MAX_LINES); 1607 SELECTION_SCROLL_MAX_LINES);
1617 } 1608 }
1618 else 1609 else
1619 { 1610 {
1620 /* we are within the text window, so we 1611 /* we are within the text window, so we
1621 * shouldn't be scrolling 1612 * shouldn't be scrolling
1622 */ 1613 */
1623 if (sel_scroll_ev.active)
1624 sel_scroll_ev.stop(); 1614 sel_scroll_ev.stop();
1625 } 1615 }
1626#endif 1616#endif
1627#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
1628 } 1618 }
1629#endif 1619#endif
1630 } 1620 }
1631 } 1621 }
1632 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1622 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1633 { 1623 {
1634 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1624 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1635 MotionNotify, &ev)) 1625 MotionNotify, &ev))
1636 ; 1626 ;
1637 1627
1638 XQueryPointer (display->display, scrollBar.win, 1628 XQueryPointer (dpy, scrollBar.win,
1639 &unused_root, &unused_child, 1629 &unused_root, &unused_child,
1640 &unused_root_x, &unused_root_y, 1630 &unused_root_x, &unused_root_y,
1641 &ev.xbutton.x, &ev.xbutton.y, 1631 &ev.xbutton.x, &ev.xbutton.y,
1642 &unused_mask); 1632 &unused_mask);
1643 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1633 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1644 scrollbar_size ()); 1634 scrollbar_size ());
1645 scr_refresh (refresh_type);
1646 refresh_limit = 0; 1635 want_refresh = 1;
1647 scrollbar_show (1); 1636 scrollbar_show (1);
1648 } 1637 }
1649 break; 1638 break;
1650 } 1639 }
1651}
1652 1640
1653#if TRANSPARENT 1641#if defined(CURSOR_BLINK)
1642 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1643 {
1644 if (hidden_cursor)
1645 {
1646 hidden_cursor = 0;
1647 want_refresh = 1;
1648 }
1649
1650 cursor_blink_ev.again ();
1651 }
1652#endif
1653
1654#if defined(POINTER_BLANK)
1655 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1656 {
1657 if (ev.type == MotionNotify
1658 || ev.type == ButtonPress
1659 || ev.type == ButtonRelease)
1660 if (hidden_pointer)
1661 pointer_unblank ();
1662
1663 if (ev.type == KeyPress && hidden_pointer == 0)
1664 pointer_blank ();
1665 }
1666#endif
1667}
1668
1669void
1670rxvt_term::focus_in ()
1671{
1672 if (!focus)
1673 {
1674 focus = 1;
1675 want_refresh = 1;
1676
1677 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1678
1679#if USE_XIM
1680 if (Input_Context != NULL)
1681 {
1682 IMSetPosition ();
1683 XSetICFocus (Input_Context);
1684 }
1685#endif
1686#if CURSOR_BLINK
1687 if (option (Opt_cursorBlink))
1688 cursor_blink_ev.again ();
1689#endif
1690#if OFF_FOCUS_FADING
1691 if (rs[Rs_fade])
1692 {
1693 pix_colors = pix_colors_focused;
1694 scr_recolour ();
1695 }
1696#endif
1697#if ENABLE_FRILLS
1698 if (option (Opt_urgentOnBell))
1699 {
1700 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1701 {
1702 h->flags &= ~XUrgencyHint;
1703 XSetWMHints (dpy, parent[0], h);
1704 }
1705 }
1706#endif
1707 }
1708}
1709
1710void
1711rxvt_term::focus_out ()
1712{
1713 if (focus)
1714 {
1715 focus = 0;
1716 want_refresh = 1;
1717
1718 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1719
1720#if ENABLE_FRILLS || ISO_14755
1721 if (iso14755buf)
1722 {
1723 iso14755buf = 0;
1724# if ISO_14755
1725 scr_overlay_off ();
1726# endif
1727 }
1728#endif
1729#if USE_XIM
1730 if (Input_Context != NULL)
1731 XUnsetICFocus (Input_Context);
1732#endif
1733#if CURSOR_BLINK
1734 if (option (Opt_cursorBlink))
1735 cursor_blink_ev.stop ();
1736
1737 hidden_cursor = 0;
1738#endif
1739#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade])
1741 {
1742 pix_colors = pix_colors_unfocused;
1743 scr_recolour ();
1744 }
1745#endif
1746 }
1747}
1748
1749void
1750rxvt_term::update_fade_color (unsigned int idx)
1751{
1752#if OFF_FOCUS_FADING
1753 if (rs[Rs_fade])
1754 {
1755 rgba c;
1756 pix_colors [Color_fade].get (c);
1757 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1758 }
1759#endif
1760}
1761
1762#if ENABLE_TRANSPARENCY || ENABLE_PERL
1654void 1763void
1655rxvt_term::rootwin_cb (XEvent &ev) 1764rxvt_term::rootwin_cb (XEvent &ev)
1656{ 1765{
1657 SET_R (this); 1766 make_current ();
1658 SET_LOCALE (locale);
1659 1767
1768 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1769 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1770 return;
1771
1772# if ENABLE_TRANSPARENCY
1660 switch (ev.type) 1773 switch (ev.type)
1661 { 1774 {
1662 case PropertyNotify: 1775 case PropertyNotify:
1663 /* 1776 /*
1664 * if user used some Esetroot compatible prog to set the root bg, 1777 * if user used some Esetroot compatible prog to set the root bg,
1665 * use the property to determine the pixmap. We use it later on. 1778 * use the property to determine the pixmap. We use it later on.
1666 */ 1779 */
1667 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1780 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1668 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1781 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1669 return; 1782 {
1670 1783 bgPixmap.set_root_pixmap ();
1671 /* FALLTHROUGH */ 1784 update_background ();
1672 case ReparentNotify: 1785 }
1673 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1674 want_refresh = want_full_refresh = 1;
1675 break; 1786 break;
1676 } 1787 }
1788# endif
1677} 1789}
1678#endif 1790#endif
1679 1791
1680void 1792void
1681rxvt_term::button_press (XButtonEvent &ev) 1793rxvt_term::button_press (XButtonEvent &ev)
1682{ 1794{
1683 int reportmode = 0, clickintime; 1795 int reportmode = 0, clickintime;
1684 1796
1685 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1797 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1798
1686 if (!bypass_keystate) 1799 if (!bypass_keystate)
1687 reportmode = !! (priv_modes & PrivMode_mouse_report); 1800 reportmode = !! (priv_modes & PrivMode_mouse_report);
1688 1801
1689 /* 1802 /*
1690 * VT window processing of button press 1803 * VT window processing of button press
1691 */ 1804 */
1692 if (ev.window == TermWin.vt) 1805 if (ev.window == vt)
1693 { 1806 {
1807 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1808 return;
1809
1694#if ISO_14755 1810#if ISO_14755
1695 // 5.4 1811 // 5.4
1696 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1697 { 1813 {
1698 iso14755_54 (ev.x, ev.y); 1814 iso14755_54 (ev.x, ev.y);
… …
1710#ifdef MOUSE_REPORT_DOUBLECLICK 1826#ifdef MOUSE_REPORT_DOUBLECLICK
1711 if (ev.button == MEvent.button && clickintime) 1827 if (ev.button == MEvent.button && clickintime)
1712 { 1828 {
1713 /* same button, within alloted time */ 1829 /* same button, within alloted time */
1714 MEvent.clicks++; 1830 MEvent.clicks++;
1831
1715 if (MEvent.clicks > 1) 1832 if (MEvent.clicks > 1)
1716 { 1833 {
1717 /* only report double clicks */ 1834 /* only report double clicks */
1718 MEvent.clicks = 2; 1835 MEvent.clicks = 2;
1719 mouse_report (ev); 1836 mouse_report (ev);
… …
1731 mouse_report (ev); 1848 mouse_report (ev);
1732 } 1849 }
1733#else 1850#else
1734 MEvent.button = ev.button; 1851 MEvent.button = ev.button;
1735 mouse_report (ev); 1852 mouse_report (ev);
1736#endif /* MOUSE_REPORT_DOUBLECLICK */ 1853#endif /* MOUSE_REPORT_DOUBLECLICK */
1737 1854
1738 } 1855 }
1739 else 1856 else
1740 { 1857 {
1741 if (ev.button != MEvent.button) 1858 if (ev.button != MEvent.button)
… …
1751#else 1868#else
1752 selection.rect = false; 1869 selection.rect = false;
1753#endif 1870#endif
1754 1871
1755 /* allow shift+left click to extend selection */ 1872 /* allow shift+left click to extend selection */
1756 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1873 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1757 { 1874 {
1758 if (MEvent.button == Button1 && clickintime) 1875 if (MEvent.button == Button1 && clickintime)
1759 selection_rotate (ev.x, ev.y); 1876 selection_rotate (ev.x, ev.y);
1760 else 1877 else
1761 selection_extend (ev.x, ev.y, 1); 1878 selection_extend (ev.x, ev.y, 1);
… …
1835 tt_printf ("\033[5~"); 1952 tt_printf ("\033[5~");
1836 break; 1953 break;
1837 } 1954 }
1838 } 1955 }
1839 else 1956 else
1840#endif /* NO_SCROLLBAR_REPORT */ 1957#endif /* NO_SCROLLBAR_REPORT */
1841 1958
1842 { 1959 {
1843 char upordown = 0; 1960 char upordown = 0;
1844 1961
1845 if (scrollBar.style == R_SB_NEXT) 1962 if (scrollBar.style == R_SB_NEXT)
1846 { 1963 {
1847 if (scrollbarnext_upButton (ev.y)) 1964 if (scrollbarnext_upButton (ev.y))
1848 upordown = -1; /* up */ 1965 upordown = -1; /* up */
… …
1854 if (scrollbarrxvt_upButton (ev.y)) 1971 if (scrollbarrxvt_upButton (ev.y))
1855 upordown = -1; /* up */ 1972 upordown = -1; /* up */
1856 else if (scrollbarrxvt_dnButton (ev.y)) 1973 else if (scrollbarrxvt_dnButton (ev.y))
1857 upordown = 1; /* down */ 1974 upordown = 1; /* down */
1858 } 1975 }
1976
1859 if (upordown) 1977 if (upordown)
1860 { 1978 {
1861#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1979#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1980 if (!cont_scroll_ev.is_active ())
1862 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1863#endif 1982#endif
1864 if (scr_page (upordown < 0 ? UP : DN, 1)) 1983 if (scr_page (upordown < 0 ? UP : DN, 1))
1865 { 1984 {
1866 if (upordown < 0) 1985 if (upordown < 0)
1867 scrollBar.setUp (); 1986 scrollBar.setUp ();
… …
1902 case Button3: 2021 case Button3:
1903 if (scrollBar.style != R_SB_XTERM) 2022 if (scrollBar.style != R_SB_XTERM)
1904 { 2023 {
1905 if (scrollbar_above_slider (ev.y)) 2024 if (scrollbar_above_slider (ev.y))
1906# ifdef RXVT_SCROLL_FULL 2025# ifdef RXVT_SCROLL_FULL
1907 scr_page (UP, TermWin.nrow - 1); 2026 scr_page (UP, nrow - 1);
1908# else 2027# else
1909 scr_page (UP, TermWin.nrow / 4); 2028 scr_page (UP, nrow / 4);
1910# endif 2029# endif
1911 else if (scrollbar_below_slider (ev.y)) 2030 else if (scrollbar_below_slider (ev.y))
1912# ifdef RXVT_SCROLL_FULL 2031# ifdef RXVT_SCROLL_FULL
1913 scr_page (DN, TermWin.nrow - 1); 2032 scr_page (DN, nrow - 1);
1914# else 2033# else
1915 scr_page (DN, TermWin.nrow / 4); 2034 scr_page (DN, nrow / 4);
1916# endif 2035# endif
1917 else 2036 else
1918 scrollBar.setMotion (); 2037 scrollBar.setMotion ();
1919 } 2038 }
1920 else 2039 else
1921 { 2040 {
1922 scr_page ((ev.button == Button1 ? DN : UP), 2041 scr_page ((ev.button == Button1 ? DN : UP),
1923 (TermWin.nrow 2042 (nrow
1924 * scrollbar_position (ev.y) 2043 * scrollbar_position (ev.y)
1925 / scrollbar_size ())); 2044 / scrollbar_size ()));
1926 } 2045 }
1927 2046
1928 break; 2047 break;
1929 } 2048 }
1930 } 2049 }
2050
1931 return; 2051 return;
1932 } 2052 }
1933#if MENUBAR
1934 /*
1935 * Menubar window processing of button press
1936 */
1937 if (isMenuBarWindow (ev.window))
1938 menubar_control (ev);
1939#endif
1940} 2053}
1941 2054
1942void 2055void
1943rxvt_term::button_release (XButtonEvent &ev) 2056rxvt_term::button_release (XButtonEvent &ev)
1944{ 2057{
… …
1950 2063
1951 if (scrollbar_isUpDn ()) 2064 if (scrollbar_isUpDn ())
1952 { 2065 {
1953 scrollBar.setIdle (); 2066 scrollBar.setIdle ();
1954 scrollbar_show (0); 2067 scrollbar_show (0);
1955#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1956 refresh_type &= ~SMOOTH_REFRESH;
1957#endif
1958 } 2068 }
1959 2069
1960#ifdef SELECTION_SCROLLING 2070#ifdef SELECTION_SCROLLING
1961 if (sel_scroll_ev.active)
1962 sel_scroll_ev.stop(); 2071 sel_scroll_ev.stop();
1963#endif 2072#endif
1964 2073
1965 if (ev.window == TermWin.vt) 2074 if (ev.window == vt)
1966 { 2075 {
2076 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2077 return;
2078
1967#if ISO_14755 2079#if ISO_14755
1968 // 5.4 2080 // 5.4
1969 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2081 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1970 return; 2082 return;
1971#endif 2083#endif
2084
1972 if (reportmode) 2085 if (reportmode)
1973 { 2086 {
1974 /* mouse report from vt window */ 2087 /* mouse report from vt window */
1975 /* don't report release of wheel "buttons" */ 2088 /* don't report release of wheel "buttons" */
1976 if (ev.button >= 4) 2089 if (ev.button >= 4)
… …
1987 mouse_report (ev); 2100 mouse_report (ev);
1988 } 2101 }
1989#else /* MOUSE_REPORT_DOUBLECLICK */ 2102#else /* MOUSE_REPORT_DOUBLECLICK */
1990 MEvent.button = AnyButton; 2103 MEvent.button = AnyButton;
1991 mouse_report (ev); 2104 mouse_report (ev);
1992#endif /* MOUSE_REPORT_DOUBLECLICK */ 2105#endif /* MOUSE_REPORT_DOUBLECLICK */
1993 return; 2106 return;
1994 } 2107 }
1995 2108
1996 /* 2109 /*
1997 * dumb hack to compensate for the failure of click-and-drag 2110 * dumb hack to compensate for the failure of click-and-drag
… …
2006 { 2119 {
2007 case Button1: 2120 case Button1:
2008 case Button3: 2121 case Button3:
2009 selection_make (ev.time); 2122 selection_make (ev.time);
2010 break; 2123 break;
2124
2011 case Button2: 2125 case Button2:
2012 selection_request (ev.time, ev.x, ev.y); 2126 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2127 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2013 break; 2128 break;
2129
2014#ifdef MOUSE_WHEEL 2130#ifdef MOUSE_WHEEL
2015 case Button4: 2131 case Button4:
2016 case Button5: 2132 case Button5:
2017 { 2133 {
2018 int i; 2134 int i;
… …
2020 2136
2021 v = ev.button == Button4 ? UP : DN; 2137 v = ev.button == Button4 ? UP : DN;
2022 2138
2023 if (ev.state & ShiftMask) 2139 if (ev.state & ShiftMask)
2024 i = 1; 2140 i = 1;
2025 else if (options & Opt_mouseWheelScrollPage) 2141 else if (option (Opt_mouseWheelScrollPage))
2026 i = TermWin.nrow - 1; 2142 i = nrow - 1;
2027 else 2143 else
2028 i = 5; 2144 i = 5;
2029 2145
2030# ifdef MOUSE_SLIP_WHEELING 2146# ifdef MOUSE_SLIP_WHEELING
2031 if (ev.state & ControlMask) 2147 if (ev.state & ControlMask)
2032 { 2148 {
2033 mouse_slip_wheel_speed += v ? -1 : 1; 2149 mouse_slip_wheel_speed += v ? -1 : 1;
2034 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2150 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2035 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2151 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2036 2152
2037 if (slip_wheel_ev.at < NOW) 2153 if (!slip_wheel_ev.is_active ())
2038 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2039
2040 slip_wheel_ev.start ();
2041 } 2155 }
2042 else 2156 else
2043 { 2157 {
2044# endif 2158# endif
2045# ifdef JUMP_MOUSE_WHEEL
2046 scr_page (v, i); 2159 scr_page (v, i);
2047 scr_refresh (SMOOTH_REFRESH);
2048 scrollbar_show (1); 2160 scrollbar_show (1);
2049# else
2050 while (i--)
2051 {
2052 scr_page (v, 1);
2053 scr_refresh (SMOOTH_REFRESH);
2054 scrollbar_show (1);
2055 }
2056# endif
2057# ifdef MOUSE_SLIP_WHEELING 2161# ifdef MOUSE_SLIP_WHEELING
2058 } 2162 }
2059#endif 2163# endif
2060 } 2164 }
2061 break; 2165 break;
2062#endif 2166#endif
2063 } 2167 }
2064 } 2168 }
2065#ifdef MENUBAR
2066 else if (isMenuBarWindow (ev.window))
2067 menubar_control (ev);
2068#endif
2069} 2169}
2070
2071#ifdef TRANSPARENT
2072#if TINTING
2073/* taken from aterm-0.4.2 */
2074
2075typedef uint32_t RUINT32T;
2076
2077void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2078{
2079 int sh_r, sh_g, sh_b;
2080 RUINT32T mask_r, mask_g, mask_b;
2081 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2082 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2083 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2084 int i;
2085
2086 Visual* visual = display->visual;
2087
2088 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2089
2090 /* for convenience */
2091 mask_r = visual->red_mask;
2092 mask_g = visual->green_mask;
2093 mask_b = visual->blue_mask;
2094
2095 /* boring lookup table pre-initialization */
2096 switch (srcImage->bits_per_pixel) {
2097 case 15:
2098 if ((mask_r != 0x7c00) ||
2099 (mask_g != 0x03e0) ||
2100 (mask_b != 0x001f))
2101 return;
2102 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2103 lookup_r = lookup;
2104 lookup_g = lookup+32;
2105 lookup_b = lookup+32+32;
2106 sh_r = 10;
2107 sh_g = 5;
2108 sh_b = 0;
2109 break;
2110 case 16:
2111 if ((mask_r != 0xf800) ||
2112 (mask_g != 0x07e0) ||
2113 (mask_b != 0x001f))
2114 return;
2115 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2116 lookup_r = lookup;
2117 lookup_g = lookup+32;
2118 lookup_b = lookup+32+64;
2119 sh_r = 11;
2120 sh_g = 5;
2121 sh_b = 0;
2122 break;
2123 case 24:
2124 if ((mask_r != 0xff0000) ||
2125 (mask_g != 0x00ff00) ||
2126 (mask_b != 0x0000ff))
2127 return;
2128 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2129 lookup_r = lookup;
2130 lookup_g = lookup+256;
2131 lookup_b = lookup+256+256;
2132 sh_r = 16;
2133 sh_g = 8;
2134 sh_b = 0;
2135 break;
2136 case 32:
2137 if ((mask_r != 0xff0000) ||
2138 (mask_g != 0x00ff00) ||
2139 (mask_b != 0x0000ff))
2140 return;
2141 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2142 lookup_r = lookup;
2143 lookup_g = lookup+256;
2144 lookup_b = lookup+256+256;
2145 sh_r = 16;
2146 sh_g = 8;
2147 sh_b = 0;
2148 break;
2149 default:
2150 return; /* we do not support this color depth */
2151 }
2152
2153 /* prepare limits for color transformation (each channel is handled separately) */
2154 if (shade < 0) {
2155 shade = -shade;
2156 if (shade < 0) shade = 0;
2157 if (shade > 100) shade = 100;
2158
2159 lower_lim_r = 65535-rm;
2160 lower_lim_g = 65535-gm;
2161 lower_lim_b = 65535-bm;
2162
2163 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2164 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2165 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2166
2167 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2168 } else {
2169 if (shade < 0) shade = 0;
2170 if (shade > 100) shade = 100;
2171
2172 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2173
2174 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2175 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2176 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2177 }
2178
2179 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2180 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2181 {
2182 unsigned int tmp;
2183
2184 tmp = lower_lim_r;
2185 lower_lim_r = lower_lim_b;
2186 lower_lim_b = tmp;
2187
2188 tmp = upper_lim_r;
2189 upper_lim_r = upper_lim_b;
2190 upper_lim_b = tmp;
2191 }
2192
2193 /* fill our lookup tables */
2194 for (i = 0; i <= mask_r>>sh_r; i++)
2195 {
2196 RUINT32T tmp;
2197 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2198 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2199 lookup_r[i] = (tmp/65535)<<sh_r;
2200 }
2201 for (i = 0; i <= mask_g>>sh_g; i++)
2202 {
2203 RUINT32T tmp;
2204 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2205 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2206 lookup_g[i] = (tmp/65535)<<sh_g;
2207 }
2208 for (i = 0; i <= mask_b>>sh_b; i++)
2209 {
2210 RUINT32T tmp;
2211 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2212 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2213 lookup_b[i] = (tmp/65535)<<sh_b;
2214 }
2215
2216 /* apply table to input image (replacing colors by newly calculated ones) */
2217 switch (srcImage->bits_per_pixel)
2218 {
2219 case 15:
2220 {
2221 unsigned short *p1, *pf, *p, *pl;
2222 p1 = (unsigned short *) srcImage->data;
2223 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2224 while (p1 < pf)
2225 {
2226 p = p1;
2227 pl = p1 + srcImage->width;
2228 for (; p < pl; p++)
2229 {
2230 *p = lookup_r[(*p & 0x7c00)>>10] |
2231 lookup_g[(*p & 0x03e0)>> 5] |
2232 lookup_b[(*p & 0x001f)];
2233 }
2234 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2235 }
2236 break;
2237 }
2238 case 16:
2239 {
2240 unsigned short *p1, *pf, *p, *pl;
2241 p1 = (unsigned short *) srcImage->data;
2242 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2243 while (p1 < pf)
2244 {
2245 p = p1;
2246 pl = p1 + srcImage->width;
2247 for (; p < pl; p++)
2248 {
2249 *p = lookup_r[(*p & 0xf800)>>11] |
2250 lookup_g[(*p & 0x07e0)>> 5] |
2251 lookup_b[(*p & 0x001f)];
2252 }
2253 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2254 }
2255 break;
2256 }
2257 case 24:
2258 {
2259 unsigned char *p1, *pf, *p, *pl;
2260 p1 = (unsigned char *) srcImage->data;
2261 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2262 while (p1 < pf)
2263 {
2264 p = p1;
2265 pl = p1 + srcImage->width * 3;
2266 for (; p < pl; p += 3)
2267 {
2268 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2269 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2270 p[2] = lookup_r[(p[2] & 0x0000ff)];
2271 }
2272 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2273 }
2274 break;
2275 }
2276 case 32:
2277 {
2278 RUINT32T *p1, *pf, *p, *pl;
2279 p1 = (RUINT32T *) srcImage->data;
2280 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2281
2282 while (p1 < pf)
2283 {
2284 p = p1;
2285 pl = p1 + srcImage->width;
2286 for (; p < pl; p++)
2287 {
2288 *p = lookup_r[(*p & 0xff0000)>>16] |
2289 lookup_g[(*p & 0x00ff00)>> 8] |
2290 lookup_b[(*p & 0x0000ff)] |
2291 (*p & ~0xffffff);
2292 }
2293 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2294 }
2295 break;
2296 }
2297 }
2298
2299 free (lookup);
2300}
2301#endif
2302
2303/*
2304 * Check our parents are still who we think they are.
2305 * Do transparency updates if required
2306 */
2307int
2308rxvt_term::check_our_parents ()
2309{
2310 int i, pchanged, aformat, have_pixmap, rootdepth;
2311 unsigned long nitems, bytes_after;
2312 Atom atype;
2313 unsigned char *prop = NULL;
2314 Window root, oldp, *list;
2315 Pixmap rootpixmap = None;
2316 XWindowAttributes wattr, wrootattr;
2317
2318 pchanged = 0;
2319
2320 if (!(options & Opt_transparent))
2321 return pchanged; /* Don't try any more */
2322
2323 XGetWindowAttributes (display->display, display->root, &wrootattr);
2324 rootdepth = wrootattr.depth;
2325
2326 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2327
2328 if (rootdepth != wattr.depth)
2329 {
2330 if (am_transparent)
2331 {
2332 pchanged = 1;
2333 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2334 am_transparent = am_pixmap_trans = 0;
2335 }
2336
2337 return pchanged; /* Don't try any more */
2338 }
2339
2340 /* Get all X ops out of the queue so that our information is up-to-date. */
2341 XSync (display->display, False);
2342
2343 /*
2344 * Make the frame window set by the window manager have
2345 * the root background. Some window managers put multiple nested frame
2346 * windows for each client, so we have to take care about that.
2347 */
2348 i = (xa[XA_XROOTPMAP_ID]
2349 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],
2350 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2351 &nitems, &bytes_after, &prop) == Success);
2352
2353 if (!i || prop == NULL)
2354 i = (xa[XA_ESETROOT_PMAP_ID]
2355 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],
2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357 &nitems, &bytes_after, &prop) == Success);
2358
2359 if (!i || prop == NULL
2360#if TINTING
2361 || !rs[Rs_color + Color_tint]
2362#endif
2363 )
2364 have_pixmap = 0;
2365 else
2366 {
2367 have_pixmap = 1;
2368 rootpixmap = *(Pixmap *)prop;
2369 XFree (prop);
2370 }
2371
2372 if (have_pixmap)
2373 {
2374 /*
2375 * Copy display->root pixmap transparency
2376 */
2377 int sx, sy, nx, ny;
2378 unsigned int nw, nh;
2379 Window cr;
2380 XImage *image;
2381 GC gc;
2382 XGCValues gcvalue;
2383
2384 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2385 0, 0, &sx, &sy, &cr);
2386 nw = (unsigned int)szHint.width;
2387 nh = (unsigned int)szHint.height;
2388 nx = ny = 0;
2389
2390 if (sx < 0)
2391 {
2392 nw += sx;
2393 nx = -sx;
2394 sx = 0;
2395 }
2396
2397 if (sy < 0)
2398 {
2399 nh += sy;
2400 ny = -sy;
2401 sy = 0;
2402 }
2403
2404 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2405 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2406
2407 XSync (display->display, False);
2408 allowedxerror = -1;
2409 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2410
2411 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2412 /* XXX: may need a delay here? */
2413 allowedxerror = 0;
2414
2415 if (image == NULL)
2416 {
2417 if (am_transparent && am_pixmap_trans)
2418 {
2419 pchanged = 1;
2420 if (TermWin.pixmap != None)
2421 {
2422 XFreePixmap (display->display, TermWin.pixmap);
2423 TermWin.pixmap = None;
2424 }
2425 }
2426
2427 am_pixmap_trans = 0;
2428 }
2429 else
2430 {
2431 if (TermWin.pixmap != None)
2432 XFreePixmap (display->display, TermWin.pixmap);
2433
2434#if TINTING
2435 if (ISSET_PIXCOLOR (Color_tint))
2436 {
2437 unsigned short rm, gm, bm;
2438 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2439
2440 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2441
2442 ShadeXImage (display, image, shade, rm, gm, bm);
2443 }
2444#endif
2445
2446 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2447 szHint.width, szHint.height, image->depth);
2448 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2449 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2450 nx, ny, image->width, image->height);
2451 XFreeGC (display->display, gc);
2452 XDestroyImage (image);
2453 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2454 XClearWindow (display->display, TermWin.parent[0]);
2455
2456 if (!am_transparent || !am_pixmap_trans)
2457 pchanged = 1;
2458
2459 am_transparent = am_pixmap_trans = 1;
2460 }
2461 }
2462
2463 if (am_pixmap_trans)
2464 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2465 else
2466 {
2467 unsigned int n;
2468 /*
2469 * InheritPixmap transparency
2470 */
2471 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2472 {
2473 oldp = TermWin.parent[i];
2474 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2475 &TermWin.parent[i], &list, &n);
2476 XFree (list);
2477
2478 if (TermWin.parent[i] == display->root)
2479 {
2480 if (oldp != None)
2481 pchanged = 1;
2482
2483 break;
2484 }
2485
2486 if (oldp != TermWin.parent[i])
2487 pchanged = 1;
2488 }
2489
2490 n = 0;
2491
2492 if (pchanged)
2493 {
2494 for (; n < (unsigned int)i; n++)
2495 {
2496 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2497 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2498 {
2499 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2500 break;
2501 }
2502 }
2503 }
2504
2505 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2506 {
2507 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2508 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2509 am_transparent = 0;
2510 /* XXX: also turn off Opt_transparent? */
2511 }
2512 else
2513 {
2514#if WAIT_FOR_WM
2515 /* wait (an arbitrary period) for the WM to do its thing
2516 * needed for fvwm2.2.2 (and before?) */
2517 sleep (1);
2518#endif
2519 for (n = 0; n < (unsigned int)i; n++)
2520 {
2521 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2522 XClearWindow (display->display, TermWin.parent[n]);
2523 }
2524
2525 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2526 am_transparent = 1;
2527 }
2528
2529 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2530 TermWin.parent[i] = None;
2531 }
2532
2533 if (scrollBar.win)
2534 {
2535 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2536 scrollBar.setIdle ();
2537 scrollbar_show (0);
2538 }
2539
2540 if (am_transparent)
2541 {
2542 want_refresh = want_full_refresh = 1;
2543 if (am_pixmap_trans)
2544 flush ();
2545 }
2546
2547 return pchanged;
2548}
2549#endif
2550 2170
2551/*}}} */ 2171/*}}} */
2552 2172
2553bool 2173bool
2554rxvt_term::cmd_parse () 2174rxvt_term::cmd_parse ()
2555{ 2175{
2556 bool flag = false; 2176 bool flag = false;
2557 unicode_t ch = NOCHAR; 2177 wchar_t ch = NOCHAR;
2558 unsigned char *seq_begin; // remember start of esc-sequence here 2178 char *seq_begin; // remember start of esc-sequence here
2559 2179
2560 for (;;) 2180 for (;;)
2561 { 2181 {
2562 if (ch == NOCHAR) 2182 if (ch == NOCHAR)
2563 { 2183 {
2564 seq_begin = cmdbuf_ptr; 2184 seq_begin = cmdbuf_ptr;
2565 ch = next_char (); 2185 ch = next_char ();
2566 }
2567 2186
2568 if (ch == NOCHAR) // TODO: improve 2187 if (ch == NOCHAR)
2569 break; 2188 break;
2189 }
2570 2190
2571 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2191 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2572 { 2192 {
2573 if (!seen_input) 2193 if (!seen_input)
2574 { 2194 {
… …
2578 // some window managers resize the window early, and these programs 2198 // some window managers resize the window early, and these programs
2579 // then sometimes get the size wrong. 2199 // then sometimes get the size wrong.
2580 // unfortunately other programs are even more buggy and dislike 2200 // unfortunately other programs are even more buggy and dislike
2581 // being sent SIGWINCH, so only do it when we were in fact being 2201 // being sent SIGWINCH, so only do it when we were in fact being
2582 // resized. 2202 // resized.
2583 if (seen_resize) 2203 if (seen_resize && cmd_pid)
2584 kill (-cmd_pid, SIGWINCH); 2204 kill (-cmd_pid, SIGWINCH);
2585 } 2205 }
2586 2206
2587 /* Read a text string from the input buffer */ 2207 /* Read a text string from the input buffer */
2588 unicode_t buf[UBUFSIZ]; 2208 wchar_t buf[UBUFSIZ];
2589 bool refreshnow = false; 2209 bool refreshnow = false;
2590 int nlines = 0; 2210 int nlines = 0;
2591 unicode_t *str = buf; 2211 wchar_t *str = buf;
2212 wchar_t *eol = str + min (ncol, UBUFSIZ);
2592 2213
2593 for (;;) 2214 for (;;)
2594 { 2215 {
2595 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2216 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2596 break; 2217 break;
2597 2218
2598 *str++ = ch; 2219 *str++ = ch;
2599 2220
2600 if (ch == C0_LF) 2221 if (ch == C0_LF || str >= eol)
2601 { 2222 {
2223 if (ch == C0_LF)
2602 nlines++; 2224 nlines++;
2225
2603 refresh_count++; 2226 refresh_count++;
2604 2227
2605 if (!(options & Opt_jumpScroll) 2228 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2606 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2607 { 2229 {
2230 refresh_count = 0;
2231
2232 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2233 {
2608 refreshnow = true; 2234 refreshnow = true;
2609 ch = NOCHAR; 2235 ch = NOCHAR;
2610 break; 2236 break;
2237 }
2611 } 2238 }
2612 2239
2613 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2240 // scr_add_lines only works for nlines <= nrow - 1.
2614 if (nlines >= TermWin.nrow - 1) 2241 if (nlines >= nrow - 1)
2615 { 2242 {
2243 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2244 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2616 scr_add_lines (buf, nlines, str - buf); 2245 scr_add_lines (buf, str - buf, nlines);
2246
2617 nlines = 0; 2247 nlines = 0;
2618 str = buf; 2248 str = buf;
2249 eol = str + min (ncol, UBUFSIZ);
2619 } 2250 }
2620 }
2621 2251
2622 if (str >= buf + UBUFSIZ) 2252 if (str >= eol)
2623 { 2253 {
2254 if (eol >= buf + UBUFSIZ)
2255 {
2624 ch = NOCHAR; 2256 ch = NOCHAR;
2625 break; 2257 break;
2258 }
2259 else
2260 eol = min (eol + ncol, buf + UBUFSIZ);
2261 }
2262
2626 } 2263 }
2627 2264
2628 seq_begin = cmdbuf_ptr; 2265 seq_begin = cmdbuf_ptr;
2629 ch = next_char (); 2266 ch = next_char ();
2630 } 2267 }
2631 2268
2269 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2270 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2632 scr_add_lines (buf, nlines, str - buf); 2271 scr_add_lines (buf, str - buf, nlines);
2633 2272
2634 /* 2273 /*
2635 * If there have been a lot of new lines, then update the screen 2274 * If there have been a lot of new lines, then update the screen
2636 * What the heck I'll cheat and only refresh less than every page-full. 2275 * What the heck we'll cheat and only refresh less than every page-full.
2637 * the number of pages between refreshes is refresh_limit, which 2276 * if skipScroll is enabled.
2638 * is incremented here because we must be doing flat-out scrolling.
2639 */ 2277 */
2640 if (refreshnow) 2278 if (refreshnow)
2641 { 2279 {
2642 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2643 refresh_limit++;
2644 else
2645 {
2646 flag = true; 2280 flag = true;
2647 scr_refresh (refresh_type); 2281 scr_refresh ();
2648 } 2282 want_refresh = 1;
2649 } 2283 }
2650 2284
2651 } 2285 }
2652 else 2286 else
2653 { 2287 {
… …
2667 } 2301 }
2668 2302
2669 return flag; 2303 return flag;
2670} 2304}
2671 2305
2672// read the next octet
2673unicode_t
2674rxvt_term::next_octet ()
2675{
2676 return cmdbuf_ptr < cmdbuf_endp
2677 ? *cmdbuf_ptr++
2678 : NOCHAR;
2679}
2680
2681// read the next character 2306// read the next character
2682unicode_t 2307wchar_t
2683rxvt_term::next_char () 2308rxvt_term::next_char () NOTHROW
2684{ 2309{
2685 while (cmdbuf_ptr < cmdbuf_endp) 2310 while (cmdbuf_ptr < cmdbuf_endp)
2686 { 2311 {
2687 // assume 7-bit to be ascii ALWAYS 2312 // assume 7-bit to be ascii ALWAYS
2688 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2313 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2689 return *cmdbuf_ptr++; 2314 return *cmdbuf_ptr++;
2690 2315
2691 wchar_t wc; 2316 wchar_t wc;
2692 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2317 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2693 2318
2694 if (len == (size_t)-2) 2319 if (len == (size_t)-2)
2695 { 2320 {
2696 // the mbstate stores incomplete sequences. didn't know this :/ 2321 // the mbstate stores incomplete sequences. didn't know this :/
2697 cmdbuf_ptr = cmdbuf_endp; 2322 cmdbuf_ptr = cmdbuf_endp;
2698 break; 2323 break;
2699 } 2324 }
2700 2325
2701 if (len == (size_t)-1) 2326 if (len == (size_t)-1)
2702 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2327 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2703 2328
2704 // assume wchar == unicode 2329 // assume wchar == unicode
2705 cmdbuf_ptr += len; 2330 cmdbuf_ptr += len;
2706 return wc & UNICODE_MASK; 2331 return wc & UNICODE_MASK;
2707 } 2332 }
2708 2333
2709 return NOCHAR; 2334 return NOCHAR;
2710} 2335}
2336
2337// read the next octet
2338uint32_t
2339rxvt_term::next_octet () NOTHROW
2340{
2341 return cmdbuf_ptr < cmdbuf_endp
2342 ? (unsigned char)*cmdbuf_ptr++
2343 : NOCHAR;
2344}
2345
2346static class out_of_input out_of_input;
2711 2347
2712/* rxvt_cmd_getc () - Return next input character */ 2348/* rxvt_cmd_getc () - Return next input character */
2713/* 2349/*
2714 * Return the next input character after first passing any keyboard input 2350 * Return the next input character after first passing any keyboard input
2715 * to the command. 2351 * to the command.
2716 */ 2352 */
2717unicode_t 2353wchar_t
2718rxvt_term::cmd_getc () 2354rxvt_term::cmd_getc () THROW ((class out_of_input))
2719{ 2355{
2720 unicode_t c = next_char (); 2356 wchar_t c = next_char ();
2721 2357
2722 if (c == NOCHAR) 2358 if (c == NOCHAR)
2723 throw out_of_input; 2359 throw out_of_input;
2724 2360
2725 return c; 2361 return c;
2726} 2362}
2727 2363
2728unicode_t 2364uint32_t
2729rxvt_term::cmd_get8 () 2365rxvt_term::cmd_get8 () THROW ((class out_of_input))
2730{ 2366{
2731 unicode_t c = next_octet (); 2367 uint32_t c = next_octet ();
2732 2368
2733 if (c == NOCHAR) 2369 if (c == NOCHAR)
2734 throw out_of_input; 2370 throw out_of_input;
2735 2371
2736 return c; 2372 return c;
… …
2800 { 2436 {
2801 if ((buf[len++] = cmd_getc ()) == 'i') 2437 if ((buf[len++] = cmd_getc ()) == 'i')
2802 break; /* done = 1 */ 2438 break; /* done = 1 */
2803 } 2439 }
2804 } 2440 }
2805 2441
2806 for (i = 0; i < len; i++) 2442 for (i = 0; i < len; i++)
2807 if (putc (buf[i], fd) == EOF) 2443 if (putc (buf[i], fd) == EOF)
2808 { 2444 {
2809 done = 1; 2445 done = 1;
2810 break; 2446 break;
… …
2812 } 2448 }
2813 } 2449 }
2814 2450
2815 pclose_printer (fd); 2451 pclose_printer (fd);
2816} 2452}
2817#endif /* PRINTPIPE */ 2453#endif /* PRINTPIPE */
2818/*}}} */ 2454/*}}} */
2819 2455
2820/* *INDENT-OFF* */ 2456/* *INDENT-OFF* */
2821enum { 2457enum {
2822 C1_40 = 0x40, 2458 C1_40 = 0x40,
… …
2836 case C0_ESC: 2472 case C0_ESC:
2837 process_escape_seq (); 2473 process_escape_seq ();
2838 break; 2474 break;
2839 case C0_ENQ: /* terminal Status */ 2475 case C0_ENQ: /* terminal Status */
2840 if (rs[Rs_answerbackstring]) 2476 if (rs[Rs_answerbackstring])
2841 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2477 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2842 (unsigned int)strlen (rs[Rs_answerbackstring]));
2843 else 2478 else
2844 tt_write ((unsigned char *)VT100_ANS, 2479 tt_write (VT100_ANS, strlen (VT100_ANS));
2845 (unsigned int)strlen (VT100_ANS));
2846 break; 2480 break;
2847 case C0_BEL: /* bell */ 2481 case C0_BEL: /* bell */
2848 scr_bell (); 2482 scr_bell ();
2849 break; 2483 break;
2850 case C0_BS: /* backspace */ 2484 case C0_BS: /* backspace */
… …
2874 process_dcs_seq (); 2508 process_dcs_seq ();
2875 break; 2509 break;
2876 case 0x9b: /* CSI */ 2510 case 0x9b: /* CSI */
2877 process_csi_seq (); 2511 process_csi_seq ();
2878 break; 2512 break;
2879 case 0x9d: /* CSI */ 2513 case 0x9d: /* OSC */
2880 process_osc_seq (); 2514 process_osc_seq ();
2881 break; 2515 break;
2882#endif 2516#endif
2883 } 2517 }
2884} 2518}
… …
2974 scr_charset_set (2, (unsigned int)cmd_getc ()); 2608 scr_charset_set (2, (unsigned int)cmd_getc ());
2975 break; 2609 break;
2976 case '+': 2610 case '+':
2977 scr_charset_set (3, (unsigned int)cmd_getc ()); 2611 scr_charset_set (3, (unsigned int)cmd_getc ());
2978 break; 2612 break;
2979#if ENABLE_FRILLS 2613#if !ENABLE_MINIMAL
2980 case '6': 2614 case '6':
2981 scr_backindex (); 2615 scr_backindex ();
2982 break; 2616 break;
2983#endif 2617#endif
2984 case '7': 2618 case '7':
2985 scr_cursor (SAVE); 2619 scr_cursor (SAVE);
2986 break; 2620 break;
2987 case '8': 2621 case '8':
2988 scr_cursor (RESTORE); 2622 scr_cursor (RESTORE);
2989 break; 2623 break;
2990#if ENABLE_FRILLS 2624#if !ENABLE_MINIMAL
2991 case '9': 2625 case '9':
2992 scr_forwardindex (); 2626 scr_forwardindex ();
2993 break; 2627 break;
2994#endif 2628#endif
2995 case '=': 2629 case '=':
… …
3005 break; 2639 break;
3006 2640
3007 /* 8.3.87: NEXT LINE */ 2641 /* 8.3.87: NEXT LINE */
3008 case C1_NEL: /* ESC E */ 2642 case C1_NEL: /* ESC E */
3009 { 2643 {
3010 unicode_t nlcr[] = { C0_LF, C0_CR }; 2644 wchar_t nlcr[] = { C0_LF, C0_CR };
3011 scr_add_lines (nlcr, 1, 2); 2645 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3012 } 2646 }
3013 break; 2647 break;
3014 2648
3015 /* kidnapped escape sequence: Should be 8.3.48 */ 2649 /* kidnapped escape sequence: Should be 8.3.48 */
3016 case C1_ESA: /* ESC G */ 2650 case C1_ESA: /* ESC G */
… …
3038 process_dcs_seq (); 2672 process_dcs_seq ();
3039 break; 2673 break;
3040 2674
3041 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2675 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3042 case C1_SCI: /* ESC Z */ 2676 case C1_SCI: /* ESC Z */
3043 tt_write ((const unsigned char *)ESCZ_ANSWER, 2677 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3044 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3045 break; /* steal obsolete ESC [ c */ 2678 break; /* steal obsolete ESC [ c */
3046 2679
3047 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2680 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3048 case C1_CSI: /* ESC [ */ 2681 case C1_CSI: /* ESC [ */
3049 process_csi_seq (); 2682 process_csi_seq ();
… …
3111rxvt_term::process_csi_seq () 2744rxvt_term::process_csi_seq ()
3112{ 2745{
3113 unicode_t ch, priv, i; 2746 unicode_t ch, priv, i;
3114 unsigned int nargs, p; 2747 unsigned int nargs, p;
3115 int n, ndef; 2748 int n, ndef;
3116 int arg[ESC_ARGS]; 2749 int arg[ESC_ARGS] = { };
3117 2750
3118 for (nargs = ESC_ARGS; nargs > 0;) 2751 nargs = 0;
3119 arg[--nargs] = 0;
3120 2752
3121 priv = 0; 2753 priv = 0;
3122 ch = cmd_getc (); 2754 ch = cmd_getc ();
3123 if (ch >= '<' && ch <= '?') 2755 if (ch >= '<' && ch <= '?')
2756 {
3124 { /* '<' '=' '>' '?' */ 2757 /* '<' '=' '>' '?' */
3125 priv = ch; 2758 priv = ch;
3126 ch = cmd_getc (); 2759 ch = cmd_getc ();
3127 } 2760 }
3128 2761
3129 /* read any numerical arguments */ 2762 /* read any numerical arguments */
… …
3158 ndef = get_byte_array_bit (csi_defaults, i); 2791 ndef = get_byte_array_bit (csi_defaults, i);
3159 for (p = 0; p < nargs; p++) 2792 for (p = 0; p < nargs; p++)
3160 if (arg[p] == -1) 2793 if (arg[p] == -1)
3161 arg[p] = ndef; 2794 arg[p] = ndef;
3162 2795
3163#ifdef DEBUG_CMD
3164 fprintf (stderr, "CSI ");
3165 for (p = 0; p < nargs; p++)
3166 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3167 fprintf (stderr, "%c\n", ch);
3168#endif
3169
3170 /* 2796 /*
3171 * private mode handling 2797 * private mode handling
3172 */ 2798 */
3173 if (priv) 2799 if (priv)
3174 { 2800 {
3175 switch (priv) 2801 switch (priv)
3176 { 2802 {
3177 case '>': 2803 case '>':
3178 if (ch == CSI_DA) /* secondary device attributes */ 2804 if (ch == CSI_DA) /* secondary device attributes */
2805 {
2806 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2807 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2808 //
2809 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2810 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2811 // versions.
2812 //
3179 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2813 tt_printf ("\033[>%d;95;0c", 'U');
2814 }
3180 break; 2815 break;
3181 case '?': 2816 case '?':
3182 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2817 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3183 process_terminal_mode (ch, priv, nargs, arg); 2818 process_terminal_mode (ch, priv, nargs, arg);
3184 break; 2819 break;
… …
3289 2924
3290 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2925 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3291 arg[0] = -arg[0]; 2926 arg[0] = -arg[0];
3292 /* FALLTHROUGH */ 2927 /* FALLTHROUGH */
3293 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2928 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3294 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2929 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3295 break; 2930 break;
3296 2931
3297 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2932 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3298 tt_write ((const unsigned char *)VT100_ANS, 2933 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3299 (unsigned int) (sizeof (VT100_ANS) - 1));
3300 break; 2934 break;
3301 2935
3302 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2936 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3303 process_sgr_mode (nargs, arg); 2937 process_sgr_mode (nargs, arg);
3304 break; 2938 break;
… …
3311 break; 2945 break;
3312 case 6: /* CPR requested */ 2946 case 6: /* CPR requested */
3313 scr_report_position (); 2947 scr_report_position ();
3314 break; 2948 break;
3315 case 7: /* unofficial extension */ 2949 case 7: /* unofficial extension */
3316 if (options & Opt_insecure) 2950 if (option (Opt_insecure))
3317 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2951 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3318 break; 2952 break;
3319 case 8: /* unofficial extension */ 2953 case 8: /* unofficial extension */
3320 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2954 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3321 break; 2955 break;
… …
3388 break; 3022 break;
3389 case CSI_75: 3023 case CSI_75:
3390 scr_cursor (RESTORE); 3024 scr_cursor (RESTORE);
3391 break; 3025 break;
3392 3026
3393#if ENABLE_FRILLS 3027#if !ENABLE_MINIMAL
3394 case CSI_74: 3028 case CSI_74:
3395 process_window_ops (arg, nargs); 3029 process_window_ops (arg, nargs);
3396 break; 3030 break;
3397#endif 3031#endif
3398 3032
… …
3405 break; 3039 break;
3406 } 3040 }
3407} 3041}
3408/*}}} */ 3042/*}}} */
3409 3043
3410#if ENABLE_FRILLS 3044#if !ENABLE_MINIMAL
3411/* ARGSUSED */ 3045/* ARGSUSED */
3412void 3046void
3413rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3047rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3414{ 3048{
3415 int x, y; 3049 int x, y;
3416 XWindowAttributes wattr; 3050 XWindowAttributes wattr;
3417 Window wdummy; 3051 Window wdummy;
3052
3053 dLocal (Display *, dpy);
3418 3054
3419 if (nargs == 0) 3055 if (nargs == 0)
3420 return; 3056 return;
3421 3057
3422 switch (args[0]) 3058 switch (args[0])
3423 { 3059 {
3424 /* 3060 /*
3425 * commands 3061 * commands
3426 */ 3062 */
3427 case 1: /* deiconify window */ 3063 case 1: /* deiconify window */
3428 XMapWindow (display->display, TermWin.parent[0]); 3064 XMapWindow (dpy, parent[0]);
3429 break; 3065 break;
3430 case 2: /* iconify window */ 3066 case 2: /* iconify window */
3431 XIconifyWindow (display->display, TermWin.parent[0], 3067 XIconifyWindow (dpy, parent[0], display->screen);
3432 DefaultScreen (display->display));
3433 break; 3068 break;
3434 case 3: /* set position (pixels) */ 3069 case 3: /* set position (pixels) */
3435 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3070 XMoveWindow (dpy, parent[0], args[1], args[2]);
3436 break; 3071 break;
3437 case 4: /* set size (pixels) */ 3072 case 4: /* set size (pixels) */
3438 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3073 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3439 break; 3074 break;
3440 case 5: /* raise window */ 3075 case 5: /* raise window */
3441 XRaiseWindow (display->display, TermWin.parent[0]); 3076 XRaiseWindow (dpy, parent[0]);
3442 break; 3077 break;
3443 case 6: /* lower window */ 3078 case 6: /* lower window */
3444 XLowerWindow (display->display, TermWin.parent[0]); 3079 XLowerWindow (dpy, parent[0]);
3445 break; 3080 break;
3446 case 7: /* refresh window */ 3081 case 7: /* refresh window */
3447 scr_touch (true); 3082 scr_touch (true);
3448 break; 3083 break;
3449 case 8: /* set size (chars) */ 3084 case 8: /* set size (chars) */
3450 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3085 set_widthheight ((unsigned int) (args[2] * fwidth),
3451 (unsigned int) (args[1] * TermWin.fheight)); 3086 (unsigned int) (args[1] * fheight));
3452 break; 3087 break;
3453 3088
3454 //case 9: NYI, TODO, restore maximized window or maximize window 3089 //case 9: NYI, TODO, restore maximized window or maximize window
3455 default: 3090 default:
3456 if (args[0] >= 24) /* set height (chars) */ 3091 if (args[0] >= 24) /* set height (chars) */
3457 set_widthheight ((unsigned int)TermWin.width, 3092 set_widthheight ((unsigned int)width,
3458 (unsigned int) (args[1] * TermWin.fheight)); 3093 (unsigned int) (args[1] * fheight));
3459 break; 3094 break;
3460
3461 3095
3462 /* 3096 /*
3463 * reports - some output format copied from XTerm 3097 * reports - some output format copied from XTerm
3464 */ 3098 */
3465 case 11: /* report window state */ 3099 case 11: /* report window state */
3466 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3100 XGetWindowAttributes (dpy, parent[0], &wattr);
3467 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3101 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3468 break; 3102 break;
3469 case 13: /* report window position */ 3103 case 13: /* report window position */
3470 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3104 XGetWindowAttributes (dpy, parent[0], &wattr);
3471 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3105 XTranslateCoordinates (dpy, parent[0], wattr.root,
3472 -wattr.border_width, -wattr.border_width, 3106 -wattr.border_width, -wattr.border_width,
3473 &x, &y, &wdummy); 3107 &x, &y, &wdummy);
3474 tt_printf ("\033[3;%d;%dt", x, y); 3108 tt_printf ("\033[3;%d;%dt", x, y);
3475 break; 3109 break;
3476 case 14: /* report window size (pixels) */ 3110 case 14: /* report window size (pixels) */
3477 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3111 XGetWindowAttributes (dpy, parent[0], &wattr);
3478 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3112 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3479 break; 3113 break;
3480 case 18: /* report text area size (chars) */ 3114 case 18: /* report text area size (chars) */
3481 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3115 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3482 break; 3116 break;
3483 case 19: /* report window size (chars) */ 3117 case 19: /* report window size (chars) */
3484 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3118 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3485 break; 3119 break;
3486 case 20: /* report icon label */ 3120 case 20: /* report icon label */
3487 { 3121 {
3488 char *s; 3122 char *s;
3489 XGetIconName (display->display, TermWin.parent[0], &s); 3123 XGetIconName (dpy, parent[0], &s);
3490 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3124 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3491 XFree (s); 3125 XFree (s);
3492 } 3126 }
3493 break; 3127 break;
3494 case 21: /* report window title */ 3128 case 21: /* report window title */
3495 { 3129 {
3496 char *s; 3130 char *s;
3497 XFetchName (display->display, TermWin.parent[0], &s); 3131 XFetchName (dpy, parent[0], &s);
3498 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3132 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s); 3133 XFree (s);
3500 } 3134 }
3501 break; 3135 break;
3502 } 3136 }
3503} 3137}
… …
3506/*----------------------------------------------------------------------*/ 3140/*----------------------------------------------------------------------*/
3507/* 3141/*
3508 * get input up until STRING TERMINATOR (or BEL) 3142 * get input up until STRING TERMINATOR (or BEL)
3509 * ends_how is terminator used. returned input must be free()'d 3143 * ends_how is terminator used. returned input must be free()'d
3510 */ 3144 */
3511unsigned char * 3145char *
3512rxvt_term::get_to_st (unicode_t &ends_how) 3146rxvt_term::get_to_st (unicode_t &ends_how)
3513{ 3147{
3514 unicode_t ch; 3148 unicode_t ch;
3515 bool seen_esc = false; 3149 bool seen_esc = false;
3516 unsigned int n = 0; 3150 unsigned int n = 0;
… …
3530 seen_esc = true; 3164 seen_esc = true;
3531 continue; 3165 continue;
3532 } 3166 }
3533 else if (ch == C0_BEL || ch == CHAR_ST) 3167 else if (ch == C0_BEL || ch == CHAR_ST)
3534 break; 3168 break;
3169 else if (ch == C0_SYN)
3170 ch = cmd_get8 ();
3535 else if (ch < 0x20) 3171 else if (ch < 0x20)
3536 return NULL; /* other control character - exit */ 3172 return NULL; /* other control character - exit */
3537 3173
3538 seen_esc = false; 3174 seen_esc = false;
3539 3175
3540 if (n >= sizeof (string) - 1) 3176 if (n >= STRING_MAX - 1)
3541 // stop at some sane length 3177 // stop at some sane length
3542 return NULL; 3178 return NULL;
3543 3179
3544 if (ch == C0_SYN)
3545 string[n++] = cmd_get8 ();
3546 else
3547 string[n++] = ch; 3180 string[n++] = ch;
3548 } 3181 }
3549 3182
3550 string[n++] = '\0'; 3183 string[n++] = '\0';
3551 3184
3552 ends_how = (ch == 0x5c ? C0_ESC : ch); 3185 ends_how = (ch == 0x5c ? C0_ESC : ch);
3553 3186
3554 return (unsigned char *)rxvt_wcstombs (string); 3187 return rxvt_wcstombs (string);
3555} 3188}
3556 3189
3557/*----------------------------------------------------------------------*/ 3190/*----------------------------------------------------------------------*/
3558/* 3191/*
3559 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3192 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3560 */ 3193 */
3561void 3194void
3562rxvt_term::process_dcs_seq () 3195rxvt_term::process_dcs_seq ()
3563{ 3196{
3564 unsigned char *s; 3197 char *s;
3565 unicode_t eh; 3198 unicode_t eh;
3566 3199
3567 /* 3200 /*
3568 * Not handled yet 3201 * Not handled yet
3569 */ 3202 */
… …
3588 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3221 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3589 arg = arg * 10 + (ch - '0'); 3222 arg = arg * 10 + (ch - '0');
3590 3223
3591 if (ch == ';') 3224 if (ch == ';')
3592 { 3225 {
3593 unsigned char *s = get_to_st (eh); 3226 char *s = get_to_st (eh);
3594 3227
3595 if (s) 3228 if (s)
3596 { 3229 {
3597 process_xterm_seq (arg, (char *)s, eh); 3230 process_xterm_seq (arg, s, eh);
3598 free (s); 3231 free (s);
3599 } 3232 }
3600 } 3233 }
3601} 3234}
3602 3235
3603void 3236void
3604rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3237rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3605{ 3238{
3606 if (str[0] == '?' && !str[1]) 3239 if (str[0] == '?' && !str[1])
3607 { 3240 {
3608 unsigned short r, g, b; 3241 rgba c;
3609 pix_colors_focused[color].get (display, r, g, b); 3242 pix_colors_focused[color].get (c);
3243
3244#if XFT
3245 if (c.a != rgba::MAX_CC)
3246 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3247 else
3248#endif
3610 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3249 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3611 } 3250 }
3612 else 3251 else
3613 set_window_color (color, str); 3252 set_window_color (color, str);
3614} 3253}
3615 3254
3616/* 3255/*
3617 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3256 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3618 * 0 = change iconName/title
3619 * 1 = change iconName
3620 * 2 = change title
3621 * 4 = change color
3622 * 10 = change fg color
3623 * 11 = change bg color
3624 * 12 = change text color
3625 * 13 = change mouse foreground color
3626 * 17 = change highlight character colour
3627 * 18 = change bold character color
3628 * 19 = change underlined character color
3629 * 46 = change logfile (not implemented)
3630 * 50 = change font
3631 *
3632 * rxvt extensions:
3633 * 20 = bg pixmap
3634 * 39 = change default fg color
3635 * 49 = change default bg color
3636 * 55 = dump scrollback buffer and all of screen
3637 * 701 = change locale
3638 * 702 = find font
3639 * 703 = menu
3640 */ 3257 */
3641void 3258void
3642rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3259rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3643{ 3260{
3644 int changed = 0;
3645 int color; 3261 int color;
3646 char *buf, *name; 3262 char *buf, *name;
3647 bool query = str[0] == '?' && !str[1]; 3263 bool query = str[0] == '?' && !str[1];
3648 int saveop = op; 3264 int saveop = op;
3649 3265
3266 dLocal (Display *, dpy);
3267
3650 assert (str != NULL); 3268 assert (str != NULL);
3269
3270 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3271 return;
3272
3651 switch (op) 3273 switch (op)
3652 { 3274 {
3653 case XTerm_name: 3275 case XTerm_name:
3654 set_title (str); 3276 set_title (str);
3655 /* FALLTHROUGH */ 3277 /* FALLTHROUGH */
… …
3669 unsigned long bytes_after; 3291 unsigned long bytes_after;
3670 unsigned char *value = 0; 3292 unsigned char *value = 0;
3671 const char *str = ""; 3293 const char *str = "";
3672 3294
3673 if (prop 3295 if (prop
3674 && XGetWindowProperty (display->display, TermWin.parent[0], 3296 && XGetWindowProperty (dpy, parent[0],
3675 prop, 0, 1<<16, 0, AnyPropertyType, 3297 prop, 0, 1<<16, 0, AnyPropertyType,
3676 &actual_type, &actual_format, 3298 &actual_type, &actual_format,
3677 &nitems, &bytes_after, &value) == Success 3299 &nitems, &bytes_after, &value) == Success
3678 && actual_type != None 3300 && actual_type != None
3679 && actual_format == 8) 3301 && actual_format == 8)
3680 str = (const char *)(value); 3302 str = (const char *)(value);
3681 3303
3682 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3304 tt_printf ("\033]%d;%s%c", op, str, resp);
3683 3305
3684 XFree (value); 3306 XFree (value);
3685 } 3307 }
3686 else 3308 else
3687 { 3309 {
… …
3691 { 3313 {
3692 *eq = 0; 3314 *eq = 0;
3693 set_utf8_property (display->atom (str), eq + 1); 3315 set_utf8_property (display->atom (str), eq + 1);
3694 } 3316 }
3695 else 3317 else
3696 XDeleteProperty (display->display, TermWin.parent[0], 3318 XDeleteProperty (dpy, parent[0],
3697 display->atom (str)); 3319 display->atom (str));
3698 } 3320 }
3699 break; 3321 break;
3700 3322
3701 case XTerm_Color: 3323 case XTerm_Color:
… …
3703 { 3325 {
3704 if ((name = strchr (buf, ';')) == NULL) 3326 if ((name = strchr (buf, ';')) == NULL)
3705 break; 3327 break;
3706 3328
3707 *name++ = '\0'; 3329 *name++ = '\0';
3708 color = atoi (buf); 3330 color = atoi (buf) + minCOLOR;
3709 3331
3710 if (color < 0 || color >= TOTAL_COLORS) 3332 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3711 break; 3333 break;
3712 3334
3713 if ((buf = strchr (name, ';')) != NULL) 3335 if ((buf = strchr (name, ';')) != NULL)
3714 *buf++ = '\0'; 3336 *buf++ = '\0';
3715 3337
3716 if (name[0] == '?' && !name[1]) 3338 process_color_seq (op, color, name, resp);
3717 {
3718 unsigned short r, g, b;
3719 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3720 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3721 }
3722 else
3723 set_window_color (color + minCOLOR, name);
3724 } 3339 }
3725 break; 3340 break;
3726 case XTerm_Color00: 3341 case XTerm_Color00:
3727 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3342 process_color_seq (op, Color_fg, str, resp);
3728 break; 3343 break;
3729 case XTerm_Color01: 3344 case XTerm_Color01:
3730 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3345 process_color_seq (op, Color_bg, str, resp);
3731 break; 3346 break;
3732#ifndef NO_CURSORCOLOR 3347#ifndef NO_CURSORCOLOR
3733 case XTerm_Color_cursor: 3348 case XTerm_Color_cursor:
3734 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3349 process_color_seq (op, Color_cursor, str, resp);
3735 break; 3350 break;
3736#endif 3351#endif
3737 case XTerm_Color_pointer_fg: 3352 case XTerm_Color_pointer_fg:
3738 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3353 process_color_seq (op, Color_pointer_fg, str, resp);
3739 break; 3354 break;
3740 case XTerm_Color_pointer_bg: 3355 case XTerm_Color_pointer_bg:
3741 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3356 process_color_seq (op, Color_pointer_bg, str, resp);
3742 break; 3357 break;
3743#ifndef NO_BOLD_UNDERLINE_REVERSE 3358#ifndef NO_BOLD_UNDERLINE_REVERSE
3744 case XTerm_Color_BD:
3745 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3746 break;
3747 case XTerm_Color_IT:
3748 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3749 break;
3750 case XTerm_Color_UL:
3751 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3752 break;
3753 case XTerm_Color_RV: 3359 case XTerm_Color_RV:
3754 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3360 process_color_seq (op, Color_RV, str, resp);
3755 break; 3361 break;
3362 case Rxvt_Color_BD:
3363 case URxvt_Color_BD:
3364 process_color_seq (op, Color_BD, str, resp);
3365 break;
3366 case Rxvt_Color_UL:
3367 case URxvt_Color_UL:
3368 process_color_seq (op, Color_UL, str, resp);
3369 break;
3370 case URxvt_Color_IT:
3371 process_color_seq (op, Color_IT, str, resp);
3372 break;
3756#endif 3373#endif
3757#if TRANSPARENT && TINTING 3374#if ENABLE_TRANSPARENCY
3758 case XTerm_Color_tint: 3375 case URxvt_Color_tint:
3759 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3376 process_color_seq (op, Color_tint, str, resp);
3760 check_our_parents (); 3377 {
3761 if (am_transparent) 3378 bool changed = false;
3762 want_full_refresh = want_refresh = 1; 3379 if (ISSET_PIXCOLOR (Color_tint))
3763 break; 3380 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3764#endif 3381 else
3382 changed = bgPixmap.unset_tint ();
3383 if (changed)
3384 update_background ();
3385 }
3765 3386
3387 break;
3388#endif
3389
3390#if BG_IMAGE_FROM_FILE
3766 case XTerm_Pixmap: 3391 case Rxvt_Pixmap:
3767 if (*str != ';') 3392 if (!strcmp (str, "?"))
3768 { 3393 {
3769#if XPM_BACKGROUND 3394 char str[256];
3770 scale_pixmap (""); /* reset to default scaling */ 3395
3771 set_bgPixmap (str); /* change pixmap */ 3396 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3772#endif 3397 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3773 scr_touch (true); 3398 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3399 process_xterm_seq (XTerm_title, str, CHAR_ST);
3774 } 3400 }
3775 while ((str = strchr (str, ';')) != NULL) 3401 else
3776 { 3402 {
3403 int changed = 0;
3404
3405 if (*str != ';')
3406 {
3407 /* reset to default scaling :*/
3408 bgPixmap.unset_geometry ();
3409 if (bgPixmap.set_file (str)) /* change pixmap */
3410 changed++;
3411 str = strchr (str, ';');
3412 if (str == NULL)
3413 bgPixmap.set_defaultGeometry ();
3414 }
3415 while (str)
3416 {
3777 str++; 3417 str++;
3778#if XPM_BACKGROUND 3418 if (bgPixmap.set_geometry (str))
3779 changed += scale_pixmap (str); 3419 changed++;
3780#endif 3420 str = strchr (str, ';');
3421 }
3422 if (changed)
3423 update_background ();
3781 } 3424 }
3782
3783 if (changed)
3784 {
3785#ifdef XPM_BACKGROUND
3786 resize_pixmap ();
3787#endif
3788 scr_touch (true);
3789 }
3790 break; 3425 break;
3426#endif
3791 3427
3792 case XTerm_restoreFG: 3428 case Rxvt_restoreFG:
3793 set_window_color (Color_fg, str); 3429 set_window_color (Color_fg, str);
3794 break; 3430 break;
3795 case XTerm_restoreBG: 3431 case Rxvt_restoreBG:
3796 set_window_color (Color_bg, str); 3432 set_window_color (Color_bg, str);
3797 break; 3433 break;
3798 3434
3799 case XTerm_logfile: 3435 case XTerm_logfile:
3800 // TODO, when secure mode? 3436 // TODO, when secure mode?
3801 break; 3437 break;
3802 3438
3439#if 0
3440 case Rxvt_dumpscreen: /* no error notices */
3441 {
3442 int fd;
3443 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3444 {
3445 scr_dump (fd);
3446 close (fd);
3447 }
3448 }
3449 break;
3450#endif
3803 case XTerm_font: 3451 case XTerm_font:
3804 op = URxvt_font; 3452 op = URxvt_font;
3805 case URxvt_font: 3453 case URxvt_font:
3806#if ENABLE_STYLES 3454#if ENABLE_STYLES
3807 case URxvt_boldFont: 3455 case URxvt_boldFont:
3808 case URxvt_italicFont: 3456 case URxvt_italicFont:
3809 case URxvt_boldItalicFont: 3457 case URxvt_boldItalicFont:
3810#endif 3458#endif
3811 if (query) 3459 if (query)
3812 tt_printf ("\33]%d;%-.250s%c", saveop, 3460 tt_printf ("\33]%d;%-.250s%c", saveop,
3813 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3461 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3814 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3462 ? fontset[op - URxvt_font]->fontdesc : "",
3815 resp); 3463 resp);
3816 else 3464 else
3817 { 3465 {
3818 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3466 const char *&res = rs[Rs_font + (op - URxvt_font)];
3819 3467
… …
3821 allocated.push_back ((void *)res); 3469 allocated.push_back ((void *)res);
3822 set_fonts (); 3470 set_fonts ();
3823 } 3471 }
3824 break; 3472 break;
3825 3473
3826#if ENABLE_FRILLS 3474 case URxvt_version:
3827 case XTerm_locale:
3828 if (query) 3475 if (query)
3476 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3477 op,
3478 rs[Rs_name], VERSION[0], VERSION[2],
3479 resp);
3480 break;
3481
3482#if !ENABLE_MINIMAL
3483 case URxvt_locale:
3484 if (query)
3829 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3485 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3830 else 3486 else
3831 { 3487 {
3832 set_locale (str); 3488 set_locale (str);
3833 pty.set_utf8_mode (enc_utf8); 3489 pty->set_utf8_mode (enc_utf8);
3834# ifdef USE_XIM
3835 im_cb (); 3490 init_xlocale ();
3836# endif
3837 } 3491 }
3838 break; 3492 break;
3839#endif
3840 3493
3841#ifdef MENUBAR 3494 case URxvt_view_up:
3842 case XTerm_Menu: 3495 case URxvt_view_down:
3843 if (options & Opt_insecure) 3496 {
3844 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3497 int lines = atoi (str);
3498
3499 if (lines)
3500 scr_page (op == URxvt_view_up ? UP : DN, lines);
3501 else
3502 scr_erase_savelines ();
3503 }
3504
3845 break; 3505 break;
3846#endif 3506#endif
3847#if 0 3507
3848 case XTerm_dumpscreen: /* no error notices */ 3508#if ENABLE_PERL
3849 { 3509 case URxvt_perl:
3850 int fd; 3510 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3851 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3511 ; // no responses yet
3852 {
3853 scr_dump (fd);
3854 close (fd);
3855 }
3856 }
3857 break; 3512 break;
3858#endif 3513#endif
3859 } 3514 }
3860} 3515}
3861/*----------------------------------------------------------------------*/ 3516/*----------------------------------------------------------------------*/
… …
3892 return state; 3547 return state;
3893} 3548}
3894 3549
3895/* we're not using priv _yet_ */ 3550/* we're not using priv _yet_ */
3896void 3551void
3897rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3552rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3898{ 3553{
3899 unsigned int i, j; 3554 unsigned int i, j;
3900 int state; 3555 int state;
3901 3556
3902 static const struct 3557 static const struct
3903 { 3558 {
3904 const int argval; 3559 const int argval;
3905 const unsigned long bit; 3560 const unsigned long bit;
3906 }
3907
3908 argtopriv[] = { 3561 } argtopriv[] = {
3909 { 1, PrivMode_aplCUR }, 3562 { 1, PrivMode_aplCUR },
3910 { 2, PrivMode_vt52 }, 3563 { 2, PrivMode_vt52 },
3911 { 3, PrivMode_132 }, 3564 { 3, PrivMode_132 },
3912 { 4, PrivMode_smoothScroll }, 3565 { 4, PrivMode_smoothScroll },
3913 { 5, PrivMode_rVideo }, 3566 { 5, PrivMode_rVideo },
3914 { 6, PrivMode_relOrigin }, 3567 { 6, PrivMode_relOrigin },
3915 { 7, PrivMode_Autowrap }, 3568 { 7, PrivMode_Autowrap },
3916 // 8, bi-directional support mode 3569 // 8, bi-directional support mode
3917 { 9, PrivMode_MouseX10 }, 3570 { 9, PrivMode_MouseX10 },
3918#ifdef menuBar_esc
3919 { menuBar_esc, PrivMode_menuBar },
3920#endif
3921 // 18, 19 printing-related 3571 // 18, 19 printing-related
3922 { 25, PrivMode_VisibleCursor }, 3572 { 25, PrivMode_VisibleCursor },
3923#ifdef scrollBar_esc 3573#ifdef scrollBar_esc
3924 { scrollBar_esc, PrivMode_scrollBar }, 3574 { scrollBar_esc, PrivMode_scrollBar },
3925#endif 3575#endif
… …
3932 { 66, PrivMode_aplKP }, 3582 { 66, PrivMode_aplKP },
3933#ifndef NO_BACKSPACE_KEY 3583#ifndef NO_BACKSPACE_KEY
3934 { 67, PrivMode_BackSpace }, 3584 { 67, PrivMode_BackSpace },
3935#endif 3585#endif
3936 { 1000, PrivMode_MouseX11 }, 3586 { 1000, PrivMode_MouseX11 },
3937 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3587 { 1002, PrivMode_MouseBtnEvent },
3938 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3588 { 1003, PrivMode_MouseAnyEvent },
3939 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3940 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3941 { 1011, PrivMode_Keypress }, // rxvt extension 3590 { 1011, PrivMode_Keypress }, // rxvt extension
3942 // 1035 enable modifiers for alt, numlock NYI 3591 // 1035 enable modifiers for alt, numlock NYI
3943 // 1036 send ESC for meta keys NYI 3592 // 1036 send ESC for meta keys NYI
3944 // 1037 send DEL for keypad delete NYI 3593 // 1037 send DEL for keypad delete NYI
… …
3970 } 3619 }
3971 3620
3972 /* extra handling for values with state unkept */ 3621 /* extra handling for values with state unkept */
3973 switch (arg[i]) 3622 switch (arg[i])
3974 { 3623 {
3624#if ENABLE_STYLES
3625 case 1021:
3626 set_option (Opt_intensityStyles, mode);
3627
3628 scr_touch (true);
3629 break;
3630#endif
3975 case 1048: /* alternative cursor save */ 3631 case 1048: /* alternative cursor save */
3976 case 1049: 3632 case 1049:
3977 if (options & Opt_secondaryScreen) 3633 if (option (Opt_secondaryScreen))
3978 if (mode == 0) 3634 if (mode == 0)
3979 scr_cursor (RESTORE); 3635 scr_cursor (RESTORE);
3980 else if (mode == 1) 3636 else if (mode == 1)
3981 scr_cursor (SAVE); 3637 scr_cursor (SAVE);
3982 break; 3638 break;
… …
3994 */ 3650 */
3995 PrivMode (1, PrivMode_vt52); 3651 PrivMode (1, PrivMode_vt52);
3996 break; 3652 break;
3997 case 3: /* 80/132 */ 3653 case 3: /* 80/132 */
3998 if (priv_modes & PrivMode_132OK) 3654 if (priv_modes & PrivMode_132OK)
3999 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3655 set_widthheight (((state ? 132 : 80) * fwidth), height);
4000 break; 3656 break;
4001 case 4: /* smooth scrolling */ 3657 case 4: /* smooth scrolling */
4002 if (state)
4003 options &= ~Opt_jumpScroll;
4004 else
4005 options |= Opt_jumpScroll; 3658 set_option (Opt_jumpScroll, !state);
4006 break; 3659 break;
4007 case 5: /* reverse video */ 3660 case 5: /* reverse video */
4008 scr_rvideo_mode (state); 3661 scr_rvideo_mode (state);
4009 break; 3662 break;
4010 case 6: /* relative/absolute origins */ 3663 case 6: /* relative/absolute origins */
… …
4014 scr_autowrap (state); 3667 scr_autowrap (state);
4015 break; 3668 break;
4016 /* case 8: - auto repeat, can't do on a per window basis */ 3669 /* case 8: - auto repeat, can't do on a per window basis */
4017 case 9: /* X10 mouse reporting */ 3670 case 9: /* X10 mouse reporting */
4018 if (state) /* orthogonal */ 3671 if (state) /* orthogonal */
4019 priv_modes &= ~PrivMode_MouseX11; 3672 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4020 break; 3673 break;
4021#ifdef menuBar_esc
4022 case menuBar_esc:
4023#ifdef MENUBAR
4024 map_menuBar (state);
4025#endif
4026 break;
4027#endif
4028#ifdef scrollBar_esc 3674#ifdef scrollBar_esc
4029 case scrollBar_esc: 3675 case scrollBar_esc:
4030 if (scrollbar_mapping (state)) 3676 if (scrollbar_mapping (state))
4031 { 3677 {
4032 resize_all_windows (0, 0, 0); 3678 resize_all_windows (0, 0, 0);
… …
4044 break; 3690 break;
4045 /* case 66: - application key pad */ 3691 /* case 66: - application key pad */
4046 /* case 67: - backspace key */ 3692 /* case 67: - backspace key */
4047 case 1000: /* X11 mouse reporting */ 3693 case 1000: /* X11 mouse reporting */
4048 if (state) /* orthogonal */ 3694 if (state) /* orthogonal */
4049 priv_modes &= ~PrivMode_MouseX10; 3695 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4050 break; 3696 break;
4051#if 0
4052 case 1001: 3697 case 1002:
4053 break; /* X11 mouse highlighting */ 3698 case 1003:
4054#endif 3699 if (state)
3700 {
3701 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3702 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3703 vt_emask_mouse = PointerMotionMask;
3704 }
3705 else
3706 vt_emask_mouse = NoEventMask;
3707 vt_select_input ();
3708 break;
4055 case 1010: /* scroll to bottom on TTY output inhibit */ 3709 case 1010: /* scroll to bottom on TTY output inhibit */
4056 if (state)
4057 options &= ~Opt_scrollTtyOutput;
4058 else
4059 options |= Opt_scrollTtyOutput; 3710 set_option (Opt_scrollTtyOutput, !state);
4060 break; 3711 break;
4061 case 1011: /* scroll to bottom on key press */ 3712 case 1011: /* scroll to bottom on key press */
4062 if (state)
4063 options |= Opt_scrollTtyKeypress; 3713 set_option (Opt_scrollTtyKeypress, state);
4064 else
4065 options &= ~Opt_scrollTtyKeypress;
4066 break; 3714 break;
4067 case 1047: /* secondary screen w/ clearing last */ 3715 case 1047: /* secondary screen w/ clearing last */
4068 if (options & Opt_secondaryScreen) 3716 if (option (Opt_secondaryScreen))
4069 if (current_screen != PRIMARY) 3717 if (current_screen != PRIMARY)
4070 scr_erase_screen (2); 3718 scr_erase_screen (2);
4071 scr_change_screen (state); 3719 scr_change_screen (state);
4072 break; 3720 break;
4073 case 1049: /* secondary screen w/ clearing first */ 3721 case 1049: /* secondary screen w/ clearing first */
4074 scr_change_screen (state); 3722 scr_change_screen (state);
4075 if (options & Opt_secondaryScreen) 3723 if (option (Opt_secondaryScreen))
4076 if (current_screen != PRIMARY) 3724 if (current_screen != PRIMARY)
4077 scr_erase_screen (2); 3725 scr_erase_screen (2);
4078 break; 3726 break;
4079 default: 3727 default:
4080 break; 3728 break;
… …
4208 scr_color (Color_bg, Color_bg); 3856 scr_color (Color_bg, Color_bg);
4209 break; 3857 break;
4210 3858
4211 //case 50: // not variable spacing 3859 //case 50: // not variable spacing
4212 3860
4213#ifndef NO_BRIGHTCOLOR 3861#if !ENABLE_MINIMAL
4214 case 90: 3862 case 90:
4215 case 91: /* set bright fg color */ 3863 case 91: /* set bright fg color */
4216 case 92: 3864 case 92:
4217 case 93: 3865 case 93:
4218 case 94: 3866 case 94:
… …
4230 case 106: 3878 case 106:
4231 case 107: 3879 case 107:
4232 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3880 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4233 break; 3881 break;
4234#endif 3882#endif
4235
4236 } 3883 }
4237 } 3884 }
4238} 3885}
4239/*}}} */ 3886/*}}} */
4240 3887
… …
4243rxvt_term::process_graphics () 3890rxvt_term::process_graphics ()
4244{ 3891{
4245 unicode_t ch, cmd = cmd_getc (); 3892 unicode_t ch, cmd = cmd_getc ();
4246 3893
4247 if (cmd == 'Q') 3894 if (cmd == 'Q')
3895 {
4248 { /* query graphics */ 3896 /* query graphics */
4249 tt_printf ("\033G0\012"); /* no graphics */ 3897 tt_printf ("\033G0\012"); /* no graphics */
4250 return; 3898 return;
4251 } 3899 }
4252 /* swallow other graphics sequences until terminating ':' */ 3900 /* swallow other graphics sequences until terminating ':' */
4253 do 3901 do
… …
4264 */ 3912 */
4265void 3913void
4266rxvt_term::tt_printf (const char *fmt,...) 3914rxvt_term::tt_printf (const char *fmt,...)
4267{ 3915{
4268 va_list arg_ptr; 3916 va_list arg_ptr;
4269 unsigned char buf[256]; 3917 char buf[256];
4270 3918
4271 va_start (arg_ptr, fmt); 3919 va_start (arg_ptr, fmt);
4272 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3920 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4273 va_end (arg_ptr); 3921 va_end (arg_ptr);
4274 tt_write (buf, strlen (buf)); 3922 tt_write (buf, strlen (buf));
… …
4279 * or generated by us in response to a query ESC sequence. 3927 * or generated by us in response to a query ESC sequence.
4280 */ 3928 */
4281const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3929const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4282 3930
4283void 3931void
4284rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3932rxvt_term::tt_write (const char *data, unsigned int len)
4285{ 3933{
3934 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3935 return;
3936
3937 if (pty->pty < 0)
3938 return;
3939
4286 if (v_buflen == 0) 3940 if (v_buflen == 0)
4287 { 3941 {
4288 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3942 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4289 3943
4290 if ((unsigned int)written == len) 3944 if ((unsigned int)written == len)
4291 return; 3945 return;
4292 3946
4293 data += written; 3947 data += written;
4294 len -= written; 3948 len -= written;
4295 } 3949 }
4296 3950
4297 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 3951 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4298 3952
4299 memcpy (v_buffer + v_buflen, data, len); 3953 memcpy (v_buffer + v_buflen, data, len);
4300 v_buflen += len; 3954 v_buflen += len;
4301 3955
4302 pty_ev.set (EVENT_READ | EVENT_WRITE); 3956 pty_ev.set (ev::READ | ev::WRITE);
4303} 3957}
4304 3958
4305void rxvt_term::pty_write () 3959void rxvt_term::pty_write ()
4306{ 3960{
4307 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3961 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4308 3962
4309 if (written > 0) 3963 if (written > 0)
4310 { 3964 {
4311 v_buflen -= written; 3965 v_buflen -= written;
4312 3966
4313 if (v_buflen == 0) 3967 if (v_buflen == 0)
4314 { 3968 {
4315 free (v_buffer); 3969 free (v_buffer);
4316 v_buffer = 0; 3970 v_buffer = 0;
4317 v_buflen = 0;
4318 3971
4319 pty_ev.set (EVENT_READ); 3972 pty_ev.set (ev::READ);
4320 return; 3973 return;
4321 } 3974 }
4322 3975
4323 memmove (v_buffer, v_buffer + written, v_buflen); 3976 memmove (v_buffer, v_buffer + written, v_buflen);
4324 } 3977 }
4325 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3978 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4326 // original code just ignores this... 3979 pty_ev.set (ev::READ);
4327 destroy ();
4328} 3980}
4329 3981
4330/*----------------------- end-of-file (C source) -----------------------*/ 3982/*----------------------- end-of-file (C source) -----------------------*/
4331 3983

Diff Legend

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