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.21 by pcg, Thu Dec 18 08:06:46 2003 UTC vs.
Revision 1.36 by pcg, Sun Feb 1 01:34:41 2004 UTC

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

Diff Legend

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