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.23 by pcg, Sat Jan 31 03:18:43 2004 UTC vs.
Revision 1.51 by pcg, Sat Mar 6 00:05:01 2004 UTC

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

Diff Legend

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