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.177 by root, Mon Dec 13 07:18:52 2004 UTC vs.
Revision 1.544 by sf-exg, Sat Apr 26 14:55:58 2014 UTC

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

Diff Legend

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