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.14 by pcg, Mon Dec 8 23:14:40 2003 UTC vs.
Revision 1.73 by pcg, Mon Mar 15 00:08:11 2004 UTC

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

Diff Legend

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