ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.56 by pcg, Tue Feb 24 00:02:44 2004 UTC vs.
Revision 1.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;
888
699 if (n > 0 && s < count) 889 if (n > 0 && s < count)
700 { 890 {
701 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 891 memmove (cmdbuf_base, cmdbuf_ptr,
702 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 892 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
703 cmdbuf_ptr = cmdbuf_base; 893 cmdbuf_ptr = cmdbuf_base;
704 cmdbuf_endp -= n; 894 cmdbuf_endp -= n;
705 s += n; 895 s += n;
706 } 896 }
897
707 if (count > s) 898 if (count > s)
708 { 899 {
709 rxvt_print_error ("data loss: cmd_write too large"); 900 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
710 count = s; 901 count = s;
711 } 902 }
903
712 for (; count--;) 904 for (; count--;)
713 *cmdbuf_endp++ = *str++; 905 *cmdbuf_endp++ = *str++;
906
907 cmd_parse ();
908
714 return 0; 909 return 0;
715} 910}
716#endif /* MENUBAR_MAX */ 911#endif /* MENUBAR_MAX */
717 912
718void 913void
719rxvt_term::flush () 914rxvt_term::flush ()
720{ 915{
916 flush_ev.stop ();
917
721#ifdef TRANSPARENT 918#ifdef TRANSPARENT
722 if (want_full_refresh) 919 if (want_full_refresh)
723 { 920 {
724 want_full_refresh = 0; 921 want_full_refresh = 0;
725 scr_clear (); 922 scr_clear ();
726 scr_touch (false); 923 scr_touch (false);
727 want_refresh = 1;
728 } 924 }
729#endif 925#endif
730 926
731 if (want_refresh) 927 if (want_refresh)
732 { 928 {
733 scr_refresh (refresh_type); 929 scr_refresh (refresh_type);
734 scrollbar_show (1); 930 scrollbar_show (1);
735#ifdef USE_XIM 931#ifdef USE_XIM
736 IMSendSpot (); 932 IMSendSpot ();
737#endif 933#endif
738
739 } 934 }
740 935
741 display->flush (); 936 display->flush ();
742} 937}
743 938
… …
745rxvt_term::check_cb (check_watcher &w) 940rxvt_term::check_cb (check_watcher &w)
746{ 941{
747 SET_R (this); 942 SET_R (this);
748 SET_LOCALE (locale); 943 SET_LOCALE (locale);
749 944
945 display->flush ();
946
947 if (want_refresh && !flush_ev.active)
948 flush_ev.start (NOW + 0.01);
949}
950
951void
952rxvt_term::flush_cb (time_watcher &w)
953{
954 SET_R (this);
955 SET_LOCALE (locale);
956
957 refresh_limit = 1;
958 refresh_count = 0;
750 flush (); 959 flush ();
751} 960}
752 961
753#ifdef CURSOR_BLINK 962#ifdef CURSOR_BLINK
754void 963void
… …
772 w.start (w.at + TEXT_BLINK_INTERVAL); 981 w.start (w.at + TEXT_BLINK_INTERVAL);
773 } 982 }
774} 983}
775#endif 984#endif
776 985
986#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
987void
988rxvt_term::cont_scroll_cb (time_watcher &w)
989{
990 if ((scrollbar_isUp() || scrollbar_isDn()) &&
991 scr_page (scrollbar_isUp() ? UP : DN, 1))
992 {
993 refresh_type |= SMOOTH_REFRESH;
994 want_refresh = 1;
995 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
996 }
997}
998#endif
999
1000#ifdef SELECTION_SCROLLING
1001void
1002rxvt_term::sel_scroll_cb (time_watcher &w)
1003{
1004 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1005 {
1006 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1007 refresh_type |= SMOOTH_REFRESH;
1008 want_refresh = 1;
1009 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1010 }
1011}
1012#endif
1013
1014#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1015void
1016rxvt_term::slip_wheel_cb (time_watcher &w)
1017{
1018 if (mouse_slip_wheel_speed == 0
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed))
1021 {
1022 refresh_type |= SMOOTH_REFRESH;
1023 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 }
1026}
1027#endif
1028
777bool 1029bool
778rxvt_term::pty_fill () 1030rxvt_term::pty_fill ()
779{ 1031{
780 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1032 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1033
1034 if (CBUFSIZ == n)
1035 {
1036 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
1037 n = 0;
1038 }
781 1039
782 memmove (cmdbuf_base, cmdbuf_ptr, n); 1040 memmove (cmdbuf_base, cmdbuf_ptr, n);
783 cmdbuf_ptr = cmdbuf_base; 1041 cmdbuf_ptr = cmdbuf_base;
784 cmdbuf_endp = cmdbuf_ptr + n; 1042 cmdbuf_endp = cmdbuf_ptr + n;
785 1043
786 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
787 1045
788 if (n > 0) 1046 if (n > 0)
789 { 1047 {
790 cmdbuf_endp += n; 1048 cmdbuf_endp += n;
791 return true; 1049 return true;
792 } 1050 }
793 else if (n < 0 && errno != EAGAIN) 1051 else if (n < 0 && errno != EAGAIN)
794 destroy (); 1052 destroy ();
795 1053
796 return false; 1054 return false;
797} 1055}
798 1056
799void 1057void
800rxvt_term::pty_cb (io_watcher &w, short revents) 1058rxvt_term::pty_cb (io_watcher &w, short revents)
… …
803 SET_LOCALE (locale); 1061 SET_LOCALE (locale);
804 1062
805 if (revents & EVENT_WRITE) 1063 if (revents & EVENT_WRITE)
806 tt_write (0, 0); 1064 tt_write (0, 0);
807 else if (revents & EVENT_READ) 1065 else if (revents & EVENT_READ)
808 {
809 bool flag = true;
810
811 // loop, but don't allow a single term to monopolize us 1066 // loop, but don't allow a single term to monopolize us
812 // the number of loops is fully arbitrary, and thus wrong
813 while (flag && pty_fill ()) 1067 while (pty_fill ())
814 { 1068 if (cmd_parse ())
815 if (!seen_input)
816 {
817 seen_input = 1;
818 /* once we know the shell is running, send the screen size. Again! */
819 tt_winch ();
820 }
821
822 uint32_t ch = NOCHAR;
823
824 for (;;)
825 {
826 if (ch == NOCHAR)
827 ch = next_char ();
828
829 if (ch == NOCHAR) // TODO: improve
830 break; 1069 break;
831
832 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
833 {
834 /* Read a text string from the input buffer */
835 uint32_t buf[BUFSIZ];
836 bool refreshnow = false;
837 int nlines = 0;
838 uint32_t *str = buf;
839
840 *str++ = ch;
841
842 for (;;)
843 {
844 ch = next_char ();
845
846 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
847 break;
848 else
849 {
850 *str++ = ch;
851
852 if (ch == '\n')
853 {
854 nlines++;
855 refresh_count++;
856
857 if (! (Options & Opt_jumpScroll)
858 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
859 {
860 refreshnow = true;
861 flag = false;
862 ch = NOCHAR;
863 break;
864 }
865
866 // scr_add_lines only works for nlines < TermWin.nrow - 1.
867 if (nlines >= TermWin.nrow - 1)
868 {
869 scr_add_lines (buf, nlines, str - buf);
870 nlines = 0;
871 str = buf;
872 }
873 }
874
875 if (str >= buf + BUFSIZ)
876 {
877 ch = NOCHAR;
878 break;
879 }
880 }
881 }
882
883 scr_add_lines (buf, nlines, str - buf);
884
885 /*
886 * If there have been a lot of new lines, then update the screen
887 * What the heck I'll cheat and only refresh less than every page-full.
888 * the number of pages between refreshes is refresh_limit, which
889 * is incremented here because we must be doing flat-out scrolling.
890 *
891 * refreshing should be correct for small scrolls, because of the
892 * time-out
893 */
894 if (refreshnow)
895 {
896 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
897 refresh_limit++;
898
899 scr_refresh (refresh_type);
900 }
901
902 }
903 else
904 {
905 switch (ch)
906 {
907 default:
908 process_nonprinting (ch);
909 break;
910 case C0_ESC: /* escape char */
911 process_escape_seq ();
912 break;
913 /*case 0x9b: */ /* CSI */
914 /* process_csi_seq (); */
915 }
916
917 ch = NOCHAR;
918 }
919 }
920 }
921 }
922} 1070}
923 1071
924// read the next character, currently handles UTF-8 1072void
925// will probably handle all sorts of other stuff in the future 1073rxvt_term::pointer_unblank ()
926uint32_t
927rxvt_term::next_char ()
928{ 1074{
929 while (cmdbuf_ptr < cmdbuf_endp) 1075 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
930 { 1076 recolour_cursor ();
931 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
932 return *cmdbuf_ptr++;
933 1077
934 wchar_t wc; 1078#ifdef POINTER_BLANK
935 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 1079 hidden_pointer = 0;
936 1080
937 if (len == (size_t)-2) 1081 if (options & Opt_pointerBlank)
938 return NOCHAR; 1082 pointer_ev.start (NOW + pointerBlankDelay);
939 1083#endif
940 if (len == (size_t)-1)
941 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
942
943 // assume wchar == unicode
944 cmdbuf_ptr += len;
945 return wc;
946 }
947
948 return NOCHAR;
949}
950
951/* rxvt_cmd_getc () - Return next input character */
952/*
953 * Return the next input character after first passing any keyboard input
954 * to the command.
955 */
956uint32_t
957rxvt_term::cmd_getc ()
958{
959 for (;;)
960 {
961 uint32_t c = next_char ();
962 if (c != NOCHAR)
963 return c;
964
965 // incomplete sequences should occur rarely, still, a better solution
966 // would be preferred. either setjmp/longjmp or better design.
967 fcntl (cmd_fd, F_SETFL, 0);
968 pty_fill ();
969 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
970 }
971} 1084}
972 1085
973#ifdef POINTER_BLANK 1086#ifdef POINTER_BLANK
974void 1087void
975rxvt_term::pointer_unblank ()
976{
977 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
978 recolour_cursor ();
979
980 hidden_pointer = 0;
981
982 if (Options & Opt_pointerBlank)
983 pointer_ev.start (NOW + pointerBlankDelay);
984}
985
986void
987rxvt_term::pointer_blank () 1088rxvt_term::pointer_blank ()
988{ 1089{
989 if (! (Options & Opt_pointerBlank)) 1090 if (! (options & Opt_pointerBlank))
990 return; 1091 return;
991 1092
992 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1093 XDefineCursor (display->display, TermWin.vt, blank_cursor);
993 XFlush (display->display); 1094 XFlush (display->display);
994 1095
… …
1014 x = ev.x; 1115 x = ev.x;
1015 y = ev.y; 1116 y = ev.y;
1016 pixel_position (&x, &y); 1117 pixel_position (&x, &y);
1017 1118
1018 if (MEvent.button == AnyButton) 1119 if (MEvent.button == AnyButton)
1019 {
1020 button_number = 3; 1120 button_number = 3;
1021 }
1022 else 1121 else
1023 { 1122 {
1024 button_number = MEvent.button - Button1; 1123 button_number = MEvent.button - Button1;
1025 /* add 0x3D for wheel events, like xterm does */ 1124 /* add 0x3D for wheel events, like xterm does */
1026 if (button_number >= 3) 1125 if (button_number >= 3)
1027 button_number += (64 - 3); 1126 button_number += (64 - 3);
1028 } 1127 }
1029 1128
1030 if (PrivateModes & PrivMode_MouseX10) 1129 if (priv_modes & PrivMode_MouseX10)
1031 { 1130 {
1032 /* 1131 /*
1033 * do not report ButtonRelease 1132 * do not report ButtonRelease
1034 * no state info allowed 1133 * no state info allowed
1035 */ 1134 */
… …
1050 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1149 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1051 + ((MEvent.state & ControlMask) ? 16 : 0); 1150 + ((MEvent.state & ControlMask) ? 16 : 0);
1052#ifdef MOUSE_REPORT_DOUBLECLICK 1151#ifdef MOUSE_REPORT_DOUBLECLICK
1053 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1152 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1054#endif 1153#endif
1055
1056 } 1154 }
1057 1155
1058#ifdef DEBUG_MOUSEREPORT 1156#if DEBUG_MOUSEREPORT
1059 fprintf (stderr, "Mouse ["); 1157 fprintf (stderr, "Mouse [");
1060 if (key_state & 16) 1158 if (key_state & 16)
1061 fputc ('C', stderr); 1159 fputc ('C', stderr);
1062 if (key_state & 4) 1160 if (key_state & 4)
1063 fputc ('S', stderr); 1161 fputc ('S', stderr);
… …
1067 fputc ('2', stderr); 1165 fputc ('2', stderr);
1068 fprintf (stderr, "]: <%d>, %d/%d\n", 1166 fprintf (stderr, "]: <%d>, %d/%d\n",
1069 button_number, 1167 button_number,
1070 x + 1, 1168 x + 1,
1071 y + 1); 1169 y + 1);
1072#else 1170#endif
1171
1073 tt_printf ("\033[M%c%c%c", 1172 tt_printf ("\033[M%c%c%c",
1074 (32 + button_number + key_state), 1173 (32 + button_number + key_state),
1075 (32 + x + 1), 1174 (32 + x + 1),
1076 (32 + y + 1)); 1175 (32 + y + 1));
1077#endif
1078} 1176}
1079 1177
1080#ifdef USING_W11LIB 1178#ifdef USING_W11LIB
1081void 1179void
1082rxvt_W11_process_x_event (XEvent *ev) 1180rxvt_W11_process_x_event (XEvent *ev)
… …
1093{ 1191{
1094 SET_R (this); 1192 SET_R (this);
1095 SET_LOCALE (locale); 1193 SET_LOCALE (locale);
1096 1194
1097#if defined(CURSOR_BLINK) 1195#if defined(CURSOR_BLINK)
1098 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1196 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1099 { 1197 {
1100 if (hidden_cursor) 1198 if (hidden_cursor)
1101 { 1199 {
1102 hidden_cursor = 0; 1200 hidden_cursor = 0;
1103 want_refresh = 1; 1201 want_refresh = 1;
… …
1106 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1204 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1107 } 1205 }
1108#endif 1206#endif
1109 1207
1110#if defined(POINTER_BLANK) 1208#if defined(POINTER_BLANK)
1111 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1209 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1112 { 1210 {
1113 if (ev.type == MotionNotify 1211 if (ev.type == MotionNotify
1114 || ev.type == ButtonPress 1212 || ev.type == ButtonPress
1115 || ev.type == ButtonRelease) 1213 || ev.type == ButtonRelease)
1116 if (hidden_pointer) 1214 if (hidden_pointer)
… …
1119 if (ev.type == KeyPress && hidden_pointer == 0) 1217 if (ev.type == KeyPress && hidden_pointer == 0)
1120 pointer_blank (); 1218 pointer_blank ();
1121 } 1219 }
1122#endif 1220#endif
1123 1221
1124#ifdef USE_XIM
1125 if (XFilterEvent (&ev, None))
1126 return;
1127#endif
1128
1129 Window unused_root, unused_child; 1222 Window unused_root, unused_child;
1130 int unused_root_x, unused_root_y; 1223 int unused_root_x, unused_root_y;
1131 unsigned int unused_mask; 1224 unsigned int unused_mask;
1132
1133#ifdef DEBUG_X
1134 const char *const eventnames[] =
1135 { /* mason - this matches my system */
1136 "",
1137 "",
1138 "KeyPress",
1139 "KeyRelease",
1140 "ButtonPress",
1141 "ButtonRelease",
1142 "MotionNotify",
1143 "EnterNotify",
1144 "LeaveNotify",
1145 "FocusIn",
1146 "FocusOut",
1147 "KeymapNotify",
1148 "Expose",
1149 "GraphicsExpose",
1150 "NoExpose",
1151 "VisibilityNotify",
1152 "CreateNotify",
1153 "DestroyNotify",
1154 "UnmapNotify",
1155 "MapNotify",
1156 "MapRequest",
1157 "ReparentNotify",
1158 "ConfigureNotify",
1159 "ConfigureRequest",
1160 "GravityNotify",
1161 "ResizeRequest",
1162 "CirculateNotify",
1163 "CirculateRequest",
1164 "PropertyNotify",
1165 "SelectionClear",
1166 "SelectionRequest",
1167 "SelectionNotify",
1168 "ColormapNotify",
1169 "ClientMessage",
1170 "MappingNotify"
1171 };
1172#endif
1173
1174#ifdef DEBUG_X
1175 struct timeval tp;
1176 struct tm *ltt;
1177 (void)gettimeofday (&tp, NULL);
1178 ltt = localtime (& (tp.tv_sec));
1179 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1180#endif
1181 1225
1182 switch (ev.type) 1226 switch (ev.type)
1183 { 1227 {
1184 case KeyPress: 1228 case KeyPress:
1229#if ISO_14755
1230 if (!(iso14755buf & ISO_14755_52))
1231#endif
1185 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;
1186 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
1187 1297
1188#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1298#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1189 case KeyRelease:
1190 {
1191 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)
1192 mouse_slip_wheel_speed = 0; 1302 mouse_slip_wheel_speed = 0;
1193 else 1303#endif
1194 {
1195 KeySym ks;
1196
1197 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1198 if (ks == XK_Control_L || ks == XK_Control_R)
1199 mouse_slip_wheel_speed = 0;
1200 }
1201 break; 1304 break;
1202 } 1305 }
1203#endif
1204 1306
1205 case ButtonPress: 1307 case ButtonPress:
1206 button_press (ev.xbutton); 1308 button_press (ev.xbutton);
1207 break; 1309 break;
1208 1310
… …
1220 && (ev.xclient.data.l[0] == DndFile 1322 && (ev.xclient.data.l[0] == DndFile
1221 || ev.xclient.data.l[0] == DndDir 1323 || ev.xclient.data.l[0] == DndDir
1222 || ev.xclient.data.l[0] == DndLink)) 1324 || ev.xclient.data.l[0] == DndLink))
1223 { 1325 {
1224 /* Get Dnd data */ 1326 /* Get Dnd data */
1225 Atom ActualType; 1327 Atom ActualType;
1226 int ActualFormat; 1328 int ActualFormat;
1227 unsigned char *data; 1329 unsigned char *data;
1228 unsigned long Size, RemainingBytes; 1330 unsigned long Size, RemainingBytes;
1229 1331
1230 XGetWindowProperty (display->display, display->root, 1332 XGetWindowProperty (display->display, display->root,
1231 xa[XA_DNDSELECTION], 1333 xa[XA_DNDSELECTION],
1232 0L, 1000000L, 1334 0L, 1000000L,
1233 False, AnyPropertyType, 1335 False, AnyPropertyType,
1234 &ActualType, &ActualFormat, 1336 &ActualType, &ActualFormat,
1235 &Size, &RemainingBytes, 1337 &Size, &RemainingBytes,
1236 &data); 1338 &data);
1237 XChangeProperty (display->display, display->root, 1339 set_string_property (XA_CUT_BUFFER0, data);
1238 XA_CUT_BUFFER0, XA_STRING, 1340 XFree (data);
1239 8, PropModeReplace,
1240 data, STRLEN (data));
1241 selection_paste (display->root, XA_CUT_BUFFER0, True); 1341 selection_paste (display->root, XA_CUT_BUFFER0, true);
1242 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1342 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1243 } 1343 }
1244#endif /* OFFIX_DND */ 1344#endif /* OFFIX_DND */
1245 break; 1345 break;
1246 1346
1247 case MappingNotify: 1347 case MappingNotify:
1248 XRefreshKeyboardMapping (& (ev.xmapping)); 1348 XRefreshKeyboardMapping (&ev.xmapping);
1249 break; 1349 break;
1250 1350
1251 /* 1351 /*
1252 * XXX: this is not the _current_ arrangement 1352 * XXX: this is not the _current_ arrangement
1253 * Here's my conclusion: 1353 * Here's my conclusion:
… …
1278 { 1378 {
1279 TermWin.focus = 1; 1379 TermWin.focus = 1;
1280 want_refresh = 1; 1380 want_refresh = 1;
1281#ifdef USE_XIM 1381#ifdef USE_XIM
1282 if (Input_Context != NULL) 1382 if (Input_Context != NULL)
1383 {
1384 IMSetStatusPosition ();
1283 XSetICFocus (Input_Context); 1385 XSetICFocus (Input_Context);
1386 }
1284#endif 1387#endif
1285#ifdef CURSOR_BLINK 1388#ifdef CURSOR_BLINK
1286 if (Options & Opt_cursorBlink) 1389 if (options & Opt_cursorBlink)
1287 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 }
1288#endif 1398#endif
1289 1399
1290 } 1400 }
1291 break; 1401 break;
1292 1402
1293 case FocusOut: 1403 case FocusOut:
1294 if (TermWin.focus) 1404 if (TermWin.focus)
1295 { 1405 {
1296 TermWin.focus = 0; 1406 TermWin.focus = 0;
1297 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
1298#ifdef USE_XIM 1415#ifdef USE_XIM
1299 if (Input_Context != NULL) 1416 if (Input_Context != NULL)
1300 XUnsetICFocus (Input_Context); 1417 XUnsetICFocus (Input_Context);
1301#endif 1418#endif
1302#ifdef CURSOR_BLINK 1419#ifdef CURSOR_BLINK
1303 if (Options & Opt_cursorBlink) 1420 if (options & Opt_cursorBlink)
1304 cursor_blink_ev.stop (); 1421 cursor_blink_ev.stop ();
1305 hidden_cursor = 0; 1422 hidden_cursor = 0;
1306#endif 1423#endif
1307 1424#ifdef OFF_FOCUS_FADING
1425 if (rs[Rs_fade])
1426 {
1427 pix_colors = pix_colors_unfocused;
1428 scr_recolour ();
1429 }
1430#endif
1308 } 1431 }
1309 break; 1432 break;
1310 1433
1311 case ConfigureNotify: 1434 case ConfigureNotify:
1312 if (ev.xconfigure.window == TermWin.parent[0]) 1435 if (ev.xconfigure.window == TermWin.parent[0])
… …
1321 } 1444 }
1322 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1445 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1323 1446
1324 if (szHint.width != width || szHint.height != height) 1447 if (szHint.width != width || szHint.height != height)
1325 { 1448 {
1326 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1449 seen_resize = 1;
1327 resize_all_windows (width, height, 1); 1450 resize_all_windows (width, height, 1);
1328 } 1451 }
1329#ifdef DEBUG_SIZE 1452
1330 else
1331 {
1332 D_SIZE ((stderr, "Size: Not resizing"));
1333 }
1334#endif
1335#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1453#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1336 if (Options & Opt_transparent) 1454 if (options & Opt_transparent)
1337 {
1338 check_our_parents (); 1455 check_our_parents ();
1339 if (am_transparent)
1340 want_full_refresh = 1;
1341 }
1342#endif 1456#endif
1343
1344 } 1457 }
1345 break; 1458 break;
1346 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
1347 case SelectionClear: 1467 case SelectionClear:
1348 display->set_selection_owner (0); 1468 selection_clear ();
1349 break; 1469 break;
1350 1470
1351 case SelectionNotify: 1471 case SelectionNotify:
1352 if (selection_wait == Sel_normal) 1472 if (selection_wait == Sel_normal)
1353 selection_paste (ev.xselection.requestor, 1473 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1354 ev.xselection.property, True);
1355 break; 1474 break;
1356 1475
1357 case SelectionRequest: 1476 case SelectionRequest:
1358 selection_send (ev.xselectionrequest); 1477 selection_send (ev.xselectionrequest);
1359 break; 1478 break;
… …
1380 1499
1381 case GraphicsExpose: 1500 case GraphicsExpose:
1382 case Expose: 1501 case Expose:
1383 if (ev.xany.window == TermWin.vt) 1502 if (ev.xany.window == TermWin.vt)
1384 { 1503 {
1385#ifdef NO_SLOW_LINK_SUPPORT 1504 do
1386 scr_expose (ev.xexpose.x, ev.xexpose.y, 1505 scr_expose (ev.xexpose.x, ev.xexpose.y,
1387 ev.xexpose.width, ev.xexpose.height, False); 1506 ev.xexpose.width, ev.xexpose.height, False);
1388#else 1507 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1389 // 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))
1390 scr_expose (ev.xexpose.x, ev.xexpose.y, 1512 scr_expose (ev.xexpose.x, ev.xexpose.y,
1391 ev.xexpose.width, ev.xexpose.height, False); 1513 ev.xexpose.width, ev.xexpose.height, False);
1392 //scr_expose (ev.xexpose.x, 0, 1514
1393 // ev.xexpose.width, TermWin.height, False); 1515 scr_refresh (refresh_type);
1394#endif
1395 want_refresh = 1;
1396 } 1516 }
1397 else 1517 else
1398 { 1518 {
1399 XEvent unused_event; 1519 XEvent unused_event;
1400 1520
1401 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1521 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1402 Expose, 1522 ;
1403 &unused_event)) ;
1404 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1523 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1405 GraphicsExpose, 1524 ;
1406 &unused_event)) ; 1525
1407 if (isScrollbarWindow (ev.xany.window)) 1526 if (isScrollbarWindow (ev.xany.window))
1408 { 1527 {
1409 scrollBar.setIdle (); 1528 scrollBar.setIdle ();
1410 scrollbar_show (0); 1529 scrollbar_show (0);
1411 } 1530 }
1412#ifdef MENUBAR 1531#ifdef MENUBAR
1413 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1532 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1414 menubar_expose (); 1533 menubar_expose ();
1415#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
1416 } 1540 }
1417 break; 1541 break;
1418 1542
1419 case MotionNotify: 1543 case MotionNotify:
1420#ifdef POINTER_BLANK 1544#ifdef POINTER_BLANK
… …
1426 { 1550 {
1427 menubar_control (ev.xbutton); 1551 menubar_control (ev.xbutton);
1428 break; 1552 break;
1429 } 1553 }
1430#endif 1554#endif
1431 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1555 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1432 break; 1556 break;
1433 1557
1434 if (ev.xany.window == TermWin.vt) 1558 if (ev.xany.window == TermWin.vt)
1435 { 1559 {
1436 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1560 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1437 { 1561 {
1438 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1562 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1439 ; 1563 ;
1440 1564
1441 XQueryPointer (display->display, TermWin.vt, 1565 XQueryPointer (display->display, TermWin.vt,
1442 &unused_root, &unused_child, 1566 &unused_root, &unused_child,
1443 &unused_root_x, &unused_root_y, 1567 &unused_root_x, &unused_root_y,
1444 & (ev.xbutton.x), & (ev.xbutton.y), 1568 &ev.xbutton.x, &ev.xbutton.y,
1445 &unused_mask); 1569 &ev.xbutton.state);
1446#ifdef MOUSE_THRESHOLD 1570#ifdef MOUSE_THRESHOLD
1447 /* deal with a `jumpy' mouse */ 1571 /* deal with a `jumpy' mouse */
1448 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1572 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1449 { 1573 {
1450#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
1451 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1583 selection_extend (ev.xbutton.x, ev.xbutton.y,
1452 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1584 ev.xbutton.state & Button3Mask ? 2 : 0);
1585
1453#ifdef SELECTION_SCROLLING 1586#ifdef SELECTION_SCROLLING
1454 if (ev.xbutton.y < TermWin.int_bwidth 1587 if (ev.xbutton.y < TermWin.int_bwidth
1455 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1588 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1456 { 1589 {
1457 int dist; 1590 int dist;
1458 1591
1459 pending_scroll_selection=1;
1460
1461 /* don't clobber the current delay if we are 1592 /* don't clobber the current delay if we are
1462 * already in the middle of scrolling. 1593 * already in the middle of scrolling.
1463 */ 1594 */
1464 if (scroll_selection_delay<=0) 1595 if (!sel_scroll_ev.active)
1465 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1596 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1466 1597
1467 /* save the event params so we can highlight 1598 /* save the event params so we can highlight
1468 * the selection in the pending-scroll loop 1599 * the selection in the pending-scroll loop
1469 */ 1600 */
1470 selection_save_x=ev.xbutton.x; 1601 selection_save_x = ev.xbutton.x;
1471 selection_save_y=ev.xbutton.y; 1602 selection_save_y = ev.xbutton.y;
1472 selection_save_state=
1473 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1603 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1474 1604
1475 /* calc number of lines to scroll */ 1605 /* calc number of lines to scroll */
1476 if (ev.xbutton.y<TermWin.int_bwidth) 1606 if (ev.xbutton.y < TermWin.int_bwidth)
1477 { 1607 {
1478 scroll_selection_dir = UP; 1608 scroll_selection_dir = UP;
1479 dist = TermWin.int_bwidth - ev.xbutton.y; 1609 dist = TermWin.int_bwidth - ev.xbutton.y;
1480 } 1610 }
1481 else 1611 else
1482 { 1612 {
1483 scroll_selection_dir = DN; 1613 scroll_selection_dir = DN;
1484 dist = ev.xbutton.y -
1485 (TermWin.int_bwidth + TermWin.height); 1614 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1486 } 1615 }
1616
1487 scroll_selection_lines= (Pixel2Height (dist)/ 1617 scroll_selection_lines = Pixel2Height (dist)
1488 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1618 / SELECTION_SCROLL_LINE_SPEEDUP
1619 + 1;
1489 MIN_IT (scroll_selection_lines, 1620 MIN_IT (scroll_selection_lines,
1490 SELECTION_SCROLL_MAX_LINES); 1621 SELECTION_SCROLL_MAX_LINES);
1491 } 1622 }
1492 else 1623 else
1493 { 1624 {
1494 /* we are within the text window, so we 1625 /* we are within the text window, so we
1495 * shouldn't be scrolling 1626 * shouldn't be scrolling
1496 */ 1627 */
1497 pending_scroll_selection = 0; 1628 if (sel_scroll_ev.active)
1629 sel_scroll_ev.stop();
1498 } 1630 }
1499#endif 1631#endif
1500#ifdef MOUSE_THRESHOLD 1632#ifdef MOUSE_THRESHOLD
1501
1502 } 1633 }
1503#endif 1634#endif
1504
1505 } 1635 }
1506 } 1636 }
1507 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1637 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1508 { 1638 {
1509 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1639 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1510 MotionNotify, &ev)) ; 1640 MotionNotify, &ev))
1641 ;
1642
1511 XQueryPointer (display->display, scrollBar.win, 1643 XQueryPointer (display->display, scrollBar.win,
1512 &unused_root, &unused_child, 1644 &unused_root, &unused_child,
1513 &unused_root_x, &unused_root_y, 1645 &unused_root_x, &unused_root_y,
1514 & (ev.xbutton.x), & (ev.xbutton.y), 1646 &ev.xbutton.x, &ev.xbutton.y,
1515 &unused_mask); 1647 &unused_mask);
1516 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1648 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1517 scrollbar_size ()); 1649 scrollbar_size ());
1518 scr_refresh (refresh_type); 1650 scr_refresh (refresh_type);
1519 refresh_limit = 0; 1651 refresh_limit = 0;
… …
1521 } 1653 }
1522 break; 1654 break;
1523 } 1655 }
1524} 1656}
1525 1657
1658#if TRANSPARENT
1526void 1659void
1527rxvt_term::rootwin_cb (XEvent &ev) 1660rxvt_term::rootwin_cb (XEvent &ev)
1528{ 1661{
1529 SET_R (this); 1662 SET_R (this);
1530 SET_LOCALE (locale); 1663 SET_LOCALE (locale);
1531 1664
1532 switch (ev.type) 1665 switch (ev.type)
1533 { 1666 {
1534 case PropertyNotify: 1667 case PropertyNotify:
1535 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1536 {
1537 if (ev.xproperty.state == PropertyNewValue)
1538 selection_property (ev.xproperty.window, ev.xproperty.atom);
1539 break;
1540 }
1541#ifdef TRANSPARENT
1542 else
1543 {
1544 /* 1668 /*
1545 * 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,
1546 * 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.
1547 */ 1671 */
1548 if (xa[XA_XROOTPMAPID] == 0) 1672 if (xa[XA_XROOTPMAPID] == 0)
1549 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1673 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1550 1674
1551 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1675 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1552 return; 1676 return;
1553 }
1554 1677
1555 /* FALLTHROUGH */ 1678 /* FALLTHROUGH */
1556 case ReparentNotify: 1679 case ReparentNotify:
1557 if ((Options & Opt_transparent) && check_our_parents ()) 1680 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1558 if (am_transparent)
1559 want_full_refresh = 1; 1681 want_refresh = want_full_refresh = 1;
1560 break; 1682 break;
1561#endif
1562 } 1683 }
1563} 1684}
1685#endif
1564 1686
1565void 1687void
1566rxvt_term::button_press (XButtonEvent &ev) 1688rxvt_term::button_press (XButtonEvent &ev)
1567{ 1689{
1568 int reportmode = 0, clickintime; 1690 int reportmode = 0, clickintime;
1569 1691
1570 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1692 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1571 if (!bypass_keystate) 1693 if (!bypass_keystate)
1572 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1694 reportmode = !! (priv_modes & PrivMode_mouse_report);
1695
1573 /* 1696 /*
1574 * VT window processing of button press 1697 * VT window processing of button press
1575 */ 1698 */
1576 if (ev.window == TermWin.vt) 1699 if (ev.window == TermWin.vt)
1577 { 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
1578 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1710 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1711
1579 if (reportmode) 1712 if (reportmode)
1580 { 1713 {
1581 /* mouse report from vt window */ 1714 /* mouse report from vt window */
1582 /* save the xbutton state (for ButtonRelease) */ 1715 /* save the xbutton state (for ButtonRelease) */
1583 MEvent.state = ev.state; 1716 MEvent.state = ev.state;
… …
1612 } 1745 }
1613 else 1746 else
1614 { 1747 {
1615 if (ev.button != MEvent.button) 1748 if (ev.button != MEvent.button)
1616 MEvent.clicks = 0; 1749 MEvent.clicks = 0;
1750
1617 switch (ev.button) 1751 switch (ev.button)
1618 { 1752 {
1619 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
1620 /* allow shift+left click to extend selection */ 1762 /* allow shift+left click to extend selection */
1621 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1763 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1622 { 1764 {
1623 if (MEvent.button == Button1 && clickintime) 1765 if (MEvent.button == Button1 && clickintime)
1624 selection_rotate (ev.x, ev.y); 1766 selection_rotate (ev.x, ev.y);
1625 else 1767 else
1626 selection_extend (ev.x, ev.y, 1); 1768 selection_extend (ev.x, ev.y, 1);
… …
1641 case Button3: 1783 case Button3:
1642 if (MEvent.button == Button3 && clickintime) 1784 if (MEvent.button == Button3 && clickintime)
1643 selection_rotate (ev.x, ev.y); 1785 selection_rotate (ev.x, ev.y);
1644 else 1786 else
1645 selection_extend (ev.x, ev.y, 1); 1787 selection_extend (ev.x, ev.y, 1);
1788
1646 MEvent.button = Button3; 1789 MEvent.button = Button3;
1647 break; 1790 break;
1648 } 1791 }
1649 } 1792 }
1793
1650 MEvent.time = ev.time; 1794 MEvent.time = ev.time;
1651 return; 1795 return;
1652 } 1796 }
1653 1797
1654 /* 1798 /*
… …
1720 upordown = 1; /* down */ 1864 upordown = 1; /* down */
1721 } 1865 }
1722 if (upordown) 1866 if (upordown)
1723 { 1867 {
1724#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1868#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1725 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1869 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1726#endif 1870#endif
1727 if (scr_page (upordown < 0 ? UP : DN, 1)) 1871 if (scr_page (upordown < 0 ? UP : DN, 1))
1728 { 1872 {
1729 if (upordown < 0) 1873 if (upordown < 0)
1730 scrollBar.setUp (); 1874 scrollBar.setUp ();
… …
1746 break; 1890 break;
1747 case R_SB_ALIGN_BOTTOM: 1891 case R_SB_ALIGN_BOTTOM:
1748 csrO = scrollBar.bot - scrollBar.top; 1892 csrO = scrollBar.bot - scrollBar.top;
1749 break; 1893 break;
1750 } 1894 }
1895
1751 if (scrollBar.style == R_SB_XTERM 1896 if (scrollBar.style == R_SB_XTERM
1752 || scrollbar_above_slider (ev.y) 1897 || scrollbar_above_slider (ev.y)
1753 || scrollbar_below_slider (ev.y)) 1898 || scrollbar_below_slider (ev.y))
1754 scr_move_to ( scrollbar_position (ev.y) - csrO, 1899 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1755 scrollbar_size ()); 1900
1756 scrollBar.setMotion (); 1901 scrollBar.setMotion ();
1757 break; 1902 break;
1758 1903
1759 case Button1: 1904 case Button1:
1760 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1905 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1784 scr_page ((ev.button == Button1 ? DN : UP), 1929 scr_page ((ev.button == Button1 ? DN : UP),
1785 (TermWin.nrow 1930 (TermWin.nrow
1786 * scrollbar_position (ev.y) 1931 * scrollbar_position (ev.y)
1787 / scrollbar_size ())); 1932 / scrollbar_size ()));
1788 } 1933 }
1934
1789 break; 1935 break;
1790 } 1936 }
1791 } 1937 }
1792 return; 1938 return;
1793 } 1939 }
… …
1805{ 1951{
1806 int reportmode = 0; 1952 int reportmode = 0;
1807 1953
1808 csrO = 0; /* reset csr Offset */ 1954 csrO = 0; /* reset csr Offset */
1809 if (!bypass_keystate) 1955 if (!bypass_keystate)
1810 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1956 reportmode = !! (priv_modes & PrivMode_mouse_report);
1811 1957
1812 if (scrollbar_isUpDn ()) 1958 if (scrollbar_isUpDn ())
1813 { 1959 {
1814 scrollBar.setIdle (); 1960 scrollBar.setIdle ();
1815 scrollbar_show (0); 1961 scrollbar_show (0);
1816#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1962#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1817 refresh_type &= ~SMOOTH_REFRESH; 1963 refresh_type &= ~SMOOTH_REFRESH;
1818#endif 1964#endif
1819
1820 } 1965 }
1966
1821#ifdef SELECTION_SCROLLING 1967#ifdef SELECTION_SCROLLING
1822 pending_scroll_selection=0; 1968 if (sel_scroll_ev.active)
1969 sel_scroll_ev.stop();
1823#endif 1970#endif
1971
1824 if (ev.window == TermWin.vt) 1972 if (ev.window == TermWin.vt)
1825 { 1973 {
1974#if ISO_14755
1975 // 5.4
1976 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1977 return;
1978#endif
1826 if (reportmode) 1979 if (reportmode)
1827 { 1980 {
1828 /* mouse report from vt window */ 1981 /* mouse report from vt window */
1829 /* don't report release of wheel "buttons" */ 1982 /* don't report release of wheel "buttons" */
1830 if (ev.button >= 4) 1983 if (ev.button >= 4)
… …
1844 MEvent.button = AnyButton; 1997 MEvent.button = AnyButton;
1845 mouse_report (ev); 1998 mouse_report (ev);
1846#endif /* MOUSE_REPORT_DOUBLECLICK */ 1999#endif /* MOUSE_REPORT_DOUBLECLICK */
1847 return; 2000 return;
1848 } 2001 }
2002
1849 /* 2003 /*
1850 * dumb hack to compensate for the failure of click-and-drag 2004 * dumb hack to compensate for the failure of click-and-drag
1851 * when overriding mouse reporting 2005 * when overriding mouse reporting
1852 */ 2006 */
1853 if (PrivateModes & PrivMode_mouse_report 2007 if (priv_modes & PrivMode_mouse_report
1854 && bypass_keystate 2008 && bypass_keystate
1855 && ev.button == Button1 && MEvent.clicks <= 1) 2009 && ev.button == Button1 && MEvent.clicks <= 1)
1856 selection_extend (ev.x, ev.y, 0); 2010 selection_extend (ev.x, ev.y, 0);
1857 2011
1858 switch (ev.button) 2012 switch (ev.button)
… …
1869 case Button5: 2023 case Button5:
1870 { 2024 {
1871 int i; 2025 int i;
1872 page_dirn v; 2026 page_dirn v;
1873 2027
1874 v = (ev.button == Button4) ? UP : DN; 2028 v = ev.button == Button4 ? UP : DN;
2029
1875 if (ev.state & ShiftMask) 2030 if (ev.state & ShiftMask)
1876 i = 1; 2031 i = 1;
1877 else if ((Options & Opt_mouseWheelScrollPage)) 2032 else if (options & Opt_mouseWheelScrollPage)
1878 i = TermWin.nrow - 1; 2033 i = TermWin.nrow - 1;
1879 else 2034 else
1880 i = 5; 2035 i = 5;
2036
1881# ifdef MOUSE_SLIP_WHEELING 2037# ifdef MOUSE_SLIP_WHEELING
1882 if (ev.state & ControlMask) 2038 if (ev.state & ControlMask)
1883 { 2039 {
1884 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)
1885 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2045 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2046
2047 slip_wheel_ev.start ();
1886 } 2048 }
2049 else
2050 {
1887# endif 2051# endif
1888# ifdef JUMP_MOUSE_WHEEL 2052# ifdef JUMP_MOUSE_WHEEL
1889 scr_page (v, i);
1890 scr_refresh (SMOOTH_REFRESH);
1891 scrollbar_show (1);
1892# else
1893 while (i--)
1894 {
1895 scr_page (v, 1); 2053 scr_page (v, i);
1896 scr_refresh (SMOOTH_REFRESH); 2054 scr_refresh (SMOOTH_REFRESH);
1897 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
1898 } 2065 }
1899# endif 2066#endif
1900
1901 } 2067 }
1902 break; 2068 break;
1903#endif 2069#endif
1904
1905 } 2070 }
1906 } 2071 }
1907#ifdef MENUBAR 2072#ifdef MENUBAR
1908 else if (isMenuBarWindow (ev.window)) 2073 else if (isMenuBarWindow (ev.window))
1909 menubar_control (ev); 2074 menubar_control (ev);
1910#endif 2075#endif
1911} 2076}
1912 2077
1913
1914#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
1915/* 2310/*
1916 * Check our parents are still who we think they are. 2311 * Check our parents are still who we think they are.
1917 * Do transparency updates if required 2312 * Do transparency updates if required
1918 */ 2313 */
1919int 2314int
1920rxvt_term::check_our_parents () 2315rxvt_term::check_our_parents ()
1921{ 2316{
1922 int i, pchanged, aformat, have_pixmap, rootdepth; 2317 int i, pchanged, aformat, have_pixmap, rootdepth;
1923 unsigned long nitems, bytes_after; 2318 unsigned long nitems, bytes_after;
1924 Atom atype; 2319 Atom atype;
1925 unsigned char *prop = NULL; 2320 unsigned char *prop = NULL;
1926 Window root, oldp, *list; 2321 Window root, oldp, *list;
1927 Pixmap rootpixmap = None; 2322 Pixmap rootpixmap = None;
1928 XWindowAttributes wattr, wrootattr; 2323 XWindowAttributes wattr, wrootattr;
1929 2324
1930 pchanged = 0; 2325 pchanged = 0;
1931 2326
1932 if (! (Options & Opt_transparent)) 2327 if (!(options & Opt_transparent))
1933 return pchanged; /* Don't try any more */ 2328 return pchanged; /* Don't try any more */
1934 2329
1935 XGetWindowAttributes (display->display, display->root, &wrootattr); 2330 XGetWindowAttributes (display->display, display->root, &wrootattr);
1936 rootdepth = wrootattr.depth; 2331 rootdepth = wrootattr.depth;
1937 2332
1938 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2334
1939 if (rootdepth != wattr.depth) 2335 if (rootdepth != wattr.depth)
1940 { 2336 {
1941 if (am_transparent) 2337 if (am_transparent)
1942 { 2338 {
1943 pchanged = 1; 2339 pchanged = 1;
1944 XSetWindowBackground (display->display, TermWin.vt, 2340 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1945 PixColors[Color_bg]);
1946 am_transparent = am_pixmap_trans = 0; 2341 am_transparent = am_pixmap_trans = 0;
1947 } 2342 }
2343
1948 return pchanged; /* Don't try any more */ 2344 return pchanged; /* Don't try any more */
1949 } 2345 }
1950 2346
1951 /* 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. */
1952 XSync (display->display, False); 2348 XSync (display->display, False);
… …
1954 /* 2350 /*
1955 * Make the frame window set by the window manager have 2351 * Make the frame window set by the window manager have
1956 * the root background. Some window managers put multiple nested frame 2352 * the root background. Some window managers put multiple nested frame
1957 * 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.
1958 */ 2354 */
1959 i = (xa[XA_XROOTPMAPID] != 0 2355 i = (xa[XA_XROOTPMAPID]
1960 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2356 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1961 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2357 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1962 &nitems, &bytes_after, &prop) == Success)); 2358 &nitems, &bytes_after, &prop) == Success);
2359
1963 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 )
1964 have_pixmap = 0; 2371 have_pixmap = 0;
1965 else 2372 else
1966 { 2373 {
1967 have_pixmap = 1; 2374 have_pixmap = 1;
1968 rootpixmap = * ((Pixmap *)prop); 2375 rootpixmap = *(Pixmap *)prop;
1969 XFree (prop); 2376 XFree (prop);
1970 } 2377 }
2378
1971 if (have_pixmap) 2379 if (have_pixmap)
1972 { 2380 {
1973 /* 2381 /*
1974 * Copy display->root pixmap transparency 2382 * Copy display->root pixmap transparency
1975 */ 2383 */
1976 int sx, sy, nx, ny; 2384 int sx, sy, nx, ny;
1977 unsigned int nw, nh; 2385 unsigned int nw, nh;
1978 Window cr; 2386 Window cr;
1979 XImage *image; 2387 XImage *image;
1980 GC gc; 2388 GC gc;
1981 XGCValues gcvalue; 2389 XGCValues gcvalue;
1982 2390
1983 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2391 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1984 0, 0, &sx, &sy, &cr); 2392 0, 0, &sx, &sy, &cr);
1985 nw = (unsigned int)szHint.width; 2393 nw = (unsigned int)szHint.width;
1986 nh = (unsigned int)szHint.height; 2394 nh = (unsigned int)szHint.height;
1987 nx = ny = 0; 2395 nx = ny = 0;
2396
1988 if (sx < 0) 2397 if (sx < 0)
1989 { 2398 {
1990 nw += sx; 2399 nw += sx;
1991 nx = -sx; 2400 nx = -sx;
1992 sx = 0; 2401 sx = 0;
1993 } 2402 }
2403
1994 if (sy < 0) 2404 if (sy < 0)
1995 { 2405 {
1996 nh += sy; 2406 nh += sy;
1997 ny = -sy; 2407 ny = -sy;
1998 sy = 0; 2408 sy = 0;
1999 } 2409 }
2410
2000 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2411 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2001 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2412 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2413
2414 XSync (display->display, False);
2002 allowedxerror = -1; 2415 allowedxerror = -1;
2003 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2416 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2004 ZPixmap); 2417
2005 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2418 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2006 /* XXX: may need a delay here? */ 2419 /* XXX: may need a delay here? */
2007 allowedxerror = 0; 2420 allowedxerror = 0;
2421
2008 if (image == NULL) 2422 if (image == NULL)
2009 { 2423 {
2010 if (am_transparent && am_pixmap_trans) 2424 if (am_transparent && am_pixmap_trans)
2011 { 2425 {
2012 pchanged = 1; 2426 pchanged = 1;
… …
2014 { 2428 {
2015 XFreePixmap (display->display, TermWin.pixmap); 2429 XFreePixmap (display->display, TermWin.pixmap);
2016 TermWin.pixmap = None; 2430 TermWin.pixmap = None;
2017 } 2431 }
2018 } 2432 }
2433
2019 am_pixmap_trans = 0; 2434 am_pixmap_trans = 0;
2020 } 2435 }
2021 else 2436 else
2022 { 2437 {
2023 if (TermWin.pixmap != None) 2438 if (TermWin.pixmap != None)
2024 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
2025 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2453 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2026 (unsigned int)szHint.width,
2027 (unsigned int)szHint.height, 2454 szHint.width, szHint.height, image->depth);
2028 (unsigned int)image->depth);
2029 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2455 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2030 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2456 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2031 nx, ny, (unsigned int)image->width,
2032 (unsigned int)image->height); 2457 nx, ny, image->width, image->height);
2033 XFreeGC (display->display, gc); 2458 XFreeGC (display->display, gc);
2034 XDestroyImage (image); 2459 XDestroyImage (image);
2035 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2460 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2036 TermWin.pixmap); 2461 XClearWindow (display->display, TermWin.parent[0]);
2462
2037 if (!am_transparent || !am_pixmap_trans) 2463 if (!am_transparent || !am_pixmap_trans)
2038 pchanged = 1; 2464 pchanged = 1;
2465
2039 am_transparent = am_pixmap_trans = 1; 2466 am_transparent = am_pixmap_trans = 1;
2040 } 2467 }
2041 } 2468 }
2469
2042 if (!am_pixmap_trans) 2470 if (am_pixmap_trans)
2471 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2472 else
2043 { 2473 {
2044 unsigned int n; 2474 unsigned int n;
2045 /* 2475 /*
2046 * InheritPixmap transparency 2476 * InheritPixmap transparency
2047 */ 2477 */
2048 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2049 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2478 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2050 i++)
2051 { 2479 {
2052 oldp = TermWin.parent[i]; 2480 oldp = TermWin.parent[i];
2053 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2481 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2054 &TermWin.parent[i], &list, &n); 2482 &TermWin.parent[i], &list, &n);
2055 XFree (list); 2483 XFree (list);
2056 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2484
2057 if (TermWin.parent[i] == display->root) 2485 if (TermWin.parent[i] == display->root)
2058 { 2486 {
2059 if (oldp != None) 2487 if (oldp != None)
2060 pchanged = 1; 2488 pchanged = 1;
2489
2061 break; 2490 break;
2062 } 2491 }
2492
2063 if (oldp != TermWin.parent[i]) 2493 if (oldp != TermWin.parent[i])
2064 pchanged = 1; 2494 pchanged = 1;
2065 } 2495 }
2496
2066 n = 0; 2497 n = 0;
2498
2067 if (pchanged) 2499 if (pchanged)
2068 { 2500 {
2069 for (; n < (unsigned int)i; n++) 2501 for (; n < (unsigned int)i; n++)
2070 { 2502 {
2071 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2503 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2072 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2073 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2504 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2074 { 2505 {
2075 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2506 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2076 break; 2507 break;
2077 } 2508 }
2078 } 2509 }
2079 } 2510 }
2080 if (n > (int) (sizeof (TermWin.parent) 2511
2081 / sizeof (TermWin.parent[0]))) 2512 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2082 { 2513 {
2083 D_X ((stderr, "InheritPixmap Turning off"));
2084 XSetWindowBackground (display->display, TermWin.parent[0], 2514 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2085 PixColors[Color_fg]);
2086 XSetWindowBackground (display->display, TermWin.vt, 2515 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2087 PixColors[Color_bg]);
2088 am_transparent = 0; 2516 am_transparent = 0;
2089 /* XXX: also turn off Opt_transparent? */ 2517 /* XXX: also turn off Opt_transparent? */
2090 } 2518 }
2091 else 2519 else
2092 { 2520 {
2521#if WAIT_FOR_WM
2093 /* wait (an arbitrary period) for the WM to do its thing 2522 /* wait (an arbitrary period) for the WM to do its thing
2094 * needed for fvwm2.2.2 (and before?) */ 2523 * needed for fvwm2.2.2 (and before?) */
2095# ifdef HAVE_NANOSLEEP
2096 struct timespec rqt;
2097
2098 rqt.tv_sec = 1;
2099 rqt.tv_nsec = 0;
2100 nanosleep (&rqt, NULL);
2101# else
2102 sleep (1); 2524 sleep (1);
2103# endif 2525#endif
2104 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2105 for (n = 0; n < (unsigned int)i; n++) 2526 for (n = 0; n < (unsigned int)i; n++)
2527 {
2106 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2528 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2107 ParentRelative); 2529 XClearWindow (display->display, TermWin.parent[n]);
2530 }
2531
2108 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2532 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2109 ParentRelative);
2110 am_transparent = 1; 2533 am_transparent = 1;
2111 } 2534 }
2535
2112 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2536 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2113 TermWin.parent[i] = None; 2537 TermWin.parent[i] = None;
2114 } 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
2115 return pchanged; 2554 return pchanged;
2116} 2555}
2117#endif 2556#endif
2118 2557
2119/*}}} */ 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}
2120 2745
2121/*{{{ print pipe */ 2746/*{{{ print pipe */
2122/*----------------------------------------------------------------------*/ 2747/*----------------------------------------------------------------------*/
2123#ifdef PRINTPIPE 2748#ifdef PRINTPIPE
2124FILE * 2749FILE *
2125rxvt_term::popen_printer () 2750rxvt_term::popen_printer ()
2126{ 2751{
2127 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2752 FILE *stream = popen (rs[Rs_print_pipe], "w");
2128 2753
2129 if (stream == NULL) 2754 if (stream == NULL)
2130 rxvt_print_error ("can't open printer pipe"); 2755 rxvt_warn ("can't open printer pipe, not printing.\n");
2756
2131 return stream; 2757 return stream;
2132} 2758}
2133 2759
2134int 2760int
2135rxvt_term::pclose_printer (FILE *stream) 2761rxvt_term::pclose_printer (FILE *stream)
2136{ 2762{
2137 fflush (stream); 2763 fflush (stream);
2138 /* pclose () reported not to work on SunOS 4.1.3 */
2139# if defined (__sun__) /* TODO: RESOLVE THIS */
2140 /* pclose works provided SIGCHLD handler uses waitpid */
2141 return pclose (stream); /* return fclose (stream); */
2142# else
2143 return pclose (stream); 2764 return pclose (stream);
2144# endif
2145} 2765}
2146 2766
2147/* 2767/*
2148 * simulate attached vt100 printer 2768 * simulate attached vt100 printer
2149 */ 2769 */
2150void 2770void
2151rxvt_term::process_print_pipe () 2771rxvt_term::process_print_pipe ()
2152{ 2772{
2153 int done; 2773 int done;
2154 FILE *fd; 2774 FILE *fd;
2155 2775
2156 if ((fd = popen_printer ()) == NULL) 2776 if ((fd = popen_printer ()) == NULL)
2157 return; 2777 return;
2158 2778
2159 /* 2779 /*
2160 * 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
2161 * is received. 2781 * is received.
2162 */ 2782 */
2163 for (done = 0; !done;) 2783 for (done = 0; !done;)
2164 { 2784 {
2165 unsigned char buf[8]; 2785 unsigned char buf[8];
2166 unsigned char ch; 2786 unicode_t ch;
2167 unsigned int i, len; 2787 unsigned int i, len;
2168 2788
2169 if ((ch = cmd_getc ()) != C0_ESC) 2789 if ((ch = cmd_getc ()) != C0_ESC)
2170 { 2790 {
2171 if (putc (ch, fd) == EOF) 2791 if (putc (ch, fd) == EOF)
2172 break; /* done = 1 */ 2792 break; /* done = 1 */
… …
2187 { 2807 {
2188 if ((buf[len++] = cmd_getc ()) == 'i') 2808 if ((buf[len++] = cmd_getc ()) == 'i')
2189 break; /* done = 1 */ 2809 break; /* done = 1 */
2190 } 2810 }
2191 } 2811 }
2812
2192 for (i = 0; i < len; i++) 2813 for (i = 0; i < len; i++)
2193 if (putc (buf[i], fd) == EOF) 2814 if (putc (buf[i], fd) == EOF)
2194 { 2815 {
2195 done = 1; 2816 done = 1;
2196 break; 2817 break;
2197 } 2818 }
2198 } 2819 }
2199 } 2820 }
2821
2200 pclose_printer (fd); 2822 pclose_printer (fd);
2201} 2823}
2202#endif /* PRINTPIPE */ 2824#endif /* PRINTPIPE */
2203/*}}} */ 2825/*}}} */
2204 2826
2205/* *INDENT-OFF* */ 2827/* *INDENT-OFF* */
2206enum { 2828enum {
2207 C1_40 = 0x40, 2829 C1_40 = 0x40,
2208 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,
2209 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,
2210 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,
2211 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,
2212}; 2834};
2213/* *INDENT-ON* */ 2835/* *INDENT-ON* */
2214 2836
2215/*{{{ process non-printing single characters */ 2837/*{{{ process non-printing single characters */
2216void 2838void
2217rxvt_term::process_nonprinting (unsigned char ch) 2839rxvt_term::process_nonprinting (unicode_t ch)
2218{ 2840{
2219 switch (ch) 2841 switch (ch)
2220 { 2842 {
2843 case C0_ESC:
2844 process_escape_seq ();
2845 break;
2221 case C0_ENQ: /* terminal Status */ 2846 case C0_ENQ: /* terminal Status */
2222 if (rs[Rs_answerbackstring]) 2847 if (rs[Rs_answerbackstring])
2223 tt_write (
2224 (const unsigned char *)rs[Rs_answerbackstring], 2848 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2225 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2849 (unsigned int)strlen (rs[Rs_answerbackstring]));
2226 else 2850 else
2227 tt_write ((unsigned char *)VT100_ANS, 2851 tt_write ((unsigned char *)VT100_ANS,
2228 (unsigned int)STRLEN (VT100_ANS)); 2852 (unsigned int)strlen (VT100_ANS));
2229 break; 2853 break;
2230 case C0_BEL: /* bell */ 2854 case C0_BEL: /* bell */
2231 scr_bell (); 2855 scr_bell ();
2232 break; 2856 break;
2233 case C0_BS: /* backspace */ 2857 case C0_BS: /* backspace */
… …
2248 scr_charset_choose (1); 2872 scr_charset_choose (1);
2249 break; 2873 break;
2250 case C0_SI: /* shift in - acs */ 2874 case C0_SI: /* shift in - acs */
2251 scr_charset_choose (0); 2875 scr_charset_choose (0);
2252 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
2253 } 2890 }
2254} 2891}
2255/*}}} */ 2892/*}}} */
2256 2893
2257 2894
2258/*{{{ process VT52 escape sequences */ 2895/*{{{ process VT52 escape sequences */
2259void 2896void
2260rxvt_term::process_escape_vt52 (unsigned char ch) 2897rxvt_term::process_escape_vt52 (unicode_t ch)
2261{ 2898{
2262 int row, col; 2899 int row, col;
2263 2900
2264 switch (ch) 2901 switch (ch)
2265 { 2902 {
… …
2317 2954
2318/*{{{ process escape sequences */ 2955/*{{{ process escape sequences */
2319void 2956void
2320rxvt_term::process_escape_seq () 2957rxvt_term::process_escape_seq ()
2321{ 2958{
2322 unsigned char ch = cmd_getc (); 2959 unicode_t ch = cmd_getc ();
2323 2960
2324 if (PrivateModes & PrivMode_vt52) 2961 if (priv_modes & PrivMode_vt52)
2325 { 2962 {
2326 process_escape_vt52 (ch); 2963 process_escape_vt52 (ch);
2327 return; 2964 return;
2328 } 2965 }
2329 2966
… …
2344 scr_charset_set (2, (unsigned int)cmd_getc ()); 2981 scr_charset_set (2, (unsigned int)cmd_getc ());
2345 break; 2982 break;
2346 case '+': 2983 case '+':
2347 scr_charset_set (3, (unsigned int)cmd_getc ()); 2984 scr_charset_set (3, (unsigned int)cmd_getc ());
2348 break; 2985 break;
2349#ifdef MULTICHAR_SET 2986#if ENABLE_FRILLS
2350 case '$':
2351 scr_charset_set (-2, (unsigned int)cmd_getc ());
2352 break;
2353#endif
2354#ifndef NO_FRILLS
2355 case '6': 2987 case '6':
2356 scr_backindex (); 2988 scr_backindex ();
2357 break; 2989 break;
2358#endif 2990#endif
2359 case '7': 2991 case '7':
2360 scr_cursor (SAVE); 2992 scr_cursor (SAVE);
2361 break; 2993 break;
2362 case '8': 2994 case '8':
2363 scr_cursor (RESTORE); 2995 scr_cursor (RESTORE);
2364 break; 2996 break;
2365#ifndef NO_FRILLS 2997#if ENABLE_FRILLS
2366 case '9': 2998 case '9':
2367 scr_forwardindex (); 2999 scr_forwardindex ();
2368 break; 3000 break;
2369#endif 3001#endif
2370 case '=': 3002 case '=':
… …
2380 break; 3012 break;
2381 3013
2382 /* 8.3.87: NEXT LINE */ 3014 /* 8.3.87: NEXT LINE */
2383 case C1_NEL: /* ESC E */ 3015 case C1_NEL: /* ESC E */
2384 { 3016 {
2385 uint32_t nlcr[] = { '\n', '\r' }; 3017 unicode_t nlcr[] = { C0_LF, C0_CR };
2386 scr_add_lines (nlcr, 1, 2); 3018 scr_add_lines (nlcr, 1, 2);
2387 } 3019 }
2388 break; 3020 break;
2389 3021
2390 /* kidnapped escape sequence: Should be 8.3.48 */ 3022 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2401 case C1_RI: /* ESC M */ 3033 case C1_RI: /* ESC M */
2402 scr_index (DN); 3034 scr_index (DN);
2403 break; 3035 break;
2404 3036
2405 /* 8.3.142: SINGLE-SHIFT TWO */ 3037 /* 8.3.142: SINGLE-SHIFT TWO */
2406 /*case C1_SS2: scr_single_shift (2); break; */ 3038 /*case C1_SS2: scr_single_shift (2); break; */
2407 3039
2408 /* 8.3.143: SINGLE-SHIFT THREE */ 3040 /* 8.3.143: SINGLE-SHIFT THREE */
2409 /*case C1_SS3: scr_single_shift (3); break; */ 3041 /*case C1_SS3: scr_single_shift (3); break; */
2410 3042
2411 /* 8.3.27: DEVICE CONTROL STRING */ 3043 /* 8.3.27: DEVICE CONTROL STRING */
2412 case C1_DCS: /* ESC P */ 3044 case C1_DCS: /* ESC P */
2413 process_dcs_seq (); 3045 process_dcs_seq ();
2414 break; 3046 break;
… …
2429 process_osc_seq (); 3061 process_osc_seq ();
2430 break; 3062 break;
2431 3063
2432 /* 8.3.106: RESET TO INITIAL STATE */ 3064 /* 8.3.106: RESET TO INITIAL STATE */
2433 case 'c': 3065 case 'c':
3066 mbstate.reset ();
2434 scr_poweron (); 3067 scr_poweron ();
2435 scrollbar_show (1); 3068 scrollbar_show (1);
2436 break; 3069 break;
2437 3070
2438 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3071 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2450 3083
2451/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3084/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2452/* *INDENT-OFF* */ 3085/* *INDENT-OFF* */
2453enum { 3086enum {
2454 CSI_ICH = 0x40, 3087 CSI_ICH = 0x40,
2455 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,
2456 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 ,
2457 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,
2458 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,
2459 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,
2460 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,
… …
2475 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, */
2476 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, [, \, ], ^, _, */
2477 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, */
2478 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, */
2479 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, */
2480 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, {, |, }, ~, */
2481 }; 3114 };
2482/* *INDENT-ON* */ 3115/* *INDENT-ON* */
2483 3116
2484void 3117void
2485rxvt_term::process_csi_seq () 3118rxvt_term::process_csi_seq ()
2486{ 3119{
2487 unsigned char ch, priv, i; 3120 unicode_t ch, priv, i;
2488 unsigned int nargs, p; 3121 unsigned int nargs, p;
2489 int n, ndef; 3122 int n, ndef;
2490 int arg[ESC_ARGS]; 3123 int arg[ESC_ARGS];
2491 3124
2492 for (nargs = ESC_ARGS; nargs > 0;) 3125 for (nargs = ESC_ARGS; nargs > 0;)
2493 arg[--nargs] = 0; 3126 arg[--nargs] = 0;
2494 3127
2495 priv = 0; 3128 priv = 0;
… …
2497 if (ch >= '<' && ch <= '?') 3130 if (ch >= '<' && ch <= '?')
2498 { /* '<' '=' '>' '?' */ 3131 { /* '<' '=' '>' '?' */
2499 priv = ch; 3132 priv = ch;
2500 ch = cmd_getc (); 3133 ch = cmd_getc ();
2501 } 3134 }
3135
2502 /* read any numerical arguments */ 3136 /* read any numerical arguments */
2503 for (n = -1; ch < CSI_ICH; ) 3137 for (n = -1; ch < CSI_ICH; )
2504 { 3138 {
2505 if (isdigit (ch)) 3139 if (isdigit (ch))
2506 { 3140 {
… …
2513 { 3147 {
2514 if (nargs < ESC_ARGS) 3148 if (nargs < ESC_ARGS)
2515 arg[nargs++] = n; 3149 arg[nargs++] = n;
2516 n = -1; 3150 n = -1;
2517 } 3151 }
2518 else if (ch == '\b') 3152 else if (IS_CONTROL (ch))
2519 {
2520 scr_backspace ();
2521 }
2522 else if (ch == C0_ESC)
2523 {
2524 process_escape_seq ();
2525 return;
2526 }
2527 else if (ch < ' ')
2528 {
2529 process_nonprinting (ch); 3153 process_nonprinting (ch);
2530 } 3154
2531 ch = cmd_getc (); 3155 ch = cmd_getc ();
2532 } 3156 }
2533 3157
2534 if (ch > CSI_7F) 3158 if (ch > CSI_7F)
2535 return; 3159 return;
… …
2677 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3301 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2678 break; 3302 break;
2679 3303
2680 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3304 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2681 tt_write ((const unsigned char *)VT100_ANS, 3305 tt_write ((const unsigned char *)VT100_ANS,
2682 (unsigned int) (sizeof (VT100_ANS) - 1)); 3306 (unsigned int) (sizeof (VT100_ANS) - 1));
2683 break; 3307 break;
2684 3308
2685 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3309 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2686 process_sgr_mode (nargs, arg); 3310 process_sgr_mode (nargs, arg);
2687 break; 3311 break;
… …
2693 tt_printf ("\033[0n"); 3317 tt_printf ("\033[0n");
2694 break; 3318 break;
2695 case 6: /* CPR requested */ 3319 case 6: /* CPR requested */
2696 scr_report_position (); 3320 scr_report_position ();
2697 break; 3321 break;
2698#if defined (ENABLE_DISPLAY_ANSWER)
2699 case 7: /* unofficial extension */ 3322 case 7: /* unofficial extension */
3323 if (options & Opt_insecure)
2700 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3324 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2701 break; 3325 break;
2702#endif
2703 case 8: /* unofficial extension */ 3326 case 8: /* unofficial extension */
2704 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3327 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2705 break; 3328 break;
2706 } 3329 }
2707 break; 3330 break;
2708 3331
2709 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3332 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2742 break; 3365 break;
2743 3366
2744 case CSI_RM: /* 8.3.107: RESET MODE */ 3367 case CSI_RM: /* 8.3.107: RESET MODE */
2745 if (arg[0] == 4) 3368 if (arg[0] == 4)
2746 scr_insert_mode (0); 3369 scr_insert_mode (0);
3370 else if (arg[0] == 20)
3371 priv_modes &= ~PrivMode_LFNL;
2747 break; 3372 break;
2748 3373
2749 case CSI_SM: /* 8.3.126: SET MODE */ 3374 case CSI_SM: /* 8.3.126: SET MODE */
2750 if (arg[0] == 4) 3375 if (arg[0] == 4)
2751 scr_insert_mode (1); 3376 scr_insert_mode (1);
3377 else if (arg[0] == 20)
3378 priv_modes |= PrivMode_LFNL;
2752 break; 3379 break;
2753 3380
2754 /* 3381 /*
2755 * PRIVATE USE beyond this point. All CSI_7? sequences here 3382 * PRIVATE USE beyond this point. All CSI_7? sequences here
2756 */ 3383 */
… …
2768 break; 3395 break;
2769 case CSI_75: 3396 case CSI_75:
2770 scr_cursor (RESTORE); 3397 scr_cursor (RESTORE);
2771 break; 3398 break;
2772 3399
2773#ifndef NO_FRILLS 3400#if ENABLE_FRILLS
2774 case CSI_74: 3401 case CSI_74:
2775 process_window_ops (arg, nargs); 3402 process_window_ops (arg, nargs);
2776 break; 3403 break;
2777#endif 3404#endif
2778 3405
2779 case CSI_78: /* DECREQTPARM */ 3406 case CSI_78: /* DECREQTPARM */
2780 if (arg[0] == 0 || arg[0] == 1) 3407 if (arg[0] == 0 || arg[0] == 1)
2781 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);
2782 /* FALLTHROUGH */ 3409 break;
2783 3410
2784 default: 3411 default:
2785 break; 3412 break;
2786 } 3413 }
2787} 3414}
2788/*}}} */ 3415/*}}} */
2789 3416
2790#ifndef NO_FRILLS 3417#if ENABLE_FRILLS
2791/* ARGSUSED */ 3418/* ARGSUSED */
2792void 3419void
2793rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3420rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2794{ 3421{
2795 int x, y; 3422 int x, y;
2796#if 0
2797 char *s;
2798#endif
2799 XWindowAttributes wattr; 3423 XWindowAttributes wattr;
2800 Window wdummy; 3424 Window wdummy;
2801 3425
2802 if (nargs == 0) 3426 if (nargs == 0)
2803 return; 3427 return;
3428
2804 switch (args[0]) 3429 switch (args[0])
2805 { 3430 {
2806 /* 3431 /*
2807 * commands 3432 * commands
2808 */ 3433 */
2809 case 1: /* deiconify window */ 3434 case 1: /* deiconify window */
2810 XMapWindow (display->display, TermWin.parent[0]); 3435 XMapWindow (display->display, TermWin.parent[0]);
2811 break; 3436 break;
2812 case 2: /* iconify window */ 3437 case 2: /* iconify window */
2813 XIconifyWindow (display->display, TermWin.parent[0], 3438 XIconifyWindow (display->display, TermWin.parent[0],
… …
2830 break; 3455 break;
2831 case 8: /* set size (chars) */ 3456 case 8: /* set size (chars) */
2832 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3457 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2833 (unsigned int) (args[1] * TermWin.fheight)); 3458 (unsigned int) (args[1] * TermWin.fheight));
2834 break; 3459 break;
3460
3461 //case 9: NYI, TODO, restore maximized window or maximize window
2835 default: 3462 default:
2836 if (args[0] >= 24) /* set height (chars) */ 3463 if (args[0] >= 24) /* set height (chars) */
2837 set_widthheight ((unsigned int)TermWin.width, 3464 set_widthheight ((unsigned int)TermWin.width,
2838 (unsigned int) (args[1] * TermWin.fheight)); 3465 (unsigned int) (args[1] * TermWin.fheight));
2839 break; 3466 break;
3467
3468
2840 /* 3469 /*
2841 * reports - some output format copied from XTerm 3470 * reports - some output format copied from XTerm
2842 */ 3471 */
2843 case 11: /* report window state */ 3472 case 11: /* report window state */
2844 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3473 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2845 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3474 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2846 break; 3475 break;
2847 case 13: /* report window position */ 3476 case 13: /* report window position */
2848 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3477 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2849 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3478 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2850 -wattr.border_width, -wattr.border_width, 3479 -wattr.border_width, -wattr.border_width,
2851 &x, &y, &wdummy); 3480 &x, &y, &wdummy);
2852 tt_printf ("\033[3;%d;%dt", x, y); 3481 tt_printf ("\033[3;%d;%dt", x, y);
2853 break; 3482 break;
2854 case 14: /* report window size (pixels) */ 3483 case 14: /* report window size (pixels) */
2855 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3484 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2856 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3485 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2857 break; 3486 break;
2858 case 18: /* report window size (chars) */ 3487 case 18: /* report text area size (chars) */
2859 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3488 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2860 break; 3489 break;
2861#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;
2862 case 20: /* report icon label */ 3493 case 20: /* report icon label */
3494 {
3495 char *s;
2863 XGetIconName (display->display, TermWin.parent[0], &s); 3496 XGetIconName (display->display, TermWin.parent[0], &s);
2864 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 }
2865 break; 3500 break;
2866 case 21: /* report window title */ 3501 case 21: /* report window title */
3502 {
3503 char *s;
2867 XFetchName (display->display, TermWin.parent[0], &s); 3504 XFetchName (display->display, TermWin.parent[0], &s);
2868 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 }
2869 break; 3508 break;
2870#endif
2871
2872 } 3509 }
2873} 3510}
2874#endif 3511#endif
2875 3512
2876/*----------------------------------------------------------------------*/ 3513/*----------------------------------------------------------------------*/
2877/* 3514/*
2878 * get input up until STRING TERMINATOR (or BEL) 3515 * get input up until STRING TERMINATOR (or BEL)
2879 * ends_how is terminator used. returned input must be free ()d 3516 * ends_how is terminator used. returned input must be free()'d
2880 */ 3517 */
2881unsigned char * 3518unsigned char *
2882rxvt_term::get_to_st (unsigned char *ends_how) 3519rxvt_term::get_to_st (unicode_t &ends_how)
2883{ 3520{
2884 int seen_esc = 0; /* seen escape? */ 3521 unicode_t ch;
3522 bool seen_esc = false;
2885 unsigned int n = 0; 3523 unsigned int n = 0;
2886 unsigned char *s; 3524 wchar_t string[STRING_MAX];
2887 unsigned char ch, string[STRING_MAX];
2888 3525
2889 for (; (ch = cmd_getc ());) 3526 while ((ch = cmd_getc ()) != NOCHAR)
2890 { 3527 {
2891 if (ch == C0_BEL 3528 if (seen_esc)
2892 || ch == CHAR_ST 3529 {
2893 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3530 if (ch == 0x5c) /* 7bit ST */
2894 break; 3531 break;
3532 else
3533 return NULL;
3534 }
2895 if (ch == C0_ESC) 3535 else if (ch == C0_ESC)
2896 { 3536 {
2897 seen_esc = 1; 3537 seen_esc = true;
2898 continue; 3538 continue;
2899 } 3539 }
2900 else if (ch == '\t') 3540 else if (ch == C0_BEL || ch == CHAR_ST)
2901 ch = ' '; /* translate '\t' to space */ 3541 break;
2902 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3542 else if (ch < 0x20)
2903 return NULL; /* other control character - exit */ 3543 return NULL; /* other control character - exit */
3544
3545 seen_esc = false;
3546
2904 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
2905 string[n++] = ch; 3554 string[n++] = ch;
2906 seen_esc = 0;
2907 } 3555 }
3556
2908 string[n++] = '\0'; 3557 string[n++] = '\0';
2909 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3558
2910 return NULL;
2911 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3559 ends_how = (ch == 0x5c ? C0_ESC : ch);
2912 STRNCPY (s, string, n); 3560
2913 return s; 3561 return (unsigned char *)rxvt_wcstombs (string);
2914} 3562}
2915 3563
2916/*----------------------------------------------------------------------*/ 3564/*----------------------------------------------------------------------*/
2917/* 3565/*
2918 * 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)'
2919 */ 3567 */
2920void 3568void
2921rxvt_term::process_dcs_seq () 3569rxvt_term::process_dcs_seq ()
2922{ 3570{
2923 unsigned char eh, *s; 3571 unsigned char *s;
3572 unicode_t eh;
3573
2924 /* 3574 /*
2925 * Not handled yet 3575 * Not handled yet
2926 */ 3576 */
2927 s = get_to_st (&eh); 3577 s = get_to_st (eh);
2928 if (s) 3578 if (s)
2929 free (s); 3579 free (s);
3580
2930 return; 3581 return;
2931} 3582}
2932 3583
2933/*----------------------------------------------------------------------*/ 3584/*----------------------------------------------------------------------*/
2934/* 3585/*
2935 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3586 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2936 */ 3587 */
2937void 3588void
2938rxvt_term::process_osc_seq () 3589rxvt_term::process_osc_seq ()
2939{ 3590{
2940 unsigned char ch, eh, *s; 3591 unicode_t ch, eh;
2941 int arg; 3592 int arg;
2942 3593
2943 ch = cmd_getc (); 3594 ch = cmd_getc ();
2944 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3595 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2945 arg = arg * 10 + (ch - '0'); 3596 arg = arg * 10 + (ch - '0');
2946 3597
2947 if (ch == ';') 3598 if (ch == ';')
2948 { 3599 {
2949 s = get_to_st (&eh); 3600 unsigned char *s = get_to_st (eh);
3601
2950 if (s) 3602 if (s)
2951 { 3603 {
2952 /*
2953 * rxvt_menubar_dispatch () violates the constness of the string,
2954 * so do it here
2955 */
2956 if (arg == XTerm_Menu)
2957#if 0 /* XXX: currently disabled due to security concerns */
2958 menubar_dispatch ((char *)s);
2959#else
2960 (void)0;
2961#endif
2962 else
2963 xterm_seq (arg, (char *)s, eh); 3604 process_xterm_seq (arg, (char *)s, eh);
2964 free (s); 3605 free (s);
2965 } 3606 }
2966 } 3607 }
2967} 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
2968/* 3623/*
2969 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3624 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2970 * 0 = change iconName/title 3625 * 0 = change iconName/title
2971 * 1 = change iconName 3626 * 1 = change iconName
2972 * 2 = change title 3627 * 2 = change title
2973 * 4 = change color 3628 * 4 = change color
3629 * 10 = change fg color
3630 * 11 = change bg color
2974 * 12 = change text color 3631 * 12 = change text color
2975 * 13 = change mouse foreground color 3632 * 13 = change mouse foreground color
2976 * 17 = change highlight character colour 3633 * 17 = change highlight character colour
2977 * 18 = change bold character color 3634 * 18 = change bold character color
2978 * 19 = change underlined character color 3635 * 19 = change underlined character color
2979 * 46 = change logfile (not implemented) 3636 * 46 = change logfile (not implemented)
2980 * 50 = change font 3637 * 50 = change font
2981 * 3638 *
2982 * rxvt extensions: 3639 * rxvt extensions:
2983 * 9 = change locale (NYI)
2984 * 10 = menu (may change in future)
2985 * 20 = bg pixmap 3640 * 20 = bg pixmap
2986 * 39 = change default fg color 3641 * 39 = change default fg color
2987 * 49 = change default bg color 3642 * 49 = change default bg color
2988 * 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
2989 */ 3647 */
2990void 3648void
2991rxvt_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)
2992{ 3650{
2993 int changed = 0; 3651 int changed = 0;
2994 int color; 3652 int color;
2995 char *buf, *name; 3653 char *buf, *name;
3654 bool query = str[0] == '?' && !str[1];
3655 int saveop = op;
2996 3656
2997 assert (str != NULL); 3657 assert (str != NULL);
2998 switch (op) 3658 switch (op)
2999 { 3659 {
3000 case XTerm_name: 3660 case XTerm_name:
3001 set_title (str); 3661 set_title (str);
3002 /* FALLTHROUGH */ 3662 /* FALLTHROUGH */
3003 case XTerm_iconName: 3663 case XTerm_iconName:
3004 set_iconName (str); 3664 set_icon_name (str);
3005 break; 3665 break;
3006 case XTerm_title: 3666 case XTerm_title:
3007 set_title (str); 3667 set_title (str);
3008 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
3009 case XTerm_Color: 3708 case XTerm_Color:
3010 for (buf = (char *)str; buf && *buf;) 3709 for (buf = (char *)str; buf && *buf;)
3011 { 3710 {
3012 if ((name = STRCHR (buf, ';')) == NULL) 3711 if ((name = strchr (buf, ';')) == NULL)
3013 break; 3712 break;
3713
3014 *name++ = '\0'; 3714 *name++ = '\0';
3015 color = atoi (buf); 3715 color = atoi (buf);
3716
3016 if (color < 0 || color >= TOTAL_COLORS) 3717 if (color < 0 || color >= TOTAL_COLORS)
3017 break; 3718 break;
3719
3018 if ((buf = STRCHR (name, ';')) != NULL) 3720 if ((buf = strchr (name, ';')) != NULL)
3019 *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
3020 set_window_color (color + minCOLOR, name); 3730 set_window_color (color + minCOLOR, name);
3021 } 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);
3022 break; 3738 break;
3023#ifndef NO_CURSORCOLOR 3739#ifndef NO_CURSORCOLOR
3024 case XTerm_Color_cursor: 3740 case XTerm_Color_cursor:
3025 set_window_color (Color_cursor, str); 3741 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3026 break; 3742 break;
3027#endif 3743#endif
3028 case XTerm_Color_pointer: 3744 case XTerm_Color_pointer_fg:
3029 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);
3030 break; 3749 break;
3031#ifndef NO_BOLD_UNDERLINE_REVERSE 3750#ifndef NO_BOLD_UNDERLINE_REVERSE
3032 case XTerm_Color_BD: 3751 case XTerm_Color_BD:
3033 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);
3034 break; 3756 break;
3035 case XTerm_Color_UL: 3757 case XTerm_Color_UL:
3036 set_window_color (Color_UL, str); 3758 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3037 break; 3759 break;
3038 case XTerm_Color_RV: 3760 case XTerm_Color_RV:
3039 set_window_color (Color_RV, str); 3761 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3040 break; 3762 break;
3041#endif 3763#endif
3042 3764#if TRANSPARENT && TINTING
3043 case XTerm_Menu: 3765 case XTerm_Color_tint:
3044 /* 3766 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3045 * rxvt_menubar_dispatch () violates the constness of the string, 3767 check_our_parents ();
3046 * so DON'T do it here 3768 if (am_transparent)
3047 */ 3769 want_full_refresh = want_refresh = 1;
3048 break; 3770 break;
3771#endif
3772
3049 case XTerm_Pixmap: 3773 case XTerm_Pixmap:
3050 if (*str != ';') 3774 if (*str != ';')
3051 { 3775 {
3052#if XPM_BACKGROUND 3776#if XPM_BACKGROUND
3053 scale_pixmap (""); /* reset to default scaling */ 3777 scale_pixmap (""); /* reset to default scaling */
3054 set_bgPixmap (str); /* change pixmap */ 3778 set_bgPixmap (str); /* change pixmap */
3055#endif 3779#endif
3056 scr_touch (true); 3780 scr_touch (true);
3057 } 3781 }
3058 while ((str = STRCHR (str, ';')) != NULL) 3782 while ((str = strchr (str, ';')) != NULL)
3059 { 3783 {
3060 str++; 3784 str++;
3061#if XPM_BACKGROUND 3785#if XPM_BACKGROUND
3062 changed += scale_pixmap (str); 3786 changed += scale_pixmap (str);
3063#endif 3787#endif
… …
3076 set_window_color (Color_fg, str); 3800 set_window_color (Color_fg, str);
3077 break; 3801 break;
3078 case XTerm_restoreBG: 3802 case XTerm_restoreBG:
3079 set_window_color (Color_bg, str); 3803 set_window_color (Color_bg, str);
3080 break; 3804 break;
3805
3081 case XTerm_logfile: 3806 case XTerm_logfile:
3807 // TODO, when secure mode?
3082 break; 3808 break;
3809
3083 case XTerm_font: 3810 case XTerm_font:
3084 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 }
3085 break; 3831 break;
3832
3833#if ENABLE_FRILLS
3086 case XTerm_locale: 3834 case XTerm_locale:
3087 if (str[0] == '?' && !str[1]) 3835 if (query)
3088 tt_printf ("%-.250s\n", locale); 3836 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3089 else 3837 else
3090 { 3838 {
3091 set_locale (str); 3839 set_locale (str);
3840# ifdef USE_XIM
3092 im_cb (); 3841 im_cb ();
3842# endif
3093 } 3843 }
3094 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
3095#if 0 3853#if 0
3096 case XTerm_dumpscreen: /* no error notices */ 3854 case XTerm_dumpscreen: /* no error notices */
3097 { 3855 {
3098 int fd; 3856 int fd;
3099 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)
3100 { 3858 {
3101 scr_dump (fd); 3859 scr_dump (fd);
3102 close (fd); 3860 close (fd);
3103 } 3861 }
3104 } 3862 }
3105 break; 3863 break;
3106#endif 3864#endif
3107
3108 } 3865 }
3109} 3866}
3110/*----------------------------------------------------------------------*/ 3867/*----------------------------------------------------------------------*/
3111 3868
3112/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3869/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3120 * so no need for fancy checking 3877 * so no need for fancy checking
3121 */ 3878 */
3122int 3879int
3123rxvt_term::privcases (int mode, unsigned long bit) 3880rxvt_term::privcases (int mode, unsigned long bit)
3124{ 3881{
3125 int state; 3882 int state;
3126 3883
3127 if (mode == 's') 3884 if (mode == 's')
3128 { 3885 {
3129 SavedModes |= (PrivateModes & bit); 3886 SavedModes |= (priv_modes & bit);
3130 return -1; 3887 return -1;
3131 } 3888 }
3132 else 3889 else
3133 { 3890 {
3134 if (mode == 'r') 3891 if (mode == 'r')
3135 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3892 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3136 else 3893 else
3137 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3894 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3138 PrivMode (state, bit); 3895 PrivMode (state, bit);
3139 } 3896 }
3897
3140 return state; 3898 return state;
3141} 3899}
3142 3900
3143/* we're not using priv _yet_ */ 3901/* we're not using priv _yet_ */
3144void 3902void
3145rxvt_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)
3146{ 3904{
3147 unsigned int i, j; 3905 unsigned int i, j;
3148 int state; 3906 int state;
3907
3149 static const struct 3908 static const struct
3150 { 3909 {
3151 const int argval; 3910 const int argval;
3152 const unsigned long bit; 3911 const unsigned long bit;
3153 } 3912 }
3913
3154 argtopriv[] = { 3914 argtopriv[] = {
3155 { 1, PrivMode_aplCUR }, 3915 { 1, PrivMode_aplCUR },
3156 { 2, PrivMode_vt52 }, 3916 { 2, PrivMode_vt52 },
3157 { 3, PrivMode_132 }, 3917 { 3, PrivMode_132 },
3158 { 4, PrivMode_smoothScroll }, 3918 { 4, PrivMode_smoothScroll },
3159 { 5, PrivMode_rVideo }, 3919 { 5, PrivMode_rVideo },
3160 { 6, PrivMode_relOrigin }, 3920 { 6, PrivMode_relOrigin },
3161 { 7, PrivMode_Autowrap }, 3921 { 7, PrivMode_Autowrap },
3922 // 8, bi-directional support mode
3162 { 9, PrivMode_MouseX10 }, 3923 { 9, PrivMode_MouseX10 },
3163#ifdef menuBar_esc 3924#ifdef menuBar_esc
3164 { menuBar_esc, PrivMode_menuBar }, 3925 { menuBar_esc, PrivMode_menuBar },
3165#endif 3926#endif
3927 // 18, 19 printing-related
3928 { 25, PrivMode_VisibleCursor },
3166#ifdef scrollBar_esc 3929#ifdef scrollBar_esc
3167 { scrollBar_esc, PrivMode_scrollBar }, 3930 { scrollBar_esc, PrivMode_scrollBar },
3168#endif 3931#endif
3169 { 25, PrivMode_VisibleCursor },
3170 { 35, PrivMode_ShiftKeys }, 3932 { 35, PrivMode_ShiftKeys }, // rxvt extension
3171 { 40, PrivMode_132OK }, 3933 { 40, PrivMode_132OK },
3934 // 41 xterm more fixes NYI
3935 // 45 margin bell NYI
3936 // 46 start logging
3172 { 47, PrivMode_Screen }, 3937 { 47, PrivMode_Screen },
3173 { 66, PrivMode_aplKP }, 3938 { 66, PrivMode_aplKP },
3174#ifndef NO_BACKSPACE_KEY 3939#ifndef NO_BACKSPACE_KEY
3175 { 67, PrivMode_BackSpace }, 3940 { 67, PrivMode_BackSpace },
3176#endif 3941#endif
3177 { 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
3178 { 1010, PrivMode_TtyOutputInh }, 3946 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3179 { 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
3180 { 1047, PrivMode_Screen }, 3951 { 1047, PrivMode_Screen },
3952 // 1048 save and restore cursor
3181 { 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
3182 }; 3955 };
3183 3956
3184 if (nargs == 0) 3957 if (nargs == 0)
3185 return; 3958 return;
3186 3959
… …
3201 state = privcases (mode, argtopriv[j].bit); 3974 state = privcases (mode, argtopriv[j].bit);
3202 break; 3975 break;
3203 } 3976 }
3204 3977
3205 /* extra handling for values with state unkept */ 3978 /* extra handling for values with state unkept */
3206 if (state == -1)
3207 switch (arg[i]) 3979 switch (arg[i])
3208 { 3980 {
3209 case 1048: /* alternative cursor save */ 3981 case 1048: /* alternative cursor save */
3982 case 1049:
3983 if (options & Opt_secondaryScreen)
3210 if (mode == 0) 3984 if (mode == 0)
3211 scr_cursor (RESTORE); 3985 scr_cursor (RESTORE);
3212 else if (mode == 1) 3986 else if (mode == 1)
3213 scr_cursor (SAVE); 3987 scr_cursor (SAVE);
3214 /* FALLTHROUGH */
3215 default:
3216 continue; /* for (;i;) */
3217 }
3218
3219 /* extra handling for values with valid 0 or 1 state */
3220 switch (arg[i])
3221 {
3222 /* case 1: - application cursor keys */
3223 case 2: /* VT52 mode */
3224 /* oddball mode. should be set regardless of set/reset
3225 * parameter. Return from VT52 mode with an ESC < from
3226 * within VT52 mode
3227 */
3228 PrivMode (1, PrivMode_vt52);
3229 break; 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;
3230 case 3: /* 80/132 */ 4003 case 3: /* 80/132 */
3231 if (PrivateModes & PrivMode_132OK) 4004 if (priv_modes & PrivMode_132OK)
3232 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4005 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3233 (unsigned int)TermWin.height);
3234 break; 4006 break;
3235 case 4: /* smooth scrolling */ 4007 case 4: /* smooth scrolling */
3236 if (state) 4008 if (state)
3237 Options &= ~Opt_jumpScroll; 4009 options &= ~Opt_jumpScroll;
3238 else 4010 else
3239 Options |= Opt_jumpScroll; 4011 options |= Opt_jumpScroll;
3240 break; 4012 break;
3241 case 5: /* reverse video */ 4013 case 5: /* reverse video */
3242 scr_rvideo_mode (state); 4014 scr_rvideo_mode (state);
3243 break; 4015 break;
3244 case 6: /* relative/absolute origins */ 4016 case 6: /* relative/absolute origins */
3245 scr_relative_origin (state); 4017 scr_relative_origin (state);
3246 break; 4018 break;
3247 case 7: /* autowrap */ 4019 case 7: /* autowrap */
3248 scr_autowrap (state); 4020 scr_autowrap (state);
3249 break; 4021 break;
3250 /* 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 */
3251 case 9: /* X10 mouse reporting */ 4023 case 9: /* X10 mouse reporting */
3252 if (state) /* orthogonal */ 4024 if (state) /* orthogonal */
3253 PrivateModes &= ~ (PrivMode_MouseX11); 4025 priv_modes &= ~PrivMode_MouseX11;
3254 break; 4026 break;
3255#ifdef menuBar_esc 4027#ifdef menuBar_esc
3256 case menuBar_esc: 4028 case menuBar_esc:
3257#ifdef MENUBAR 4029#ifdef MENUBAR
3258 map_menuBar (state); 4030 map_menuBar (state);
3259#endif 4031#endif
3260 break; 4032 break;
3261#endif 4033#endif
3262#ifdef scrollBar_esc 4034#ifdef scrollBar_esc
3263 case scrollBar_esc: 4035 case scrollBar_esc:
3264 if (scrollbar_mapping (state)) 4036 if (scrollbar_mapping (state))
3265 { 4037 {
3266 resize_all_windows (0, 0, 0); 4038 resize_all_windows (0, 0, 0);
3267 scr_touch (true); 4039 scr_touch (true);
3268 } 4040 }
3269 break; 4041 break;
3270#endif 4042#endif
3271 case 25: /* visible/invisible cursor */ 4043 case 25: /* visible/invisible cursor */
3272 scr_cursor_visible (state); 4044 scr_cursor_visible (state);
3273 break; 4045 break;
3274 /* case 35: - shift keys */ 4046 /* case 35: - shift keys */
3275 /* case 40: - 80 <--> 132 mode */ 4047 /* case 40: - 80 <--> 132 mode */
3276 case 47: /* secondary screen */ 4048 case 47: /* secondary screen */
3277 scr_change_screen (state); 4049 scr_change_screen (state);
3278 break; 4050 break;
3279 /* case 66: - application key pad */ 4051 /* case 66: - application key pad */
3280 /* case 67: - backspace key */ 4052 /* case 67: - backspace key */
3281 case 1000: /* X11 mouse reporting */ 4053 case 1000: /* X11 mouse reporting */
3282 if (state) /* orthogonal */ 4054 if (state) /* orthogonal */
3283 PrivateModes &= ~ (PrivMode_MouseX10); 4055 priv_modes &= ~PrivMode_MouseX10;
3284 break; 4056 break;
3285#if 0 4057#if 0
3286 case 1001: 4058 case 1001:
3287 break; /* X11 mouse highlighting */ 4059 break; /* X11 mouse highlighting */
3288#endif 4060#endif
3289 case 1010: /* scroll to bottom on TTY output inhibit */ 4061 case 1010: /* scroll to bottom on TTY output inhibit */
3290 if (state) 4062 if (state)
3291 Options &= ~Opt_scrollTtyOutput; 4063 options &= ~Opt_scrollTtyOutput;
3292 else 4064 else
3293 Options |= Opt_scrollTtyOutput; 4065 options |= Opt_scrollTtyOutput;
3294 break; 4066 break;
3295 case 1011: /* scroll to bottom on key press */ 4067 case 1011: /* scroll to bottom on key press */
3296 if (state) 4068 if (state)
3297 Options |= Opt_scrollTtyKeypress; 4069 options |= Opt_scrollTtyKeypress;
3298 else 4070 else
3299 Options &= ~Opt_scrollTtyKeypress; 4071 options &= ~Opt_scrollTtyKeypress;
3300 break; 4072 break;
3301 case 1047: /* secondary screen w/ clearing */ 4073 case 1047: /* secondary screen w/ clearing last */
3302 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4074 if (options & Opt_secondaryScreen)
3303 if (current_screen != PRIMARY) 4075 if (current_screen != PRIMARY)
3304 scr_erase_screen (2); 4076 scr_erase_screen (2);
3305 scr_change_screen (state); 4077 scr_change_screen (state);
3306 /* FALLTHROUGH */
3307 default:
3308 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;
3309 } 4087 }
3310 } 4088 }
3311} 4089}
3312/*}}} */ 4090/*}}} */
3313 4091
3314/*{{{ process sgr sequences */ 4092/*{{{ process sgr sequences */
3315void 4093void
3316rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4094rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3317{ 4095{
3318 unsigned int i; 4096 unsigned int i;
3319 short rendset; 4097 short rendset;
3320 int rendstyle; 4098 int rendstyle;
3321 4099
3322 if (nargs == 0) 4100 if (nargs == 0)
3323 { 4101 {
3324 scr_rendition (0, ~RS_None); 4102 scr_rendition (0, ~RS_None);
3325 return; 4103 return;
3326 } 4104 }
4105
3327 for (i = 0; i < nargs; i++) 4106 for (i = 0; i < nargs; i++)
3328 { 4107 {
3329 rendset = -1; 4108 rendset = -1;
3330 switch (arg[i]) 4109 switch (arg[i])
3331 { 4110 {
… …
3333 rendset = 0, rendstyle = ~RS_None; 4112 rendset = 0, rendstyle = ~RS_None;
3334 break; 4113 break;
3335 case 1: 4114 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 4115 rendset = 1, rendstyle = RS_Bold;
3337 break; 4116 break;
4117 //case 2: // low intensity
4118 case 3:
4119 rendset = 1, rendstyle = RS_Italic;
4120 break;
3338 case 4: 4121 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 4122 rendset = 1, rendstyle = RS_Uline;
3340 break; 4123 break;
3341 case 5: 4124 case 5: // slowly blinking
4125 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 4126 rendset = 1, rendstyle = RS_Blink;
3343 break; 4127 break;
4128 //case 6: // scoansi light background
3344 case 7: 4129 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 4130 rendset = 1, rendstyle = RS_RVid;
3346 break; 4131 break;
3347 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)
3348 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;
3349 break; 4150 break;
3350 case 24: 4151 case 24:
3351 rendset = 0, rendstyle = RS_Uline; 4152 rendset = 0, rendstyle = RS_Uline;
3352 break; 4153 break;
3353 case 25: 4154 case 25:
3354 rendset = 0, rendstyle = RS_Blink; 4155 rendset = 0, rendstyle = RS_Blink;
3355 break; 4156 break;
4157 case 26: // variable spacing (iso 8613)
4158 rendset = 0, rendstyle = RS_Blink;
4159 break;
3356 case 27: 4160 case 27:
3357 rendset = 0, rendstyle = RS_RVid; 4161 rendset = 0, rendstyle = RS_RVid;
3358 break; 4162 break;
4163 //case 28: // visible. NYI
4164 //case 29: // not crossed-out
3359 } 4165 }
4166
3360 if (rendset != -1) 4167 if (rendset != -1)
3361 { 4168 {
3362 scr_rendition (rendset, rendstyle); 4169 scr_rendition (rendset, rendstyle);
3363 continue; /* for (;i;) */ 4170 continue; /* for (;i;) */
3364 } 4171 }
… …
3371 case 33: 4178 case 33:
3372 case 34: 4179 case 34:
3373 case 35: 4180 case 35:
3374 case 36: 4181 case 36:
3375 case 37: 4182 case 37:
3376 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4183 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3377 Color_fg);
3378 break; 4184 break;
3379#ifdef TTY_256COLOR 4185 case 38: // set fg color, ISO 8613-6
3380 case 38:
3381 if (nargs > i + 2 && arg[i + 1] == 5) 4186 if (nargs > i + 2 && arg[i + 1] == 5)
3382 { 4187 {
3383 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4188 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3384 Color_fg);
3385 i += 2; 4189 i += 2;
3386 } 4190 }
3387 break; 4191 break;
3388#endif
3389 case 39: /* default fg */ 4192 case 39: /* default fg */
3390 scr_color (Color_fg, Color_fg); 4193 scr_color (Color_fg, Color_fg);
3391 break; 4194 break;
3392 4195
3393 case 40: 4196 case 40:
… …
3396 case 43: 4199 case 43:
3397 case 44: 4200 case 44:
3398 case 45: 4201 case 45:
3399 case 46: 4202 case 46:
3400 case 47: 4203 case 47:
3401 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4204 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3402 Color_bg);
3403 break; 4205 break;
3404#ifdef TTY_256COLOR 4206 case 48: // set bg color, ISO 8613-6
3405 case 48:
3406 if (nargs > i + 2 && arg[i + 1] == 5) 4207 if (nargs > i + 2 && arg[i + 1] == 5)
3407 { 4208 {
3408 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4209 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3409 Color_bg);
3410 i += 2; 4210 i += 2;
3411 } 4211 }
3412 break; 4212 break;
3413#endif
3414 case 49: /* default bg */ 4213 case 49: /* default bg */
3415 scr_color (Color_bg, Color_bg); 4214 scr_color (Color_bg, Color_bg);
3416 break; 4215 break;
4216
4217 //case 50: // not variable spacing
3417 4218
3418#ifndef NO_BRIGHTCOLOR 4219#ifndef NO_BRIGHTCOLOR
3419 case 90: 4220 case 90:
3420 case 91: /* set bright fg color */ 4221 case 91: /* set bright fg color */
3421 case 92: 4222 case 92:
3422 case 93: 4223 case 93:
3423 case 94: 4224 case 94:
3424 case 95: 4225 case 95:
3425 case 96: 4226 case 96:
3426 case 97: 4227 case 97:
3427 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4228 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3428 Color_fg);
3429 break; 4229 break;
3430 case 100: 4230 case 100:
3431 case 101: /* set bright bg color */ 4231 case 101: /* set bright bg color */
3432 case 102: 4232 case 102:
3433 case 103: 4233 case 103:
3434 case 104: 4234 case 104:
3435 case 105: 4235 case 105:
3436 case 106: 4236 case 106:
3437 case 107: 4237 case 107:
3438 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4238 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3439 Color_bg);
3440 break; 4239 break;
3441#endif 4240#endif
3442 4241
3443 } 4242 }
3444 } 4243 }
3445} 4244}
3446/*}}} */ 4245/*}}} */
3447 4246
3448/*{{{ process Rob Nation's own graphics mode sequences */ 4247/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3449void 4248void
3450rxvt_term::process_graphics () 4249rxvt_term::process_graphics ()
3451{ 4250{
3452 unsigned char ch, cmd = cmd_getc (); 4251 unicode_t ch, cmd = cmd_getc ();
3453 4252
3454 if (cmd == 'Q') 4253 if (cmd == 'Q')
3455 { /* query graphics */ 4254 { /* query graphics */
3456 tt_printf ("\033G0\n"); /* no graphics */ 4255 tt_printf ("\033G0\012"); /* no graphics */
3457 return; 4256 return;
3458 } 4257 }
3459 /* swallow other graphics sequences until terminating ':' */ 4258 /* swallow other graphics sequences until terminating ':' */
3460 do 4259 do
3461 ch = cmd_getc (); 4260 ch = cmd_getc ();
… …
3476 unsigned char buf[256]; 4275 unsigned char buf[256];
3477 4276
3478 va_start (arg_ptr, fmt); 4277 va_start (arg_ptr, fmt);
3479 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4278 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3480 va_end (arg_ptr); 4279 va_end (arg_ptr);
3481 tt_write (buf, STRLEN (buf)); 4280 tt_write (buf, strlen (buf));
3482} 4281}
3483 4282
3484/* ---------------------------------------------------------------------- */ 4283/* ---------------------------------------------------------------------- */
3485/* 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,
3486 * or generated by us in response to a query ESC sequence. 4285 * or generated by us in response to a query ESC sequence.
3487 */ 4286 */
3488void 4287void
3489rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4288rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3490{ 4289{
3491 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4290 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3492 4291
3493 if (len) 4292 if (len)
3494 { 4293 {
3495 if (v_buflen == 0) 4294 if (v_buflen == 0)
3496 { 4295 {
3497 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));
3498 4297
3499 if ((unsigned int)written == len) 4298 if ((unsigned int)written == len)
3500 return; 4299 return;
3501 4300
3502 data += written; 4301 data += written;
… …
3510 v_buflen += len; 4309 v_buflen += len;
3511 } 4310 }
3512 4311
3513 for (;;) 4312 for (;;)
3514 { 4313 {
3515 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));
3516 4315
3517 if (written > 0) 4316 if (written > 0)
3518 { 4317 {
3519 v_buflen -= written; 4318 v_buflen -= written;
3520 4319

Diff Legend

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