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

Diff Legend

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