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.15 by pcg, Thu Dec 18 05:45:11 2003 UTC vs.
Revision 1.39 by pcg, Sat Feb 21 22:14:00 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines