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.56 by pcg, Tue Feb 24 00:02:44 2004 UTC vs.
Revision 1.177 by root, Mon Dec 13 07:18:52 2004 UTC

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

Diff Legend

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