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

Diff Legend

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