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

Diff Legend

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