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.8 by pcg, Wed Nov 26 10:42:34 2003 UTC vs.
Revision 1.68 by pcg, Sun Mar 14 17:33:07 2004 UTC

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

Diff Legend

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