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

Diff Legend

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