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.10 by pcg, Thu Nov 27 16:49:45 2003 UTC vs.
Revision 1.41 by pcg, Tue Feb 10 00:40:39 2004 UTC

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

Diff Legend

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