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

Diff Legend

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