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

Diff Legend

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