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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.193 by root, Sun Feb 13 08:56:27 2005 UTC vs.
Revision 1.376 by root, Fri Dec 14 02:08:18 2007 UTC

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

Diff Legend

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