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.34 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.58 by pcg, Wed Feb 25 15:06:03 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.34 2004/01/31 00:20:21 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * 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>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
26 * - extensive modifications 25 * - extensive modifications
27 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
28 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
29 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
30 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
54 54
55/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
56 56
57/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
58void 58void
59rxvt_term::lookup_key (XKeyEvent *ev) 59rxvt_term::lookup_key (XKeyEvent &ev)
60{ 60{
61 int ctrl, meta, shft, len; 61 int ctrl, meta, shft, len;
62 unsigned int newlen; 62 unsigned int newlen;
63 KeySym keysym; 63 KeySym keysym;
64#ifdef DEBUG_CMD 64#ifdef DEBUG_CMD
65 static int debug_key = 1; /* accessible by a debugger only */ 65 static int debug_key = 1; /* accessible by a debugger only */
66#endif 66#endif
67 int valid_keysym; 67 int valid_keysym;
68 unsigned char kbuf[KBUFSZ]; 68 unsigned char kbuf[KBUFSZ];
69 69
70/* 70 /*
71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
72 * escape sequence to toggle the Keypad. 72 * escape sequence to toggle the Keypad.
73 * 73 *
74 * Always permit `shift' to override the current setting 74 * Always permit `shift' to override the current setting
75 */ 75 */
76 shft = (ev->state & ShiftMask); 76 shft = (ev.state & ShiftMask);
77 ctrl = (ev->state & ControlMask); 77 ctrl = (ev.state & ControlMask);
78 meta = (ev->state & ModMetaMask); 78 meta = (ev.state & ModMetaMask);
79 79
80 if (numlock_state || (ev->state & ModNumLockMask)) 80 if (numlock_state || (ev.state & ModNumLockMask))
81 { 81 {
82 numlock_state = (ev->state & ModNumLockMask); 82 numlock_state = (ev.state & ModNumLockMask);
83 PrivMode((!numlock_state), PrivMode_aplKP); 83 PrivMode ((!numlock_state), PrivMode_aplKP);
84 } 84 }
85 85
86 kbuf[0] = 0; 86 kbuf[0] = 0;
87 87
88#ifdef USE_XIM 88#ifdef USE_XIM
89 if (Input_Context) 89 if (Input_Context)
90 { 90 {
91 Status status_return; 91 Status status_return;
92 92
93#ifdef X_HAVE_UTF8_STRING 93#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) 94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
95 len = Xutf8LookupString (Input_Context, ev, (char *)kbuf, 95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
96 KBUFSZ, &keysym, &status_return); 96 KBUFSZ, &keysym, &status_return);
97 else 97 else
98#endif 98#endif
99 { 99 {
100 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
101 101
102 // the XOpenIM manpage lies about hardcoding the locale 102 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 103 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale]) 104 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]); 105 SET_LOCALE (rs[Rs_imLocale]);
106 // assume wchar_t == unicode or better 106 // assume wchar_t == unicode or better
107 len = XwcLookupString (Input_Context, ev, wkbuf, 107 len = XwcLookupString (Input_Context, &ev, wkbuf,
108 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
109 if (rs[Rs_imLocale]) 109 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 110 SET_LOCALE (locale);
111 111
112 if (status_return == XLookupChars 112 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
114 {
115 /* make sure the user can type ctrl-@, i.e. NUL */
116 if (len == 1 && *wkbuf == 0)
114 { 117 {
118 kbuf[0] = 0;
119 len = 1;
120 }
121 else
122 {
115 wkbuf[len] = 0; 123 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 124 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 125 if (len < 0)
118 len = 0; 126 len = 0;
119 } 127 }
128 }
120 else 129 else
121 len = 0; 130 len = 0;
122 } 131 }
123 132
124 valid_keysym = status_return == XLookupKeySym 133 valid_keysym = status_return == XLookupKeySym
125 || status_return == XLookupBoth; 134 || status_return == XLookupBoth;
126 } 135 }
127 else 136 else
128#endif 137#endif
129 { 138 {
130 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 139 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
131 valid_keysym = !len; 140 valid_keysym = keysym != NoSymbol;
132 } 141 }
133 142
134 if (valid_keysym) 143 if (valid_keysym)
135 { 144 {
136/* for some backwards compatibility */ 145 /* for some backwards compatibility */
137#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 146#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
138# ifdef HOTKEY_CTRL 147# ifdef HOTKEY_CTRL
139 if (ctrl) 148 if (ctrl)
140# else 149# else
141 if (meta) 150 if (meta)
142# endif 151# endif
143 { 152 {
144 if (keysym == ks_bigfont) 153 if (keysym == ks_bigfont)
145 { 154 {
146 change_font (0, FONT_UP); 155 change_font (FONT_UP);
147 return; 156 return;
148 } 157 }
149 else if (keysym == ks_smallfont) 158 else if (keysym == ks_smallfont)
150 { 159 {
151 change_font (0, FONT_DN); 160 change_font (FONT_DN);
152 return; 161 return;
162 }
153 } 163 }
154 }
155#endif 164#endif
156 165
157 if (TermWin.saveLines) { 166 if (TermWin.saveLines)
167 {
158#ifdef UNSHIFTED_SCROLLKEYS 168#ifdef UNSHIFTED_SCROLLKEYS
159 if (!ctrl && !meta) { 169 if (!ctrl && !meta)
170 {
160#else 171#else
161 if (IS_SCROLL_MOD) { 172 if (IS_SCROLL_MOD)
173 {
162#endif 174#endif
163 int lnsppg; 175 int lnsppg;
164 176
165#ifdef PAGING_CONTEXT_LINES 177#ifdef PAGING_CONTEXT_LINES
166 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 178 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
167#else 179#else
168 lnsppg = TermWin.nrow * 4 / 5; 180 lnsppg = TermWin.nrow * 4 / 5;
169#endif 181#endif
170 if (keysym == XK_Prior) { 182 if (keysym == XK_Prior)
183 {
171 scr_page (UP, lnsppg); 184 scr_page (UP, lnsppg);
172 return; 185 return;
186 }
173 } else if (keysym == XK_Next) { 187 else if (keysym == XK_Next)
188 {
174 scr_page (DN, lnsppg); 189 scr_page (DN, lnsppg);
175 return; 190 return;
176 } 191 }
177 } 192 }
178#ifdef SCROLL_ON_UPDOWN_KEYS 193#ifdef SCROLL_ON_UPDOWN_KEYS
179 if (IS_SCROLL_MOD) { 194 if (IS_SCROLL_MOD)
180 if (keysym == XK_Up) { 195 {
181 scr_page (UP, 1); 196 if (keysym == XK_Up)
182 return; 197 {
198 scr_page (UP, 1);
199 return;
200 }
183 } else if (keysym == XK_Down) { 201 else if (keysym == XK_Down)
184 scr_page (DN, 1); 202 {
185 return; 203 scr_page (DN, 1);
186 } 204 return;
187 } 205 }
206 }
188#endif 207#endif
189#ifdef SCROLL_ON_HOMEEND_KEYS 208#ifdef SCROLL_ON_HOMEEND_KEYS
190 if (IS_SCROLL_MOD) { 209 if (IS_SCROLL_MOD)
191 if (keysym == XK_Home) { 210 {
192 scr_move_to (0, 1); 211 if (keysym == XK_Home)
193 return; 212 {
213 scr_move_to (0, 1);
214 return;
215 }
194 } else if (keysym == XK_End) { 216 else if (keysym == XK_End)
195 scr_move_to (1, 0); 217 {
196 return; 218 scr_move_to (1, 0);
197 } 219 return;
198 } 220 }
221 }
199#endif 222#endif
200 } 223 }
201 224
202 if (shft) { 225 if (shft)
226 {
203 /* Shift + F1 - F10 generates F11 - F20 */ 227 /* Shift + F1 - F10 generates F11 - F20 */
204 if (keysym >= XK_F1 && keysym <= XK_F10) { 228 if (keysym >= XK_F1 && keysym <= XK_F10)
229 {
205 keysym += (XK_F11 - XK_F1); 230 keysym += (XK_F11 - XK_F1);
206 shft = 0; /* turn off Shift */ 231 shft = 0; /* turn off Shift */
232 }
207 } else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) { 233 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys))
208 switch (keysym) { 234 {
209 /* normal XTerm key bindings */ 235 switch (keysym)
236 {
237 /* normal XTerm key bindings */
210 case XK_Insert: /* Shift+Insert = paste mouse selection */ 238 case XK_Insert: /* Shift+Insert = paste mouse selection */
211 selection_request (ev->time, 0, 0); 239 selection_request (ev.time, 0, 0);
212 return; 240 return;
213 /* rxvt extras */ 241 /* rxvt extras */
214 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 242 case XK_KP_Add: /* Shift+KP_Add = bigger font */
215 change_font (0, FONT_UP); 243 change_font (FONT_UP);
216 return; 244 return;
217 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 245 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
218 change_font (0, FONT_DN); 246 change_font (FONT_DN);
219 return; 247 return;
220 } 248 }
221 } 249 }
222 } 250 }
223#ifdef PRINTPIPE 251#ifdef PRINTPIPE
224 if (keysym == XK_Print) { 252 if (keysym == XK_Print)
253 {
225 scr_printscreen (ctrl | shft); 254 scr_printscreen (ctrl | shft);
226 return; 255 return;
227 } 256 }
228#endif 257#endif
229#ifdef GREEK_SUPPORT
230 if (keysym == ks_greekmodeswith) {
231 greek_mode = !greek_mode;
232 if (greek_mode) {
233 xterm_seq (XTerm_title,
234 (greek_getmode() == GREEK_ELOT928
235 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
236 greek_reset();
237 } else
238 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
239 return;
240 }
241#endif
242 258
243 if (keysym >= 0xFF00 && keysym <= 0xFFFF) { 259 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
260 {
244#ifdef KEYSYM_RESOURCE 261#ifdef KEYSYM_RESOURCE
245 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) { 262 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
246 unsigned int l; 263 {
264 unsigned int l;
247 const unsigned char *kbuf0; 265 const unsigned char *kbuf0;
248 const unsigned char ch = C0_ESC; 266 const unsigned char ch = C0_ESC;
249 267
250 kbuf0 = (Keysym_map[keysym & 0xFF]); 268 kbuf0 = (Keysym_map[keysym & 0xFF]);
251 l = (unsigned int)*kbuf0++; 269 l = (unsigned int)*kbuf0++;
252 270
253 /* escape prefix */ 271 /* escape prefix */
254 if (meta) 272 if (meta)
255# ifdef META8_OPTION 273# ifdef META8_OPTION
256 if (meta_char == C0_ESC) 274 if (meta_char == C0_ESC)
257# endif 275# endif
258 tt_write (&ch, 1); 276 tt_write (&ch, 1);
259 tt_write (kbuf0, l); 277 tt_write (kbuf0, l);
260 return; 278 return;
261 } else 279 }
280 else
262#endif 281#endif
263 { 282 {
264 newlen = 1; 283 newlen = 1;
265 switch (keysym) { 284 switch (keysym)
285 {
266#ifndef NO_BACKSPACE_KEY 286#ifndef NO_BACKSPACE_KEY
267 case XK_BackSpace: 287 case XK_BackSpace:
268 if (PrivateModes & PrivMode_HaveBackSpace) { 288 if (PrivateModes & PrivMode_HaveBackSpace)
289 {
269 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace) 290 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
270 ^ !!ctrl) ? '\b' : '\177'; 291 ^ !!ctrl) ? '\b' : '\177';
271 kbuf[1] = '\0'; 292 kbuf[1] = '\0';
272 } else 293 }
273 STRCPY(kbuf, key_backspace); 294 else
295 STRCPY (kbuf, key_backspace);
274# ifdef MULTICHAR_SET 296# ifdef MULTICHAR_SET
275 if ((Options & Opt_mc_hack) && screen.cur.col > 0) { 297 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
276 int col, row; 298 {
299 int col, row;
277 300
278 newlen = STRLEN(kbuf); 301 newlen = STRLEN (kbuf);
279 col = screen.cur.col - 1; 302 col = screen.cur.col - 1;
280 row = screen.cur.row + TermWin.saveLines; 303 row = screen.cur.row + TermWin.saveLines;
281 if (IS_MULTI2(screen.rend[row][col])) 304 if (IS_MULTI2 (screen.rend[row][col]))
282 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 305 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
283 } 306 }
284# endif 307# endif
285 break; 308 break;
286#endif 309#endif
287#ifndef NO_DELETE_KEY 310#ifndef NO_DELETE_KEY
288 case XK_Delete: 311 case XK_Delete:
289 STRCPY(kbuf, key_delete); 312 STRCPY (kbuf, key_delete);
290# ifdef MULTICHAR_SET 313# ifdef MULTICHAR_SET
291 if (Options & Opt_mc_hack) { 314 if (Options & Opt_mc_hack)
292 int col, row; 315 {
293 316 int col, row;
294 newlen = STRLEN(kbuf); 317
295 col = screen.cur.col; 318 newlen = STRLEN (kbuf);
319 col = screen.cur.col;
296 row = screen.cur.row + TermWin.saveLines; 320 row = screen.cur.row + TermWin.saveLines;
297 if (IS_MULTI1(screen.rend[row][col])) 321 if (IS_MULTI1 (screen.rend[row][col]))
298 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 322 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
299 } 323 }
300# endif 324# endif
301 break; 325 break;
302#endif 326#endif
303 case XK_Tab: 327 case XK_Tab:
304 if (shft) 328 if (shft)
305 STRCPY(kbuf, "\033[Z"); 329 STRCPY (kbuf, "\033[Z");
306 else { 330 else
331 {
307#ifdef CTRL_TAB_MAKES_META 332#ifdef CTRL_TAB_MAKES_META
308 if (ctrl) 333 if (ctrl)
309 meta = 1; 334 meta = 1;
310#endif 335#endif
311#ifdef MOD4_TAB_MAKES_META 336#ifdef MOD4_TAB_MAKES_META
312 if (ev->state & Mod4Mask) 337 if (ev.state & Mod4Mask)
313 meta = 1; 338 meta = 1;
314#endif 339#endif
315 newlen = 0; 340 newlen = 0;
316 } 341 }
317 break; 342 break;
318
319 343
320#ifdef XK_KP_Left 344#ifdef XK_KP_Left
321 case XK_KP_Up: /* \033Ox or standard */ 345 case XK_KP_Up: /* \033Ox or standard */
322 case XK_KP_Down: /* \033Or or standard */ 346 case XK_KP_Down: /* \033Or or standard */
323 case XK_KP_Right: /* \033Ov or standard */ 347 case XK_KP_Right: /* \033Ov or standard */
324 case XK_KP_Left: /* \033Ot or standard */ 348 case XK_KP_Left: /* \033Ot or standard */
325 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 349 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
326 STRCPY(kbuf, "\033OZ"); 350 {
327 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 351 STRCPY (kbuf, "\033OZ");
328 break; 352 kbuf[2] = "txvr"[keysym - XK_KP_Left];
329 } else 353 break;
354 }
355 else
330 /* translate to std. cursor key */ 356 /* translate to std. cursor key */
331 keysym = XK_Left + (keysym - XK_KP_Left); 357 keysym = XK_Left + (keysym - XK_KP_Left);
332 /* FALLTHROUGH */ 358 /* FALLTHROUGH */
333#endif 359#endif
334 case XK_Up: /* "\033[A" */ 360 case XK_Up: /* "\033[A" */
335 case XK_Down: /* "\033[B" */ 361 case XK_Down: /* "\033[B" */
336 case XK_Right: /* "\033[C" */ 362 case XK_Right: /* "\033[C" */
337 case XK_Left: /* "\033[D" */ 363 case XK_Left: /* "\033[D" */
338 STRCPY(kbuf, "\033[Z"); 364 STRCPY (kbuf, "\033[Z");
339 kbuf[2] = ("DACB"[keysym - XK_Left]); 365 kbuf[2] = "DACB"[keysym - XK_Left];
340 /* do Shift first */ 366 /* do Shift first */
341 if (shft) 367 if (shft)
342 kbuf[2] = ("dacb"[keysym - XK_Left]); 368 kbuf[2] = "dacb"[keysym - XK_Left];
343 else if (ctrl) { 369 else if (ctrl)
344 kbuf[1] = 'O'; 370 {
345 kbuf[2] = ("dacb"[keysym - XK_Left]); 371 kbuf[1] = 'O';
372 kbuf[2] = "dacb"[keysym - XK_Left];
373 }
346 } else if (PrivateModes & PrivMode_aplCUR) 374 else if (PrivateModes & PrivMode_aplCUR)
347 kbuf[1] = 'O'; 375 kbuf[1] = 'O';
348#ifdef MULTICHAR_SET 376#ifdef MULTICHAR_SET
349 //TODO: ?? 377 //TODO: ??
350 if (Options & Opt_mc_hack) { 378 if (Options & Opt_mc_hack)
351 int col, row, m; 379 {
380 int col, row, m;
352 381
353 col = screen.cur.col; 382 col = screen.cur.col;
354 row = screen.cur.row + TermWin.saveLines; 383 row = screen.cur.row + TermWin.saveLines;
355 m = 0; 384 m = 0;
356 if (keysym == XK_Right 385 if (keysym == XK_Right
357 && IS_MULTI1(screen.rend[row][col])) 386 && IS_MULTI1 (screen.rend[row][col]))
358 m = 1; 387 m = 1;
359 else if (keysym == XK_Left) { 388 else if (keysym == XK_Left)
360 if (col > 0) { 389 {
361 if (IS_MULTI2(screen.rend[row][col - 1])) 390 if (col > 0)
362 m = 1; 391 {
363 } else if (screen.cur.row > 0) { 392 if (IS_MULTI2 (screen.rend[row][col - 1]))
364 col = screen.tlen[--row]; 393 m = 1;
365 if (col == -1) 394 }
366 col = TermWin.ncol - 1; 395 else if (screen.cur.row > 0)
367 else 396 {
368 col--; 397 col = screen.tlen[--row];
369 if (col > 0 398 if (col == -1)
370 && IS_MULTI2(screen.rend[row][col])) 399 col = TermWin.ncol - 1;
371 m = 1; 400 else
372 } 401 col--;
373 } 402 if (col > 0
374 if (m) 403 && IS_MULTI2 (screen.rend[row][col]))
375 MEMMOVE(kbuf + 3, kbuf, 3 + 1); 404 m = 1;
376 } 405 }
406 }
407 if (m)
408 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
409 }
377#endif 410#endif
378 break; 411 break;
379 412
380#ifndef UNSHIFTED_SCROLLKEYS 413#ifndef UNSHIFTED_SCROLLKEYS
381# ifdef XK_KP_Prior 414# ifdef XK_KP_Prior
382 case XK_KP_Prior: 415 case XK_KP_Prior:
383 /* allow shift to override */ 416 /* allow shift to override */
384 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 417 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
385 STRCPY(kbuf, "\033Oy"); 418 {
386 break; 419 STRCPY (kbuf, "\033Oy");
387 } 420 break;
388 /* FALLTHROUGH */ 421 }
422 /* FALLTHROUGH */
389# endif 423# endif
390 case XK_Prior: 424 case XK_Prior:
391 STRCPY(kbuf, "\033[5~"); 425 STRCPY (kbuf, "\033[5~");
392 break; 426 break;
393# ifdef XK_KP_Next 427# ifdef XK_KP_Next
394 case XK_KP_Next: 428 case XK_KP_Next:
395 /* allow shift to override */ 429 /* allow shift to override */
396 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 430 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
397 STRCPY(kbuf, "\033Os"); 431 {
398 break; 432 STRCPY (kbuf, "\033Os");
399 } 433 break;
400 /* FALLTHROUGH */ 434 }
435 /* FALLTHROUGH */
401# endif 436# endif
402 case XK_Next: 437 case XK_Next:
403 STRCPY(kbuf, "\033[6~"); 438 STRCPY (kbuf, "\033[6~");
404 break; 439 break;
405#endif 440#endif
406 case XK_KP_Enter: 441 case XK_KP_Enter:
407 /* allow shift to override */ 442 /* allow shift to override */
408 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 443 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
409 STRCPY(kbuf, "\033OM"); 444 {
410 } else { 445 STRCPY (kbuf, "\033OM");
411 kbuf[0] = '\r'; 446 }
412 kbuf[1] = '\0'; 447 else
413 } 448 {
414 break; 449 kbuf[0] = '\r';
450 kbuf[1] = '\0';
451 }
452 break;
415 453
416#ifdef XK_KP_Begin 454#ifdef XK_KP_Begin
417 case XK_KP_Begin: 455 case XK_KP_Begin:
418 STRCPY(kbuf, "\033Ou"); 456 STRCPY (kbuf, "\033Ou");
419 break; 457 break;
420 458
421 case XK_KP_Insert: 459 case XK_KP_Insert:
422 STRCPY(kbuf, "\033Op"); 460 STRCPY (kbuf, "\033Op");
423 break; 461 break;
424 462
425 case XK_KP_Delete: 463 case XK_KP_Delete:
426 STRCPY(kbuf, "\033On"); 464 STRCPY (kbuf, "\033On");
427 break; 465 break;
428#endif 466#endif
429 case XK_KP_F1: /* "\033OP" */ 467 case XK_KP_F1: /* "\033OP" */
430 case XK_KP_F2: /* "\033OQ" */ 468 case XK_KP_F2: /* "\033OQ" */
431 case XK_KP_F3: /* "\033OR" */ 469 case XK_KP_F3: /* "\033OR" */
432 case XK_KP_F4: /* "\033OS" */ 470 case XK_KP_F4: /* "\033OS" */
433 STRCPY(kbuf, "\033OP"); 471 STRCPY (kbuf, "\033OP");
434 kbuf[2] += (keysym - XK_KP_F1); 472 kbuf[2] += (keysym - XK_KP_F1);
435 break; 473 break;
436 474
437 case XK_KP_Multiply: /* "\033Oj" : "*" */ 475 case XK_KP_Multiply: /* "\033Oj" : "*" */
438 case XK_KP_Add: /* "\033Ok" : "+" */ 476 case XK_KP_Add: /* "\033Ok" : "+" */
439 case XK_KP_Separator: /* "\033Ol" : "," */ 477 case XK_KP_Separator: /* "\033Ol" : "," */
440 case XK_KP_Subtract: /* "\033Om" : "-" */ 478 case XK_KP_Subtract: /* "\033Om" : "-" */
441 case XK_KP_Decimal: /* "\033On" : "." */ 479 case XK_KP_Decimal: /* "\033On" : "." */
442 case XK_KP_Divide: /* "\033Oo" : "/" */ 480 case XK_KP_Divide: /* "\033Oo" : "/" */
443 case XK_KP_0: /* "\033Op" : "0" */ 481 case XK_KP_0: /* "\033Op" : "0" */
444 case XK_KP_1: /* "\033Oq" : "1" */ 482 case XK_KP_1: /* "\033Oq" : "1" */
445 case XK_KP_2: /* "\033Or" : "2" */ 483 case XK_KP_2: /* "\033Or" : "2" */
446 case XK_KP_3: /* "\033Os" : "3" */ 484 case XK_KP_3: /* "\033Os" : "3" */
447 case XK_KP_4: /* "\033Ot" : "4" */ 485 case XK_KP_4: /* "\033Ot" : "4" */
448 case XK_KP_5: /* "\033Ou" : "5" */ 486 case XK_KP_5: /* "\033Ou" : "5" */
449 case XK_KP_6: /* "\033Ov" : "6" */ 487 case XK_KP_6: /* "\033Ov" : "6" */
450 case XK_KP_7: /* "\033Ow" : "7" */ 488 case XK_KP_7: /* "\033Ow" : "7" */
451 case XK_KP_8: /* "\033Ox" : "8" */ 489 case XK_KP_8: /* "\033Ox" : "8" */
452 case XK_KP_9: /* "\033Oy" : "9" */ 490 case XK_KP_9: /* "\033Oy" : "9" */
453 /* allow shift to override */ 491 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 492 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
455 STRCPY(kbuf, "\033Oj"); 493 {
456 kbuf[2] += (keysym - XK_KP_Multiply); 494 STRCPY (kbuf, "\033Oj");
457 } else { 495 kbuf[2] += (keysym - XK_KP_Multiply);
496 }
497 else
498 {
458 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 499 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
459 kbuf[1] = '\0'; 500 kbuf[1] = '\0';
460 } 501 }
461 break; 502 break;
462 503
463 case XK_Find: 504 case XK_Find:
464 STRCPY(kbuf, "\033[1~"); 505 STRCPY (kbuf, "\033[1~");
465 break; 506 break;
466 case XK_Insert: 507 case XK_Insert:
467 STRCPY(kbuf, "\033[2~"); 508 STRCPY (kbuf, "\033[2~");
468 break; 509 break;
469#ifdef DXK_Remove /* support for DEC remove like key */ 510#ifdef DXK_Remove /* support for DEC remove like key */
470 case DXK_Remove: 511 case DXK_Remove:
471 /* FALLTHROUGH */ 512 /* FALLTHROUGH */
472#endif 513#endif
473 case XK_Execute: 514 case XK_Execute:
474 STRCPY(kbuf, "\033[3~"); 515 STRCPY (kbuf, "\033[3~");
475 break; 516 break;
476 case XK_Select: 517 case XK_Select:
477 STRCPY(kbuf, "\033[4~"); 518 STRCPY (kbuf, "\033[4~");
478 break; 519 break;
479#ifdef XK_KP_End 520#ifdef XK_KP_End
480 case XK_KP_End: 521 case XK_KP_End:
481 /* allow shift to override */ 522 /* allow shift to override */
482 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 523 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
483 STRCPY(kbuf, "\033Oq"); 524 {
484 break; 525 STRCPY (kbuf, "\033Oq");
485 } 526 break;
486 /* FALLTHROUGH */ 527 }
528 /* FALLTHROUGH */
487#endif 529#endif
488 case XK_End: 530 case XK_End:
489 STRCPY(kbuf, KS_END); 531 STRCPY (kbuf, KS_END);
490 break; 532 break;
491#ifdef XK_KP_Home 533#ifdef XK_KP_Home
492 case XK_KP_Home: 534 case XK_KP_Home:
493 /* allow shift to override */ 535 /* allow shift to override */
494 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 536 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
495 STRCPY(kbuf, "\033Ow"); 537 {
496 break; 538 STRCPY (kbuf, "\033Ow");
497 } 539 break;
498 /* FALLTHROUGH */ 540 }
541 /* FALLTHROUGH */
499#endif 542#endif
500 case XK_Home: 543 case XK_Home:
501 STRCPY(kbuf, KS_HOME); 544 STRCPY (kbuf, KS_HOME);
502 break; 545 break;
503 546
504#define FKEY(n, fkey) \ 547#define FKEY(n, fkey) \
505 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 548 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
506 549
507 case XK_F1: /* "\033[11~" */ 550 case XK_F1: /* "\033[11~" */
508 case XK_F2: /* "\033[12~" */ 551 case XK_F2: /* "\033[12~" */
509 case XK_F3: /* "\033[13~" */ 552 case XK_F3: /* "\033[13~" */
510 case XK_F4: /* "\033[14~" */ 553 case XK_F4: /* "\033[14~" */
511 case XK_F5: /* "\033[15~" */ 554 case XK_F5: /* "\033[15~" */
512 FKEY(11, XK_F1); 555 FKEY (11, XK_F1);
513 break; 556 break;
514 case XK_F6: /* "\033[17~" */ 557 case XK_F6: /* "\033[17~" */
515 case XK_F7: /* "\033[18~" */ 558 case XK_F7: /* "\033[18~" */
516 case XK_F8: /* "\033[19~" */ 559 case XK_F8: /* "\033[19~" */
517 case XK_F9: /* "\033[20~" */ 560 case XK_F9: /* "\033[20~" */
518 case XK_F10: /* "\033[21~" */ 561 case XK_F10: /* "\033[21~" */
519 FKEY(17, XK_F6); 562 FKEY (17, XK_F6);
520 break; 563 break;
521 case XK_F11: /* "\033[23~" */ 564 case XK_F11: /* "\033[23~" */
522 case XK_F12: /* "\033[24~" */ 565 case XK_F12: /* "\033[24~" */
523 case XK_F13: /* "\033[25~" */ 566 case XK_F13: /* "\033[25~" */
524 case XK_F14: /* "\033[26~" */ 567 case XK_F14: /* "\033[26~" */
525 FKEY(23, XK_F11); 568 FKEY (23, XK_F11);
526 break; 569 break;
527 case XK_F15: /* "\033[28~" */ 570 case XK_F15: /* "\033[28~" */
528 case XK_F16: /* "\033[29~" */ 571 case XK_F16: /* "\033[29~" */
529 FKEY(28, XK_F15); 572 FKEY (28, XK_F15);
530 break; 573 break;
531 case XK_Help: /* "\033[28~" */ 574 case XK_Help: /* "\033[28~" */
532 FKEY(28, XK_Help); 575 FKEY (28, XK_Help);
533 break; 576 break;
534 case XK_Menu: /* "\033[29~" */ 577 case XK_Menu: /* "\033[29~" */
535 FKEY(29, XK_Menu); 578 FKEY (29, XK_Menu);
536 break; 579 break;
537 case XK_F17: /* "\033[31~" */ 580 case XK_F17: /* "\033[31~" */
538 case XK_F18: /* "\033[32~" */ 581 case XK_F18: /* "\033[32~" */
539 case XK_F19: /* "\033[33~" */ 582 case XK_F19: /* "\033[33~" */
540 case XK_F20: /* "\033[34~" */ 583 case XK_F20: /* "\033[34~" */
541 case XK_F21: /* "\033[35~" */ 584 case XK_F21: /* "\033[35~" */
542 case XK_F22: /* "\033[36~" */ 585 case XK_F22: /* "\033[36~" */
543 case XK_F23: /* "\033[37~" */ 586 case XK_F23: /* "\033[37~" */
544 case XK_F24: /* "\033[38~" */ 587 case XK_F24: /* "\033[38~" */
545 case XK_F25: /* "\033[39~" */ 588 case XK_F25: /* "\033[39~" */
546 case XK_F26: /* "\033[40~" */ 589 case XK_F26: /* "\033[40~" */
547 case XK_F27: /* "\033[41~" */ 590 case XK_F27: /* "\033[41~" */
548 case XK_F28: /* "\033[42~" */ 591 case XK_F28: /* "\033[42~" */
549 case XK_F29: /* "\033[43~" */ 592 case XK_F29: /* "\033[43~" */
550 case XK_F30: /* "\033[44~" */ 593 case XK_F30: /* "\033[44~" */
551 case XK_F31: /* "\033[45~" */ 594 case XK_F31: /* "\033[45~" */
552 case XK_F32: /* "\033[46~" */ 595 case XK_F32: /* "\033[46~" */
553 case XK_F33: /* "\033[47~" */ 596 case XK_F33: /* "\033[47~" */
554 case XK_F34: /* "\033[48~" */ 597 case XK_F34: /* "\033[48~" */
555 case XK_F35: /* "\033[49~" */ 598 case XK_F35: /* "\033[49~" */
556 FKEY(31, XK_F17); 599 FKEY (31, XK_F17);
557 break; 600 break;
558#undef FKEY 601#undef FKEY
559 default: 602 default:
560 newlen = 0; 603 newlen = 0;
561 break; 604 break;
562 } 605 }
563 if (newlen) 606 if (newlen)
564 len = STRLEN(kbuf); 607 len = STRLEN (kbuf);
565 } 608 }
566 /* 609 /*
567 * Pass meta for all function keys, if 'meta' option set 610 * Pass meta for all function keys, if 'meta' option set
568 */ 611 */
569#ifdef META8_OPTION 612#ifdef META8_OPTION
570 if (meta && (meta_char == 0x80) && len > 0) 613 if (meta && (meta_char == 0x80) && len > 0)
571 kbuf[len - 1] |= 0x80; 614 kbuf[len - 1] |= 0x80;
572#endif 615#endif
616
617 }
573 } else if (ctrl && keysym == XK_minus) { 618 else if (ctrl && keysym == XK_minus)
619 {
574 len = 1; 620 len = 1;
575 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 621 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
576 } else { 622 }
623 else
624 {
577#ifdef META8_OPTION 625#ifdef META8_OPTION
578 /* set 8-bit on */ 626 /* set 8-bit on */
579 if (meta && (meta_char == 0x80)) { 627 if (meta && (meta_char == 0x80))
580 unsigned char *ch; 628 {
629 unsigned char *ch;
581 630
582 for (ch = kbuf; ch < kbuf + len; ch++) 631 for (ch = kbuf; ch < kbuf + len; ch++)
583 *ch |= 0x80; 632 *ch |= 0x80;
584 meta = 0; 633 meta = 0;
634 }
635#endif
636 /* nil */ ;
637 }
585 } 638 }
586#endif 639
587#ifdef GREEK_SUPPORT 640 if (len <= 0)
588 if (greek_mode) 641 return; /* not mapped */
589 len = greek_xlat(kbuf, len); 642
590#endif 643 if (Options & Opt_scrollTtyKeypress)
591 /* nil */ ; 644 if (TermWin.view_start)
592 } 645 {
646 TermWin.view_start = 0;
647 want_refresh = 1;
593 } 648 }
594 649
595 if (len <= 0) 650 /*
596 return; /* not mapped */
597
598 if (Options & Opt_scrollTtyKeypress)
599 if (TermWin.view_start) {
600 TermWin.view_start = 0;
601 want_refresh = 1;
602 }
603
604/*
605 * these modifications only affect the static keybuffer 651 * these modifications only affect the static keybuffer
606 * pass Shift/Control indicators for function keys ending with `~' 652 * pass Shift/Control indicators for function keys ending with `~'
607 * 653 *
608 * eg, 654 * eg,
609 * Prior = "ESC[5~" 655 * Prior = "ESC[5~"
610 * Shift+Prior = "ESC[5$" 656 * Shift+Prior = "ESC[5$"
611 * Ctrl+Prior = "ESC[5^" 657 * Ctrl+Prior = "ESC[5^"
612 * Ctrl+Shift+Prior = "ESC[5@" 658 * Ctrl+Shift+Prior = "ESC[5@"
613 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 659 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
614 */ 660 */
615 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~') 661 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
616 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 662 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
617 663
618/* escape prefix */ 664 /* escape prefix */
619 if (meta 665 if (meta
620#ifdef META8_OPTION 666#ifdef META8_OPTION
621 && (meta_char == C0_ESC) 667 && meta_char == C0_ESC
622#endif 668#endif
623 ) { 669 )
670 {
624 const unsigned char ch = C0_ESC; 671 const unsigned char ch = C0_ESC;
625
626 tt_write(&ch, 1); 672 tt_write (&ch, 1);
627 } 673 }
674
628#ifdef DEBUG_CMD 675#if defined(DEBUG_CMD)
629 if (debug_key) { /* Display keyboard buffer contents */ 676 /* Display keyboard buffer contents */
630 char *p; 677 unsigned char *p;
631 int i; 678 int i;
632 679
633 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 680 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
634 for (i = 0, p = kbuf; i < len; i++, p++) 681 for (i = 0, p = kbuf; i < len; i++, p++)
635 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 682 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
636 fprintf(stderr, "'\n"); 683 fprintf (stderr, "'\n");
637 }
638#endif /* DEBUG_CMD */ 684#endif /* DEBUG_CMD */
639 tt_write (kbuf, (unsigned int)len); 685 tt_write (kbuf, (unsigned int)len);
640} 686}
641/*}}} */ 687/*}}} */
642 688
643#if (MENUBAR_MAX) 689#if (MENUBAR_MAX)
644/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 690/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
645/* attempt to `write' count to the input buffer */ 691/* attempt to `write' count to the input buffer */
646unsigned int 692unsigned int
647rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 693rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
648{ 694{
649 unsigned int n, s; 695 unsigned int n, s;
650 696
651 n = cmdbuf_ptr - cmdbuf_base; 697 n = cmdbuf_ptr - cmdbuf_base;
652 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 698 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
699
653 if (n > 0 && s < count) { 700 if (n > 0 && s < count)
701 {
654 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 702 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
655 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 703 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
656 cmdbuf_ptr = cmdbuf_base; 704 cmdbuf_ptr = cmdbuf_base;
657 cmdbuf_endp -= n; 705 cmdbuf_endp -= n;
658 s += n; 706 s += n;
659 } 707 }
708
660 if (count > s) { 709 if (count > s)
710 {
661 rxvt_print_error("data loss: cmd_write too large"); 711 rxvt_print_error ("data loss: cmd_write too large");
662 count = s; 712 count = s;
663 } 713 }
714
664 for (; count--;) 715 for (; count--;)
665 *cmdbuf_endp++ = *str++; 716 *cmdbuf_endp++ = *str++;
717
718 cmd_parse ();
719
666 return 0; 720 return 0;
667} 721}
668#endif /* MENUBAR_MAX */ 722#endif /* MENUBAR_MAX */
669 723
670void 724void
671rxvt_term::flush () 725rxvt_term::flush ()
… …
685 scr_refresh (refresh_type); 739 scr_refresh (refresh_type);
686 scrollbar_show (1); 740 scrollbar_show (1);
687#ifdef USE_XIM 741#ifdef USE_XIM
688 IMSendSpot (); 742 IMSendSpot ();
689#endif 743#endif
690 }
691 744
692 XFlush (Xdisplay); 745 }
746
747 display->flush ();
693} 748}
694 749
695void 750void
696rxvt_term::check_cb (check_watcher &w) 751rxvt_term::check_cb (check_watcher &w)
697{ 752{
698 SET_R (this); 753 SET_R (this);
699 SET_LOCALE (locale); 754 SET_LOCALE (locale);
700 755
701 flush (); 756 flush ();
702}
703
704void
705rxvt_term::process_x_events ()
706{
707 do
708 {
709 XEvent xev;
710
711 XNextEvent (Xdisplay, &xev);
712
713#if defined(CURSOR_BLINK)
714 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
715 {
716 if (hidden_cursor)
717 {
718 hidden_cursor = 0;
719 want_refresh = 1;
720 }
721
722 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
723 }
724#endif
725
726#if defined(POINTER_BLANK)
727 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
728 {
729 if (xev.type == MotionNotify
730 || xev.type == ButtonPress
731 || xev.type == ButtonRelease)
732 if (hidden_pointer)
733 pointer_unblank ();
734
735 if (xev.type == KeyPress && hidden_pointer == 0)
736 pointer_blank ();
737 }
738#endif
739
740#ifdef USE_XIM
741 if (!XFilterEvent (&xev, xev.xany.window))
742#endif
743 process_x_event (&xev);
744 }
745 while (XPending (Xdisplay));
746} 757}
747 758
748#ifdef CURSOR_BLINK 759#ifdef CURSOR_BLINK
749void 760void
750rxvt_term::cursor_blink_cb (time_watcher &w) 761rxvt_term::cursor_blink_cb (time_watcher &w)
… …
767 w.start (w.at + TEXT_BLINK_INTERVAL); 778 w.start (w.at + TEXT_BLINK_INTERVAL);
768 } 779 }
769} 780}
770#endif 781#endif
771 782
772void
773rxvt_term::x_cb (io_watcher &w, short revents)
774{
775 SET_R (this);
776 SET_LOCALE (locale);
777
778 process_x_events ();
779}
780
781bool 783bool
782rxvt_term::pty_fill () 784rxvt_term::pty_fill ()
783{ 785{
784 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 786 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
785 787
786 memmove (cmdbuf_base, cmdbuf_ptr, n); 788 memmove (cmdbuf_base, cmdbuf_ptr, n);
787 cmdbuf_ptr = cmdbuf_base; 789 cmdbuf_ptr = cmdbuf_base;
788 cmdbuf_endp = cmdbuf_ptr + n; 790 cmdbuf_endp = cmdbuf_ptr + n;
789 791
790 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 792 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
791 793
792 if (n > 0) 794 if (n > 0)
793 { 795 {
794 cmdbuf_endp += n; 796 cmdbuf_endp += n;
795 return true; 797 return true;
796 } 798 }
797 else if (n < 0 && errno != EAGAIN) 799 else if (n < 0 && errno != EAGAIN)
798 destroy (); 800 destroy ();
799 801
800 return false; 802 return false;
801} 803}
802 804
803void 805void
804rxvt_term::pty_cb (io_watcher &w, short revents) 806rxvt_term::pty_cb (io_watcher &w, short revents)
… …
821 seen_input = 1; 823 seen_input = 1;
822 /* once we know the shell is running, send the screen size. Again! */ 824 /* once we know the shell is running, send the screen size. Again! */
823 tt_winch (); 825 tt_winch ();
824 } 826 }
825 827
828 if (cmd_parse ())
829 break;
830 }
831 }
832}
833
834bool
835rxvt_term::cmd_parse ()
836{
837 bool flag = false;
826 uint32_t ch = NOCHAR; 838 uint32_t ch = NOCHAR;
839
840 for (;;)
841 {
842 if (ch == NOCHAR)
843 ch = next_char ();
844
845 if (ch == NOCHAR) // TODO: improve
846 break;
847
848 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
849 {
850 /* Read a text string from the input buffer */
851 uint32_t buf[BUFSIZ];
852 bool refreshnow = false;
853 int nlines = 0;
854 uint32_t *str = buf;
855
856 *str++ = ch;
827 857
828 for (;;) 858 for (;;)
829 { 859 {
830 if (ch == NOCHAR)
831 ch = next_char (); 860 ch = next_char ();
832 861
833 if (ch == NOCHAR) // TODO: improve 862 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
834 break; 863 break;
835 864 else
836 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
837 { 865 {
838 /* Read a text string from the input buffer */
839 uint32_t buf[BUFSIZ];
840 bool refreshnow = false;
841 int nlines = 0;
842 uint32_t *str = buf;
843
844 *str++ = ch; 866 *str++ = ch;
845 867
846 for (;;) 868 if (ch == '\n')
847 { 869 {
848 ch = next_char ();
849
850 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
851 break;
852 else 870 nlines++;
871 refresh_count++;
872
873 if (! (Options & Opt_jumpScroll)
874 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
853 { 875 {
854 *str++ = ch;
855
856 if (ch == '\n')
857 {
858 nlines++;
859 refresh_count++;
860
861 if (!(Options & Opt_jumpScroll)
862 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
863 {
864 refreshnow = true; 876 refreshnow = true;
865 flag = false; 877 flag = false;
866 ch = NOCHAR;
867 break;
868 }
869 }
870
871 if (str >= buf + BUFSIZ)
872 {
873 ch = NOCHAR; 878 ch = NOCHAR;
874 break; 879 break;
875 } 880 }
881
882 // scr_add_lines only works for nlines < TermWin.nrow - 1.
883 if (nlines >= TermWin.nrow - 1)
884 {
885 scr_add_lines (buf, nlines, str - buf);
886 nlines = 0;
887 str = buf;
876 } 888 }
877 } 889 }
878 890
879 scr_add_lines (buf, nlines, str - buf); 891 if (str >= buf + BUFSIZ)
880
881 /*
882 * If there have been a lot of new lines, then update the screen
883 * What the heck I'll cheat and only refresh less than every page-full.
884 * the number of pages between refreshes is refresh_limit, which
885 * is incremented here because we must be doing flat-out scrolling.
886 *
887 * refreshing should be correct for small scrolls, because of the
888 * time-out
889 */
890 if (refreshnow)
891 { 892 {
892 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 893 ch = NOCHAR;
893 refresh_limit++; 894 break;
894
895 scr_refresh (refresh_type);
896 } 895 }
897
898 }
899 else
900 {
901 switch (ch)
902 {
903 default:
904 process_nonprinting (ch);
905 break;
906 case C0_ESC: /* escape char */
907 process_escape_seq ();
908 break;
909 /*case 0x9b: */ /* CSI */
910 /* process_csi_seq (); */
911 }
912
913 ch = NOCHAR;
914 } 896 }
915 } 897 }
898
899 scr_add_lines (buf, nlines, str - buf);
900
901 /*
902 * If there have been a lot of new lines, then update the screen
903 * What the heck I'll cheat and only refresh less than every page-full.
904 * the number of pages between refreshes is refresh_limit, which
905 * is incremented here because we must be doing flat-out scrolling.
906 *
907 * refreshing should be correct for small scrolls, because of the
908 * time-out
909 */
910 if (refreshnow)
911 {
912 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
913 refresh_limit++;
914
915 scr_refresh (refresh_type);
916 }
917
918 }
919 else
916 } 920 {
921 switch (ch)
922 {
923 default:
924 process_nonprinting (ch);
925 break;
926 case C0_ESC: /* escape char */
927 process_escape_seq ();
928 break;
929 /*case 0x9b: */ /* CSI */
930 /* process_csi_seq (); */
931 }
932
933 ch = NOCHAR;
934 }
917 } 935 }
936
937 return flag;
918} 938}
919 939
920// read the next character, currently handles UTF-8 940// read the next character, currently handles UTF-8
921// will probably handle all sorts of other stuff in the future 941// will probably handle all sorts of other stuff in the future
922uint32_t 942uint32_t
… …
926 { 946 {
927 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 947 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
928 return *cmdbuf_ptr++; 948 return *cmdbuf_ptr++;
929 949
930 wchar_t wc; 950 wchar_t wc;
931 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 951 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
932 952
933 if (len == (size_t)-2) 953 if (len == (size_t)-2)
934 return NOCHAR; 954 return NOCHAR;
935 955
936 if (len == (size_t)-1) 956 if (len == (size_t)-1)
… …
942 } 962 }
943 963
944 return NOCHAR; 964 return NOCHAR;
945} 965}
946 966
947/* rxvt_cmd_getc() - Return next input character */ 967/* rxvt_cmd_getc () - Return next input character */
948/* 968/*
949 * Return the next input character after first passing any keyboard input 969 * Return the next input character after first passing any keyboard input
950 * to the command. 970 * to the command.
951 */ 971 */
952uint32_t 972uint32_t
… …
962 // would be preferred. either setjmp/longjmp or better design. 982 // would be preferred. either setjmp/longjmp or better design.
963 fcntl (cmd_fd, F_SETFL, 0); 983 fcntl (cmd_fd, F_SETFL, 0);
964 pty_fill (); 984 pty_fill ();
965 fcntl (cmd_fd, F_SETFL, O_NONBLOCK); 985 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
966 } 986 }
967
968#if 0
969#define TIMEOUT_USEC 5000
970 fd_set readfds;
971 int quick_timeout, select_res;
972 int want_motion_time, want_keypress_time;
973 struct timeval value;
974#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
975 struct timeval tp;
976#endif
977
978 for (;;) {
979 /* loop until we can return something */
980
981 if (v_bufstr < v_bufptr) /* output any pending chars */
982 tt_write(NULL, 0);
983
984#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
985 if (mouse_slip_wheel_speed) {
986 quick_timeout = 1;
987 if (!mouse_slip_wheel_delay--
988 && scr_page (mouse_slip_wheel_speed > 0 ? UP : DN,
989 abs(mouse_slip_wheel_speed))) {
990 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
991 refresh_type |= SMOOTH_REFRESH;
992 want_refresh = 1;
993 }
994 }
995#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
996#ifdef SELECTION_SCROLLING
997 if (pending_scroll_selection) {
998 quick_timeout = 1;
999 if (!scroll_selection_delay--
1000 && scr_page (scroll_selection_dir,
1001 scroll_selection_lines)) {
1002 selection_extend (selection_save_x,
1003 selection_save_y, selection_save_state);
1004 scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1005 refresh_type |= SMOOTH_REFRESH;
1006 want_refresh = 1;
1007 }
1008 }
1009#endif
1010#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1011 if (scrollbar_isUp() || scrollbar_isDn()) {
1012 quick_timeout = 1;
1013 if (!scroll_arrow_delay--
1014 && scr_page (scrollbar_isUp() ? UP : DN, 1)) {
1015 scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1016 refresh_type |= SMOOTH_REFRESH;
1017 want_refresh = 1;
1018 }
1019 }
1020#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1021
1022#ifdef TRANSPARENT
1023 quick_timeout |= want_full_refresh;
1024#endif
1025#endif
1026} 987}
1027 988
1028#ifdef POINTER_BLANK 989#ifdef POINTER_BLANK
1029void 990void
1030rxvt_term::pointer_unblank () 991rxvt_term::pointer_unblank ()
1031{ 992{
1032 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 993 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1033 recolour_cursor (); 994 recolour_cursor ();
1034 995
1035 hidden_pointer = 0; 996 hidden_pointer = 0;
1036 997
1037 if (Options & Opt_pointerBlank) 998 if (Options & Opt_pointerBlank)
… …
1039} 1000}
1040 1001
1041void 1002void
1042rxvt_term::pointer_blank () 1003rxvt_term::pointer_blank ()
1043{ 1004{
1044 if (!(Options & Opt_pointerBlank)) 1005 if (! (Options & Opt_pointerBlank))
1045 return; 1006 return;
1046 1007
1047 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1008 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1048 XFlush (Xdisplay); 1009 XFlush (display->display);
1049 1010
1050 hidden_pointer = 1; 1011 hidden_pointer = 1;
1051} 1012}
1052 1013
1053void 1014void
… …
1059 pointer_blank (); 1020 pointer_blank ();
1060} 1021}
1061#endif 1022#endif
1062 1023
1063void 1024void
1064rxvt_term::mouse_report (const XButtonEvent *ev) 1025rxvt_term::mouse_report (XButtonEvent &ev)
1065{ 1026{
1066 int button_number, key_state = 0; 1027 int button_number, key_state = 0;
1067 int x, y; 1028 int x, y;
1068 1029
1069 x = ev->x; 1030 x = ev.x;
1070 y = ev->y; 1031 y = ev.y;
1071 pixel_position (&x, &y); 1032 pixel_position (&x, &y);
1072 1033
1073 if (MEvent.button == AnyButton) { 1034 if (MEvent.button == AnyButton)
1035 {
1074 button_number = 3; 1036 button_number = 3;
1075 } else { 1037 }
1038 else
1039 {
1076 button_number = MEvent.button - Button1; 1040 button_number = MEvent.button - Button1;
1077 /* add 0x3D for wheel events, like xterm does */ 1041 /* add 0x3D for wheel events, like xterm does */
1078 if (button_number >= 3) 1042 if (button_number >= 3)
1079 button_number += (64 - 3); 1043 button_number += (64 - 3);
1080 } 1044 }
1081 1045
1082 if (PrivateModes & PrivMode_MouseX10) { 1046 if (PrivateModes & PrivMode_MouseX10)
1047 {
1083 /* 1048 /*
1084 * do not report ButtonRelease 1049 * do not report ButtonRelease
1085 * no state info allowed 1050 * no state info allowed
1086 */ 1051 */
1087 key_state = 0; 1052 key_state = 0;
1088 if (button_number == 3) 1053 if (button_number == 3)
1089 return; 1054 return;
1090 } else { 1055 }
1056 else
1057 {
1091 /* XTerm mouse reporting needs these values: 1058 /* XTerm mouse reporting needs these values:
1092 * 4 = Shift 1059 * 4 = Shift
1093 * 8 = Meta 1060 * 8 = Meta
1094 * 16 = Control 1061 * 16 = Control
1095 * plus will add in our own Double-Click reporting 1062 * plus will add in our own Double-Click reporting
1096 * 32 = Double Click 1063 * 32 = Double Click
1097 */ 1064 */
1098 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1065 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1099 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1066 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1100 + ((MEvent.state & ControlMask) ? 16 : 0); 1067 + ((MEvent.state & ControlMask) ? 16 : 0);
1101#ifdef MOUSE_REPORT_DOUBLECLICK 1068#ifdef MOUSE_REPORT_DOUBLECLICK
1102 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1069 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1103#endif 1070#endif
1071
1104 } 1072 }
1105 1073
1106#ifdef DEBUG_MOUSEREPORT 1074#ifdef DEBUG_MOUSEREPORT
1107 fprintf(stderr, "Mouse ["); 1075 fprintf (stderr, "Mouse [");
1108 if (key_state & 16) 1076 if (key_state & 16)
1109 fputc('C', stderr); 1077 fputc ('C', stderr);
1110 if (key_state & 4) 1078 if (key_state & 4)
1111 fputc('S', stderr); 1079 fputc ('S', stderr);
1112 if (key_state & 8) 1080 if (key_state & 8)
1113 fputc('A', stderr); 1081 fputc ('A', stderr);
1114 if (key_state & 32) 1082 if (key_state & 32)
1115 fputc('2', stderr); 1083 fputc ('2', stderr);
1116 fprintf(stderr, "]: <%d>, %d/%d\n", 1084 fprintf (stderr, "]: <%d>, %d/%d\n",
1117 button_number, 1085 button_number,
1118 x + 1, 1086 x + 1,
1119 y + 1); 1087 y + 1);
1120#else 1088#else
1121 tt_printf("\033[M%c%c%c", 1089 tt_printf ("\033[M%c%c%c",
1122 (32 + button_number + key_state), 1090 (32 + button_number + key_state),
1123 (32 + x + 1), 1091 (32 + x + 1),
1124 (32 + y + 1)); 1092 (32 + y + 1));
1125#endif 1093#endif
1126} 1094}
1127 1095
1128#ifdef USING_W11LIB 1096#ifdef USING_W11LIB
1129void 1097void
1130rxvt_W11_process_x_event(XEvent *ev) 1098rxvt_W11_process_x_event (XEvent *ev)
1131{ 1099{
1132 rxvt_t *r = rxvt_get_r(); 1100 rxvt_t *r = rxvt_get_r ();
1133 1101
1134 process_x_event (ev); 1102 x_cb (*ev);
1135} 1103}
1136#endif 1104#endif
1137 1105
1138/*{{{ process an X event */ 1106/*{{{ process an X event */
1139void 1107void
1140rxvt_term::process_x_event (XEvent *ev) 1108rxvt_term::x_cb (XEvent &ev)
1141{ 1109{
1110 SET_R (this);
1111 SET_LOCALE (locale);
1112
1113#if defined(CURSOR_BLINK)
1114 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1115 {
1116 if (hidden_cursor)
1117 {
1118 hidden_cursor = 0;
1119 want_refresh = 1;
1120 }
1121
1122 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1123 }
1124#endif
1125
1126#if defined(POINTER_BLANK)
1127 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1128 {
1129 if (ev.type == MotionNotify
1130 || ev.type == ButtonPress
1131 || ev.type == ButtonRelease)
1132 if (hidden_pointer)
1133 pointer_unblank ();
1134
1135 if (ev.type == KeyPress && hidden_pointer == 0)
1136 pointer_blank ();
1137 }
1138#endif
1139
1140#ifdef USE_XIM
1141 if (XFilterEvent (&ev, None))
1142 return;
1143#endif
1144
1142 Window unused_root, unused_child; 1145 Window unused_root, unused_child;
1143 int unused_root_x, unused_root_y; 1146 int unused_root_x, unused_root_y;
1144 unsigned int unused_mask; 1147 unsigned int unused_mask;
1145 1148
1146#ifdef DEBUG_X 1149#ifdef DEBUG_X
1147 const char *const eventnames[] = 1150 const char *const eventnames[] =
1148 { /* mason - this matches my system */ 1151 { /* mason - this matches my system */
1149 "", 1152 "",
1150 "", 1153 "",
1151 "KeyPress", 1154 "KeyPress",
1152 "KeyRelease", 1155 "KeyRelease",
1153 "ButtonPress", 1156 "ButtonPress",
1154 "ButtonRelease", 1157 "ButtonRelease",
1155 "MotionNotify", 1158 "MotionNotify",
1156 "EnterNotify", 1159 "EnterNotify",
1157 "LeaveNotify", 1160 "LeaveNotify",
1158 "FocusIn", 1161 "FocusIn",
1159 "FocusOut", 1162 "FocusOut",
1160 "KeymapNotify", 1163 "KeymapNotify",
1161 "Expose", 1164 "Expose",
1162 "GraphicsExpose", 1165 "GraphicsExpose",
1163 "NoExpose", 1166 "NoExpose",
1164 "VisibilityNotify", 1167 "VisibilityNotify",
1165 "CreateNotify", 1168 "CreateNotify",
1166 "DestroyNotify", 1169 "DestroyNotify",
1167 "UnmapNotify", 1170 "UnmapNotify",
1168 "MapNotify", 1171 "MapNotify",
1169 "MapRequest", 1172 "MapRequest",
1170 "ReparentNotify", 1173 "ReparentNotify",
1171 "ConfigureNotify", 1174 "ConfigureNotify",
1172 "ConfigureRequest", 1175 "ConfigureRequest",
1173 "GravityNotify", 1176 "GravityNotify",
1174 "ResizeRequest", 1177 "ResizeRequest",
1175 "CirculateNotify", 1178 "CirculateNotify",
1176 "CirculateRequest", 1179 "CirculateRequest",
1177 "PropertyNotify", 1180 "PropertyNotify",
1178 "SelectionClear", 1181 "SelectionClear",
1179 "SelectionRequest", 1182 "SelectionRequest",
1180 "SelectionNotify", 1183 "SelectionNotify",
1181 "ColormapNotify", 1184 "ColormapNotify",
1182 "ClientMessage", 1185 "ClientMessage",
1183 "MappingNotify" 1186 "MappingNotify"
1184 }; 1187 };
1185#endif 1188#endif
1186 1189
1187#ifdef DEBUG_X 1190#ifdef DEBUG_X
1188 struct timeval tp; 1191 struct timeval tp;
1189 struct tm *ltt; 1192 struct tm *ltt;
1190 (void)gettimeofday(&tp, NULL); 1193 (void)gettimeofday (&tp, NULL);
1191 ltt = localtime(&(tp.tv_sec)); 1194 ltt = localtime (& (tp.tv_sec));
1192 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)); 1195 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1193#endif 1196#endif
1194 1197
1195 switch (ev->type) { 1198 switch (ev.type)
1199 {
1196 case KeyPress: 1200 case KeyPress:
1197 lookup_key ((XKeyEvent *)ev); 1201 lookup_key (ev.xkey);
1198 break; 1202 break;
1199 1203
1200#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1204#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1201 case KeyRelease: 1205 case KeyRelease:
1202 { 1206 {
1203 if (!(ev->xkey.state & ControlMask)) 1207 if (! (ev.xkey.state & ControlMask))
1204 mouse_slip_wheel_speed = 0;
1205 else {
1206 KeySym ks;
1207
1208 ks = XKeycodeToKeysym(Xdisplay, ev->xkey.keycode, 0);
1209 if (ks == XK_Control_L || ks == XK_Control_R)
1210 mouse_slip_wheel_speed = 0; 1208 mouse_slip_wheel_speed = 0;
1211 } 1209 else
1212 break; 1210 {
1213 } 1211 KeySym ks;
1214#endif
1215 1212
1213 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1214 if (ks == XK_Control_L || ks == XK_Control_R)
1215 mouse_slip_wheel_speed = 0;
1216 }
1217 break;
1218 }
1219#endif
1220
1216 case ButtonPress: 1221 case ButtonPress:
1217 button_press ((XButtonEvent *)ev); 1222 button_press (ev.xbutton);
1218 break; 1223 break;
1219 1224
1220 case ButtonRelease: 1225 case ButtonRelease:
1221 button_release ((XButtonEvent *)ev); 1226 button_release (ev.xbutton);
1222 break; 1227 break;
1223 1228
1224 case ClientMessage: 1229 case ClientMessage:
1225 if (ev->xclient.format == 32 1230 if (ev.xclient.format == 32
1226 && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1231 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1227 destroy (); 1232 destroy ();
1228#ifdef OFFIX_DND 1233#ifdef OFFIX_DND
1229 /* OffiX Dnd (drag 'n' drop) protocol */ 1234 /* OffiX Dnd (drag 'n' drop) protocol */
1230 else if (ev->xclient.message_type == xa[XA_DNDPROTOCOL] 1235 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1231 && (ev->xclient.data.l[0] == DndFile 1236 && (ev.xclient.data.l[0] == DndFile
1232 || ev->xclient.data.l[0] == DndDir 1237 || ev.xclient.data.l[0] == DndDir
1233 || ev->xclient.data.l[0] == DndLink)) { 1238 || ev.xclient.data.l[0] == DndLink))
1234 /* Get Dnd data */ 1239 {
1240 /* Get Dnd data */
1235 Atom ActualType; 1241 Atom ActualType;
1236 int ActualFormat; 1242 int ActualFormat;
1237 unsigned char *data; 1243 unsigned char *data;
1238 unsigned long Size, RemainingBytes; 1244 unsigned long Size, RemainingBytes;
1239 1245
1240 XGetWindowProperty(Xdisplay, Xroot, 1246 XGetWindowProperty (display->display, display->root,
1241 xa[XA_DNDSELECTION], 1247 xa[XA_DNDSELECTION],
1242 0L, 1000000L, 1248 0L, 1000000L,
1243 False, AnyPropertyType, 1249 False, AnyPropertyType,
1244 &ActualType, &ActualFormat, 1250 &ActualType, &ActualFormat,
1245 &Size, &RemainingBytes, 1251 &Size, &RemainingBytes,
1246 &data); 1252 &data);
1247 XChangeProperty(Xdisplay, Xroot, 1253 XChangeProperty (display->display, display->root,
1248 XA_CUT_BUFFER0, XA_STRING, 1254 XA_CUT_BUFFER0, XA_STRING,
1249 8, PropModeReplace, 1255 8, PropModeReplace,
1250 data, STRLEN(data)); 1256 data, STRLEN (data));
1251 selection_paste (Xroot, XA_CUT_BUFFER0, True); 1257 selection_paste (display->root, XA_CUT_BUFFER0, True);
1252 XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime); 1258 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1253 } 1259 }
1254#endif /* OFFIX_DND */ 1260#endif /* OFFIX_DND */
1255 break; 1261 break;
1256 1262
1257 case MappingNotify: 1263 case MappingNotify:
1258 XRefreshKeyboardMapping(&(ev->xmapping)); 1264 XRefreshKeyboardMapping (& (ev.xmapping));
1259 break; 1265 break;
1260 1266
1261 /* 1267 /*
1262 * XXX: this is not the _current_ arrangement 1268 * XXX: this is not the _current_ arrangement
1263 * Here's my conclusion: 1269 * Here's my conclusion:
1264 * If the window is completely unobscured, use bitblt's 1270 * If the window is completely unobscured, use bitblt's
1265 * to scroll. Even then, they're only used when doing partial 1271 * to scroll. Even then, they're only used when doing partial
1266 * screen scrolling. When partially obscured, we have to fill 1272 * screen scrolling. When partially obscured, we have to fill
1267 * in the GraphicsExpose parts, which means that after each refresh, 1273 * in the GraphicsExpose parts, which means that after each refresh,
1268 * we need to wait for the graphics expose or Noexpose events, 1274 * we need to wait for the graphics expose or Noexpose events,
1269 * which ought to make things real slow! 1275 * which ought to make things real slow!
1270 */ 1276 */
1271 case VisibilityNotify: 1277 case VisibilityNotify:
1272 switch (ev->xvisibility.state) 1278 switch (ev.xvisibility.state)
1273 { 1279 {
1274 case VisibilityUnobscured: 1280 case VisibilityUnobscured:
1275 refresh_type = FAST_REFRESH; 1281 refresh_type = FAST_REFRESH;
1276 break; 1282 break;
1277 case VisibilityPartiallyObscured: 1283 case VisibilityPartiallyObscured:
… …
1279 break; 1285 break;
1280 default: 1286 default:
1281 refresh_type = NO_REFRESH; 1287 refresh_type = NO_REFRESH;
1282 break; 1288 break;
1283 } 1289 }
1284 break; 1290 break;
1285 1291
1286 case FocusIn: 1292 case FocusIn:
1287 if (!TermWin.focus) { 1293 if (!TermWin.focus)
1294 {
1288 TermWin.focus = 1; 1295 TermWin.focus = 1;
1289 want_refresh = 1; 1296 want_refresh = 1;
1290#ifdef USE_XIM 1297#ifdef USE_XIM
1291 if (Input_Context != NULL) 1298 if (Input_Context != NULL)
1292 XSetICFocus(Input_Context); 1299 XSetICFocus (Input_Context);
1293#endif 1300#endif
1294#ifdef CURSOR_BLINK 1301#ifdef CURSOR_BLINK
1295 if (Options & Opt_cursorBlink) 1302 if (Options & Opt_cursorBlink)
1296 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1303 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1297#endif 1304#endif
1298 }
1299 break;
1300 1305
1306 }
1307 break;
1308
1301 case FocusOut: 1309 case FocusOut:
1302 if (TermWin.focus) { 1310 if (TermWin.focus)
1311 {
1303 TermWin.focus = 0; 1312 TermWin.focus = 0;
1304 want_refresh = 1; 1313 want_refresh = 1;
1305#ifdef USE_XIM 1314#ifdef USE_XIM
1306 if (Input_Context != NULL) 1315 if (Input_Context != NULL)
1307 XUnsetICFocus(Input_Context); 1316 XUnsetICFocus (Input_Context);
1308#endif 1317#endif
1309#ifdef CURSOR_BLINK 1318#ifdef CURSOR_BLINK
1310 if (Options & Opt_cursorBlink) 1319 if (Options & Opt_cursorBlink)
1311 cursor_blink_ev.stop (); 1320 cursor_blink_ev.stop ();
1312 hidden_cursor = 0; 1321 hidden_cursor = 0;
1313#endif 1322#endif
1314 }
1315 break;
1316 1323
1324 }
1325 break;
1326
1317 case ConfigureNotify: 1327 case ConfigureNotify:
1318 if (ev->xconfigure.window == TermWin.parent[0]) { 1328 if (ev.xconfigure.window == TermWin.parent[0])
1319 int height, width; 1329 {
1330 int height, width;
1320 1331
1332 do
1321 do { /* Wrap lots of configures into one */ 1333 { /* Wrap lots of configures into one */
1322 width = ev->xconfigure.width; 1334 width = ev.xconfigure.width;
1323 height = ev->xconfigure.height; 1335 height = ev.xconfigure.height;
1324 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1336 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1325 } while (XCheckTypedWindowEvent(Xdisplay, ev->xconfigure.window, 1337 }
1326 ConfigureNotify, ev)); 1338 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1339
1327 if (szHint.width != width || szHint.height != height) { 1340 if (szHint.width != width || szHint.height != height)
1341 {
1328 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1342 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1329 resize_all_windows (width, height, 1); 1343 resize_all_windows (width, height, 1);
1330 } 1344 }
1331#ifdef DEBUG_SIZE 1345#ifdef DEBUG_SIZE
1332 else { 1346 else
1347 {
1333 D_SIZE((stderr, "Size: Not resizing")); 1348 D_SIZE ((stderr, "Size: Not resizing"));
1334 } 1349 }
1335#endif 1350#endif
1336#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1351#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1337 if (Options & Opt_transparent) { 1352 if (Options & Opt_transparent)
1338 check_our_parents (); 1353 {
1339 if (am_transparent) 1354 check_our_parents ();
1355 if (am_transparent)
1340 want_full_refresh = 1; 1356 want_full_refresh = 1;
1341 } 1357 }
1342#endif 1358#endif
1343 }
1344 break;
1345 1359
1360 }
1361 break;
1362
1346 case SelectionClear: 1363 case SelectionClear:
1347 selection_clear (); 1364 display->set_selection_owner (0);
1348 break; 1365 break;
1349 1366
1350 case SelectionNotify: 1367 case SelectionNotify:
1351 if (selection_wait == Sel_normal) 1368 if (selection_wait == Sel_normal)
1352 selection_paste (ev->xselection.requestor, 1369 selection_paste (ev.xselection.requestor,
1353 ev->xselection.property, True); 1370 ev.xselection.property, True);
1354 break; 1371 break;
1355 1372
1356 case SelectionRequest: 1373 case SelectionRequest:
1357 selection_send (&(ev->xselectionrequest)); 1374 selection_send (ev.xselectionrequest);
1358 break; 1375 break;
1359 1376
1360 case UnmapNotify: 1377 case UnmapNotify:
1361 TermWin.mapped = 0; 1378 TermWin.mapped = 0;
1362#ifdef TEXT_BLINK 1379#ifdef TEXT_BLINK
1363 text_blink_ev.stop (); 1380 text_blink_ev.stop ();
1364#endif 1381#endif
1365 break; 1382 break;
1366 1383
1367 case MapNotify: 1384 case MapNotify:
1368 TermWin.mapped = 1; 1385 TermWin.mapped = 1;
1369#ifdef TEXT_BLINK 1386#ifdef TEXT_BLINK
1370 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1387 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1371#endif 1388#endif
1372 break;
1373
1374 case PropertyNotify:
1375 if (ev->xproperty.atom == xa[XA_VT_SELECTION]) {
1376 if (ev->xproperty.state == PropertyNewValue)
1377 selection_property (ev->xproperty.window,
1378 ev->xproperty.atom);
1379 break; 1389 break;
1380 } 1390
1381#ifdef TRANSPARENT 1391#ifdef TRANSPARENT
1382 /*
1383 * if user used some Esetroot compatible prog to set the root bg,
1384 * use the property to determine the pixmap. We use it later on.
1385 */
1386 if (xa[XA_XROOTPMAPID] == 0)
1387 xa[XA_XROOTPMAPID] = XInternAtom(Xdisplay,
1388 "_XROOTPMAP_ID", False);
1389 if (ev->xproperty.atom != xa[XA_XROOTPMAPID])
1390 break;
1391 /* FALLTHROUGH */
1392 case ReparentNotify: 1392 case ReparentNotify:
1393 if ((Options & Opt_transparent) && check_our_parents ()) { 1393 rootwin_cb (ev);
1394 if (am_transparent) 1394 break;
1395 want_full_refresh = 1;
1396 }
1397#endif /* TRANSPARENT */ 1395#endif /* TRANSPARENT */
1398 break;
1399 1396
1400 case GraphicsExpose: 1397 case GraphicsExpose:
1401 case Expose: 1398 case Expose:
1402 if (ev->xany.window == TermWin.vt) { 1399 if (ev.xany.window == TermWin.vt)
1400 {
1403#ifdef NO_SLOW_LINK_SUPPORT 1401#ifdef NO_SLOW_LINK_SUPPORT
1404 scr_expose (ev->xexpose.x, ev->xexpose.y, 1402 scr_expose (ev.xexpose.x, ev.xexpose.y,
1405 ev->xexpose.width, ev->xexpose.height, False); 1403 ev.xexpose.width, ev.xexpose.height, False);
1406#else 1404#else
1407 // don't understand this, so commented it out 1405 // don't understand this, so commented it out
1408 scr_expose (ev->xexpose.x, ev->xexpose.y, 1406 scr_expose (ev.xexpose.x, ev.xexpose.y,
1409 ev->xexpose.width, ev->xexpose.height, False); 1407 ev.xexpose.width, ev.xexpose.height, False);
1410 //scr_expose (ev->xexpose.x, 0, 1408 //scr_expose (ev.xexpose.x, 0,
1411 // ev->xexpose.width, TermWin.height, False); 1409 // ev.xexpose.width, TermWin.height, False);
1412#endif 1410#endif
1413 want_refresh = 1; 1411 want_refresh = 1;
1414 } else { 1412 }
1415 XEvent unused_xevent; 1413 else
1414 {
1415 XEvent unused_event;
1416 1416
1417 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1418 Expose, 1418 Expose,
1419 &unused_xevent)) ; 1419 &unused_event)) ;
1420 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1420 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1421 GraphicsExpose, 1421 GraphicsExpose,
1422 &unused_xevent)) ; 1422 &unused_event)) ;
1423 if (isScrollbarWindow(ev->xany.window)) { 1423 if (isScrollbarWindow (ev.xany.window))
1424 scrollBar.setIdle(); 1424 {
1425 scrollbar_show (0); 1425 scrollBar.setIdle ();
1426 } 1426 scrollbar_show (0);
1427 }
1427#ifdef MENUBAR 1428#ifdef MENUBAR
1428 if (menubar_visible () && isMenuBarWindow(ev->xany.window)) 1429 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1429 menubar_expose (); 1430 menubar_expose ();
1430#endif 1431#endif
1431#ifdef RXVT_GRAPHICS 1432 }
1432 Gr_expose (ev->xany.window); 1433 break;
1433#endif
1434 }
1435 break;
1436 1434
1437 case MotionNotify: 1435 case MotionNotify:
1438#ifdef POINTER_BLANK 1436#ifdef POINTER_BLANK
1439 if (hidden_pointer) 1437 if (hidden_pointer)
1440 pointer_unblank (); 1438 pointer_unblank ();
1441#endif 1439#endif
1442#if MENUBAR 1440#if MENUBAR
1443 if (isMenuBarWindow(ev->xany.window)) { 1441 if (isMenuBarWindow (ev.xany.window))
1442 {
1444 menubar_control (&(ev->xbutton)); 1443 menubar_control (ev.xbutton);
1445 break; 1444 break;
1446 } 1445 }
1447#endif 1446#endif
1448 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1447 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1449 break; 1448 break;
1450 1449
1451 if (ev->xany.window == TermWin.vt) { 1450 if (ev.xany.window == TermWin.vt)
1451 {
1452 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1452 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1453 while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt, 1453 {
1454 MotionNotify, ev)) ; 1454 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1455 XQueryPointer(Xdisplay, TermWin.vt, 1455 ;
1456 &unused_root, &unused_child, 1456
1457 &unused_root_x, &unused_root_y, 1457 XQueryPointer (display->display, TermWin.vt,
1458 &(ev->xbutton.x), &(ev->xbutton.y), 1458 &unused_root, &unused_child,
1459 &unused_mask); 1459 &unused_root_x, &unused_root_y,
1460 & (ev.xbutton.x), & (ev.xbutton.y),
1461 &unused_mask);
1460#ifdef MOUSE_THRESHOLD 1462#ifdef MOUSE_THRESHOLD
1461 /* deal with a `jumpy' mouse */ 1463 /* deal with a `jumpy' mouse */
1462 if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) { 1464 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1465 {
1463#endif 1466#endif
1464 selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1467 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1465 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1468 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1466#ifdef SELECTION_SCROLLING 1469#ifdef SELECTION_SCROLLING
1467 if (ev->xbutton.y < TermWin.int_bwidth 1470 if (ev.xbutton.y < TermWin.int_bwidth
1468 || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) { 1471 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1469 int dist;
1470
1471 pending_scroll_selection=1;
1472
1473 /* don't clobber the current delay if we are
1474 * already in the middle of scrolling.
1475 */
1476 if (scroll_selection_delay<=0)
1477 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1478
1479 /* save the event params so we can highlight
1480 * the selection in the pending-scroll loop
1481 */
1482 selection_save_x=ev->xbutton.x;
1483 selection_save_y=ev->xbutton.y;
1484 selection_save_state=
1485 (ev->xbutton.state & Button3Mask) ? 2 : 0;
1486
1487 /* calc number of lines to scroll */
1488 if (ev->xbutton.y<TermWin.int_bwidth) {
1489 scroll_selection_dir = UP;
1490 dist = TermWin.int_bwidth - ev->xbutton.y;
1491 }
1492 else {
1493 scroll_selection_dir = DN;
1494 dist = ev->xbutton.y -
1495 (TermWin.int_bwidth + TermWin.height);
1496 }
1497 scroll_selection_lines=(Pixel2Height(dist)/
1498 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1499 MIN_IT(scroll_selection_lines,
1500 SELECTION_SCROLL_MAX_LINES);
1501 }
1502 else {
1503 /* we are within the text window, so we
1504 * shouldn't be scrolling
1505 */
1506 pending_scroll_selection = 0;
1507 }
1508#endif
1509#ifdef MOUSE_THRESHOLD
1510 }
1511#endif
1512 }
1513 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1514 while (XCheckTypedWindowEvent(Xdisplay, scrollBar.win,
1515 MotionNotify, ev)) ;
1516 XQueryPointer(Xdisplay, scrollBar.win,
1517 &unused_root, &unused_child,
1518 &unused_root_x, &unused_root_y,
1519 &(ev->xbutton.x), &(ev->xbutton.y),
1520 &unused_mask);
1521 scr_move_to (scrollbar_position(ev->xbutton.y) - csrO,
1522 scrollbar_size());
1523 scr_refresh (refresh_type);
1524 refresh_limit = 0;
1525 scrollbar_show (1);
1526 }
1527 break;
1528 }
1529}
1530
1531void
1532rxvt_term::button_press (XButtonEvent *ev)
1533{
1534 int reportmode = 0, clickintime;
1535
1536 bypass_keystate = ev->state & (ModMetaMask | ShiftMask);
1537 if (!bypass_keystate)
1538 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1539/*
1540 * VT window processing of button press
1541 */
1542 if (ev->window == TermWin.vt)
1543 {
1544#if RXVT_GRAPHICS
1545 if (ev->subwindow != None)
1546 rxvt_Gr_ButtonPress (ev->x, ev->y);
1547 else
1548#endif
1549 {
1550 clickintime = ev->time - MEvent.time < MULTICLICK_TIME;
1551 if (reportmode)
1552 {
1553 /* mouse report from vt window */
1554 /* save the xbutton state (for ButtonRelease) */
1555 MEvent.state = ev->state;
1556#ifdef MOUSE_REPORT_DOUBLECLICK
1557 if (ev->button == MEvent.button && clickintime)
1558 {
1559 /* same button, within alloted time */
1560 MEvent.clicks++;
1561 if (MEvent.clicks > 1)
1562 { 1472 {
1563 /* only report double clicks */ 1473 int dist;
1564 MEvent.clicks = 2;
1565 mouse_report (ev);
1566 1474
1567 /* don't report the release */ 1475 pending_scroll_selection=1;
1568 MEvent.clicks = 0; 1476
1569 MEvent.button = AnyButton; 1477 /* don't clobber the current delay if we are
1570 } 1478 * already in the middle of scrolling.
1571 }
1572 else
1573 { 1479 */
1574 /* different button, or time expired */ 1480 if (scroll_selection_delay<=0)
1575 MEvent.clicks = 1; 1481 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1576 MEvent.button = ev->button; 1482
1577 mouse_report (ev); 1483 /* save the event params so we can highlight
1578 } 1484 * the selection in the pending-scroll loop
1579#else
1580 MEvent.button = ev->button;
1581 mouse_report (ev);
1582#endif /* MOUSE_REPORT_DOUBLECLICK */
1583 }
1584 else
1585 {
1586 if (ev->button != MEvent.button)
1587 MEvent.clicks = 0;
1588 switch (ev->button)
1589 { 1485 */
1590 case Button1: 1486 selection_save_x=ev.xbutton.x;
1591 /* allow shift+left click to extend selection */ 1487 selection_save_y=ev.xbutton.y;
1592 if (ev->state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1488 selection_save_state=
1489 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1490
1491 /* calc number of lines to scroll */
1492 if (ev.xbutton.y<TermWin.int_bwidth)
1593 { 1493 {
1594 if (MEvent.button == Button1 && clickintime) 1494 scroll_selection_dir = UP;
1595 selection_rotate (ev->x, ev->y); 1495 dist = TermWin.int_bwidth - ev.xbutton.y;
1596 else
1597 selection_extend (ev->x, ev->y, 1);
1598 } 1496 }
1599 else 1497 else
1600 { 1498 {
1601 if (MEvent.button == Button1 && clickintime) 1499 scroll_selection_dir = DN;
1602 MEvent.clicks++; 1500 dist = ev.xbutton.y -
1603 else 1501 (TermWin.int_bwidth + TermWin.height);
1604 MEvent.clicks = 1;
1605
1606 selection_click (MEvent.clicks, ev->x, ev->y);
1607 } 1502 }
1503 scroll_selection_lines= (Pixel2Height (dist)/
1504 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1505 MIN_IT (scroll_selection_lines,
1506 SELECTION_SCROLL_MAX_LINES);
1507 }
1508 else
1509 {
1510 /* we are within the text window, so we
1511 * shouldn't be scrolling
1512 */
1513 pending_scroll_selection = 0;
1514 }
1515#endif
1516#ifdef MOUSE_THRESHOLD
1608 1517
1518 }
1519#endif
1520
1521 }
1522 }
1523 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1524 {
1525 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1526 MotionNotify, &ev)) ;
1527 XQueryPointer (display->display, scrollBar.win,
1528 &unused_root, &unused_child,
1529 &unused_root_x, &unused_root_y,
1530 & (ev.xbutton.x), & (ev.xbutton.y),
1531 &unused_mask);
1532 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1533 scrollbar_size ());
1534 scr_refresh (refresh_type);
1535 refresh_limit = 0;
1536 scrollbar_show (1);
1537 }
1538 break;
1539 }
1540}
1541
1542void
1543rxvt_term::rootwin_cb (XEvent &ev)
1544{
1545 SET_R (this);
1546 SET_LOCALE (locale);
1547
1548 switch (ev.type)
1549 {
1550 case PropertyNotify:
1551 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1552 {
1553 if (ev.xproperty.state == PropertyNewValue)
1554 selection_property (ev.xproperty.window, ev.xproperty.atom);
1555 break;
1556 }
1557#ifdef TRANSPARENT
1558 else
1559 {
1560 /*
1561 * if user used some Esetroot compatible prog to set the root bg,
1562 * use the property to determine the pixmap. We use it later on.
1563 */
1564 if (xa[XA_XROOTPMAPID] == 0)
1565 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1566
1567 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1568 return;
1569 }
1570
1571 /* FALLTHROUGH */
1572 case ReparentNotify:
1573 if ((Options & Opt_transparent) && check_our_parents ())
1574 if (am_transparent)
1575 want_full_refresh = 1;
1576 break;
1577#endif
1578 }
1579}
1580
1581void
1582rxvt_term::button_press (XButtonEvent &ev)
1583{
1584 int reportmode = 0, clickintime;
1585
1586 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1587 if (!bypass_keystate)
1588 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1589 /*
1590 * VT window processing of button press
1591 */
1592 if (ev.window == TermWin.vt)
1593 {
1594 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1595 if (reportmode)
1596 {
1597 /* mouse report from vt window */
1598 /* save the xbutton state (for ButtonRelease) */
1599 MEvent.state = ev.state;
1600#ifdef MOUSE_REPORT_DOUBLECLICK
1601 if (ev.button == MEvent.button && clickintime)
1602 {
1603 /* same button, within alloted time */
1604 MEvent.clicks++;
1605 if (MEvent.clicks > 1)
1606 {
1607 /* only report double clicks */
1608 MEvent.clicks = 2;
1609 mouse_report (ev);
1610
1611 /* don't report the release */
1612 MEvent.clicks = 0;
1613 MEvent.button = AnyButton;
1614 }
1615 }
1616 else
1617 {
1618 /* different button, or time expired */
1619 MEvent.clicks = 1;
1620 MEvent.button = ev.button;
1621 mouse_report (ev);
1622 }
1623#else
1624 MEvent.button = ev.button;
1625 mouse_report (ev);
1626#endif /* MOUSE_REPORT_DOUBLECLICK */
1627
1628 }
1629 else
1630 {
1631 if (ev.button != MEvent.button)
1632 MEvent.clicks = 0;
1633 switch (ev.button)
1634 {
1635 case Button1:
1636 /* allow shift+left click to extend selection */
1637 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1638 {
1639 if (MEvent.button == Button1 && clickintime)
1640 selection_rotate (ev.x, ev.y);
1641 else
1642 selection_extend (ev.x, ev.y, 1);
1643 }
1644 else
1645 {
1646 if (MEvent.button == Button1 && clickintime)
1647 MEvent.clicks++;
1648 else
1649 MEvent.clicks = 1;
1650
1651 selection_click (MEvent.clicks, ev.x, ev.y);
1652 }
1653
1609 MEvent.button = Button1; 1654 MEvent.button = Button1;
1655 break;
1656
1657 case Button3:
1658 if (MEvent.button == Button3 && clickintime)
1659 selection_rotate (ev.x, ev.y);
1660 else
1661 selection_extend (ev.x, ev.y, 1);
1662 MEvent.button = Button3;
1663 break;
1664 }
1665 }
1666 MEvent.time = ev.time;
1667 return;
1668 }
1669
1670 /*
1671 * Scrollbar window processing of button press
1672 */
1673 if (isScrollbarWindow (ev.window))
1674 {
1675 scrollBar.setIdle ();
1676 /*
1677 * Rxvt-style scrollbar:
1678 * move up if mouse is above slider
1679 * move dn if mouse is below slider
1680 *
1681 * XTerm-style scrollbar:
1682 * Move display proportional to pointer location
1683 * pointer near top -> scroll one line
1684 * pointer near bot -> scroll full page
1685 */
1686#ifndef NO_SCROLLBAR_REPORT
1687 if (reportmode)
1688 {
1689 /*
1690 * Mouse report disabled scrollbar:
1691 * arrow buttons - send up/down
1692 * click on scrollbar - send pageup/down
1693 */
1694 if ((scrollBar.style == R_SB_NEXT
1695 && scrollbarnext_upButton (ev.y))
1696 || (scrollBar.style == R_SB_RXVT
1697 && scrollbarrxvt_upButton (ev.y)))
1698 tt_printf ("\033[A");
1699 else if ((scrollBar.style == R_SB_NEXT
1700 && scrollbarnext_dnButton (ev.y))
1701 || (scrollBar.style == R_SB_RXVT
1702 && scrollbarrxvt_dnButton (ev.y)))
1703 tt_printf ("\033[B");
1704 else
1705 switch (ev.button)
1706 {
1707 case Button2:
1708 tt_printf ("\014");
1709 break;
1710 case Button1:
1711 tt_printf ("\033[6~");
1712 break;
1713 case Button3:
1714 tt_printf ("\033[5~");
1715 break;
1716 }
1717 }
1718 else
1719#endif /* NO_SCROLLBAR_REPORT */
1720
1721 {
1722 char upordown = 0;
1723
1724 if (scrollBar.style == R_SB_NEXT)
1725 {
1726 if (scrollbarnext_upButton (ev.y))
1727 upordown = -1; /* up */
1728 else if (scrollbarnext_dnButton (ev.y))
1729 upordown = 1; /* down */
1730 }
1731 else if (scrollBar.style == R_SB_RXVT)
1732 {
1733 if (scrollbarrxvt_upButton (ev.y))
1734 upordown = -1; /* up */
1735 else if (scrollbarrxvt_dnButton (ev.y))
1736 upordown = 1; /* down */
1737 }
1738 if (upordown)
1739 {
1740#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1741 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1742#endif
1743 if (scr_page (upordown < 0 ? UP : DN, 1))
1744 {
1745 if (upordown < 0)
1746 scrollBar.setUp ();
1747 else
1748 scrollBar.setDn ();
1749 }
1750 }
1751 else
1752 switch (ev.button)
1753 {
1754 case Button2:
1755 switch (scrollbar_align)
1756 {
1757 case R_SB_ALIGN_TOP:
1758 csrO = 0;
1610 break; 1759 break;
1611 1760 case R_SB_ALIGN_CENTRE:
1612 case Button3: 1761 csrO = (scrollBar.bot - scrollBar.top) / 2;
1613 if (MEvent.button == Button3 && clickintime)
1614 selection_rotate (ev->x, ev->y);
1615 else
1616 selection_extend (ev->x, ev->y, 1);
1617 MEvent.button = Button3;
1618 break; 1762 break;
1763 case R_SB_ALIGN_BOTTOM:
1764 csrO = scrollBar.bot - scrollBar.top;
1765 break;
1766 }
1767 if (scrollBar.style == R_SB_XTERM
1768 || scrollbar_above_slider (ev.y)
1769 || scrollbar_below_slider (ev.y))
1770 scr_move_to ( scrollbar_position (ev.y) - csrO,
1771 scrollbar_size ());
1772 scrollBar.setMotion ();
1773 break;
1774
1775 case Button1:
1776 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1777 csrO = ev.y - scrollBar.top;
1778 /* FALLTHROUGH */
1779
1780 case Button3:
1781 if (scrollBar.style != R_SB_XTERM)
1782 {
1783 if (scrollbar_above_slider (ev.y))
1784# ifdef RXVT_SCROLL_FULL
1785 scr_page (UP, TermWin.nrow - 1);
1786# else
1787 scr_page (UP, TermWin.nrow / 4);
1788# endif
1789 else if (scrollbar_below_slider (ev.y))
1790# ifdef RXVT_SCROLL_FULL
1791 scr_page (DN, TermWin.nrow - 1);
1792# else
1793 scr_page (DN, TermWin.nrow / 4);
1794# endif
1795 else
1796 scrollBar.setMotion ();
1797 }
1798 else
1799 {
1800 scr_page ((ev.button == Button1 ? DN : UP),
1801 (TermWin.nrow
1802 * scrollbar_position (ev.y)
1803 / scrollbar_size ()));
1804 }
1805 break;
1806 }
1619 } 1807 }
1620 }
1621 MEvent.time = ev->time;
1622 return; 1808 return;
1623 }
1624 }
1625
1626/*
1627 * Scrollbar window processing of button press
1628 */
1629 if (isScrollbarWindow(ev->window))
1630 {
1631 scrollBar.setIdle ();
1632 /*
1633 * Rxvt-style scrollbar:
1634 * move up if mouse is above slider
1635 * move dn if mouse is below slider
1636 *
1637 * XTerm-style scrollbar:
1638 * Move display proportional to pointer location
1639 * pointer near top -> scroll one line
1640 * pointer near bot -> scroll full page
1641 */
1642#ifndef NO_SCROLLBAR_REPORT
1643 if (reportmode) {
1644 /*
1645 * Mouse report disabled scrollbar:
1646 * arrow buttons - send up/down
1647 * click on scrollbar - send pageup/down
1648 */
1649 if ((scrollBar.style == R_SB_NEXT
1650 && scrollbarnext_upButton(ev->y))
1651 || (scrollBar.style == R_SB_RXVT
1652 && scrollbarrxvt_upButton(ev->y)))
1653 tt_printf("\033[A");
1654 else if ((scrollBar.style == R_SB_NEXT
1655 && scrollbarnext_dnButton(ev->y))
1656 || (scrollBar.style == R_SB_RXVT
1657 && scrollbarrxvt_dnButton(ev->y)))
1658 tt_printf("\033[B");
1659 else
1660 switch (ev->button) {
1661 case Button2:
1662 tt_printf("\014");
1663 break;
1664 case Button1:
1665 tt_printf("\033[6~");
1666 break;
1667 case Button3:
1668 tt_printf("\033[5~");
1669 break;
1670 }
1671 }
1672 else
1673#endif /* NO_SCROLLBAR_REPORT */
1674 {
1675 char upordown = 0;
1676
1677 if (scrollBar.style == R_SB_NEXT) {
1678 if (scrollbarnext_upButton(ev->y))
1679 upordown = -1; /* up */
1680 else if (scrollbarnext_dnButton(ev->y))
1681 upordown = 1; /* down */
1682 } else if (scrollBar.style == R_SB_RXVT) {
1683 if (scrollbarrxvt_upButton(ev->y))
1684 upordown = -1; /* up */
1685 else if (scrollbarrxvt_dnButton(ev->y))
1686 upordown = 1; /* down */
1687 } 1809 }
1688 if (upordown) { 1810#if MENUBAR
1811 /*
1812 * Menubar window processing of button press
1813 */
1814 if (isMenuBarWindow (ev.window))
1815 menubar_control (ev);
1816#endif
1817}
1818
1819void
1820rxvt_term::button_release (XButtonEvent &ev)
1821{
1822 int reportmode = 0;
1823
1824 csrO = 0; /* reset csr Offset */
1825 if (!bypass_keystate)
1826 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1827
1828 if (scrollbar_isUpDn ())
1829 {
1830 scrollBar.setIdle ();
1831 scrollbar_show (0);
1689#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1832#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1690 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1833 refresh_type &= ~SMOOTH_REFRESH;
1691#endif
1692 if (scr_page (upordown < 0 ? UP : DN, 1)) {
1693 if (upordown < 0)
1694 scrollBar.setUp ();
1695 else
1696 scrollBar.setDn ();
1697 }
1698 } else
1699 switch (ev->button) {
1700 case Button2:
1701 switch (scrollbar_align) {
1702 case R_SB_ALIGN_TOP:
1703 csrO = 0;
1704 break;
1705 case R_SB_ALIGN_CENTRE:
1706 csrO = (scrollBar.bot - scrollBar.top) / 2;
1707 break;
1708 case R_SB_ALIGN_BOTTOM:
1709 csrO = scrollBar.bot - scrollBar.top;
1710 break;
1711 }
1712 if (scrollBar.style == R_SB_XTERM
1713 || scrollbar_above_slider(ev->y)
1714 || scrollbar_below_slider(ev->y))
1715 scr_move_to ( scrollbar_position(ev->y) - csrO,
1716 scrollbar_size());
1717 scrollBar.setMotion ();
1718 break;
1719
1720 case Button1:
1721 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1722 csrO = ev->y - scrollBar.top;
1723 /* FALLTHROUGH */
1724
1725 case Button3:
1726 if (scrollBar.style != R_SB_XTERM) {
1727 if (scrollbar_above_slider(ev->y))
1728# ifdef RXVT_SCROLL_FULL
1729 scr_page (UP, TermWin.nrow - 1);
1730# else
1731 scr_page (UP, TermWin.nrow / 4);
1732# endif 1834#endif
1733 else if (scrollbar_below_slider(ev->y))
1734# ifdef RXVT_SCROLL_FULL
1735 scr_page (DN, TermWin.nrow - 1);
1736# else
1737 scr_page (DN, TermWin.nrow / 4);
1738# endif
1739 else
1740 scrollBar.setMotion ();
1741 } else {
1742 scr_page ((ev->button == Button1 ? DN : UP),
1743 (TermWin.nrow
1744 * scrollbar_position(ev->y)
1745 / scrollbar_size()));
1746 }
1747 break;
1748 }
1749 }
1750 return;
1751 }
1752#if MENUBAR
1753 /*
1754 * Menubar window processing of button press
1755 */
1756 if (isMenuBarWindow(ev->window))
1757 menubar_control (ev);
1758#endif
1759}
1760 1835
1761void
1762rxvt_term::button_release (XButtonEvent *ev)
1763{
1764 int reportmode = 0;
1765
1766 csrO = 0; /* reset csr Offset */
1767 if (!bypass_keystate)
1768 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1769
1770 if (scrollbar_isUpDn()) {
1771 scrollBar.setIdle ();
1772 scrollbar_show (0);
1773#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1774 refresh_type &= ~SMOOTH_REFRESH;
1775#endif
1776 } 1836 }
1777#ifdef SELECTION_SCROLLING 1837#ifdef SELECTION_SCROLLING
1778 pending_scroll_selection=0; 1838 pending_scroll_selection=0;
1779#endif 1839#endif
1780 if (ev->window == TermWin.vt) 1840 if (ev.window == TermWin.vt)
1781 { 1841 {
1782#ifdef RXVT_GRAPHICS
1783 if (ev->subwindow != None)
1784 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1785 else
1786#endif
1787 {
1788 if (reportmode) 1842 if (reportmode)
1789 { 1843 {
1790 /* mouse report from vt window */ 1844 /* mouse report from vt window */
1791 /* don't report release of wheel "buttons" */ 1845 /* don't report release of wheel "buttons" */
1792 if (ev->button >= 4) 1846 if (ev.button >= 4)
1793 return; 1847 return;
1794#ifdef MOUSE_REPORT_DOUBLECLICK 1848#ifdef MOUSE_REPORT_DOUBLECLICK
1795 /* only report the release of 'slow' single clicks */ 1849 /* only report the release of 'slow' single clicks */
1796 if (MEvent.button != AnyButton 1850 if (MEvent.button != AnyButton
1797 && (ev->button != MEvent.button 1851 && (ev.button != MEvent.button
1798 || (ev->time - MEvent.time 1852 || (ev.time - MEvent.time
1799 > MULTICLICK_TIME / 2))) 1853 > MULTICLICK_TIME / 2)))
1800 { 1854 {
1801 MEvent.clicks = 0; 1855 MEvent.clicks = 0;
1802 MEvent.button = AnyButton; 1856 MEvent.button = AnyButton;
1803 mouse_report (ev); 1857 mouse_report (ev);
1804 } 1858 }
1805#else /* MOUSE_REPORT_DOUBLECLICK */ 1859#else /* MOUSE_REPORT_DOUBLECLICK */
1806 MEvent.button = AnyButton; 1860 MEvent.button = AnyButton;
1807 mouse_report (ev); 1861 mouse_report (ev);
1808#endif /* MOUSE_REPORT_DOUBLECLICK */ 1862#endif /* MOUSE_REPORT_DOUBLECLICK */
1809 return; 1863 return;
1810 } 1864 }
1811 /* 1865 /*
1812 * dumb hack to compensate for the failure of click-and-drag 1866 * dumb hack to compensate for the failure of click-and-drag
1813 * when overriding mouse reporting 1867 * when overriding mouse reporting
1814 */ 1868 */
1815 if (PrivateModes & PrivMode_mouse_report 1869 if (PrivateModes & PrivMode_mouse_report
1816 && bypass_keystate 1870 && bypass_keystate
1817 && ev->button == Button1 && MEvent.clicks <= 1) 1871 && ev.button == Button1 && MEvent.clicks <= 1)
1818 selection_extend (ev->x, ev->y, 0); 1872 selection_extend (ev.x, ev.y, 0);
1819 1873
1820 switch (ev->button) { 1874 switch (ev.button)
1875 {
1821 case Button1: 1876 case Button1:
1822 case Button3: 1877 case Button3:
1823 selection_make (ev->time); 1878 selection_make (ev.time);
1824 break; 1879 break;
1825 case Button2: 1880 case Button2:
1826 selection_request (ev->time, ev->x, ev->y); 1881 selection_request (ev.time, ev.x, ev.y);
1827 break; 1882 break;
1828#ifdef MOUSE_WHEEL 1883#ifdef MOUSE_WHEEL
1829 case Button4: 1884 case Button4:
1830 case Button5: 1885 case Button5:
1831 { 1886 {
1832 int i; 1887 int i;
1833 page_dirn v; 1888 page_dirn v;
1834 1889
1835 v = (ev->button == Button4) ? UP : DN; 1890 v = (ev.button == Button4) ? UP : DN;
1836 if (ev->state & ShiftMask) 1891 if (ev.state & ShiftMask)
1837 i = 1; 1892 i = 1;
1838 else if ((Options & Opt_mouseWheelScrollPage)) 1893 else if ((Options & Opt_mouseWheelScrollPage))
1839 i = TermWin.nrow - 1; 1894 i = TermWin.nrow - 1;
1840 else 1895 else
1841 i = 5; 1896 i = 5;
1842# ifdef MOUSE_SLIP_WHEELING 1897# ifdef MOUSE_SLIP_WHEELING
1843 if (ev->state & ControlMask) 1898 if (ev.state & ControlMask)
1844 { 1899 {
1845 mouse_slip_wheel_speed += (v ? -1 : 1); 1900 mouse_slip_wheel_speed += (v ? -1 : 1);
1846 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1901 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1847 } 1902 }
1848# endif 1903# endif
1849# ifdef JUMP_MOUSE_WHEEL 1904# ifdef JUMP_MOUSE_WHEEL
1850 scr_page (v, i); 1905 scr_page (v, i);
1851 scr_refresh (SMOOTH_REFRESH); 1906 scr_refresh (SMOOTH_REFRESH);
1852 scrollbar_show (1); 1907 scrollbar_show (1);
1853# else 1908# else
1854 while (i--) 1909 while (i--)
1855 { 1910 {
1856 scr_page (v, 1); 1911 scr_page (v, 1);
1857 scr_refresh (SMOOTH_REFRESH); 1912 scr_refresh (SMOOTH_REFRESH);
1858 scrollbar_show (1); 1913 scrollbar_show (1);
1859 } 1914 }
1860# endif 1915# endif
1861 } 1916
1862 break; 1917 }
1918 break;
1863#endif 1919#endif
1864 } 1920
1865 }
1866 } 1921 }
1922 }
1867#ifdef MENUBAR 1923#ifdef MENUBAR
1868 else if (isMenuBarWindow(ev->window)) 1924 else if (isMenuBarWindow (ev.window))
1869 menubar_control (ev); 1925 menubar_control (ev);
1870#endif 1926#endif
1871} 1927}
1872 1928
1873 1929
1874#ifdef TRANSPARENT 1930#ifdef TRANSPARENT
… …
1877 * Do transparency updates if required 1933 * Do transparency updates if required
1878 */ 1934 */
1879int 1935int
1880rxvt_term::check_our_parents () 1936rxvt_term::check_our_parents ()
1881{ 1937{
1882 int i, pchanged, aformat, have_pixmap, rootdepth; 1938 int i, pchanged, aformat, have_pixmap, rootdepth;
1883 unsigned long nitems, bytes_after; 1939 unsigned long nitems, bytes_after;
1884 Atom atype; 1940 Atom atype;
1885 unsigned char *prop = NULL; 1941 unsigned char *prop = NULL;
1886 Window root, oldp, *list; 1942 Window root, oldp, *list;
1887 Pixmap rootpixmap = None; 1943 Pixmap rootpixmap = None;
1888 XWindowAttributes wattr, wrootattr; 1944 XWindowAttributes wattr, wrootattr;
1889 1945
1890 pchanged = 0; 1946 pchanged = 0;
1891 1947
1892 if (!(Options & Opt_transparent)) 1948 if (! (Options & Opt_transparent))
1893 return pchanged; /* Don't try any more */ 1949 return pchanged; /* Don't try any more */
1894 1950
1895 XGetWindowAttributes(Xdisplay, Xroot, &wrootattr); 1951 XGetWindowAttributes (display->display, display->root, &wrootattr);
1896 rootdepth = wrootattr.depth; 1952 rootdepth = wrootattr.depth;
1897 1953
1898 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 1954 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1899 if (rootdepth != wattr.depth) { 1955 if (rootdepth != wattr.depth)
1956 {
1900 if (am_transparent) { 1957 if (am_transparent)
1958 {
1901 pchanged = 1; 1959 pchanged = 1;
1902 XSetWindowBackground(Xdisplay, TermWin.vt, 1960 XSetWindowBackground (display->display, TermWin.vt,
1903 PixColors[Color_bg]); 1961 PixColors[Color_bg]);
1904 am_transparent = am_pixmap_trans = 0; 1962 am_transparent = am_pixmap_trans = 0;
1905 } 1963 }
1906 return pchanged; /* Don't try any more */ 1964 return pchanged; /* Don't try any more */
1907 } 1965 }
1908 1966
1909/* Get all X ops out of the queue so that our information is up-to-date. */ 1967 /* Get all X ops out of the queue so that our information is up-to-date. */
1910 XSync(Xdisplay, False); 1968 XSync (display->display, False);
1911 1969
1912/* 1970 /*
1913 * Make the frame window set by the window manager have 1971 * Make the frame window set by the window manager have
1914 * the root background. Some window managers put multiple nested frame 1972 * the root background. Some window managers put multiple nested frame
1915 * windows for each client, so we have to take care about that. 1973 * windows for each client, so we have to take care about that.
1916 */ 1974 */
1917 i = (xa[XA_XROOTPMAPID] != 0 1975 i = (xa[XA_XROOTPMAPID] != 0
1918 && (XGetWindowProperty(Xdisplay, Xroot, xa[XA_XROOTPMAPID], 1976 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1919 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1977 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1920 &nitems, &bytes_after, &prop) == Success)); 1978 &nitems, &bytes_after, &prop) == Success));
1921 if (!i || prop == NULL) 1979 if (!i || prop == NULL)
1922 have_pixmap = 0; 1980 have_pixmap = 0;
1923 else { 1981 else
1982 {
1924 have_pixmap = 1; 1983 have_pixmap = 1;
1925 rootpixmap = *((Pixmap *)prop); 1984 rootpixmap = * ((Pixmap *)prop);
1926 XFree(prop); 1985 XFree (prop);
1927 } 1986 }
1928 if (have_pixmap) { 1987 if (have_pixmap)
1929/* 1988 {
1989 /*
1930 * Copy Xroot pixmap transparency 1990 * Copy display->root pixmap transparency
1931 */ 1991 */
1932 int sx, sy, nx, ny; 1992 int sx, sy, nx, ny;
1933 unsigned int nw, nh; 1993 unsigned int nw, nh;
1934 Window cr; 1994 Window cr;
1935 XImage *image; 1995 XImage *image;
1936 GC gc; 1996 GC gc;
1937 XGCValues gcvalue; 1997 XGCValues gcvalue;
1938 1998
1939 XTranslateCoordinates(Xdisplay, TermWin.parent[0], Xroot, 1999 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1940 0, 0, &sx, &sy, &cr); 2000 0, 0, &sx, &sy, &cr);
1941 nw = (unsigned int)szHint.width; 2001 nw = (unsigned int)szHint.width;
1942 nh = (unsigned int)szHint.height; 2002 nh = (unsigned int)szHint.height;
1943 nx = ny = 0; 2003 nx = ny = 0;
1944 if (sx < 0) { 2004 if (sx < 0)
2005 {
1945 nw += sx; 2006 nw += sx;
1946 nx = -sx; 2007 nx = -sx;
1947 sx = 0; 2008 sx = 0;
1948 } 2009 }
1949 if (sy < 0) { 2010 if (sy < 0)
2011 {
1950 nh += sy; 2012 nh += sy;
1951 ny = -sy; 2013 ny = -sy;
1952 sy = 0; 2014 sy = 0;
1953 } 2015 }
1954 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2016 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1955 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2017 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1956 allowedxerror = -1; 2018 allowedxerror = -1;
1957 image = XGetImage(Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 2019 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1958 ZPixmap); 2020 ZPixmap);
1959 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2021 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1960 /* XXX: may need a delay here? */ 2022 /* XXX: may need a delay here? */
1961 allowedxerror = 0; 2023 allowedxerror = 0;
1962 if (image == NULL) { 2024 if (image == NULL)
2025 {
1963 if (am_transparent && am_pixmap_trans) { 2026 if (am_transparent && am_pixmap_trans)
1964 pchanged = 1; 2027 {
2028 pchanged = 1;
1965 if (TermWin.pixmap != None) { 2029 if (TermWin.pixmap != None)
2030 {
1966 XFreePixmap(Xdisplay, TermWin.pixmap); 2031 XFreePixmap (display->display, TermWin.pixmap);
1967 TermWin.pixmap = None; 2032 TermWin.pixmap = None;
1968 } 2033 }
1969 } 2034 }
1970 am_pixmap_trans = 0; 2035 am_pixmap_trans = 0;
1971 } else { 2036 }
2037 else
2038 {
1972 if (TermWin.pixmap != None) 2039 if (TermWin.pixmap != None)
1973 XFreePixmap(Xdisplay, TermWin.pixmap); 2040 XFreePixmap (display->display, TermWin.pixmap);
1974 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, 2041 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1975 (unsigned int)szHint.width, 2042 (unsigned int)szHint.width,
1976 (unsigned int)szHint.height, 2043 (unsigned int)szHint.height,
1977 (unsigned int)image->depth); 2044 (unsigned int)image->depth);
1978 gc = XCreateGC(Xdisplay, TermWin.vt, 0UL, &gcvalue); 2045 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1979 XPutImage(Xdisplay, TermWin.pixmap, gc, image, 0, 0, 2046 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1980 nx, ny, (unsigned int)image->width, 2047 nx, ny, (unsigned int)image->width,
1981 (unsigned int)image->height); 2048 (unsigned int)image->height);
1982 XFreeGC(Xdisplay, gc); 2049 XFreeGC (display->display, gc);
1983 XDestroyImage(image); 2050 XDestroyImage (image);
1984 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2051 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
1985 TermWin.pixmap); 2052 TermWin.pixmap);
1986 if (!am_transparent || !am_pixmap_trans) 2053 if (!am_transparent || !am_pixmap_trans)
1987 pchanged = 1; 2054 pchanged = 1;
1988 am_transparent = am_pixmap_trans = 1; 2055 am_transparent = am_pixmap_trans = 1;
1989 } 2056 }
1990 } 2057 }
1991 if (!am_pixmap_trans) { 2058 if (!am_pixmap_trans)
2059 {
1992 unsigned int n; 2060 unsigned int n;
1993/* 2061 /*
1994 * InheritPixmap transparency 2062 * InheritPixmap transparency
1995 */ 2063 */
1996 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2064 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1997 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2065 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
1998 i++) { 2066 i++)
2067 {
1999 oldp = TermWin.parent[i]; 2068 oldp = TermWin.parent[i];
2000 XQueryTree(Xdisplay, TermWin.parent[i - 1], &root, 2069 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2001 &TermWin.parent[i], &list, &n); 2070 &TermWin.parent[i], &list, &n);
2002 XFree(list); 2071 XFree (list);
2003 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2072 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2004 if (TermWin.parent[i] == Xroot) { 2073 if (TermWin.parent[i] == display->root)
2005 if (oldp != None) 2074 {
2006 pchanged = 1; 2075 if (oldp != None)
2007 break; 2076 pchanged = 1;
2008 } 2077 break;
2078 }
2009 if (oldp != TermWin.parent[i]) 2079 if (oldp != TermWin.parent[i])
2010 pchanged = 1; 2080 pchanged = 1;
2011 } 2081 }
2012 n = 0; 2082 n = 0;
2013 if (pchanged) { 2083 if (pchanged)
2084 {
2014 for (; n < (unsigned int)i; n++) { 2085 for (; n < (unsigned int)i; n++)
2086 {
2015 XGetWindowAttributes(Xdisplay, TermWin.parent[n], &wattr); 2087 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2016 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2088 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2017 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { 2089 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2090 {
2018 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2091 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2019 break; 2092 break;
2020 } 2093 }
2021 } 2094 }
2022 } 2095 }
2023 if (n > (int)(sizeof(TermWin.parent) 2096 if (n > (int) (sizeof (TermWin.parent)
2024 / sizeof(TermWin.parent[0]))) { 2097 / sizeof (TermWin.parent[0])))
2098 {
2025 D_X((stderr, "InheritPixmap Turning off")); 2099 D_X ((stderr, "InheritPixmap Turning off"));
2026 XSetWindowBackground(Xdisplay, TermWin.parent[0], 2100 XSetWindowBackground (display->display, TermWin.parent[0],
2027 PixColors[Color_fg]); 2101 PixColors[Color_fg]);
2028 XSetWindowBackground(Xdisplay, TermWin.vt, 2102 XSetWindowBackground (display->display, TermWin.vt,
2029 PixColors[Color_bg]); 2103 PixColors[Color_bg]);
2030 am_transparent = 0; 2104 am_transparent = 0;
2031 /* XXX: also turn off Opt_transparent? */ 2105 /* XXX: also turn off Opt_transparent? */
2032 } else { 2106 }
2107 else
2108 {
2033 /* wait (an arbitrary period) for the WM to do its thing 2109 /* wait (an arbitrary period) for the WM to do its thing
2034 * needed for fvwm2.2.2 (and before?) */ 2110 * needed for fvwm2.2.2 (and before?) */
2035# ifdef HAVE_NANOSLEEP 2111# ifdef HAVE_NANOSLEEP
2036 struct timespec rqt; 2112 struct timespec rqt;
2037 2113
2038 rqt.tv_sec = 1; 2114 rqt.tv_sec = 1;
2039 rqt.tv_nsec = 0; 2115 rqt.tv_nsec = 0;
2040 nanosleep(&rqt, NULL); 2116 nanosleep (&rqt, NULL);
2041# else 2117# else
2042 sleep(1); 2118 sleep (1);
2043# endif 2119# endif
2044 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2120 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2045 for (n = 0; n < (unsigned int)i; n++) 2121 for (n = 0; n < (unsigned int)i; n++)
2046 XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n], 2122 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2047 ParentRelative); 2123 ParentRelative);
2048 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2124 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2049 ParentRelative); 2125 ParentRelative);
2050 am_transparent = 1; 2126 am_transparent = 1;
2051 } 2127 }
2052 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2128 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2053 TermWin.parent[i] = None; 2129 TermWin.parent[i] = None;
2054 } 2130 }
2055 return pchanged; 2131 return pchanged;
2056} 2132}
2057#endif 2133#endif
2058 2134
2059/*}}} */ 2135/*}}} */
2060 2136
… …
2062/*----------------------------------------------------------------------*/ 2138/*----------------------------------------------------------------------*/
2063#ifdef PRINTPIPE 2139#ifdef PRINTPIPE
2064FILE * 2140FILE *
2065rxvt_term::popen_printer () 2141rxvt_term::popen_printer ()
2066{ 2142{
2067 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2143 FILE *stream = popen (rs[Rs_print_pipe], "w");
2068 2144
2069 if (stream == NULL) 2145 if (stream == NULL)
2070 rxvt_print_error("can't open printer pipe"); 2146 rxvt_print_error ("can't open printer pipe");
2071 return stream; 2147 return stream;
2072} 2148}
2073 2149
2074int 2150int
2075rxvt_term::pclose_printer (FILE *stream) 2151rxvt_term::pclose_printer (FILE *stream)
2076{ 2152{
2077 fflush (stream); 2153 fflush (stream);
2078/* pclose() reported not to work on SunOS 4.1.3 */ 2154 /* pclose () reported not to work on SunOS 4.1.3 */
2079# if defined (__sun__) /* TODO: RESOLVE THIS */ 2155# if defined (__sun__) /* TODO: RESOLVE THIS */
2080/* pclose works provided SIGCHLD handler uses waitpid */ 2156 /* pclose works provided SIGCHLD handler uses waitpid */
2081 return pclose (stream); /* return fclose (stream); */ 2157 return pclose (stream); /* return fclose (stream); */
2082# else 2158# else
2083 return pclose (stream); 2159 return pclose (stream);
2084# endif 2160# endif
2085} 2161}
… …
2088 * simulate attached vt100 printer 2164 * simulate attached vt100 printer
2089 */ 2165 */
2090void 2166void
2091rxvt_term::process_print_pipe () 2167rxvt_term::process_print_pipe ()
2092{ 2168{
2093 int done; 2169 int done;
2094 FILE *fd; 2170 FILE *fd;
2095 2171
2096 if ((fd = popen_printer ()) == NULL) 2172 if ((fd = popen_printer ()) == NULL)
2097 return; 2173 return;
2098 2174
2099/* 2175 /*
2100 * Send all input to the printer until either ESC[4i or ESC[?4i 2176 * Send all input to the printer until either ESC[4i or ESC[?4i
2101 * is received. 2177 * is received.
2102 */ 2178 */
2103 for (done = 0; !done;) { 2179 for (done = 0; !done;)
2180 {
2104 unsigned char buf[8]; 2181 unsigned char buf[8];
2105 unsigned char ch; 2182 unsigned char ch;
2106 unsigned int i, len; 2183 unsigned int i, len;
2107 2184
2108 if ((ch = cmd_getc ()) != C0_ESC) { 2185 if ((ch = cmd_getc ()) != C0_ESC)
2186 {
2109 if (putc(ch, fd) == EOF) 2187 if (putc (ch, fd) == EOF)
2110 break; /* done = 1 */ 2188 break; /* done = 1 */
2111 } else { 2189 }
2190 else
2191 {
2112 len = 0; 2192 len = 0;
2113 buf[len++] = ch; 2193 buf[len++] = ch;
2114 2194
2115 if ((buf[len++] = cmd_getc ()) == '[') { 2195 if ((buf[len++] = cmd_getc ()) == '[')
2196 {
2116 if ((ch = cmd_getc ()) == '?') { 2197 if ((ch = cmd_getc ()) == '?')
2117 buf[len++] = '?'; 2198 {
2118 ch = cmd_getc (); 2199 buf[len++] = '?';
2119 } 2200 ch = cmd_getc ();
2201 }
2120 if ((buf[len++] = ch) == '4') { 2202 if ((buf[len++] = ch) == '4')
2203 {
2121 if ((buf[len++] = cmd_getc ()) == 'i') 2204 if ((buf[len++] = cmd_getc ()) == 'i')
2122 break; /* done = 1 */ 2205 break; /* done = 1 */
2123 } 2206 }
2207 }
2208 for (i = 0; i < len; i++)
2209 if (putc (buf[i], fd) == EOF)
2210 {
2211 done = 1;
2212 break;
2213 }
2214 }
2124 } 2215 }
2125 for (i = 0; i < len; i++)
2126 if (putc(buf[i], fd) == EOF) {
2127 done = 1;
2128 break;
2129 }
2130 }
2131 }
2132 pclose_printer (fd); 2216 pclose_printer (fd);
2133} 2217}
2134#endif /* PRINTPIPE */ 2218#endif /* PRINTPIPE */
2135/*}}} */ 2219/*}}} */
2136 2220
2137/* *INDENT-OFF* */ 2221/* *INDENT-OFF* */
2138enum { 2222enum {
2139 C1_40 = 0x40, 2223 C1_40 = 0x40,
2140 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2224 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2141 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2225 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2142 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2226 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2143 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2227 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC
2144}; 2228};
2145/* *INDENT-ON* */ 2229/* *INDENT-ON* */
2146 2230
2147/*{{{ process non-printing single characters */ 2231/*{{{ process non-printing single characters */
2148void 2232void
2149rxvt_term::process_nonprinting (unsigned char ch) 2233rxvt_term::process_nonprinting (unsigned char ch)
2150{ 2234{
2151 switch (ch) { 2235 switch (ch)
2236 {
2152 case C0_ENQ: /* terminal Status */ 2237 case C0_ENQ: /* terminal Status */
2153 if (rs[Rs_answerbackstring]) 2238 if (rs[Rs_answerbackstring])
2154 tt_write( 2239 tt_write (
2155 (const unsigned char *)rs[Rs_answerbackstring], 2240 (const unsigned char *)rs[Rs_answerbackstring],
2156 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2241 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2157 else 2242 else
2158 tt_write((unsigned char *)VT100_ANS, 2243 tt_write ((unsigned char *)VT100_ANS,
2159 (unsigned int)STRLEN(VT100_ANS)); 2244 (unsigned int)STRLEN (VT100_ANS));
2160 break; 2245 break;
2161 case C0_BEL: /* bell */ 2246 case C0_BEL: /* bell */
2162 scr_bell (); 2247 scr_bell ();
2163 break; 2248 break;
2164 case C0_BS: /* backspace */ 2249 case C0_BS: /* backspace */
2165 scr_backspace (); 2250 scr_backspace ();
2166 break; 2251 break;
2167 case C0_HT: /* tab */ 2252 case C0_HT: /* tab */
2168 scr_tab (1); 2253 scr_tab (1);
2169 break; 2254 break;
2170 case C0_CR: /* carriage return */ 2255 case C0_CR: /* carriage return */
2171 scr_gotorc (0, 0, R_RELATIVE); 2256 scr_gotorc (0, 0, R_RELATIVE);
2172 break; 2257 break;
2173 case C0_VT: /* vertical tab, form feed */ 2258 case C0_VT: /* vertical tab, form feed */
2174 case C0_FF: 2259 case C0_FF:
2175 case C0_LF: /* line feed */ 2260 case C0_LF: /* line feed */
2176 scr_index (UP); 2261 scr_index (UP);
2177 break; 2262 break;
2178 case C0_SO: /* shift out - acs */ 2263 case C0_SO: /* shift out - acs */
2179 scr_charset_choose (1); 2264 scr_charset_choose (1);
2180 break; 2265 break;
2181 case C0_SI: /* shift in - acs */ 2266 case C0_SI: /* shift in - acs */
2182 scr_charset_choose (0); 2267 scr_charset_choose (0);
2183 break; 2268 break;
2184 } 2269 }
2185} 2270}
2186/*}}} */ 2271/*}}} */
2187 2272
2188 2273
2189/*{{{ process VT52 escape sequences */ 2274/*{{{ process VT52 escape sequences */
2190void 2275void
2191rxvt_term::process_escape_vt52 (unsigned char ch) 2276rxvt_term::process_escape_vt52 (unsigned char ch)
2192{ 2277{
2193 int row, col; 2278 int row, col;
2279
2280 switch (ch)
2194 2281 {
2195 switch (ch) {
2196 case 'A': /* cursor up */ 2282 case 'A': /* cursor up */
2197 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE); 2283 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2198 break; 2284 break;
2199 case 'B': /* cursor down */ 2285 case 'B': /* cursor down */
2200 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE); 2286 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2201 break; 2287 break;
2202 case 'C': /* cursor right */ 2288 case 'C': /* cursor right */
2203 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 2289 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2204 break; 2290 break;
2205 case 'D': /* cursor left */ 2291 case 'D': /* cursor left */
2206 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 2292 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2207 break; 2293 break;
2208 case 'H': /* cursor home */ 2294 case 'H': /* cursor home */
2209 scr_gotorc (0, 0, 0); 2295 scr_gotorc (0, 0, 0);
2210 break; 2296 break;
2211 case 'I': /* cursor up and scroll down if needed */ 2297 case 'I': /* cursor up and scroll down if needed */
2212 scr_index (DN); 2298 scr_index (DN);
2213 break; 2299 break;
2214 case 'J': /* erase to end of screen */ 2300 case 'J': /* erase to end of screen */
2215 scr_erase_screen (0); 2301 scr_erase_screen (0);
2216 break; 2302 break;
2217 case 'K': /* erase to end of line */ 2303 case 'K': /* erase to end of line */
2218 scr_erase_line (0); 2304 scr_erase_line (0);
2219 break; 2305 break;
2220 case 'Y': /* move to specified row and col */ 2306 case 'Y': /* move to specified row and col */
2221 /* full command is 'ESC Y row col' where row and col 2307 /* full command is 'ESC Y row col' where row and col
2222 * are encoded by adding 32 and sending the ascii 2308 * are encoded by adding 32 and sending the ascii
2223 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2309 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2224 * etc. */ 2310 * etc. */
2225 row = cmd_getc () - ' '; 2311 row = cmd_getc () - ' ';
2226 col = cmd_getc () - ' '; 2312 col = cmd_getc () - ' ';
2227 scr_gotorc (row, col, 0); 2313 scr_gotorc (row, col, 0);
2228 break; 2314 break;
2229 case 'Z': /* identify the terminal type */ 2315 case 'Z': /* identify the terminal type */
2230 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2316 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2231 break; 2317 break;
2232 case '<': /* turn off VT52 mode */ 2318 case '<': /* turn off VT52 mode */
2233 PrivMode(0, PrivMode_vt52); 2319 PrivMode (0, PrivMode_vt52);
2234 break; 2320 break;
2235 case 'F': /* use special graphics character set */ 2321 case 'F': /* use special graphics character set */
2236 case 'G': /* use regular character set */ 2322 case 'G': /* use regular character set */
2237 /* unimplemented */ 2323 /* unimplemented */
2238 break; 2324 break;
2239 case '=': /* use alternate keypad mode */ 2325 case '=': /* use alternate keypad mode */
2240 case '>': /* use regular keypad mode */ 2326 case '>': /* use regular keypad mode */
2241 /* unimplemented */ 2327 /* unimplemented */
2242 break; 2328 break;
2243 } 2329 }
2244} 2330}
2245/*}}} */ 2331/*}}} */
2246 2332
2247 2333
2248/*{{{ process escape sequences */ 2334/*{{{ process escape sequences */
2249void 2335void
2250rxvt_term::process_escape_seq () 2336rxvt_term::process_escape_seq ()
2251{ 2337{
2252 unsigned char ch = cmd_getc (); 2338 unsigned char ch = cmd_getc ();
2253 2339
2254 if (PrivateModes & PrivMode_vt52) { 2340 if (PrivateModes & PrivMode_vt52)
2255 process_escape_vt52 (ch);
2256 return;
2257 }
2258 2341 {
2342 process_escape_vt52 (ch);
2343 return;
2344 }
2345
2259 switch (ch) { 2346 switch (ch)
2347 {
2260 /* case 1: do_tek_mode (); break; */ 2348 /* case 1: do_tek_mode (); break; */
2261 case '#': 2349 case '#':
2262 if (cmd_getc () == '8') 2350 if (cmd_getc () == '8')
2263 scr_E (); 2351 scr_E ();
2264 break; 2352 break;
2265 case '(': 2353 case '(':
2266 scr_charset_set (0, (unsigned int)cmd_getc ()); 2354 scr_charset_set (0, (unsigned int)cmd_getc ());
2267 break; 2355 break;
2268 case ')': 2356 case ')':
2269 scr_charset_set (1, (unsigned int)cmd_getc ()); 2357 scr_charset_set (1, (unsigned int)cmd_getc ());
2270 break; 2358 break;
2271 case '*': 2359 case '*':
2272 scr_charset_set (2, (unsigned int)cmd_getc ()); 2360 scr_charset_set (2, (unsigned int)cmd_getc ());
2273 break; 2361 break;
2274 case '+': 2362 case '+':
2275 scr_charset_set (3, (unsigned int)cmd_getc ()); 2363 scr_charset_set (3, (unsigned int)cmd_getc ());
2276 break; 2364 break;
2277#ifdef MULTICHAR_SET 2365#ifdef MULTICHAR_SET
2278 case '$': 2366 case '$':
2279 scr_charset_set (-2, (unsigned int)cmd_getc ()); 2367 scr_charset_set (-2, (unsigned int)cmd_getc ());
2280 break; 2368 break;
2281#endif 2369#endif
2282#ifndef NO_FRILLS 2370#ifndef NO_FRILLS
2283 case '6': 2371 case '6':
2284 scr_backindex (); 2372 scr_backindex ();
2285 break; 2373 break;
2286#endif 2374#endif
2287 case '7': 2375 case '7':
2288 scr_cursor (SAVE); 2376 scr_cursor (SAVE);
2289 break; 2377 break;
2290 case '8': 2378 case '8':
2291 scr_cursor (RESTORE); 2379 scr_cursor (RESTORE);
2292 break; 2380 break;
2293#ifndef NO_FRILLS 2381#ifndef NO_FRILLS
2294 case '9': 2382 case '9':
2295 scr_forwardindex (); 2383 scr_forwardindex ();
2296 break; 2384 break;
2297#endif 2385#endif
2298 case '=': 2386 case '=':
2299 case '>': 2387 case '>':
2300 PrivMode((ch == '='), PrivMode_aplKP); 2388 PrivMode ((ch == '='), PrivMode_aplKP);
2301 break; 2389 break;
2302 2390
2303 case C1_40: 2391 case C1_40:
2304 cmd_getc (); 2392 cmd_getc ();
2305 break; 2393 break;
2306 case C1_44: 2394 case C1_44:
2307 scr_index (UP); 2395 scr_index (UP);
2308 break; 2396 break;
2309 2397
2310 /* 8.3.87: NEXT LINE */ 2398 /* 8.3.87: NEXT LINE */
2311 case C1_NEL: /* ESC E */ 2399 case C1_NEL: /* ESC E */
2312 { 2400 {
2313 uint32_t nlcr[] = { '\n', '\r' }; 2401 uint32_t nlcr[] = { '\n', '\r' };
2314 scr_add_lines (nlcr, 1, 2); 2402 scr_add_lines (nlcr, 1, 2);
2315 } 2403 }
2316 break; 2404 break;
2317 2405
2318 /* kidnapped escape sequence: Should be 8.3.48 */ 2406 /* kidnapped escape sequence: Should be 8.3.48 */
2319 case C1_ESA: /* ESC G */ 2407 case C1_ESA: /* ESC G */
2320 process_graphics (); 2408 process_graphics ();
2321 break; 2409 break;
2322 2410
2323 /* 8.3.63: CHARACTER TABULATION SET */ 2411 /* 8.3.63: CHARACTER TABULATION SET */
2324 case C1_HTS: /* ESC H */ 2412 case C1_HTS: /* ESC H */
2325 scr_set_tab (1); 2413 scr_set_tab (1);
2326 break; 2414 break;
2327 2415
2328 /* 8.3.105: REVERSE LINE FEED */ 2416 /* 8.3.105: REVERSE LINE FEED */
2329 case C1_RI: /* ESC M */ 2417 case C1_RI: /* ESC M */
2330 scr_index (DN); 2418 scr_index (DN);
2331 break; 2419 break;
2332 2420
2333 /* 8.3.142: SINGLE-SHIFT TWO */ 2421 /* 8.3.142: SINGLE-SHIFT TWO */
2334 /*case C1_SS2: scr_single_shift (2); break; */ 2422 /*case C1_SS2: scr_single_shift (2); break; */
2335 2423
2336 /* 8.3.143: SINGLE-SHIFT THREE */ 2424 /* 8.3.143: SINGLE-SHIFT THREE */
2337 /*case C1_SS3: scr_single_shift (3); break; */ 2425 /*case C1_SS3: scr_single_shift (3); break; */
2338 2426
2339 /* 8.3.27: DEVICE CONTROL STRING */ 2427 /* 8.3.27: DEVICE CONTROL STRING */
2340 case C1_DCS: /* ESC P */ 2428 case C1_DCS: /* ESC P */
2341 process_dcs_seq (); 2429 process_dcs_seq ();
2342 break; 2430 break;
2343 2431
2344 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2432 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2345 case C1_SCI: /* ESC Z */ 2433 case C1_SCI: /* ESC Z */
2346 tt_write((const unsigned char *)ESCZ_ANSWER, 2434 tt_write ((const unsigned char *)ESCZ_ANSWER,
2347 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2435 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2348 break; /* steal obsolete ESC [ c */ 2436 break; /* steal obsolete ESC [ c */
2349 2437
2350 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2438 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2351 case C1_CSI: /* ESC [ */ 2439 case C1_CSI: /* ESC [ */
2352 process_csi_seq (); 2440 process_csi_seq ();
2353 break; 2441 break;
2354 2442
2355 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2443 /* 8.3.90: OPERATING SYSTEM COMMAND */
2356 case C1_OSC: /* ESC ] */ 2444 case C1_OSC: /* ESC ] */
2357 process_osc_seq (); 2445 process_osc_seq ();
2358 break; 2446 break;
2359 2447
2360 /* 8.3.106: RESET TO INITIAL STATE */ 2448 /* 8.3.106: RESET TO INITIAL STATE */
2361 case 'c': 2449 case 'c':
2362 scr_poweron (); 2450 scr_poweron ();
2363 scrollbar_show (1); 2451 scrollbar_show (1);
2364 break; 2452 break;
2365 2453
2366 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2454 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2367 case 'n': 2455 case 'n':
2368 scr_charset_choose (2); 2456 scr_charset_choose (2);
2369 break; 2457 break;
2370 2458
2371 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2459 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2372 case 'o': 2460 case 'o':
2373 scr_charset_choose (3); 2461 scr_charset_choose (3);
2374 break; 2462 break;
2375 } 2463 }
2376} 2464}
2377/*}}} */ 2465/*}}} */
2378 2466
2379/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2467/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2380/* *INDENT-OFF* */ 2468/* *INDENT-OFF* */
2381enum { 2469enum {
2382 CSI_ICH = 0x40, 2470 CSI_ICH = 0x40,
2383 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2471 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2384 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2472 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2385 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2473 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2386 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2474 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2387 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2475 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2388 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2476 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2389 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2477 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2390 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2478 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2391}; 2479};
2392 2480
2393#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2481#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2394 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2482 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2395 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2483 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2396#define get_byte_array_bit(array, bit) \ 2484#define get_byte_array_bit(array, bit) \
2397 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2485 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2398 2486
2399const unsigned char csi_defaults[] = { 2487const unsigned char csi_defaults[] =
2488 {
2400 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2489 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2401 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2490 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2402 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2491 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2403 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2492 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2404 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2493 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2405 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2494 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2406 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2495 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2407 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2496 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2408}; 2497 };
2409/* *INDENT-ON* */ 2498/* *INDENT-ON* */
2410 2499
2411void 2500void
2412rxvt_term::process_csi_seq () 2501rxvt_term::process_csi_seq ()
2413{ 2502{
2414 unsigned char ch, priv, i; 2503 unsigned char ch, priv, i;
2415 unsigned int nargs, p; 2504 unsigned int nargs, p;
2416 int n, ndef; 2505 int n, ndef;
2417 int arg[ESC_ARGS]; 2506 int arg[ESC_ARGS];
2418 2507
2419 for (nargs = ESC_ARGS; nargs > 0;) 2508 for (nargs = ESC_ARGS; nargs > 0;)
2420 arg[--nargs] = 0; 2509 arg[--nargs] = 0;
2421 2510
2422 priv = 0; 2511 priv = 0;
2512 ch = cmd_getc ();
2513 if (ch >= '<' && ch <= '?')
2514 { /* '<' '=' '>' '?' */
2515 priv = ch;
2423 ch = cmd_getc (); 2516 ch = cmd_getc ();
2424 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2425 priv = ch;
2426 ch = cmd_getc ();
2427 } 2517 }
2428/* read any numerical arguments */ 2518 /* read any numerical arguments */
2429 for (n = -1; ch < CSI_ICH; ) { 2519 for (n = -1; ch < CSI_ICH; )
2520 {
2430 if (isdigit(ch)) { 2521 if (isdigit (ch))
2522 {
2431 if (n < 0) 2523 if (n < 0)
2432 n = ch - '0'; 2524 n = ch - '0';
2433 else 2525 else
2434 n = n * 10 + ch - '0'; 2526 n = n * 10 + ch - '0';
2527 }
2435 } else if (ch == ';') { 2528 else if (ch == ';')
2529 {
2436 if (nargs < ESC_ARGS) 2530 if (nargs < ESC_ARGS)
2437 arg[nargs++] = n; 2531 arg[nargs++] = n;
2438 n = -1; 2532 n = -1;
2533 }
2439 } else if (ch == '\b') { 2534 else if (ch == '\b')
2535 {
2440 scr_backspace (); 2536 scr_backspace ();
2537 }
2441 } else if (ch == C0_ESC) { 2538 else if (ch == C0_ESC)
2539 {
2442 process_escape_seq (); 2540 process_escape_seq ();
2541 return;
2542 }
2543 else if (ch < ' ')
2544 {
2545 process_nonprinting (ch);
2546 }
2547 ch = cmd_getc ();
2548 }
2549
2550 if (ch > CSI_7F)
2443 return; 2551 return;
2444 } else if (ch < ' ') {
2445 process_nonprinting (ch);
2446 }
2447 ch = cmd_getc ();
2448 }
2449 2552
2450 if (ch > CSI_7F)
2451 return;
2452
2453 if (nargs < ESC_ARGS) 2553 if (nargs < ESC_ARGS)
2454 arg[nargs++] = n; 2554 arg[nargs++] = n;
2455 2555
2456 i = ch - CSI_ICH; 2556 i = ch - CSI_ICH;
2457 ndef = get_byte_array_bit(csi_defaults, i); 2557 ndef = get_byte_array_bit (csi_defaults, i);
2458 for (p = 0; p < nargs; p++) 2558 for (p = 0; p < nargs; p++)
2459 if (arg[p] == -1) 2559 if (arg[p] == -1)
2460 arg[p] = ndef; 2560 arg[p] = ndef;
2461 2561
2462#ifdef DEBUG_CMD 2562#ifdef DEBUG_CMD
2463 fprintf(stderr, "CSI "); 2563 fprintf (stderr, "CSI ");
2464 for (p = 0; p < nargs; p++) 2564 for (p = 0; p < nargs; p++)
2465 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2565 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2466 fprintf(stderr, "%c\n", ch); 2566 fprintf (stderr, "%c\n", ch);
2467#endif 2567#endif
2468 2568
2469/* 2569 /*
2470 * private mode handling 2570 * private mode handling
2471 */ 2571 */
2472 if (priv) { 2572 if (priv)
2473 switch (priv) { 2573 {
2474 case '>': 2574 switch (priv)
2575 {
2576 case '>':
2475 if (ch == CSI_DA) /* secondary device attributes */ 2577 if (ch == CSI_DA) /* secondary device attributes */
2476 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2578 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2477 break; 2579 break;
2478 case '?': 2580 case '?':
2479 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2581 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2480 process_terminal_mode (ch, priv, nargs, arg); 2582 process_terminal_mode (ch, priv, nargs, arg);
2481 break; 2583 break;
2482 } 2584 }
2483 return; 2585 return;
2484 } 2586 }
2485 2587
2486 switch (ch) { 2588 switch (ch)
2487/* 2589 {
2590 /*
2488 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2591 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2489 */ 2592 */
2490#ifdef PRINTPIPE 2593#ifdef PRINTPIPE
2491 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2594 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2492 switch (arg[0]) { 2595 switch (arg[0])
2596 {
2493 case 0: /* initiate transfer to primary aux device */ 2597 case 0: /* initiate transfer to primary aux device */
2494 scr_printscreen (0); 2598 scr_printscreen (0);
2495 break; 2599 break;
2496 case 5: /* start relay to primary aux device */ 2600 case 5: /* start relay to primary aux device */
2497 process_print_pipe (); 2601 process_print_pipe ();
2602 break;
2603 }
2498 break; 2604 break;
2499 }
2500 break;
2501#endif 2605#endif
2502 2606
2503 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2607 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2504 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2608 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2505 arg[0] = -arg[0]; 2609 arg[0] = -arg[0];
2506 /* FALLTHROUGH */ 2610 /* FALLTHROUGH */
2507 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2611 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2508 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2612 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2509 scr_gotorc (arg[0], 0, RELATIVE); 2613 scr_gotorc (arg[0], 0, RELATIVE);
2510 break; 2614 break;
2511 2615
2512 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2616 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2513 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2617 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2514#ifdef ISO6429 2618#ifdef ISO6429
2515 arg[0] = -arg[0]; 2619 arg[0] = -arg[0];
2516#else /* emulate common DEC VTs */ 2620#else /* emulate common DEC VTs */
2517 arg[0] = arg[0] ? -arg[0] : -1; 2621 arg[0] = arg[0] ? -arg[0] : -1;
2518#endif 2622#endif
2519 /* FALLTHROUGH */ 2623 /* FALLTHROUGH */
2520 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2624 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2521 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2625 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2522#ifdef ISO6429 2626#ifdef ISO6429
2523 scr_gotorc (0, arg[0], RELATIVE); 2627 scr_gotorc (0, arg[0], RELATIVE);
2524#else /* emulate common DEC VTs */ 2628#else /* emulate common DEC VTs */
2525 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE); 2629 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2526#endif 2630#endif
2527 break; 2631 break;
2528 2632
2529 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2633 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2530 arg[0] = -arg[0]; 2634 arg[0] = -arg[0];
2531 /* FALLTHROUGH */ 2635 /* FALLTHROUGH */
2532 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2636 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2533 scr_gotorc (arg[0], 0, R_RELATIVE); 2637 scr_gotorc (arg[0], 0, R_RELATIVE);
2534 break; 2638 break;
2535 2639
2536 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2640 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2537 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2641 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2538 scr_gotorc (0, arg[0] - 1, R_RELATIVE); 2642 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2539 break; 2643 break;
2540 2644
2541 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2645 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2542 scr_gotorc (arg[0] - 1, 0, C_RELATIVE); 2646 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2543 break; 2647 break;
2544 2648
2545 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2649 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2546 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */ 2650 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
2547 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0); 2651 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
2548 break; 2652 break;
2549 2653
2550 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2654 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2551 arg[0] = -arg[0]; 2655 arg[0] = -arg[0];
2552 /* FALLTHROUGH */ 2656 /* FALLTHROUGH */
2553 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2657 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2554 scr_tab (arg[0]); 2658 scr_tab (arg[0]);
2555 break; 2659 break;
2556 2660
2557 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2661 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2558 scr_erase_screen (arg[0]); 2662 scr_erase_screen (arg[0]);
2559 break; 2663 break;
2560 2664
2561 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2665 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2562 scr_erase_line (arg[0]); 2666 scr_erase_line (arg[0]);
2563 break; 2667 break;
2564 2668
2565 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2669 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2566 scr_insdel_chars (arg[0], INSERT); 2670 scr_insdel_chars (arg[0], INSERT);
2567 break; 2671 break;
2568 2672
2569 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2673 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2570 scr_insdel_lines (arg[0], INSERT); 2674 scr_insdel_lines (arg[0], INSERT);
2571 break; 2675 break;
2572 2676
2573 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2677 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2574 scr_insdel_lines (arg[0], DELETE); 2678 scr_insdel_lines (arg[0], DELETE);
2575 break; 2679 break;
2576 2680
2577 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2681 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2578 scr_insdel_chars (arg[0], ERASE); 2682 scr_insdel_chars (arg[0], ERASE);
2579 break; 2683 break;
2580 2684
2581 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2685 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2582 scr_insdel_chars (arg[0], DELETE); 2686 scr_insdel_chars (arg[0], DELETE);
2583 break; 2687 break;
2584 2688
2585 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2689 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2586 arg[0] = -arg[0]; 2690 arg[0] = -arg[0];
2587 /* FALLTHROUGH */ 2691 /* FALLTHROUGH */
2588 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2692 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2589 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2693 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2590 break; 2694 break;
2591 2695
2592 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2696 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2593 tt_write((const unsigned char *)VT100_ANS, 2697 tt_write ((const unsigned char *)VT100_ANS,
2594 (unsigned int)(sizeof(VT100_ANS) - 1)); 2698 (unsigned int) (sizeof (VT100_ANS) - 1));
2595 break; 2699 break;
2596 2700
2597 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2701 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2598 process_sgr_mode (nargs, arg); 2702 process_sgr_mode (nargs, arg);
2599 break; 2703 break;
2600 2704
2601 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2705 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2602 switch (arg[0]) { 2706 switch (arg[0])
2707 {
2603 case 5: /* DSR requested */ 2708 case 5: /* DSR requested */
2604 tt_printf("\033[0n"); 2709 tt_printf ("\033[0n");
2605 break; 2710 break;
2606 case 6: /* CPR requested */ 2711 case 6: /* CPR requested */
2607 scr_report_position (); 2712 scr_report_position ();
2608 break; 2713 break;
2609#if defined (ENABLE_DISPLAY_ANSWER) 2714#if defined (ENABLE_DISPLAY_ANSWER)
2610 case 7: /* unofficial extension */ 2715 case 7: /* unofficial extension */
2611 tt_printf("%-.250s\n", rs[Rs_display_name]); 2716 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2612 break; 2717 break;
2613#endif 2718#endif
2614 case 8: /* unofficial extension */ 2719 case 8: /* unofficial extension */
2615 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2720 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2721 break;
2722 }
2616 break; 2723 break;
2617 }
2618 break;
2619 2724
2620 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2725 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2621 switch (arg[0]) { 2726 switch (arg[0])
2727 {
2622 case 0: /* char tab stop cleared at active position */ 2728 case 0: /* char tab stop cleared at active position */
2623 scr_set_tab (0); 2729 scr_set_tab (0);
2624 break; 2730 break;
2625 /* case 1: */ /* line tab stop cleared in active line */ 2731 /* case 1: */ /* line tab stop cleared in active line */
2626 /* case 2: */ /* char tab stops cleared in active line */ 2732 /* case 2: */ /* char tab stops cleared in active line */
2627 case 3: /* all char tab stops are cleared */ 2733 case 3: /* all char tab stops are cleared */
2628 /* case 4: */ /* all line tab stops are cleared */ 2734 /* case 4: */ /* all line tab stops are cleared */
2629 case 5: /* all tab stops are cleared */ 2735 case 5: /* all tab stops are cleared */
2630 scr_set_tab (-1); 2736 scr_set_tab (-1);
2737 break;
2738 }
2631 break; 2739 break;
2632 }
2633 break;
2634 2740
2635 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2741 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2636 switch (arg[0]) { 2742 switch (arg[0])
2743 {
2637 case 0: /* char tab stop set at active position */ 2744 case 0: /* char tab stop set at active position */
2638 scr_set_tab (1); 2745 scr_set_tab (1);
2639 break; /* = ESC H */ 2746 break; /* = ESC H */
2640 /* case 1: */ /* line tab stop set at active line */ 2747 /* case 1: */ /* line tab stop set at active line */
2641 case 2: /* char tab stop cleared at active position */ 2748 case 2: /* char tab stop cleared at active position */
2642 scr_set_tab (0); 2749 scr_set_tab (0);
2643 break; /* = ESC [ 0 g */ 2750 break; /* = ESC [ 0 g */
2644 /* case 3: */ /* line tab stop cleared at active line */ 2751 /* case 3: */ /* line tab stop cleared at active line */
2645 /* case 4: */ /* char tab stops cleared at active line */ 2752 /* case 4: */ /* char tab stops cleared at active line */
2646 case 5: /* all char tab stops are cleared */ 2753 case 5: /* all char tab stops are cleared */
2647 scr_set_tab (-1); 2754 scr_set_tab (-1);
2648 break; /* = ESC [ 3 g */ 2755 break; /* = ESC [ 3 g */
2649 /* case 6: */ /* all line tab stops are cleared */ 2756 /* case 6: */ /* all line tab stops are cleared */
2650 } 2757 }
2651 break; 2758 break;
2652 2759
2653 case CSI_RM: /* 8.3.107: RESET MODE */ 2760 case CSI_RM: /* 8.3.107: RESET MODE */
2654 if (arg[0] == 4) 2761 if (arg[0] == 4)
2655 scr_insert_mode (0); 2762 scr_insert_mode (0);
2656 break; 2763 break;
2657 2764
2658 case CSI_SM: /* 8.3.126: SET MODE */ 2765 case CSI_SM: /* 8.3.126: SET MODE */
2659 if (arg[0] == 4) 2766 if (arg[0] == 4)
2660 scr_insert_mode (1); 2767 scr_insert_mode (1);
2661 break; 2768 break;
2662 2769
2663/* 2770 /*
2664 * PRIVATE USE beyond this point. All CSI_7? sequences here 2771 * PRIVATE USE beyond this point. All CSI_7? sequences here
2665 */ 2772 */
2666 case CSI_72: /* DECSTBM: set top and bottom margins */ 2773 case CSI_72: /* DECSTBM: set top and bottom margins */
2667 if (nargs == 1) 2774 if (nargs == 1)
2668 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1); 2775 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2669 else if (nargs == 0 || arg[0] >= arg[1]) 2776 else if (nargs == 0 || arg[0] >= arg[1])
2670 scr_scroll_region (0, MAX_ROWS - 1); 2777 scr_scroll_region (0, MAX_ROWS - 1);
2671 else 2778 else
2672 scr_scroll_region (arg[0] - 1, arg[1] - 1); 2779 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2673 break; 2780 break;
2674 2781
2675 case CSI_73: 2782 case CSI_73:
2676 scr_cursor (SAVE); 2783 scr_cursor (SAVE);
2677 break; 2784 break;
2678 case CSI_75: 2785 case CSI_75:
2679 scr_cursor (RESTORE); 2786 scr_cursor (RESTORE);
2680 break; 2787 break;
2681 2788
2682#ifndef NO_FRILLS 2789#ifndef NO_FRILLS
2683 case CSI_74: 2790 case CSI_74:
2684 process_window_ops (arg, nargs); 2791 process_window_ops (arg, nargs);
2685 break; 2792 break;
2686#endif 2793#endif
2687 2794
2688 case CSI_78: /* DECREQTPARM */ 2795 case CSI_78: /* DECREQTPARM */
2689 if (arg[0] == 0 || arg[0] == 1) 2796 if (arg[0] == 0 || arg[0] == 1)
2690 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2797 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2691 /* FALLTHROUGH */ 2798 /* FALLTHROUGH */
2692 2799
2693 default: 2800 default:
2694 break; 2801 break;
2695 } 2802 }
2696} 2803}
2697/*}}} */ 2804/*}}} */
2698 2805
2699#ifndef NO_FRILLS 2806#ifndef NO_FRILLS
2700/* ARGSUSED */ 2807/* ARGSUSED */
2701void 2808void
2702rxvt_term::process_window_ops (const int *args, unsigned int nargs) 2809rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2703{ 2810{
2704 int x, y; 2811 int x, y;
2705#if 0 2812#if 0
2706 char *s; 2813 char *s;
2707#endif 2814#endif
2708 XWindowAttributes wattr; 2815 XWindowAttributes wattr;
2709 Window wdummy; 2816 Window wdummy;
2710 2817
2711 if (nargs == 0) 2818 if (nargs == 0)
2712 return; 2819 return;
2713 switch (args[0]) { 2820 switch (args[0])
2821 {
2714 /* 2822 /*
2715 * commands 2823 * commands
2716 */ 2824 */
2717 case 1: /* deiconify window */ 2825 case 1: /* deiconify window */
2718 XMapWindow(Xdisplay, TermWin.parent[0]); 2826 XMapWindow (display->display, TermWin.parent[0]);
2719 break; 2827 break;
2720 case 2: /* iconify window */ 2828 case 2: /* iconify window */
2721 XIconifyWindow(Xdisplay, TermWin.parent[0], 2829 XIconifyWindow (display->display, TermWin.parent[0],
2722 DefaultScreen(Xdisplay)); 2830 DefaultScreen (display->display));
2723 break; 2831 break;
2724 case 3: /* set position (pixels) */ 2832 case 3: /* set position (pixels) */
2725 XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]); 2833 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2726 break; 2834 break;
2727 case 4: /* set size (pixels) */ 2835 case 4: /* set size (pixels) */
2728 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 2836 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2729 break; 2837 break;
2730 case 5: /* raise window */ 2838 case 5: /* raise window */
2731 XRaiseWindow(Xdisplay, TermWin.parent[0]); 2839 XRaiseWindow (display->display, TermWin.parent[0]);
2732 break; 2840 break;
2733 case 6: /* lower window */ 2841 case 6: /* lower window */
2734 XLowerWindow(Xdisplay, TermWin.parent[0]); 2842 XLowerWindow (display->display, TermWin.parent[0]);
2735 break; 2843 break;
2736 case 7: /* refresh window */ 2844 case 7: /* refresh window */
2737 scr_touch (true); 2845 scr_touch (true);
2738 break; 2846 break;
2739 case 8: /* set size (chars) */ 2847 case 8: /* set size (chars) */
2740 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 2848 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2741 (unsigned int)(args[1] * TermWin.fheight)); 2849 (unsigned int) (args[1] * TermWin.fheight));
2742 break; 2850 break;
2743 default: 2851 default:
2744 if (args[0] >= 24) /* set height (chars) */ 2852 if (args[0] >= 24) /* set height (chars) */
2745 set_widthheight ((unsigned int)TermWin.width, 2853 set_widthheight ((unsigned int)TermWin.width,
2746 (unsigned int)(args[1] * TermWin.fheight)); 2854 (unsigned int) (args[1] * TermWin.fheight));
2747 break; 2855 break;
2748 /* 2856 /*
2749 * reports - some output format copied from XTerm 2857 * reports - some output format copied from XTerm
2750 */ 2858 */
2751 case 11: /* report window state */ 2859 case 11: /* report window state */
2752 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2860 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2753 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2861 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2754 break; 2862 break;
2755 case 13: /* report window position */ 2863 case 13: /* report window position */
2756 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2864 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2757 XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root, 2865 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2758 -wattr.border_width, -wattr.border_width, 2866 -wattr.border_width, -wattr.border_width,
2759 &x, &y, &wdummy); 2867 &x, &y, &wdummy);
2760 tt_printf("\033[3;%d;%dt", x, y); 2868 tt_printf ("\033[3;%d;%dt", x, y);
2761 break; 2869 break;
2762 case 14: /* report window size (pixels) */ 2870 case 14: /* report window size (pixels) */
2763 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2871 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2764 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2872 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2765 break; 2873 break;
2766 case 18: /* report window size (chars) */ 2874 case 18: /* report window size (chars) */
2767 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 2875 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2768 break; 2876 break;
2769#if 0 /* XXX: currently disabled due to security concerns */ 2877#if 0 /* XXX: currently disabled due to security concerns */
2770 case 20: /* report icon label */ 2878 case 20: /* report icon label */
2771 XGetIconName(Xdisplay, TermWin.parent[0], &s); 2879 XGetIconName (display->display, TermWin.parent[0], &s);
2772 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2880 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2773 break; 2881 break;
2774 case 21: /* report window title */ 2882 case 21: /* report window title */
2775 XFetchName(Xdisplay, TermWin.parent[0], &s); 2883 XFetchName (display->display, TermWin.parent[0], &s);
2776 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2884 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2777 break; 2885 break;
2778#endif 2886#endif
2887
2779 } 2888 }
2780} 2889}
2781#endif 2890#endif
2782 2891
2783/*----------------------------------------------------------------------*/ 2892/*----------------------------------------------------------------------*/
2784/* 2893/*
2785 * get input up until STRING TERMINATOR (or BEL) 2894 * get input up until STRING TERMINATOR (or BEL)
2786 * ends_how is terminator used. returned input must be free()d 2895 * ends_how is terminator used. returned input must be free ()d
2787 */ 2896 */
2788unsigned char * 2897unsigned char *
2789rxvt_term::get_to_st (unsigned char *ends_how) 2898rxvt_term::get_to_st (unsigned char *ends_how)
2790{ 2899{
2791 int seen_esc = 0; /* seen escape? */ 2900 int seen_esc = 0; /* seen escape? */
2792 unsigned int n = 0; 2901 unsigned int n = 0;
2793 unsigned char *s; 2902 unsigned char *s;
2794 unsigned char ch, string[STRING_MAX]; 2903 unsigned char ch, string[STRING_MAX];
2795 2904
2796 for (; (ch = cmd_getc ());) { 2905 for (; (ch = cmd_getc ());)
2906 {
2797 if (ch == C0_BEL 2907 if (ch == C0_BEL
2798 || ch == CHAR_ST 2908 || ch == CHAR_ST
2799 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2909 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2800 break; 2910 break;
2801 if (ch == C0_ESC) { 2911 if (ch == C0_ESC)
2912 {
2802 seen_esc = 1; 2913 seen_esc = 1;
2803 continue; 2914 continue;
2915 }
2804 } else if (ch == '\t') 2916 else if (ch == '\t')
2805 ch = ' '; /* translate '\t' to space */ 2917 ch = ' '; /* translate '\t' to space */
2806 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2918 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2807 return NULL; /* other control character - exit */ 2919 return NULL; /* other control character - exit */
2808 if (n < sizeof(string) - 1) 2920 if (n < sizeof (string) - 1)
2809 string[n++] = ch; 2921 string[n++] = ch;
2810 seen_esc = 0; 2922 seen_esc = 0;
2811 } 2923 }
2812 string[n++] = '\0'; 2924 string[n++] = '\0';
2813 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2925 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2814 return NULL; 2926 return NULL;
2815 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2927 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2816 STRNCPY(s, string, n); 2928 STRNCPY (s, string, n);
2817 return s; 2929 return s;
2818} 2930}
2819 2931
2820/*----------------------------------------------------------------------*/ 2932/*----------------------------------------------------------------------*/
2821/* 2933/*
2822 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 2934 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2823 */ 2935 */
2824void 2936void
2825rxvt_term::process_dcs_seq () 2937rxvt_term::process_dcs_seq ()
2826{ 2938{
2827 unsigned char eh, *s; 2939 unsigned char eh, *s;
2828/* 2940 /*
2829 * Not handled yet 2941 * Not handled yet
2830 */ 2942 */
2831 s = get_to_st (&eh); 2943 s = get_to_st (&eh);
2832 if (s) 2944 if (s)
2833 free(s); 2945 free (s);
2834 return; 2946 return;
2835} 2947}
2836 2948
2837/*----------------------------------------------------------------------*/ 2949/*----------------------------------------------------------------------*/
2838/* 2950/*
2839 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2951 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2840 */ 2952 */
2841void 2953void
2842rxvt_term::process_osc_seq () 2954rxvt_term::process_osc_seq ()
2843{ 2955{
2844 unsigned char ch, eh, *s; 2956 unsigned char ch, eh, *s;
2845 int arg; 2957 int arg;
2846 2958
2847 ch = cmd_getc (); 2959 ch = cmd_getc ();
2848 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 2960 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2849 arg = arg * 10 + (ch - '0'); 2961 arg = arg * 10 + (ch - '0');
2850 2962
2851 if (ch == ';') { 2963 if (ch == ';')
2964 {
2852 s = get_to_st (&eh); 2965 s = get_to_st (&eh);
2853 if (s) { 2966 if (s)
2854 /* 2967 {
2968 /*
2855 * rxvt_menubar_dispatch() violates the constness of the string, 2969 * rxvt_menubar_dispatch () violates the constness of the string,
2856 * so do it here 2970 * so do it here
2857 */ 2971 */
2858 if (arg == XTerm_Menu) 2972 if (arg == XTerm_Menu)
2859#if 0 /* XXX: currently disabled due to security concerns */ 2973#if 0 /* XXX: currently disabled due to security concerns */
2860 menubar_dispatch ((char *)s); 2974 menubar_dispatch ((char *)s);
2861#else 2975#else
2862 (void)0; 2976 (void)0;
2863#endif 2977#endif
2864 else 2978 else
2865 xterm_seq (arg, (char *)s, eh); 2979 xterm_seq (arg, (char *)s, eh);
2866 free(s); 2980 free (s);
2867 } 2981 }
2868 } 2982 }
2869} 2983}
2870/* 2984/*
2871 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 2985 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2872 * 0 = change iconName/title 2986 * 0 = change iconName/title
… …
2880 * 19 = change underlined character color 2994 * 19 = change underlined character color
2881 * 46 = change logfile (not implemented) 2995 * 46 = change logfile (not implemented)
2882 * 50 = change font 2996 * 50 = change font
2883 * 2997 *
2884 * rxvt extensions: 2998 * rxvt extensions:
2999 * 9 = change locale (NYI)
2885 * 10 = menu (may change in future) 3000 * 10 = menu (may change in future)
2886 * 20 = bg pixmap 3001 * 20 = bg pixmap
2887 * 39 = change default fg color 3002 * 39 = change default fg color
2888 * 49 = change default bg color 3003 * 49 = change default bg color
2889 * 55 = dump scrollback buffer and all of screen 3004 * 55 = dump scrollback buffer and all of screen
2890 */ 3005 */
2891void 3006void
2892rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 3007rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
2893{ 3008{
2894 int changed = 0; 3009 int changed = 0;
2895 int color; 3010 int color;
2896 char *buf, *name; 3011 char *buf, *name;
2897 3012
2898 assert(str != NULL); 3013 assert (str != NULL);
2899 switch (op) { 3014 switch (op)
3015 {
2900 case XTerm_name: 3016 case XTerm_name:
2901 set_title (str); 3017 set_title (str);
2902 /* FALLTHROUGH */ 3018 /* FALLTHROUGH */
2903 case XTerm_iconName: 3019 case XTerm_iconName:
2904 set_iconName (str); 3020 set_iconName (str);
2905 break; 3021 break;
2906 case XTerm_title: 3022 case XTerm_title:
2907 set_title (str); 3023 set_title (str);
2908 break; 3024 break;
2909 case XTerm_Color: 3025 case XTerm_Color:
2910 for (buf = (char *)str; buf && *buf;) { 3026 for (buf = (char *)str; buf && *buf;)
3027 {
2911 if ((name = STRCHR(buf, ';')) == NULL) 3028 if ((name = STRCHR (buf, ';')) == NULL)
2912 break; 3029 break;
2913 *name++ = '\0'; 3030 *name++ = '\0';
2914 color = atoi(buf); 3031 color = atoi (buf);
2915 if (color < 0 || color >= TOTAL_COLORS) 3032 if (color < 0 || color >= TOTAL_COLORS)
2916 break; 3033 break;
2917 if ((buf = STRCHR(name, ';')) != NULL) 3034 if ((buf = STRCHR (name, ';')) != NULL)
2918 *buf++ = '\0'; 3035 *buf++ = '\0';
2919 set_window_color (color + minCOLOR, name); 3036 set_window_color (color + minCOLOR, name);
2920 } 3037 }
2921 break; 3038 break;
2922#ifndef NO_CURSORCOLOR 3039#ifndef NO_CURSORCOLOR
2923 case XTerm_Color_cursor: 3040 case XTerm_Color_cursor:
2924 set_window_color (Color_cursor, str); 3041 set_window_color (Color_cursor, str);
2925 break; 3042 break;
2926#endif 3043#endif
2927 case XTerm_Color_pointer: 3044 case XTerm_Color_pointer:
2928 set_window_color (Color_pointer, str); 3045 set_window_color (Color_pointer, str);
2929 break; 3046 break;
2930#ifndef NO_BOLD_UNDERLINE_REVERSE 3047#ifndef NO_BOLD_UNDERLINE_REVERSE
2931 case XTerm_Color_BD: 3048 case XTerm_Color_BD:
2932 set_window_color (Color_BD, str); 3049 set_window_color (Color_BD, str);
2933 break; 3050 break;
2934 case XTerm_Color_UL: 3051 case XTerm_Color_UL:
2935 set_window_color (Color_UL, str); 3052 set_window_color (Color_UL, str);
2936 break; 3053 break;
2937 case XTerm_Color_RV: 3054 case XTerm_Color_RV:
2938 set_window_color (Color_RV, str); 3055 set_window_color (Color_RV, str);
2939 break; 3056 break;
2940#endif 3057#endif
2941 3058
2942 case XTerm_Menu: 3059 case XTerm_Menu:
2943 /* 3060 /*
2944 * rxvt_menubar_dispatch() violates the constness of the string, 3061 * rxvt_menubar_dispatch () violates the constness of the string,
2945 * so DON'T do it here 3062 * so DON'T do it here
2946 */ 3063 */
2947 break; 3064 break;
2948 case XTerm_Pixmap: 3065 case XTerm_Pixmap:
2949 if (*str != ';') { 3066 if (*str != ';')
3067 {
2950#if XPM_BACKGROUND 3068#if XPM_BACKGROUND
2951 scale_pixmap (""); /* reset to default scaling */ 3069 scale_pixmap (""); /* reset to default scaling */
2952 set_bgPixmap (str); /* change pixmap */ 3070 set_bgPixmap (str); /* change pixmap */
2953#endif 3071#endif
2954 scr_touch (true); 3072 scr_touch (true);
2955 } 3073 }
2956 while ((str = STRCHR(str, ';')) != NULL) { 3074 while ((str = STRCHR (str, ';')) != NULL)
2957 str++; 3075 {
3076 str++;
2958#if XPM_BACKGROUND 3077#if XPM_BACKGROUND
2959 changed += scale_pixmap (str); 3078 changed += scale_pixmap (str);
2960#endif 3079#endif
2961 } 3080
2962 if (changed) { 3081 }
3082 if (changed)
3083 {
2963#ifdef XPM_BACKGROUND 3084#ifdef XPM_BACKGROUND
2964 resize_pixmap (); 3085 resize_pixmap ();
2965#endif 3086#endif
2966 scr_touch (true); 3087 scr_touch (true);
2967 } 3088 }
2968 break; 3089 break;
2969 3090
2970 case XTerm_restoreFG: 3091 case XTerm_restoreFG:
2971 set_window_color (Color_fg, str); 3092 set_window_color (Color_fg, str);
2972 break; 3093 break;
2973 case XTerm_restoreBG: 3094 case XTerm_restoreBG:
2974 set_window_color (Color_bg, str); 3095 set_window_color (Color_bg, str);
2975 break; 3096 break;
2976 case XTerm_logfile: 3097 case XTerm_logfile:
2977 break; 3098 break;
2978 case XTerm_font: 3099 case XTerm_font:
2979 change_font (0, str); 3100 change_font (str);
2980 break; 3101 break;
3102 case XTerm_locale:
3103 if (str[0] == '?' && !str[1])
3104 tt_printf ("%-.250s\n", locale);
3105 else
3106 {
3107 set_locale (str);
3108 im_cb ();
3109
3110 if (display->selection_owner == this)
3111 display->set_selection_owner (0);
3112 }
3113 break;
2981#if 0 3114#if 0
2982 case XTerm_dumpscreen: /* no error notices */ 3115 case XTerm_dumpscreen: /* no error notices */
2983 { 3116 {
2984 int fd; 3117 int fd;
2985 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) { 3118 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
2986 scr_dump (fd); 3119 {
2987 close(fd); 3120 scr_dump (fd);
2988 } 3121 close (fd);
2989 } 3122 }
2990 break; 3123 }
3124 break;
2991#endif 3125#endif
3126
2992 } 3127 }
2993} 3128}
2994/*----------------------------------------------------------------------*/ 3129/*----------------------------------------------------------------------*/
2995 3130
2996/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3131/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3004 * so no need for fancy checking 3139 * so no need for fancy checking
3005 */ 3140 */
3006int 3141int
3007rxvt_term::privcases (int mode, unsigned long bit) 3142rxvt_term::privcases (int mode, unsigned long bit)
3008{ 3143{
3009 int state; 3144 int state;
3010 3145
3011 if (mode == 's') { 3146 if (mode == 's')
3147 {
3012 SavedModes |= (PrivateModes & bit); 3148 SavedModes |= (PrivateModes & bit);
3013 return -1; 3149 return -1;
3014 } else { 3150 }
3151 else
3152 {
3015 if (mode == 'r') 3153 if (mode == 'r')
3016 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3154 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3017 else 3155 else
3018 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3156 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3019 PrivMode(state, bit); 3157 PrivMode (state, bit);
3020 } 3158 }
3021 return state; 3159 return state;
3022} 3160}
3023 3161
3024/* we're not using priv _yet_ */ 3162/* we're not using priv _yet_ */
3025void 3163void
3026rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3164rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3027{ 3165{
3028 unsigned int i, j; 3166 unsigned int i, j;
3029 int state; 3167 int state;
3030 static const struct { 3168 static const struct
3169 {
3031 const int argval; 3170 const int argval;
3032 const unsigned long bit; 3171 const unsigned long bit;
3172 }
3033 } argtopriv[] = { 3173 argtopriv[] = {
3034 { 1, PrivMode_aplCUR }, 3174 { 1, PrivMode_aplCUR },
3035 { 2, PrivMode_vt52 }, 3175 { 2, PrivMode_vt52 },
3036 { 3, PrivMode_132 }, 3176 { 3, PrivMode_132 },
3037 { 4, PrivMode_smoothScroll }, 3177 { 4, PrivMode_smoothScroll },
3038 { 5, PrivMode_rVideo }, 3178 { 5, PrivMode_rVideo },
3039 { 6, PrivMode_relOrigin }, 3179 { 6, PrivMode_relOrigin },
3040 { 7, PrivMode_Autowrap }, 3180 { 7, PrivMode_Autowrap },
3041 { 9, PrivMode_MouseX10 }, 3181 { 9, PrivMode_MouseX10 },
3042#ifdef menuBar_esc 3182#ifdef menuBar_esc
3043 { menuBar_esc, PrivMode_menuBar }, 3183 { menuBar_esc, PrivMode_menuBar },
3044#endif 3184#endif
3045#ifdef scrollBar_esc 3185#ifdef scrollBar_esc
3046 { scrollBar_esc, PrivMode_scrollBar }, 3186 { scrollBar_esc, PrivMode_scrollBar },
3047#endif 3187#endif
3048 { 25, PrivMode_VisibleCursor }, 3188 { 25, PrivMode_VisibleCursor },
3049 { 35, PrivMode_ShiftKeys }, 3189 { 35, PrivMode_ShiftKeys },
3050 { 40, PrivMode_132OK }, 3190 { 40, PrivMode_132OK },
3051 { 47, PrivMode_Screen }, 3191 { 47, PrivMode_Screen },
3052 { 66, PrivMode_aplKP }, 3192 { 66, PrivMode_aplKP },
3053#ifndef NO_BACKSPACE_KEY 3193#ifndef NO_BACKSPACE_KEY
3054 { 67, PrivMode_BackSpace }, 3194 { 67, PrivMode_BackSpace },
3055#endif 3195#endif
3056 { 1000, PrivMode_MouseX11 }, 3196 { 1000, PrivMode_MouseX11 },
3057 { 1010, PrivMode_TtyOutputInh }, 3197 { 1010, PrivMode_TtyOutputInh },
3058 { 1011, PrivMode_Keypress }, 3198 { 1011, PrivMode_Keypress },
3059 { 1047, PrivMode_Screen }, 3199 { 1047, PrivMode_Screen },
3060 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3200 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3061 }; 3201 };
3062 3202
3063 if (nargs == 0) 3203 if (nargs == 0)
3064 return; 3204 return;
3065 3205
3066/* make lo/hi boolean */ 3206 /* make lo/hi boolean */
3067 if (mode == 'l') 3207 if (mode == 'l')
3068 mode = 0; /* reset */ 3208 mode = 0; /* reset */
3069 else if (mode == 'h') 3209 else if (mode == 'h')
3070 mode = 1; /* set */ 3210 mode = 1; /* set */
3071 3211
3072 for (i = 0; i < nargs; i++) { 3212 for (i = 0; i < nargs; i++)
3213 {
3073 state = -1; 3214 state = -1;
3074 3215
3075 /* basic handling */ 3216 /* basic handling */
3076 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3217 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3077 if (argtopriv[j].argval == arg[i]) { 3218 if (argtopriv[j].argval == arg[i])
3219 {
3078 state = privcases (mode, argtopriv[j].bit); 3220 state = privcases (mode, argtopriv[j].bit);
3079 break; 3221 break;
3080 } 3222 }
3081 3223
3082 /* extra handling for values with state unkept */ 3224 /* extra handling for values with state unkept */
3083 if (state == -1) 3225 if (state == -1)
3084 switch (arg[i]) { 3226 switch (arg[i])
3227 {
3085 case 1048: /* alternative cursor save */ 3228 case 1048: /* alternative cursor save */
3086 if (mode == 0) 3229 if (mode == 0)
3087 scr_cursor (RESTORE); 3230 scr_cursor (RESTORE);
3088 else if (mode == 1) 3231 else if (mode == 1)
3089 scr_cursor (SAVE); 3232 scr_cursor (SAVE);
3090 /* FALLTHROUGH */ 3233 /* FALLTHROUGH */
3091 default: 3234 default:
3092 continue; /* for(;i;) */ 3235 continue; /* for (;i;) */
3093 } 3236 }
3094 3237
3095 /* extra handling for values with valid 0 or 1 state */ 3238 /* extra handling for values with valid 0 or 1 state */
3096 switch (arg[i]) { 3239 switch (arg[i])
3240 {
3097 /* case 1: - application cursor keys */ 3241 /* case 1: - application cursor keys */
3098 case 2: /* VT52 mode */ 3242 case 2: /* VT52 mode */
3099 /* oddball mode. should be set regardless of set/reset 3243 /* oddball mode. should be set regardless of set/reset
3100 * parameter. Return from VT52 mode with an ESC < from 3244 * parameter. Return from VT52 mode with an ESC < from
3101 * within VT52 mode 3245 * within VT52 mode
3102 */ 3246 */
3103 PrivMode(1, PrivMode_vt52); 3247 PrivMode (1, PrivMode_vt52);
3104 break; 3248 break;
3105 case 3: /* 80/132 */ 3249 case 3: /* 80/132 */
3106 if (PrivateModes & PrivMode_132OK) 3250 if (PrivateModes & PrivMode_132OK)
3107 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3251 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth),
3108 (unsigned int)TermWin.height); 3252 (unsigned int)TermWin.height);
3109 break; 3253 break;
3110 case 4: /* smooth scrolling */ 3254 case 4: /* smooth scrolling */
3111 if (state) 3255 if (state)
3112 Options &= ~Opt_jumpScroll; 3256 Options &= ~Opt_jumpScroll;
3113 else 3257 else
3114 Options |= Opt_jumpScroll; 3258 Options |= Opt_jumpScroll;
3115 break; 3259 break;
3116 case 5: /* reverse video */ 3260 case 5: /* reverse video */
3117 scr_rvideo_mode (state); 3261 scr_rvideo_mode (state);
3118 break; 3262 break;
3119 case 6: /* relative/absolute origins */ 3263 case 6: /* relative/absolute origins */
3120 scr_relative_origin (state); 3264 scr_relative_origin (state);
3121 break; 3265 break;
3122 case 7: /* autowrap */ 3266 case 7: /* autowrap */
3123 scr_autowrap (state); 3267 scr_autowrap (state);
3124 break; 3268 break;
3125 /* case 8: - auto repeat, can't do on a per window basis */ 3269 /* case 8: - auto repeat, can't do on a per window basis */
3126 case 9: /* X10 mouse reporting */ 3270 case 9: /* X10 mouse reporting */
3127 if (state) /* orthogonal */ 3271 if (state) /* orthogonal */
3128 PrivateModes &= ~(PrivMode_MouseX11); 3272 PrivateModes &= ~ (PrivMode_MouseX11);
3129 break; 3273 break;
3130#ifdef menuBar_esc 3274#ifdef menuBar_esc
3131 case menuBar_esc: 3275 case menuBar_esc:
3132#ifdef MENUBAR 3276#ifdef MENUBAR
3133 map_menuBar (state); 3277 map_menuBar (state);
3134#endif 3278#endif
3135 break; 3279 break;
3136#endif 3280#endif
3137#ifdef scrollBar_esc 3281#ifdef scrollBar_esc
3138 case scrollBar_esc: 3282 case scrollBar_esc:
3139 if (scrollbar_mapping (state)) { 3283 if (scrollbar_mapping (state))
3284 {
3140 resize_all_windows (0, 0, 0); 3285 resize_all_windows (0, 0, 0);
3141 scr_touch (true); 3286 scr_touch (true);
3142 } 3287 }
3143 break; 3288 break;
3144#endif 3289#endif
3145 case 25: /* visible/invisible cursor */ 3290 case 25: /* visible/invisible cursor */
3146 scr_cursor_visible (state); 3291 scr_cursor_visible (state);
3147 break; 3292 break;
3148 /* case 35: - shift keys */ 3293 /* case 35: - shift keys */
3149 /* case 40: - 80 <--> 132 mode */ 3294 /* case 40: - 80 <--> 132 mode */
3150 case 47: /* secondary screen */ 3295 case 47: /* secondary screen */
3151 scr_change_screen (state); 3296 scr_change_screen (state);
3152 break; 3297 break;
3153 /* case 66: - application key pad */ 3298 /* case 66: - application key pad */
3154 /* case 67: - backspace key */ 3299 /* case 67: - backspace key */
3155 case 1000: /* X11 mouse reporting */ 3300 case 1000: /* X11 mouse reporting */
3156 if (state) /* orthogonal */ 3301 if (state) /* orthogonal */
3157 PrivateModes &= ~(PrivMode_MouseX10); 3302 PrivateModes &= ~ (PrivMode_MouseX10);
3158 break; 3303 break;
3159#if 0 3304#if 0
3160 case 1001: 3305 case 1001:
3161 break; /* X11 mouse highlighting */ 3306 break; /* X11 mouse highlighting */
3162#endif 3307#endif
3163 case 1010: /* scroll to bottom on TTY output inhibit */ 3308 case 1010: /* scroll to bottom on TTY output inhibit */
3164 if (state) 3309 if (state)
3165 Options &= ~Opt_scrollTtyOutput; 3310 Options &= ~Opt_scrollTtyOutput;
3166 else 3311 else
3167 Options |= Opt_scrollTtyOutput; 3312 Options |= Opt_scrollTtyOutput;
3168 break; 3313 break;
3169 case 1011: /* scroll to bottom on key press */ 3314 case 1011: /* scroll to bottom on key press */
3170 if (state) 3315 if (state)
3171 Options |= Opt_scrollTtyKeypress; 3316 Options |= Opt_scrollTtyKeypress;
3172 else 3317 else
3173 Options &= ~Opt_scrollTtyKeypress; 3318 Options &= ~Opt_scrollTtyKeypress;
3174 break; 3319 break;
3175 case 1047: /* secondary screen w/ clearing */ 3320 case 1047: /* secondary screen w/ clearing */
3176 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3321 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3177 if (current_screen != PRIMARY) 3322 if (current_screen != PRIMARY)
3178 scr_erase_screen (2); 3323 scr_erase_screen (2);
3179 scr_change_screen (state); 3324 scr_change_screen (state);
3180 /* FALLTHROUGH */ 3325 /* FALLTHROUGH */
3181 default: 3326 default:
3182 break; 3327 break;
3183 } 3328 }
3184 } 3329 }
3185} 3330}
3186/*}}} */ 3331/*}}} */
3187 3332
3188/*{{{ process sgr sequences */ 3333/*{{{ process sgr sequences */
3189void 3334void
3190rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3335rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3191{ 3336{
3192 unsigned int i; 3337 unsigned int i;
3193 short rendset; 3338 short rendset;
3194 int rendstyle; 3339 int rendstyle;
3195 3340
3196 if (nargs == 0) { 3341 if (nargs == 0)
3342 {
3197 scr_rendition (0, ~RS_None); 3343 scr_rendition (0, ~RS_None);
3198 return; 3344 return;
3199 } 3345 }
3200 for (i = 0; i < nargs; i++) { 3346 for (i = 0; i < nargs; i++)
3347 {
3201 rendset = -1; 3348 rendset = -1;
3202 switch (arg[i]) { 3349 switch (arg[i])
3203 case 0: 3350 {
3351 case 0:
3204 rendset = 0, rendstyle = ~RS_None; 3352 rendset = 0, rendstyle = ~RS_None;
3205 break; 3353 break;
3206 case 1: 3354 case 1:
3207 rendset = 1, rendstyle = RS_Bold; 3355 rendset = 1, rendstyle = RS_Bold;
3208 break; 3356 break;
3209 case 4: 3357 case 4:
3210 rendset = 1, rendstyle = RS_Uline; 3358 rendset = 1, rendstyle = RS_Uline;
3211 break; 3359 break;
3212 case 5: 3360 case 5:
3213 rendset = 1, rendstyle = RS_Blink; 3361 rendset = 1, rendstyle = RS_Blink;
3214 break; 3362 break;
3215 case 7: 3363 case 7:
3216 rendset = 1, rendstyle = RS_RVid; 3364 rendset = 1, rendstyle = RS_RVid;
3217 break; 3365 break;
3218 case 22: 3366 case 22:
3219 rendset = 0, rendstyle = RS_Bold; 3367 rendset = 0, rendstyle = RS_Bold;
3220 break; 3368 break;
3221 case 24: 3369 case 24:
3222 rendset = 0, rendstyle = RS_Uline; 3370 rendset = 0, rendstyle = RS_Uline;
3223 break; 3371 break;
3224 case 25: 3372 case 25:
3225 rendset = 0, rendstyle = RS_Blink; 3373 rendset = 0, rendstyle = RS_Blink;
3226 break; 3374 break;
3227 case 27: 3375 case 27:
3228 rendset = 0, rendstyle = RS_RVid; 3376 rendset = 0, rendstyle = RS_RVid;
3229 break; 3377 break;
3230 } 3378 }
3231 if (rendset != -1) { 3379 if (rendset != -1)
3380 {
3232 scr_rendition (rendset, rendstyle); 3381 scr_rendition (rendset, rendstyle);
3233 continue; /* for(;i;) */ 3382 continue; /* for (;i;) */
3234 } 3383 }
3235 3384
3236 switch (arg[i]) { 3385 switch (arg[i])
3237 case 30: 3386 {
3387 case 30:
3238 case 31: /* set fg color */ 3388 case 31: /* set fg color */
3239 case 32: 3389 case 32:
3240 case 33: 3390 case 33:
3241 case 34: 3391 case 34:
3242 case 35: 3392 case 35:
3243 case 36: 3393 case 36:
3244 case 37: 3394 case 37:
3245 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3395 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)),
3246 Color_fg); 3396 Color_fg);
3247 break; 3397 break;
3248#ifdef TTY_256COLOR 3398#ifdef TTY_256COLOR
3249 case 38: 3399 case 38:
3250 if (nargs > i + 2 && arg[i + 1] == 5) { 3400 if (nargs > i + 2 && arg[i + 1] == 5)
3401 {
3251 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3402 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3252 Color_fg); 3403 Color_fg);
3253 i += 2; 3404 i += 2;
3254 } 3405 }
3255 break; 3406 break;
3256#endif 3407#endif
3257 case 39: /* default fg */ 3408 case 39: /* default fg */
3258 scr_color (Color_fg, Color_fg); 3409 scr_color (Color_fg, Color_fg);
3259 break; 3410 break;
3260 3411
3261 case 40: 3412 case 40:
3262 case 41: /* set bg color */ 3413 case 41: /* set bg color */
3263 case 42: 3414 case 42:
3264 case 43: 3415 case 43:
3265 case 44: 3416 case 44:
3266 case 45: 3417 case 45:
3267 case 46: 3418 case 46:
3268 case 47: 3419 case 47:
3269 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3420 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)),
3270 Color_bg); 3421 Color_bg);
3271 break; 3422 break;
3272#ifdef TTY_256COLOR 3423#ifdef TTY_256COLOR
3273 case 48: 3424 case 48:
3274 if (nargs > i + 2 && arg[i + 1] == 5) { 3425 if (nargs > i + 2 && arg[i + 1] == 5)
3426 {
3275 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3427 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3276 Color_bg); 3428 Color_bg);
3277 i += 2; 3429 i += 2;
3278 } 3430 }
3279 break; 3431 break;
3280#endif 3432#endif
3281 case 49: /* default bg */ 3433 case 49: /* default bg */
3282 scr_color (Color_bg, Color_bg); 3434 scr_color (Color_bg, Color_bg);
3283 break; 3435 break;
3284 3436
3285#ifndef NO_BRIGHTCOLOR 3437#ifndef NO_BRIGHTCOLOR
3286 case 90: 3438 case 90:
3287 case 91: /* set bright fg color */ 3439 case 91: /* set bright fg color */
3288 case 92: 3440 case 92:
3289 case 93: 3441 case 93:
3290 case 94: 3442 case 94:
3291 case 95: 3443 case 95:
3292 case 96: 3444 case 96:
3293 case 97: 3445 case 97:
3294 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3446 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3295 Color_fg); 3447 Color_fg);
3296 break; 3448 break;
3297 case 100: 3449 case 100:
3298 case 101: /* set bright bg color */ 3450 case 101: /* set bright bg color */
3299 case 102: 3451 case 102:
3300 case 103: 3452 case 103:
3301 case 104: 3453 case 104:
3302 case 105: 3454 case 105:
3303 case 106: 3455 case 106:
3304 case 107: 3456 case 107:
3305 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3457 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3306 Color_bg); 3458 Color_bg);
3307 break; 3459 break;
3308#endif 3460#endif
3309 } 3461
3462 }
3310 } 3463 }
3311} 3464}
3312/*}}} */ 3465/*}}} */
3313 3466
3314/*{{{ process Rob Nation's own graphics mode sequences */ 3467/*{{{ process Rob Nation's own graphics mode sequences */
3315void 3468void
3316rxvt_term::process_graphics () 3469rxvt_term::process_graphics ()
3317{ 3470{
3318 unsigned char ch, cmd = cmd_getc (); 3471 unsigned char ch, cmd = cmd_getc ();
3319 3472
3320#ifndef RXVT_GRAPHICS 3473 if (cmd == 'Q')
3321 if (cmd == 'Q') { /* query graphics */ 3474 { /* query graphics */
3322 tt_printf("\033G0\n"); /* no graphics */ 3475 tt_printf ("\033G0\n"); /* no graphics */
3323 return; 3476 return;
3324 } 3477 }
3325/* swallow other graphics sequences until terminating ':' */ 3478 /* swallow other graphics sequences until terminating ':' */
3326 do 3479 do
3327 ch = cmd_getc ();
3328 while (ch != ':');
3329#else
3330 unsigned int nargs;
3331 int args[NGRX_PTS];
3332 unsigned char *text = NULL;
3333
3334 if (cmd == 'Q') { /* query graphics */
3335 tt_printf("\033G1\n"); /* yes, graphics (color) */
3336 return;
3337 }
3338 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) {
3339 int neg;
3340
3341 ch = cmd_getc ();
3342 neg = (ch == '-');
3343 if (neg || ch == '+')
3344 ch = cmd_getc (); 3480 ch = cmd_getc ();
3345 3481 while (ch != ':');
3346 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3347 args[nargs] = args[nargs] * 10 + (ch - '0');
3348 if (neg)
3349 args[nargs] = -args[nargs];
3350
3351 nargs++;
3352 args[nargs] = 0;
3353 if (ch != ';')
3354 break;
3355 }
3356
3357 if ((cmd == 'T') && (nargs >= 5)) {
3358 int i, len = args[4];
3359
3360 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3361
3362 if (text != NULL) {
3363 for (i = 0; i < len; i++)
3364 text[i] = cmd_getc ();
3365 text[len] = '\0';
3366 }
3367 }
3368 Gr_do_graphics (cmd, nargs, args, text);
3369#endif
3370} 3482}
3371/*}}} */ 3483/*}}} */
3372 3484
3373/* ------------------------------------------------------------------------- */ 3485/* ------------------------------------------------------------------------- */
3374 3486
3375/* 3487/*
3376 * Send printf() formatted output to the command. 3488 * Send printf () formatted output to the command.
3377 * Only use for small amounts of data. 3489 * Only use for small amounts of data.
3378 */ 3490 */
3379void 3491void
3380rxvt_term::tt_printf (const char *fmt,...) 3492rxvt_term::tt_printf (const char *fmt,...)
3381{ 3493{

Diff Legend

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