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

Diff Legend

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