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

Diff Legend

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