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.120 by root, Tue Aug 10 22:36:30 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
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-2004 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.
… …
51 52
52#include <wchar.h> 53#include <wchar.h>
53 54
54/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
55 56
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58
59// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input;
61
56/*{{{ Convert the keypress event into a string */ 62/*{{{ Convert the keypress event into a string */
57void 63void
58rxvt_term::lookup_key (XKeyEvent *ev) 64rxvt_term::lookup_key (XKeyEvent &ev)
59{ 65{
60 int ctrl, meta, shft, len; 66 int ctrl, meta, shft, len;
61 unsigned int newlen; 67 unsigned int newlen;
62 KeySym keysym; 68 KeySym keysym;
63#ifdef DEBUG_CMD 69#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 70 static int debug_key = 1; /* accessible by a debugger only */
65#endif 71#endif
66 int valid_keysym; 72 int valid_keysym;
67 unsigned char kbuf[KBUFSZ]; 73 unsigned char kbuf[KBUFSZ];
68 74
69 /* 75 /*
70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
71 * escape sequence to toggle the Keypad. 77 * escape sequence to toggle the Keypad.
72 * 78 *
73 * Always permit `shift' to override the current setting 79 * Always permit `shift' to override the current setting
74 */ 80 */
75 shft = (ev->state & ShiftMask); 81 shft = (ev.state & ShiftMask);
76 ctrl = (ev->state & ControlMask); 82 ctrl = (ev.state & ControlMask);
77 meta = (ev->state & ModMetaMask); 83 meta = (ev.state & ModMetaMask);
78 84
79 if (numlock_state || (ev->state & ModNumLockMask)) 85 if (numlock_state || (ev.state & ModNumLockMask))
80 { 86 {
81 numlock_state = (ev->state & ModNumLockMask); 87 numlock_state = (ev.state & ModNumLockMask);
82 PrivMode((!numlock_state), PrivMode_aplKP); 88 PrivMode ((!numlock_state), PrivMode_aplKP);
83 } 89 }
84 90
85 kbuf[0] = 0; 91 kbuf[0] = 0;
86 92
87#ifdef USE_XIM 93#ifdef USE_XIM
88 if (Input_Context) 94 if (Input_Context)
89 { 95 {
90 Status status_return; 96 Status status_return;
91 97
98#if 0
92#ifdef X_HAVE_UTF8_STRING 99#ifdef X_HAVE_UTF8_STRING
93 if (enc_utf8 && 0) 100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
94 len = Xutf8LookupString (Input_Context, ev, (char *)kbuf, 101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
95 KBUFSZ, &keysym, &status_return); 102 KBUFSZ, &keysym, &status_return);
96 else 103 else
97#endif 104#endif
98 105#endif
99 { 106 {
100 wchar_t wkbuf[KBUFSZ + 1]; 107 wchar_t wkbuf[KBUFSZ + 1];
101 108
102 // the XOpenIM manpage lies about hardcoding the locale 109 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 110 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale]) 111 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]); 112 SET_LOCALE (rs[Rs_imLocale]);
106 // assume wchar_t == unicode or better 113 // assume wchar_t == unicode or better
107 len = XwcLookupString (Input_Context, ev, wkbuf, 114 len = XwcLookupString (Input_Context, &ev, wkbuf,
108 KBUFSZ, &keysym, &status_return); 115 KBUFSZ, &keysym, &status_return);
109 if (rs[Rs_imLocale]) 116 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 117 SET_LOCALE (locale);
111 118
112 if (status_return == XLookupChars 119 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 120 || status_return == XLookupBoth)
114 { 121 {
122 /* make sure the user can type ctrl-@, i.e. NUL */
123 if (len == 1 && *wkbuf == 0)
124 {
125 kbuf[0] = 0;
126 len = 1;
127 }
128 else
129 {
115 wkbuf[len] = 0; 130 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 131 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 132 if (len < 0)
118 len = 0; 133 len = 0;
134 }
119 } 135 }
120 else 136 else
121 len = 0; 137 len = 0;
122 } 138 }
123 139
124 valid_keysym = status_return == XLookupKeySym 140 valid_keysym = status_return == XLookupKeySym
125 || status_return == XLookupBoth; 141 || status_return == XLookupBoth;
126 } 142 }
127 else 143 else
128#endif 144#endif
129
130 { 145 {
131 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 146 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
132 valid_keysym = !len; 147 valid_keysym = keysym != NoSymbol;
133 } 148 }
134 149
135 if (valid_keysym) 150 if (valid_keysym)
136 { 151 {
137 /* for some backwards compatibility */
138#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
139# ifdef HOTKEY_CTRL
140 if (ctrl)
141# else
142 if (meta)
143# 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
158 if (TermWin.saveLines) 152 if (TermWin.saveLines)
159 { 153 {
160#ifdef UNSHIFTED_SCROLLKEYS 154#ifdef UNSHIFTED_SCROLLKEYS
161 if (!ctrl && !meta) 155 if (!ctrl && !meta)
162 { 156 {
163#else 157#else
164 if (IS_SCROLL_MOD) 158 if (IS_SCROLL_MOD)
165 { 159 {
166#endif 160#endif
167 int lnsppg; 161 int lnsppg;
168 162
169#ifdef PAGING_CONTEXT_LINES 163#ifdef PAGING_CONTEXT_LINES
170 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
171#else 165#else
172 lnsppg = TermWin.nrow * 4 / 5; 166 lnsppg = TermWin.nrow * 4 / 5;
… …
210 scr_move_to (1, 0); 204 scr_move_to (1, 0);
211 return; 205 return;
212 } 206 }
213 } 207 }
214#endif 208#endif
215
216 } 209 }
217 210
218 if (shft) 211 if (shft)
219 { 212 {
220 /* Shift + F1 - F10 generates F11 - F20 */ 213 /* Shift + F1 - F10 generates F11 - F20 */
… …
227 { 220 {
228 switch (keysym) 221 switch (keysym)
229 { 222 {
230 /* normal XTerm key bindings */ 223 /* normal XTerm key bindings */
231 case XK_Insert: /* Shift+Insert = paste mouse selection */ 224 case XK_Insert: /* Shift+Insert = paste mouse selection */
232 selection_request (ev->time, 0, 0); 225 selection_request (ev.time, 0, 0);
233 return; 226 return;
234 /* rxvt extras */ 227 /* rxvt extras */
235 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 228 case XK_KP_Add: /* Shift+KP_Add = bigger font */
236 change_font (0, FONT_UP); 229 change_font (FONT_UP);
237 return; 230 return;
238 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
239 change_font (0, FONT_DN); 232 change_font (FONT_DN);
240 return; 233 return;
241 } 234 }
242 } 235 }
243 } 236 }
244#ifdef PRINTPIPE 237#ifdef PRINTPIPE
… …
246 { 239 {
247 scr_printscreen (ctrl | shft); 240 scr_printscreen (ctrl | shft);
248 return; 241 return;
249 } 242 }
250#endif 243#endif
251#ifdef GREEK_SUPPORT
252 if (keysym == ks_greekmodeswith)
253 {
254 greek_mode = !greek_mode;
255 if (greek_mode)
256 {
257 xterm_seq (XTerm_title,
258 (greek_getmode() == GREEK_ELOT928
259 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
260 greek_reset();
261 }
262 else
263 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
264 return;
265 }
266#endif
267 244
268 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 245 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
269 { 246 {
270#ifdef KEYSYM_RESOURCE 247#ifdef KEYSYM_RESOURCE
271 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
272 { 249 {
273 unsigned int l; 250 unsigned int l;
274 const unsigned char *kbuf0; 251 const unsigned char *kbuf0;
275 const unsigned char ch = C0_ESC;
276 252
277 kbuf0 = (Keysym_map[keysym & 0xFF]); 253 kbuf0 = (Keysym_map[keysym & 0xFF]);
278 l = (unsigned int)*kbuf0++; 254 l = (unsigned int)*kbuf0++;
279 255
280 /* escape prefix */ 256 /* escape prefix */
281 if (meta) 257 if (meta
282# ifdef META8_OPTION 258# ifdef META8_OPTION
283 if (meta_char == C0_ESC) 259 && meta_char == C0_ESC
284# endif 260# endif
261 )
262 {
263 const unsigned char ch = C0_ESC;
285 tt_write (&ch, 1); 264 tt_write (&ch, 1);
265 }
266
286 tt_write (kbuf0, l); 267 tt_write (kbuf0, l);
287 return; 268 return;
288 } 269 }
289 else 270 else
290#endif 271#endif
291
292 { 272 {
293 newlen = 1; 273 newlen = 1;
294 switch (keysym) 274 switch (keysym)
295 { 275 {
296#ifndef NO_BACKSPACE_KEY 276#ifndef NO_BACKSPACE_KEY
297 case XK_BackSpace: 277 case XK_BackSpace:
298 if (PrivateModes & PrivMode_HaveBackSpace) 278 if (PrivateModes & PrivMode_HaveBackSpace)
299 { 279 {
300 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace) 280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
301 ^ !!ctrl) ? '\b' : '\177'; 281 ^ !!ctrl) ? '\b' : '\177';
302 kbuf[1] = '\0'; 282 kbuf[1] = '\0';
303 } 283 }
304 else 284 else
305 STRCPY(kbuf, key_backspace); 285 STRCPY (kbuf, key_backspace);
306# ifdef MULTICHAR_SET
307 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
308 {
309 int col, row;
310
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 }
317# endif
318 break; 286 break;
319#endif 287#endif
320#ifndef NO_DELETE_KEY 288#ifndef NO_DELETE_KEY
321 case XK_Delete: 289 case XK_Delete:
322 STRCPY(kbuf, key_delete); 290 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; 291 break;
336#endif 292#endif
337 case XK_Tab: 293 case XK_Tab:
338 if (shft) 294 if (shft)
339 STRCPY(kbuf, "\033[Z"); 295 STRCPY (kbuf, "\033[Z");
340 else 296 else
341 { 297 {
342#ifdef CTRL_TAB_MAKES_META 298#ifdef CTRL_TAB_MAKES_META
343 if (ctrl) 299 if (ctrl)
344 meta = 1; 300 meta = 1;
345#endif 301#endif
346#ifdef MOD4_TAB_MAKES_META 302#ifdef MOD4_TAB_MAKES_META
347 if (ev->state & Mod4Mask) 303 if (ev.state & Mod4Mask)
348 meta = 1; 304 meta = 1;
349#endif 305#endif
350 newlen = 0; 306 newlen = 0;
351 } 307 }
352 break; 308 break;
353 309
354
355#ifdef XK_KP_Left 310#ifdef XK_KP_Left
356 case XK_KP_Up: /* \033Ox or standard */ 311 case XK_KP_Up: /* \033Ox or standard */
357 case XK_KP_Down: /* \033Or or standard */ 312 case XK_KP_Down: /* \033Or or standard */
358 case XK_KP_Right: /* \033Ov or standard */ 313 case XK_KP_Right: /* \033Ov or standard */
359 case XK_KP_Left: /* \033Ot or standard */ 314 case XK_KP_Left: /* \033Ot or standard */
360 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
361 { 316 {
362 STRCPY(kbuf, "\033OZ"); 317 STRCPY (kbuf, "\033OZ");
363 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 318 kbuf[2] = "txvr"[keysym - XK_KP_Left];
364 break; 319 break;
365 } 320 }
366 else 321 else
367 /* translate to std. cursor key */ 322 /* translate to std. cursor key */
368 keysym = XK_Left + (keysym - XK_KP_Left); 323 keysym = XK_Left + (keysym - XK_KP_Left);
… …
370#endif 325#endif
371 case XK_Up: /* "\033[A" */ 326 case XK_Up: /* "\033[A" */
372 case XK_Down: /* "\033[B" */ 327 case XK_Down: /* "\033[B" */
373 case XK_Right: /* "\033[C" */ 328 case XK_Right: /* "\033[C" */
374 case XK_Left: /* "\033[D" */ 329 case XK_Left: /* "\033[D" */
375 STRCPY(kbuf, "\033[Z"); 330 STRCPY (kbuf, "\033[Z");
376 kbuf[2] = ("DACB"[keysym - XK_Left]); 331 kbuf[2] = "DACB"[keysym - XK_Left];
377 /* do Shift first */ 332 /* do Shift first */
378 if (shft) 333 if (shft)
379 kbuf[2] = ("dacb"[keysym - XK_Left]); 334 kbuf[2] = "dacb"[keysym - XK_Left];
380 else if (ctrl) 335 else if (ctrl)
381 { 336 {
382 kbuf[1] = 'O'; 337 kbuf[1] = 'O';
383 kbuf[2] = ("dacb"[keysym - XK_Left]); 338 kbuf[2] = "dacb"[keysym - XK_Left];
384 } 339 }
385 else if (PrivateModes & PrivMode_aplCUR) 340 else if (PrivateModes & PrivMode_aplCUR)
386 kbuf[1] = 'O'; 341 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; 342 break;
423 343
424#ifndef UNSHIFTED_SCROLLKEYS 344#ifndef UNSHIFTED_SCROLLKEYS
425# ifdef XK_KP_Prior 345# ifdef XK_KP_Prior
426 case XK_KP_Prior: 346 case XK_KP_Prior:
427 /* allow shift to override */ 347 /* allow shift to override */
428 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
429 { 349 {
430 STRCPY(kbuf, "\033Oy"); 350 STRCPY (kbuf, "\033Oy");
431 break; 351 break;
432 } 352 }
433 /* FALLTHROUGH */ 353 /* FALLTHROUGH */
434# endif 354# endif
435 case XK_Prior: 355 case XK_Prior:
436 STRCPY(kbuf, "\033[5~"); 356 STRCPY (kbuf, "\033[5~");
437 break; 357 break;
438# ifdef XK_KP_Next 358# ifdef XK_KP_Next
439 case XK_KP_Next: 359 case XK_KP_Next:
440 /* allow shift to override */ 360 /* allow shift to override */
441 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
442 { 362 {
443 STRCPY(kbuf, "\033Os"); 363 STRCPY (kbuf, "\033Os");
444 break; 364 break;
445 } 365 }
446 /* FALLTHROUGH */ 366 /* FALLTHROUGH */
447# endif 367# endif
448 case XK_Next: 368 case XK_Next:
449 STRCPY(kbuf, "\033[6~"); 369 STRCPY (kbuf, "\033[6~");
450 break; 370 break;
451#endif 371#endif
452 case XK_KP_Enter: 372 case XK_KP_Enter:
453 /* allow shift to override */ 373 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
455 { 375 {
456 STRCPY(kbuf, "\033OM"); 376 STRCPY (kbuf, "\033OM");
457 } 377 }
458 else 378 else
459 { 379 {
460 kbuf[0] = '\r'; 380 kbuf[0] = '\r';
461 kbuf[1] = '\0'; 381 kbuf[1] = '\0';
462 } 382 }
463 break; 383 break;
464 384
465#ifdef XK_KP_Begin 385#ifdef XK_KP_Begin
466 case XK_KP_Begin: 386 case XK_KP_Begin:
467 STRCPY(kbuf, "\033Ou"); 387 STRCPY (kbuf, "\033Ou");
468 break; 388 break;
469 389
470 case XK_KP_Insert: 390 case XK_KP_Insert:
471 STRCPY(kbuf, "\033Op"); 391 STRCPY (kbuf, "\033Op");
472 break; 392 break;
473 393
474 case XK_KP_Delete: 394 case XK_KP_Delete:
475 STRCPY(kbuf, "\033On"); 395 STRCPY (kbuf, "\033On");
476 break; 396 break;
477#endif 397#endif
478 case XK_KP_F1: /* "\033OP" */ 398 case XK_KP_F1: /* "\033OP" */
479 case XK_KP_F2: /* "\033OQ" */ 399 case XK_KP_F2: /* "\033OQ" */
480 case XK_KP_F3: /* "\033OR" */ 400 case XK_KP_F3: /* "\033OR" */
481 case XK_KP_F4: /* "\033OS" */ 401 case XK_KP_F4: /* "\033OS" */
482 STRCPY(kbuf, "\033OP"); 402 STRCPY (kbuf, "\033OP");
483 kbuf[2] += (keysym - XK_KP_F1); 403 kbuf[2] += (keysym - XK_KP_F1);
484 break; 404 break;
485 405
486 case XK_KP_Multiply: /* "\033Oj" : "*" */ 406 case XK_KP_Multiply: /* "\033Oj" : "*" */
487 case XK_KP_Add: /* "\033Ok" : "+" */ 407 case XK_KP_Add: /* "\033Ok" : "+" */
488 case XK_KP_Separator: /* "\033Ol" : "," */ 408 case XK_KP_Separator: /* "\033Ol" : "," */
489 case XK_KP_Subtract: /* "\033Om" : "-" */ 409 case XK_KP_Subtract: /* "\033Om" : "-" */
490 case XK_KP_Decimal: /* "\033On" : "." */ 410 case XK_KP_Decimal: /* "\033On" : "." */
491 case XK_KP_Divide: /* "\033Oo" : "/" */ 411 case XK_KP_Divide: /* "\033Oo" : "/" */
492 case XK_KP_0: /* "\033Op" : "0" */ 412 case XK_KP_0: /* "\033Op" : "0" */
… …
500 case XK_KP_8: /* "\033Ox" : "8" */ 420 case XK_KP_8: /* "\033Ox" : "8" */
501 case XK_KP_9: /* "\033Oy" : "9" */ 421 case XK_KP_9: /* "\033Oy" : "9" */
502 /* allow shift to override */ 422 /* allow shift to override */
503 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
504 { 424 {
505 STRCPY(kbuf, "\033Oj"); 425 STRCPY (kbuf, "\033Oj");
506 kbuf[2] += (keysym - XK_KP_Multiply); 426 kbuf[2] += (keysym - XK_KP_Multiply);
507 } 427 }
508 else 428 else
509 { 429 {
510 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
511 kbuf[1] = '\0'; 431 kbuf[1] = '\0';
512 } 432 }
513 break; 433 break;
514 434
515 case XK_Find: 435 case XK_Find:
516 STRCPY(kbuf, "\033[1~"); 436 STRCPY (kbuf, "\033[1~");
517 break; 437 break;
518 case XK_Insert: 438 case XK_Insert:
519 STRCPY(kbuf, "\033[2~"); 439 STRCPY (kbuf, "\033[2~");
520 break; 440 break;
521#ifdef DXK_Remove /* support for DEC remove like key */ 441#ifdef DXK_Remove /* support for DEC remove like key */
522 case DXK_Remove: 442 case DXK_Remove:
523 /* FALLTHROUGH */ 443 /* FALLTHROUGH */
524#endif 444#endif
525 case XK_Execute: 445 case XK_Execute:
526 STRCPY(kbuf, "\033[3~"); 446 STRCPY (kbuf, "\033[3~");
527 break; 447 break;
528 case XK_Select: 448 case XK_Select:
529 STRCPY(kbuf, "\033[4~"); 449 STRCPY (kbuf, "\033[4~");
530 break; 450 break;
531#ifdef XK_KP_End 451#ifdef XK_KP_End
532 case XK_KP_End: 452 case XK_KP_End:
533 /* allow shift to override */ 453 /* allow shift to override */
534 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
535 { 455 {
536 STRCPY(kbuf, "\033Oq"); 456 STRCPY (kbuf, "\033Oq");
537 break; 457 break;
538 } 458 }
539 /* FALLTHROUGH */ 459 /* FALLTHROUGH */
540#endif 460#endif
541 case XK_End: 461 case XK_End:
542 STRCPY(kbuf, KS_END); 462 STRCPY (kbuf, KS_END);
543 break; 463 break;
544#ifdef XK_KP_Home 464#ifdef XK_KP_Home
545 case XK_KP_Home: 465 case XK_KP_Home:
546 /* allow shift to override */ 466 /* allow shift to override */
547 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
548 { 468 {
549 STRCPY(kbuf, "\033Ow"); 469 STRCPY (kbuf, "\033Ow");
550 break; 470 break;
551 } 471 }
552 /* FALLTHROUGH */ 472 /* FALLTHROUGH */
553#endif 473#endif
554 case XK_Home: 474 case XK_Home:
555 STRCPY(kbuf, KS_HOME); 475 STRCPY (kbuf, KS_HOME);
556 break; 476 break;
557 477
558#define FKEY(n, fkey) \ 478#define FKEY(n, fkey) \
559 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
560 480
561 case XK_F1: /* "\033[11~" */ 481 case XK_F1: /* "\033[11~" */
562 case XK_F2: /* "\033[12~" */ 482 case XK_F2: /* "\033[12~" */
563 case XK_F3: /* "\033[13~" */ 483 case XK_F3: /* "\033[13~" */
564 case XK_F4: /* "\033[14~" */ 484 case XK_F4: /* "\033[14~" */
565 case XK_F5: /* "\033[15~" */ 485 case XK_F5: /* "\033[15~" */
566 FKEY(11, XK_F1); 486 FKEY (11, XK_F1);
567 break; 487 break;
568 case XK_F6: /* "\033[17~" */ 488 case XK_F6: /* "\033[17~" */
569 case XK_F7: /* "\033[18~" */ 489 case XK_F7: /* "\033[18~" */
570 case XK_F8: /* "\033[19~" */ 490 case XK_F8: /* "\033[19~" */
571 case XK_F9: /* "\033[20~" */ 491 case XK_F9: /* "\033[20~" */
572 case XK_F10: /* "\033[21~" */ 492 case XK_F10: /* "\033[21~" */
573 FKEY(17, XK_F6); 493 FKEY (17, XK_F6);
574 break; 494 break;
575 case XK_F11: /* "\033[23~" */ 495 case XK_F11: /* "\033[23~" */
576 case XK_F12: /* "\033[24~" */ 496 case XK_F12: /* "\033[24~" */
577 case XK_F13: /* "\033[25~" */ 497 case XK_F13: /* "\033[25~" */
578 case XK_F14: /* "\033[26~" */ 498 case XK_F14: /* "\033[26~" */
579 FKEY(23, XK_F11); 499 FKEY (23, XK_F11);
580 break; 500 break;
581 case XK_F15: /* "\033[28~" */ 501 case XK_F15: /* "\033[28~" */
582 case XK_F16: /* "\033[29~" */ 502 case XK_F16: /* "\033[29~" */
583 FKEY(28, XK_F15); 503 FKEY (28, XK_F15);
584 break; 504 break;
585 case XK_Help: /* "\033[28~" */ 505 case XK_Help: /* "\033[28~" */
586 FKEY(28, XK_Help); 506 FKEY (28, XK_Help);
587 break; 507 break;
588 case XK_Menu: /* "\033[29~" */ 508 case XK_Menu: /* "\033[29~" */
589 FKEY(29, XK_Menu); 509 FKEY (29, XK_Menu);
590 break; 510 break;
591 case XK_F17: /* "\033[31~" */ 511 case XK_F17: /* "\033[31~" */
592 case XK_F18: /* "\033[32~" */ 512 case XK_F18: /* "\033[32~" */
593 case XK_F19: /* "\033[33~" */ 513 case XK_F19: /* "\033[33~" */
594 case XK_F20: /* "\033[34~" */ 514 case XK_F20: /* "\033[34~" */
… …
605 case XK_F31: /* "\033[45~" */ 525 case XK_F31: /* "\033[45~" */
606 case XK_F32: /* "\033[46~" */ 526 case XK_F32: /* "\033[46~" */
607 case XK_F33: /* "\033[47~" */ 527 case XK_F33: /* "\033[47~" */
608 case XK_F34: /* "\033[48~" */ 528 case XK_F34: /* "\033[48~" */
609 case XK_F35: /* "\033[49~" */ 529 case XK_F35: /* "\033[49~" */
610 FKEY(31, XK_F17); 530 FKEY (31, XK_F17);
611 break; 531 break;
612#undef FKEY 532#undef FKEY
613 default: 533 default:
614 newlen = 0; 534 newlen = 0;
615 break; 535 break;
616 } 536 }
617 if (newlen) 537 if (newlen)
618 len = STRLEN(kbuf); 538 len = STRLEN (kbuf);
619 } 539 }
540
620 /* 541 /*
621 * Pass meta for all function keys, if 'meta' option set 542 * Pass meta for all function keys, if 'meta' option set
622 */ 543 */
623#ifdef META8_OPTION 544#ifdef META8_OPTION
624 if (meta && (meta_char == 0x80) && len > 0) 545 if (meta && (meta_char == 0x80) && len > 0)
… …
639 { 560 {
640 unsigned char *ch; 561 unsigned char *ch;
641 562
642 for (ch = kbuf; ch < kbuf + len; ch++) 563 for (ch = kbuf; ch < kbuf + len; ch++)
643 *ch |= 0x80; 564 *ch |= 0x80;
565
644 meta = 0; 566 meta = 0;
645 } 567 }
646#endif
647#ifdef GREEK_SUPPORT
648 if (greek_mode)
649 len = greek_xlat(kbuf, len);
650#endif 568#endif
651 /* nil */ ; 569 /* nil */ ;
652 } 570 }
653 } 571 }
654 572
… …
677 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 595 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
678 596
679 /* escape prefix */ 597 /* escape prefix */
680 if (meta 598 if (meta
681#ifdef META8_OPTION 599#ifdef META8_OPTION
682 && (meta_char == C0_ESC) 600 && meta_char == C0_ESC
683#endif 601#endif
684 ) 602 )
685 { 603 {
686 const unsigned char ch = C0_ESC; 604 const unsigned char ch = C0_ESC;
687
688 tt_write(&ch, 1); 605 tt_write (&ch, 1);
689 } 606 }
607
690#ifdef DEBUG_CMD 608#if defined(DEBUG_CMD)
691 if (debug_key)
692 { /* Display keyboard buffer contents */ 609 /* Display keyboard buffer contents */
693 char *p; 610 unsigned char *p;
694 int i; 611 int i;
695 612
696 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 613 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
697 for (i = 0, p = kbuf; i < len; i++, p++) 614 for (i = 0, p = kbuf; i < len; i++, p++)
698 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 615 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
699 fprintf(stderr, "'\n"); 616 fprintf (stderr, "'\n");
700 }
701#endif /* DEBUG_CMD */ 617#endif /* DEBUG_CMD */
702 tt_write (kbuf, (unsigned int)len); 618 tt_write (kbuf, (unsigned int)len);
703} 619}
704/*}}} */ 620/*}}} */
705 621
706#if (MENUBAR_MAX) 622#if (MENUBAR_MAX)
707/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
708/* attempt to `write' count to the input buffer */ 624/* attempt to `write' count to the input buffer */
709unsigned int 625unsigned int
710rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 626rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
711{ 627{
712 unsigned int n, s; 628 unsigned int n, s;
713 629
714 n = cmdbuf_ptr - cmdbuf_base; 630 n = cmdbuf_ptr - cmdbuf_base;
715 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632
716 if (n > 0 && s < count) 633 if (n > 0 && s < count)
717 { 634 {
718 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 635 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
719 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
720 cmdbuf_ptr = cmdbuf_base; 637 cmdbuf_ptr = cmdbuf_base;
721 cmdbuf_endp -= n; 638 cmdbuf_endp -= n;
722 s += n; 639 s += n;
723 } 640 }
641
724 if (count > s) 642 if (count > s)
725 { 643 {
726 rxvt_print_error("data loss: cmd_write too large"); 644 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
727 count = s; 645 count = s;
728 } 646 }
647
729 for (; count--;) 648 for (; count--;)
730 *cmdbuf_endp++ = *str++; 649 *cmdbuf_endp++ = *str++;
650
651 cmd_parse ();
652
731 return 0; 653 return 0;
732} 654}
733#endif /* MENUBAR_MAX */ 655#endif /* MENUBAR_MAX */
734 656
735void 657void
… …
739 if (want_full_refresh) 661 if (want_full_refresh)
740 { 662 {
741 want_full_refresh = 0; 663 want_full_refresh = 0;
742 scr_clear (); 664 scr_clear ();
743 scr_touch (false); 665 scr_touch (false);
744 want_refresh = 1;
745 } 666 }
746#endif 667#endif
747 668
748 if (want_refresh) 669 if (want_refresh)
749 { 670 {
750 scr_refresh (refresh_type); 671 scr_refresh (refresh_type);
751 scrollbar_show (1); 672 scrollbar_show (1);
752#ifdef USE_XIM 673#ifdef USE_XIM
753 IMSendSpot (); 674 IMSendSpot ();
754#endif 675#endif
755
756 } 676 }
757 677
758 XFlush (Xdisplay); 678 display->flush ();
679
680 flush_ev.stop ();
759} 681}
760 682
761void 683void
762rxvt_term::check_cb (check_watcher &w) 684rxvt_term::check_cb (check_watcher &w)
763{ 685{
764 SET_R (this); 686 SET_R (this);
765 SET_LOCALE (locale); 687 SET_LOCALE (locale);
766 688
689 display->flush ();
690
691 if (want_refresh && !flush_ev.active)
692 flush_ev.start (NOW + 0.01);
693}
694
695void
696rxvt_term::flush_cb (time_watcher &w)
697{
698 SET_R (this);
699 SET_LOCALE (locale);
700
701 refresh_limit = 1;
702 refresh_count = 0;
767 flush (); 703 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} 704}
813 705
814#ifdef CURSOR_BLINK 706#ifdef CURSOR_BLINK
815void 707void
816rxvt_term::cursor_blink_cb (time_watcher &w) 708rxvt_term::cursor_blink_cb (time_watcher &w)
… …
833 w.start (w.at + TEXT_BLINK_INTERVAL); 725 w.start (w.at + TEXT_BLINK_INTERVAL);
834 } 726 }
835} 727}
836#endif 728#endif
837 729
730#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
838void 731void
839rxvt_term::x_cb (io_watcher &w, short revents) 732rxvt_term::cont_scroll_cb (time_watcher &w)
840{ 733{
841 SET_R (this); 734 if ((scrollbar_isUp() || scrollbar_isDn()) &&
842 SET_LOCALE (locale); 735 scr_page (scrollbar_isUp() ? UP : DN, 1))
843 736 {
844 process_x_events (); 737 refresh_type |= SMOOTH_REFRESH;
738 want_refresh = 1;
739 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
740 }
845} 741}
742#endif
743
744#ifdef SELECTION_SCROLLING
745void
746rxvt_term::sel_scroll_cb (time_watcher &w)
747{
748 if (scr_page (scroll_selection_dir, scroll_selection_lines))
749 {
750 selection_extend (selection_save_x, selection_save_y, selection_save_state);
751 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 }
755}
756#endif
757
758#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
759void
760rxvt_term::slip_wheel_cb (time_watcher &w)
761{
762 if (mouse_slip_wheel_speed == 0
763 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
764 : scr_page (UP, mouse_slip_wheel_speed))
765 {
766 refresh_type |= SMOOTH_REFRESH;
767 want_refresh = 1;
768 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
769 }
770}
771#endif
846 772
847bool 773bool
848rxvt_term::pty_fill () 774rxvt_term::pty_fill ()
849{ 775{
850 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 776 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
777
778 if (CBUFSIZ == n)
779 {
780 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
781 n = 0;
782 }
851 783
852 memmove (cmdbuf_base, cmdbuf_ptr, n); 784 memmove (cmdbuf_base, cmdbuf_ptr, n);
853 cmdbuf_ptr = cmdbuf_base; 785 cmdbuf_ptr = cmdbuf_base;
854 cmdbuf_endp = cmdbuf_ptr + n; 786 cmdbuf_endp = cmdbuf_ptr + n;
855 787
856 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 788 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n);
857 789
858 if (n > 0) 790 if (n > 0)
859 { 791 {
860 cmdbuf_endp += n; 792 cmdbuf_endp += n;
861 return true; 793 return true;
862 } 794 }
863 else if (n < 0 && errno != EAGAIN) 795 else if (n < 0 && errno != EAGAIN)
864 destroy (); 796 destroy ();
865 797
866 return false; 798 return false;
867} 799}
868 800
869void 801void
870rxvt_term::pty_cb (io_watcher &w, short revents) 802rxvt_term::pty_cb (io_watcher &w, short revents)
… …
873 SET_LOCALE (locale); 805 SET_LOCALE (locale);
874 806
875 if (revents & EVENT_WRITE) 807 if (revents & EVENT_WRITE)
876 tt_write (0, 0); 808 tt_write (0, 0);
877 else if (revents & EVENT_READ) 809 else if (revents & EVENT_READ)
878 {
879 bool flag = true;
880
881 // loop, but don't allow a single term to monopolize us 810 // 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 ()) 811 while (pty_fill ())
884 { 812 if (cmd_parse ())
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; 813 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} 814}
985 815
986// read the next character, currently handles UTF-8 816void
987// will probably handle all sorts of other stuff in the future 817rxvt_term::pointer_unblank ()
988uint32_t
989rxvt_term::next_char ()
990{ 818{
991 while (cmdbuf_ptr < cmdbuf_endp) 819 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
992 { 820 recolour_cursor ();
993 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
994 return *cmdbuf_ptr++;
995 821
996 wchar_t wc; 822#ifdef POINTER_BLANK
997 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 823 hidden_pointer = 0;
998 824
999 if (len == (size_t)-2) 825 if (Options & Opt_pointerBlank)
1000 return NOCHAR; 826 pointer_ev.start (NOW + pointerBlankDelay);
1001 827#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} 828}
1034 829
1035#ifdef POINTER_BLANK 830#ifdef POINTER_BLANK
1036void 831void
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 () 832rxvt_term::pointer_blank ()
1050{ 833{
1051 if (!(Options & Opt_pointerBlank)) 834 if (! (Options & Opt_pointerBlank))
1052 return; 835 return;
1053 836
1054 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 837 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1055 XFlush (Xdisplay); 838 XFlush (display->display);
1056 839
1057 hidden_pointer = 1; 840 hidden_pointer = 1;
1058} 841}
1059 842
1060void 843void
… …
1066 pointer_blank (); 849 pointer_blank ();
1067} 850}
1068#endif 851#endif
1069 852
1070void 853void
1071rxvt_term::mouse_report (const XButtonEvent *ev) 854rxvt_term::mouse_report (XButtonEvent &ev)
1072{ 855{
1073 int button_number, key_state = 0; 856 int button_number, key_state = 0;
1074 int x, y; 857 int x, y;
1075 858
1076 x = ev->x; 859 x = ev.x;
1077 y = ev->y; 860 y = ev.y;
1078 pixel_position (&x, &y); 861 pixel_position (&x, &y);
1079 862
1080 if (MEvent.button == AnyButton) 863 if (MEvent.button == AnyButton)
1081 { 864 {
1082 button_number = 3; 865 button_number = 3;
… …
1116#endif 899#endif
1117 900
1118 } 901 }
1119 902
1120#ifdef DEBUG_MOUSEREPORT 903#ifdef DEBUG_MOUSEREPORT
1121 fprintf(stderr, "Mouse ["); 904 fprintf (stderr, "Mouse [");
1122 if (key_state & 16) 905 if (key_state & 16)
1123 fputc('C', stderr); 906 fputc ('C', stderr);
1124 if (key_state & 4) 907 if (key_state & 4)
1125 fputc('S', stderr); 908 fputc ('S', stderr);
1126 if (key_state & 8) 909 if (key_state & 8)
1127 fputc('A', stderr); 910 fputc ('A', stderr);
1128 if (key_state & 32) 911 if (key_state & 32)
1129 fputc('2', stderr); 912 fputc ('2', stderr);
1130 fprintf(stderr, "]: <%d>, %d/%d\n", 913 fprintf (stderr, "]: <%d>, %d/%d\n",
1131 button_number, 914 button_number,
1132 x + 1, 915 x + 1,
1133 y + 1); 916 y + 1);
1134#else 917#else
1135 tt_printf("\033[M%c%c%c", 918 tt_printf ("\033[M%c%c%c",
1136 (32 + button_number + key_state), 919 (32 + button_number + key_state),
1137 (32 + x + 1), 920 (32 + x + 1),
1138 (32 + y + 1)); 921 (32 + y + 1));
1139#endif 922#endif
1140} 923}
1141 924
1142#ifdef USING_W11LIB 925#ifdef USING_W11LIB
1143void 926void
1144rxvt_W11_process_x_event(XEvent *ev) 927rxvt_W11_process_x_event (XEvent *ev)
1145{ 928{
1146 rxvt_t *r = rxvt_get_r(); 929 rxvt_t *r = rxvt_get_r ();
1147 930
1148 process_x_event (ev); 931 x_cb (*ev);
1149} 932}
1150#endif 933#endif
1151 934
1152/*{{{ process an X event */ 935/*{{{ process an X event */
1153void 936void
1154rxvt_term::process_x_event (XEvent *ev) 937rxvt_term::x_cb (XEvent &ev)
1155{ 938{
939 SET_R (this);
940 SET_LOCALE (locale);
941
942#if defined(CURSOR_BLINK)
943 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
944 {
945 if (hidden_cursor)
946 {
947 hidden_cursor = 0;
948 want_refresh = 1;
949 }
950
951 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
952 }
953#endif
954
955#if defined(POINTER_BLANK)
956 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
957 {
958 if (ev.type == MotionNotify
959 || ev.type == ButtonPress
960 || ev.type == ButtonRelease)
961 if (hidden_pointer)
962 pointer_unblank ();
963
964 if (ev.type == KeyPress && hidden_pointer == 0)
965 pointer_blank ();
966 }
967#endif
968
969#ifdef USE_XIM
970 if (XFilterEvent (&ev, None))
971 return;
972#endif
973
1156 Window unused_root, unused_child; 974 Window unused_root, unused_child;
1157 int unused_root_x, unused_root_y; 975 int unused_root_x, unused_root_y;
1158 unsigned int unused_mask; 976 unsigned int unused_mask;
1159 977
1160#ifdef DEBUG_X 978#ifdef DEBUG_X
… …
1199#endif 1017#endif
1200 1018
1201#ifdef DEBUG_X 1019#ifdef DEBUG_X
1202 struct timeval tp; 1020 struct timeval tp;
1203 struct tm *ltt; 1021 struct tm *ltt;
1204 (void)gettimeofday(&tp, NULL); 1022 (void)gettimeofday (&tp, NULL);
1205 ltt = localtime(&(tp.tv_sec)); 1023 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)); 1024 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 1025#endif
1208 1026
1209 switch (ev->type) 1027 switch (ev.type)
1210 { 1028 {
1211 case KeyPress: 1029 case KeyPress:
1212 lookup_key ((XKeyEvent *)ev); 1030 lookup_key (ev.xkey);
1213 break; 1031 break;
1214 1032
1215#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1033#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1216 case KeyRelease: 1034 case KeyRelease:
1217 { 1035 {
1218 if (!(ev->xkey.state & ControlMask)) 1036 if (!(ev.xkey.state & ControlMask))
1219 mouse_slip_wheel_speed = 0; 1037 slip_wheel_ev.stop ();
1220 else 1038 else
1221 { 1039 {
1222 KeySym ks; 1040 KeySym ks;
1223 1041
1224 ks = XKeycodeToKeysym(Xdisplay, ev->xkey.keycode, 0); 1042 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1225 if (ks == XK_Control_L || ks == XK_Control_R) 1043 if (ks == XK_Control_L || ks == XK_Control_R)
1226 mouse_slip_wheel_speed = 0; 1044 mouse_slip_wheel_speed = 0;
1227 } 1045 }
1228 break; 1046 break;
1229 } 1047 }
1230#endif 1048#endif
1231 1049
1232 case ButtonPress: 1050 case ButtonPress:
1233 button_press ((XButtonEvent *)ev); 1051 button_press (ev.xbutton);
1234 break; 1052 break;
1235 1053
1236 case ButtonRelease: 1054 case ButtonRelease:
1237 button_release ((XButtonEvent *)ev); 1055 button_release (ev.xbutton);
1238 break; 1056 break;
1239 1057
1240 case ClientMessage: 1058 case ClientMessage:
1241 if (ev->xclient.format == 32 1059 if (ev.xclient.format == 32
1242 && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1060 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1243 destroy (); 1061 destroy ();
1244#ifdef OFFIX_DND 1062#ifdef OFFIX_DND
1245 /* OffiX Dnd (drag 'n' drop) protocol */ 1063 /* OffiX Dnd (drag 'n' drop) protocol */
1246 else if (ev->xclient.message_type == xa[XA_DNDPROTOCOL] 1064 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1247 && (ev->xclient.data.l[0] == DndFile 1065 && (ev.xclient.data.l[0] == DndFile
1248 || ev->xclient.data.l[0] == DndDir 1066 || ev.xclient.data.l[0] == DndDir
1249 || ev->xclient.data.l[0] == DndLink)) 1067 || ev.xclient.data.l[0] == DndLink))
1250 { 1068 {
1251 /* Get Dnd data */ 1069 /* Get Dnd data */
1252 Atom ActualType; 1070 Atom ActualType;
1253 int ActualFormat; 1071 int ActualFormat;
1254 unsigned char *data; 1072 unsigned char *data;
1255 unsigned long Size, RemainingBytes; 1073 unsigned long Size, RemainingBytes;
1256 1074
1257 XGetWindowProperty(Xdisplay, Xroot, 1075 XGetWindowProperty (display->display, display->root,
1258 xa[XA_DNDSELECTION], 1076 xa[XA_DNDSELECTION],
1259 0L, 1000000L, 1077 0L, 1000000L,
1260 False, AnyPropertyType, 1078 False, AnyPropertyType,
1261 &ActualType, &ActualFormat, 1079 &ActualType, &ActualFormat,
1262 &Size, &RemainingBytes, 1080 &Size, &RemainingBytes,
1263 &data); 1081 &data);
1264 XChangeProperty(Xdisplay, Xroot, 1082 XChangeProperty (display->display, display->root,
1265 XA_CUT_BUFFER0, XA_STRING, 1083 XA_CUT_BUFFER0, XA_STRING,
1266 8, PropModeReplace, 1084 8, PropModeReplace,
1267 data, STRLEN(data)); 1085 data, STRLEN (data));
1086 XFree (data);
1268 selection_paste (Xroot, XA_CUT_BUFFER0, True); 1087 selection_paste (display->root, XA_CUT_BUFFER0, True);
1269 XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime); 1088 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1270 } 1089 }
1271#endif /* OFFIX_DND */ 1090#endif /* OFFIX_DND */
1272 break; 1091 break;
1273 1092
1274 case MappingNotify: 1093 case MappingNotify:
1275 XRefreshKeyboardMapping(&(ev->xmapping)); 1094 XRefreshKeyboardMapping (&ev.xmapping);
1276 break; 1095 break;
1277 1096
1278 /* 1097 /*
1279 * XXX: this is not the _current_ arrangement 1098 * XXX: this is not the _current_ arrangement
1280 * Here's my conclusion: 1099 * Here's my conclusion:
… …
1284 * in the GraphicsExpose parts, which means that after each refresh, 1103 * in the GraphicsExpose parts, which means that after each refresh,
1285 * we need to wait for the graphics expose or Noexpose events, 1104 * we need to wait for the graphics expose or Noexpose events,
1286 * which ought to make things real slow! 1105 * which ought to make things real slow!
1287 */ 1106 */
1288 case VisibilityNotify: 1107 case VisibilityNotify:
1289 switch (ev->xvisibility.state) 1108 switch (ev.xvisibility.state)
1290 { 1109 {
1291 case VisibilityUnobscured: 1110 case VisibilityUnobscured:
1292 refresh_type = FAST_REFRESH; 1111 refresh_type = FAST_REFRESH;
1293 break; 1112 break;
1294 case VisibilityPartiallyObscured: 1113 case VisibilityPartiallyObscured:
… …
1305 { 1124 {
1306 TermWin.focus = 1; 1125 TermWin.focus = 1;
1307 want_refresh = 1; 1126 want_refresh = 1;
1308#ifdef USE_XIM 1127#ifdef USE_XIM
1309 if (Input_Context != NULL) 1128 if (Input_Context != NULL)
1310 XSetICFocus(Input_Context); 1129 XSetICFocus (Input_Context);
1311#endif 1130#endif
1312#ifdef CURSOR_BLINK 1131#ifdef CURSOR_BLINK
1313 if (Options & Opt_cursorBlink) 1132 if (Options & Opt_cursorBlink)
1314 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1133 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1134#endif
1135#ifdef OFF_FOCUS_FADING
1136 if (rs[Rs_fade])
1137 {
1138 PixColors = PixColorsFocused;
1139 set_colorfgbg ();
1140 scr_clear ();
1141 scr_touch (true);
1142 }
1315#endif 1143#endif
1316 1144
1317 } 1145 }
1318 break; 1146 break;
1319 1147
… …
1322 { 1150 {
1323 TermWin.focus = 0; 1151 TermWin.focus = 0;
1324 want_refresh = 1; 1152 want_refresh = 1;
1325#ifdef USE_XIM 1153#ifdef USE_XIM
1326 if (Input_Context != NULL) 1154 if (Input_Context != NULL)
1327 XUnsetICFocus(Input_Context); 1155 XUnsetICFocus (Input_Context);
1328#endif 1156#endif
1329#ifdef CURSOR_BLINK 1157#ifdef CURSOR_BLINK
1330 if (Options & Opt_cursorBlink) 1158 if (Options & Opt_cursorBlink)
1331 cursor_blink_ev.stop (); 1159 cursor_blink_ev.stop ();
1332 hidden_cursor = 0; 1160 hidden_cursor = 0;
1333#endif 1161#endif
1162#ifdef OFF_FOCUS_FADING
1163 if (rs[Rs_fade])
1164 {
1165 PixColors = PixColorsUnFocused;
1166 set_colorfgbg ();
1167 scr_clear ();
1168 scr_touch (true);
1169 }
1170#endif
1334 1171
1335 } 1172 }
1336 break; 1173 break;
1337 1174
1338 case ConfigureNotify: 1175 case ConfigureNotify:
1339 if (ev->xconfigure.window == TermWin.parent[0]) 1176 if (ev.xconfigure.window == TermWin.parent[0])
1340 { 1177 {
1341 int height, width; 1178 int height, width;
1342 1179
1343 do 1180 do
1344 { /* Wrap lots of configures into one */ 1181 { /* Wrap lots of configures into one */
1345 width = ev->xconfigure.width; 1182 width = ev.xconfigure.width;
1346 height = ev->xconfigure.height; 1183 height = ev.xconfigure.height;
1347 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1184 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1348 } 1185 }
1349 while (XCheckTypedWindowEvent(Xdisplay, ev->xconfigure.window, 1186 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1350 ConfigureNotify, ev)); 1187
1351 if (szHint.width != width || szHint.height != height) 1188 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); 1189 resize_all_windows (width, height, 1);
1355 } 1190
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 */ 1191#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1363 if (Options & Opt_transparent) 1192 if (Options & Opt_transparent)
1364 { 1193 {
1365 check_our_parents (); 1194 check_our_parents ();
1366 if (am_transparent) 1195 if (am_transparent)
1367 want_full_refresh = 1; 1196 want_refresh = want_full_refresh = 1;
1368 } 1197 }
1369#endif 1198#endif
1370
1371 } 1199 }
1372 break; 1200 break;
1373 1201
1374 case SelectionClear: 1202 case SelectionClear:
1375 selection_clear (); 1203 selection_clear ();
1376 break; 1204 break;
1377 1205
1378 case SelectionNotify: 1206 case SelectionNotify:
1379 if (selection_wait == Sel_normal) 1207 if (selection_wait == Sel_normal)
1380 selection_paste (ev->xselection.requestor, 1208 selection_paste (ev.xselection.requestor,
1381 ev->xselection.property, True); 1209 ev.xselection.property, True);
1382 break; 1210 break;
1383 1211
1384 case SelectionRequest: 1212 case SelectionRequest:
1385 selection_send (&(ev->xselectionrequest)); 1213 selection_send (ev.xselectionrequest);
1386 break; 1214 break;
1387 1215
1388 case UnmapNotify: 1216 case UnmapNotify:
1389 TermWin.mapped = 0; 1217 TermWin.mapped = 0;
1390#ifdef TEXT_BLINK 1218#ifdef TEXT_BLINK
… …
1397#ifdef TEXT_BLINK 1225#ifdef TEXT_BLINK
1398 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1226 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1399#endif 1227#endif
1400 break; 1228 break;
1401 1229
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;
1409 }
1410#ifdef TRANSPARENT 1230#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: 1231 case ReparentNotify:
1422 if ((Options & Opt_transparent) && check_our_parents ()) 1232 rootwin_cb (ev);
1423 { 1233 break;
1424 if (am_transparent)
1425 want_full_refresh = 1;
1426 }
1427#endif /* TRANSPARENT */ 1234#endif /* TRANSPARENT */
1428 break;
1429 1235
1430 case GraphicsExpose: 1236 case GraphicsExpose:
1431 case Expose: 1237 case Expose:
1432 if (ev->xany.window == TermWin.vt) 1238 if (ev.xany.window == TermWin.vt)
1433 { 1239 {
1434#ifdef NO_SLOW_LINK_SUPPORT 1240 do
1435 scr_expose (ev->xexpose.x, ev->xexpose.y, 1241 scr_expose (ev.xexpose.x, ev.xexpose.y,
1436 ev->xexpose.width, ev->xexpose.height, False); 1242 ev.xexpose.width, ev.xexpose.height, False);
1437#else 1243 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1438 // don't understand this, so commented it out 1244
1245 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1246
1247 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1439 scr_expose (ev->xexpose.x, ev->xexpose.y, 1248 scr_expose (ev.xexpose.x, ev.xexpose.y,
1440 ev->xexpose.width, ev->xexpose.height, False); 1249 ev.xexpose.width, ev.xexpose.height, False);
1441 //scr_expose (ev->xexpose.x, 0, 1250
1442 // ev->xexpose.width, TermWin.height, False); 1251 scr_refresh (refresh_type);
1443#endif
1444 want_refresh = 1;
1445 } 1252 }
1446 else 1253 else
1447 { 1254 {
1448 XEvent unused_xevent; 1255 XEvent unused_event;
1449 1256
1450 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1257 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1451 Expose, 1258 ;
1452 &unused_xevent)) ; 1259 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1453 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1260 ;
1454 GraphicsExpose, 1261
1455 &unused_xevent)) ;
1456 if (isScrollbarWindow(ev->xany.window)) 1262 if (isScrollbarWindow (ev.xany.window))
1457 { 1263 {
1458 scrollBar.setIdle(); 1264 scrollBar.setIdle ();
1459 scrollbar_show (0); 1265 scrollbar_show (0);
1460 } 1266 }
1461#ifdef MENUBAR 1267#ifdef MENUBAR
1462 if (menubar_visible () && isMenuBarWindow(ev->xany.window)) 1268 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1463 menubar_expose (); 1269 menubar_expose ();
1464#endif 1270#endif
1465#ifdef RXVT_GRAPHICS
1466 Gr_expose (ev->xany.window);
1467#endif
1468 1271
1272#ifdef TRANSPARENT
1273 if (am_transparent && ev.xany.window == TermWin.parent[0])
1274 XClearWindow (display->display, ev.xany.window);
1275#endif
1469 } 1276 }
1470 break; 1277 break;
1471 1278
1472 case MotionNotify: 1279 case MotionNotify:
1473#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1474 if (hidden_pointer) 1281 if (hidden_pointer)
1475 pointer_unblank (); 1282 pointer_unblank ();
1476#endif 1283#endif
1477#if MENUBAR 1284#if MENUBAR
1478 if (isMenuBarWindow(ev->xany.window)) 1285 if (isMenuBarWindow (ev.xany.window))
1479 { 1286 {
1480 menubar_control (&(ev->xbutton)); 1287 menubar_control (ev.xbutton);
1481 break; 1288 break;
1482 } 1289 }
1483#endif 1290#endif
1484 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1291 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1485 break; 1292 break;
1486 1293
1487 if (ev->xany.window == TermWin.vt) 1294 if (ev.xany.window == TermWin.vt)
1488 { 1295 {
1489 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) 1296 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1490 { 1297 {
1491 while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt, 1298 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1492 MotionNotify, ev)) ; 1299 ;
1300
1493 XQueryPointer(Xdisplay, TermWin.vt, 1301 XQueryPointer (display->display, TermWin.vt,
1494 &unused_root, &unused_child, 1302 &unused_root, &unused_child,
1495 &unused_root_x, &unused_root_y, 1303 &unused_root_x, &unused_root_y,
1496 &(ev->xbutton.x), &(ev->xbutton.y), 1304 & (ev.xbutton.x), & (ev.xbutton.y),
1497 &unused_mask); 1305 &unused_mask);
1498#ifdef MOUSE_THRESHOLD 1306#ifdef MOUSE_THRESHOLD
1499 /* deal with a `jumpy' mouse */ 1307 /* deal with a `jumpy' mouse */
1500 if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1308 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1501 { 1309 {
1502#endif 1310#endif
1503 selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1311 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1504 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1312 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1505#ifdef SELECTION_SCROLLING 1313#ifdef SELECTION_SCROLLING
1506 if (ev->xbutton.y < TermWin.int_bwidth 1314 if (ev.xbutton.y < TermWin.int_bwidth
1507 || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) 1315 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1508 { 1316 {
1509 int dist; 1317 int dist;
1510
1511 pending_scroll_selection=1;
1512 1318
1513 /* don't clobber the current delay if we are 1319 /* don't clobber the current delay if we are
1514 * already in the middle of scrolling. 1320 * already in the middle of scrolling.
1515 */ 1321 */
1516 if (scroll_selection_delay<=0) 1322 if (!sel_scroll_ev.active)
1517 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1323 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1518 1324
1519 /* save the event params so we can highlight 1325 /* save the event params so we can highlight
1520 * the selection in the pending-scroll loop 1326 * the selection in the pending-scroll loop
1521 */ 1327 */
1522 selection_save_x=ev->xbutton.x; 1328 selection_save_x=ev.xbutton.x;
1523 selection_save_y=ev->xbutton.y; 1329 selection_save_y=ev.xbutton.y;
1524 selection_save_state= 1330 selection_save_state=
1525 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1331 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1526 1332
1527 /* calc number of lines to scroll */ 1333 /* calc number of lines to scroll */
1528 if (ev->xbutton.y<TermWin.int_bwidth) 1334 if (ev.xbutton.y<TermWin.int_bwidth)
1529 { 1335 {
1530 scroll_selection_dir = UP; 1336 scroll_selection_dir = UP;
1531 dist = TermWin.int_bwidth - ev->xbutton.y; 1337 dist = TermWin.int_bwidth - ev.xbutton.y;
1532 } 1338 }
1533 else 1339 else
1534 { 1340 {
1535 scroll_selection_dir = DN; 1341 scroll_selection_dir = DN;
1536 dist = ev->xbutton.y - 1342 dist = ev.xbutton.y -
1537 (TermWin.int_bwidth + TermWin.height); 1343 (TermWin.int_bwidth + TermWin.height);
1538 } 1344 }
1539 scroll_selection_lines=(Pixel2Height(dist)/ 1345 scroll_selection_lines= (Pixel2Height (dist)/
1540 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1346 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1541 MIN_IT(scroll_selection_lines, 1347 MIN_IT (scroll_selection_lines,
1542 SELECTION_SCROLL_MAX_LINES); 1348 SELECTION_SCROLL_MAX_LINES);
1543 } 1349 }
1544 else 1350 else
1545 { 1351 {
1546 /* we are within the text window, so we 1352 /* we are within the text window, so we
1547 * shouldn't be scrolling 1353 * shouldn't be scrolling
1548 */ 1354 */
1549 pending_scroll_selection = 0; 1355 if (sel_scroll_ev.active)
1356 sel_scroll_ev.stop();
1550 } 1357 }
1551#endif 1358#endif
1552#ifdef MOUSE_THRESHOLD 1359#ifdef MOUSE_THRESHOLD
1553 1360
1554 } 1361 }
1555#endif 1362#endif
1556 1363
1557 } 1364 }
1558 } 1365 }
1559 else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) 1366 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1560 { 1367 {
1561 while (XCheckTypedWindowEvent(Xdisplay, scrollBar.win, 1368 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1562 MotionNotify, ev)) ; 1369 MotionNotify, &ev)) ;
1563 XQueryPointer(Xdisplay, scrollBar.win, 1370 XQueryPointer (display->display, scrollBar.win,
1564 &unused_root, &unused_child, 1371 &unused_root, &unused_child,
1565 &unused_root_x, &unused_root_y, 1372 &unused_root_x, &unused_root_y,
1566 &(ev->xbutton.x), &(ev->xbutton.y), 1373 & (ev.xbutton.x), & (ev.xbutton.y),
1567 &unused_mask); 1374 &unused_mask);
1568 scr_move_to (scrollbar_position(ev->xbutton.y) - csrO, 1375 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1569 scrollbar_size()); 1376 scrollbar_size ());
1570 scr_refresh (refresh_type); 1377 scr_refresh (refresh_type);
1571 refresh_limit = 0; 1378 refresh_limit = 0;
1572 scrollbar_show (1); 1379 scrollbar_show (1);
1573 } 1380 }
1574 break; 1381 break;
1575 } 1382 }
1576} 1383}
1577 1384
1578void 1385void
1386rxvt_term::rootwin_cb (XEvent &ev)
1387{
1388 SET_R (this);
1389 SET_LOCALE (locale);
1390
1391 switch (ev.type)
1392 {
1393 case PropertyNotify:
1394 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1395 {
1396 if (ev.xproperty.state == PropertyNewValue)
1397 selection_property (ev.xproperty.window, ev.xproperty.atom);
1398 break;
1399 }
1400#ifdef TRANSPARENT
1401 else
1402 {
1403 /*
1404 * if user used some Esetroot compatible prog to set the root bg,
1405 * use the property to determine the pixmap. We use it later on.
1406 */
1407 if (xa[XA_XROOTPMAPID] == 0)
1408 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1409
1410 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1411 return;
1412 }
1413
1414 /* FALLTHROUGH */
1415 case ReparentNotify:
1416 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1417 want_refresh = want_full_refresh = 1;
1418 break;
1419#endif
1420 }
1421}
1422
1423void
1579rxvt_term::button_press (XButtonEvent *ev) 1424rxvt_term::button_press (XButtonEvent &ev)
1580{ 1425{
1581 int reportmode = 0, clickintime; 1426 int reportmode = 0, clickintime;
1582 1427
1583 bypass_keystate = ev->state & (ModMetaMask | ShiftMask); 1428 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1584 if (!bypass_keystate) 1429 if (!bypass_keystate)
1585 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1430 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1586 /* 1431 /*
1587 * VT window processing of button press 1432 * VT window processing of button press
1588 */ 1433 */
1589 if (ev->window == TermWin.vt) 1434 if (ev.window == TermWin.vt)
1590 { 1435 {
1591#if RXVT_GRAPHICS
1592 if (ev->subwindow != None)
1593 rxvt_Gr_ButtonPress (ev->x, ev->y);
1594 else
1595#endif
1596
1597 {
1598 clickintime = ev->time - MEvent.time < MULTICLICK_TIME; 1436 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1599 if (reportmode) 1437 if (reportmode)
1438 {
1439 /* mouse report from vt window */
1440 /* save the xbutton state (for ButtonRelease) */
1441 MEvent.state = ev.state;
1442#ifdef MOUSE_REPORT_DOUBLECLICK
1443 if (ev.button == MEvent.button && clickintime)
1600 { 1444 {
1601 /* mouse report from vt window */ 1445 /* same button, within alloted time */
1602 /* save the xbutton state (for ButtonRelease) */ 1446 MEvent.clicks++;
1603 MEvent.state = ev->state; 1447 if (MEvent.clicks > 1)
1604#ifdef MOUSE_REPORT_DOUBLECLICK
1605 if (ev->button == MEvent.button && clickintime)
1606 { 1448 {
1607 /* same button, within alloted time */
1608 MEvent.clicks++;
1609 if (MEvent.clicks > 1)
1610 {
1611 /* only report double clicks */ 1449 /* only report double clicks */
1612 MEvent.clicks = 2; 1450 MEvent.clicks = 2;
1613 mouse_report (ev); 1451 mouse_report (ev);
1614 1452
1615 /* don't report the release */ 1453 /* don't report the release */
1616 MEvent.clicks = 0; 1454 MEvent.clicks = 0;
1617 MEvent.button = AnyButton; 1455 MEvent.button = AnyButton;
1618 }
1619 } 1456 }
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 } 1457 }
1633 else 1458 else
1634 { 1459 {
1635 if (ev->button != MEvent.button) 1460 /* different button, or time expired */
1636 MEvent.clicks = 0; 1461 MEvent.clicks = 1;
1462 MEvent.button = ev.button;
1463 mouse_report (ev);
1464 }
1465#else
1466 MEvent.button = ev.button;
1467 mouse_report (ev);
1468#endif /* MOUSE_REPORT_DOUBLECLICK */
1469
1470 }
1471 else
1472 {
1473 if (ev.button != MEvent.button)
1474 MEvent.clicks = 0;
1637 switch (ev->button) 1475 switch (ev.button)
1638 { 1476 {
1639 case Button1: 1477 case Button1:
1640 /* allow shift+left click to extend selection */ 1478 /* allow shift+left click to extend selection */
1641 if (ev->state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1479 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1642 { 1480 {
1643 if (MEvent.button == Button1 && clickintime) 1481 if (MEvent.button == Button1 && clickintime)
1644 selection_rotate (ev->x, ev->y); 1482 selection_rotate (ev.x, ev.y);
1645 else
1646 selection_extend (ev->x, ev->y, 1);
1647 }
1648 else 1483 else
1649 { 1484 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 } 1485 }
1657 1486 else
1658 MEvent.button = Button1;
1659 break; 1487 {
1660
1661 case Button3:
1662 if (MEvent.button == Button3 && clickintime) 1488 if (MEvent.button == Button1 && clickintime)
1663 selection_rotate (ev->x, ev->y); 1489 MEvent.clicks++;
1664 else 1490 else
1491 MEvent.clicks = 1;
1492
1493 selection_click (MEvent.clicks, ev.x, ev.y);
1494 }
1495
1496 MEvent.button = Button1;
1497 break;
1498
1499 case Button3:
1500 if (MEvent.button == Button3 && clickintime)
1501 selection_rotate (ev.x, ev.y);
1502 else
1665 selection_extend (ev->x, ev->y, 1); 1503 selection_extend (ev.x, ev.y, 1);
1666 MEvent.button = Button3; 1504 MEvent.button = Button3;
1667 break; 1505 break;
1668 }
1669 } 1506 }
1507 }
1670 MEvent.time = ev->time; 1508 MEvent.time = ev.time;
1671 return; 1509 return;
1672 }
1673 } 1510 }
1674 1511
1675 /* 1512 /*
1676 * Scrollbar window processing of button press 1513 * Scrollbar window processing of button press
1677 */ 1514 */
1678 if (isScrollbarWindow(ev->window)) 1515 if (isScrollbarWindow (ev.window))
1679 { 1516 {
1680 scrollBar.setIdle (); 1517 scrollBar.setIdle ();
1681 /* 1518 /*
1682 * Rxvt-style scrollbar: 1519 * Rxvt-style scrollbar:
1683 * move up if mouse is above slider 1520 * move up if mouse is above slider
… …
1695 * Mouse report disabled scrollbar: 1532 * Mouse report disabled scrollbar:
1696 * arrow buttons - send up/down 1533 * arrow buttons - send up/down
1697 * click on scrollbar - send pageup/down 1534 * click on scrollbar - send pageup/down
1698 */ 1535 */
1699 if ((scrollBar.style == R_SB_NEXT 1536 if ((scrollBar.style == R_SB_NEXT
1700 && scrollbarnext_upButton(ev->y)) 1537 && scrollbarnext_upButton (ev.y))
1701 || (scrollBar.style == R_SB_RXVT 1538 || (scrollBar.style == R_SB_RXVT
1702 && scrollbarrxvt_upButton(ev->y))) 1539 && scrollbarrxvt_upButton (ev.y)))
1703 tt_printf("\033[A"); 1540 tt_printf ("\033[A");
1704 else if ((scrollBar.style == R_SB_NEXT 1541 else if ((scrollBar.style == R_SB_NEXT
1705 && scrollbarnext_dnButton(ev->y)) 1542 && scrollbarnext_dnButton (ev.y))
1706 || (scrollBar.style == R_SB_RXVT 1543 || (scrollBar.style == R_SB_RXVT
1707 && scrollbarrxvt_dnButton(ev->y))) 1544 && scrollbarrxvt_dnButton (ev.y)))
1708 tt_printf("\033[B"); 1545 tt_printf ("\033[B");
1709 else 1546 else
1710 switch (ev->button) 1547 switch (ev.button)
1711 { 1548 {
1712 case Button2: 1549 case Button2:
1713 tt_printf("\014"); 1550 tt_printf ("\014");
1714 break; 1551 break;
1715 case Button1: 1552 case Button1:
1716 tt_printf("\033[6~"); 1553 tt_printf ("\033[6~");
1717 break; 1554 break;
1718 case Button3: 1555 case Button3:
1719 tt_printf("\033[5~"); 1556 tt_printf ("\033[5~");
1720 break; 1557 break;
1721 } 1558 }
1722 } 1559 }
1723 else 1560 else
1724#endif /* NO_SCROLLBAR_REPORT */ 1561#endif /* NO_SCROLLBAR_REPORT */
… …
1726 { 1563 {
1727 char upordown = 0; 1564 char upordown = 0;
1728 1565
1729 if (scrollBar.style == R_SB_NEXT) 1566 if (scrollBar.style == R_SB_NEXT)
1730 { 1567 {
1731 if (scrollbarnext_upButton(ev->y)) 1568 if (scrollbarnext_upButton (ev.y))
1732 upordown = -1; /* up */ 1569 upordown = -1; /* up */
1733 else if (scrollbarnext_dnButton(ev->y)) 1570 else if (scrollbarnext_dnButton (ev.y))
1734 upordown = 1; /* down */ 1571 upordown = 1; /* down */
1735 } 1572 }
1736 else if (scrollBar.style == R_SB_RXVT) 1573 else if (scrollBar.style == R_SB_RXVT)
1737 { 1574 {
1738 if (scrollbarrxvt_upButton(ev->y)) 1575 if (scrollbarrxvt_upButton (ev.y))
1739 upordown = -1; /* up */ 1576 upordown = -1; /* up */
1740 else if (scrollbarrxvt_dnButton(ev->y)) 1577 else if (scrollbarrxvt_dnButton (ev.y))
1741 upordown = 1; /* down */ 1578 upordown = 1; /* down */
1742 } 1579 }
1743 if (upordown) 1580 if (upordown)
1744 { 1581 {
1745#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1582#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1746 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1583 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1747#endif 1584#endif
1748 if (scr_page (upordown < 0 ? UP : DN, 1)) 1585 if (scr_page (upordown < 0 ? UP : DN, 1))
1749 { 1586 {
1750 if (upordown < 0) 1587 if (upordown < 0)
1751 scrollBar.setUp (); 1588 scrollBar.setUp ();
1752 else 1589 else
1753 scrollBar.setDn (); 1590 scrollBar.setDn ();
1754 } 1591 }
1755 } 1592 }
1756 else 1593 else
1757 switch (ev->button) 1594 switch (ev.button)
1758 { 1595 {
1759 case Button2: 1596 case Button2:
1760 switch (scrollbar_align) 1597 switch (scrollbar_align)
1761 { 1598 {
1762 case R_SB_ALIGN_TOP: 1599 case R_SB_ALIGN_TOP:
… …
1767 break; 1604 break;
1768 case R_SB_ALIGN_BOTTOM: 1605 case R_SB_ALIGN_BOTTOM:
1769 csrO = scrollBar.bot - scrollBar.top; 1606 csrO = scrollBar.bot - scrollBar.top;
1770 break; 1607 break;
1771 } 1608 }
1609
1772 if (scrollBar.style == R_SB_XTERM 1610 if (scrollBar.style == R_SB_XTERM
1773 || scrollbar_above_slider(ev->y) 1611 || scrollbar_above_slider (ev.y)
1774 || scrollbar_below_slider(ev->y)) 1612 || scrollbar_below_slider (ev.y))
1775 scr_move_to ( scrollbar_position(ev->y) - csrO, 1613 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1776 scrollbar_size()); 1614
1777 scrollBar.setMotion (); 1615 scrollBar.setMotion ();
1778 break; 1616 break;
1779 1617
1780 case Button1: 1618 case Button1:
1781 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1619 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1782 csrO = ev->y - scrollBar.top; 1620 csrO = ev.y - scrollBar.top;
1783 /* FALLTHROUGH */ 1621 /* FALLTHROUGH */
1784 1622
1785 case Button3: 1623 case Button3:
1786 if (scrollBar.style != R_SB_XTERM) 1624 if (scrollBar.style != R_SB_XTERM)
1787 { 1625 {
1788 if (scrollbar_above_slider(ev->y)) 1626 if (scrollbar_above_slider (ev.y))
1789# ifdef RXVT_SCROLL_FULL 1627# ifdef RXVT_SCROLL_FULL
1790 scr_page (UP, TermWin.nrow - 1); 1628 scr_page (UP, TermWin.nrow - 1);
1791# else 1629# else
1792 scr_page (UP, TermWin.nrow / 4); 1630 scr_page (UP, TermWin.nrow / 4);
1793# endif 1631# endif
1794 else if (scrollbar_below_slider(ev->y)) 1632 else if (scrollbar_below_slider (ev.y))
1795# ifdef RXVT_SCROLL_FULL 1633# ifdef RXVT_SCROLL_FULL
1796 scr_page (DN, TermWin.nrow - 1); 1634 scr_page (DN, TermWin.nrow - 1);
1797# else 1635# else
1798 scr_page (DN, TermWin.nrow / 4); 1636 scr_page (DN, TermWin.nrow / 4);
1799# endif 1637# endif
1800 else 1638 else
1801 scrollBar.setMotion (); 1639 scrollBar.setMotion ();
1802 } 1640 }
1803 else 1641 else
1804 { 1642 {
1805 scr_page ((ev->button == Button1 ? DN : UP), 1643 scr_page ((ev.button == Button1 ? DN : UP),
1806 (TermWin.nrow 1644 (TermWin.nrow
1807 * scrollbar_position(ev->y) 1645 * scrollbar_position (ev.y)
1808 / scrollbar_size())); 1646 / scrollbar_size ()));
1809 } 1647 }
1648
1810 break; 1649 break;
1811 } 1650 }
1812 } 1651 }
1813 return; 1652 return;
1814 } 1653 }
1815#if MENUBAR 1654#if MENUBAR
1816 /* 1655 /*
1817 * Menubar window processing of button press 1656 * Menubar window processing of button press
1818 */ 1657 */
1819 if (isMenuBarWindow(ev->window)) 1658 if (isMenuBarWindow (ev.window))
1820 menubar_control (ev); 1659 menubar_control (ev);
1821#endif 1660#endif
1822} 1661}
1823 1662
1824void 1663void
1825rxvt_term::button_release (XButtonEvent *ev) 1664rxvt_term::button_release (XButtonEvent &ev)
1826{ 1665{
1827 int reportmode = 0; 1666 int reportmode = 0;
1828 1667
1829 csrO = 0; /* reset csr Offset */ 1668 csrO = 0; /* reset csr Offset */
1830 if (!bypass_keystate) 1669 if (!bypass_keystate)
1831 reportmode = !!(PrivateModes & PrivMode_mouse_report); 1670 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1832 1671
1833 if (scrollbar_isUpDn()) 1672 if (scrollbar_isUpDn ())
1834 { 1673 {
1835 scrollBar.setIdle (); 1674 scrollBar.setIdle ();
1836 scrollbar_show (0); 1675 scrollbar_show (0);
1837#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1676#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1838 refresh_type &= ~SMOOTH_REFRESH; 1677 refresh_type &= ~SMOOTH_REFRESH;
1839#endif 1678#endif
1840 1679
1841 } 1680 }
1842#ifdef SELECTION_SCROLLING 1681#ifdef SELECTION_SCROLLING
1843 pending_scroll_selection=0; 1682 if (sel_scroll_ev.active)
1683 sel_scroll_ev.stop();
1844#endif 1684#endif
1845 if (ev->window == TermWin.vt) 1685 if (ev.window == TermWin.vt)
1846 { 1686 {
1847#ifdef RXVT_GRAPHICS
1848 if (ev->subwindow != None)
1849 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1850 else
1851#endif
1852
1853 {
1854 if (reportmode) 1687 if (reportmode)
1688 {
1689 /* mouse report from vt window */
1690 /* don't report release of wheel "buttons" */
1691 if (ev.button >= 4)
1692 return;
1693#ifdef MOUSE_REPORT_DOUBLECLICK
1694 /* only report the release of 'slow' single clicks */
1695 if (MEvent.button != AnyButton
1696 && (ev.button != MEvent.button
1697 || (ev.time - MEvent.time
1698 > MULTICLICK_TIME / 2)))
1855 { 1699 {
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; 1700 MEvent.clicks = 0;
1868 MEvent.button = AnyButton;
1869 mouse_report (ev);
1870 }
1871#else /* MOUSE_REPORT_DOUBLECLICK */
1872 MEvent.button = AnyButton; 1701 MEvent.button = AnyButton;
1873 mouse_report (ev); 1702 mouse_report (ev);
1703 }
1704#else /* MOUSE_REPORT_DOUBLECLICK */
1705 MEvent.button = AnyButton;
1706 mouse_report (ev);
1874#endif /* MOUSE_REPORT_DOUBLECLICK */ 1707#endif /* MOUSE_REPORT_DOUBLECLICK */
1875 return; 1708 return;
1876 } 1709 }
1877 /* 1710 /*
1878 * dumb hack to compensate for the failure of click-and-drag 1711 * dumb hack to compensate for the failure of click-and-drag
1879 * when overriding mouse reporting 1712 * when overriding mouse reporting
1880 */ 1713 */
1881 if (PrivateModes & PrivMode_mouse_report 1714 if (PrivateModes & PrivMode_mouse_report
1882 && bypass_keystate 1715 && bypass_keystate
1883 && ev->button == Button1 && MEvent.clicks <= 1) 1716 && ev.button == Button1 && MEvent.clicks <= 1)
1884 selection_extend (ev->x, ev->y, 0); 1717 selection_extend (ev.x, ev.y, 0);
1885 1718
1886 switch (ev->button) 1719 switch (ev.button)
1720 {
1721 case Button1:
1722 case Button3:
1723 selection_make (ev.time);
1724 break;
1725 case Button2:
1726 selection_request (ev.time, ev.x, ev.y);
1727 break;
1728#ifdef MOUSE_WHEEL
1729 case Button4:
1730 case Button5:
1887 { 1731 {
1888 case Button1: 1732 int i;
1889 case Button3: 1733 page_dirn v;
1890 selection_make (ev->time); 1734
1735 v = ev.button == Button4 ? UP : DN;
1736
1737 if (ev.state & ShiftMask)
1891 break; 1738 i = 1;
1892 case Button2: 1739 else if (Options & Opt_mouseWheelScrollPage)
1893 selection_request (ev->time, ev->x, ev->y); 1740 i = TermWin.nrow - 1;
1741 else
1894 break; 1742 i = 5;
1743
1895#ifdef MOUSE_WHEEL 1744# ifdef MOUSE_SLIP_WHEELING
1896 case Button4: 1745 if (ev.state & ControlMask)
1897 case Button5:
1898 { 1746 {
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); 1747 mouse_slip_wheel_speed += v ? -1 : 1;
1748 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
1749 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
1750
1751 if (slip_wheel_ev.at < NOW)
1913 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1752 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1753
1754 slip_wheel_ev.start ();
1914 } 1755 }
1756 else
1757 {
1915# endif 1758# endif
1916# ifdef JUMP_MOUSE_WHEEL 1759# ifdef JUMP_MOUSE_WHEEL
1917 scr_page (v, i); 1760 scr_page (v, i);
1918 scr_refresh (SMOOTH_REFRESH); 1761 scr_refresh (SMOOTH_REFRESH);
1919 scrollbar_show (1); 1762 scrollbar_show (1);
… …
1923 scr_page (v, 1); 1766 scr_page (v, 1);
1924 scr_refresh (SMOOTH_REFRESH); 1767 scr_refresh (SMOOTH_REFRESH);
1925 scrollbar_show (1); 1768 scrollbar_show (1);
1926 } 1769 }
1927# endif 1770# endif
1928 1771# ifdef MOUSE_SLIP_WHEELING
1929 } 1772 }
1930 break;
1931#endif 1773#endif
1932
1933 } 1774 }
1775 break;
1776#endif
1934 } 1777 }
1935 } 1778 }
1936#ifdef MENUBAR 1779#ifdef MENUBAR
1937 else if (isMenuBarWindow(ev->window)) 1780 else if (isMenuBarWindow (ev.window))
1938 menubar_control (ev); 1781 menubar_control (ev);
1939#endif 1782#endif
1940} 1783}
1941 1784
1942
1943#ifdef TRANSPARENT 1785#ifdef TRANSPARENT
1786#if TINTING
1787/* taken from aterm-0.4.2 */
1788
1789typedef uint32_t RUINT32T;
1790
1791void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1792{
1793 int sh_r, sh_g, sh_b;
1794 RUINT32T mask_r, mask_g, mask_b;
1795 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1796 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1797 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1798 int i;
1799
1800 Visual* visual = display->visual;
1801
1802 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1803
1804 /* for convenience */
1805 mask_r = visual->red_mask;
1806 mask_g = visual->green_mask;
1807 mask_b = visual->blue_mask;
1808
1809 /* boring lookup table pre-initialization */
1810 switch (srcImage->bits_per_pixel) {
1811 case 15:
1812 if ((mask_r != 0x7c00) ||
1813 (mask_g != 0x03e0) ||
1814 (mask_b != 0x001f))
1815 return;
1816 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
1817 lookup_r = lookup;
1818 lookup_g = lookup+32;
1819 lookup_b = lookup+32+32;
1820 sh_r = 10;
1821 sh_g = 5;
1822 sh_b = 0;
1823 break;
1824 case 16:
1825 if ((mask_r != 0xf800) ||
1826 (mask_g != 0x07e0) ||
1827 (mask_b != 0x001f))
1828 return;
1829 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
1830 lookup_r = lookup;
1831 lookup_g = lookup+32;
1832 lookup_b = lookup+32+64;
1833 sh_r = 11;
1834 sh_g = 5;
1835 sh_b = 0;
1836 break;
1837 case 24:
1838 if ((mask_r != 0xff0000) ||
1839 (mask_g != 0x00ff00) ||
1840 (mask_b != 0x0000ff))
1841 return;
1842 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1843 lookup_r = lookup;
1844 lookup_g = lookup+256;
1845 lookup_b = lookup+256+256;
1846 sh_r = 16;
1847 sh_g = 8;
1848 sh_b = 0;
1849 break;
1850 case 32:
1851 if ((mask_r != 0xff0000) ||
1852 (mask_g != 0x00ff00) ||
1853 (mask_b != 0x0000ff))
1854 return;
1855 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1856 lookup_r = lookup;
1857 lookup_g = lookup+256;
1858 lookup_b = lookup+256+256;
1859 sh_r = 16;
1860 sh_g = 8;
1861 sh_b = 0;
1862 break;
1863 default:
1864 return; /* we do not support this color depth */
1865 }
1866
1867 /* prepare limits for color transformation (each channel is handled separately) */
1868 if (shade < 0) {
1869 shade = -shade;
1870 if (shade < 0) shade = 0;
1871 if (shade > 100) shade = 100;
1872
1873 lower_lim_r = 65535-rm;
1874 lower_lim_g = 65535-gm;
1875 lower_lim_b = 65535-bm;
1876
1877 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
1878 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1879 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1880
1881 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1882 } else {
1883 if (shade < 0) shade = 0;
1884 if (shade > 100) shade = 100;
1885
1886 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1887
1888 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1889 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1890 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1891 }
1892
1893 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1894 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1895 {
1896 unsigned int tmp;
1897
1898 tmp = lower_lim_r;
1899 lower_lim_r = lower_lim_b;
1900 lower_lim_b = tmp;
1901
1902 tmp = upper_lim_r;
1903 upper_lim_r = upper_lim_b;
1904 upper_lim_b = tmp;
1905 }
1906
1907 /* fill our lookup tables */
1908 for (i = 0; i <= mask_r>>sh_r; i++)
1909 {
1910 RUINT32T tmp;
1911 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
1912 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
1913 lookup_r[i] = (tmp/65535)<<sh_r;
1914 }
1915 for (i = 0; i <= mask_g>>sh_g; i++)
1916 {
1917 RUINT32T tmp;
1918 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
1919 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
1920 lookup_g[i] = (tmp/65535)<<sh_g;
1921 }
1922 for (i = 0; i <= mask_b>>sh_b; i++)
1923 {
1924 RUINT32T tmp;
1925 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
1926 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
1927 lookup_b[i] = (tmp/65535)<<sh_b;
1928 }
1929
1930 /* apply table to input image (replacing colors by newly calculated ones) */
1931 switch (srcImage->bits_per_pixel)
1932 {
1933 case 15:
1934 {
1935 unsigned short *p1, *pf, *p, *pl;
1936 p1 = (unsigned short *) srcImage->data;
1937 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1938 while (p1 < pf)
1939 {
1940 p = p1;
1941 pl = p1 + srcImage->width;
1942 for (; p < pl; p++)
1943 {
1944 *p = lookup_r[(*p & 0x7c00)>>10] |
1945 lookup_g[(*p & 0x03e0)>> 5] |
1946 lookup_b[(*p & 0x001f)];
1947 }
1948 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1949 }
1950 break;
1951 }
1952 case 16:
1953 {
1954 unsigned short *p1, *pf, *p, *pl;
1955 p1 = (unsigned short *) srcImage->data;
1956 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1957 while (p1 < pf)
1958 {
1959 p = p1;
1960 pl = p1 + srcImage->width;
1961 for (; p < pl; p++)
1962 {
1963 *p = lookup_r[(*p & 0xf800)>>11] |
1964 lookup_g[(*p & 0x07e0)>> 5] |
1965 lookup_b[(*p & 0x001f)];
1966 }
1967 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1968 }
1969 break;
1970 }
1971 case 24:
1972 {
1973 unsigned char *p1, *pf, *p, *pl;
1974 p1 = (unsigned char *) srcImage->data;
1975 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1976 while (p1 < pf)
1977 {
1978 p = p1;
1979 pl = p1 + srcImage->width * 3;
1980 for (; p < pl; p += 3)
1981 {
1982 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1983 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1984 p[2] = lookup_r[(p[2] & 0x0000ff)];
1985 }
1986 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1987 }
1988 break;
1989 }
1990 case 32:
1991 {
1992 RUINT32T *p1, *pf, *p, *pl;
1993 p1 = (RUINT32T *) srcImage->data;
1994 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1995
1996 while (p1 < pf)
1997 {
1998 p = p1;
1999 pl = p1 + srcImage->width;
2000 for (; p < pl; p++)
2001 {
2002 *p = lookup_r[(*p & 0xff0000)>>16] |
2003 lookup_g[(*p & 0x00ff00)>> 8] |
2004 lookup_b[(*p & 0x0000ff)] |
2005 (*p & ~0xffffff);
2006 }
2007 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2008 }
2009 break;
2010 }
2011 }
2012
2013 free (lookup);
2014}
2015#endif
2016
1944/* 2017/*
1945 * Check our parents are still who we think they are. 2018 * Check our parents are still who we think they are.
1946 * Do transparency updates if required 2019 * Do transparency updates if required
1947 */ 2020 */
1948int 2021int
1949rxvt_term::check_our_parents () 2022rxvt_term::check_our_parents ()
1950{ 2023{
1951 int i, pchanged, aformat, have_pixmap, rootdepth; 2024 int i, pchanged, aformat, have_pixmap, rootdepth;
1952 unsigned long nitems, bytes_after; 2025 unsigned long nitems, bytes_after;
1953 Atom atype; 2026 Atom atype;
1954 unsigned char *prop = NULL; 2027 unsigned char *prop = NULL;
1955 Window root, oldp, *list; 2028 Window root, oldp, *list;
1956 Pixmap rootpixmap = None; 2029 Pixmap rootpixmap = None;
1957 XWindowAttributes wattr, wrootattr; 2030 XWindowAttributes wattr, wrootattr;
1958 2031
1959 pchanged = 0; 2032 pchanged = 0;
1960 2033
1961 if (!(Options & Opt_transparent)) 2034 if (!(Options & Opt_transparent))
1962 return pchanged; /* Don't try any more */ 2035 return pchanged; /* Don't try any more */
1963 2036
1964 XGetWindowAttributes(Xdisplay, Xroot, &wrootattr); 2037 XGetWindowAttributes (display->display, display->root, &wrootattr);
1965 rootdepth = wrootattr.depth; 2038 rootdepth = wrootattr.depth;
1966 2039
1967 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2040 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2041
1968 if (rootdepth != wattr.depth) 2042 if (rootdepth != wattr.depth)
1969 { 2043 {
1970 if (am_transparent) 2044 if (am_transparent)
1971 { 2045 {
1972 pchanged = 1; 2046 pchanged = 1;
1973 XSetWindowBackground(Xdisplay, TermWin.vt, 2047 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
1974 PixColors[Color_bg]);
1975 am_transparent = am_pixmap_trans = 0; 2048 am_transparent = am_pixmap_trans = 0;
1976 } 2049 }
2050
1977 return pchanged; /* Don't try any more */ 2051 return pchanged; /* Don't try any more */
1978 } 2052 }
1979 2053
1980 /* Get all X ops out of the queue so that our information is up-to-date. */ 2054 /* Get all X ops out of the queue so that our information is up-to-date. */
1981 XSync(Xdisplay, False); 2055 XSync (display->display, False);
1982 2056
1983 /* 2057 /*
1984 * Make the frame window set by the window manager have 2058 * Make the frame window set by the window manager have
1985 * the root background. Some window managers put multiple nested frame 2059 * the root background. Some window managers put multiple nested frame
1986 * windows for each client, so we have to take care about that. 2060 * windows for each client, so we have to take care about that.
1987 */ 2061 */
1988 i = (xa[XA_XROOTPMAPID] != 0 2062 i = (xa[XA_XROOTPMAPID]
1989 && (XGetWindowProperty(Xdisplay, Xroot, xa[XA_XROOTPMAPID], 2063 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1990 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2064 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1991 &nitems, &bytes_after, &prop) == Success)); 2065 &nitems, &bytes_after, &prop) == Success);
2066
1992 if (!i || prop == NULL) 2067 if (!i || prop == NULL)
2068 i = (xa[XA_XSETROOTID]
2069 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2070 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2071 &nitems, &bytes_after, &prop) == Success);
2072
2073 if (!i || prop == NULL
2074#if TINTING
2075 || !rs[Rs_color + Color_tint]
2076#endif
2077 )
1993 have_pixmap = 0; 2078 have_pixmap = 0;
1994 else 2079 else
1995 { 2080 {
1996 have_pixmap = 1; 2081 have_pixmap = 1;
1997 rootpixmap = *((Pixmap *)prop); 2082 rootpixmap = *(Pixmap *)prop;
1998 XFree(prop); 2083 XFree (prop);
1999 } 2084 }
2085
2000 if (have_pixmap) 2086 if (have_pixmap)
2001 { 2087 {
2002 /* 2088 /*
2003 * Copy Xroot pixmap transparency 2089 * Copy display->root pixmap transparency
2004 */ 2090 */
2005 int sx, sy, nx, ny; 2091 int sx, sy, nx, ny;
2006 unsigned int nw, nh; 2092 unsigned int nw, nh;
2007 Window cr; 2093 Window cr;
2008 XImage *image; 2094 XImage *image;
2009 GC gc; 2095 GC gc;
2010 XGCValues gcvalue; 2096 XGCValues gcvalue;
2011 2097
2012 XTranslateCoordinates(Xdisplay, TermWin.parent[0], Xroot, 2098 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2013 0, 0, &sx, &sy, &cr); 2099 0, 0, &sx, &sy, &cr);
2014 nw = (unsigned int)szHint.width; 2100 nw = (unsigned int)szHint.width;
2015 nh = (unsigned int)szHint.height; 2101 nh = (unsigned int)szHint.height;
2016 nx = ny = 0; 2102 nx = ny = 0;
2103
2017 if (sx < 0) 2104 if (sx < 0)
2018 { 2105 {
2019 nw += sx; 2106 nw += sx;
2020 nx = -sx; 2107 nx = -sx;
2021 sx = 0; 2108 sx = 0;
2022 } 2109 }
2110
2023 if (sy < 0) 2111 if (sy < 0)
2024 { 2112 {
2025 nh += sy; 2113 nh += sy;
2026 ny = -sy; 2114 ny = -sy;
2027 sy = 0; 2115 sy = 0;
2028 } 2116 }
2117
2029 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2118 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2030 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2119 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2031 allowedxerror = -1; 2120 allowedxerror = -1;
2032 image = XGetImage(Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 2121 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2033 ZPixmap); 2122
2034 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2123 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2035 /* XXX: may need a delay here? */ 2124 /* XXX: may need a delay here? */
2036 allowedxerror = 0; 2125 allowedxerror = 0;
2126
2037 if (image == NULL) 2127 if (image == NULL)
2038 { 2128 {
2039 if (am_transparent && am_pixmap_trans) 2129 if (am_transparent && am_pixmap_trans)
2040 { 2130 {
2041 pchanged = 1; 2131 pchanged = 1;
2042 if (TermWin.pixmap != None) 2132 if (TermWin.pixmap != None)
2043 { 2133 {
2044 XFreePixmap(Xdisplay, TermWin.pixmap); 2134 XFreePixmap (display->display, TermWin.pixmap);
2045 TermWin.pixmap = None; 2135 TermWin.pixmap = None;
2046 } 2136 }
2047 } 2137 }
2138
2048 am_pixmap_trans = 0; 2139 am_pixmap_trans = 0;
2049 } 2140 }
2050 else 2141 else
2051 { 2142 {
2052 if (TermWin.pixmap != None) 2143 if (TermWin.pixmap != None)
2053 XFreePixmap(Xdisplay, TermWin.pixmap); 2144 XFreePixmap (display->display, TermWin.pixmap);
2145
2146#if TINTING
2147 if (ISSET_PIXCOLOR (Color_tint))
2148 {
2149 unsigned short rm, gm, bm;
2150 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2151
2152 PixColorsFocused[Color_tint].get (display, rm, gm, bm);
2153
2154 ShadeXImage (display, image, shade, rm, gm, bm);
2155 }
2156#endif
2157
2054 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, 2158 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2055 (unsigned int)szHint.width,
2056 (unsigned int)szHint.height, 2159 szHint.width, szHint.height, image->depth);
2057 (unsigned int)image->depth);
2058 gc = XCreateGC(Xdisplay, TermWin.vt, 0UL, &gcvalue); 2160 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2059 XPutImage(Xdisplay, TermWin.pixmap, gc, image, 0, 0, 2161 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2060 nx, ny, (unsigned int)image->width,
2061 (unsigned int)image->height); 2162 nx, ny, image->width, image->height);
2062 XFreeGC(Xdisplay, gc); 2163 XFreeGC (display->display, gc);
2063 XDestroyImage(image); 2164 XDestroyImage (image);
2064 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2165 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2065 TermWin.pixmap); 2166 XClearWindow (display->display, TermWin.parent[0]);
2167
2066 if (!am_transparent || !am_pixmap_trans) 2168 if (!am_transparent || !am_pixmap_trans)
2067 pchanged = 1; 2169 pchanged = 1;
2170
2068 am_transparent = am_pixmap_trans = 1; 2171 am_transparent = am_pixmap_trans = 1;
2069 } 2172 }
2070 } 2173 }
2174
2071 if (!am_pixmap_trans) 2175 if (!am_pixmap_trans)
2072 { 2176 {
2073 unsigned int n; 2177 unsigned int n;
2074 /* 2178 /*
2075 * InheritPixmap transparency 2179 * InheritPixmap transparency
2076 */ 2180 */
2077 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2181 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2078 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2182 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2079 i++)
2080 { 2183 {
2081 oldp = TermWin.parent[i]; 2184 oldp = TermWin.parent[i];
2082 XQueryTree(Xdisplay, TermWin.parent[i - 1], &root, 2185 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2083 &TermWin.parent[i], &list, &n); 2186 &TermWin.parent[i], &list, &n);
2084 XFree(list); 2187 XFree (list);
2085 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2188 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2189
2086 if (TermWin.parent[i] == Xroot) 2190 if (TermWin.parent[i] == display->root)
2087 { 2191 {
2088 if (oldp != None) 2192 if (oldp != None)
2089 pchanged = 1; 2193 pchanged = 1;
2194
2090 break; 2195 break;
2091 } 2196 }
2197
2092 if (oldp != TermWin.parent[i]) 2198 if (oldp != TermWin.parent[i])
2093 pchanged = 1; 2199 pchanged = 1;
2094 } 2200 }
2201
2095 n = 0; 2202 n = 0;
2203
2096 if (pchanged) 2204 if (pchanged)
2097 { 2205 {
2098 for (; n < (unsigned int)i; n++) 2206 for (; n < (unsigned int)i; n++)
2099 { 2207 {
2100 XGetWindowAttributes(Xdisplay, TermWin.parent[n], &wattr); 2208 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2101 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2209 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2102 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2210 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2103 { 2211 {
2104 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2212 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2105 break; 2213 break;
2106 } 2214 }
2107 } 2215 }
2108 } 2216 }
2109 if (n > (int)(sizeof(TermWin.parent) 2217
2110 / sizeof(TermWin.parent[0]))) 2218 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2111 { 2219 {
2112 D_X((stderr, "InheritPixmap Turning off")); 2220 D_X ((stderr, "InheritPixmap Turning off"));
2113 XSetWindowBackground(Xdisplay, TermWin.parent[0], 2221 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]);
2114 PixColors[Color_fg]); 2222 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2115 XSetWindowBackground(Xdisplay, TermWin.vt,
2116 PixColors[Color_bg]);
2117 am_transparent = 0; 2223 am_transparent = 0;
2118 /* XXX: also turn off Opt_transparent? */ 2224 /* XXX: also turn off Opt_transparent? */
2119 } 2225 }
2120 else 2226 else
2121 { 2227 {
2228#if WAIT_FOR_WM
2122 /* wait (an arbitrary period) for the WM to do its thing 2229 /* wait (an arbitrary period) for the WM to do its thing
2123 * needed for fvwm2.2.2 (and before?) */ 2230 * needed for fvwm2.2.2 (and before?) */
2124# ifdef HAVE_NANOSLEEP
2125 struct timespec rqt;
2126
2127 rqt.tv_sec = 1;
2128 rqt.tv_nsec = 0;
2129 nanosleep(&rqt, NULL);
2130# else
2131 sleep(1); 2231 sleep (1);
2132# endif 2232#endif
2133 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2233 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2134 for (n = 0; n < (unsigned int)i; n++) 2234 for (n = 0; n < (unsigned int)i; n++)
2235 {
2135 XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n], 2236 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2136 ParentRelative); 2237 XClearWindow (display->display, TermWin.parent[n]);
2238 }
2239
2137 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2240 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2138 ParentRelative);
2139 am_transparent = 1; 2241 am_transparent = 1;
2140 } 2242 }
2243
2141 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2244 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2142 TermWin.parent[i] = None; 2245 TermWin.parent[i] = None;
2143 } 2246 }
2247
2248 // this is experimental
2249 if (scrollBar.win)
2250 {
2251 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2252 XClearWindow (display->display, scrollBar.win);
2253 scrollBar.setIdle ();
2254 scrollbar_show (0);
2255 }
2256
2144 return pchanged; 2257 return pchanged;
2145} 2258}
2146#endif 2259#endif
2147 2260
2148/*}}} */ 2261/*}}} */
2262
2263bool
2264rxvt_term::cmd_parse ()
2265{
2266 bool flag = false;
2267 unicode_t ch = NOCHAR;
2268 unsigned char *seq_begin; // remember start of esc-sequence here
2269
2270 for (;;)
2271 {
2272 if (ch == NOCHAR)
2273 {
2274 seq_begin = cmdbuf_ptr;
2275 ch = next_char ();
2276 }
2277
2278 if (ch == NOCHAR) // TODO: improve
2279 break;
2280
2281 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2282 {
2283 /* Read a text string from the input buffer */
2284 unicode_t buf[UBUFSIZ];
2285 bool refreshnow = false;
2286 int nlines = 0;
2287 unicode_t *str = buf;
2288
2289 for (;;)
2290 {
2291 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2292 break;
2293
2294 *str++ = ch;
2295
2296 if (ch == C0_LF)
2297 {
2298 nlines++;
2299 refresh_count++;
2300
2301 if (!(Options & Opt_jumpScroll)
2302 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2303 {
2304 refreshnow = true;
2305 ch = NOCHAR;
2306 break;
2307 }
2308
2309 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2310 if (nlines >= TermWin.nrow - 1)
2311 {
2312 scr_add_lines (buf, nlines, str - buf);
2313 nlines = 0;
2314 str = buf;
2315 }
2316 }
2317
2318 if (str >= buf + UBUFSIZ)
2319 {
2320 ch = NOCHAR;
2321 break;
2322 }
2323
2324 seq_begin = cmdbuf_ptr;
2325 ch = next_char ();
2326 }
2327
2328 scr_add_lines (buf, nlines, str - buf);
2329
2330 /*
2331 * If there have been a lot of new lines, then update the screen
2332 * What the heck I'll cheat and only refresh less than every page-full.
2333 * the number of pages between refreshes is refresh_limit, which
2334 * is incremented here because we must be doing flat-out scrolling.
2335 */
2336 if (refreshnow)
2337 {
2338 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2339 refresh_limit++;
2340 else
2341 {
2342 flag = true;
2343 scr_refresh (refresh_type);
2344 }
2345 }
2346
2347 }
2348 else
2349 {
2350 try
2351 {
2352 process_nonprinting (ch);
2353 }
2354 catch (const class out_of_input &o)
2355 {
2356 // we ran out of input, retry later
2357 cmdbuf_ptr = seq_begin;
2358 break;
2359 }
2360
2361 ch = NOCHAR;
2362 }
2363 }
2364
2365 return flag;
2366}
2367
2368// read the next octet
2369unicode_t
2370rxvt_term::next_octet ()
2371{
2372 return cmdbuf_ptr < cmdbuf_endp
2373 ? *cmdbuf_ptr++
2374 : NOCHAR;
2375}
2376
2377// read the next character
2378unicode_t
2379rxvt_term::next_char ()
2380{
2381 while (cmdbuf_ptr < cmdbuf_endp)
2382 {
2383 // assume 7-bit to be ascii ALWAYS
2384 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2385 return *cmdbuf_ptr++;
2386
2387 wchar_t wc;
2388 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2389
2390 if (len == (size_t)-2)
2391 {
2392 // the mbstate stores incomplete sequences. didn't know this :/
2393 cmdbuf_ptr = cmdbuf_endp;
2394 break;
2395 }
2396
2397 if (len == (size_t)-1)
2398 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2399
2400 // assume wchar == unicode
2401 cmdbuf_ptr += len;
2402 return wc;
2403 }
2404
2405 return NOCHAR;
2406}
2407
2408/* rxvt_cmd_getc () - Return next input character */
2409/*
2410 * Return the next input character after first passing any keyboard input
2411 * to the command.
2412 */
2413unicode_t
2414rxvt_term::cmd_getc ()
2415{
2416 unicode_t c = next_char ();
2417
2418 if (c == NOCHAR)
2419 throw out_of_input;
2420
2421 return c;
2422}
2423
2424unicode_t
2425rxvt_term::cmd_get8 ()
2426{
2427 unicode_t c = next_octet ();
2428
2429 if (c == NOCHAR)
2430 throw out_of_input;
2431
2432 return c;
2433}
2149 2434
2150/*{{{ print pipe */ 2435/*{{{ print pipe */
2151/*----------------------------------------------------------------------*/ 2436/*----------------------------------------------------------------------*/
2152#ifdef PRINTPIPE 2437#ifdef PRINTPIPE
2153FILE * 2438FILE *
2154rxvt_term::popen_printer () 2439rxvt_term::popen_printer ()
2155{ 2440{
2156 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2441 FILE *stream = popen (rs[Rs_print_pipe], "w");
2157 2442
2158 if (stream == NULL) 2443 if (stream == NULL)
2159 rxvt_print_error("can't open printer pipe"); 2444 rxvt_warn ("can't open printer pipe, not printing.\n");
2445
2160 return stream; 2446 return stream;
2161} 2447}
2162 2448
2163int 2449int
2164rxvt_term::pclose_printer (FILE *stream) 2450rxvt_term::pclose_printer (FILE *stream)
2165{ 2451{
2166 fflush (stream); 2452 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); 2453 return pclose (stream);
2173# endif
2174} 2454}
2175 2455
2176/* 2456/*
2177 * simulate attached vt100 printer 2457 * simulate attached vt100 printer
2178 */ 2458 */
2179void 2459void
2180rxvt_term::process_print_pipe () 2460rxvt_term::process_print_pipe ()
2181{ 2461{
2182 int done; 2462 int done;
2183 FILE *fd; 2463 FILE *fd;
2184 2464
2185 if ((fd = popen_printer ()) == NULL) 2465 if ((fd = popen_printer ()) == NULL)
2186 return; 2466 return;
2187 2467
2188 /* 2468 /*
2189 * Send all input to the printer until either ESC[4i or ESC[?4i 2469 * Send all input to the printer until either ESC[4i or ESC[?4i
2190 * is received. 2470 * is received.
2191 */ 2471 */
2192 for (done = 0; !done;) 2472 for (done = 0; !done;)
2193 { 2473 {
2194 unsigned char buf[8]; 2474 unsigned char buf[8];
2195 unsigned char ch; 2475 unicode_t ch;
2196 unsigned int i, len; 2476 unsigned int i, len;
2197 2477
2198 if ((ch = cmd_getc ()) != C0_ESC) 2478 if ((ch = cmd_getc ()) != C0_ESC)
2199 { 2479 {
2200 if (putc(ch, fd) == EOF) 2480 if (putc (ch, fd) == EOF)
2201 break; /* done = 1 */ 2481 break; /* done = 1 */
2202 } 2482 }
2203 else 2483 else
2204 { 2484 {
2205 len = 0; 2485 len = 0;
… …
2216 { 2496 {
2217 if ((buf[len++] = cmd_getc ()) == 'i') 2497 if ((buf[len++] = cmd_getc ()) == 'i')
2218 break; /* done = 1 */ 2498 break; /* done = 1 */
2219 } 2499 }
2220 } 2500 }
2501
2221 for (i = 0; i < len; i++) 2502 for (i = 0; i < len; i++)
2222 if (putc(buf[i], fd) == EOF) 2503 if (putc (buf[i], fd) == EOF)
2223 { 2504 {
2224 done = 1; 2505 done = 1;
2225 break; 2506 break;
2226 } 2507 }
2227 } 2508 }
2228 } 2509 }
2510
2229 pclose_printer (fd); 2511 pclose_printer (fd);
2230} 2512}
2231#endif /* PRINTPIPE */ 2513#endif /* PRINTPIPE */
2232/*}}} */ 2514/*}}} */
2233 2515
2234/* *INDENT-OFF* */ 2516/* *INDENT-OFF* */
2235enum { 2517enum {
2236 C1_40 = 0x40, 2518 C1_40 = 0x40,
2237 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2519 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, 2520 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, 2521 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 2522 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2241}; 2523};
2242/* *INDENT-ON* */ 2524/* *INDENT-ON* */
2243 2525
2244/*{{{ process non-printing single characters */ 2526/*{{{ process non-printing single characters */
2245void 2527void
2246rxvt_term::process_nonprinting (unsigned char ch) 2528rxvt_term::process_nonprinting (unicode_t ch)
2247{ 2529{
2248 switch (ch) 2530 switch (ch)
2249 { 2531 {
2532 case C0_ESC:
2533 process_escape_seq ();
2534 break;
2250 case C0_ENQ: /* terminal Status */ 2535 case C0_ENQ: /* terminal Status */
2251 if (rs[Rs_answerbackstring]) 2536 if (rs[Rs_answerbackstring])
2252 tt_write(
2253 (const unsigned char *)rs[Rs_answerbackstring], 2537 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2254 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2538 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2255 else 2539 else
2256 tt_write((unsigned char *)VT100_ANS, 2540 tt_write ((unsigned char *)VT100_ANS,
2257 (unsigned int)STRLEN(VT100_ANS)); 2541 (unsigned int)STRLEN (VT100_ANS));
2258 break; 2542 break;
2259 case C0_BEL: /* bell */ 2543 case C0_BEL: /* bell */
2260 scr_bell (); 2544 scr_bell ();
2261 break; 2545 break;
2262 case C0_BS: /* backspace */ 2546 case C0_BS: /* backspace */
… …
2277 scr_charset_choose (1); 2561 scr_charset_choose (1);
2278 break; 2562 break;
2279 case C0_SI: /* shift in - acs */ 2563 case C0_SI: /* shift in - acs */
2280 scr_charset_choose (0); 2564 scr_charset_choose (0);
2281 break; 2565 break;
2566
2567#ifdef EIGHT_BIT_CONTROLS
2568 // 8-bit controls
2569 case 0x90: /* DCS */
2570 process_dcs_seq ();
2571 break;
2572 case 0x9b: /* CSI */
2573 process_csi_seq ();
2574 break;
2575 case 0x9d: /* CSI */
2576 process_osc_seq ();
2577 break;
2578#endif
2282 } 2579 }
2283} 2580}
2284/*}}} */ 2581/*}}} */
2285 2582
2286 2583
2287/*{{{ process VT52 escape sequences */ 2584/*{{{ process VT52 escape sequences */
2288void 2585void
2289rxvt_term::process_escape_vt52 (unsigned char ch) 2586rxvt_term::process_escape_vt52 (unicode_t ch)
2290{ 2587{
2291 int row, col; 2588 int row, col;
2292 2589
2293 switch (ch) 2590 switch (ch)
2294 { 2591 {
… …
2324 row = cmd_getc () - ' '; 2621 row = cmd_getc () - ' ';
2325 col = cmd_getc () - ' '; 2622 col = cmd_getc () - ' ';
2326 scr_gotorc (row, col, 0); 2623 scr_gotorc (row, col, 0);
2327 break; 2624 break;
2328 case 'Z': /* identify the terminal type */ 2625 case 'Z': /* identify the terminal type */
2329 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2626 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2330 break; 2627 break;
2331 case '<': /* turn off VT52 mode */ 2628 case '<': /* turn off VT52 mode */
2332 PrivMode(0, PrivMode_vt52); 2629 PrivMode (0, PrivMode_vt52);
2333 break; 2630 break;
2334 case 'F': /* use special graphics character set */ 2631 case 'F': /* use special graphics character set */
2335 case 'G': /* use regular character set */ 2632 case 'G': /* use regular character set */
2336 /* unimplemented */ 2633 /* unimplemented */
2337 break; 2634 break;
… …
2346 2643
2347/*{{{ process escape sequences */ 2644/*{{{ process escape sequences */
2348void 2645void
2349rxvt_term::process_escape_seq () 2646rxvt_term::process_escape_seq ()
2350{ 2647{
2351 unsigned char ch = cmd_getc (); 2648 unicode_t ch = cmd_getc ();
2352 2649
2353 if (PrivateModes & PrivMode_vt52) 2650 if (PrivateModes & PrivMode_vt52)
2354 { 2651 {
2355 process_escape_vt52 (ch); 2652 process_escape_vt52 (ch);
2356 return; 2653 return;
… …
2373 scr_charset_set (2, (unsigned int)cmd_getc ()); 2670 scr_charset_set (2, (unsigned int)cmd_getc ());
2374 break; 2671 break;
2375 case '+': 2672 case '+':
2376 scr_charset_set (3, (unsigned int)cmd_getc ()); 2673 scr_charset_set (3, (unsigned int)cmd_getc ());
2377 break; 2674 break;
2378#ifdef MULTICHAR_SET
2379 case '$':
2380 scr_charset_set (-2, (unsigned int)cmd_getc ());
2381 break;
2382#endif
2383#ifndef NO_FRILLS 2675#ifndef NO_FRILLS
2384 case '6': 2676 case '6':
2385 scr_backindex (); 2677 scr_backindex ();
2386 break; 2678 break;
2387#endif 2679#endif
… …
2396 scr_forwardindex (); 2688 scr_forwardindex ();
2397 break; 2689 break;
2398#endif 2690#endif
2399 case '=': 2691 case '=':
2400 case '>': 2692 case '>':
2401 PrivMode((ch == '='), PrivMode_aplKP); 2693 PrivMode ((ch == '='), PrivMode_aplKP);
2402 break; 2694 break;
2403 2695
2404 case C1_40: 2696 case C1_40:
2405 cmd_getc (); 2697 cmd_getc ();
2406 break; 2698 break;
… …
2409 break; 2701 break;
2410 2702
2411 /* 8.3.87: NEXT LINE */ 2703 /* 8.3.87: NEXT LINE */
2412 case C1_NEL: /* ESC E */ 2704 case C1_NEL: /* ESC E */
2413 { 2705 {
2414 uint32_t nlcr[] = { '\n', '\r' }; 2706 unicode_t nlcr[] = { C0_LF, C0_CR };
2415 scr_add_lines (nlcr, 1, 2); 2707 scr_add_lines (nlcr, 1, 2);
2416 } 2708 }
2417 break; 2709 break;
2418 2710
2419 /* kidnapped escape sequence: Should be 8.3.48 */ 2711 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2430 case C1_RI: /* ESC M */ 2722 case C1_RI: /* ESC M */
2431 scr_index (DN); 2723 scr_index (DN);
2432 break; 2724 break;
2433 2725
2434 /* 8.3.142: SINGLE-SHIFT TWO */ 2726 /* 8.3.142: SINGLE-SHIFT TWO */
2435 /*case C1_SS2: scr_single_shift (2); break; */ 2727 /*case C1_SS2: scr_single_shift (2); break; */
2436 2728
2437 /* 8.3.143: SINGLE-SHIFT THREE */ 2729 /* 8.3.143: SINGLE-SHIFT THREE */
2438 /*case C1_SS3: scr_single_shift (3); break; */ 2730 /*case C1_SS3: scr_single_shift (3); break; */
2439 2731
2440 /* 8.3.27: DEVICE CONTROL STRING */ 2732 /* 8.3.27: DEVICE CONTROL STRING */
2441 case C1_DCS: /* ESC P */ 2733 case C1_DCS: /* ESC P */
2442 process_dcs_seq (); 2734 process_dcs_seq ();
2443 break; 2735 break;
2444 2736
2445 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2446 case C1_SCI: /* ESC Z */ 2738 case C1_SCI: /* ESC Z */
2447 tt_write((const unsigned char *)ESCZ_ANSWER, 2739 tt_write ((const unsigned char *)ESCZ_ANSWER,
2448 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2740 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2449 break; /* steal obsolete ESC [ c */ 2741 break; /* steal obsolete ESC [ c */
2450 2742
2451 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2743 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2452 case C1_CSI: /* ESC [ */ 2744 case C1_CSI: /* ESC [ */
2453 process_csi_seq (); 2745 process_csi_seq ();
… …
2458 process_osc_seq (); 2750 process_osc_seq ();
2459 break; 2751 break;
2460 2752
2461 /* 8.3.106: RESET TO INITIAL STATE */ 2753 /* 8.3.106: RESET TO INITIAL STATE */
2462 case 'c': 2754 case 'c':
2755 mbstate.reset ();
2463 scr_poweron (); 2756 scr_poweron ();
2464 scrollbar_show (1); 2757 scrollbar_show (1);
2465 break; 2758 break;
2466 2759
2467 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2760 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2479 2772
2480/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2773/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2481/* *INDENT-OFF* */ 2774/* *INDENT-OFF* */
2482enum { 2775enum {
2483 CSI_ICH = 0x40, 2776 CSI_ICH = 0x40,
2484 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2777 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 , 2778 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, 2779 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, 2780 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, 2781 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, 2782 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2493 2786
2494#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2787#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2495 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2788 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2496 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2789 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2497#define get_byte_array_bit(array, bit) \ 2790#define get_byte_array_bit(array, bit) \
2498 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2791 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2499 2792
2500const unsigned char csi_defaults[] = 2793const unsigned char csi_defaults[] =
2501 { 2794 {
2502 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2795 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, */ 2796 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, */ 2797 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, [, \, ], ^, _, */ 2798 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, */ 2799 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, */ 2800 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, */ 2801 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, {, |, }, ~, */ 2802 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2510 }; 2803 };
2511/* *INDENT-ON* */ 2804/* *INDENT-ON* */
2512 2805
2513void 2806void
2514rxvt_term::process_csi_seq () 2807rxvt_term::process_csi_seq ()
2515{ 2808{
2516 unsigned char ch, priv, i; 2809 unicode_t ch, priv, i;
2517 unsigned int nargs, p; 2810 unsigned int nargs, p;
2518 int n, ndef; 2811 int n, ndef;
2519 int arg[ESC_ARGS]; 2812 int arg[ESC_ARGS];
2520 2813
2521 for (nargs = ESC_ARGS; nargs > 0;) 2814 for (nargs = ESC_ARGS; nargs > 0;)
2522 arg[--nargs] = 0; 2815 arg[--nargs] = 0;
2523 2816
2524 priv = 0; 2817 priv = 0;
… …
2526 if (ch >= '<' && ch <= '?') 2819 if (ch >= '<' && ch <= '?')
2527 { /* '<' '=' '>' '?' */ 2820 { /* '<' '=' '>' '?' */
2528 priv = ch; 2821 priv = ch;
2529 ch = cmd_getc (); 2822 ch = cmd_getc ();
2530 } 2823 }
2824
2531 /* read any numerical arguments */ 2825 /* read any numerical arguments */
2532 for (n = -1; ch < CSI_ICH; ) 2826 for (n = -1; ch < CSI_ICH; )
2533 { 2827 {
2534 if (isdigit(ch)) 2828 if (isdigit (ch))
2535 { 2829 {
2536 if (n < 0) 2830 if (n < 0)
2537 n = ch - '0'; 2831 n = ch - '0';
2538 else 2832 else
2539 n = n * 10 + ch - '0'; 2833 n = n * 10 + ch - '0';
… …
2542 { 2836 {
2543 if (nargs < ESC_ARGS) 2837 if (nargs < ESC_ARGS)
2544 arg[nargs++] = n; 2838 arg[nargs++] = n;
2545 n = -1; 2839 n = -1;
2546 } 2840 }
2547 else if (ch == '\b') 2841 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); 2842 process_nonprinting (ch);
2559 } 2843
2560 ch = cmd_getc (); 2844 ch = cmd_getc ();
2561 } 2845 }
2562 2846
2563 if (ch > CSI_7F) 2847 if (ch > CSI_7F)
2564 return; 2848 return;
2565 2849
2566 if (nargs < ESC_ARGS) 2850 if (nargs < ESC_ARGS)
2567 arg[nargs++] = n; 2851 arg[nargs++] = n;
2568 2852
2569 i = ch - CSI_ICH; 2853 i = ch - CSI_ICH;
2570 ndef = get_byte_array_bit(csi_defaults, i); 2854 ndef = get_byte_array_bit (csi_defaults, i);
2571 for (p = 0; p < nargs; p++) 2855 for (p = 0; p < nargs; p++)
2572 if (arg[p] == -1) 2856 if (arg[p] == -1)
2573 arg[p] = ndef; 2857 arg[p] = ndef;
2574 2858
2575#ifdef DEBUG_CMD 2859#ifdef DEBUG_CMD
2576 fprintf(stderr, "CSI "); 2860 fprintf (stderr, "CSI ");
2577 for (p = 0; p < nargs; p++) 2861 for (p = 0; p < nargs; p++)
2578 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2862 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2579 fprintf(stderr, "%c\n", ch); 2863 fprintf (stderr, "%c\n", ch);
2580#endif 2864#endif
2581 2865
2582 /* 2866 /*
2583 * private mode handling 2867 * private mode handling
2584 */ 2868 */
… …
2586 { 2870 {
2587 switch (priv) 2871 switch (priv)
2588 { 2872 {
2589 case '>': 2873 case '>':
2590 if (ch == CSI_DA) /* secondary device attributes */ 2874 if (ch == CSI_DA) /* secondary device attributes */
2591 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2875 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2592 break; 2876 break;
2593 case '?': 2877 case '?':
2594 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2595 process_terminal_mode (ch, priv, nargs, arg); 2879 process_terminal_mode (ch, priv, nargs, arg);
2596 break; 2880 break;
… …
2599 } 2883 }
2600 2884
2601 switch (ch) 2885 switch (ch)
2602 { 2886 {
2603 /* 2887 /*
2604 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2888 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2605 */ 2889 */
2606#ifdef PRINTPIPE 2890#ifdef PRINTPIPE
2607 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2891 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2608 switch (arg[0]) 2892 switch (arg[0])
2609 { 2893 {
… …
2705 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2989 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2706 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2990 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2707 break; 2991 break;
2708 2992
2709 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2993 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2710 tt_write((const unsigned char *)VT100_ANS, 2994 tt_write ((const unsigned char *)VT100_ANS,
2711 (unsigned int)(sizeof(VT100_ANS) - 1)); 2995 (unsigned int) (sizeof (VT100_ANS) - 1));
2712 break; 2996 break;
2713 2997
2714 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2998 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2715 process_sgr_mode (nargs, arg); 2999 process_sgr_mode (nargs, arg);
2716 break; 3000 break;
2717 3001
2718 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 3002 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2719 switch (arg[0]) 3003 switch (arg[0])
2720 { 3004 {
2721 case 5: /* DSR requested */ 3005 case 5: /* DSR requested */
2722 tt_printf("\033[0n"); 3006 tt_printf ("\033[0n");
2723 break; 3007 break;
2724 case 6: /* CPR requested */ 3008 case 6: /* CPR requested */
2725 scr_report_position (); 3009 scr_report_position ();
2726 break; 3010 break;
2727#if defined (ENABLE_DISPLAY_ANSWER)
2728 case 7: /* unofficial extension */ 3011 case 7: /* unofficial extension */
3012 if (Options & Opt_insecure)
2729 tt_printf("%-.250s\n", rs[Rs_display_name]); 3013 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2730 break; 3014 break;
2731#endif
2732 case 8: /* unofficial extension */ 3015 case 8: /* unofficial extension */
2733 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2734 break; 3017 break;
2735 } 3018 }
2736 break; 3019 break;
2737 3020
2738 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3021 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2805 break; 3088 break;
2806#endif 3089#endif
2807 3090
2808 case CSI_78: /* DECREQTPARM */ 3091 case CSI_78: /* DECREQTPARM */
2809 if (arg[0] == 0 || arg[0] == 1) 3092 if (arg[0] == 0 || arg[0] == 1)
2810 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3093 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2811 /* FALLTHROUGH */ 3094 break;
2812 3095
2813 default: 3096 default:
2814 break; 3097 break;
2815 } 3098 }
2816} 3099}
… …
2819#ifndef NO_FRILLS 3102#ifndef NO_FRILLS
2820/* ARGSUSED */ 3103/* ARGSUSED */
2821void 3104void
2822rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3105rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2823{ 3106{
2824 int x, y; 3107 int x, y;
2825#if 0
2826 char *s;
2827#endif
2828 XWindowAttributes wattr; 3108 XWindowAttributes wattr;
2829 Window wdummy; 3109 Window wdummy;
2830 3110
2831 if (nargs == 0) 3111 if (nargs == 0)
2832 return; 3112 return;
3113
2833 switch (args[0]) 3114 switch (args[0])
2834 { 3115 {
2835 /* 3116 /*
2836 * commands 3117 * commands
2837 */ 3118 */
2838 case 1: /* deiconify window */ 3119 case 1: /* deiconify window */
2839 XMapWindow(Xdisplay, TermWin.parent[0]); 3120 XMapWindow (display->display, TermWin.parent[0]);
2840 break; 3121 break;
2841 case 2: /* iconify window */ 3122 case 2: /* iconify window */
2842 XIconifyWindow(Xdisplay, TermWin.parent[0], 3123 XIconifyWindow (display->display, TermWin.parent[0],
2843 DefaultScreen(Xdisplay)); 3124 DefaultScreen (display->display));
2844 break; 3125 break;
2845 case 3: /* set position (pixels) */ 3126 case 3: /* set position (pixels) */
2846 XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]); 3127 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2847 break; 3128 break;
2848 case 4: /* set size (pixels) */ 3129 case 4: /* set size (pixels) */
2849 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3130 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2850 break; 3131 break;
2851 case 5: /* raise window */ 3132 case 5: /* raise window */
2852 XRaiseWindow(Xdisplay, TermWin.parent[0]); 3133 XRaiseWindow (display->display, TermWin.parent[0]);
2853 break; 3134 break;
2854 case 6: /* lower window */ 3135 case 6: /* lower window */
2855 XLowerWindow(Xdisplay, TermWin.parent[0]); 3136 XLowerWindow (display->display, TermWin.parent[0]);
2856 break; 3137 break;
2857 case 7: /* refresh window */ 3138 case 7: /* refresh window */
2858 scr_touch (true); 3139 scr_touch (true);
2859 break; 3140 break;
2860 case 8: /* set size (chars) */ 3141 case 8: /* set size (chars) */
2861 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 3142 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2862 (unsigned int)(args[1] * TermWin.fheight)); 3143 (unsigned int) (args[1] * TermWin.fheight));
2863 break; 3144 break;
3145
3146 //case 9: NYI, TODO, restore maximized window or maximize window
2864 default: 3147 default:
2865 if (args[0] >= 24) /* set height (chars) */ 3148 if (args[0] >= 24) /* set height (chars) */
2866 set_widthheight ((unsigned int)TermWin.width, 3149 set_widthheight ((unsigned int)TermWin.width,
2867 (unsigned int)(args[1] * TermWin.fheight)); 3150 (unsigned int) (args[1] * TermWin.fheight));
2868 break; 3151 break;
3152
3153
2869 /* 3154 /*
2870 * reports - some output format copied from XTerm 3155 * reports - some output format copied from XTerm
2871 */ 3156 */
2872 case 11: /* report window state */ 3157 case 11: /* report window state */
2873 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 3158 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2874 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2875 break; 3160 break;
2876 case 13: /* report window position */ 3161 case 13: /* report window position */
2877 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 3162 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2878 XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root, 3163 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2879 -wattr.border_width, -wattr.border_width, 3164 -wattr.border_width, -wattr.border_width,
2880 &x, &y, &wdummy); 3165 &x, &y, &wdummy);
2881 tt_printf("\033[3;%d;%dt", x, y); 3166 tt_printf ("\033[3;%d;%dt", x, y);
2882 break; 3167 break;
2883 case 14: /* report window size (pixels) */ 3168 case 14: /* report window size (pixels) */
2884 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 3169 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2885 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2886 break; 3171 break;
2887 case 18: /* report window size (chars) */ 3172 case 18: /* report text area size (chars) */
2888 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3173 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2889 break; 3174 break;
2890#if 0 /* XXX: currently disabled due to security concerns */ 3175 case 19: /* report window size (chars) */
3176 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3177 break;
2891 case 20: /* report icon label */ 3178 case 20: /* report icon label */
3179 if (Options & Opt_insecure)
3180 {
3181 char *s;
2892 XGetIconName(Xdisplay, TermWin.parent[0], &s); 3182 XGetIconName (display->display, TermWin.parent[0], &s);
2893 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3183 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
3184 }
2894 break; 3185 break;
2895 case 21: /* report window title */ 3186 case 21: /* report window title */
3187 if (Options & Opt_insecure)
3188 {
3189 char *s;
2896 XFetchName(Xdisplay, TermWin.parent[0], &s); 3190 XFetchName (display->display, TermWin.parent[0], &s);
2897 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3191 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
3192 }
2898 break; 3193 break;
2899#endif
2900
2901 } 3194 }
2902} 3195}
2903#endif 3196#endif
2904 3197
2905/*----------------------------------------------------------------------*/ 3198/*----------------------------------------------------------------------*/
2906/* 3199/*
2907 * get input up until STRING TERMINATOR (or BEL) 3200 * get input up until STRING TERMINATOR (or BEL)
2908 * ends_how is terminator used. returned input must be free()d 3201 * ends_how is terminator used. returned input must be free()'d
2909 */ 3202 */
2910unsigned char * 3203unsigned char *
2911rxvt_term::get_to_st (unsigned char *ends_how) 3204rxvt_term::get_to_st (unicode_t &ends_how)
2912{ 3205{
2913 int seen_esc = 0; /* seen escape? */ 3206 unicode_t prev = 0, ch;
2914 unsigned int n = 0; 3207 unsigned int n = 0;
2915 unsigned char *s; 3208 unsigned char *s;
2916 unsigned char ch, string[STRING_MAX]; 3209 unsigned char string[STRING_MAX];
2917 3210
2918 for (; (ch = cmd_getc ());) 3211 while ((ch = cmd_getc ()) != NOCHAR)
2919 { 3212 {
2920 if (ch == C0_BEL
2921 || ch == CHAR_ST
2922 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2923 break;
2924 if (ch == C0_ESC) 3213 if (prev == C0_ESC)
2925 {
2926 seen_esc = 1;
2927 continue;
2928 } 3214 {
2929 else if (ch == '\t') 3215 if (ch == 0x5c) /* 7bit ST */
2930 ch = ' '; /* translate '\t' to space */ 3216 break;
2931 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3217 else
3218 return NULL;
3219 }
3220 else if (ch == C0_BEL || ch == CHAR_ST)
3221 break;
3222 else if (ch < 0x20)
2932 return NULL; /* other control character - exit */ 3223 return NULL; /* other control character - exit */
3224
2933 if (n < sizeof(string) - 1) 3225 if (n >= sizeof (string) - 1)
3226 // stop at some sane length
3227 return NULL;
3228
3229 if (ch == C0_SYN)
3230 {
3231 string[n++] = cmd_get8 ();
3232 prev = 0;
3233 }
3234 else
2934 string[n++] = ch; 3235 string[n++] = prev = ch;
2935 seen_esc = 0;
2936 } 3236 }
3237
2937 string[n++] = '\0'; 3238 string[n++] = '\0';
3239
2938 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 3240 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2939 return NULL; 3241 return NULL;
3242
2940 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3243 ends_how = (ch == 0x5c ? C0_ESC : ch);
2941 STRNCPY(s, string, n); 3244 STRNCPY (s, string, n);
2942 return s; 3245 return s;
2943} 3246}
2944 3247
2945/*----------------------------------------------------------------------*/ 3248/*----------------------------------------------------------------------*/
2946/* 3249/*
2947 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2948 */ 3251 */
2949void 3252void
2950rxvt_term::process_dcs_seq () 3253rxvt_term::process_dcs_seq ()
2951{ 3254{
2952 unsigned char eh, *s; 3255 unsigned char *s;
3256 unicode_t eh;
3257
2953 /* 3258 /*
2954 * Not handled yet 3259 * Not handled yet
2955 */ 3260 */
2956 s = get_to_st (&eh); 3261 s = get_to_st (eh);
2957 if (s) 3262 if (s)
2958 free(s); 3263 free (s);
3264
2959 return; 3265 return;
2960} 3266}
2961 3267
2962/*----------------------------------------------------------------------*/ 3268/*----------------------------------------------------------------------*/
2963/* 3269/*
2964 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3270 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2965 */ 3271 */
2966void 3272void
2967rxvt_term::process_osc_seq () 3273rxvt_term::process_osc_seq ()
2968{ 3274{
2969 unsigned char ch, eh, *s; 3275 unicode_t ch, eh;
2970 int arg; 3276 int arg;
2971 3277
2972 ch = cmd_getc (); 3278 ch = cmd_getc ();
2973 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 3279 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2974 arg = arg * 10 + (ch - '0'); 3280 arg = arg * 10 + (ch - '0');
2975 3281
2976 if (ch == ';') 3282 if (ch == ';')
2977 { 3283 {
2978 s = get_to_st (&eh); 3284 unsigned char *s = get_to_st (eh);
3285
2979 if (s) 3286 if (s)
2980 { 3287 {
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); 3288 process_xterm_seq (arg, (char *)s, eh);
2993 free(s); 3289 free (s);
3290 }
3291 }
3292}
3293
3294void
3295rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3296{
3297 if (str[0] == '?' && !str[1])
3298 {
3299 if (Options & Opt_insecure)
2994 } 3300 {
3301 unsigned short r, g, b;
3302 PixColorsFocused[color].get (display, r, g, b);
3303 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3304 }
2995 } 3305 }
3306 else
3307 set_window_color (color, str);
2996} 3308}
3309
2997/* 3310/*
2998 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2999 * 0 = change iconName/title 3312 * 0 = change iconName/title
3000 * 1 = change iconName 3313 * 1 = change iconName
3001 * 2 = change title 3314 * 2 = change title
3002 * 4 = change color 3315 * 4 = change color
3316 * 10 = change fg color
3317 * 11 = change bg color
3003 * 12 = change text color 3318 * 12 = change text color
3004 * 13 = change mouse foreground color 3319 * 13 = change mouse foreground color
3005 * 17 = change highlight character colour 3320 * 17 = change highlight character colour
3006 * 18 = change bold character color 3321 * 18 = change bold character color
3007 * 19 = change underlined character color 3322 * 19 = change underlined character color
3008 * 46 = change logfile (not implemented) 3323 * 46 = change logfile (not implemented)
3009 * 50 = change font 3324 * 50 = change font
3010 * 3325 *
3011 * rxvt extensions: 3326 * rxvt extensions:
3012 * 10 = menu (may change in future)
3013 * 20 = bg pixmap 3327 * 20 = bg pixmap
3014 * 39 = change default fg color 3328 * 39 = change default fg color
3015 * 49 = change default bg color 3329 * 49 = change default bg color
3016 * 55 = dump scrollback buffer and all of screen 3330 * 55 = dump scrollback buffer and all of screen
3331 * 701 = change locale
3332 * 702 = find font
3333 * 703 = menu
3017 */ 3334 */
3018void 3335void
3019rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 3336rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3020{ 3337{
3021 int changed = 0; 3338 int changed = 0;
3022 int color; 3339 int color;
3023 char *buf, *name; 3340 char *buf, *name;
3341 bool query = str[0] == '?' && !str[1];
3024 3342
3025 assert(str != NULL); 3343 assert (str != NULL);
3026 switch (op) 3344 switch (op)
3027 { 3345 {
3028 case XTerm_name: 3346 case XTerm_name:
3029 set_title (str); 3347 set_title (str);
3030 /* FALLTHROUGH */ 3348 /* FALLTHROUGH */
3031 case XTerm_iconName: 3349 case XTerm_iconName:
3032 set_iconName (str); 3350 set_icon_name (str);
3033 break; 3351 break;
3034 case XTerm_title: 3352 case XTerm_title:
3035 set_title (str); 3353 set_title (str);
3036 break; 3354 break;
3355 case XTerm_property:
3356 if (str[0] == '?')
3357 {
3358 Atom prop = XInternAtom (display->display, str + 1, True);
3359 Atom actual_type;
3360 int actual_format;
3361 unsigned long nitems;
3362 unsigned long bytes_after;
3363 unsigned char *value = 0;
3364 const char *str = "";
3365
3366 if (prop
3367 && XGetWindowProperty (display->display, TermWin.parent[0],
3368 prop, 0, 1<<16, 0, AnyPropertyType,
3369 &actual_type, &actual_format,
3370 &nitems, &bytes_after, &value) == Success
3371 && actual_type != None
3372 && actual_format == 8)
3373 str = (const char *)(value);
3374
3375 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3376
3377 XFree (value);
3378 }
3379 else
3380 {
3381 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3382
3383 if (eq)
3384 {
3385 *eq = 0;
3386 XChangeProperty (display->display, TermWin.parent[0],
3387 display->atom (str), XA_STRING, 8,
3388 PropModeReplace, (unsigned char *)eq + 1,
3389 strlen (eq + 1));
3390 }
3391 else
3392 XDeleteProperty (display->display, TermWin.parent[0],
3393 display->atom (str));
3394 }
3395 break;
3396
3037 case XTerm_Color: 3397 case XTerm_Color:
3038 for (buf = (char *)str; buf && *buf;) 3398 for (buf = (char *)str; buf && *buf;)
3039 { 3399 {
3040 if ((name = STRCHR(buf, ';')) == NULL) 3400 if ((name = STRCHR (buf, ';')) == NULL)
3041 break; 3401 break;
3402
3042 *name++ = '\0'; 3403 *name++ = '\0';
3043 color = atoi(buf); 3404 color = atoi (buf);
3405
3044 if (color < 0 || color >= TOTAL_COLORS) 3406 if (color < 0 || color >= TOTAL_COLORS)
3045 break; 3407 break;
3408
3046 if ((buf = STRCHR(name, ';')) != NULL) 3409 if ((buf = STRCHR (name, ';')) != NULL)
3047 *buf++ = '\0'; 3410 *buf++ = '\0';
3411
3412 if (name[0] == '?' && !name[1])
3413 {
3414 if (Options & Opt_insecure)
3415 {
3416 unsigned short r, g, b;
3417 PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3418 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3419 }
3420 }
3421 else
3048 set_window_color (color + minCOLOR, name); 3422 set_window_color (color + minCOLOR, name);
3049 } 3423 }
3424 break;
3425 case XTerm_Color00:
3426 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3427 break;
3428 case XTerm_Color01:
3429 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3050 break; 3430 break;
3051#ifndef NO_CURSORCOLOR 3431#ifndef NO_CURSORCOLOR
3052 case XTerm_Color_cursor: 3432 case XTerm_Color_cursor:
3053 set_window_color (Color_cursor, str); 3433 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3054 break; 3434 break;
3055#endif 3435#endif
3056 case XTerm_Color_pointer: 3436 case XTerm_Color_pointer_fg:
3057 set_window_color (Color_pointer, str); 3437 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3438 break;
3439 case XTerm_Color_pointer_bg:
3440 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3058 break; 3441 break;
3059#ifndef NO_BOLD_UNDERLINE_REVERSE 3442#ifndef NO_BOLD_UNDERLINE_REVERSE
3060 case XTerm_Color_BD: 3443 case XTerm_Color_BD:
3061 set_window_color (Color_BD, str); 3444 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3062 break; 3445 break;
3063 case XTerm_Color_UL: 3446 case XTerm_Color_UL:
3064 set_window_color (Color_UL, str); 3447 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3065 break; 3448 break;
3066 case XTerm_Color_RV: 3449 case XTerm_Color_RV:
3067 set_window_color (Color_RV, str); 3450 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3068 break; 3451 break;
3069#endif 3452#endif
3070 3453
3071 case XTerm_Menu:
3072 /*
3073 * rxvt_menubar_dispatch() violates the constness of the string,
3074 * so DON'T do it here
3075 */
3076 break;
3077 case XTerm_Pixmap: 3454 case XTerm_Pixmap:
3078 if (*str != ';') 3455 if (*str != ';')
3079 { 3456 {
3080#if XPM_BACKGROUND 3457#if XPM_BACKGROUND
3081 scale_pixmap (""); /* reset to default scaling */ 3458 scale_pixmap (""); /* reset to default scaling */
3082 set_bgPixmap (str); /* change pixmap */ 3459 set_bgPixmap (str); /* change pixmap */
3083#endif 3460#endif
3084 scr_touch (true); 3461 scr_touch (true);
3085 } 3462 }
3086 while ((str = STRCHR(str, ';')) != NULL) 3463 while ((str = STRCHR (str, ';')) != NULL)
3087 { 3464 {
3088 str++; 3465 str++;
3089#if XPM_BACKGROUND 3466#if XPM_BACKGROUND
3090 changed += scale_pixmap (str); 3467 changed += scale_pixmap (str);
3091#endif 3468#endif
… …
3104 set_window_color (Color_fg, str); 3481 set_window_color (Color_fg, str);
3105 break; 3482 break;
3106 case XTerm_restoreBG: 3483 case XTerm_restoreBG:
3107 set_window_color (Color_bg, str); 3484 set_window_color (Color_bg, str);
3108 break; 3485 break;
3486
3109 case XTerm_logfile: 3487 case XTerm_logfile:
3488 // TODO, when secure mode?
3110 break; 3489 break;
3490
3111 case XTerm_font: 3491 case XTerm_font:
3492 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3496 TermWin.fontset->fontdesc
3497 ? TermWin.fontset->fontdesc
3498 : "",
3499 resp);
3500 }
3501 else
3112 change_font (0, str); 3502 change_font (str);
3503 break;
3504
3505#ifndef NO_FRILLS
3506 case XTerm_locale:
3507 if (query)
3508 {
3509 if (Options & Opt_insecure)
3510 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3511 }
3512 else
3513 {
3514 set_locale (str);
3515# ifdef USE_XIM
3516 im_cb ();
3517# endif
3518 }
3519 break;
3520
3521 case XTerm_findfont:
3522 if (Options & Opt_insecure)
3523 {
3524 int fid = TermWin.fontset->find_font (atoi (str));
3525 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3526 fid, (*TermWin.fontset)[fid]->name, resp);
3527 }
3528 break;
3529#endif
3530
3531#ifdef MENUBAR
3532 case XTerm_Menu:
3533 if (Options & Opt_insecure)
3534 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3113 break; 3535 break;
3536#endif
3114#if 0 3537#if 0
3115 case XTerm_dumpscreen: /* no error notices */ 3538 case XTerm_dumpscreen: /* no error notices */
3116 { 3539 {
3117 int fd; 3540 int fd;
3118 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3541 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3119 { 3542 {
3120 scr_dump (fd); 3543 scr_dump (fd);
3121 close(fd); 3544 close (fd);
3122 } 3545 }
3123 } 3546 }
3124 break; 3547 break;
3125#endif 3548#endif
3126
3127 } 3549 }
3128} 3550}
3129/*----------------------------------------------------------------------*/ 3551/*----------------------------------------------------------------------*/
3130 3552
3131/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3553/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3139 * so no need for fancy checking 3561 * so no need for fancy checking
3140 */ 3562 */
3141int 3563int
3142rxvt_term::privcases (int mode, unsigned long bit) 3564rxvt_term::privcases (int mode, unsigned long bit)
3143{ 3565{
3144 int state; 3566 int state;
3145 3567
3146 if (mode == 's') 3568 if (mode == 's')
3147 { 3569 {
3148 SavedModes |= (PrivateModes & bit); 3570 SavedModes |= (PrivateModes & bit);
3149 return -1; 3571 return -1;
… …
3151 else 3573 else
3152 { 3574 {
3153 if (mode == 'r') 3575 if (mode == 'r')
3154 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3155 else 3577 else
3156 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3578 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3157 PrivMode(state, bit); 3579 PrivMode (state, bit);
3158 } 3580 }
3581
3159 return state; 3582 return state;
3160} 3583}
3161 3584
3162/* we're not using priv _yet_ */ 3585/* we're not using priv _yet_ */
3163void 3586void
3164rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3587rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3165{ 3588{
3166 unsigned int i, j; 3589 unsigned int i, j;
3167 int state; 3590 int state;
3591
3168 static const struct 3592 static const struct
3169 { 3593 {
3170 const int argval; 3594 const int argval;
3171 const unsigned long bit; 3595 const unsigned long bit;
3172 } 3596 }
3597
3173 argtopriv[] = { 3598 argtopriv[] = {
3174 { 1, PrivMode_aplCUR }, 3599 { 1, PrivMode_aplCUR },
3175 { 2, PrivMode_vt52 }, 3600 { 2, PrivMode_vt52 },
3176 { 3, PrivMode_132 }, 3601 { 3, PrivMode_132 },
3177 { 4, PrivMode_smoothScroll }, 3602 { 4, PrivMode_smoothScroll },
… …
3183 { menuBar_esc, PrivMode_menuBar }, 3608 { menuBar_esc, PrivMode_menuBar },
3184#endif 3609#endif
3185#ifdef scrollBar_esc 3610#ifdef scrollBar_esc
3186 { scrollBar_esc, PrivMode_scrollBar }, 3611 { scrollBar_esc, PrivMode_scrollBar },
3187#endif 3612#endif
3613 // 18, 19 printing-related
3188 { 25, PrivMode_VisibleCursor }, 3614 { 25, PrivMode_VisibleCursor },
3615 // 30 show scrollbar rxvt. extension
3189 { 35, PrivMode_ShiftKeys }, 3616 { 35, PrivMode_ShiftKeys }, // rxvt extension
3190 { 40, PrivMode_132OK }, 3617 { 40, PrivMode_132OK },
3618 // 41 xterm more fixes NYI
3619 // 45 margin bell NYI
3620 // 46 start logging
3191 { 47, PrivMode_Screen }, 3621 { 47, PrivMode_Screen },
3192 { 66, PrivMode_aplKP }, 3622 { 66, PrivMode_aplKP },
3193#ifndef NO_BACKSPACE_KEY 3623#ifndef NO_BACKSPACE_KEY
3194 { 67, PrivMode_BackSpace }, 3624 { 67, PrivMode_BackSpace },
3195#endif 3625#endif
3196 { 1000, PrivMode_MouseX11 }, 3626 { 1000, PrivMode_MouseX11 },
3627 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3628 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3629 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3197 { 1010, PrivMode_TtyOutputInh }, 3630 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3198 { 1011, PrivMode_Keypress }, 3631 { 1011, PrivMode_Keypress }, // rxvt extension
3632 // 1035 enable modifiers for alt, numlock NYI
3633 // 1036 send ESC for meta keys NYI
3634 // 1037 send DEL for keypad delete NYI
3199 { 1047, PrivMode_Screen }, 3635 { 1047, PrivMode_Screen },
3636 // 1048 save and restore cursor
3200 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3637 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3638 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3201 }; 3639 };
3202 3640
3203 if (nargs == 0) 3641 if (nargs == 0)
3204 return; 3642 return;
3205 3643
… …
3212 for (i = 0; i < nargs; i++) 3650 for (i = 0; i < nargs; i++)
3213 { 3651 {
3214 state = -1; 3652 state = -1;
3215 3653
3216 /* basic handling */ 3654 /* basic handling */
3217 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3655 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3218 if (argtopriv[j].argval == arg[i]) 3656 if (argtopriv[j].argval == arg[i])
3219 { 3657 {
3220 state = privcases (mode, argtopriv[j].bit); 3658 state = privcases (mode, argtopriv[j].bit);
3221 break; 3659 break;
3222 } 3660 }
3223 3661
3224 /* extra handling for values with state unkept */ 3662 /* extra handling for values with state unkept */
3225 if (state == -1)
3226 switch (arg[i]) 3663 switch (arg[i])
3227 { 3664 {
3228 case 1048: /* alternative cursor save */ 3665 case 1048: /* alternative cursor save */
3666 if (Options & Opt_secondaryScreen)
3229 if (mode == 0) 3667 if (mode == 0)
3230 scr_cursor (RESTORE); 3668 scr_cursor (RESTORE);
3231 else if (mode == 1) 3669 else if (mode == 1)
3232 scr_cursor (SAVE); 3670 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; 3671 break;
3672 }
3673
3674 if (state >= 0)
3675 /* extra handling for values with valid 0 or 1 state */
3676 switch (arg[i])
3677 {
3678 /* case 1: - application cursor keys */
3679 case 2: /* VT52 mode */
3680 /* oddball mode. should be set regardless of set/reset
3681 * parameter. Return from VT52 mode with an ESC < from
3682 * within VT52 mode
3683 */
3684 PrivMode (1, PrivMode_vt52);
3685 break;
3249 case 3: /* 80/132 */ 3686 case 3: /* 80/132 */
3250 if (PrivateModes & PrivMode_132OK) 3687 if (PrivateModes & PrivMode_132OK)
3251 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3688 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3252 (unsigned int)TermWin.height);
3253 break; 3689 break;
3254 case 4: /* smooth scrolling */ 3690 case 4: /* smooth scrolling */
3255 if (state) 3691 if (state)
3256 Options &= ~Opt_jumpScroll; 3692 Options &= ~Opt_jumpScroll;
3257 else 3693 else
3258 Options |= Opt_jumpScroll; 3694 Options |= Opt_jumpScroll;
3259 break; 3695 break;
3260 case 5: /* reverse video */ 3696 case 5: /* reverse video */
3261 scr_rvideo_mode (state); 3697 scr_rvideo_mode (state);
3262 break; 3698 break;
3263 case 6: /* relative/absolute origins */ 3699 case 6: /* relative/absolute origins */
3264 scr_relative_origin (state); 3700 scr_relative_origin (state);
3265 break; 3701 break;
3266 case 7: /* autowrap */ 3702 case 7: /* autowrap */
3267 scr_autowrap (state); 3703 scr_autowrap (state);
3268 break; 3704 break;
3269 /* case 8: - auto repeat, can't do on a per window basis */ 3705 /* case 8: - auto repeat, can't do on a per window basis */
3270 case 9: /* X10 mouse reporting */ 3706 case 9: /* X10 mouse reporting */
3271 if (state) /* orthogonal */ 3707 if (state) /* orthogonal */
3272 PrivateModes &= ~(PrivMode_MouseX11); 3708 PrivateModes &= ~PrivMode_MouseX11;
3273 break; 3709 break;
3274#ifdef menuBar_esc 3710#ifdef menuBar_esc
3275 case menuBar_esc: 3711 case menuBar_esc:
3276#ifdef MENUBAR 3712#ifdef MENUBAR
3277 map_menuBar (state); 3713 map_menuBar (state);
3278#endif 3714#endif
3279 break; 3715 break;
3280#endif 3716#endif
3281#ifdef scrollBar_esc 3717#ifdef scrollBar_esc
3282 case scrollBar_esc: 3718 case scrollBar_esc:
3283 if (scrollbar_mapping (state)) 3719 if (scrollbar_mapping (state))
3284 { 3720 {
3285 resize_all_windows (0, 0, 0); 3721 resize_all_windows (0, 0, 0);
3286 scr_touch (true); 3722 scr_touch (true);
3287 } 3723 }
3288 break; 3724 break;
3289#endif 3725#endif
3290 case 25: /* visible/invisible cursor */ 3726 case 25: /* visible/invisible cursor */
3291 scr_cursor_visible (state); 3727 scr_cursor_visible (state);
3292 break; 3728 break;
3293 /* case 35: - shift keys */ 3729 /* case 35: - shift keys */
3294 /* case 40: - 80 <--> 132 mode */ 3730 /* case 40: - 80 <--> 132 mode */
3295 case 47: /* secondary screen */ 3731 case 47: /* secondary screen */
3296 scr_change_screen (state); 3732 scr_change_screen (state);
3297 break; 3733 break;
3298 /* case 66: - application key pad */ 3734 /* case 66: - application key pad */
3299 /* case 67: - backspace key */ 3735 /* case 67: - backspace key */
3300 case 1000: /* X11 mouse reporting */ 3736 case 1000: /* X11 mouse reporting */
3301 if (state) /* orthogonal */ 3737 if (state) /* orthogonal */
3302 PrivateModes &= ~(PrivMode_MouseX10); 3738 PrivateModes &= ~PrivMode_MouseX10;
3303 break; 3739 break;
3304#if 0 3740#if 0
3305 case 1001: 3741 case 1001:
3306 break; /* X11 mouse highlighting */ 3742 break; /* X11 mouse highlighting */
3307#endif 3743#endif
3308 case 1010: /* scroll to bottom on TTY output inhibit */ 3744 case 1010: /* scroll to bottom on TTY output inhibit */
3309 if (state) 3745 if (state)
3310 Options &= ~Opt_scrollTtyOutput; 3746 Options &= ~Opt_scrollTtyOutput;
3311 else 3747 else
3312 Options |= Opt_scrollTtyOutput; 3748 Options |= Opt_scrollTtyOutput;
3313 break; 3749 break;
3314 case 1011: /* scroll to bottom on key press */ 3750 case 1011: /* scroll to bottom on key press */
3315 if (state) 3751 if (state)
3316 Options |= Opt_scrollTtyKeypress; 3752 Options |= Opt_scrollTtyKeypress;
3317 else 3753 else
3318 Options &= ~Opt_scrollTtyKeypress; 3754 Options &= ~Opt_scrollTtyKeypress;
3319 break; 3755 break;
3320 case 1047: /* secondary screen w/ clearing */ 3756 case 1047: /* secondary screen w/ clearing last */
3321 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3757 if (Options & Opt_secondaryScreen)
3322 if (current_screen != PRIMARY) 3758 if (current_screen != PRIMARY)
3323 scr_erase_screen (2); 3759 scr_erase_screen (2);
3324 scr_change_screen (state); 3760 scr_change_screen (state);
3325 /* FALLTHROUGH */
3326 default:
3327 break; 3761 break;
3762 case 1049: /* secondary screen w/ clearing first */
3763 scr_change_screen (state);
3764 if (Options & Opt_secondaryScreen)
3765 if (current_screen != PRIMARY)
3766 scr_erase_screen (2);
3767 break;
3768 default:
3769 break;
3328 } 3770 }
3329 } 3771 }
3330} 3772}
3331/*}}} */ 3773/*}}} */
3332 3774
3333/*{{{ process sgr sequences */ 3775/*{{{ process sgr sequences */
3334void 3776void
3335rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3777rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3336{ 3778{
3337 unsigned int i; 3779 unsigned int i;
3338 short rendset; 3780 short rendset;
3339 int rendstyle; 3781 int rendstyle;
3340 3782
3341 if (nargs == 0) 3783 if (nargs == 0)
3342 { 3784 {
3343 scr_rendition (0, ~RS_None); 3785 scr_rendition (0, ~RS_None);
3344 return; 3786 return;
3345 } 3787 }
3788
3346 for (i = 0; i < nargs; i++) 3789 for (i = 0; i < nargs; i++)
3347 { 3790 {
3348 rendset = -1; 3791 rendset = -1;
3349 switch (arg[i]) 3792 switch (arg[i])
3350 { 3793 {
… …
3352 rendset = 0, rendstyle = ~RS_None; 3795 rendset = 0, rendstyle = ~RS_None;
3353 break; 3796 break;
3354 case 1: 3797 case 1:
3355 rendset = 1, rendstyle = RS_Bold; 3798 rendset = 1, rendstyle = RS_Bold;
3356 break; 3799 break;
3800 //case 2: // faint or second colour
3357 case 4: 3801 case 4:
3358 rendset = 1, rendstyle = RS_Uline; 3802 rendset = 1, rendstyle = RS_Uline;
3359 break; 3803 break;
3360 case 5: 3804 case 5: // slowly blinking
3805 case 6: // rapidly blinking
3361 rendset = 1, rendstyle = RS_Blink; 3806 rendset = 1, rendstyle = RS_Blink;
3362 break; 3807 break;
3808 //case 6: // scoansi light background
3363 case 7: 3809 case 7:
3364 rendset = 1, rendstyle = RS_RVid; 3810 rendset = 1, rendstyle = RS_RVid;
3811 break;
3812 case 8:
3813 // invisible. NYI
3814 break;
3815 //case 9: // crossed out
3816 //case 10: // scoansi acs off, primary font
3817 //case 11: // scoansi acs on, first alt font
3818 //case 12: // scoansi acs on, |0x80, second alt font
3819 //...
3820 //case 19: // ninth alt font
3821 //case 20: // gothic
3822 case 21: // disable bold, faint
3823 rendset = 0, rendstyle = RS_Bold;
3365 break; 3824 break;
3366 case 22: 3825 case 22:
3367 rendset = 0, rendstyle = RS_Bold; 3826 rendset = 0, rendstyle = RS_Bold;
3368 break; 3827 break;
3828 //case 23: disable italic
3369 case 24: 3829 case 24:
3370 rendset = 0, rendstyle = RS_Uline; 3830 rendset = 0, rendstyle = RS_Uline;
3371 break; 3831 break;
3372 case 25: 3832 case 25:
3373 rendset = 0, rendstyle = RS_Blink; 3833 rendset = 0, rendstyle = RS_Blink;
3374 break; 3834 break;
3375 case 27: 3835 case 27:
3376 rendset = 0, rendstyle = RS_RVid; 3836 rendset = 0, rendstyle = RS_RVid;
3377 break; 3837 break;
3838 //case 28: // visible. NYI
3839 //case 29: // not crossed-out
3378 } 3840 }
3841
3379 if (rendset != -1) 3842 if (rendset != -1)
3380 { 3843 {
3381 scr_rendition (rendset, rendstyle); 3844 scr_rendition (rendset, rendstyle);
3382 continue; /* for(;i;) */ 3845 continue; /* for (;i;) */
3383 } 3846 }
3384 3847
3385 switch (arg[i]) 3848 switch (arg[i])
3386 { 3849 {
3387 case 30: 3850 case 30:
… …
3390 case 33: 3853 case 33:
3391 case 34: 3854 case 34:
3392 case 35: 3855 case 35:
3393 case 36: 3856 case 36:
3394 case 37: 3857 case 37:
3395 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3858 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3396 Color_fg);
3397 break; 3859 break;
3398#ifdef TTY_256COLOR 3860#ifdef TTY_256COLOR
3399 case 38: 3861 case 38:
3400 if (nargs > i + 2 && arg[i + 1] == 5) 3862 if (nargs > i + 2 && arg[i + 1] == 5)
3401 { 3863 {
3402 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3864 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3403 Color_fg);
3404 i += 2; 3865 i += 2;
3405 } 3866 }
3406 break; 3867 break;
3407#endif 3868#endif
3408 case 39: /* default fg */ 3869 case 39: /* default fg */
… …
3415 case 43: 3876 case 43:
3416 case 44: 3877 case 44:
3417 case 45: 3878 case 45:
3418 case 46: 3879 case 46:
3419 case 47: 3880 case 47:
3420 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3881 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3421 Color_bg);
3422 break; 3882 break;
3423#ifdef TTY_256COLOR 3883#ifdef TTY_256COLOR
3424 case 48: 3884 case 48:
3425 if (nargs > i + 2 && arg[i + 1] == 5) 3885 if (nargs > i + 2 && arg[i + 1] == 5)
3426 { 3886 {
3427 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3887 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3428 Color_bg);
3429 i += 2; 3888 i += 2;
3430 } 3889 }
3431 break; 3890 break;
3432#endif 3891#endif
3433 case 49: /* default bg */ 3892 case 49: /* default bg */
… …
3441 case 93: 3900 case 93:
3442 case 94: 3901 case 94:
3443 case 95: 3902 case 95:
3444 case 96: 3903 case 96:
3445 case 97: 3904 case 97:
3446 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3905 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3447 Color_fg); 3906 Color_fg);
3448 break; 3907 break;
3449 case 100: 3908 case 100:
3450 case 101: /* set bright bg color */ 3909 case 101: /* set bright bg color */
3451 case 102: 3910 case 102:
3452 case 103: 3911 case 103:
3453 case 104: 3912 case 104:
3454 case 105: 3913 case 105:
3455 case 106: 3914 case 106:
3456 case 107: 3915 case 107:
3457 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3916 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3458 Color_bg); 3917 Color_bg);
3459 break; 3918 break;
3460#endif 3919#endif
3461 3920
3462 } 3921 }
3463 } 3922 }
3464} 3923}
3465/*}}} */ 3924/*}}} */
3466 3925
3467/*{{{ process Rob Nation's own graphics mode sequences */ 3926/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3468void 3927void
3469rxvt_term::process_graphics () 3928rxvt_term::process_graphics ()
3470{ 3929{
3471 unsigned char ch, cmd = cmd_getc (); 3930 unicode_t ch, cmd = cmd_getc ();
3472 3931
3473#ifndef RXVT_GRAPHICS
3474 if (cmd == 'Q') 3932 if (cmd == 'Q')
3475 { /* query graphics */ 3933 { /* query graphics */
3476 tt_printf("\033G0\n"); /* no graphics */ 3934 tt_printf ("\033G0\n"); /* no graphics */
3477 return; 3935 return;
3478 } 3936 }
3479 /* swallow other graphics sequences until terminating ':' */ 3937 /* swallow other graphics sequences until terminating ':' */
3480 do 3938 do
3481 ch = cmd_getc (); 3939 ch = cmd_getc ();
3482 while (ch != ':'); 3940 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} 3941}
3529/*}}} */ 3942/*}}} */
3530 3943
3531/* ------------------------------------------------------------------------- */ 3944/* ------------------------------------------------------------------------- */
3532 3945
3533/* 3946/*
3534 * Send printf() formatted output to the command. 3947 * Send printf () formatted output to the command.
3535 * Only use for small amounts of data. 3948 * Only use for small amounts of data.
3536 */ 3949 */
3537void 3950void
3538rxvt_term::tt_printf (const char *fmt,...) 3951rxvt_term::tt_printf (const char *fmt,...)
3539{ 3952{

Diff Legend

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