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

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

Diff Legend

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