ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.8 by pcg, Thu Nov 27 10:12:10 2003 UTC vs.
Revision 1.44 by pcg, Tue Feb 24 16:25:44 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.8 2003/11/27 10:12:10 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>
12 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
13 * - extensive modifications 12 * - extensive modifications
14 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
15 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
16 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
42 42
43#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring>
48
49static char curlocale[128];
50
51void
52rxvt_set_locale (const char *locale)
53{
54 if (locale && STRNCMP (locale, curlocale, 128))
55 {
56 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale);
58 }
59}
60
47void * 61void *
48rxvt_term::operator new (size_t s) 62rxvt_term::operator new (size_t s)
49{ 63{
50 void *p = malloc (s); 64 void *p = malloc (s);
51 65
58{ 72{
59 free (p); 73 free (p);
60} 74}
61 75
62rxvt_term::rxvt_term () 76rxvt_term::rxvt_term ()
77 :
78 rootwin_ev (this, &rxvt_term::rootwin_cb),
79 termwin_ev (this, &rxvt_term::x_cb),
63: pty_ev (this, &rxvt_term::pty_cb), 80 vt_ev (this, &rxvt_term::x_cb),
81#ifdef HAVE_SCROLLBARS
82 scrollbar_ev (this, &rxvt_term::x_cb),
83#endif
84#ifdef MENUBAR
85 menubar_ev (this, &rxvt_term::x_cb),
86#endif
64#ifdef CURSOR_BLINK 87#ifdef CURSOR_BLINK
88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
89#endif
90#ifdef TEXT_BLINK
65 blink_ev (this, &rxvt_term::blink_cb), 91 text_blink_ev (this, &rxvt_term::text_blink_cb),
66#endif 92#endif
67#ifdef POINTER_BLANK 93#ifdef POINTER_BLANK
68 pointer_ev (this, &rxvt_term::pointer_cb), 94 pointer_ev (this, &rxvt_term::pointer_cb),
69#endif 95#endif
96#ifdef USE_XIM
70 x_ev (this, &rxvt_term::x_cb), 97 im_ev (this, &rxvt_term::im_cb),
98#endif
99 check_ev (this, &rxvt_term::check_cb),
71 destroy_ev (this, &rxvt_term::destroy_cb) 100 destroy_ev (this, &rxvt_term::destroy_cb),
101 pty_ev (this, &rxvt_term::pty_cb),
102 incr_ev (this, &rxvt_term::incr_cb)
72{ 103{
73 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
74} 105}
75 106
76rxvt_term::~rxvt_term () 107rxvt_term::~rxvt_term ()
77{ 108{
78 rxvt_scr_release (this);
79
80#ifndef NO_SETOWNER_TTYDEV
81 rxvt_privileged_ttydev (this, RESTORE);
82#endif
83#ifdef UTMP_SUPPORT
84 rxvt_privileged_utmp (this, RESTORE);
85#endif
86#ifdef USE_XIM
87 if (Input_Context != NULL)
88 {
89 XDestroyIC (Input_Context);
90 Input_Context = NULL;
91 }
92#endif
93
94 if (cmd_fd >= 0) 109 if (cmd_fd >= 0)
95 close (cmd_fd); 110 close (cmd_fd);
96 111
97 if (Xfd >= 0) 112#ifndef NO_SETOWNER_TTYDEV
98 XCloseDisplay (Xdisplay); 113 privileged_ttydev (RESTORE);
114#endif
115#ifdef UTMP_SUPPORT
116 privileged_utmp (RESTORE);
117#endif
118
119 delete TermWin.fontset;
120
121 if (display)
122 {
123 if (TermWin.parent[0])
124 XDestroyWindow (display->display, TermWin.parent[0]);
125#if defined(MENUBAR) && (MENUBAR_MAX > 1)
126 if (menuBar.win)
127 XDestroyWindow (display->display, menuBar.win);
128 delete menuBar.drawable;
129#endif
130 }
131
132 // TODO: free pixcolours, colours should become part of rxvt_display
99 133
100 delete PixColors; 134 delete PixColors;
135
136 displays.put (display);
137
138 scr_release ();
139
140 free (env_windowid);
141 free (env_display);
142 free (env_term);
143 free (env_colorfgbg);
144 free (locale);
145 free (codeset);
146
147 delete envv;
148 delete argv;
101} 149}
102 150
103void 151void
104rxvt_term::destroy () 152rxvt_term::destroy ()
105{ 153{
154 if (display)
155 {
156 rootwin_ev.stop (display);
157 termwin_ev.stop (display);
158 vt_ev.stop (display);
159#ifdef USE_XIM
160 im_destroy ();
161 im_ev.stop (display);
162#endif
163#ifdef HAVE_SCROLLBARS
164 scrollbar_ev.stop (display);
165#endif
166#ifdef MENUBAR
167 menubar_ev.stop (display);
168#endif
169 }
170
171 check_ev.stop ();
106 pty_ev.stop (); 172 pty_ev.stop ();
107 x_ev.stop ();
108#ifdef CURSOR_BLINK 173#ifdef CURSOR_BLINK
174 cursor_blink_ev.stop ();
175#endif
176#ifdef TEXT_BLINK
109 blink_ev.stop (); 177 text_blink_ev.stop ();
110#endif 178#endif
111#ifdef POINTER_BLANK 179#ifdef POINTER_BLANK
112 pointer_ev.stop (); 180 pointer_ev.stop ();
113#endif 181#endif
114 182
122 190
123 delete this; 191 delete this;
124} 192}
125 193
126/*----------------------------------------------------------------------*/ 194/*----------------------------------------------------------------------*/
127/* rxvt_init() */ 195/* rxvt_init () */
128/* LIBPROTO */ 196/* LIBPROTO */
129rxvt_t 197rxvt_t
130rxvt_init(int argc, const char *const *argv) 198rxvt_init (int argc, const char *const *argv)
131{ 199{
132 SET_R(new rxvt_term); 200 SET_R (new rxvt_term);
133 dR;
134 201
135 if (!R->init_vars () || !R->init (argc, argv)) 202 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
136 { 203 {
137 delete R; 204 delete GET_R;
138 return NULL; 205 SET_R (0);
139 } 206 }
140 207
141 return R; 208 return GET_R;
142} 209}
143 210
144/* EXTPROTO */ 211static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
212
145void 213void
146rxvt_init_signals () 214rxvt_init_signals ()
147{ 215{
148/* install exit handler for cleanup */ 216 /* install exit handler for cleanup */
149#if 0 217#if 0
150#ifdef HAVE_ATEXIT 218#ifdef HAVE_ATEXIT
151 atexit(rxvt_clean_exit); 219 atexit (rxvt_clean_exit);
152#else 220#else
153# ifdef HAVE_ON_EXIT
154 on_exit(rxvt_clean_exit, NULL); /* non-ANSI exit handler */
155# endif
156#endif 221#endif
157#endif 222#endif
158 223
159 struct sigaction sa; 224 struct sigaction sa;
160 225
161 sigfillset (&sa.sa_mask); 226 sigfillset (&sa.sa_mask);
162 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART; 227 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
163 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGHUP , &sa, 0); //TODO, also: SIGPIPE 228 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
229 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
164 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0); 230 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
165 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0); 231 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
166 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0); 232 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
167 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0); 233 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
168 234
169/* need to trap SIGURG for SVR4 (Unixware) rlogin */ 235 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
170/* signal (SIGURG, SIG_DFL); */ 236 /* signal (SIGURG, SIG_DFL); */
171 237
172 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 238 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
173 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 239 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
174} 240}
175 241
176bool 242bool
177rxvt_term::init (int argc, const char *const *argv) 243rxvt_term::init (int argc, const char *const *argv)
178{ 244{
179 dR;//TODO (scrollbar, setidle)
180
181 /* 245 /*
182 * Save and then give up any super-user privileges 246 * Save and then give up any super-user privileges
183 * If we need privileges in any area then we must specifically request it. 247 * If we need privileges in any area then we must specifically request it.
184 * We should only need to be root in these cases: 248 * We should only need to be root in these cases:
185 * 1. write utmp entries on some systems 249 * 1. write utmp entries on some systems
186 * 2. chown tty on some systems 250 * 2. chown tty on some systems
187 */ 251 */
188 rxvt_privileges (this, SAVE); 252 privileges (SAVE);
189 rxvt_privileges (this, IGNORE); 253 privileges (IGNORE);
190 254
191 rxvt_init_secondary (this); 255 init_secondary ();
192 256
193 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 257 const char **cmd_argv = init_resources (argc, argv);
194 258
259 set_locale ("");
260
195#if (MENUBAR_MAX) 261#if MENUBAR_MAX
196 rxvt_menubar_read (this, rs[Rs_menu]); 262 menubar_read (rs[Rs_menu]);
197#endif 263#endif
198#ifdef HAVE_SCROLLBARS 264#ifdef HAVE_SCROLLBARS
199 if (Options & Opt_scrollBar) 265 if (Options & Opt_scrollBar)
200 scrollbar_setIdle (); /* set existence for size calculations */ 266 scrollBar.setIdle (); /* set existence for size calculations */
201#endif 267#endif
202 268
203 rxvt_Create_Windows (this, argc, argv); 269 create_windows (argc, argv);
204 270
205 rxvt_init_xlocale (this); 271 init_xlocale ();
206 272
207 rxvt_scr_reset (this); /* initialize screen */ 273 scr_reset (); /* initialize screen */
208#ifdef RXVT_GRAPHICS
209 rxvt_Gr_reset (this); /* reset graphics */
210#endif
211 274
212#if 0 275#if 0
213#ifdef DEBUG_X
214 XSynchronize(Xdisplay, True); 276 XSynchronize (display->display, True);
215#endif
216#endif 277#endif
217 278
218#ifdef HAVE_SCROLLBARS 279#ifdef HAVE_SCROLLBARS
219 if (Options & Opt_scrollBar) 280 if (Options & Opt_scrollBar)
220 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 281 resize_scrollbar (); /* create and map scrollbar */
221#endif 282#endif
222#if (MENUBAR_MAX) 283#if (MENUBAR_MAX)
223 if (menubar_visible(r)) 284 if (menubar_visible ())
224 XMapWindow (Xdisplay, menuBar.win); 285 XMapWindow (display->display, menuBar.win);
225#endif 286#endif
226#ifdef TRANSPARENT 287#ifdef TRANSPARENT
227 if (Options & Opt_transparent) 288 if (Options & Opt_transparent)
228 { 289 {
229 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 290 XSelectInput (display->display, display->root, PropertyChangeMask);
230 rxvt_check_our_parents (this); 291 check_our_parents ();
231 } 292 }
232#endif 293#endif
294
295 rootwin_ev.start (display, display->root);
296
233 XMapWindow (Xdisplay, TermWin.vt); 297 XMapWindow (display->display, TermWin.vt);
234 XMapWindow (Xdisplay, TermWin.parent[0]); 298 XMapWindow (display->display, TermWin.parent[0]);
235 299
236 rxvt_init_env (this);
237 rxvt_init_command (this, cmd_argv); 300 init_command (cmd_argv);
238 301
239 x_ev.start (Xfd, EVENT_READ);
240 pty_ev.start (cmd_fd, EVENT_READ); 302 pty_ev.start (cmd_fd, EVENT_READ);
241 303
242 flush (); 304 check_ev.start ();
243 305
244 return true; 306 return true;
245} 307}
246 308
247/* ------------------------------------------------------------------------- * 309/* ------------------------------------------------------------------------- *
251 * Catch a SIGCHLD signal and exit if the direct child has died 313 * Catch a SIGCHLD signal and exit if the direct child has died
252 */ 314 */
253/* ARGSUSED */ 315/* ARGSUSED */
254/* EXTPROTO */ 316/* EXTPROTO */
255RETSIGTYPE 317RETSIGTYPE
256rxvt_Child_signal(int sig __attribute__ ((unused))) 318rxvt_Child_signal (int sig __attribute__ ((unused)))
257{ 319{
258 int pid, save_errno = errno; 320 int pid, save_errno = errno;
259 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 321 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
260 ; 322 ;
261 errno = save_errno; 323 errno = save_errno;
262 324
263#if 0 325#if 0
264 if (pid == R->cmd_pid) 326 if (pid == cmd_pid)
265 exit (EXIT_SUCCESS); 327 exit (EXIT_SUCCESS);
266#endif 328#endif
267} 329}
268 330
269/* 331/*
270 * Catch a fatal signal and tidy up before quitting 332 * Catch a fatal signal and tidy up before quitting
271 */ 333 */
272/* EXTPROTO */ 334/* EXTPROTO */
273RETSIGTYPE 335RETSIGTYPE
274rxvt_Exit_signal(int sig) 336rxvt_Exit_signal (int sig)
275{ 337{
276 signal(sig, SIG_DFL); 338 signal (sig, SIG_DFL);
277#ifdef DEBUG_CMD 339#ifdef DEBUG_CMD
278 rxvt_print_error("signal %d", sig); 340 rxvt_print_error ("signal %d", sig);
279#endif 341#endif
280 rxvt_clean_exit(); 342 rxvt_clean_exit ();
281 kill(getpid(), sig); 343 kill (getpid (), sig);
282} 344}
283 345
284/* ARGSUSED */
285/* INTPROTO */ 346/* INTPROTO */
286int 347int
287rxvt_xerror_handler(const Display * display 348rxvt_xerror_handler (Display *display, XErrorEvent *event)
288 __attribute__ ((unused)), const XErrorEvent * event)
289{ 349{
290 dR;
291
292 if (R->allowedxerror == -1) 350 if (GET_R->allowedxerror == -1)
293 R->allowedxerror = event->error_code; 351 GET_R->allowedxerror = event->error_code;
294 else 352 else
295 { 353 {
296 rxvt_print_error("XError: Request: %d . %d, Error: %d", 354 old_xerror_handler (display, event);
297 event->request_code, event->minor_code,
298 event->error_code);
299
300 R->destroy (); 355 GET_R->destroy ();
301 } 356 }
302 357
303 return 0; 358 return 0;
304} 359}
305 360
310 */ 365 */
311/* EXTPROTO */ 366/* EXTPROTO */
312void 367void
313rxvt_clean_exit () 368rxvt_clean_exit ()
314{ 369{
315 dR; 370 // TODO: rxvtd should clean up all ressources
316 371 if (GET_R)
317 R->destroy (); 372 GET_R->destroy ();
318} 373}
319 374
320/* ------------------------------------------------------------------------- * 375/* ------------------------------------------------------------------------- *
321 * MEMORY ALLOCATION WRAPPERS * 376 * MEMORY ALLOCATION WRAPPERS *
322 * ------------------------------------------------------------------------- */ 377 * ------------------------------------------------------------------------- */
323/* EXTPROTO */ 378/* EXTPROTO */
324void * 379void *
325rxvt_malloc(size_t size) 380rxvt_malloc (size_t size)
326{ 381{
327 void *p; 382 void *p;
328 383
329 p = malloc(size); 384 p = malloc (size);
330 if (p) 385 if (p)
331 return p; 386 return p;
332 387
333 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 388 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
334 rxvt_clean_exit(); 389 rxvt_clean_exit ();
335 exit(EXIT_FAILURE); 390 exit (EXIT_FAILURE);
336/* NOTREACHED */ 391 /* NOTREACHED */
337} 392}
338 393
339/* EXTPROTO */ 394/* EXTPROTO */
340void * 395void *
341rxvt_calloc(size_t number, size_t size) 396rxvt_calloc (size_t number, size_t size)
342{ 397{
343 void *p; 398 void *p;
344 399
345 p = calloc(number, size); 400 p = calloc (number, size);
346 if (p) 401 if (p)
347 return p; 402 return p;
348 403
349 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 404 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
350 rxvt_clean_exit(); 405 rxvt_clean_exit ();
351 exit(EXIT_FAILURE); 406 exit (EXIT_FAILURE);
352/* NOTREACHED */ 407 /* NOTREACHED */
353} 408}
354 409
355/* EXTPROTO */ 410/* EXTPROTO */
356void * 411void *
357rxvt_realloc(void *ptr, size_t size) 412rxvt_realloc (void *ptr, size_t size)
358{ 413{
359 void *p; 414 void *p;
360 415
361 if (ptr) 416 if (ptr)
362 p = realloc(ptr, size); 417 p = realloc (ptr, size);
363 else 418 else
364 p = malloc(size); 419 p = malloc (size);
365 if (p) 420 if (p)
366 return p; 421 return p;
367 422
368 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 423 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
369 rxvt_clean_exit(); 424 rxvt_clean_exit ();
370 exit(EXIT_FAILURE); 425 exit (EXIT_FAILURE);
371/* NOTREACHED */ 426 /* NOTREACHED */
372} 427}
373 428
374/* ------------------------------------------------------------------------- * 429/* ------------------------------------------------------------------------- *
375 * PRIVILEGED OPERATIONS * 430 * PRIVILEGED OPERATIONS *
376 * ------------------------------------------------------------------------- */ 431 * ------------------------------------------------------------------------- */
377/* take care of suid/sgid super-user (root) privileges */ 432/* take care of suid/sgid super-user (root) privileges */
378/* INTPROTO */
379void 433void
380rxvt_privileges(pR_ int mode) 434rxvt_term::privileges (int mode)
381{ 435{
382#if ! defined(__CYGWIN32__) 436#if ! defined(__CYGWIN32__)
383# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 437# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
384/* setreuid() is the poor man's setuid(), seteuid() */ 438 /* setreuid () is the poor man's setuid (), seteuid () */
385# define seteuid(a) setreuid(-1, (a)) 439# define seteuid(a) setreuid(-1, (a))
386# define setegid(a) setregid(-1, (a)) 440# define setegid(a) setregid(-1, (a))
387# define HAVE_SETEUID 441# define HAVE_SETEUID
388# endif 442# endif
389# ifdef HAVE_SETEUID 443# ifdef HAVE_SETEUID
390 switch (mode) { 444 switch (mode)
445 {
391 case IGNORE: 446 case IGNORE:
392 /* 447 /*
393 * change effective uid/gid - not real uid/gid - so we can switch 448 * change effective uid/gid - not real uid/gid - so we can switch
394 * back to root later, as required 449 * back to root later, as required
395 */ 450 */
396 seteuid(getuid()); 451 seteuid (getuid ());
397 setegid(getgid()); 452 setegid (getgid ());
398 break; 453 break;
399 case SAVE: 454 case SAVE:
400 R->euid = geteuid(); 455 euid = geteuid ();
401 R->egid = getegid(); 456 egid = getegid ();
402 break; 457 break;
403 case RESTORE: 458 case RESTORE:
404 seteuid(R->euid); 459 seteuid (euid);
405 setegid(R->egid); 460 setegid (egid);
406 break; 461 break;
407 } 462 }
408# else 463# else
409 switch (mode) { 464 switch (mode)
465 {
410 case IGNORE: 466 case IGNORE:
411 setuid(getuid()); 467 setuid (getuid ());
412 setgid(getgid()); 468 setgid (getgid ());
413 /* FALLTHROUGH */ 469 /* FALLTHROUGH */
414 case SAVE: 470 case SAVE:
415 /* FALLTHROUGH */ 471 /* FALLTHROUGH */
416 case RESTORE: 472 case RESTORE:
417 break; 473 break;
418 } 474 }
419# endif 475# endif
420#endif 476#endif
421} 477}
422 478
423#ifdef UTMP_SUPPORT 479#ifdef UTMP_SUPPORT
424/* EXTPROTO */
425void 480void
426rxvt_privileged_utmp(pR_ char action) 481rxvt_term::privileged_utmp (char action)
427{ 482{
428 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 483 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
429 action, R->next_utmp_action, getpid())); 484 action, next_utmp_action, getpid ()));
430 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 485 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
431 || (R->Options & Opt_utmpInhibit) 486 || (Options & Opt_utmpInhibit)
432 || R->ttydev == NULL || *R->ttydev == '\0') 487 || ttydev == NULL || *ttydev == '\0')
433 return; 488 return;
434 489
435 rxvt_privileges(aR_ RESTORE); 490 privileges (RESTORE);
436 if (action == SAVE) { 491 if (action == SAVE)
492 {
437 R->next_utmp_action = RESTORE; 493 next_utmp_action = RESTORE;
438 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 494 makeutent (ttydev, rs[Rs_display_name]);
495 }
496 else
439 } else { /* action == RESTORE */ 497 { /* action == RESTORE */
440 R->next_utmp_action = IGNORE; 498 next_utmp_action = IGNORE;
441 rxvt_cleanutent(aR); 499 cleanutent ();
442 } 500 }
443 rxvt_privileges(aR_ IGNORE); 501 privileges (IGNORE);
444} 502}
445#endif 503#endif
446 504
447#ifndef NO_SETOWNER_TTYDEV 505#ifndef NO_SETOWNER_TTYDEV
448/* EXTPROTO */
449void 506void
450rxvt_privileged_ttydev(pR_ char action) 507rxvt_term::privileged_ttydev (char action)
451{ 508{
452 D_MAIN((stderr, 509 D_MAIN ((stderr,
453 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 510 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
454 action, R->next_tty_action, getpid())); 511 action, next_tty_action, getpid ()));
455 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 512 if (next_tty_action != action || (action != SAVE && action != RESTORE)
456 || R->ttydev == NULL || *R->ttydev == '\0') 513 || ttydev == NULL || *ttydev == '\0')
457 return; 514 return;
458 515
459 rxvt_privileges(aR_ RESTORE); 516 privileges (RESTORE);
460 517
461 if (action == SAVE) { 518 if (action == SAVE)
519 {
462 R->next_tty_action = RESTORE; 520 next_tty_action = RESTORE;
463# ifndef RESET_TTY_TO_COMMON_DEFAULTS 521# ifndef RESET_TTY_TO_COMMON_DEFAULTS
464/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 522 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
465 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 523 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
466 R->next_tty_action = IGNORE; 524 next_tty_action = IGNORE;
467 else 525 else
468# endif 526# endif
527
469 { 528 {
470 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 529 chown (ttydev, getuid (), ttygid); /* fail silently */
471 chmod(R->ttydev, R->ttymode); 530 chmod (ttydev, ttymode);
472# ifdef HAVE_REVOKE 531# ifdef HAVE_REVOKE
473 revoke(R->ttydev); 532 revoke (ttydev);
474# endif 533# endif
534
475 } 535 }
536 }
537 else
476 } else { /* action == RESTORE */ 538 { /* action == RESTORE */
477 R->next_tty_action = IGNORE; 539 next_tty_action = IGNORE;
478# ifndef RESET_TTY_TO_COMMON_DEFAULTS 540# ifndef RESET_TTY_TO_COMMON_DEFAULTS
479 chmod(R->ttydev, R->ttyfd_stat.st_mode); 541 chmod (ttydev, ttyfd_stat.st_mode);
480 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 542 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
481# else 543# else
482 chmod(R->ttydev, 544 chmod (ttydev,
483 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 545 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
484 chown(R->ttydev, 0, 0); 546 chown (ttydev, 0, 0);
485# endif 547# endif
486 }
487 548
549 }
550
488 rxvt_privileges(aR_ IGNORE); 551 privileges (IGNORE);
489 552
490# ifndef RESET_TTY_TO_COMMON_DEFAULTS 553# ifndef RESET_TTY_TO_COMMON_DEFAULTS
491 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 554 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
492 action == RESTORE ? "Restoring" : (action == 555 action == RESTORE ? "Restoring" : (action ==
493 SAVE ? "Saving" : 556 SAVE ? "Saving" :
494 "UNKNOWN ERROR for"), R->ttydev, 557 "UNKNOWN ERROR for"), ttydev,
495 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 558 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
496 R->ttyfd_stat.st_gid)); 559 ttyfd_stat.st_gid));
497# endif 560# endif
498} 561}
499#endif 562#endif
500 563
501/*----------------------------------------------------------------------*/ 564/*----------------------------------------------------------------------*/
502/* 565/*
503 * window size/position calculcations for XSizeHint and other storage. 566 * window size/position calculcations for XSizeHint and other storage.
504 * if width/height are non-zero then override calculated width/height 567 * if width/height are non-zero then override calculated width/height
505 */ 568 */
506/* EXTPROTO */
507void 569void
508rxvt_window_calc(pR_ unsigned int width, unsigned int height) 570rxvt_term::window_calc (unsigned int width, unsigned int height)
509{ 571{
510 short recalc_x, recalc_y; 572 short recalc_x, recalc_y;
511 int x, y, sb_w, mb_h, flags; 573 int x, y, sb_w, mb_h, flags;
512 unsigned int w, h; 574 unsigned int w, h;
513 unsigned int max_width, max_height; 575 unsigned int max_width, max_height;
514 576
515 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 577 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
516 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 578 TermWin.ncol, TermWin.nrow, szHint.width,
517 R->szHint.height)); 579 szHint.height));
518 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 580 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
519 R->szHint.win_gravity = NorthWestGravity; 581 szHint.win_gravity = NorthWestGravity;
520/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 582 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
521 583
522 recalc_x = recalc_y = 0; 584 recalc_x = recalc_y = 0;
523 flags = 0; 585 flags = 0;
524 if (!R->parsed_geometry) { 586 if (!parsed_geometry)
587 {
525 R->parsed_geometry = 1; 588 parsed_geometry = 1;
526 if (R->rs[Rs_geometry]) 589 if (rs[Rs_geometry])
527 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 590 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
528 if (flags & WidthValue) { 591 if (flags & WidthValue)
592 {
529 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 593 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
530 R->szHint.flags |= USSize; 594 szHint.flags |= USSize;
531 } 595 }
532 if (flags & HeightValue) { 596 if (flags & HeightValue)
597 {
533 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 598 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
534 R->szHint.flags |= USSize; 599 szHint.flags |= USSize;
535 } 600 }
536 if (flags & XValue) { 601 if (flags & XValue)
602 {
537 R->szHint.x = x; 603 szHint.x = x;
538 R->szHint.flags |= USPosition; 604 szHint.flags |= USPosition;
539 if (flags & XNegative) { 605 if (flags & XNegative)
606 {
540 recalc_x = 1; 607 recalc_x = 1;
541 R->szHint.win_gravity = NorthEastGravity; 608 szHint.win_gravity = NorthEastGravity;
542 } 609 }
543 } 610 }
544 if (flags & YValue) { 611 if (flags & YValue)
612 {
545 R->szHint.y = y; 613 szHint.y = y;
546 R->szHint.flags |= USPosition; 614 szHint.flags |= USPosition;
547 if (flags & YNegative) { 615 if (flags & YNegative)
616 {
548 recalc_y = 1; 617 recalc_y = 1;
549 if (R->szHint.win_gravity == NorthEastGravity) 618 if (szHint.win_gravity == NorthEastGravity)
550 R->szHint.win_gravity = SouthEastGravity; 619 szHint.win_gravity = SouthEastGravity;
551 else 620 else
552 R->szHint.win_gravity = SouthWestGravity; 621 szHint.win_gravity = SouthWestGravity;
553 } 622 }
554 } 623 }
555 } 624 }
556/* TODO: BOUNDS */ 625 /* TODO: BOUNDS */
557 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 626 TermWin.width = TermWin.ncol * TermWin.fwidth;
558 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 627 TermWin.height = TermWin.nrow * TermWin.fheight;
559 max_width = MAX_COLS * R->TermWin.fwidth; 628 max_width = MAX_COLS * TermWin.fwidth;
560 max_height = MAX_ROWS * R->TermWin.fheight; 629 max_height = MAX_ROWS * TermWin.fheight;
561 630
562 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 631 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
563 632
564 sb_w = mb_h = 0; 633 sb_w = mb_h = 0;
565 R->window_vt_x = R->window_vt_y = 0; 634 window_vt_x = window_vt_y = 0;
566 if (scrollbar_visible(R)) { 635 if (scrollbar_visible ())
636 {
567 sb_w = scrollbar_TotalWidth(); 637 sb_w = scrollbar_TotalWidth ();
568 R->szHint.base_width += sb_w; 638 szHint.base_width += sb_w;
569 if (!(R->Options & Opt_scrollBar_right)) 639 if (! (Options & Opt_scrollBar_right))
570 R->window_vt_x = sb_w; 640 window_vt_x = sb_w;
571 } 641 }
572 if (menubar_visible(R)) { 642 if (menubar_visible ())
643 {
573 mb_h = menuBar_TotalHeight(); 644 mb_h = menuBar_TotalHeight ();
574 R->szHint.base_height += mb_h; 645 szHint.base_height += mb_h;
575 R->window_vt_y = mb_h; 646 window_vt_y = mb_h;
576 } 647 }
577 R->szHint.width_inc = R->TermWin.fwidth; 648 szHint.width_inc = TermWin.fwidth;
578 R->szHint.height_inc = R->TermWin.fheight; 649 szHint.height_inc = TermWin.fheight;
579 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 650 szHint.min_width = szHint.base_width + szHint.width_inc;
580 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 651 szHint.min_height = szHint.base_height + szHint.height_inc;
581 652
582 if (width && width - R->szHint.base_width < max_width) { 653 if (width && width - szHint.base_width < max_width)
654 {
583 R->szHint.width = width; 655 szHint.width = width;
584 R->TermWin.width = width - R->szHint.base_width; 656 TermWin.width = width - szHint.base_width;
585 } else { 657 }
658 else
659 {
586 MIN_IT(R->TermWin.width, max_width); 660 MIN_IT (TermWin.width, max_width);
587 R->szHint.width = R->szHint.base_width + R->TermWin.width; 661 szHint.width = szHint.base_width + TermWin.width;
588 } 662 }
589 if (height && height - R->szHint.base_height < max_height) { 663 if (height && height - szHint.base_height < max_height)
664 {
590 R->szHint.height = height; 665 szHint.height = height;
591 R->TermWin.height = height - R->szHint.base_height; 666 TermWin.height = height - szHint.base_height;
592 } else { 667 }
668 else
669 {
593 MIN_IT(R->TermWin.height, max_height); 670 MIN_IT (TermWin.height, max_height);
594 R->szHint.height = R->szHint.base_height + R->TermWin.height; 671 szHint.height = szHint.base_height + TermWin.height;
595 } 672 }
596 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 673 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
597 R->window_sb_x = R->szHint.width - sb_w; 674 window_sb_x = szHint.width - sb_w;
598 675
599 if (recalc_x) 676 if (recalc_x)
600 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 677 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
601 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 678 - szHint.width - 2 * TermWin.ext_bwidth);
602 if (recalc_y) 679 if (recalc_y)
603 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 680 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
604 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 681 - szHint.height - 2 * TermWin.ext_bwidth);
605 682
606 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 683 TermWin.ncol = TermWin.width / TermWin.fwidth;
607 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 684 TermWin.nrow = TermWin.height / TermWin.fheight;
608 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 685 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
609 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 686 TermWin.ncol, TermWin.nrow, szHint.width,
610 R->szHint.height)); 687 szHint.height));
611 return; 688 return;
612} 689}
613 690
614/*----------------------------------------------------------------------*/ 691/*----------------------------------------------------------------------*/
615/* 692/*
616 * Tell the teletype handler what size the window is. 693 * Tell the teletype handler what size the window is.
617 * Called after a window size change. 694 * Called after a window size change.
618 */ 695 */
619/* EXTPROTO */
620void 696void
621rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) 697rxvt_term::tt_winch ()
622{ 698{
623 struct winsize ws; 699 struct winsize ws;
624 700
625 if (fd < 0) 701 if (cmd_fd < 0)
626 return; 702 return;
703
627 ws.ws_col = col; 704 ws.ws_col = TermWin.ncol;
628 ws.ws_row = row; 705 ws.ws_row = TermWin.nrow;
629 ws.ws_xpixel = ws.ws_ypixel = 0; 706 ws.ws_xpixel = ws.ws_ypixel = 0;
630#ifndef DEBUG_SIZE 707#ifndef DEBUG_SIZE
631 (void)ioctl(fd, TIOCSWINSZ, &ws); 708 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
632#else 709#else
633 if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { 710 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
634 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 711 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
635 }
636# ifdef SIGWINCH 712# ifdef SIGWINCH
637 else if (pid) /* force through to the command */ 713 else if (cmd_pid) /* force through to the command */
638 kill(pid, SIGWINCH); 714 kill (cmd_pid, SIGWINCH);
639# endif 715# endif
640#endif 716#endif
641} 717}
642 718
643/*----------------------------------------------------------------------*/ 719/*----------------------------------------------------------------------*/
644/* rxvt_change_font() - Switch to a new font */ 720/* rxvt_change_font () - Switch to a new font */
645/* 721/*
646 * init = 1 - initialize 722 * init = 1 - initialize
647 * 723 *
648 * fontname == FONT_UP - switch to bigger font 724 * fontname == FONT_UP - switch to bigger font
649 * fontname == FONT_DN - switch to smaller font 725 * fontname == FONT_DN - switch to smaller font
650 */ 726 */
651/* EXTPROTO */ 727bool
652void
653rxvt_change_font(pR_ int init, const char *fontname) 728rxvt_term::change_font (const char *fontname)
654{ 729{
655} 730 if (fontname == FONT_UP)
731 {
732 // TODO
733 }
734 else if (fontname == FONT_DN)
735 {
736 // TODO
737 }
738 else
739 {
740 rxvt_fontset *fs = new rxvt_fontset (this);
656 741
657/* INTPROTO */ 742 if (fs && fs->populate (fontname))
658void 743 {
744 delete TermWin.fontset;
745 TermWin.fontset = fs;
746 TermWin.fwidth = fs->base_font ()->width;
747 TermWin.fheight = fs->base_font ()->height;
748 TermWin.fbase = fs->base_font ()->ascent;
749
750 // TODO: screen needs to be told about new fonts
751
752 if (TermWin.parent[0])
753 {
754 resize_all_windows (0, 0, 0);
755 scr_remap_chars ();
756 scr_touch (true);
757 }
758
759 return true;
760 }
761 }
762
763 return false;
764}
765
766bool
659rxvt_font_up_down(pR_ int n, int direction) 767rxvt_term::font_up_down (int n, int direction)
660{ 768{
769 return false;
661} 770}
662 771
663/*----------------------------------------------------------------------*/ 772/*----------------------------------------------------------------------*/
664/*----------------------------------------------------------------------*/ 773/*----------------------------------------------------------------------*/
665/* xterm sequences - title, iconName, color (exptl) */ 774/* xterm sequences - title, iconName, color (exptl) */
666/* EXTPROTO */
667void 775void
668rxvt_set_title(pR_ const char *str) 776rxvt_term::set_title (const char *str)
669{ 777{
670#ifndef SMART_WINDOW_TITLE 778#ifndef SMART_WINDOW_TITLE
671 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 779 XStoreName (display->display, TermWin.parent[0], str);
672#else 780#else
673 char *name; 781 char *name;
674 782
675 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 783 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
676 name = NULL; 784 name = NULL;
677 if (name == NULL || STRCMP(name, str)) 785 if (name == NULL || STRCMP (name, str))
678 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 786 XStoreName (display->display, TermWin.parent[0], str);
679 if (name) 787 if (name)
680 XFree(name); 788 XFree (name);
681#endif 789#endif
682} 790}
683 791
684/* EXTPROTO */
685void 792void
686rxvt_set_iconName(pR_ const char *str) 793rxvt_term::set_iconName (const char *str)
687{ 794{
688#ifndef SMART_WINDOW_TITLE 795#ifndef SMART_WINDOW_TITLE
689 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 796 XSetIconName (display->display, TermWin.parent[0], str);
690#else 797#else
691 char *name; 798 char *name;
692 799
693 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 800 if (XGetIconName (display->display, TermWin.parent[0], &name))
694 name = NULL; 801 name = NULL;
695 if (name == NULL || STRCMP(name, str)) 802 if (name == NULL || STRCMP (name, str))
696 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 803 XSetIconName (display->display, TermWin.parent[0], str);
697 if (name) 804 if (name)
698 XFree(name); 805 XFree (name);
699#endif 806#endif
700} 807}
701 808
702#ifdef XTERM_COLOR_CHANGE 809#ifdef XTERM_COLOR_CHANGE
703/* EXTPROTO */
704void 810void
705rxvt_set_window_color(pR_ int idx, const char *color) 811rxvt_term::set_window_color (int idx, const char *color)
706{ 812{
707 rxvt_color xcol; 813 rxvt_color xcol;
708 int i; 814 int i;
709 815
710 if (color == NULL || *color == '\0') 816 if (color == NULL || *color == '\0')
711 return; 817 return;
712 818
713/* handle color aliases */ 819 /* handle color aliases */
714 if (isdigit(*color)) { 820 if (isdigit (*color))
821 {
715 i = atoi(color); 822 i = atoi (color);
823 if (i >= 8 && i <= 15)
716 if (i >= 8 && i <= 15) { /* bright colors */ 824 { /* bright colors */
717 i -= 8; 825 i -= 8;
718# ifndef NO_BRIGHTCOLOR 826# ifndef NO_BRIGHTCOLOR
719 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 827 PixColors[idx] = PixColors[minBrightCOLOR + i];
720 SET_PIXCOLOR(R, idx); 828 SET_PIXCOLOR (idx);
721 goto Done; 829 goto Done;
722# endif 830# endif
831
723 } 832 }
724 if (i >= 0 && i <= 7) { /* normal colors */ 833 if (i >= 0 && i <= 7)
834 { /* normal colors */
725 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 835 PixColors[idx] = PixColors[minCOLOR + i];
726 SET_PIXCOLOR(R, idx); 836 SET_PIXCOLOR (idx);
727 goto Done; 837 goto Done;
728 } 838 }
729 } 839 }
730 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 840 if (!rXParseAllocColor (& xcol, color))
731 return; 841 return;
732/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 842 /* XStoreColor (display->display, XCMAP, XColor*); */
733 843
734/* 844 /*
735 * FIXME: should free colors here, but no idea how to do it so instead, 845 * FIXME: should free colors here, but no idea how to do it so instead,
736 * so just keep gobbling up the colormap 846 * so just keep gobbling up the colormap
737 */ 847 */
738# if 0 848# if 0
739 for (i = Color_Black; i <= Color_White; i++) 849 for (i = Color_Black; i <= Color_White; i++)
740 if (R->PixColors[idx] == R->PixColors[i]) 850 if (PixColors[idx] == PixColors[i])
741 break; 851 break;
742 if (i > Color_White) { 852 if (i > Color_White)
853 {
743 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 854 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
744 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 855 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
745 DisplayPlanes(R->Xdisplay, Xscreen)); 856 DisplayPlanes (display->display, display->screen));
746 } 857 }
747# endif 858# endif
748 859
749 R->PixColors[idx] = xcol; 860 PixColors[idx] = xcol;
750 SET_PIXCOLOR(R, idx); 861 SET_PIXCOLOR (idx);
751 862
752/* XSetWindowAttributes attr; */ 863 /* XSetWindowAttributes attr; */
753/* Cursor cursor; */ 864 /* Cursor cursor; */
754 Done: 865Done:
755 if (idx == Color_bg && !(R->Options & Opt_transparent)) 866 if (idx == Color_bg && ! (Options & Opt_transparent))
756 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 867 XSetWindowBackground (display->display, TermWin.vt,
757 R->PixColors[Color_bg]); 868 PixColors[Color_bg]);
758 869
759/* handle Color_BD, scrollbar background, etc. */ 870 /* handle Color_BD, scrollbar background, etc. */
760 871
761 rxvt_set_colorfgbg(aR); 872 set_colorfgbg ();
762 rxvt_recolour_cursor(aR); 873 recolour_cursor ();
763/* the only reasonable way to enforce a clean update */ 874 /* the only reasonable way to enforce a clean update */
764 rxvt_scr_poweron(aR); 875 scr_poweron ();
765} 876}
766 877
767#else 878#else
768# define rxvt_set_window_color(aR_ idx,color) ((void)0) 879# define set_window_color (idx,color) ((void)0)
769#endif /* XTERM_COLOR_CHANGE */ 880#endif /* XTERM_COLOR_CHANGE */
770 881
771/* EXTPROTO */
772void 882void
773rxvt_recolour_cursor(pR) 883rxvt_term::recolour_cursor ()
774{ 884{
775 rxvt_color xcol[2];
776
777#if TODO 885#if TODO
886 rxvt_color xcol[2];
887
778 xcol[0] = R->PixColors[Color_pointer]; 888 xcol[0] = PixColors[Color_pointer];
779 xcol[1] = R->PixColors[Color_bg]; 889 xcol[1] = PixColors[Color_bg];
780 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 890 XQueryColors (display->display, XCMAP, xcol, 2);
781 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 891 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
782#endif 892#endif
783} 893}
784 894
785/*----------------------------------------------------------------------*/ 895/*----------------------------------------------------------------------*/
786/* 896/*
787 * find if fg/bg matches any of the normal (low-intensity) colors 897 * find if fg/bg matches any of the normal (low-intensity) colors
788 */ 898 */
789/* INTPROTO */
790void 899void
791rxvt_set_colorfgbg(pR) 900rxvt_term::set_colorfgbg ()
792{ 901{
793 unsigned int i; 902 unsigned int i;
794 const char *xpmb = "\0"; 903 const char *xpmb = "\0";
795 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 904 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
796 905
797 R->env_colorfgbg = 906 env_colorfgbg =
798 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 907 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
799 STRCPY(fstr, "default"); 908 STRCPY (fstr, "default");
800 STRCPY(bstr, "default"); 909 STRCPY (bstr, "default");
801 for (i = Color_Black; i <= Color_White; i++) 910 for (i = Color_Black; i <= Color_White; i++)
802 if (R->PixColors[Color_fg] == R->PixColors[i]) { 911 if (PixColors[Color_fg] == PixColors[i])
912 {
803 sprintf(fstr, "%d", (i - Color_Black)); 913 sprintf (fstr, "%d", (i - Color_Black));
804 break; 914 break;
805 } 915 }
806 for (i = Color_Black; i <= Color_White; i++) 916 for (i = Color_Black; i <= Color_White; i++)
807 if (R->PixColors[Color_bg] == R->PixColors[i]) { 917 if (PixColors[Color_bg] == PixColors[i])
918 {
808 sprintf(bstr, "%d", (i - Color_Black)); 919 sprintf (bstr, "%d", (i - Color_Black));
809#ifdef XPM_BACKGROUND 920#ifdef XPM_BACKGROUND
810 xpmb = "default;"; 921 xpmb = "default;";
811#endif 922#endif
812 break; 923 break;
813 } 924 }
925
814 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 926 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
815 putenv(R->env_colorfgbg);
816 927
817#ifndef NO_BRIGHTCOLOR 928#ifndef NO_BRIGHTCOLOR
818 R->colorfgbg = DEFAULT_RSTYLE; 929 colorfgbg = DEFAULT_RSTYLE;
819 for (i = minCOLOR; i <= maxCOLOR; i++) { 930 for (i = minCOLOR; i <= maxCOLOR; i++)
931 {
820 if (R->PixColors[Color_fg] == R->PixColors[i]) 932 if (PixColors[Color_fg] == PixColors[i])
821 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 933 colorfgbg = SET_FGCOLOR (colorfgbg, i);
822 if (R->PixColors[Color_bg] == R->PixColors[i]) 934 if (PixColors[Color_bg] == PixColors[i])
823 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 935 colorfgbg = SET_BGCOLOR (colorfgbg, i);
824 } 936 }
825#endif 937#endif
826} 938}
827 939
828/*----------------------------------------------------------------------*/ 940/*----------------------------------------------------------------------*/
829/* 941/*
830 * Colour determination for low colour displays, routine from 942 * Colour determination for low colour displays, routine from
831 * Hans de Goede <hans@highrise.nl> 943 * Hans de Goede <hans@highrise.nl>
832 */ 944 */
833 945
834/* EXTPROTO */
835int 946int
836rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 947rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
837{ 948{
838 screen_in_out->set(aR_ colour);
839
840 if (!screen_in_out->set(aR_ colour)) { 949 if (!screen_in_out->set (display, colour))
950 {
841 rxvt_print_error("can't allocate colour: %s", colour); 951 rxvt_print_error ("can't allocate colour: %s", colour);
842 return false; 952 return false;
843 } 953 }
844 954
845 return true; 955 return true;
846} 956}
847 957
848/* -------------------------------------------------------------------- * 958/* -------------------------------------------------------------------- *
849 * - WINDOW RESIZING - * 959 * - WINDOW RESIZING - *
850 * -------------------------------------------------------------------- */ 960 * -------------------------------------------------------------------- */
851/* EXTPROTO */
852void 961void
853rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 962rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
854 int ignoreparent)
855{ 963{
856 int fix_screen; 964 int fix_screen;
857 965
858#ifdef SMART_RESIZE 966#ifdef SMART_RESIZE
859 int old_width = R->szHint.width, old_height = R->szHint.height; 967 int old_width = szHint.width, old_height = szHint.height;
860#endif 968#endif
861 969
862 rxvt_window_calc(aR_ width, height); 970 window_calc (width, height);
863 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 971 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
864 if (!ignoreparent) { 972 if (!ignoreparent)
973 {
865#ifdef SMART_RESIZE 974#ifdef SMART_RESIZE
866/* 975 /*
867 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 976 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
868 * reposition window on resize depending on placement on screen 977 * reposition window on resize depending on placement on screen
869 */ 978 */
870 int x, y, x1, y1; 979 int x, y, x1, y1;
871 int dx, dy; 980 int dx, dy;
872 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 981 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
873 Window unused_cr; 982 Window unused_cr;
874 983
875 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 984 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
876 0, 0, &x, &y, &unused_cr); 985 0, 0, &x, &y, &unused_cr);
877 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 986 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
878 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 987 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
879 /* 988 /*
880 * if Xroot isn't the parent window, a WM will probably have offset 989 * if display->root isn't the parent window, a WM will probably have offset
881 * our position for handles and decorations. Counter it 990 * our position for handles and decorations. Counter it
882 */ 991 */
883 if (x1 != x || y1 != y) { 992 if (x1 != x || y1 != y)
993 {
884 x -= x1; 994 x -= x1;
885 y -= y1; 995 y -= y1;
886 } 996 }
887 997
888 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 998 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
889 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 999 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
890 dx = old_width - R->szHint.width; 1000 dx = old_width - szHint.width;
891 dy = old_height - R->szHint.height; 1001 dy = old_height - szHint.height;
892 1002
893 /* Check position of the center of the window */ 1003 /* Check position of the center of the window */
894 if (x < x1) /* left half */ 1004 if (x < x1) /* left half */
895 dx = 0; 1005 dx = 0;
896 else if (x == x1) /* exact center */ 1006 else if (x == x1) /* exact center */
897 dx /= 2; 1007 dx /= 2;
898 if (y < y1) /* top half */ 1008 if (y < y1) /* top half */
899 dy = 0; 1009 dy = 0;
900 else if (y == y1) /* exact center */ 1010 else if (y == y1) /* exact center */
901 dy /= 2; 1011 dy /= 2;
902 1012
903 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 1013 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
904 R->szHint.width, R->szHint.height); 1014 szHint.width, szHint.height);
905#else 1015#else
906 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 1016 XResizeWindow (display->display, TermWin.parent[0], szHint.width,
907 R->szHint.height); 1017 szHint.height);
908#endif 1018#endif
909 }
910 1019
1020 }
1021
911 fix_screen = (R->TermWin.ncol != R->prev_ncol 1022 fix_screen = (TermWin.ncol != prev_ncol
912 || R->TermWin.nrow != R->prev_nrow); 1023 || TermWin.nrow != prev_nrow);
1024
913 if (fix_screen || width != R->old_width || height != R->old_height) { 1025 if (fix_screen || width != old_width || height != old_height)
1026 {
914 if (scrollbar_visible(R)) { 1027 if (scrollbar_visible ())
1028 {
915 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 1029 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,
916 0, scrollbar_TotalWidth(), R->szHint.height); 1030 0, scrollbar_TotalWidth (), szHint.height);
917 rxvt_Resize_scrollBar(aR); 1031 resize_scrollbar ();
918 } 1032 }
1033
919 if (menubar_visible(R)) 1034 if (menubar_visible ())
920 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 1035 XMoveResizeWindow (display->display, menuBar.win, window_vt_x,
921 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 1036 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
1037
922 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 1038 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
923 R->window_vt_y, TermWin_TotalWidth(), 1039 window_vt_y, TermWin_TotalWidth (),
924 TermWin_TotalHeight()); 1040 TermWin_TotalHeight ());
925#ifdef RXVT_GRAPHICS
926 if (R->old_height)
927 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
928 R->old_height - R->szHint.base_height);
929#endif
930 rxvt_scr_clear(aR); 1041 scr_clear ();
931#ifdef XPM_BACKGROUND 1042#ifdef XPM_BACKGROUND
932 rxvt_resize_pixmap(aR); 1043 resize_pixmap ();
933#endif 1044#endif
934 }
935 1045
1046 }
1047
936 if (fix_screen || R->old_height == 0) { 1048 if (fix_screen || old_height == 0)
1049 {
937 int curr_screen = -1; 1050 int curr_screen = -1;
938 uint16_t old_ncol = R->prev_ncol; 1051 int old_ncol = prev_ncol;
939 1052
940 /* scr_reset only works on the primary screen */ 1053 /* scr_reset only works on the primary screen */
941 if (R->old_height) /* this is not the first time through */ 1054 if (old_height) /* this is not the first time through */
1055 {
1056 unsigned int ncol = TermWin.ncol;
1057 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
942 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 1058 curr_screen = scr_change_screen (PRIMARY);
943 rxvt_scr_reset(aR); 1059 TermWin.ncol = ncol;
944 if (curr_screen >= 0) { /* this is not the first time through */
945 rxvt_scr_change_screen(aR_ curr_screen);
946 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
947 } 1060 }
948 }
949 1061
1062 scr_reset ();
1063
1064 if (curr_screen >= 0) /* this is not the first time through */
1065 {
1066 scr_change_screen (curr_screen);
1067 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1068 }
1069 }
1070
950 R->old_width = R->szHint.width; 1071 old_width = szHint.width;
951 R->old_height = R->szHint.height; 1072 old_height = szHint.height;
952 1073
953#ifdef USE_XIM 1074#ifdef USE_XIM
954 rxvt_IMSetStatusPosition(aR); 1075 IMSetStatusPosition ();
955#endif 1076#endif
956} 1077}
957 1078
958/* 1079/*
959 * Set the width/height of the vt window in characters. Units are pixels. 1080 * Set the width/height of the vt window in characters. Units are pixels.
960 * good for toggling 80/132 columns 1081 * good for toggling 80/132 columns
961 */ 1082 */
962/* EXTPROTO */
963void 1083void
964rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1084rxvt_term::set_widthheight (unsigned int width, unsigned int height)
965{ 1085{
966 XWindowAttributes wattr; 1086 XWindowAttributes wattr;
967 1087
968 if (width == 0 || height == 0) { 1088 if (width == 0 || height == 0)
1089 {
969 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1090 XGetWindowAttributes (display->display, display->root, &wattr);
970 if (width == 0) 1091 if (width == 0)
971 width = wattr.width - R->szHint.base_width; 1092 width = wattr.width - szHint.base_width;
972 if (height == 0) 1093 if (height == 0)
973 height = wattr.height - R->szHint.base_height; 1094 height = wattr.height - szHint.base_height;
974 } 1095 }
975 if (width != R->TermWin.width || height != R->TermWin.height) { 1096 if (width != TermWin.width || height != TermWin.height)
1097 {
976 width += R->szHint.base_width; 1098 width += szHint.base_width;
977 height += R->szHint.base_height; 1099 height += szHint.base_height;
978 rxvt_resize_all_windows(aR_ width, height, 0); 1100 resize_all_windows (width, height, 0);
979 } 1101 }
980} 1102}
981 1103
982/* -------------------------------------------------------------------- * 1104/* -------------------------------------------------------------------- *
983 * - X INPUT METHOD ROUTINES - * 1105 * - X INPUT METHOD ROUTINES - *
984 * -------------------------------------------------------------------- */ 1106 * -------------------------------------------------------------------- */
985#ifdef USE_XIM 1107#ifdef USE_XIM
986/* INTPROTO */ 1108
987void 1109void
988rxvt_setSize(pR_ XRectangle * size) 1110rxvt_term::im_set_size (XRectangle *size)
989{ 1111{
990 size->x = R->TermWin.int_bwidth; 1112 size->x = TermWin.int_bwidth;
991 size->y = R->TermWin.int_bwidth; 1113 size->y = TermWin.int_bwidth;
992 size->width = Width2Pixel(R->TermWin.ncol); 1114 size->width = Width2Pixel (TermWin.ncol);
993 size->height = Height2Pixel(R->TermWin.nrow); 1115 size->height = Height2Pixel (TermWin.nrow);
994} 1116}
995 1117
996/* INTPROTO */
997void 1118void
998rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1119rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
999{ 1120{
1000 *fg = R->PixColors[Color_fg]; 1121 *fg = PixColors[Color_fg];
1001 *bg = R->PixColors[Color_bg]; 1122 *bg = PixColors[Color_bg];
1002} 1123}
1003 1124
1004/* Checking whether input method is running. */ 1125/* Checking whether input method is running. */
1005/* INTPROTO */
1006Bool 1126bool
1007rxvt_IMisRunning(pR) 1127rxvt_term::IMisRunning ()
1008{ 1128{
1009 char *p; 1129 char *p;
1010 Atom atom; 1130 Atom atom;
1011 Window win; 1131 Window win;
1012 char server[IMBUFSIZ]; 1132 char server[IMBUFSIZ];
1013 1133
1014/* get current locale modifier */ 1134 /* get current locale modifier */
1015 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1135 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1136 {
1016 STRCPY(server, "@server="); 1137 STRCPY (server, "@server=");
1017 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1138 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1018 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1139 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1019 *p = '\0'; 1140 *p = '\0';
1020 1141
1021 atom = XInternAtom(R->Xdisplay, server, False); 1142 atom = XInternAtom (display->display, server, False);
1022 win = XGetSelectionOwner(R->Xdisplay, atom); 1143 win = XGetSelectionOwner (display->display, atom);
1023 if (win != None) 1144 if (win != None)
1024 return True; 1145 return True;
1025 } 1146 }
1026 return False; 1147 return False;
1027} 1148}
1028 1149
1029/* EXTPROTO */
1030void 1150void
1031rxvt_IMSendSpot(pR) 1151rxvt_term::IMSendSpot ()
1032{ 1152{
1033 XPoint spot; 1153 XPoint spot;
1034 XVaNestedList preedit_attr; 1154 XVaNestedList preedit_attr;
1035 1155
1036 if (R->Input_Context == NULL 1156 if (Input_Context == NULL
1037 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1157 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1038 || !(R->event_type == KeyPress 1158 || ! (event_type == KeyPress
1039 || R->event_type == Expose 1159 || event_type == Expose
1040 || R->event_type == NoExpose 1160 || event_type == NoExpose
1041 || R->event_type == SelectionNotify 1161 || event_type == SelectionNotify
1042 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1162 || event_type == ButtonRelease || event_type == FocusIn)
1043 || !rxvt_IMisRunning(aR)) 1163 || !IMisRunning ())
1044 return; 1164 return;
1045 1165
1046 rxvt_setPosition(aR_ & spot); 1166 im_set_position (&spot);
1047 1167
1048 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1168 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1049 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1169 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1050 XFree(preedit_attr); 1170 XFree (preedit_attr);
1051} 1171}
1052 1172
1053/* EXTPROTO */
1054void 1173void
1055rxvt_setTermFontSet(pR_ int idx)
1056{
1057 char *string;
1058 long length;
1059 int success = 0;
1060
1061 if (idx < 0 || idx >= MAX_NFONTS)
1062 return;
1063}
1064
1065/* INTPROTO */
1066void
1067rxvt_setPreeditArea(pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1174rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1068 XRectangle * needed_rect) 1175 XRectangle * needed_rect)
1069{ 1176{
1070 int mbh, vtx = 0; 1177 int mbh, vtx = 0;
1071 1178
1072 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1179 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1073 vtx = scrollbar_TotalWidth(); 1180 vtx = scrollbar_TotalWidth ();
1181
1074 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1182 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1075 mbh -= R->TermWin.lineSpace; 1183 mbh -= TermWin.lineSpace;
1076 1184
1077 preedit_rect->x = needed_rect->width + vtx; 1185 preedit_rect->x = needed_rect->width + vtx;
1078 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1186 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1079 1187
1080 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1188 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1081 + vtx;
1082 preedit_rect->height = Height2Pixel(1); 1189 preedit_rect->height = Height2Pixel (1);
1083 1190
1084 status_rect->x = vtx; 1191 status_rect->x = vtx;
1085 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1192 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1086 1193
1087 status_rect->width = needed_rect->width ? needed_rect->width 1194 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1088 : Width2Pixel(R->TermWin.ncol + 1);
1089 status_rect->height = Height2Pixel(1); 1195 status_rect->height = Height2Pixel (1);
1090} 1196}
1091 1197
1092/* ARGSUSED */
1093/* INTPROTO */
1094void 1198void
1095rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1199rxvt_term::im_destroy ()
1096 __attribute__ ((unused)), XPointer call_data
1097 __attribute__ ((unused)))
1098{ 1200{
1099 dR; 1201 if (Input_Context)
1100 1202 {
1203 XDestroyIC (Input_Context);
1101 R->Input_Context = NULL; 1204 Input_Context = NULL;
1102/* To avoid Segmentation Fault in C locale: Solaris only? */ 1205 }
1103 if (STRCMP(R->locale, "C"))
1104 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
1105 rxvt_IMInstantiateCallback, NULL);
1106}
1107 1206
1108/* 1207 if (input_method)
1109 * X manual pages and include files don't match on some systems:
1110 * some think this is an XIDProc and others an XIMProc so we can't
1111 * use the first argument - need to update this to be nice for
1112 * both types via some sort of configure detection
1113 */
1114/* ARGSUSED */
1115/* EXTPROTO */
1116void
1117rxvt_IMInstantiateCallback(Display * unused
1118 __attribute__ ((unused)), XPointer client_data
1119 __attribute__ ((unused)), XPointer call_data
1120 __attribute__ ((unused)))
1121{
1122 dR;
1123 int i, found, had_im;
1124 const char *p;
1125 char **s;
1126 char buf[IMBUFSIZ];
1127
1128 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1129 if (R->Input_Context)
1130 return;
1131
1132 found = had_im = 0;
1133 p = R->rs[Rs_inputMethod];
1134 if (p && *p) {
1135 had_im = 1;
1136 s = rxvt_splitcommastring(p);
1137 for (i = 0; s[i]; i++) {
1138 if (*s[i]) {
1139 STRCPY(buf, "@im=");
1140 STRNCAT(buf, s[i], IMBUFSIZ - 5);
1141 if ((p = XSetLocaleModifiers(buf)) != NULL && *p
1142 && (rxvt_IM_get_IC(aR) == True)) {
1143 found = 1;
1144 break;
1145 }
1146 }
1147 }
1148 for (i = 0; s[i]; i++)
1149 free(s[i]);
1150 free(s);
1151 } 1208 {
1152 if (found) 1209 display->put_xim (input_method);
1153 return; 1210 input_method = 0;
1154
1155/* try with XMODIFIERS env. var. */
1156 if ((p = XSetLocaleModifiers("")) != NULL && *p) {
1157 rxvt_IM_get_IC(aR);
1158 return;
1159 } 1211 }
1160
1161/* try with no modifiers base IF the user didn't specify an IM */
1162 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p
1163 && rxvt_IM_get_IC(aR) == True)
1164 return;
1165} 1212}
1166 1213
1167/* 1214/*
1168 * Try to open a XIM with the current modifiers, then see if we can 1215 * Try to open a XIM with the current modifiers, then see if we can
1169 * open a suitable preedit type 1216 * open a suitable preedit type
1170 */ 1217 */
1171/* INTPROTO */
1172Bool 1218bool
1173rxvt_IM_get_IC(pR) 1219rxvt_term::IM_get_IC (const char *modifiers)
1174{ 1220{
1175 int i, j, found; 1221 int i, j, found;
1176 XIM xim; 1222 XIM xim;
1177 XPoint spot; 1223 XPoint spot;
1178 XRectangle rect, status_rect, needed_rect; 1224 XRectangle rect, status_rect, needed_rect;
1179 unsigned long fg, bg; 1225 unsigned long fg, bg;
1180 const char *p; 1226 const char *p;
1181 char **s; 1227 char **s;
1182 XIMStyles *xim_styles; 1228 XIMStyles *xim_styles;
1183 XVaNestedList preedit_attr, status_attr; 1229 XVaNestedList preedit_attr, status_attr;
1184 XIMCallback ximcallback;
1185 1230
1231 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1232 return false;
1233
1186 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1234 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1187 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); 1235 input_method = display->get_xim (locale, modifiers);
1188 if (xim == NULL) 1236 if (input_method == NULL)
1189 return False; 1237 return false;
1190 1238
1239 xim = input_method->xim;
1240
1191 xim_styles = NULL; 1241 xim_styles = NULL;
1192 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) 1242 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1193 || !xim_styles || !xim_styles->count_styles) { 1243 || !xim_styles || !xim_styles->count_styles)
1194 XCloseIM(xim); 1244 {
1245 display->put_xim (input_method);
1195 return False; 1246 return false;
1196 } 1247 }
1197 1248
1198 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] 1249 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1199 : "OverTheSpot,OffTheSpot,Root";
1200 s = rxvt_splitcommastring(p); 1250 s = rxvt_splitcommastring (p);
1201 for (i = found = 0; !found && s[i]; i++) { 1251 for (i = found = 0; !found && s[i]; i++)
1252 {
1202 if (!STRCMP(s[i], "OverTheSpot")) 1253 if (!STRCMP (s[i], "OverTheSpot"))
1203 R->input_style = (XIMPreeditPosition | XIMStatusNothing); 1254 input_style = (XIMPreeditPosition | XIMStatusNothing);
1204 else if (!STRCMP(s[i], "OffTheSpot")) 1255 else if (!STRCMP (s[i], "OffTheSpot"))
1205 R->input_style = (XIMPreeditArea | XIMStatusArea); 1256 input_style = (XIMPreeditArea | XIMStatusArea);
1206 else if (!STRCMP(s[i], "Root")) 1257 else if (!STRCMP (s[i], "Root"))
1207 R->input_style = (XIMPreeditNothing | XIMStatusNothing); 1258 input_style = (XIMPreeditNothing | XIMStatusNothing);
1208 1259
1209 for (j = 0; j < xim_styles->count_styles; j++) 1260 for (j = 0; j < xim_styles->count_styles; j++)
1210 if (R->input_style == xim_styles->supported_styles[j]) { 1261 if (input_style == xim_styles->supported_styles[j])
1262 {
1211 found = 1; 1263 found = 1;
1264 break;
1265 }
1266 }
1267
1268 for (i = 0; s[i]; i++)
1269 free (s[i]);
1270
1271 free (s);
1272 XFree (xim_styles);
1273
1274 if (!found)
1275 {
1276 display->put_xim (input_method);
1277 return false;
1278 }
1279
1280 preedit_attr = status_attr = NULL;
1281
1282 if (input_style & XIMPreeditPosition)
1283 {
1284 im_set_size (&rect);
1285 im_set_position (&spot);
1286 im_set_color (&fg, &bg);
1287
1288 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1289 XNSpotLocation, &spot,
1290 XNForeground, fg, XNBackground, bg,
1291 //XNFontSet, TermWin.fontset,
1292 NULL);
1293 }
1294 else if (input_style & XIMPreeditArea)
1295 {
1296 im_set_color (&fg, &bg);
1297
1298 /*
1299 * The necessary width of preedit area is unknown
1300 * until create input context.
1301 */
1302 needed_rect.width = 0;
1303
1304 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1305
1306 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1307 XNForeground, fg, XNBackground, bg,
1308 //XNFontSet, TermWin.fontset,
1309 NULL);
1310 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1311 XNForeground, fg, XNBackground, bg,
1312 //XNFontSet, TermWin.fontset,
1313 NULL);
1314 }
1315
1316 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1317 XNClientWindow, TermWin.parent[0],
1318 XNFocusWindow, TermWin.parent[0],
1319 preedit_attr ? XNPreeditAttributes : NULL,
1320 preedit_attr,
1321 status_attr ? XNStatusAttributes : NULL,
1322 status_attr, NULL);
1323 if (preedit_attr) XFree (preedit_attr);
1324 if (status_attr) XFree (status_attr);
1325
1326 if (Input_Context == NULL)
1327 {
1328 rxvt_print_error ("failed to create input context");
1329 display->put_xim (input_method);
1330 return false;
1331 }
1332
1333 if (input_style & XIMPreeditArea)
1334 IMSetStatusPosition ();
1335
1336 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1337 return true;
1338}
1339
1340void
1341rxvt_term::im_cb ()
1342{
1343 int i, found, had_im;
1344 const char *p;
1345 char **s;
1346 char buf[IMBUFSIZ];
1347
1348 im_destroy ();
1349
1350 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1351 if (Input_Context)
1352 return;
1353
1354#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1355 if (rs[Rs_imLocale])
1356 SET_LOCALE (rs[Rs_imLocale]);
1357#endif
1358
1359 p = rs[Rs_inputMethod];
1360 if (p && *p)
1361 {
1362 bool found = false;
1363
1364 s = rxvt_splitcommastring (p);
1365 for (i = 0; s[i]; i++)
1366 {
1367 if (*s[i])
1368 {
1369 STRCPY (buf, "@im=");
1370 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1371 if (IM_get_IC (buf))
1372 {
1373 found = true;
1212 break; 1374 break;
1375 }
1213 } 1376 }
1214 } 1377 }
1215 for (i = 0; s[i]; i++) 1378 for (i = 0; s[i]; i++)
1216 free(s[i]); 1379 free (s[i]);
1217 free(s); 1380 free (s);
1218 XFree(xim_styles);
1219 1381
1220 if (!found) { 1382 if (found)
1221 XCloseIM(xim); 1383 goto done;
1222 return False;
1223 } 1384 }
1224 1385
1225 ximcallback.callback = rxvt_IMDestroyCallback; 1386 /* try with XMODIFIERS env. var. */
1387 if (IM_get_IC (""))
1388 goto done;
1226 1389
1227/* XXX: not sure why we need this (as well as IC one below) */ 1390 /* try with no modifiers base IF the user didn't specify an IM */
1228 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1391 if (IM_get_IC ("@im=none"))
1392 goto done;
1229 1393
1230 preedit_attr = status_attr = NULL; 1394done:
1231 1395#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1232 if (R->input_style & XIMPreeditPosition) { 1396 if (rs[Rs_imLocale])
1233 rxvt_setSize(aR_ & rect); 1397 SET_LOCALE (locale);
1234 rxvt_setPosition(aR_ & spot); 1398#endif
1235 rxvt_setColor(aR_ & fg, &bg);
1236
1237 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1238 XNSpotLocation, &spot,
1239 XNForeground, fg, XNBackground, bg,
1240 //XNFontSet, R->TermWin.fontset,
1241 NULL);
1242 } else if (R->input_style & XIMPreeditArea) {
1243 rxvt_setColor(aR_ & fg, &bg);
1244
1245 /*
1246 * The necessary width of preedit area is unknown
1247 * until create input context.
1248 */
1249 needed_rect.width = 0;
1250
1251 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1252
1253 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1254 XNForeground, fg, XNBackground, bg,
1255 //XNFontSet, R->TermWin.fontset,
1256 NULL);
1257 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1258 XNForeground, fg, XNBackground, bg,
1259 //XNFontSet, R->TermWin.fontset,
1260 NULL);
1261 }
1262 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1263 XNClientWindow, R->TermWin.parent[0],
1264 XNFocusWindow, R->TermWin.parent[0],
1265 XNDestroyCallback, &ximcallback,
1266 preedit_attr ? XNPreeditAttributes : NULL,
1267 preedit_attr,
1268 status_attr ? XNStatusAttributes : NULL,
1269 status_attr, NULL);
1270 if (preedit_attr)
1271 XFree(preedit_attr);
1272 if (status_attr)
1273 XFree(status_attr);
1274 if (R->Input_Context == NULL) {
1275 rxvt_print_error("failed to create input context");
1276 XCloseIM(xim);
1277 return False;
1278 }
1279 if (R->input_style & XIMPreeditArea)
1280 rxvt_IMSetStatusPosition(aR);
1281 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1282 return True;
1283} 1399}
1284 1400
1285/* EXTPROTO */
1286void 1401void
1287rxvt_IMSetStatusPosition(pR) 1402rxvt_term::IMSetStatusPosition ()
1288{ 1403{
1289 XRectangle preedit_rect, status_rect, *needed_rect; 1404 XRectangle preedit_rect, status_rect, *needed_rect;
1290 XVaNestedList preedit_attr, status_attr; 1405 XVaNestedList preedit_attr, status_attr;
1291 1406
1292 if (R->Input_Context == NULL 1407 if (Input_Context == NULL
1293 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1408 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1294 || !rxvt_IMisRunning(aR)) 1409 || !IMisRunning ())
1295 return; 1410 return;
1296 1411
1297/* Getting the necessary width of preedit area */ 1412 /* Getting the necessary width of preedit area */
1298 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1413 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1299 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1414 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1300 XFree(status_attr); 1415 XFree (status_attr);
1301 1416
1302 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1417 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1303 1418
1304 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1419 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1305 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1420 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1306 1421
1307 XSetICValues(R->Input_Context, 1422 XSetICValues (Input_Context,
1308 XNPreeditAttributes, preedit_attr, 1423 XNPreeditAttributes, preedit_attr,
1309 XNStatusAttributes, status_attr, NULL); 1424 XNStatusAttributes, status_attr, NULL);
1310 1425
1311 XFree(preedit_attr); 1426 XFree (preedit_attr);
1312 XFree(status_attr); 1427 XFree (status_attr);
1313} 1428}
1314#endif /* USE_XIM */ 1429#endif /* USE_XIM */
1315 1430
1316/*----------------------------------------------------------------------*/ 1431/*----------------------------------------------------------------------*/
1317rxvt_t rxvt_current_term; 1432rxvt_t rxvt_current_term;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines