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

Diff Legend

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