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.421 by root, Wed Oct 15 17:16:47 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 44 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 45 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 46 *----------------------------------------------------------------------*/
46 47
47/*{{{ includes: */ 48/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 49#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 50#include "rxvt.h"
51#include "rxvtperl.h"
50#include "version.h" 52#include "version.h"
51#include "command.h" 53#include "command.h"
52 54
53#include <wchar.h> 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h"
57#endif
58
59#include <csignal>
60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
54 64
55/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
56 66
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#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 68
62#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
63 70
64#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
65#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
89 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
90 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
91 98
92 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
93 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
94 XK_ISO_Lock, 0x21eb,
95 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
96 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
97 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
98 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
99 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
113 XK_Escape, 0x238b, 119 XK_Escape, 0x238b,
114 XK_Undo, 0x238c, 120 XK_Undo, 0x238c,
115 XK_Print, 0x2399, 121 XK_Print, 0x2399,
116 122
117 XK_space, 0x2423, 123 XK_space, 0x2423,
124
125#ifdef XK_KP_Begin
126 XK_KP_Prior, 0x21de,
127 XK_KP_Next, 0x21df,
128 XK_KP_Begin, 0x2320,
129 XK_KP_Insert, 0x2380,
130 XK_KP_Delete, 0x2326,
118 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif
119 0, 133 0,
120}; 134};
121 135
122void 136void
123rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
124{ 138{
125 x = Pixel2Col (x); 139 x = Pixel2Col (x);
126 y = Pixel2Row (y); 140 y = Pixel2Row (y);
127 141
128 if (x < 0 || x >= TermWin.ncol 142 if (!IN_RANGE_EXC (x, 0, ncol)
129 || y < 0 || y >= TermWin.nrow) 143 || !IN_RANGE_EXC (y, 0, nrow))
130 return; 144 return;
131 145
132 for (;;) 146 for (;;)
133 { 147 {
134 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 148 const line_t &l = ROW(y + view_start);
149
150 text_t t = l.t[x];
135 151
136 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
137 { 153 {
138 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x]); 154 iso14755_51 (l.t[x], l.r[x], x, y);
139 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
140 break; 156 break;
141 } 157 }
142 158
143 x--; 159 x--;
144 } 160 }
145
146} 161}
147#endif
148 162
149#if ENABLE_OVERLAY
150void 163void
151rxvt_term::iso14755_51 (wchar_t ch) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
152{ 165{
166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
153 wchar_t *chr, *alloc; 168 wchar_t *chr, *alloc, ch2, *fname;
154 int len; 169 int len;
155 170
171 fname = rxvt_utf8towcs (f->name);
172
156#if ENABLE_COMBINING 173# if ENABLE_COMBINING
157 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
158 { 175 {
159 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
160 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
161 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
162 } 179 }
163 else 180 else
164#endif 181# endif
165 { 182 {
183 ch2 = ch;
184
166 alloc = 0; 185 alloc = 0;
167 chr = &ch; 186 chr = &ch2;
168 len = 1; 187 len = 1;
169 } 188 }
170 189
190 char attr[80]; // plenty
191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
202 int width = wcswidth (fname, wcslen (fname));
203
204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
171 scr_overlay_new (0, -1, 8 + 5, len); 213 scr_overlay_new (x, y, width, len + 2);
214
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
172 216
173 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
174 { 218 {
175 char buf[9]; 219 char buf[9];
176 220
177 ch = *chr++; 221 ch = *chr++;
178 222
179 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
180 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
181 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
182#if !UNICODE3 226# if !UNICODE_3
183 if (ch >= 0x10000) 227 if (ch >= 0x10000)
184 ch = 0xfffd; 228 ch = 0xfffd;
185#endif 229# endif
186 scr_overlay_set (11, y, ch); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
187 scr_overlay_set (12, y, NOCHAR); 233 scr_overlay_set (12, y, NOCHAR, r);
188 } 234 }
189 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
241 scr_overlay_set (0, len , attr);
242 scr_overlay_set (0, len + 1, fname);
243
244 free (fname);
245
190#if ENABLE_COMBINING 246# if ENABLE_COMBINING
191 if (alloc) 247 if (alloc)
192 delete [] alloc; 248 delete [] alloc;
193#endif 249# endif
194} 250}
195#endif 251#endif
196 252
197void 253void
198rxvt_term::commit_iso14755 () 254rxvt_term::commit_iso14755 ()
… …
215 mb[0] = ch[0]; 271 mb[0] = ch[0];
216 len = 1; 272 len = 1;
217 } 273 }
218 274
219 if (len > 0) 275 if (len > 0)
220 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
221 else 277 else
222 scr_bell (); 278 scr_bell ();
223 } 279 }
224 280
225 iso14755buf = 0; 281 iso14755buf = 0;
226} 282}
227 283
228int 284static int
229rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
230{ 286{
231 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
232 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
233 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
234 { 290 {
… …
242 298
243 return -1; 299 return -1;
244} 300}
245#endif 301#endif
246 302
247/*{{{ Convert the keypress event into a string */ 303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
339static inline int
340map_function_key (KeySym keysym)
341{
342 int param = 0;
343
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
345 {
346 param = 11 + keysym - XK_F1;
347 if (keysym >= XK_F17)
348 param += 4;
349 else if (keysym >= XK_F15)
350 param += 3;
351 else if (keysym >= XK_F11)
352 param += 2;
353 else if (keysym >= XK_F6)
354 param += 1;
355 }
356 else
357 switch (keysym)
358 {
359 case XK_Find:
360 param = 1;
361 break;
362 case XK_Insert:
363 param = 2;
364 break;
365#ifdef DXK_Remove
366 case DXK_Remove:
367#endif
368 case XK_Execute:
369 param = 3;
370 break;
371 case XK_Select:
372 param = 4;
373 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior:
376 param = 5;
377 break;
378 case XK_Next:
379 param = 6;
380 break;
381 case XK_Home:
382 param = 7;
383 break;
384 case XK_End:
385 param = 8;
386 break;
387#endif
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
248void 398void
249rxvt_term::lookup_key (XKeyEvent &ev) 399rxvt_term::key_press (XKeyEvent &ev)
250{ 400{
251 int ctrl, meta, shft, len; 401 int ctrl, meta, shft, len;
252 unsigned int newlen;
253 KeySym keysym; 402 KeySym keysym;
254#ifdef DEBUG_CMD
255 static int debug_key = 1; /* accessible by a debugger only */
256#endif
257 int valid_keysym; 403 int valid_keysym;
258 unsigned char kbuf[KBUFSZ]; 404 char kbuf[KBUFSZ];
405
406#if ISO_14755
407 if (iso14755buf & ISO_14755_52)
408 return;
409#endif
259 410
260 /* 411 /*
261 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 412 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
262 * escape sequence to toggle the Keypad. 413 * escape sequence to toggle the Keypad.
263 * 414 *
264 * Always permit `shift' to override the current setting 415 * Always permit `shift' to override the current setting
265 */ 416 */
266 shft = (ev.state & ShiftMask); 417 shft = ev.state & ShiftMask;
267 ctrl = (ev.state & ControlMask); 418 ctrl = ev.state & ControlMask;
268 meta = (ev.state & ModMetaMask); 419 meta = ev.state & ModMetaMask;
269 420
270 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
271 { 422 {
272 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
273 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
274 } 425 }
275 426
276 kbuf[0] = 0; 427 kbuf[0] = 0;
277 428
278#ifdef USE_XIM 429#ifdef USE_XIM
… …
281 Status status_return; 432 Status status_return;
282 433
283#if 0 434#if 0
284#ifdef X_HAVE_UTF8_STRING 435#ifdef X_HAVE_UTF8_STRING
285 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 436 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
286 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 437 len = Xutf8LookupString (Input_Context, &ev, kbuf,
287 KBUFSZ, &keysym, &status_return); 438 KBUFSZ, &keysym, &status_return);
288 else 439 else
289#endif 440#endif
290#endif 441#endif
291 { 442 {
… …
293 444
294 // the XOpenIM manpage lies about hardcoding the locale 445 // the XOpenIM manpage lies about hardcoding the locale
295 // at the point of XOpenIM, so temporarily switch locales 446 // at the point of XOpenIM, so temporarily switch locales
296 if (rs[Rs_imLocale]) 447 if (rs[Rs_imLocale])
297 SET_LOCALE (rs[Rs_imLocale]); 448 SET_LOCALE (rs[Rs_imLocale]);
449
298 // assume wchar_t == unicode or better 450 // assume wchar_t == unicode or better
299 len = XwcLookupString (Input_Context, &ev, wkbuf, 451 len = XwcLookupString (Input_Context, &ev, wkbuf,
300 KBUFSZ, &keysym, &status_return); 452 KBUFSZ, &keysym, &status_return);
453
301 if (rs[Rs_imLocale]) 454 if (rs[Rs_imLocale])
302 SET_LOCALE (locale); 455 SET_LOCALE (locale);
303 456
304 if (status_return == XLookupChars 457 if (status_return == XLookupChars
305 || status_return == XLookupBoth) 458 || status_return == XLookupBoth)
… …
326 || status_return == XLookupBoth; 479 || status_return == XLookupBoth;
327 } 480 }
328 else 481 else
329#endif 482#endif
330 { 483 {
331 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
332 valid_keysym = keysym != NoSymbol; 485 valid_keysym = keysym != NoSymbol;
333 } 486 }
334 487
335 if (valid_keysym) 488 if (valid_keysym)
336 { 489 {
490#ifdef KEYSYM_RESOURCE
491 if (keyboard->dispatch (this, keysym, ev.state))
492 return;
493#endif
494
337 if (TermWin.saveLines) 495 if (saveLines)
338 { 496 {
339#ifdef UNSHIFTED_SCROLLKEYS 497#ifdef UNSHIFTED_SCROLLKEYS
340 if (!ctrl && !meta) 498 if (!ctrl && !meta)
341#else 499#else
342 if (IS_SCROLL_MOD) 500 if (IS_SCROLL_MOD)
343#endif 501#endif
344 { 502 {
345 int lnsppg; 503 int lnsppg;
346 504
347#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
348 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
349#else 507#else
350 lnsppg = TermWin.nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
351#endif 509#endif
352 if (keysym == XK_Prior) 510 if (keysym == XK_Prior)
353 { 511 {
354 scr_page (UP, lnsppg); 512 scr_page (UP, lnsppg);
355 return; 513 return;
… …
383 scr_move_to (0, 1); 541 scr_move_to (0, 1);
384 return; 542 return;
385 } 543 }
386 else if (keysym == XK_End) 544 else if (keysym == XK_End)
387 { 545 {
388 scr_move_to (1, 0); 546 scr_move_to (1, 1);
389 return; 547 return;
390 } 548 }
391 } 549 }
392#endif 550#endif
393 } 551 }
… …
404 { 562 {
405 switch (keysym) 563 switch (keysym)
406 { 564 {
407 /* normal XTerm key bindings */ 565 /* normal XTerm key bindings */
408 case XK_Insert: /* Shift+Insert = paste mouse selection */ 566 case XK_Insert: /* Shift+Insert = paste mouse selection */
409 selection_request (ev.time, 0, 0); 567 selection_request (ev.time);
410 return; 568 return;
411#if TODO // TODO 569#if TODO
412 /* rxvt extras */ 570 /* rxvt extras */
413 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 571 case XK_KP_Add: /* Shift+KP_Add = bigger font */
414 change_font (FONT_UP); 572 change_font (FONT_UP);
415 return; 573 return;
416 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 574 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
433 { 591 {
434 commit_iso14755 (); 592 commit_iso14755 ();
435 iso14755buf = ISO_14755_51; 593 iso14755buf = ISO_14755_51;
436# if ISO_14755 594# if ISO_14755
437 iso14755_51 (0); 595 iso14755_51 (0);
596# endif
597 return;
598 }
599 else if (keysym == XK_BackSpace)
600 {
601 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
602# if ISO_14755
603 iso14755_51 (iso14755buf & ISO_14755_MASK);
438# endif 604# endif
439 return; 605 return;
440 } 606 }
441 else if ((hv = hex_keyval (ev)) >= 0) 607 else if ((hv = hex_keyval (ev)) >= 0)
442 { 608 {
… …
447# endif 613# endif
448 return; 614 return;
449 } 615 }
450 else 616 else
451 { 617 {
452# if ENABLE_OVERLAY 618# if ISO_14755
453 scr_overlay_off (); 619 scr_overlay_off ();
454# endif 620# endif
455 iso14755buf = 0; 621 iso14755buf = 0;
456 } 622 }
457 } 623 }
458 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
459 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
460 if (!(iso14755buf & ISO_14755_STARTED)) 626 if (!(iso14755buf & ISO_14755_STARTED))
461 { 627 {
462 iso14755buf |= ISO_14755_STARTED; 628 iso14755buf |= ISO_14755_STARTED;
463# if ENABLE_OVERLAY 629# if ISO_14755
464 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
465 scr_overlay_set (0, 0, "ISO 14755 mode"); 631 scr_overlay_set (0, 0, "ISO 14755 mode");
466# endif 632# endif
467 } 633 }
468#endif 634#endif
469 635
470#ifdef PRINTPIPE 636#ifdef PRINTPIPE
471 if (keysym == XK_Print) 637 if (keysym == XK_Print)
472 { 638 {
473 scr_printscreen (ctrl | shft); 639 scr_printscreen (ctrl | shft);
474 return; 640 return;
475 } 641 }
476#endif 642#endif
477 643
478 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
479 { 645 {
480#ifdef KEYSYM_RESOURCE 646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
481 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 647 unsigned int newlen = 1;
648
649 switch (translate_keypad (keysym, kp))
482 { 650 {
483 unsigned int l; 651#ifndef NO_BACKSPACE_KEY
484 const unsigned char *kbuf0; 652 case XK_BackSpace:
485 653 if (priv_modes & PrivMode_HaveBackSpace)
486 kbuf0 = (Keysym_map[keysym & 0xFF]); 654 {
487 l = (unsigned int)*kbuf0++; 655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
488 656 ^ !!ctrl) ? '\b' : '\177';
489 /* escape prefix */ 657 kbuf[1] = '\0';
490 if (meta 658 }
491# ifdef META8_OPTION 659 else
492 && meta_char == C0_ESC 660 strcpy (kbuf, rs[Rs_backspace_key]);
661 break;
493# endif 662#endif
663#ifndef NO_DELETE_KEY
664 case XK_Delete:
665 strcpy (kbuf, rs[Rs_delete_key]);
666 break;
667#endif
668 case XK_Tab:
669 if (shft)
670 strcpy (kbuf, "\033[Z");
671 else
494 ) 672 {
673#ifdef CTRL_TAB_MAKES_META
674 if (ctrl)
675 meta = 1;
676#endif
677#ifdef MOD4_TAB_MAKES_META
678 if (ev.state & Mod4Mask)
679 meta = 1;
680#endif
681 newlen = 0;
682 }
683 break;
684
685 case XK_Up: /* "\033[A" */
686 case XK_Down: /* "\033[B" */
687 case XK_Right: /* "\033[C" */
688 case XK_Left: /* "\033[D" */
689 strcpy (kbuf, "\033[Z");
690 kbuf[2] = "DACB"[keysym - XK_Left];
691 /* do Shift first */
692 if (shft)
693 kbuf[2] = "dacb"[keysym - XK_Left];
694 else if (ctrl)
695 {
696 kbuf[1] = 'O';
697 kbuf[2] = "dacb"[keysym - XK_Left];
698 }
699 else if (priv_modes & PrivMode_aplCUR)
700 kbuf[1] = 'O';
701 break;
702
703 case XK_KP_Enter:
704 /* allow shift to override */
705 if (kp)
706 {
707 strcpy (kbuf, "\033OM");
708 break;
709 }
710
711 /* FALLTHROUGH */
712
713 case XK_Return:
714 if (priv_modes & PrivMode_LFNL)
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\012';
718 kbuf[2] = '\0';
719 }
720 else
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\0';
724 }
725 break;
726
727 case XK_KP_F1: /* "\033OP" */
728 case XK_KP_F2: /* "\033OQ" */
729 case XK_KP_F3: /* "\033OR" */
730 case XK_KP_F4: /* "\033OS" */
731 strcpy (kbuf, "\033OP");
732 kbuf[2] += (keysym - XK_KP_F1);
733 break;
734
735 case XK_KP_Multiply: /* "\033Oj" : "*" */
736 case XK_KP_Add: /* "\033Ok" : "+" */
737 case XK_KP_Separator: /* "\033Ol" : "," */
738 case XK_KP_Subtract: /* "\033Om" : "-" */
739 case XK_KP_Decimal: /* "\033On" : "." */
740 case XK_KP_Divide: /* "\033Oo" : "/" */
741 case XK_KP_0: /* "\033Op" : "0" */
742 case XK_KP_1: /* "\033Oq" : "1" */
743 case XK_KP_2: /* "\033Or" : "2" */
744 case XK_KP_3: /* "\033Os" : "3" */
745 case XK_KP_4: /* "\033Ot" : "4" */
746 case XK_KP_5: /* "\033Ou" : "5" */
747 case XK_KP_6: /* "\033Ov" : "6" */
748 case XK_KP_7: /* "\033Ow" : "7" */
749 case XK_KP_8: /* "\033Ox" : "8" */
750 case XK_KP_9: /* "\033Oy" : "9" */
751 /* allow shift to override */
752 if (kp)
753 {
754 strcpy (kbuf, "\033Oj");
755 kbuf[2] += (keysym - XK_KP_Multiply);
756 }
757 else
758 {
759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
760 kbuf[1] = '\0';
761 }
762 break;
763
764 default:
495 { 765 {
496 const unsigned char ch = C0_ESC; 766 int param = map_function_key (keysym);
497 tt_write (&ch, 1); 767 if (param > 0)
768 sprintf (kbuf,"\033[%d~", param);
769 else
770 newlen = 0;
498 } 771 }
499
500 tt_write (kbuf0, l);
501 return; 772 break;
502 } 773 }
503 else
504#endif
505 {
506 newlen = 1;
507 switch (keysym)
508 {
509#ifndef NO_BACKSPACE_KEY
510 case XK_BackSpace:
511 if (priv_modes & PrivMode_HaveBackSpace)
512 {
513 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
514 ^ !!ctrl) ? '\b' : '\177';
515 kbuf[1] = '\0';
516 }
517 else
518 strcpy (kbuf, key_backspace);
519 break;
520#endif
521#ifndef NO_DELETE_KEY
522 case XK_Delete:
523 strcpy (kbuf, key_delete);
524 break;
525#endif
526 case XK_Tab:
527 if (shft)
528 strcpy (kbuf, "\033[Z");
529 else
530 {
531#ifdef CTRL_TAB_MAKES_META
532 if (ctrl)
533 meta = 1;
534#endif
535#ifdef MOD4_TAB_MAKES_META
536 if (ev.state & Mod4Mask)
537 meta = 1;
538#endif
539 newlen = 0;
540 }
541 break;
542 774
543#ifdef XK_KP_Left
544 case XK_KP_Up: /* \033Ox or standard */
545 case XK_KP_Down: /* \033Or or standard */
546 case XK_KP_Right: /* \033Ov or standard */
547 case XK_KP_Left: /* \033Ot or standard */
548 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
549 {
550 strcpy (kbuf, "\033OZ");
551 kbuf[2] = "txvr"[keysym - XK_KP_Left];
552 break;
553 }
554 else
555 /* translate to std. cursor key */
556 keysym = XK_Left + (keysym - XK_KP_Left);
557 /* FALLTHROUGH */
558#endif
559 case XK_Up: /* "\033[A" */
560 case XK_Down: /* "\033[B" */
561 case XK_Right: /* "\033[C" */
562 case XK_Left: /* "\033[D" */
563 strcpy (kbuf, "\033[Z");
564 kbuf[2] = "DACB"[keysym - XK_Left];
565 /* do Shift first */
566 if (shft)
567 kbuf[2] = "dacb"[keysym - XK_Left];
568 else if (ctrl)
569 {
570 kbuf[1] = 'O';
571 kbuf[2] = "dacb"[keysym - XK_Left];
572 }
573 else if (priv_modes & PrivMode_aplCUR)
574 kbuf[1] = 'O';
575 break;
576
577#ifndef UNSHIFTED_SCROLLKEYS
578# ifdef XK_KP_Prior
579 case XK_KP_Prior:
580 /* allow shift to override */
581 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
582 {
583 strcpy (kbuf, "\033Oy");
584 break;
585 }
586 /* FALLTHROUGH */
587# endif
588 case XK_Prior:
589 strcpy (kbuf, "\033[5~");
590 break;
591# ifdef XK_KP_Next
592 case XK_KP_Next:
593 /* allow shift to override */
594 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
595 {
596 strcpy (kbuf, "\033Os");
597 break;
598 }
599 /* FALLTHROUGH */
600# endif
601 case XK_Next:
602 strcpy (kbuf, "\033[6~");
603 break;
604#endif
605 case XK_KP_Enter:
606 /* allow shift to override */
607 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
608 {
609 strcpy (kbuf, "\033OM");
610 break;
611 }
612
613 /* FALLTHROUGH */
614
615 case XK_Return:
616 if (priv_modes & PrivMode_LFNL)
617 {
618 kbuf[0] = '\015';
619 kbuf[1] = '\012';
620 kbuf[2] = '\0';
621 }
622 else
623 {
624 kbuf[0] = '\015';
625 kbuf[1] = '\0';
626 }
627 break;
628
629#ifdef XK_KP_Begin
630 case XK_KP_Begin:
631 strcpy (kbuf, "\033Ou");
632 break;
633
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
642 case XK_KP_F1: /* "\033OP" */
643 case XK_KP_F2: /* "\033OQ" */
644 case XK_KP_F3: /* "\033OR" */
645 case XK_KP_F4: /* "\033OS" */
646 strcpy (kbuf, "\033OP");
647 kbuf[2] += (keysym - XK_KP_F1);
648 break;
649
650 case XK_KP_Multiply: /* "\033Oj" : "*" */
651 case XK_KP_Add: /* "\033Ok" : "+" */
652 case XK_KP_Separator: /* "\033Ol" : "," */
653 case XK_KP_Subtract: /* "\033Om" : "-" */
654 case XK_KP_Decimal: /* "\033On" : "." */
655 case XK_KP_Divide: /* "\033Oo" : "/" */
656 case XK_KP_0: /* "\033Op" : "0" */
657 case XK_KP_1: /* "\033Oq" : "1" */
658 case XK_KP_2: /* "\033Or" : "2" */
659 case XK_KP_3: /* "\033Os" : "3" */
660 case XK_KP_4: /* "\033Ot" : "4" */
661 case XK_KP_5: /* "\033Ou" : "5" */
662 case XK_KP_6: /* "\033Ov" : "6" */
663 case XK_KP_7: /* "\033Ow" : "7" */
664 case XK_KP_8: /* "\033Ox" : "8" */
665 case XK_KP_9: /* "\033Oy" : "9" */
666 /* allow shift to override */
667 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
668 {
669 strcpy (kbuf, "\033Oj");
670 kbuf[2] += (keysym - XK_KP_Multiply);
671 }
672 else
673 {
674 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
675 kbuf[1] = '\0';
676 }
677 break;
678
679 case XK_Find:
680 strcpy (kbuf, "\033[1~");
681 break;
682 case XK_Insert:
683 strcpy (kbuf, "\033[2~");
684 break;
685#ifdef DXK_Remove /* support for DEC remove like key */
686 case DXK_Remove:
687 /* FALLTHROUGH */
688#endif
689 case XK_Execute:
690 strcpy (kbuf, "\033[3~");
691 break;
692 case XK_Select:
693 strcpy (kbuf, "\033[4~");
694 break;
695#ifdef XK_KP_End
696 case XK_KP_End:
697 /* allow shift to override */
698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
699 {
700 strcpy (kbuf, "\033Oq");
701 break;
702 }
703 /* FALLTHROUGH */
704#endif
705 case XK_End:
706 strcpy (kbuf, KS_END);
707 break;
708#ifdef XK_KP_Home
709 case XK_KP_Home:
710 /* allow shift to override */
711 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
712 {
713 strcpy (kbuf, "\033Ow");
714 break;
715 }
716 /* FALLTHROUGH */
717#endif
718 case XK_Home:
719 strcpy (kbuf, KS_HOME);
720 break;
721
722#define FKEY(n, fkey) \
723 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
724
725 case XK_F1: /* "\033[11~" */
726 case XK_F2: /* "\033[12~" */
727 case XK_F3: /* "\033[13~" */
728 case XK_F4: /* "\033[14~" */
729 case XK_F5: /* "\033[15~" */
730 FKEY (11, XK_F1);
731 break;
732 case XK_F6: /* "\033[17~" */
733 case XK_F7: /* "\033[18~" */
734 case XK_F8: /* "\033[19~" */
735 case XK_F9: /* "\033[20~" */
736 case XK_F10: /* "\033[21~" */
737 FKEY (17, XK_F6);
738 break;
739 case XK_F11: /* "\033[23~" */
740 case XK_F12: /* "\033[24~" */
741 case XK_F13: /* "\033[25~" */
742 case XK_F14: /* "\033[26~" */
743 FKEY (23, XK_F11);
744 break;
745 case XK_F15: /* "\033[28~" */
746 case XK_F16: /* "\033[29~" */
747 FKEY (28, XK_F15);
748 break;
749 case XK_Help: /* "\033[28~" */
750 FKEY (28, XK_Help);
751 break;
752 case XK_Menu: /* "\033[29~" */
753 FKEY (29, XK_Menu);
754 break;
755 case XK_F17: /* "\033[31~" */
756 case XK_F18: /* "\033[32~" */
757 case XK_F19: /* "\033[33~" */
758 case XK_F20: /* "\033[34~" */
759 case XK_F21: /* "\033[35~" */
760 case XK_F22: /* "\033[36~" */
761 case XK_F23: /* "\033[37~" */
762 case XK_F24: /* "\033[38~" */
763 case XK_F25: /* "\033[39~" */
764 case XK_F26: /* "\033[40~" */
765 case XK_F27: /* "\033[41~" */
766 case XK_F28: /* "\033[42~" */
767 case XK_F29: /* "\033[43~" */
768 case XK_F30: /* "\033[44~" */
769 case XK_F31: /* "\033[45~" */
770 case XK_F32: /* "\033[46~" */
771 case XK_F33: /* "\033[47~" */
772 case XK_F34: /* "\033[48~" */
773 case XK_F35: /* "\033[49~" */
774 FKEY (31, XK_F17);
775 break;
776#undef FKEY
777 default:
778 newlen = 0;
779 break;
780 }
781 if (newlen) 775 if (newlen)
782 len = strlen (kbuf); 776 len = strlen (kbuf);
783 }
784 777
785 /* 778 /*
786 * Pass meta for all function keys, if 'meta' option set 779 * Pass meta for all function keys, if 'meta' option set
787 */ 780 */
788#ifdef META8_OPTION 781#ifdef META8_OPTION
… …
794 else if (ctrl && keysym == XK_minus) 787 else if (ctrl && keysym == XK_minus)
795 { 788 {
796 len = 1; 789 len = 1;
797 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 790 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
798 } 791 }
792 else if (keysym == XK_ISO_Left_Tab)
793 {
794 strcpy (kbuf, "\033[Z");
795 len = 3;
796 }
799 else 797 else
800 { 798 {
801#ifdef META8_OPTION 799#ifdef META8_OPTION
802 /* set 8-bit on */ 800 /* set 8-bit on */
803 if (meta && (meta_char == 0x80)) 801 if (meta && (meta_char == 0x80))
804 { 802 {
805 unsigned char *ch; 803 char *ch;
806 804
807 for (ch = kbuf; ch < kbuf + len; ch++) 805 for (ch = kbuf; ch < kbuf + len; ch++)
808 *ch |= 0x80; 806 *ch |= 0x80;
809 807
810 meta = 0; 808 meta = 0;
… …
812#endif 810#endif
813 /* nil */ ; 811 /* nil */ ;
814 } 812 }
815 } 813 }
816 814
815 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
816 return;
817
817 if (len <= 0) 818 if (len <= 0)
818 return; /* not mapped */ 819 return; /* not mapped */
819 820
820 if (options & Opt_scrollTtyKeypress) 821 if (option (Opt_scrollTtyKeypress))
821 if (TermWin.view_start) 822 if (view_start)
822 { 823 {
823 TermWin.view_start = 0; 824 view_start = 0;
824 want_refresh = 1; 825 want_refresh = 1;
825 } 826 }
826 827
827 /* 828 /*
828 * these modifications only affect the static keybuffer 829 * these modifications only affect the static keybuffer
… …
843#ifdef META8_OPTION 844#ifdef META8_OPTION
844 && meta_char == C0_ESC 845 && meta_char == C0_ESC
845#endif 846#endif
846 ) 847 )
847 { 848 {
848 const unsigned char ch = C0_ESC; 849 const char ch = C0_ESC;
849 tt_write (&ch, 1); 850 tt_write (&ch, 1);
850 } 851 }
851 852
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); 853 tt_write (kbuf, (unsigned int)len);
863} 854}
864/*}}} */
865 855
866#if (MENUBAR_MAX) 856void
867/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 857rxvt_term::key_release (XKeyEvent &ev)
868/* attempt to `write' count to the input buffer */ 858{
859#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
860 KeySym keysym;
861
862 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
863#endif
864
865#if ENABLE_FRILLS || ISO_14755
866 // ISO 14755 support
867 if (iso14755buf)
868 if (iso14755buf & ISO_14755_52)
869 {
870# if ISO_14755
871 scr_overlay_off ();
872# endif
873# if ISO_14755
874 // iso14755 part 5.2 handling: release time
875 // first: controls
876 if ((ev.state & ControlMask)
877 && ((keysym >= 0x40 && keysym <= 0x5f)
878 || (keysym >= 0x61 && keysym <= 0x7f)))
879 {
880 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
881 commit_iso14755 ();
882
883 return;
884 }
885
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
887 if (i[0] == keysym)
888 {
889 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 ();
891
892 return;
893 }
894
895 scr_bell ();
896# endif
897 iso14755buf = 0;
898
899 return;
900 }
901 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
902 {
903# if ISO_14755
904 scr_overlay_off ();
905# endif
906 if (iso14755buf & ISO_14755_51)
907 commit_iso14755 ();
908#if ISO_14755
909 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
910 {
911 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
912
913 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
914 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
915 }
916# endif
917 else
918 iso14755buf = 0;
919 }
920#endif
921
922 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
923 return;
924
925#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
926 if (!(ev.state & ControlMask))
927 slip_wheel_ev.stop ();
928 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0;
930#endif
931}
932
933#if defined (KEYSYM_RESOURCE)
869unsigned int 934unsigned int
870rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 935rxvt_term::cmd_write (const char *str, unsigned int count)
871{ 936{
872 unsigned int n, s; 937 unsigned int n, s;
873 938
874 n = cmdbuf_ptr - cmdbuf_base; 939 n = cmdbuf_ptr - cmdbuf_base;
875 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 940 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
894 959
895 cmd_parse (); 960 cmd_parse ();
896 961
897 return 0; 962 return 0;
898} 963}
899#endif /* MENUBAR_MAX */ 964#endif
900 965
901void 966void
902rxvt_term::flush () 967rxvt_term::flush ()
903{ 968{
904#ifdef TRANSPARENT 969 flush_ev.stop ();
905 if (want_full_refresh) 970
971#ifdef HAVE_BG_PIXMAP
972 if (bgPixmap.check_clearChanged ())
906 { 973 {
907 want_full_refresh = 0; 974// scr_clear (true); This needs to be researched further!
908 scr_clear ();
909 scr_touch (false); 975 scr_touch (false);
910 } 976 }
911#endif 977#endif
912 978
913 if (want_refresh) 979 if (want_refresh)
914 { 980 {
981 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
982 {
983 int row = view_start;
984 int end_row = row + nrow;
985
986 while (row > top_row && ROW (row - 1).is_longer ())
987 --row;
988
989 do
990 {
991 int start_row = row;
992 line_t *l;
993
994 do
995 {
996 l = &ROW (row++);
997
998 if (!(l->f & LINE_FILTERED))
999 {
1000 // line not filtered, mark it as filtered
1001 l->f |= LINE_FILTERED;
1002 while (l->is_longer ())
1003 {
1004 l = &ROW (row++);
1005 l->f |= LINE_FILTERED;
1006 }
1007
1008 // and filter it
1009 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1010
1011 break;
1012 }
1013 }
1014 while (l->is_longer () && row < end_row);
1015 }
1016 while (row < end_row);
1017 }
1018
915 scr_refresh (refresh_type); 1019 scr_refresh ();
916 scrollbar_show (1); 1020 scrollBar.show (1);
917#ifdef USE_XIM 1021#ifdef USE_XIM
918 IMSendSpot (); 1022 IMSendSpot ();
919#endif 1023#endif
920 } 1024 }
921 1025
922 display->flush (); 1026 display->flush ();
923
924 flush_ev.stop ();
925} 1027}
926 1028
1029/* checks wether a refresh is requested and starts the refresh timer */
927void 1030void
928rxvt_term::check_cb (check_watcher &w) 1031rxvt_term::refresh_check ()
929{ 1032{
930 SET_R (this); 1033 if (want_refresh && !flush_ev.is_active ())
931 SET_LOCALE (locale); 1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
932 1035
933 display->flush (); 1036 display->flush ();
934
935 if (want_refresh && !flush_ev.active)
936 flush_ev.start (NOW + 0.01);
937} 1037}
938 1038
939void 1039void
940rxvt_term::flush_cb (time_watcher &w) 1040rxvt_term::flush_cb (ev::timer &w, int revents)
941{ 1041{
942 SET_R (this); 1042 make_current ();
943 SET_LOCALE (locale);
944 1043
945 refresh_limit = 1;
946 refresh_count = 0; 1044 refresh_count = 0;
947 flush (); 1045 flush ();
948} 1046}
949 1047
950#ifdef CURSOR_BLINK 1048#ifdef CURSOR_BLINK
951void 1049void
952rxvt_term::cursor_blink_cb (time_watcher &w) 1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
953{ 1051{
954 hidden_cursor = !hidden_cursor; 1052 hidden_cursor = !hidden_cursor;
955 want_refresh = 1; 1053 want_refresh = 1;
956 1054 refresh_check ();
957 w.start (w.at + BLINK_INTERVAL);
958} 1055}
959#endif 1056#endif
960 1057
961#ifdef TEXT_BLINK 1058#ifdef TEXT_BLINK
962void 1059void
963rxvt_term::text_blink_cb (time_watcher &w) 1060rxvt_term::text_blink_cb (ev::timer &w, int revents)
964{ 1061{
965 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1062 if (scr_refresh_rend (RS_Blink, RS_Blink))
966 { 1063 {
967 hidden_text = !hidden_text; 1064 hidden_text = !hidden_text;
968 want_refresh = 1; 1065 want_refresh = 1;
969 w.start (w.at + TEXT_BLINK_INTERVAL); 1066 refresh_check ();
970 } 1067 }
1068 else
1069 w.stop ();
971} 1070}
972#endif 1071#endif
973 1072
974#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
975void 1074void
976rxvt_term::cont_scroll_cb (time_watcher &w) 1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
977{ 1076{
978 if ((scrollbar_isUp() || scrollbar_isDn()) && 1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
979 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
980 { 1079 {
981 refresh_type |= SMOOTH_REFRESH;
982 want_refresh = 1; 1080 want_refresh = 1;
983 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1081 refresh_check ();
984 } 1082 }
1083 else
1084 w.stop ();
985} 1085}
986#endif 1086#endif
987 1087
988#ifdef SELECTION_SCROLLING 1088#ifdef SELECTION_SCROLLING
989void 1089void
990rxvt_term::sel_scroll_cb (time_watcher &w) 1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
991{ 1091{
992 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1092 if (scr_page (scroll_selection_dir, scroll_selection_lines))
993 { 1093 {
994 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1094 selection_extend (selection_save_x, selection_save_y, selection_save_state);
995 refresh_type |= SMOOTH_REFRESH;
996 want_refresh = 1; 1095 want_refresh = 1;
997 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
998 } 1097 }
1098 else
1099 w.stop ();
999} 1100}
1000#endif 1101#endif
1001 1102
1002#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1003void 1104void
1004rxvt_term::slip_wheel_cb (time_watcher &w) 1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1005{ 1106{
1006 if (mouse_slip_wheel_speed == 0 1107 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1007 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1008 : scr_page (UP, mouse_slip_wheel_speed))
1009 { 1108 {
1010 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1; 1109 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1110 refresh_check ();
1111 }
1112
1113 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1013 } 1114 {
1115 mouse_slip_wheel_speed = 0;
1116 w.stop ();
1117 }
1014} 1118}
1119#endif
1120
1121#if LINUX_YIELD_HACK
1122static struct event_handler
1123{
1124 ev::prepare yield_ev;
1125
1126 void yield_cb (ev::prepare &w, int revents)
1127 {
1128 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best.
1135
1136 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0);
1138
1139 w.stop ();
1140 }
1141
1142 event_handler ()
1143 : yield_ev (this, &event_handler::yield_cb)
1144 {
1145 }
1146} event_handler;
1015#endif 1147#endif
1016 1148
1017bool 1149bool
1018rxvt_term::pty_fill () 1150rxvt_term::pty_fill ()
1019{ 1151{
1020 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1152 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1021 1153
1022 if (CBUFSIZ == n) 1154 if (CBUFSIZ == n)
1023 { 1155 {
1024 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1156 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1025 n = 0; 1157 n = 0;
1026 } 1158 }
1027 1159
1028 memmove (cmdbuf_base, cmdbuf_ptr, n); 1160 memmove (cmdbuf_base, cmdbuf_ptr, n);
1029 cmdbuf_ptr = cmdbuf_base; 1161 cmdbuf_ptr = cmdbuf_base;
1030 cmdbuf_endp = cmdbuf_ptr + n; 1162 cmdbuf_endp = cmdbuf_ptr + n;
1031 1163
1032 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1164 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1033 1165
1034 if (n > 0) 1166 if (r > 0)
1035 { 1167 {
1036 cmdbuf_endp += n; 1168 cmdbuf_endp += r;
1037 return true; 1169 return true;
1038 } 1170 }
1039 else if (n < 0 && errno != EAGAIN) 1171 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1172 {
1173#if LINUX_YIELD_HACK
1174 if (display->is_local)
1175 event_handler.yield_ev.start ();
1176#endif
1177 }
1178 else
1179 {
1180 pty_ev.stop ();
1181
1182 if (!option (Opt_hold))
1040 destroy (); 1183 destroy ();
1041 1184 }
1185
1042 return false; 1186 return false;
1043} 1187}
1044 1188
1045void 1189void
1046rxvt_term::pty_cb (io_watcher &w, short revents) 1190rxvt_term::pty_cb (ev::io &w, int revents)
1047{ 1191{
1048 SET_R (this); 1192 make_current ();
1049 SET_LOCALE (locale);
1050 1193
1051 if (revents & EVENT_WRITE) 1194 if (revents & ev::READ)
1052 tt_write (0, 0);
1053 else if (revents & EVENT_READ)
1054 // loop, but don't allow a single term to monopolize us 1195 // loop, but don't allow a single term to monopolize us
1055 while (pty_fill ()) 1196 while (pty_fill ())
1056 if (cmd_parse ()) 1197 if (cmd_parse ())
1057 break; 1198 break;
1199
1200 if (revents & ev::WRITE)
1201 pty_write ();
1202
1203 refresh_check ();
1058} 1204}
1059 1205
1060void 1206void
1061rxvt_term::pointer_unblank () 1207rxvt_term::pointer_unblank ()
1062{ 1208{
1063 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1209 XDefineCursor (dpy, vt, TermWin_cursor);
1064 recolour_cursor (); 1210 recolour_cursor ();
1065 1211
1066#ifdef POINTER_BLANK 1212#ifdef POINTER_BLANK
1067 hidden_pointer = 0; 1213 hidden_pointer = 0;
1068 1214
1069 if (options & Opt_pointerBlank) 1215 if (option (Opt_pointerBlank))
1070 pointer_ev.start (NOW + pointerBlankDelay); 1216 pointer_ev.start (pointerBlankDelay);
1071#endif 1217#endif
1072} 1218}
1073 1219
1074#ifdef POINTER_BLANK 1220#ifdef POINTER_BLANK
1075void 1221void
1076rxvt_term::pointer_blank () 1222rxvt_term::pointer_blank ()
1077{ 1223{
1078 if (! (options & Opt_pointerBlank)) 1224 if (!option (Opt_pointerBlank))
1079 return; 1225 return;
1080 1226
1081 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1227 XDefineCursor (dpy, vt, display->blank_cursor);
1082 XFlush (display->display); 1228 XFlush (dpy);
1083 1229
1084 hidden_pointer = 1; 1230 hidden_pointer = 1;
1085} 1231}
1086 1232
1087void 1233void
1088rxvt_term::pointer_cb (time_watcher &w) 1234rxvt_term::pointer_cb (ev::timer &w, int revents)
1089{ 1235{
1090 SET_R (this); 1236 make_current ();
1091 SET_LOCALE (locale);
1092 1237
1093 pointer_blank (); 1238 pointer_blank ();
1094} 1239}
1095#endif 1240#endif
1096 1241
1097void 1242void
1098rxvt_term::mouse_report (XButtonEvent &ev) 1243rxvt_term::mouse_report (XButtonEvent &ev)
1099{ 1244{
1100 int button_number, key_state = 0; 1245 int button_number, key_state = 0;
1101 int x, y; 1246 int x, y;
1247 int code = 32;
1102 1248
1103 x = ev.x; 1249 x = Pixel2Col (ev.x);
1104 y = ev.y; 1250 y = Pixel2Row (ev.y);
1105 pixel_position (&x, &y); 1251 if (ev.type == MotionNotify)
1252 {
1253 if (x == mouse_row && y == mouse_col)
1254 return;
1255 mouse_row = x;
1256 mouse_col = y;
1257 code += 32;
1258 }
1106 1259
1107 if (MEvent.button == AnyButton) 1260 if (MEvent.button == AnyButton)
1108 button_number = 3; 1261 button_number = 3;
1109 else 1262 else
1110 { 1263 {
… …
1137 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1290 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1138 + ((MEvent.state & ControlMask) ? 16 : 0); 1291 + ((MEvent.state & ControlMask) ? 16 : 0);
1139#ifdef MOUSE_REPORT_DOUBLECLICK 1292#ifdef MOUSE_REPORT_DOUBLECLICK
1140 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1293 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1141#endif 1294#endif
1142
1143 } 1295 }
1144 1296
1145#ifdef DEBUG_MOUSEREPORT 1297#if DEBUG_MOUSEREPORT
1146 fprintf (stderr, "Mouse ["); 1298 fprintf (stderr, "Mouse [");
1147 if (key_state & 16) 1299 if (key_state & 16)
1148 fputc ('C', stderr); 1300 fputc ('C', stderr);
1149 if (key_state & 4) 1301 if (key_state & 4)
1150 fputc ('S', stderr); 1302 fputc ('S', stderr);
… …
1154 fputc ('2', stderr); 1306 fputc ('2', stderr);
1155 fprintf (stderr, "]: <%d>, %d/%d\n", 1307 fprintf (stderr, "]: <%d>, %d/%d\n",
1156 button_number, 1308 button_number,
1157 x + 1, 1309 x + 1,
1158 y + 1); 1310 y + 1);
1159#else 1311#endif
1312
1160 tt_printf ("\033[M%c%c%c", 1313 tt_printf ("\033[M%c%c%c",
1161 (32 + button_number + key_state), 1314 (code + button_number + key_state),
1162 (32 + x + 1), 1315 (32 + x + 1),
1163 (32 + y + 1)); 1316 (32 + y + 1));
1164#endif
1165} 1317}
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 1318
1177/*{{{ process an X event */ 1319/*{{{ process an X event */
1178void 1320void
1179rxvt_term::x_cb (XEvent &ev) 1321rxvt_term::x_cb (XEvent &ev)
1180{ 1322{
1181 SET_R (this); 1323 make_current ();
1182 SET_LOCALE (locale);
1183 1324
1184#if defined(CURSOR_BLINK) 1325 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 1326
1193 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1327 if (ev.xany.window == vt
1194 } 1328 && SHOULD_INVOKE (HOOK_X_EVENT)
1195#endif 1329 && 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; 1330 return;
1214#endif
1215 1331
1332 // for XQueryPointer
1216 Window unused_root, unused_child; 1333 Window unused_root, unused_child;
1217 int unused_root_x, unused_root_y; 1334 int unused_root_x, unused_root_y;
1218 unsigned int unused_mask; 1335 unsigned int unused_mask;
1219 1336
1220 switch (ev.type) 1337 switch (ev.type)
1221 { 1338 {
1222 case KeyPress: 1339 case KeyPress:
1223#if ISO_14755 1340 key_press (ev.xkey);
1224 if (!(iso14755buf & ISO_14755_52))
1225#endif
1226 lookup_key (ev.xkey);
1227
1228 break; 1341 break;
1229 1342
1230 case KeyRelease: 1343 case KeyRelease:
1231 { 1344 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; 1345 break;
1299 }
1300 1346
1301 case ButtonPress: 1347 case ButtonPress:
1302 button_press (ev.xbutton); 1348 button_press (ev.xbutton);
1303 break; 1349 break;
1304 1350
… …
1306 button_release (ev.xbutton); 1352 button_release (ev.xbutton);
1307 break; 1353 break;
1308 1354
1309 case ClientMessage: 1355 case ClientMessage:
1310 if (ev.xclient.format == 32 1356 if (ev.xclient.format == 32
1311 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1357 && !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 { 1358 {
1320 /* Get Dnd data */ 1359 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1321 Atom ActualType; 1360 {
1322 int ActualFormat; 1361 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1323 unsigned char *data; 1362 {
1324 unsigned long Size, RemainingBytes; 1363 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1325 1364 {
1326 XGetWindowProperty (display->display, display->root, 1365 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1327 xa[XA_DNDSELECTION], 1366 destroy ();
1328 0L, 1000000L, 1367 }
1329 False, AnyPropertyType, 1368#if ENABLE_EWMH
1330 &ActualType, &ActualFormat, 1369 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1331 &Size, &RemainingBytes, 1370 XSendEvent (dpy, ev.xclient.window = display->root,
1371 False, SubstructureRedirectMask | SubstructureNotifyMask,
1332 &data); 1372 &ev);
1333 XChangeProperty (display->display, display->root, 1373#endif
1334 XA_CUT_BUFFER0, XA_STRING, 1374 }
1335 8, PropModeReplace, 1375 }
1336 data, strlen (data)); 1376#if ENABLE_XEMBED
1337 XFree (data); 1377 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1338 selection_paste (display->root, XA_CUT_BUFFER0, True); 1378 {
1339 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1379 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1380 focus_in ();
1381 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1382 focus_out ();
1383 }
1384#endif
1340 } 1385 }
1341#endif /* OFFIX_DND */
1342 break;
1343
1344 case MappingNotify:
1345 XRefreshKeyboardMapping (&ev.xmapping);
1346 break; 1386 break;
1347 1387
1348 /* 1388 /*
1349 * XXX: this is not the _current_ arrangement 1389 * XXX: this is not the _current_ arrangement
1350 * Here's my conclusion: 1390 * Here's my conclusion:
… …
1369 break; 1409 break;
1370 } 1410 }
1371 break; 1411 break;
1372 1412
1373 case FocusIn: 1413 case FocusIn:
1374 if (!TermWin.focus) 1414 if (ev.xfocus.detail != NotifyInferior
1415 && ev.xfocus.detail != NotifyPointer
1416 && ev.xfocus.mode != NotifyGrab)
1417 focus_in ();
1418 break;
1419
1420 case FocusOut:
1421 if (ev.xfocus.detail != NotifyInferior
1422 && ev.xfocus.detail != NotifyPointer
1423 && ev.xfocus.mode != NotifyGrab)
1424 focus_out ();
1425 break;
1426
1427 case ConfigureNotify:
1428 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1429 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1430 szHint.width, szHint.height);*/
1431 if (ev.xconfigure.window == parent[0])
1375 { 1432 {
1376 TermWin.focus = 1; 1433 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1377 want_refresh = 1; 1434 ;
1378#ifdef USE_XIM 1435
1379 if (Input_Context != NULL) 1436 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1380 { 1437 {
1381 IMSetStatusPosition (); 1438 seen_resize = 1;
1382 XSetICFocus (Input_Context); 1439 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1383 } 1440 }
1384#endif 1441 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 { 1442 {
1392 pix_colors = pix_colors_focused; 1443#ifdef HAVE_BG_PIXMAP
1393 set_colorfgbg (); 1444 if (bgPixmap.window_position_sensitive ())
1394 scr_clear (); 1445 {
1395 scr_touch (true); 1446 if (mapped)
1447 update_background ();
1448 else
1449 bgPixmap.invalidate ();
1450 }
1451#endif
1396 } 1452 }
1397#endif
1398 1453
1454 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1399 } 1455 }
1400 break; 1456 break;
1401 1457
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: 1458 case PropertyNotify:
1459 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1460 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue) 1461 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom); 1462 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460 1463
1461 break; 1464 break;
1462 1465
1463 case SelectionClear: 1466 case SelectionClear:
1464 selection_clear (); 1467 selection_clear ();
1465 break; 1468 break;
1466 1469
1467 case SelectionNotify: 1470 case SelectionNotify:
1468 if (selection_wait == Sel_normal) 1471 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, 1472 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470 ev.xselection.property, True);
1471 break; 1473 break;
1472 1474
1473 case SelectionRequest: 1475 case SelectionRequest:
1474 selection_send (ev.xselectionrequest); 1476 selection_send (ev.xselectionrequest);
1475 break; 1477 break;
1476 1478
1479 case MapNotify:
1480#ifdef HAVE_BG_PIXMAP
1481 /* This is needed spcifically to fix the case of no window manager or a
1482 * non-reparenting window manager. In those cases we never get first
1483 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1484 * care of multiplicity of ConfigureNotify events arriwing while WM does
1485 * reparenting.
1486 * We should not render background immidiately, as there could be several
1487 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1488 * by scheduling background redraw as soon as we can, but giving a short
1489 * bit of time for ConfigureNotifies to arrive.
1490 * We should render background PRIOR to drawing any text, but AFTER all
1491 * of ConfigureNotifys for the best results.
1492 */
1493 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1494 update_background_ev.start (0.025);
1495#endif
1496 mapped = 1;
1497#ifdef TEXT_BLINK
1498 text_blink_ev.start ();
1499#endif
1500 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1501 break;
1502
1477 case UnmapNotify: 1503 case UnmapNotify:
1478 TermWin.mapped = 0; 1504 mapped = 0;
1479#ifdef TEXT_BLINK 1505#ifdef TEXT_BLINK
1480 text_blink_ev.stop (); 1506 text_blink_ev.stop ();
1481#endif 1507#endif
1508 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1482 break; 1509 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 1510
1497 case GraphicsExpose: 1511 case GraphicsExpose:
1498 case Expose: 1512 case Expose:
1499 if (ev.xany.window == TermWin.vt) 1513 if (ev.xany.window == vt)
1500 { 1514 {
1501 do 1515 do
1516 {
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1517 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1518 ev.xexpose.width, ev.xexpose.height, False);
1519 }
1504 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1520 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1505 1521
1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1522 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507 1523
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1525 {
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1526 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1527 ev.xexpose.width, ev.xexpose.height, False);
1528 }
1511 1529
1512 scr_refresh (refresh_type); 1530 want_refresh = 1;
1513 } 1531 }
1514 else 1532 else
1515 { 1533 {
1516 XEvent unused_event; 1534 XEvent unused_event;
1517 1535
1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1519 ; 1537 ;
1520 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1538 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1521 ; 1539 ;
1522 1540
1523 if (isScrollbarWindow (ev.xany.window)) 1541 if (scrollBar.state && ev.xany.window == scrollBar.win)
1524 { 1542 {
1525 scrollBar.setIdle (); 1543 scrollBar.state = STATE_IDLE;
1526 scrollbar_show (0); 1544 scrollBar.show (0);
1527 } 1545 }
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 } 1546 }
1538 break; 1547 break;
1539 1548
1540 case MotionNotify: 1549 case MotionNotify:
1541#ifdef POINTER_BLANK 1550#ifdef POINTER_BLANK
1542 if (hidden_pointer) 1551 if (hidden_pointer)
1543 pointer_unblank (); 1552 pointer_unblank ();
1544#endif 1553#endif
1545#if MENUBAR 1554 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1546 if (isMenuBarWindow (ev.xany.window)) 1555 || priv_modes & PrivMode_MouseAnyEvent)
1556 mouse_report (ev.xbutton);
1557 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1558 break;
1559
1560 if (ev.xany.window == vt)
1547 { 1561 {
1548 menubar_control (ev.xbutton); 1562 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1549 break; 1563 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1550 } 1564 ; // 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)) 1565 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1558 { 1566 {
1559 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1567 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1560 ; 1568 ;
1561 1569
1562 XQueryPointer (display->display, TermWin.vt, 1570 XQueryPointer (dpy, vt,
1563 &unused_root, &unused_child, 1571 &unused_root, &unused_child,
1564 &unused_root_x, &unused_root_y, 1572 &unused_root_x, &unused_root_y,
1565 & (ev.xbutton.x), & (ev.xbutton.y), 1573 &ev.xbutton.x, &ev.xbutton.y,
1566 &unused_mask); 1574 &ev.xbutton.state);
1567#ifdef MOUSE_THRESHOLD 1575#ifdef MOUSE_THRESHOLD
1568 /* deal with a `jumpy' mouse */ 1576 /* deal with a `jumpy' mouse */
1569 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1577 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1570 { 1578 {
1571#endif 1579#endif
… …
1576 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1584 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1577 break; 1585 break;
1578 } 1586 }
1579#endif 1587#endif
1580 selection_extend (ev.xbutton.x, ev.xbutton.y, 1588 selection_extend (ev.xbutton.x, ev.xbutton.y,
1581 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1589 ev.xbutton.state & Button3Mask ? 2 : 0);
1590
1582#ifdef SELECTION_SCROLLING 1591#ifdef SELECTION_SCROLLING
1583 if (ev.xbutton.y < TermWin.int_bwidth 1592 if (ev.xbutton.y < int_bwidth
1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1593 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1585 { 1594 {
1586 int dist; 1595 int dist;
1587 1596
1588 /* don't clobber the current delay if we are 1597 /* don't clobber the current delay if we are
1589 * already in the middle of scrolling. 1598 * already in the middle of scrolling.
1590 */ 1599 */
1591 if (!sel_scroll_ev.active) 1600 if (!sel_scroll_ev.is_active ())
1592 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1601 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1593 1602
1594 /* save the event params so we can highlight 1603 /* save the event params so we can highlight
1595 * the selection in the pending-scroll loop 1604 * the selection in the pending-scroll loop
1596 */ 1605 */
1597 selection_save_x = ev.xbutton.x; 1606 selection_save_x = ev.xbutton.x;
1598 selection_save_y = ev.xbutton.y; 1607 selection_save_y = ev.xbutton.y;
1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1608 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1600 1609
1601 /* calc number of lines to scroll */ 1610 /* calc number of lines to scroll */
1602 if (ev.xbutton.y<TermWin.int_bwidth) 1611 if (ev.xbutton.y < int_bwidth)
1603 { 1612 {
1604 scroll_selection_dir = UP; 1613 scroll_selection_dir = UP;
1605 dist = TermWin.int_bwidth - ev.xbutton.y; 1614 dist = int_bwidth - ev.xbutton.y;
1606 } 1615 }
1607 else 1616 else
1608 { 1617 {
1609 scroll_selection_dir = DN; 1618 scroll_selection_dir = DN;
1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1619 dist = ev.xbutton.y - (int_bwidth + height);
1611 } 1620 }
1612 1621
1613 scroll_selection_lines = Pixel2Height (dist) 1622 scroll_selection_lines = Pixel2Height (dist)
1614 / SELECTION_SCROLL_LINE_SPEEDUP 1623 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1; 1624 + 1;
1616 MIN_IT (scroll_selection_lines, 1625 min_it (scroll_selection_lines,
1617 SELECTION_SCROLL_MAX_LINES); 1626 SELECTION_SCROLL_MAX_LINES);
1618 } 1627 }
1619 else 1628 else
1620 { 1629 {
1621 /* we are within the text window, so we 1630 /* we are within the text window, so we
1622 * shouldn't be scrolling 1631 * shouldn't be scrolling
1623 */ 1632 */
1624 if (sel_scroll_ev.active)
1625 sel_scroll_ev.stop(); 1633 sel_scroll_ev.stop();
1626 } 1634 }
1627#endif 1635#endif
1628#ifdef MOUSE_THRESHOLD 1636#ifdef MOUSE_THRESHOLD
1629 } 1637 }
1630#endif 1638#endif
1631 } 1639 }
1632 } 1640 }
1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1641 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1634 { 1642 {
1635 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1643 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1636 MotionNotify, &ev)) ; 1644 MotionNotify, &ev))
1645 ;
1646
1637 XQueryPointer (display->display, scrollBar.win, 1647 XQueryPointer (dpy, scrollBar.win,
1638 &unused_root, &unused_child, 1648 &unused_root, &unused_child,
1639 &unused_root_x, &unused_root_y, 1649 &unused_root_x, &unused_root_y,
1640 & (ev.xbutton.x), & (ev.xbutton.y), 1650 &ev.xbutton.x, &ev.xbutton.y,
1641 &unused_mask); 1651 &unused_mask);
1642 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1652 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1643 scrollbar_size ()); 1653 scrollBar.size ());
1644 scr_refresh (refresh_type);
1645 refresh_limit = 0; 1654 want_refresh = 1;
1646 scrollbar_show (1); 1655 scrollBar.show (1);
1647 } 1656 }
1648 break; 1657 break;
1649 } 1658 }
1650}
1651 1659
1652#if TRANSPARENT 1660#if defined(CURSOR_BLINK)
1661 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1662 {
1663 if (hidden_cursor)
1664 {
1665 hidden_cursor = 0;
1666 want_refresh = 1;
1667 }
1668
1669 cursor_blink_ev.again ();
1670 }
1671#endif
1672
1673#if defined(POINTER_BLANK)
1674 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1675 {
1676 if (ev.type == MotionNotify
1677 || ev.type == ButtonPress
1678 || ev.type == ButtonRelease)
1679 if (hidden_pointer)
1680 pointer_unblank ();
1681
1682 if (ev.type == KeyPress && hidden_pointer == 0)
1683 pointer_blank ();
1684 }
1685#endif
1686
1687 refresh_check ();
1688}
1689
1690void
1691rxvt_term::set_urgency (bool enable)
1692{
1693 if (enable == urgency_hint)
1694 return;
1695
1696 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1697 {
1698 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1699 XSetWMHints (dpy, parent[0], h);
1700 urgency_hint = enable;
1701 }
1702}
1703
1704void
1705rxvt_term::focus_in ()
1706{
1707 if (!focus)
1708 {
1709 focus = 1;
1710 want_refresh = 1;
1711
1712#if USE_XIM
1713 if (Input_Context != NULL)
1714 {
1715 IMSetPosition ();
1716 XSetICFocus (Input_Context);
1717 }
1718#endif
1719#if CURSOR_BLINK
1720 if (option (Opt_cursorBlink))
1721 cursor_blink_ev.again ();
1722#endif
1723#if OFF_FOCUS_FADING
1724 if (rs[Rs_fade])
1725 {
1726 pix_colors = pix_colors_focused;
1727 scr_recolour ();
1728 }
1729#endif
1730#if ENABLE_FRILLS
1731 if (option (Opt_urgentOnBell))
1732 set_urgency (0);
1733#endif
1734
1735 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1736 }
1737}
1738
1739void
1740rxvt_term::focus_out ()
1741{
1742 if (focus)
1743 {
1744 focus = 0;
1745 want_refresh = 1;
1746
1747#if ENABLE_FRILLS
1748 if (option (Opt_urgentOnBell))
1749 set_urgency (0);
1750#endif
1751#if ENABLE_FRILLS || ISO_14755
1752 if (iso14755buf)
1753 {
1754 iso14755buf = 0;
1755# if ISO_14755
1756 scr_overlay_off ();
1757# endif
1758 }
1759#endif
1760#if USE_XIM
1761 if (Input_Context != NULL)
1762 XUnsetICFocus (Input_Context);
1763#endif
1764#if CURSOR_BLINK
1765 if (option (Opt_cursorBlink))
1766 cursor_blink_ev.stop ();
1767
1768 hidden_cursor = 0;
1769#endif
1770#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade])
1772 {
1773 pix_colors = pix_colors_unfocused;
1774 scr_recolour ();
1775 }
1776#endif
1777
1778 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1779 }
1780}
1781
1782void
1783rxvt_term::update_fade_color (unsigned int idx)
1784{
1785#if OFF_FOCUS_FADING
1786 if (rs[Rs_fade])
1787 {
1788 rgba c;
1789 pix_colors [Color_fade].get (c);
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 }
1792#endif
1793}
1794
1795#if ENABLE_TRANSPARENCY || ENABLE_PERL
1653void 1796void
1654rxvt_term::rootwin_cb (XEvent &ev) 1797rxvt_term::rootwin_cb (XEvent &ev)
1655{ 1798{
1656 SET_R (this); 1799 make_current ();
1657 SET_LOCALE (locale);
1658 1800
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return;
1804
1805# if ENABLE_TRANSPARENCY
1659 switch (ev.type) 1806 switch (ev.type)
1660 { 1807 {
1661 case PropertyNotify: 1808 case PropertyNotify:
1662 /* 1809 /*
1663 * if user used some Esetroot compatible prog to set the root bg, 1810 * 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. 1811 * use the property to determine the pixmap. We use it later on.
1665 */ 1812 */
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]) 1813 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1670 return; 1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1815 {
1816 bgPixmap.set_root_pixmap ();
1817 update_background ();
1818 }
1671 1819
1672 /* FALLTHROUGH */
1673 case ReparentNotify:
1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1675 want_refresh = want_full_refresh = 1;
1676 break; 1820 break;
1677 } 1821 }
1822# endif
1823
1824 refresh_check ();
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);
… …
1731 mouse_report (ev); 1884 mouse_report (ev);
1732 } 1885 }
1733#else 1886#else
1734 MEvent.button = ev.button; 1887 MEvent.button = ev.button;
1735 mouse_report (ev); 1888 mouse_report (ev);
1736#endif /* MOUSE_REPORT_DOUBLECLICK */ 1889#endif /* MOUSE_REPORT_DOUBLECLICK */
1737 1890
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);
… …
1780 } 1942 }
1781 1943
1782 /* 1944 /*
1783 * Scrollbar window processing of button press 1945 * Scrollbar window processing of button press
1784 */ 1946 */
1785 if (isScrollbarWindow (ev.window)) 1947 if (scrollBar.state && ev.window == scrollBar.win)
1786 { 1948 {
1787 scrollBar.setIdle (); 1949 page_dirn direction = NO_DIR;
1950
1951 if (scrollBar.upButton (ev.y))
1952 direction = UP; /* up */
1953 else if (scrollBar.dnButton (ev.y))
1954 direction = DN; /* down */
1955
1956 scrollBar.state = STATE_IDLE;
1788 /* 1957 /*
1789 * Rxvt-style scrollbar: 1958 * Rxvt-style scrollbar:
1790 * move up if mouse is above slider 1959 * move up if mouse is above slider
1791 * move dn if mouse is below slider 1960 * move dn if mouse is below slider
1792 * 1961 *
… …
1801 /* 1970 /*
1802 * Mouse report disabled scrollbar: 1971 * Mouse report disabled scrollbar:
1803 * arrow buttons - send up/down 1972 * arrow buttons - send up/down
1804 * click on scrollbar - send pageup/down 1973 * click on scrollbar - send pageup/down
1805 */ 1974 */
1806 if ((scrollBar.style == R_SB_NEXT 1975 if (direction == UP)
1807 && scrollbarnext_upButton (ev.y))
1808 || (scrollBar.style == R_SB_RXVT
1809 && scrollbarrxvt_upButton (ev.y)))
1810 tt_printf ("\033[A"); 1976 tt_printf ("\033[A");
1811 else if ((scrollBar.style == R_SB_NEXT 1977 else if (direction == DN)
1812 && scrollbarnext_dnButton (ev.y))
1813 || (scrollBar.style == R_SB_RXVT
1814 && scrollbarrxvt_dnButton (ev.y)))
1815 tt_printf ("\033[B"); 1978 tt_printf ("\033[B");
1816 else 1979 else
1817 switch (ev.button) 1980 switch (ev.button)
1818 { 1981 {
1819 case Button2: 1982 case Button2:
… …
1826 tt_printf ("\033[5~"); 1989 tt_printf ("\033[5~");
1827 break; 1990 break;
1828 } 1991 }
1829 } 1992 }
1830 else 1993 else
1831#endif /* NO_SCROLLBAR_REPORT */ 1994#endif /* NO_SCROLLBAR_REPORT */
1832
1833 {
1834 char upordown = 0;
1835
1836 if (scrollBar.style == R_SB_NEXT)
1837 { 1995 {
1838 if (scrollbarnext_upButton (ev.y)) 1996 if (direction != NO_DIR)
1839 upordown = -1; /* up */
1840 else if (scrollbarnext_dnButton (ev.y))
1841 upordown = 1; /* down */
1842 }
1843 else if (scrollBar.style == R_SB_RXVT)
1844 {
1845 if (scrollbarrxvt_upButton (ev.y))
1846 upordown = -1; /* up */
1847 else if (scrollbarrxvt_dnButton (ev.y))
1848 upordown = 1; /* down */
1849 }
1850 if (upordown)
1851 { 1997 {
1852#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1998#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1999 if (!cont_scroll_ev.is_active ())
1853 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2000 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1854#endif 2001#endif
1855 if (scr_page (upordown < 0 ? UP : DN, 1)) 2002 if (scr_page (direction, 1))
1856 { 2003 {
1857 if (upordown < 0) 2004 if (direction == UP)
1858 scrollBar.setUp (); 2005 scrollBar.state = STATE_UP;
1859 else 2006 else
1860 scrollBar.setDn (); 2007 scrollBar.state = STATE_DOWN;
1861 } 2008 }
1862 } 2009 }
1863 else 2010 else
1864 switch (ev.button) 2011 switch (ev.button)
1865 { 2012 {
1866 case Button2: 2013 case Button2:
1867 switch (scrollbar_align) 2014 switch (scrollBar.align)
1868 { 2015 {
1869 case R_SB_ALIGN_TOP: 2016 case R_SB_ALIGN_TOP:
1870 csrO = 0; 2017 csrO = 0;
1871 break; 2018 break;
1872 case R_SB_ALIGN_CENTRE: 2019 case R_SB_ALIGN_CENTRE:
… …
1878 } 2025 }
1879 2026
1880 if (scrollBar.style == R_SB_XTERM 2027 if (scrollBar.style == R_SB_XTERM
1881 || scrollbar_above_slider (ev.y) 2028 || scrollbar_above_slider (ev.y)
1882 || scrollbar_below_slider (ev.y)) 2029 || scrollbar_below_slider (ev.y))
1883 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
1884 2031
1885 scrollBar.setMotion (); 2032 scrollBar.state = STATE_MOTION;
1886 break; 2033 break;
1887 2034
1888 case Button1: 2035 case Button1:
1889 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2036 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1890 csrO = ev.y - scrollBar.top; 2037 csrO = ev.y - scrollBar.top;
1891 /* FALLTHROUGH */ 2038 /* FALLTHROUGH */
1892 2039
1893 case Button3: 2040 case Button3:
1894 if (scrollBar.style != R_SB_XTERM) 2041 if (scrollBar.style != R_SB_XTERM)
1895 { 2042 {
1896 if (scrollbar_above_slider (ev.y)) 2043 if (scrollbar_above_slider (ev.y))
1897# ifdef RXVT_SCROLL_FULL 2044# ifdef RXVT_SCROLL_FULL
1898 scr_page (UP, TermWin.nrow - 1); 2045 scr_page (UP, nrow - 1);
1899# else 2046# else
1900 scr_page (UP, TermWin.nrow / 4); 2047 scr_page (UP, nrow / 4);
1901# endif 2048# endif
1902 else if (scrollbar_below_slider (ev.y)) 2049 else if (scrollbar_below_slider (ev.y))
1903# ifdef RXVT_SCROLL_FULL 2050# ifdef RXVT_SCROLL_FULL
1904 scr_page (DN, TermWin.nrow - 1); 2051 scr_page (DN, nrow - 1);
1905# else 2052# else
1906 scr_page (DN, TermWin.nrow / 4); 2053 scr_page (DN, nrow / 4);
1907# endif 2054# endif
1908 else 2055 else
1909 scrollBar.setMotion (); 2056 scrollBar.state = STATE_MOTION;
1910 } 2057 }
1911 else 2058 else
1912 { 2059 {
1913 scr_page ((ev.button == Button1 ? DN : UP), 2060 scr_page ((ev.button == Button1 ? DN : UP),
1914 (TermWin.nrow 2061 (nrow
1915 * scrollbar_position (ev.y) 2062 * scrollbar_position (ev.y)
1916 / scrollbar_size ())); 2063 / scrollBar.size ()));
1917 } 2064 }
1918 2065
1919 break; 2066 break;
1920 } 2067 }
1921 } 2068 }
2069
1922 return; 2070 return;
1923 } 2071 }
1924#if MENUBAR
1925 /*
1926 * Menubar window processing of button press
1927 */
1928 if (isMenuBarWindow (ev.window))
1929 menubar_control (ev);
1930#endif
1931} 2072}
1932 2073
1933void 2074void
1934rxvt_term::button_release (XButtonEvent &ev) 2075rxvt_term::button_release (XButtonEvent &ev)
1935{ 2076{
… …
1937 2078
1938 csrO = 0; /* reset csr Offset */ 2079 csrO = 0; /* reset csr Offset */
1939 if (!bypass_keystate) 2080 if (!bypass_keystate)
1940 reportmode = !! (priv_modes & PrivMode_mouse_report); 2081 reportmode = !! (priv_modes & PrivMode_mouse_report);
1941 2082
1942 if (scrollbar_isUpDn ()) 2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1943 { 2084 {
1944 scrollBar.setIdle (); 2085 scrollBar.state = STATE_IDLE;
1945 scrollbar_show (0); 2086 scrollBar.show (0);
1946#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1947 refresh_type &= ~SMOOTH_REFRESH;
1948#endif
1949 } 2087 }
1950 2088
1951#ifdef SELECTION_SCROLLING 2089#ifdef SELECTION_SCROLLING
1952 if (sel_scroll_ev.active)
1953 sel_scroll_ev.stop(); 2090 sel_scroll_ev.stop();
1954#endif 2091#endif
1955 2092
1956 if (ev.window == TermWin.vt) 2093 if (ev.window == vt)
1957 { 2094 {
2095 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2096 return;
2097
1958#if ISO_14755 2098#if ISO_14755
1959 // 5.4 2099 // 5.4
1960 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2100 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1961 return; 2101 return;
1962#endif 2102#endif
2103
1963 if (reportmode) 2104 if (reportmode)
1964 { 2105 {
1965 /* mouse report from vt window */ 2106 /* mouse report from vt window */
1966 /* don't report release of wheel "buttons" */ 2107 /* don't report release of wheel "buttons" */
1967 if (ev.button >= 4) 2108 if (ev.button >= 4)
… …
1978 mouse_report (ev); 2119 mouse_report (ev);
1979 } 2120 }
1980#else /* MOUSE_REPORT_DOUBLECLICK */ 2121#else /* MOUSE_REPORT_DOUBLECLICK */
1981 MEvent.button = AnyButton; 2122 MEvent.button = AnyButton;
1982 mouse_report (ev); 2123 mouse_report (ev);
1983#endif /* MOUSE_REPORT_DOUBLECLICK */ 2124#endif /* MOUSE_REPORT_DOUBLECLICK */
1984 return; 2125 return;
1985 } 2126 }
1986 2127
1987 /* 2128 /*
1988 * dumb hack to compensate for the failure of click-and-drag 2129 * dumb hack to compensate for the failure of click-and-drag
… …
1997 { 2138 {
1998 case Button1: 2139 case Button1:
1999 case Button3: 2140 case Button3:
2000 selection_make (ev.time); 2141 selection_make (ev.time);
2001 break; 2142 break;
2143
2002 case Button2: 2144 case Button2:
2003 selection_request (ev.time, ev.x, ev.y); 2145 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2146 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2004 break; 2147 break;
2148
2005#ifdef MOUSE_WHEEL 2149#ifdef MOUSE_WHEEL
2006 case Button4: 2150 case Button4:
2007 case Button5: 2151 case Button5:
2008 { 2152 {
2009 int i; 2153 int i;
… …
2011 2155
2012 v = ev.button == Button4 ? UP : DN; 2156 v = ev.button == Button4 ? UP : DN;
2013 2157
2014 if (ev.state & ShiftMask) 2158 if (ev.state & ShiftMask)
2015 i = 1; 2159 i = 1;
2016 else if (options & Opt_mouseWheelScrollPage) 2160 else if (option (Opt_mouseWheelScrollPage))
2017 i = TermWin.nrow - 1; 2161 i = nrow - 1;
2018 else 2162 else
2019 i = 5; 2163 i = 5;
2020 2164
2021# ifdef MOUSE_SLIP_WHEELING 2165# ifdef MOUSE_SLIP_WHEELING
2022 if (ev.state & ControlMask) 2166 if (ev.state & ControlMask)
2023 { 2167 {
2024 mouse_slip_wheel_speed += v ? -1 : 1; 2168 mouse_slip_wheel_speed += v ? -1 : 1;
2025 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2169 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; 2170 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2027 2171
2028 if (slip_wheel_ev.at < NOW) 2172 if (!slip_wheel_ev.is_active ())
2029 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2173 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2030
2031 slip_wheel_ev.start ();
2032 } 2174 }
2033 else 2175 else
2176# endif
2034 { 2177 {
2035# endif
2036# ifdef JUMP_MOUSE_WHEEL
2037 scr_page (v, i); 2178 scr_page (v, i);
2038 scr_refresh (SMOOTH_REFRESH);
2039 scrollbar_show (1); 2179 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
2049 } 2180 }
2050#endif
2051 } 2181 }
2052 break; 2182 break;
2053#endif 2183#endif
2054 } 2184 }
2055 } 2185 }
2056#ifdef MENUBAR
2057 else if (isMenuBarWindow (ev.window))
2058 menubar_control (ev);
2059#endif
2060} 2186}
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 2187
2533/*}}} */ 2188/*}}} */
2534 2189
2535bool 2190bool
2536rxvt_term::cmd_parse () 2191rxvt_term::cmd_parse ()
2537{ 2192{
2538 bool flag = false; 2193 bool flag = false;
2539 unicode_t ch = NOCHAR; 2194 wchar_t ch = NOCHAR;
2540 unsigned char *seq_begin; // remember start of esc-sequence here 2195 char *seq_begin; // remember start of esc-sequence here
2541 2196
2542 for (;;) 2197 for (;;)
2543 { 2198 {
2544 if (ch == NOCHAR) 2199 if (expect_false (ch == NOCHAR))
2545 { 2200 {
2546 seq_begin = cmdbuf_ptr; 2201 seq_begin = cmdbuf_ptr;
2547 ch = next_char (); 2202 ch = next_char ();
2548 }
2549 2203
2550 if (ch == NOCHAR) // TODO: improve 2204 if (ch == NOCHAR)
2551 break; 2205 break;
2206 }
2552 2207
2553 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2208 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2554 { 2209 {
2555 if (!seen_input) 2210 if (expect_false (!seen_input))
2556 { 2211 {
2557 seen_input = 1; 2212 seen_input = 1;
2558 // many badly-written programs (e.g. jed) contain a race condition: 2213 // many badly-written programs (e.g. jed) contain a race condition:
2559 // they first read the screensize and then install a SIGWINCH handler. 2214 // they first read the screensize and then install a SIGWINCH handler.
2560 // some window managers resize the window early, and these programs 2215 // some window managers resize the window early, and these programs
2561 // then sometimes get the size wrong. 2216 // then sometimes get the size wrong.
2217 // unfortunately other programs are even more buggy and dislike
2218 // being sent SIGWINCH, so only do it when we were in fact being
2219 // resized.
2220 if (seen_resize && cmd_pid)
2562 kill (-cmd_pid, SIGWINCH); 2221 kill (-cmd_pid, SIGWINCH);
2563 } 2222 }
2564 2223
2565 /* Read a text string from the input buffer */ 2224 /* Read a text string from the input buffer */
2566 unicode_t buf[UBUFSIZ]; 2225 wchar_t buf[UBUFSIZ];
2567 bool refreshnow = false; 2226 bool refreshnow = false;
2568 int nlines = 0; 2227 int nlines = 0;
2569 unicode_t *str = buf; 2228 wchar_t *str = buf;
2229 wchar_t *eol = str + min (ncol, UBUFSIZ);
2570 2230
2571 for (;;) 2231 for (;;)
2572 { 2232 {
2573 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2233 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2574 break; 2234 break;
2575 2235
2576 *str++ = ch; 2236 *str++ = ch;
2577 2237
2578 if (ch == C0_LF) 2238 if (expect_false (ch == C0_LF || str >= eol))
2579 { 2239 {
2240 if (ch == C0_LF)
2580 nlines++; 2241 nlines++;
2242
2581 refresh_count++; 2243 refresh_count++;
2582 2244
2583 if (!(options & Opt_jumpScroll) 2245 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2584 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2585 { 2246 {
2247 refresh_count = 0;
2248
2249 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2250 {
2586 refreshnow = true; 2251 refreshnow = true;
2587 ch = NOCHAR; 2252 ch = NOCHAR;
2588 break; 2253 break;
2254 }
2589 } 2255 }
2590 2256
2591 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2257 // scr_add_lines only works for nlines <= nrow - 1.
2592 if (nlines >= TermWin.nrow - 1) 2258 if (nlines >= nrow - 1)
2593 { 2259 {
2260 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2261 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2594 scr_add_lines (buf, nlines, str - buf); 2262 scr_add_lines (buf, str - buf, nlines);
2263
2595 nlines = 0; 2264 nlines = 0;
2596 str = buf; 2265 str = buf;
2266 eol = str + min (ncol, UBUFSIZ);
2597 } 2267 }
2598 }
2599 2268
2600 if (str >= buf + UBUFSIZ) 2269 if (str >= eol)
2601 { 2270 {
2271 if (eol >= buf + UBUFSIZ)
2272 {
2602 ch = NOCHAR; 2273 ch = NOCHAR;
2603 break; 2274 break;
2275 }
2276 else
2277 eol = min (eol + ncol, buf + UBUFSIZ);
2278 }
2279
2604 } 2280 }
2605 2281
2606 seq_begin = cmdbuf_ptr; 2282 seq_begin = cmdbuf_ptr;
2607 ch = next_char (); 2283 ch = next_char ();
2608 } 2284 }
2609 2285
2286 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2287 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2610 scr_add_lines (buf, nlines, str - buf); 2288 scr_add_lines (buf, str - buf, nlines);
2611 2289
2612 /* 2290 /*
2613 * If there have been a lot of new lines, then update the screen 2291 * 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. 2292 * 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 2293 * if skipScroll is enabled.
2616 * is incremented here because we must be doing flat-out scrolling.
2617 */ 2294 */
2618 if (refreshnow) 2295 if (refreshnow)
2619 { 2296 {
2620 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2621 refresh_limit++;
2622 else
2623 {
2624 flag = true; 2297 flag = true;
2625 scr_refresh (refresh_type); 2298 scr_refresh ();
2626 } 2299 want_refresh = 1;
2627 } 2300 }
2628 2301
2629 } 2302 }
2630 else 2303 else
2631 { 2304 {
… …
2645 } 2318 }
2646 2319
2647 return flag; 2320 return flag;
2648} 2321}
2649 2322
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 2323// read the next character
2660unicode_t 2324wchar_t
2661rxvt_term::next_char () 2325rxvt_term::next_char () NOTHROW
2662{ 2326{
2663 while (cmdbuf_ptr < cmdbuf_endp) 2327 while (cmdbuf_ptr < cmdbuf_endp)
2664 { 2328 {
2665 // assume 7-bit to be ascii ALWAYS 2329 // assume 7-bit to be ascii ALWAYS
2666 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2330 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2667 return *cmdbuf_ptr++; 2331 return *cmdbuf_ptr++;
2668 2332
2669 wchar_t wc; 2333 wchar_t wc;
2670 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2334 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2671 2335
2672 if (len == (size_t)-2) 2336 if (len == (size_t)-2)
2673 { 2337 {
2674 // the mbstate stores incomplete sequences. didn't know this :/ 2338 // the mbstate stores incomplete sequences. didn't know this :/
2675 cmdbuf_ptr = cmdbuf_endp; 2339 cmdbuf_ptr = cmdbuf_endp;
2676 break; 2340 break;
2677 } 2341 }
2678 2342
2679 if (len == (size_t)-1) 2343 if (len == (size_t)-1)
2344 {
2345 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2680 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2346 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2347 }
2681 2348
2682 // assume wchar == unicode 2349 // assume wchar == unicode
2683 cmdbuf_ptr += len; 2350 cmdbuf_ptr += len;
2684 return wc; 2351 return wc & UNICODE_MASK;
2685 } 2352 }
2686 2353
2687 return NOCHAR; 2354 return NOCHAR;
2688} 2355}
2356
2357// read the next octet
2358uint32_t
2359rxvt_term::next_octet () NOTHROW
2360{
2361 return cmdbuf_ptr < cmdbuf_endp
2362 ? (unsigned char)*cmdbuf_ptr++
2363 : NOCHAR;
2364}
2365
2366static class out_of_input out_of_input;
2689 2367
2690/* rxvt_cmd_getc () - Return next input character */ 2368/* rxvt_cmd_getc () - Return next input character */
2691/* 2369/*
2692 * Return the next input character after first passing any keyboard input 2370 * Return the next input character after first passing any keyboard input
2693 * to the command. 2371 * to the command.
2694 */ 2372 */
2695unicode_t 2373wchar_t
2696rxvt_term::cmd_getc () 2374rxvt_term::cmd_getc () THROW ((class out_of_input))
2697{ 2375{
2698 unicode_t c = next_char (); 2376 wchar_t c = next_char ();
2699 2377
2700 if (c == NOCHAR) 2378 if (c == NOCHAR)
2701 throw out_of_input; 2379 throw out_of_input;
2702 2380
2703 return c; 2381 return c;
2704} 2382}
2705 2383
2706unicode_t 2384uint32_t
2707rxvt_term::cmd_get8 () 2385rxvt_term::cmd_get8 () THROW ((class out_of_input))
2708{ 2386{
2709 unicode_t c = next_octet (); 2387 uint32_t c = next_octet ();
2710 2388
2711 if (c == NOCHAR) 2389 if (c == NOCHAR)
2712 throw out_of_input; 2390 throw out_of_input;
2713 2391
2714 return c; 2392 return c;
… …
2718/*----------------------------------------------------------------------*/ 2396/*----------------------------------------------------------------------*/
2719#ifdef PRINTPIPE 2397#ifdef PRINTPIPE
2720FILE * 2398FILE *
2721rxvt_term::popen_printer () 2399rxvt_term::popen_printer ()
2722{ 2400{
2723 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2401 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2724 2402
2725 if (stream == NULL) 2403 if (stream == NULL)
2726 rxvt_warn ("can't open printer pipe, not printing.\n"); 2404 rxvt_warn ("can't open printer pipe, not printing.\n");
2727 2405
2728 return stream; 2406 return stream;
… …
2739 * simulate attached vt100 printer 2417 * simulate attached vt100 printer
2740 */ 2418 */
2741void 2419void
2742rxvt_term::process_print_pipe () 2420rxvt_term::process_print_pipe ()
2743{ 2421{
2744 int done; 2422 FILE *fd = popen_printer ();
2745 FILE *fd;
2746 2423
2747 if ((fd = popen_printer ()) == NULL) 2424 if (!fd)
2748 return; 2425 return;
2749 2426
2750 /* 2427 /*
2751 * Send all input to the printer until either ESC[4i or ESC[?4i 2428 * Send all input to the printer until either ESC[4i or ESC[?4i
2752 * is received. 2429 * is received.
2753 */ 2430 */
2754 for (done = 0; !done;) 2431 for (int done = 0; !done; )
2755 { 2432 {
2756 unsigned char buf[8]; 2433 unsigned char buf[8];
2757 unicode_t ch; 2434 unicode_t ch;
2758 unsigned int i, len; 2435 unsigned int i, len;
2759 2436
… …
2778 { 2455 {
2779 if ((buf[len++] = cmd_getc ()) == 'i') 2456 if ((buf[len++] = cmd_getc ()) == 'i')
2780 break; /* done = 1 */ 2457 break; /* done = 1 */
2781 } 2458 }
2782 } 2459 }
2783 2460
2784 for (i = 0; i < len; i++) 2461 for (i = 0; i < len; i++)
2785 if (putc (buf[i], fd) == EOF) 2462 if (putc (buf[i], fd) == EOF)
2786 { 2463 {
2787 done = 1; 2464 done = 1;
2788 break; 2465 break;
… …
2790 } 2467 }
2791 } 2468 }
2792 2469
2793 pclose_printer (fd); 2470 pclose_printer (fd);
2794} 2471}
2795#endif /* PRINTPIPE */ 2472#endif /* PRINTPIPE */
2796/*}}} */ 2473/*}}} */
2797 2474
2798/* *INDENT-OFF* */ 2475/* *INDENT-OFF* */
2799enum { 2476enum {
2800 C1_40 = 0x40, 2477 C1_40 = 0x40,
… …
2814 case C0_ESC: 2491 case C0_ESC:
2815 process_escape_seq (); 2492 process_escape_seq ();
2816 break; 2493 break;
2817 case C0_ENQ: /* terminal Status */ 2494 case C0_ENQ: /* terminal Status */
2818 if (rs[Rs_answerbackstring]) 2495 if (rs[Rs_answerbackstring])
2819 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2496 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2820 (unsigned int)strlen (rs[Rs_answerbackstring]));
2821 else 2497 else
2822 tt_write ((unsigned char *)VT100_ANS, 2498 tt_write (VT100_ANS, strlen (VT100_ANS));
2823 (unsigned int)strlen (VT100_ANS));
2824 break; 2499 break;
2825 case C0_BEL: /* bell */ 2500 case C0_BEL: /* bell */
2826 scr_bell (); 2501 scr_bell ();
2827 break; 2502 break;
2828 case C0_BS: /* backspace */ 2503 case C0_BS: /* backspace */
… …
2852 process_dcs_seq (); 2527 process_dcs_seq ();
2853 break; 2528 break;
2854 case 0x9b: /* CSI */ 2529 case 0x9b: /* CSI */
2855 process_csi_seq (); 2530 process_csi_seq ();
2856 break; 2531 break;
2857 case 0x9d: /* CSI */ 2532 case 0x9d: /* OSC */
2858 process_osc_seq (); 2533 process_osc_seq ();
2859 break; 2534 break;
2860#endif 2535#endif
2861 } 2536 }
2862} 2537}
… …
2906 break; 2581 break;
2907 case 'Z': /* identify the terminal type */ 2582 case 'Z': /* identify the terminal type */
2908 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2583 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2909 break; 2584 break;
2910 case '<': /* turn off VT52 mode */ 2585 case '<': /* turn off VT52 mode */
2911 PrivMode (0, PrivMode_vt52); 2586 set_privmode (PrivMode_vt52, 0);
2912 break; 2587 break;
2913 case 'F': /* use special graphics character set */ 2588 case 'F': /* use special graphics character set */
2914 case 'G': /* use regular character set */ 2589 case 'G': /* use regular character set */
2915 /* unimplemented */ 2590 /* unimplemented */
2916 break; 2591 break;
… …
2952 scr_charset_set (2, (unsigned int)cmd_getc ()); 2627 scr_charset_set (2, (unsigned int)cmd_getc ());
2953 break; 2628 break;
2954 case '+': 2629 case '+':
2955 scr_charset_set (3, (unsigned int)cmd_getc ()); 2630 scr_charset_set (3, (unsigned int)cmd_getc ());
2956 break; 2631 break;
2957#if ENABLE_FRILLS 2632#if !ENABLE_MINIMAL
2958 case '6': 2633 case '6':
2959 scr_backindex (); 2634 scr_backindex ();
2960 break; 2635 break;
2961#endif 2636#endif
2962 case '7': 2637 case '7':
2963 scr_cursor (SAVE); 2638 scr_cursor (SAVE);
2964 break; 2639 break;
2965 case '8': 2640 case '8':
2966 scr_cursor (RESTORE); 2641 scr_cursor (RESTORE);
2967 break; 2642 break;
2968#if ENABLE_FRILLS 2643#if !ENABLE_MINIMAL
2969 case '9': 2644 case '9':
2970 scr_forwardindex (); 2645 scr_forwardindex ();
2971 break; 2646 break;
2972#endif 2647#endif
2973 case '=': 2648 case '=':
2974 case '>': 2649 case '>':
2975 PrivMode ((ch == '='), PrivMode_aplKP); 2650 set_privmode (PrivMode_aplKP, ch == '=');
2976 break; 2651 break;
2977 2652
2978 case C1_40: 2653 case C1_40:
2979 cmd_getc (); 2654 cmd_getc ();
2980 break; 2655 break;
… …
2983 break; 2658 break;
2984 2659
2985 /* 8.3.87: NEXT LINE */ 2660 /* 8.3.87: NEXT LINE */
2986 case C1_NEL: /* ESC E */ 2661 case C1_NEL: /* ESC E */
2987 { 2662 {
2988 unicode_t nlcr[] = { C0_LF, C0_CR }; 2663 wchar_t nlcr[] = { C0_LF, C0_CR };
2989 scr_add_lines (nlcr, 1, 2); 2664 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2990 } 2665 }
2991 break; 2666 break;
2992 2667
2993 /* kidnapped escape sequence: Should be 8.3.48 */ 2668 /* kidnapped escape sequence: Should be 8.3.48 */
2994 case C1_ESA: /* ESC G */ 2669 case C1_ESA: /* ESC G */
… …
3016 process_dcs_seq (); 2691 process_dcs_seq ();
3017 break; 2692 break;
3018 2693
3019 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2694 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3020 case C1_SCI: /* ESC Z */ 2695 case C1_SCI: /* ESC Z */
3021 tt_write ((const unsigned char *)ESCZ_ANSWER, 2696 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3022 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3023 break; /* steal obsolete ESC [ c */ 2697 break; /* steal obsolete ESC [ c */
3024 2698
3025 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2699 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3026 case C1_CSI: /* ESC [ */ 2700 case C1_CSI: /* ESC [ */
3027 process_csi_seq (); 2701 process_csi_seq ();
… …
3034 2708
3035 /* 8.3.106: RESET TO INITIAL STATE */ 2709 /* 8.3.106: RESET TO INITIAL STATE */
3036 case 'c': 2710 case 'c':
3037 mbstate.reset (); 2711 mbstate.reset ();
3038 scr_poweron (); 2712 scr_poweron ();
3039 scrollbar_show (1); 2713 scrollBar.show (1);
3040 break; 2714 break;
3041 2715
3042 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2716 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3043 case 'n': 2717 case 'n':
3044 scr_charset_choose (2); 2718 scr_charset_choose (2);
… …
3089rxvt_term::process_csi_seq () 2763rxvt_term::process_csi_seq ()
3090{ 2764{
3091 unicode_t ch, priv, i; 2765 unicode_t ch, priv, i;
3092 unsigned int nargs, p; 2766 unsigned int nargs, p;
3093 int n, ndef; 2767 int n, ndef;
3094 int arg[ESC_ARGS]; 2768 int arg[ESC_ARGS] = { };
3095 2769
3096 for (nargs = ESC_ARGS; nargs > 0;) 2770 nargs = 0;
3097 arg[--nargs] = 0;
3098 2771
3099 priv = 0; 2772 priv = 0;
3100 ch = cmd_getc (); 2773 ch = cmd_getc ();
3101 if (ch >= '<' && ch <= '?') 2774 if (ch >= '<' && ch <= '?')
2775 {
3102 { /* '<' '=' '>' '?' */ 2776 /* '<' '=' '>' '?' */
3103 priv = ch; 2777 priv = ch;
3104 ch = cmd_getc (); 2778 ch = cmd_getc ();
3105 } 2779 }
3106 2780
3107 /* read any numerical arguments */ 2781 /* read any numerical arguments */
… …
3136 ndef = get_byte_array_bit (csi_defaults, i); 2810 ndef = get_byte_array_bit (csi_defaults, i);
3137 for (p = 0; p < nargs; p++) 2811 for (p = 0; p < nargs; p++)
3138 if (arg[p] == -1) 2812 if (arg[p] == -1)
3139 arg[p] = ndef; 2813 arg[p] = ndef;
3140 2814
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 /* 2815 /*
3149 * private mode handling 2816 * private mode handling
3150 */ 2817 */
3151 if (priv) 2818 if (priv)
3152 { 2819 {
3153 switch (priv) 2820 switch (priv)
3154 { 2821 {
3155 case '>': 2822 case '>':
3156 if (ch == CSI_DA) /* secondary device attributes */ 2823 if (ch == CSI_DA) /* secondary device attributes */
2824 {
2825 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2826 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2827 //
2828 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2829 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2830 // versions.
2831 //
3157 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2832 tt_printf ("\033[>%d;95;0c", 'U');
2833 }
3158 break; 2834 break;
2835
3159 case '?': 2836 case '?':
3160 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2837 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3161 process_terminal_mode (ch, priv, nargs, arg); 2838 process_terminal_mode (ch, priv, nargs, arg);
3162 break; 2839 break;
3163 } 2840 }
… …
3267 2944
3268 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2945 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3269 arg[0] = -arg[0]; 2946 arg[0] = -arg[0];
3270 /* FALLTHROUGH */ 2947 /* FALLTHROUGH */
3271 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2948 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3272 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2949 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3273 break; 2950 break;
3274 2951
3275 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2952 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3276 tt_write ((const unsigned char *)VT100_ANS, 2953 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3277 (unsigned int) (sizeof (VT100_ANS) - 1));
3278 break; 2954 break;
3279 2955
3280 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2956 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3281 process_sgr_mode (nargs, arg); 2957 process_sgr_mode (nargs, arg);
3282 break; 2958 break;
… …
3289 break; 2965 break;
3290 case 6: /* CPR requested */ 2966 case 6: /* CPR requested */
3291 scr_report_position (); 2967 scr_report_position ();
3292 break; 2968 break;
3293 case 7: /* unofficial extension */ 2969 case 7: /* unofficial extension */
3294 if (options & Opt_insecure) 2970 if (option (Opt_insecure))
3295 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2971 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3296 break; 2972 break;
3297 case 8: /* unofficial extension */ 2973 case 8: /* unofficial extension */
3298 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2974 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3299 break; 2975 break;
… …
3366 break; 3042 break;
3367 case CSI_75: 3043 case CSI_75:
3368 scr_cursor (RESTORE); 3044 scr_cursor (RESTORE);
3369 break; 3045 break;
3370 3046
3371#if ENABLE_FRILLS 3047#if !ENABLE_MINIMAL
3372 case CSI_74: 3048 case CSI_74:
3373 process_window_ops (arg, nargs); 3049 process_window_ops (arg, nargs);
3374 break; 3050 break;
3375#endif 3051#endif
3376 3052
… …
3383 break; 3059 break;
3384 } 3060 }
3385} 3061}
3386/*}}} */ 3062/*}}} */
3387 3063
3388#if ENABLE_FRILLS 3064#if !ENABLE_MINIMAL
3389/* ARGSUSED */ 3065/* ARGSUSED */
3390void 3066void
3391rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3067rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3392{ 3068{
3393 int x, y; 3069 int x, y;
3394 XWindowAttributes wattr; 3070 XWindowAttributes wattr;
3395 Window wdummy; 3071 Window wdummy;
3072
3073 dLocal (Display *, dpy);
3396 3074
3397 if (nargs == 0) 3075 if (nargs == 0)
3398 return; 3076 return;
3399 3077
3400 switch (args[0]) 3078 switch (args[0])
3401 { 3079 {
3402 /* 3080 /*
3403 * commands 3081 * commands
3404 */ 3082 */
3405 case 1: /* deiconify window */ 3083 case 1: /* deiconify window */
3406 XMapWindow (display->display, TermWin.parent[0]); 3084 XMapWindow (dpy, parent[0]);
3407 break; 3085 break;
3408 case 2: /* iconify window */ 3086 case 2: /* iconify window */
3409 XIconifyWindow (display->display, TermWin.parent[0], 3087 XIconifyWindow (dpy, parent[0], display->screen);
3410 DefaultScreen (display->display));
3411 break; 3088 break;
3412 case 3: /* set position (pixels) */ 3089 case 3: /* set position (pixels) */
3413 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3090 XMoveWindow (dpy, parent[0], args[1], args[2]);
3414 break; 3091 break;
3415 case 4: /* set size (pixels) */ 3092 case 4: /* set size (pixels) */
3416 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3093 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3417 break; 3094 break;
3418 case 5: /* raise window */ 3095 case 5: /* raise window */
3419 XRaiseWindow (display->display, TermWin.parent[0]); 3096 XRaiseWindow (dpy, parent[0]);
3420 break; 3097 break;
3421 case 6: /* lower window */ 3098 case 6: /* lower window */
3422 XLowerWindow (display->display, TermWin.parent[0]); 3099 XLowerWindow (dpy, parent[0]);
3423 break; 3100 break;
3424 case 7: /* refresh window */ 3101 case 7: /* refresh window */
3425 scr_touch (true); 3102 scr_touch (true);
3426 break; 3103 break;
3427 case 8: /* set size (chars) */ 3104 case 8: /* set size (chars) */
3428 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3105 set_widthheight ((unsigned int) (args[2] * fwidth),
3429 (unsigned int) (args[1] * TermWin.fheight)); 3106 (unsigned int) (args[1] * fheight));
3430 break; 3107 break;
3431 3108
3432 //case 9: NYI, TODO, restore maximized window or maximize window 3109 //case 9: NYI, TODO, restore maximized window or maximize window
3433 default: 3110 default:
3434 if (args[0] >= 24) /* set height (chars) */ 3111 if (args[0] >= 24) /* set height (chars) */
3435 set_widthheight ((unsigned int)TermWin.width, 3112 set_widthheight ((unsigned int)width,
3436 (unsigned int) (args[1] * TermWin.fheight)); 3113 (unsigned int) (args[1] * fheight));
3437 break; 3114 break;
3438
3439 3115
3440 /* 3116 /*
3441 * reports - some output format copied from XTerm 3117 * reports - some output format copied from XTerm
3442 */ 3118 */
3443 case 11: /* report window state */ 3119 case 11: /* report window state */
3444 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3120 XGetWindowAttributes (dpy, parent[0], &wattr);
3445 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3121 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3446 break; 3122 break;
3447 case 13: /* report window position */ 3123 case 13: /* report window position */
3448 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3124 XGetWindowAttributes (dpy, parent[0], &wattr);
3449 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3125 XTranslateCoordinates (dpy, parent[0], wattr.root,
3450 -wattr.border_width, -wattr.border_width, 3126 -wattr.border_width, -wattr.border_width,
3451 &x, &y, &wdummy); 3127 &x, &y, &wdummy);
3452 tt_printf ("\033[3;%d;%dt", x, y); 3128 tt_printf ("\033[3;%d;%dt", x, y);
3453 break; 3129 break;
3454 case 14: /* report window size (pixels) */ 3130 case 14: /* report window size (pixels) */
3455 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3131 XGetWindowAttributes (dpy, parent[0], &wattr);
3456 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3132 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3457 break; 3133 break;
3458 case 18: /* report text area size (chars) */ 3134 case 18: /* report text area size (chars) */
3459 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3135 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3460 break; 3136 break;
3461 case 19: /* report window size (chars) */ 3137 case 19: /* report window size (chars) */
3462 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3138 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3463 break; 3139 break;
3464 case 20: /* report icon label */ 3140 case 20: /* report icon label */
3465 { 3141 {
3466 char *s; 3142 char *s;
3467 XGetIconName (display->display, TermWin.parent[0], &s); 3143 XGetIconName (dpy, parent[0], &s);
3468 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3144 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3469 XFree (s); 3145 XFree (s);
3470 } 3146 }
3471 break; 3147 break;
3472 case 21: /* report window title */ 3148 case 21: /* report window title */
3473 { 3149 {
3474 char *s; 3150 char *s;
3475 XFetchName (display->display, TermWin.parent[0], &s); 3151 XFetchName (dpy, parent[0], &s);
3476 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3152 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3477 XFree (s); 3153 XFree (s);
3478 } 3154 }
3479 break; 3155 break;
3480 } 3156 }
3481} 3157}
… …
3484/*----------------------------------------------------------------------*/ 3160/*----------------------------------------------------------------------*/
3485/* 3161/*
3486 * get input up until STRING TERMINATOR (or BEL) 3162 * get input up until STRING TERMINATOR (or BEL)
3487 * ends_how is terminator used. returned input must be free()'d 3163 * ends_how is terminator used. returned input must be free()'d
3488 */ 3164 */
3489unsigned char * 3165char *
3490rxvt_term::get_to_st (unicode_t &ends_how) 3166rxvt_term::get_to_st (unicode_t &ends_how)
3491{ 3167{
3492 unicode_t prev = 0, ch; 3168 unicode_t ch;
3169 bool seen_esc = false;
3493 unsigned int n = 0; 3170 unsigned int n = 0;
3494 unsigned char *s;
3495 unsigned char string[STRING_MAX]; 3171 wchar_t string[STRING_MAX];
3496 3172
3497 while ((ch = cmd_getc ()) != NOCHAR) 3173 while ((ch = cmd_getc ()) != NOCHAR)
3498 { 3174 {
3499 if (prev == C0_ESC) 3175 if (seen_esc)
3500 { 3176 {
3501 if (ch == 0x5c) /* 7bit ST */ 3177 if (ch == 0x5c) /* 7bit ST */
3502 break; 3178 break;
3503 else 3179 else
3504 return NULL; 3180 return NULL;
3505 } 3181 }
3182 else if (ch == C0_ESC)
3183 {
3184 seen_esc = true;
3185 continue;
3186 }
3506 else if (ch == C0_BEL || ch == CHAR_ST) 3187 else if (ch == C0_BEL || ch == CHAR_ST)
3507 break; 3188 break;
3189 else if (ch == C0_SYN)
3190 ch = cmd_get8 ();
3508 else if (ch < 0x20) 3191 else if (ch < 0x20)
3509 return NULL; /* other control character - exit */ 3192 return NULL; /* other control character - exit */
3510 3193
3511 if (n >= sizeof (string) - 1) 3194 seen_esc = false;
3195
3196 if (n >= STRING_MAX - 1)
3512 // stop at some sane length 3197 // stop at some sane length
3513 return NULL; 3198 return NULL;
3514 3199
3515 if (ch == C0_SYN)
3516 {
3517 string[n++] = cmd_get8 ();
3518 prev = 0;
3519 }
3520 else
3521 string[n++] = prev = ch; 3200 string[n++] = ch;
3522 } 3201 }
3523 3202
3524 string[n++] = '\0'; 3203 string[n++] = '\0';
3525 3204
3526 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3527 return NULL;
3528
3529 ends_how = (ch == 0x5c ? C0_ESC : ch); 3205 ends_how = (ch == 0x5c ? C0_ESC : ch);
3530 strncpy (s, string, n); 3206
3531 return s; 3207 return rxvt_wcstombs (string);
3532} 3208}
3533 3209
3534/*----------------------------------------------------------------------*/ 3210/*----------------------------------------------------------------------*/
3535/* 3211/*
3536 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3212 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3537 */ 3213 */
3538void 3214void
3539rxvt_term::process_dcs_seq () 3215rxvt_term::process_dcs_seq ()
3540{ 3216{
3541 unsigned char *s; 3217 char *s;
3542 unicode_t eh; 3218 unicode_t eh;
3543 3219
3544 /* 3220 /*
3545 * Not handled yet 3221 * Not handled yet
3546 */ 3222 */
… …
3565 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3241 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3566 arg = arg * 10 + (ch - '0'); 3242 arg = arg * 10 + (ch - '0');
3567 3243
3568 if (ch == ';') 3244 if (ch == ';')
3569 { 3245 {
3570 unsigned char *s = get_to_st (eh); 3246 char *s = get_to_st (eh);
3571 3247
3572 if (s) 3248 if (s)
3573 { 3249 {
3574 process_xterm_seq (arg, (char *)s, eh); 3250 process_xterm_seq (arg, s, eh);
3575 free (s); 3251 free (s);
3576 } 3252 }
3577 } 3253 }
3578} 3254}
3579 3255
3580void 3256void
3581rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3257rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3582{ 3258{
3583 if (str[0] == '?' && !str[1]) 3259 if (str[0] == '?' && !str[1])
3584 { 3260 {
3585 unsigned short r, g, b; 3261 rgba c;
3586 pix_colors_focused[color].get (display, r, g, b); 3262 pix_colors_focused[color].get (c);
3263
3264#if XFT
3265 if (c.a != rgba::MAX_CC)
3266 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3267 else
3268#endif
3587 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3269 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3588 } 3270 }
3589 else 3271 else
3590 set_window_color (color, str); 3272 set_window_color (color, str);
3591} 3273}
3592 3274
3593/* 3275/*
3594 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3276 * 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 */ 3277 */
3618void 3278void
3619rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3279rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3620{ 3280{
3621 int changed = 0;
3622 int color; 3281 int color;
3623 char *buf, *name; 3282 char *buf, *name;
3624 bool query = str[0] == '?' && !str[1]; 3283 bool query = str[0] == '?' && !str[1];
3284 int saveop = op;
3285
3286 dLocal (Display *, dpy);
3625 3287
3626 assert (str != NULL); 3288 assert (str != NULL);
3289
3290 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3291 return;
3292
3627 switch (op) 3293 switch (op)
3628 { 3294 {
3629 case XTerm_name: 3295 case XTerm_name:
3630 set_title (str); 3296 set_title (str);
3631 /* FALLTHROUGH */ 3297 /* FALLTHROUGH */
… …
3636 set_title (str); 3302 set_title (str);
3637 break; 3303 break;
3638 case XTerm_property: 3304 case XTerm_property:
3639 if (str[0] == '?') 3305 if (str[0] == '?')
3640 { 3306 {
3641 Atom prop = XInternAtom (display->display, str + 1, True); 3307 Atom prop = display->atom (str + 1);
3642 Atom actual_type; 3308 Atom actual_type;
3643 int actual_format; 3309 int actual_format;
3644 unsigned long nitems; 3310 unsigned long nitems;
3645 unsigned long bytes_after; 3311 unsigned long bytes_after;
3646 unsigned char *value = 0; 3312 unsigned char *value = 0;
3647 const char *str = ""; 3313 const char *str = "";
3648 3314
3649 if (prop 3315 if (prop
3650 && XGetWindowProperty (display->display, TermWin.parent[0], 3316 && XGetWindowProperty (dpy, parent[0],
3651 prop, 0, 1<<16, 0, AnyPropertyType, 3317 prop, 0, 1<<16, 0, AnyPropertyType,
3652 &actual_type, &actual_format, 3318 &actual_type, &actual_format,
3653 &nitems, &bytes_after, &value) == Success 3319 &nitems, &bytes_after, &value) == Success
3654 && actual_type != None 3320 && actual_type != None
3655 && actual_format == 8) 3321 && actual_format == 8)
3656 str = (const char *)(value); 3322 str = (const char *)(value);
3657 3323
3658 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3324 tt_printf ("\033]%d;%s%c", op, str, resp);
3659 3325
3660 XFree (value); 3326 XFree (value);
3661 } 3327 }
3662 else 3328 else
3663 { 3329 {
3664 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3330 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3665 3331
3666 if (eq) 3332 if (eq)
3667 { 3333 {
3668 *eq = 0; 3334 *eq = 0;
3669 XChangeProperty (display->display, TermWin.parent[0], 3335 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 } 3336 }
3674 else 3337 else
3675 XDeleteProperty (display->display, TermWin.parent[0], 3338 XDeleteProperty (dpy, parent[0],
3676 display->atom (str)); 3339 display->atom (str));
3677 } 3340 }
3678 break; 3341 break;
3679 3342
3680 case XTerm_Color: 3343 case XTerm_Color:
… …
3682 { 3345 {
3683 if ((name = strchr (buf, ';')) == NULL) 3346 if ((name = strchr (buf, ';')) == NULL)
3684 break; 3347 break;
3685 3348
3686 *name++ = '\0'; 3349 *name++ = '\0';
3687 color = atoi (buf); 3350 color = atoi (buf) + minCOLOR;
3688 3351
3689 if (color < 0 || color >= TOTAL_COLORS) 3352 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3690 break; 3353 break;
3691 3354
3692 if ((buf = strchr (name, ';')) != NULL) 3355 if ((buf = strchr (name, ';')) != NULL)
3693 *buf++ = '\0'; 3356 *buf++ = '\0';
3694 3357
3695 if (name[0] == '?' && !name[1]) 3358 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 } 3359 }
3704 break; 3360 break;
3361 case Rxvt_restoreFG:
3705 case XTerm_Color00: 3362 case XTerm_Color00:
3706 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3363 process_color_seq (op, Color_fg, str, resp);
3707 break; 3364 break;
3365 case Rxvt_restoreBG:
3708 case XTerm_Color01: 3366 case XTerm_Color01:
3709 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3367 process_color_seq (op, Color_bg, str, resp);
3710 break; 3368 break;
3711#ifndef NO_CURSORCOLOR 3369#ifndef NO_CURSORCOLOR
3712 case XTerm_Color_cursor: 3370 case XTerm_Color_cursor:
3713 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3371 process_color_seq (op, Color_cursor, str, resp);
3714 break; 3372 break;
3715#endif 3373#endif
3716 case XTerm_Color_pointer_fg: 3374 case XTerm_Color_pointer_fg:
3717 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3375 process_color_seq (op, Color_pointer_fg, str, resp);
3718 break; 3376 break;
3719 case XTerm_Color_pointer_bg: 3377 case XTerm_Color_pointer_bg:
3720 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3378 process_color_seq (op, Color_pointer_bg, str, resp);
3721 break; 3379 break;
3722#ifndef NO_BOLD_UNDERLINE_REVERSE 3380#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: 3381 case XTerm_Color_RV:
3730 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3382 process_color_seq (op, Color_RV, str, resp);
3731 break; 3383 break;
3384 case Rxvt_Color_BD:
3385 case URxvt_Color_BD:
3386 process_color_seq (op, Color_BD, str, resp);
3387 break;
3388 case Rxvt_Color_UL:
3389 case URxvt_Color_UL:
3390 process_color_seq (op, Color_UL, str, resp);
3391 break;
3392 case URxvt_Color_IT:
3393 process_color_seq (op, Color_IT, str, resp);
3394 break;
3732#endif 3395#endif
3396#if ENABLE_TRANSPARENCY
3397 case URxvt_Color_tint:
3398 process_color_seq (op, Color_tint, str, resp);
3399 {
3400 bool changed = false;
3733 3401
3402 if (ISSET_PIXCOLOR (Color_tint))
3403 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3404 else
3405 changed = bgPixmap.unset_tint ();
3406
3407 if (changed)
3408 update_background ();
3409 }
3410
3411 break;
3412#endif
3413
3414#if BG_IMAGE_FROM_FILE
3734 case XTerm_Pixmap: 3415 case Rxvt_Pixmap:
3735 if (*str != ';') 3416 if (!strcmp (str, "?"))
3736 { 3417 {
3737#if XPM_BACKGROUND 3418 char str[256];
3738 scale_pixmap (""); /* reset to default scaling */ 3419
3739 set_bgPixmap (str); /* change pixmap */ 3420 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3740#endif 3421 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3741 scr_touch (true); 3422 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3423 process_xterm_seq (XTerm_title, str, CHAR_ST);
3742 } 3424 }
3743 while ((str = strchr (str, ';')) != NULL) 3425 else
3744 { 3426 {
3427 int changed = 0;
3428
3429 if (*str != ';')
3430 {
3431 /* reset to default scaling :*/
3432 bgPixmap.unset_geometry ();
3433 if (bgPixmap.set_file (str)) /* change pixmap */
3434 changed++;
3435 str = strchr (str, ';');
3436 if (str == NULL)
3437 bgPixmap.set_defaultGeometry ();
3438 }
3439
3440 while (str)
3441 {
3745 str++; 3442 str++;
3746#if XPM_BACKGROUND 3443 if (bgPixmap.set_geometry (str))
3747 changed += scale_pixmap (str); 3444 changed++;
3748#endif 3445 str = strchr (str, ';');
3446 }
3749 3447
3448 if (changed)
3449 update_background ();
3750 } 3450 }
3751 if (changed)
3752 {
3753#ifdef XPM_BACKGROUND
3754 resize_pixmap ();
3755#endif
3756 scr_touch (true);
3757 }
3758 break; 3451 break;
3759 3452#endif
3760 case XTerm_restoreFG:
3761 set_window_color (Color_fg, str);
3762 break;
3763 case XTerm_restoreBG:
3764 set_window_color (Color_bg, str);
3765 break;
3766 3453
3767 case XTerm_logfile: 3454 case XTerm_logfile:
3768 // TODO, when secure mode? 3455 // TODO, when secure mode?
3769 break; 3456 break;
3770 3457
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 3458#if 0
3812 case XTerm_dumpscreen: /* no error notices */ 3459 case Rxvt_dumpscreen: /* no error notices */
3813 { 3460 {
3814 int fd; 3461 int fd;
3815 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3462 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3816 { 3463 {
3817 scr_dump (fd); 3464 scr_dump (fd);
3818 close (fd); 3465 close (fd);
3819 } 3466 }
3820 } 3467 }
3468 break;
3469#endif
3470 case XTerm_font:
3471 op = URxvt_font;
3472 case URxvt_font:
3473#if ENABLE_STYLES
3474 case URxvt_boldFont:
3475 case URxvt_italicFont:
3476 case URxvt_boldItalicFont:
3477#endif
3478 if (query)
3479 tt_printf ("\33]%d;%-.250s%c", saveop,
3480 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3481 ? fontset[op - URxvt_font]->fontdesc : "",
3482 resp);
3483 else
3484 {
3485 const char *&res = rs[Rs_font + (op - URxvt_font)];
3486
3487 res = strdup (str);
3488 allocated.push_back ((void *)res);
3489 set_fonts ();
3490 }
3491 break;
3492
3493 case URxvt_version:
3494 if (query)
3495 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3496 op,
3497 rs[Rs_name], VERSION[0], VERSION[2],
3498 resp);
3499 break;
3500
3501#if !ENABLE_MINIMAL
3502 case URxvt_locale:
3503 if (query)
3504 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3505 else
3506 {
3507 set_locale (str);
3508 pty->set_utf8_mode (enc_utf8);
3509 init_xlocale ();
3510 }
3511 break;
3512
3513 case URxvt_view_up:
3514 case URxvt_view_down:
3515 {
3516 int lines = atoi (str);
3517
3518 if (lines)
3519 scr_page (op == URxvt_view_up ? UP : DN, lines);
3520 else
3521 scr_erase_savelines ();
3522 }
3523
3524 break;
3525#endif
3526
3527#if ENABLE_PERL
3528 case URxvt_perl:
3529 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3821 break; 3530 break;
3822#endif 3531#endif
3823 } 3532 }
3824} 3533}
3825/*----------------------------------------------------------------------*/ 3534/*----------------------------------------------------------------------*/
… …
3848 { 3557 {
3849 if (mode == 'r') 3558 if (mode == 'r')
3850 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3559 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3851 else 3560 else
3852 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3561 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3853 PrivMode (state, bit); 3562 set_privmode (bit, state);
3854 } 3563 }
3855 3564
3856 return state; 3565 return state;
3857} 3566}
3858 3567
3859/* we're not using priv _yet_ */ 3568/* we're not using priv _yet_ */
3860void 3569void
3861rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3570rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3862{ 3571{
3863 unsigned int i, j; 3572 unsigned int i, j;
3864 int state; 3573 int state;
3865 3574
3866 static const struct 3575 static const struct
3867 { 3576 {
3868 const int argval; 3577 const int argval;
3869 const unsigned long bit; 3578 const unsigned long bit;
3870 }
3871
3872 argtopriv[] = { 3579 } argtopriv[] = {
3873 { 1, PrivMode_aplCUR }, 3580 { 1, PrivMode_aplCUR },
3874 { 2, PrivMode_vt52 }, 3581 { 2, PrivMode_vt52 },
3875 { 3, PrivMode_132 }, 3582 { 3, PrivMode_132 },
3876 { 4, PrivMode_smoothScroll }, 3583 { 4, PrivMode_smoothScroll },
3877 { 5, PrivMode_rVideo }, 3584 { 5, PrivMode_rVideo },
3878 { 6, PrivMode_relOrigin }, 3585 { 6, PrivMode_relOrigin },
3879 { 7, PrivMode_Autowrap }, 3586 { 7, PrivMode_Autowrap },
3880 // 8, bi-directional support mode 3587 // 8, bi-directional support mode
3881 { 9, PrivMode_MouseX10 }, 3588 { 9, PrivMode_MouseX10 },
3882#ifdef menuBar_esc
3883 { menuBar_esc, PrivMode_menuBar },
3884#endif
3885 // 18, 19 printing-related 3589 // 18, 19 printing-related
3886 { 25, PrivMode_VisibleCursor }, 3590 { 25, PrivMode_VisibleCursor },
3887#ifdef scrollBar_esc 3591#ifdef scrollBar_esc
3888 { scrollBar_esc, PrivMode_scrollBar }, 3592 { scrollBar_esc, PrivMode_scrollBar },
3889#endif 3593#endif
… …
3896 { 66, PrivMode_aplKP }, 3600 { 66, PrivMode_aplKP },
3897#ifndef NO_BACKSPACE_KEY 3601#ifndef NO_BACKSPACE_KEY
3898 { 67, PrivMode_BackSpace }, 3602 { 67, PrivMode_BackSpace },
3899#endif 3603#endif
3900 { 1000, PrivMode_MouseX11 }, 3604 { 1000, PrivMode_MouseX11 },
3901 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3605 { 1002, PrivMode_MouseBtnEvent },
3902 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3606 { 1003, PrivMode_MouseAnyEvent },
3903 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3904 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3607 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3905 { 1011, PrivMode_Keypress }, // rxvt extension 3608 { 1011, PrivMode_Keypress }, // rxvt extension
3906 // 1035 enable modifiers for alt, numlock NYI 3609 // 1035 enable modifiers for alt, numlock NYI
3907 // 1036 send ESC for meta keys NYI 3610 // 1036 send ESC for meta keys NYI
3908 // 1037 send DEL for keypad delete NYI 3611 // 1037 send DEL for keypad delete NYI
3909 { 1047, PrivMode_Screen }, 3612 { 1047, PrivMode_Screen },
3910 // 1048 save and restore cursor 3613 // 1048 save and restore cursor
3911 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3614 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3912 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3615 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3616 { 2004, PrivMode_BracketPaste },
3913 }; 3617 };
3914 3618
3915 if (nargs == 0) 3619 if (nargs == 0)
3916 return; 3620 return;
3917 3621
… …
3934 } 3638 }
3935 3639
3936 /* extra handling for values with state unkept */ 3640 /* extra handling for values with state unkept */
3937 switch (arg[i]) 3641 switch (arg[i])
3938 { 3642 {
3643#if ENABLE_STYLES
3644 case 1021:
3645 set_option (Opt_intensityStyles, mode);
3646
3647 scr_touch (true);
3648 break;
3649#endif
3939 case 1048: /* alternative cursor save */ 3650 case 1048: /* alternative cursor save */
3651 case 1049:
3940 if (options & Opt_secondaryScreen) 3652 if (option (Opt_secondaryScreen))
3941 if (mode == 0) 3653 if (mode == 0)
3942 scr_cursor (RESTORE); 3654 scr_cursor (RESTORE);
3943 else if (mode == 1) 3655 else if (mode == 1)
3944 scr_cursor (SAVE); 3656 scr_cursor (SAVE);
3945 break; 3657 break;
… …
3953 case 2: /* VT52 mode */ 3665 case 2: /* VT52 mode */
3954 /* oddball mode. should be set regardless of set/reset 3666 /* oddball mode. should be set regardless of set/reset
3955 * parameter. Return from VT52 mode with an ESC < from 3667 * parameter. Return from VT52 mode with an ESC < from
3956 * within VT52 mode 3668 * within VT52 mode
3957 */ 3669 */
3958 PrivMode (1, PrivMode_vt52); 3670 set_privmode (PrivMode_vt52, 1);
3959 break; 3671 break;
3960 case 3: /* 80/132 */ 3672 case 3: /* 80/132 */
3961 if (priv_modes & PrivMode_132OK) 3673 if (priv_modes & PrivMode_132OK)
3674 {
3675 scr_poweron ();
3962 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3676 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3677 }
3963 break; 3678 break;
3964 case 4: /* smooth scrolling */ 3679 case 4: /* smooth scrolling */
3965 if (state)
3966 options &= ~Opt_jumpScroll;
3967 else
3968 options |= Opt_jumpScroll; 3680 set_option (Opt_jumpScroll, !state);
3969 break; 3681 break;
3970 case 5: /* reverse video */ 3682 case 5: /* reverse video */
3971 scr_rvideo_mode (state); 3683 scr_rvideo_mode (state);
3972 break; 3684 break;
3973 case 6: /* relative/absolute origins */ 3685 case 6: /* relative/absolute origins */
… …
3977 scr_autowrap (state); 3689 scr_autowrap (state);
3978 break; 3690 break;
3979 /* case 8: - auto repeat, can't do on a per window basis */ 3691 /* case 8: - auto repeat, can't do on a per window basis */
3980 case 9: /* X10 mouse reporting */ 3692 case 9: /* X10 mouse reporting */
3981 if (state) /* orthogonal */ 3693 if (state) /* orthogonal */
3982 priv_modes &= ~PrivMode_MouseX11; 3694 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3983 break; 3695 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 3696#ifdef scrollBar_esc
3992 case scrollBar_esc: 3697 case scrollBar_esc:
3993 if (scrollbar_mapping (state)) 3698 if (scrollBar.map (state))
3994 { 3699 {
3995 resize_all_windows (0, 0, 0); 3700 resize_all_windows (0, 0, 0);
3996 scr_touch (true); 3701 scr_touch (true);
3997 } 3702 }
3998 break; 3703 break;
… …
4007 break; 3712 break;
4008 /* case 66: - application key pad */ 3713 /* case 66: - application key pad */
4009 /* case 67: - backspace key */ 3714 /* case 67: - backspace key */
4010 case 1000: /* X11 mouse reporting */ 3715 case 1000: /* X11 mouse reporting */
4011 if (state) /* orthogonal */ 3716 if (state) /* orthogonal */
4012 priv_modes &= ~PrivMode_MouseX10; 3717 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4013 break; 3718 break;
4014#if 0
4015 case 1001: 3719 case 1002:
4016 break; /* X11 mouse highlighting */ 3720 case 1003:
4017#endif 3721 if (state)
3722 {
3723 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3724 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3725 vt_emask_mouse = PointerMotionMask;
3726 }
3727 else
3728 vt_emask_mouse = NoEventMask;
3729 vt_select_input ();
3730 break;
4018 case 1010: /* scroll to bottom on TTY output inhibit */ 3731 case 1010: /* scroll to bottom on TTY output inhibit */
4019 if (state)
4020 options &= ~Opt_scrollTtyOutput;
4021 else
4022 options |= Opt_scrollTtyOutput; 3732 set_option (Opt_scrollTtyOutput, !state);
4023 break; 3733 break;
4024 case 1011: /* scroll to bottom on key press */ 3734 case 1011: /* scroll to bottom on key press */
4025 if (state)
4026 options |= Opt_scrollTtyKeypress; 3735 set_option (Opt_scrollTtyKeypress, state);
4027 else
4028 options &= ~Opt_scrollTtyKeypress;
4029 break; 3736 break;
4030 case 1047: /* secondary screen w/ clearing last */ 3737 case 1047: /* secondary screen w/ clearing last */
4031 if (options & Opt_secondaryScreen) 3738 if (option (Opt_secondaryScreen))
4032 if (current_screen != PRIMARY) 3739 if (current_screen != PRIMARY)
4033 scr_erase_screen (2); 3740 scr_erase_screen (2);
4034 scr_change_screen (state); 3741 scr_change_screen (state);
4035 break; 3742 break;
4036 case 1049: /* secondary screen w/ clearing first */ 3743 case 1049: /* secondary screen w/ clearing first */
4037 scr_change_screen (state); 3744 scr_change_screen (state);
4038 if (options & Opt_secondaryScreen) 3745 if (option (Opt_secondaryScreen))
4039 if (current_screen != PRIMARY) 3746 if (current_screen != PRIMARY)
4040 scr_erase_screen (2); 3747 scr_erase_screen (2);
4041 break; 3748 break;
4042 default: 3749 default:
4043 break; 3750 break;
… …
4069 rendset = 0, rendstyle = ~RS_None; 3776 rendset = 0, rendstyle = ~RS_None;
4070 break; 3777 break;
4071 case 1: 3778 case 1:
4072 rendset = 1, rendstyle = RS_Bold; 3779 rendset = 1, rendstyle = RS_Bold;
4073 break; 3780 break;
4074 //case 2: // faint or second colour 3781 //case 2: // low intensity
4075 //case 3: // italic 3782 case 3:
3783 rendset = 1, rendstyle = RS_Italic;
3784 break;
4076 case 4: 3785 case 4:
4077 rendset = 1, rendstyle = RS_Uline; 3786 rendset = 1, rendstyle = RS_Uline;
4078 break; 3787 break;
4079 case 5: // slowly blinking 3788 case 5: // slowly blinking
4080 case 6: // rapidly blinking 3789 case 6: // rapidly blinking
… …
4092 //case 11: // scoansi acs on, first alt font 3801 //case 11: // scoansi acs on, first alt font
4093 //case 12: // scoansi acs on, |0x80, second alt font 3802 //case 12: // scoansi acs on, |0x80, second alt font
4094 //... 3803 //...
4095 //case 19: // ninth alt font 3804 //case 19: // ninth alt font
4096 //case 20: // gothic 3805 //case 20: // gothic
4097 case 21: // disable bold, faint 3806 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
4098 rendset = 0, rendstyle = RS_Bold; 3807 rendset = 0, rendstyle = RS_Bold;
4099 break; 3808 break;
4100 case 22: 3809 case 22: // normal intensity
4101 rendset = 0, rendstyle = RS_Bold; 3810 rendset = 0, rendstyle = RS_Bold;
4102 break; 3811 break;
4103 //case 23: disable italic 3812 case 23: // disable italic
3813 rendset = 0, rendstyle = RS_Italic;
3814 break;
4104 case 24: 3815 case 24:
4105 rendset = 0, rendstyle = RS_Uline; 3816 rendset = 0, rendstyle = RS_Uline;
4106 break; 3817 break;
4107 case 25: 3818 case 25:
4108 rendset = 0, rendstyle = RS_Blink; 3819 rendset = 0, rendstyle = RS_Blink;
4109 break; 3820 break;
4110 case 26: 3821 case 26: // variable spacing (iso 8613)
4111 rendset = 0, rendstyle = RS_Blink; 3822 rendset = 0, rendstyle = RS_Blink;
4112 break; 3823 break;
4113 case 27: 3824 case 27:
4114 rendset = 0, rendstyle = RS_RVid; 3825 rendset = 0, rendstyle = RS_RVid;
4115 break; 3826 break;
… …
4133 case 35: 3844 case 35:
4134 case 36: 3845 case 36:
4135 case 37: 3846 case 37:
4136 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3847 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4137 break; 3848 break;
4138#ifdef TTY_256COLOR 3849 case 38: // set fg color, ISO 8613-6
4139 case 38:
4140 if (nargs > i + 2 && arg[i + 1] == 5) 3850 if (nargs > i + 2 && arg[i + 1] == 5)
4141 { 3851 {
4142 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3852 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4143 i += 2; 3853 i += 2;
4144 } 3854 }
4145 break; 3855 break;
4146#endif
4147 case 39: /* default fg */ 3856 case 39: /* default fg */
4148 scr_color (Color_fg, Color_fg); 3857 scr_color (Color_fg, Color_fg);
4149 break; 3858 break;
4150 3859
4151 case 40: 3860 case 40:
… …
4156 case 45: 3865 case 45:
4157 case 46: 3866 case 46:
4158 case 47: 3867 case 47:
4159 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3868 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4160 break; 3869 break;
4161#ifdef TTY_256COLOR 3870 case 48: // set bg color, ISO 8613-6
4162 case 48:
4163 if (nargs > i + 2 && arg[i + 1] == 5) 3871 if (nargs > i + 2 && arg[i + 1] == 5)
4164 { 3872 {
4165 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3873 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4166 i += 2; 3874 i += 2;
4167 } 3875 }
4168 break; 3876 break;
4169#endif
4170 case 49: /* default bg */ 3877 case 49: /* default bg */
4171 scr_color (Color_bg, Color_bg); 3878 scr_color (Color_bg, Color_bg);
4172 break; 3879 break;
4173 3880
4174#ifndef NO_BRIGHTCOLOR 3881 //case 50: // not variable spacing
3882
3883#if !ENABLE_MINIMAL
4175 case 90: 3884 case 90:
4176 case 91: /* set bright fg color */ 3885 case 91: /* set bright fg color */
4177 case 92: 3886 case 92:
4178 case 93: 3887 case 93:
4179 case 94: 3888 case 94:
4180 case 95: 3889 case 95:
4181 case 96: 3890 case 96:
4182 case 97: 3891 case 97:
4183 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3892 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4184 Color_fg);
4185 break; 3893 break;
4186 case 100: 3894 case 100:
4187 case 101: /* set bright bg color */ 3895 case 101: /* set bright bg color */
4188 case 102: 3896 case 102:
4189 case 103: 3897 case 103:
4190 case 104: 3898 case 104:
4191 case 105: 3899 case 105:
4192 case 106: 3900 case 106:
4193 case 107: 3901 case 107:
4194 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3902 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4195 Color_bg);
4196 break; 3903 break;
4197#endif 3904#endif
4198
4199 } 3905 }
4200 } 3906 }
4201} 3907}
4202/*}}} */ 3908/*}}} */
4203 3909
… …
4206rxvt_term::process_graphics () 3912rxvt_term::process_graphics ()
4207{ 3913{
4208 unicode_t ch, cmd = cmd_getc (); 3914 unicode_t ch, cmd = cmd_getc ();
4209 3915
4210 if (cmd == 'Q') 3916 if (cmd == 'Q')
3917 {
4211 { /* query graphics */ 3918 /* query graphics */
4212 tt_printf ("\033G0\012"); /* no graphics */ 3919 tt_printf ("\033G0\012"); /* no graphics */
4213 return; 3920 return;
4214 } 3921 }
4215 /* swallow other graphics sequences until terminating ':' */ 3922 /* swallow other graphics sequences until terminating ':' */
4216 do 3923 do
… …
4227 */ 3934 */
4228void 3935void
4229rxvt_term::tt_printf (const char *fmt,...) 3936rxvt_term::tt_printf (const char *fmt,...)
4230{ 3937{
4231 va_list arg_ptr; 3938 va_list arg_ptr;
4232 unsigned char buf[256]; 3939 char buf[256];
4233 3940
4234 va_start (arg_ptr, fmt); 3941 va_start (arg_ptr, fmt);
4235 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3942 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4236 va_end (arg_ptr); 3943 va_end (arg_ptr);
4237 tt_write (buf, strlen (buf)); 3944 tt_write (buf, strlen (buf));
… …
4239 3946
4240/* ---------------------------------------------------------------------- */ 3947/* ---------------------------------------------------------------------- */
4241/* Write data to the pty as typed by the user, pasted with the mouse, 3948/* 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. 3949 * or generated by us in response to a query ESC sequence.
4243 */ 3950 */
3951const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3952
4244void 3953void
4245rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3954rxvt_term::tt_write (const char *data, unsigned int len)
4246{ 3955{
4247 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3956 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3957 return;
4248 3958
4249 if (len) 3959 if (pty->pty < 0)
3960 return;
3961
3962 if (v_buflen == 0)
3963 {
3964 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3965
3966 if ((unsigned int)written == len)
3967 return;
3968
3969 data += written;
3970 len -= written;
4250 { 3971 }
3972
3973 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3974
3975 memcpy (v_buffer + v_buflen, data, len);
3976 v_buflen += len;
3977
3978 pty_ev.set (ev::READ | ev::WRITE);
3979}
3980
3981void rxvt_term::pty_write ()
3982{
3983 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3984
3985 if (written > 0)
3986 {
3987 v_buflen -= written;
3988
4251 if (v_buflen == 0) 3989 if (v_buflen == 0)
4252 { 3990 {
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); 3991 free (v_buffer);
4280 v_buffer = 0; 3992 v_buffer = 0;
4281 v_buflen = 0;
4282 3993
4283 pty_ev.set (EVENT_READ); 3994 pty_ev.set (ev::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; 3995 return;
4296 } 3996 }
3997
3998 memmove (v_buffer, v_buffer + written, v_buflen);
4297 } 3999 }
4000 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4001 pty_ev.set (ev::READ);
4298} 4002}
4299 4003
4300/*----------------------- end-of-file (C source) -----------------------*/ 4004/*----------------------- end-of-file (C source) -----------------------*/
4301 4005

Diff Legend

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