[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.188 by root, Wed Jan 18 08:33:34 2006 UTC vs.
Revision 1.234 by root, Sat Jun 9 13:04:27 2007 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: main.C	2	* File: main.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* 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>
48	# include <termios.h>	48	# include <termios.h>
49	#endif	49	#endif
50		50
51	vector<rxvt_term *> rxvt_term::termlist;	51	vector<rxvt_term *> rxvt_term::termlist;
52		52
		53	// used to tell global functions which terminal instance is "active"
		54	rxvt_t rxvt_current_term;
		55
53	static char curlocale[128], savelocale[128];	56	static char curlocale[128], savelocale[128];
54		57
55	bool	58	bool
56	rxvt_set_locale (const char *locale)	59	rxvt_set_locale (const char *locale) NOTHROW
57	{	60	{
		61	int size = strlen (locale) + 1;
		62
		63	if (size > sizeof (curlocale))
		64	rxvt_fatal ("locale string too long, aborting.\n");
		65
58	if (!locale \|\| !strncmp (locale, curlocale, 128))	66	if (!locale \|\| !memcmp (locale, curlocale, size))
59	return false;	67	return false;
60		68
61	strncpy (curlocale, locale, 128);	69	memcpy (curlocale, locale, size);
62	setlocale (LC_CTYPE, curlocale);	70	setlocale (LC_CTYPE, curlocale);
63	return true;	71	return true;
64	}	72	}
65		73
66	void	74	void
67	rxvt_push_locale (const char *locale)	75	rxvt_push_locale (const char *locale) NOTHROW
68	{	76	{
69	strcpy (savelocale, curlocale);	77	strcpy (savelocale, curlocale);
70	rxvt_set_locale (locale);	78	rxvt_set_locale (locale);
71	}	79	}
72		80
73	void	81	void
74	rxvt_pop_locale ()	82	rxvt_pop_locale () NOTHROW
75	{	83	{
76	rxvt_set_locale (savelocale);	84	rxvt_set_locale (savelocale);
77	}	85	}
78		86
79	#if ENABLE_COMBINING	87	#if ENABLE_COMBINING
…		…
140	}	148	}
141	#endif	149	#endif
142		150
143	rxvt_term::rxvt_term ()	151	rxvt_term::rxvt_term ()
144	:	152	:
145	#if TRANSPARENT	153	#if TRANSPARENT \|\| ENABLE_PERL
146	rootwin_ev (this, &rxvt_term::rootwin_cb),	154	rootwin_ev (this, &rxvt_term::rootwin_cb),
		155	check_our_parents_ev(this, &rxvt_term::check_our_parents_cb),
147	#endif	156	#endif
148	#ifdef HAVE_SCROLLBARS	157	#ifdef HAVE_SCROLLBARS
149	scrollbar_ev (this, &rxvt_term::x_cb),	158	scrollbar_ev (this, &rxvt_term::x_cb),
150	#endif	159	#endif
151	#ifdef CURSOR_BLINK	160	#ifdef CURSOR_BLINK
…		…
167	pointer_ev (this, &rxvt_term::pointer_cb),	176	pointer_ev (this, &rxvt_term::pointer_cb),
168	#endif	177	#endif
169	#ifdef USE_XIM	178	#ifdef USE_XIM
170	im_ev (this, &rxvt_term::im_cb),	179	im_ev (this, &rxvt_term::im_cb),
171	#endif	180	#endif
		181	#ifndef NO_BELL
		182	bell_ev (this, &rxvt_term::bell_cb),
		183	#endif
172	termwin_ev (this, &rxvt_term::x_cb),	184	termwin_ev (this, &rxvt_term::x_cb),
173	vt_ev (this, &rxvt_term::x_cb),	185	vt_ev (this, &rxvt_term::x_cb),
		186	child_ev (this, &rxvt_term::child_cb),
174	check_ev (this, &rxvt_term::check_cb),	187	check_ev (this, &rxvt_term::check_cb),
175	flush_ev (this, &rxvt_term::flush_cb),	188	flush_ev (this, &rxvt_term::flush_cb),
176	destroy_ev (this, &rxvt_term::destroy_cb),	189	destroy_ev (this, &rxvt_term::destroy_cb),
177	pty_ev (this, &rxvt_term::pty_cb),	190	pty_ev (this, &rxvt_term::pty_cb),
178	incr_ev (this, &rxvt_term::incr_cb)	191	incr_ev (this, &rxvt_term::incr_cb)
…		…
181		194
182	termlist.push_back (this);	195	termlist.push_back (this);
183		196
184	#ifdef KEYSYM_RESOURCE	197	#ifdef KEYSYM_RESOURCE
185	keyboard = new keyboard_manager;	198	keyboard = new keyboard_manager;
186
187	if (!keyboard)
188	rxvt_fatal ("out of memory, aborting.\n");
189	#endif	199	#endif
190	}	200	}
191		201
192	// clean up the most important stuff, do not call x or free mem etc.	202	// clean up the most important stuff, do not call x or free mem etc.
193	// for use before an emergency exit	203	// for use before an emergency exit
194	void rxvt_term::emergency_cleanup ()	204	void rxvt_term::emergency_cleanup ()
195	{	205	{
196	if (cmd_pid)	206	if (cmd_pid)
197	kill (-cmd_pid, SIGHUP);	207	kill (-cmd_pid, SIGHUP);
198		208
		209	pty_ev.stop ();
199	delete pty; pty = 0;	210	delete pty; pty = 0;
200	}	211	}
201		212
202	rxvt_term::~rxvt_term ()	213	rxvt_term::~rxvt_term ()
203	{	214	{
204	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
205
206	termlist.erase (find (termlist.begin (), termlist.end(), this));	215	termlist.erase (find (termlist.begin (), termlist.end(), this));
207		216
208	emergency_cleanup ();	217	emergency_cleanup ();
209		218
210	#if ENABLE_STYLES	219	#if ENABLE_STYLES
…		…
214	#endif	223	#endif
215	delete fontset[0];	224	delete fontset[0];
216		225
217	if (display)	226	if (display)
218	{	227	{
219	dDisp;
220
221	selection_clear ();	228	selection_clear ();
222		229
223	#ifdef USE_XIM	230	#ifdef USE_XIM
224	im_destroy ();	231	im_destroy ();
225	#endif	232	#endif
226	#ifdef XTERM_SCROLLBAR	233	#ifdef XTERM_SCROLLBAR
227	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	234	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
228	if (ShadowGC) XFreeGC (disp, ShadowGC);	235	if (ShadowGC) XFreeGC (dpy, ShadowGC);
229	#endif	236	#endif
230	#ifdef PLAIN_SCROLLBAR	237	#ifdef PLAIN_SCROLLBAR
231	if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);	238	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
232	#endif	239	#endif
233	#ifdef NEXT_SCROLLBAR	240	#ifdef NEXT_SCROLLBAR
234	if (blackGC) XFreeGC (disp, blackGC);	241	if (blackGC) XFreeGC (dpy, blackGC);
235	if (whiteGC) XFreeGC (disp, whiteGC);	242	if (whiteGC) XFreeGC (dpy, whiteGC);
236	if (grayGC) XFreeGC (disp, grayGC);	243	if (grayGC) XFreeGC (dpy, grayGC);
237	if (darkGC) XFreeGC (disp, darkGC);	244	if (darkGC) XFreeGC (dpy, darkGC);
238	if (stippleGC) XFreeGC (disp, stippleGC);	245	if (stippleGC) XFreeGC (dpy, stippleGC);
239	if (dimple) XFreePixmap (disp, dimple);	246	if (dimple) XFreePixmap (dpy, dimple);
240	if (upArrow) XFreePixmap (disp, upArrow);	247	if (upArrow) XFreePixmap (dpy, upArrow);
241	if (downArrow) XFreePixmap (disp, downArrow);	248	if (downArrow) XFreePixmap (dpy, downArrow);
242	if (upArrowHi) XFreePixmap (disp, upArrowHi);	249	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
243	if (downArrowHi) XFreePixmap (disp, downArrowHi);	250	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
244	#endif	251	#endif
245	#ifdef RXVT_SCROLLBAR	252	#ifdef RXVT_SCROLLBAR
246	if (topShadowGC) XFreeGC (disp, topShadowGC);	253	if (topShadowGC) XFreeGC (dpy, topShadowGC);
247	if (botShadowGC) XFreeGC (disp, botShadowGC);	254	if (botShadowGC) XFreeGC (dpy, botShadowGC);
248	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	255	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
249	#endif	256	#endif
250	if (gc) XFreeGC (disp, gc);	257	if (gc) XFreeGC (dpy, gc);
251		258
252	delete drawable;	259	delete drawable;
253	// destroy all windows	260	// destroy all windows
254	if (parent[0])	261	if (parent[0])
255	XDestroyWindow (disp, parent[0]);	262	XDestroyWindow (dpy, parent[0]);
256	}
257		263
258	// TODO: free pixcolours, colours should become part of rxvt_display	264	for (int i = 0; i < TOTAL_COLORS; i++)
259	delete pix_colors_focused;	265	if (ISSET_PIXCOLOR (i))
		266	{
		267	pix_colors_focused [i].free (this);
260	#if OFF_FOCUS_FADING	268	#if OFF_FOCUS_FADING
		269	pix_colors_unfocused [i].free (this);
		270	#endif
		271	}
		272
		273	clear ();
		274	}
		275
		276	delete [] pix_colors_focused;
		277	#if OFF_FOCUS_FADING
261	delete pix_colors_unfocused;	278	delete [] pix_colors_unfocused;
262	#endif	279	#endif
263		280
264	displays.put (display);	281	displays.put (display);
265		282
266	scr_release ();	283	scr_release ();
…		…
269	for (int i = 0; i < allocated.size (); i++)	286	for (int i = 0; i < allocated.size (); i++)
270	free (allocated [i]);	287	free (allocated [i]);
271		288
272	free (selection.text);	289	free (selection.text);
273	// TODO: manage env vars in child only(!)	290	// TODO: manage env vars in child only(!)
274	free (env_windowid);
275	free (env_display);	291	free (env_display);
276	free (env_term);	292	free (env_term);
277	free (env_colorfgbg);
278	free (locale);	293	free (locale);
279	free (v_buffer);	294	free (v_buffer);
280	free (incr_buf);	295	free (incr_buf);
281		296
282	delete envv;	297	delete envv;
…		…
285	#ifdef KEYSYM_RESOURCE	300	#ifdef KEYSYM_RESOURCE
286	delete keyboard;	301	delete keyboard;
287	#endif	302	#endif
288	}	303	}
289		304
		305	// child has exited, usually destroys
290	void	306	void
291	rxvt_term::child_exit ()	307	rxvt_term::child_cb (child_watcher &w, int status)
292	{	308	{
		309	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		310
293	cmd_pid = 0;	311	cmd_pid = 0;
294		312
295	if (!OPTION (Opt_hold))	313	if (!option (Opt_hold))
296	destroy ();	314	destroy ();
297	}	315	}
298		316
299	void	317	void
300	rxvt_term::destroy ()	318	rxvt_term::destroy ()
301	{	319	{
302	if (destroy_ev.active)	320	if (destroy_ev.active)
303	return;	321	return;
304		322
		323	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
		324
305	#if ENABLE_OVERLAY	325	#if ENABLE_OVERLAY
306	scr_overlay_off ();	326	scr_overlay_off ();
307	#endif	327	#endif
308		328
309	if (display)	329	if (display)
…		…
312	im_ev.stop (display);	332	im_ev.stop (display);
313	#endif	333	#endif
314	#if HAVE_SCROLLBARS	334	#if HAVE_SCROLLBARS
315	scrollbar_ev.stop (display);	335	scrollbar_ev.stop (display);
316	#endif	336	#endif
317	#if TRANSPARENT	337	#if TRANSPARENT \|\| ENABLE_PERL
318	rootwin_ev.stop (display);	338	rootwin_ev.stop (display);
319	#endif	339	#endif
320	incr_ev.stop ();	340	incr_ev.stop ();
321	termwin_ev.stop (display);	341	termwin_ev.stop (display);
322	vt_ev.stop (display);	342	vt_ev.stop (display);
…		…
363	{	383	{
364	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)	384	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
365	(*t)->emergency_cleanup ();	385	(*t)->emergency_cleanup ();
366	}	386	}
367		387
368	#if ENABLE_FRILLS	388	#if !ENABLE_MINIMAL
369	static void	389	static void
370	print_x_error (Display dpy, XErrorEvent event)	390	print_x_error (Display dpy, XErrorEvent event)
371	{	391	{
372	char buffer[BUFSIZ];	392	char buffer[BUFSIZ];
373	char mesg[BUFSIZ];	393	char mesg[BUFSIZ];
…		…
421	GET_R->allowedxerror = event->error_code;	441	GET_R->allowedxerror = event->error_code;
422	else	442	else
423	{	443	{
424	// GET_R is most likely not the terminal which caused the error,	444	// GET_R is most likely not the terminal which caused the error,
425	// so just output the error and continue	445	// so just output the error and continue
426	#if ENABLE_FRILLS	446	#if ENABLE_MINIMAL
		447	old_xerror_handler (display, event);
		448	#else
427	print_x_error (display, event);	449	print_x_error (display, event);
428	#else
429	old_xerror_handler (display, event);
430	#endif	450	#endif
431	}	451	}
432		452
433	return 0;	453	return 0;
434	}	454	}
…		…
442	_exit (EXIT_FAILURE);	462	_exit (EXIT_FAILURE);
443	}	463	}
444		464
445	/----------------------------------------------------------------------/	465	/----------------------------------------------------------------------/
446	bool	466	bool
447	rxvt_term::init (int argc, const char const argv)	467	rxvt_term::init (int argc, const char const argv, stringvec *envv)
448	{	468	{
		469	this->envv = envv;
		470
449	SET_R (this);	471	SET_R (this);
450	set_locale ("");	472	set_locale ("");
451	set_environ (envv); // few things in X do not call setlocale :(	473	set_environ (envv); // few things in X do not call setlocale :(
452		474
453	if (!init_vars ())	475	if (!init_vars ())
…		…
460	#ifdef KEYSYM_RESOURCE	482	#ifdef KEYSYM_RESOURCE
461	keyboard->register_done ();	483	keyboard->register_done ();
462	#endif	484	#endif
463		485
464	#ifdef HAVE_SCROLLBARS	486	#ifdef HAVE_SCROLLBARS
465	if (OPTION (Opt_scrollBar))	487	if (option (Opt_scrollBar))
466	scrollBar.setIdle (); /* set existence for size calculations */	488	scrollBar.setIdle (); /* set existence for size calculations */
467	#endif	489	#endif
468		490
469	#if ENABLE_PERL	491	pty = ptytty::create ();
470	if (!rs[Rs_perl_ext_1])
471	rs[Rs_perl_ext_1] = "default";
472
473	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
474	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
475	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
476	{
477	rxvt_perl.init (this);
478	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
479	}
480	#endif
481
482	pty = rxvt_new_ptytty ();
483		492
484	create_windows (argc, argv);	493	create_windows (argc, argv);
485		494
486	dDisp;
487
488	init_xlocale ();	495	init_xlocale ();
489		496
490	scr_reset (); // initialize screen	497	scr_reset (); // initialize screen
491		498
492	#if 0	499	#if 0
493	XSynchronize (disp, True);	500	XSynchronize (dpy, True);
494	#endif	501	#endif
495		502
496	#ifdef HAVE_SCROLLBARS	503	#ifdef HAVE_SCROLLBARS
497	if (OPTION (Opt_scrollBar))	504	if (option (Opt_scrollBar))
498	resize_scrollbar (); /* create and map scrollbar */	505	resize_scrollbar (); /* create and map scrollbar */
499	#endif	506	#endif
500	#ifdef TRANSPARENT	507	#ifdef TRANSPARENT
501	if (OPTION (Opt_transparent))	508	if (option (Opt_transparent))
502	{	509	{
503	XSelectInput (disp, display->root, PropertyChangeMask);	510	XSelectInput (dpy, display->root, PropertyChangeMask);
504	check_our_parents ();	511	check_our_parents ();
505	rootwin_ev.start (display, display->root);	512	rootwin_ev.start (display, display->root);
506	}	513	}
507	#endif	514	#endif
508		515	#if ENABLE_PERL
509	XMapWindow (disp, vt);	516	rootwin_ev.start (display, display->root);
510	XMapWindow (disp, parent[0]);	517	#endif
511		518
512	set_colorfgbg ();	519	set_colorfgbg ();
513		520
514	init_command (cmd_argv);	521	init_command (cmd_argv);
515		522
…		…
520		527
521	check_ev.start ();	528	check_ev.start ();
522		529
523	HOOK_INVOKE ((this, HOOK_START, DT_END));	530	HOOK_INVOKE ((this, HOOK_START, DT_END));
524		531
		532	#if ENABLE_XEMBED
		533	if (rs[Rs_embed])
		534	{
		535	long info[2] = { 0, XEMBED_MAPPED };
		536
		537	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		538	32, PropModeReplace, (unsigned char *)&info, 2);
		539	}
		540	#endif
		541
		542	XMapWindow (dpy, vt);
		543	XMapWindow (dpy, parent[0]);
		544
525	return true;	545	return true;
526	}	546	}
527		547
528	static struct sig_handlers	548	static struct sig_handlers
529	{	549	{
530	sig_watcher sw_chld, sw_term, sw_int;	550	sig_watcher sw_term, sw_int;
531		551
532	void sig_chld (sig_watcher &w)
533	{
534	// we are being called for every SIGCHLD, find the corresponding term
535	int pid;
536
537	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
538	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
539	if (pid == (*t)->cmd_pid)
540	{
541	(*t)->child_exit ();
542	break;
543	}
544	}
545
546	/*	552	/*
547	* Catch a fatal signal and tidy up before quitting	553	* Catch a fatal signal and tidy up before quitting
548	*/	554	*/
549	void	555	void
550	sig_term (sig_watcher &w)	556	sig_term (sig_watcher &w)
551	{	557	{
552	#ifdef DEBUG_CMD
553	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
554	#endif
555	rxvt_emergency_cleanup ();	558	rxvt_emergency_cleanup ();
556	signal (w.signum, SIG_DFL);	559	signal (w.signum, SIG_DFL);
557	kill (getpid (), w.signum);	560	kill (getpid (), w.signum);
558	}	561	}
559		562
560	sig_handlers ()	563	sig_handlers ()
561	: sw_chld (this, &sig_handlers::sig_chld),
562	sw_term (this, &sig_handlers::sig_term),	564	: sw_term (this, &sig_handlers::sig_term),
563	sw_int (this, &sig_handlers::sig_term)	565	sw_int (this, &sig_handlers::sig_term)
564	{	566	{
565	}	567	}
566	} sig_handlers;	568	} sig_handlers;
567		569
568	char **rxvt_environ; // startup environment	570	char **rxvt_environ; // startup environment
569		571
570	void	572	void
571	rxvt_init ()	573	rxvt_init ()
572	{	574	{
573	uid_t uid = getuid ();	575	ptytty::init ();
574	gid_t gid = getgid ();
575
576	// before doing anything else, check for setuid/setgid operation,
577	// start the helper process and drop privileges
578	if (uid != geteuid ()
579	\|\| gid != getegid ())
580	{
581	#if PTYTTY_HELPER
582	rxvt_ptytty_server ();
583	#else
584	rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
585	#endif
586
587	// drop privileges
588	#if HAVE_SETRESUID
589	setresgid (gid, gid, gid);
590	setresuid (uid, uid, uid);
591	#elif HAVE_SETREUID
592	setregid (gid, gid);
593	setreuid (uid, uid);
594	#elif HAVE_SETUID
595	setgid (gid);
596	setuid (uid);
597	#endif
598
599	if (uid != geteuid ()
600	\|\| gid != getegid ())
601	rxvt_fatal ("unable to drop privileges, aborting.\n");
602	}
603		576
604	rxvt_environ = environ;	577	rxvt_environ = environ;
605		578
606	signal (SIGHUP, SIG_IGN);	579	signal (SIGHUP, SIG_IGN);
607	signal (SIGPIPE, SIG_IGN);	580	signal (SIGPIPE, SIG_IGN);
608		581
609	sig_handlers.sw_chld.start (SIGCHLD);
610	sig_handlers.sw_term.start (SIGTERM);	582	sig_handlers.sw_term.start (SIGTERM);
611	sig_handlers.sw_int.start (SIGINT);	583	sig_handlers.sw_int.start (SIGINT);
612		584
613	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	585	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
614	/* signal (SIGURG, SIG_DFL); */	586	/* signal (SIGURG, SIG_DFL); */
…		…
643	rxvt_fatal ("memory allocation failure. aborting.\n");	615	rxvt_fatal ("memory allocation failure. aborting.\n");
644		616
645	return p;	617	return p;
646	}	618	}
647		619
648	void *	620	void *
649	rxvt_realloc (void *ptr, size_t size)	621	rxvt_realloc (void *ptr, size_t size)
650	{	622	{
651	void *p = realloc (ptr, size);	623	void *p = realloc (ptr, size);
652		624
653	if (!p)	625	if (!p)
…		…
666	{	638	{
667	short recalc_x, recalc_y;	639	short recalc_x, recalc_y;
668	int x, y, sb_w, flags;	640	int x, y, sb_w, flags;
669	unsigned int w, h;	641	unsigned int w, h;
670	unsigned int max_width, max_height;	642	unsigned int max_width, max_height;
671	dDisp;
672
673	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
674	ncol, nrow, szHint.width, szHint.height));
675		643
676	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	644	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
677	szHint.win_gravity = NorthWestGravity;	645	szHint.win_gravity = NorthWestGravity;
678	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	646	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
679		647
…		…
741		709
742	if (scrollBar.state)	710	if (scrollBar.state)
743	{	711	{
744	sb_w = scrollbar_TotalWidth ();	712	sb_w = scrollbar_TotalWidth ();
745	szHint.base_width += sb_w;	713	szHint.base_width += sb_w;
		714
746	if (!OPTION (Opt_scrollBar_right))	715	if (!option (Opt_scrollBar_right))
747	window_vt_x += sb_w;	716	window_vt_x += sb_w;
748	}	717	}
749		718
750	szHint.width_inc = fwidth;	719	szHint.width_inc = fwidth;
751	szHint.height_inc = fheight;	720	szHint.height_inc = fheight;
752	szHint.min_width = szHint.base_width + szHint.width_inc;	721	szHint.min_width = szHint.base_width + szHint.width_inc;
753	szHint.min_height = szHint.base_height + szHint.height_inc;	722	szHint.min_height = szHint.base_height + szHint.height_inc;
754		723
755	if (newwidth && newwidth - szHint.base_width < max_width)	724	if (newwidth && newwidth - szHint.base_width < max_width)
756	{	725	{
757	szHint.width = newwidth;	726	szHint.width = newwidth;
…		…
772	{	741	{
773	min_it (height, max_height);	742	min_it (height, max_height);
774	szHint.height = szHint.base_height + height;	743	szHint.height = szHint.base_height + height;
775	}	744	}
776		745
777	if (scrollBar.state && OPTION (Opt_scrollBar_right))	746	if (scrollBar.state && option (Opt_scrollBar_right))
778	window_sb_x = szHint.width - sb_w;	747	window_sb_x = szHint.width - sb_w;
779		748
780	if (recalc_x)	749	if (recalc_x)
781	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	750	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
		751
782	if (recalc_y)	752	if (recalc_y)
783	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	753	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
784		754
785	ncol = width / fwidth;	755	ncol = width / fwidth;
786	nrow = height / fheight;	756	nrow = height / fheight;
787	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
788	ncol, nrow, szHint.width,
789	szHint.height));
790	return;
791	}	757	}
792		758
793	/----------------------------------------------------------------------/	759	/----------------------------------------------------------------------/
794	/*	760	/*
795	* Tell the teletype handler what size the window is.	761	* Tell the teletype handler what size the window is.
…		…
847	delete fontset[0];	813	delete fontset[0];
848	fontset[0] = fs;	814	fontset[0] = fs;
849		815
850	prop = (*fs)[1]->properties ();	816	prop = (*fs)[1]->properties ();
851	prop.height += lineSpace;	817	prop.height += lineSpace;
		818
852	fs->set_prop (prop);	819	fs->set_prop (prop, false);
853		820
854	fwidth = prop.width;	821	fwidth = prop.width;
855	fheight = prop.height;	822	fheight = prop.height;
856	fbase = prop.ascent;	823	fbase = prop.ascent;
857		824
…		…
866	{	833	{
867	fontset[style] = fs = new rxvt_fontset (this);	834	fontset[style] = fs = new rxvt_fontset (this);
868	rxvt_fontprop prop2 = prop;	835	rxvt_fontprop prop2 = prop;
869		836
870	if (res)	837	if (res)
871	prop2.weight = prop2.slant = rxvt_fontprop::unset;	838	{
		839	fs->populate (res);
		840	fs->set_prop (prop2, false);
		841	}
872	else	842	else
873	{	843	{
874	res = fontset[0]->fontdesc;	844	fs->populate (fontset[0]->fontdesc);
875		845
876	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	846	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
877	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;	847	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
		848
		849	fs->set_prop (prop2, true);
878	}	850	}
879		851
880	fs->populate (res);
881	fs->set_prop (prop2);
882	}	852	}
883	#else	853	#else
884	fontset[style] = fontset[0];	854	fontset[style] = fontset[0];
885	#endif	855	#endif
886	}	856	}
…		…
895	return true;	865	return true;
896	}	866	}
897		867
898	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	868	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
899	{	869	{
900	XChangeProperty (display->display, parent[0],	870	XChangeProperty (dpy, parent[0],
901	prop, XA_STRING, 8, PropModeReplace,	871	prop, XA_STRING, 8, PropModeReplace,
902	(const unsigned char *)str, len >= 0 ? len : strlen (str));	872	(const unsigned char *)str, len >= 0 ? len : strlen (str));
903	}	873	}
904		874
905	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	875	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
906	{	876	{
907	wchar_t *ws = rxvt_mbstowcs (str, len);	877	wchar_t *ws = rxvt_mbstowcs (str, len);
908	char *s = rxvt_wcstoutf8 (ws);	878	char *s = rxvt_wcstoutf8 (ws);
909		879
910	XChangeProperty (display->display, parent[0],	880	XChangeProperty (dpy, parent[0],
911	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	881	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
912	(const unsigned char *)s, strlen (s));	882	(const unsigned char *)s, strlen (s));
913		883
914	free (s);	884	free (s);
915	free (ws);	885	free (ws);
…		…
940	void	910	void
941	rxvt_term::set_window_color (int idx, const char *color)	911	rxvt_term::set_window_color (int idx, const char *color)
942	{	912	{
943	rxvt_color xcol;	913	rxvt_color xcol;
944	int i;	914	int i;
945		915
946	if (color == NULL \|\| *color == '\0')	916	if (color == NULL \|\| *color == '\0')
947	return;	917	return;
		918
		919	color = strdup (color);
		920	allocated.push_back ((void *)color);
		921	rs[Rs_color + idx] = color;
948		922
949	/* handle color aliases */	923	/* handle color aliases */
950	if (isdigit (*color))	924	if (isdigit (*color))
951	{	925	{
952	i = atoi (color);	926	i = atoi (color);
953		927
954	if (i >= 8 && i <= 15)	928	if (i >= 8 && i <= 15)
955	{ /* bright colors */	929	{ /* bright colors */
956	i -= 8;	930	i -= 8;
957	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	931	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
958	SET_PIXCOLOR (idx);
959	goto done;	932	goto done;
960	}	933	}
961		934
962	if (i >= 0 && i <= 7)	935	if (i >= 0 && i <= 7)
963	{ /* normal colors */	936	{ /* normal colors */
964	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	937	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
965	SET_PIXCOLOR (idx);
966	goto done;	938	goto done;
967	}	939	}
968	}	940	}
969		941
970	if (!rXParseAllocColor (&xcol, color))	942	set_color (xcol, color);
971	return;
972
973	/* XStoreColor (display->display, display->cmap, XColor); /
974		943
975	/*	944	/*
976	* FIXME: should free colors here, but no idea how to do it so instead,	945	* FIXME: should free colors here, but no idea how to do it so instead,
977	* so just keep gobbling up the colormap	946	* so just keep gobbling up the colormap
978	*/	947	*/
979	# if 0
980	for (i = Color_Black; i <= Color_White; i++)
981	if (pix_colors[idx] == pix_colors[i])
982	break;
983	if (i > Color_White)
984	{
985	/* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
986	XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
987	DisplayPlanes (display->display, display->screen));
988	}
989	# endif
990		948
991	pix_colors_focused[idx] = xcol;	949	pix_colors_focused[idx] = xcol;
992	SET_PIXCOLOR (idx);
993		950
994	/* XSetWindowAttributes attr; */	951	/* XSetWindowAttributes attr; */
995	/* Cursor cursor; */	952	/* Cursor cursor; */
996	done:	953	done:
997
998	#if OFF_FOCUS_FADING
999	if (rs[Rs_fade])
1000	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1001	#endif
1002
1003	/TODO: handle Color_BD, scrollbar background, etc. /	954	/TODO: handle Color_BD, scrollbar background, etc. /
1004		955
		956	update_fade_color (idx);
1005	recolour_cursor ();	957	recolour_cursor ();
1006	scr_recolour ();	958	scr_recolour ();
1007	}	959	}
1008		960
1009	#else	961	#else
…		…
1011	#endif /* XTERM_COLOR_CHANGE */	963	#endif /* XTERM_COLOR_CHANGE */
1012		964
1013	void	965	void
1014	rxvt_term::recolour_cursor ()	966	rxvt_term::recolour_cursor ()
1015	{	967	{
1016	XColor xcol[2];	968	XColor fg, bg;
1017		969
1018	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)	970	(ISSET_PIXCOLOR (Color_pointer_fg)
1019	? pix_colors_focused[Color_pointer_fg]	971	? pix_colors_focused[Color_pointer_fg]
1020	: pix_colors_focused[Color_fg];	972	: pix_colors_focused[Color_fg]).get (fg);
		973
1021	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)	974	(ISSET_PIXCOLOR (Color_pointer_bg)
1022	? pix_colors_focused[Color_pointer_bg]	975	? pix_colors_focused[Color_pointer_bg]
1023	: pix_colors_focused[Color_bg];	976	: pix_colors_focused[Color_bg]).get (bg);
1024		977
1025	XQueryColors (display->display, display->cmap, xcol, 2);	978	XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1026	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1027	}	979	}
1028		980
1029	/----------------------------------------------------------------------/	981	/----------------------------------------------------------------------/
1030	/*	982	/*
1031	* find if fg/bg matches any of the normal (low-intensity) colors	983	* find if fg/bg matches any of the normal (low-intensity) colors
…		…
1035	{	987	{
1036	unsigned int i;	988	unsigned int i;
1037	const char *xpmb = "\0";	989	const char *xpmb = "\0";
1038	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	990	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1039		991
1040	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1041	strcpy (fstr, "default");	992	strcpy (fstr, "default");
1042	strcpy (bstr, "default");	993	strcpy (bstr, "default");
1043	for (i = Color_Black; i <= Color_White; i++)	994	for (i = Color_Black; i <= Color_White; i++)
1044	if (pix_colors[Color_fg] == pix_colors[i])	995	if (pix_colors[Color_fg] == pix_colors[i])
1045	{	996	{
…		…
1060	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	1011	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1061	}	1012	}
1062		1013
1063	/----------------------------------------------------------------------/	1014	/----------------------------------------------------------------------/
1064		1015
1065	int	1016	bool
1066	rxvt_term::rXParseAllocColor (rxvt_color screen_in_out, const char colour)	1017	rxvt_term::set_color (rxvt_color &color, const char *name)
1067	{	1018	{
1068	if (!screen_in_out->set (display, colour))	1019	if (color.set (this, name))
1069	{
1070	rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1071	return false;
1072	}
1073
1074	return true;	1020	return true;
		1021
		1022	rxvt_warn ("can't get colour '%s', continuing without.\n", name);
		1023	return false;
		1024	}
		1025
		1026	void
		1027	rxvt_term::alias_color (int dst, int src)
		1028	{
		1029	pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1075	}	1030	}
1076		1031
1077	/* -------------------------------------------------------------------- *	1032	/* -------------------------------------------------------------------- *
1078	* - WINDOW RESIZING - *	1033	* - WINDOW RESIZING - *
1079	* -------------------------------------------------------------------- */	1034	* -------------------------------------------------------------------- */
1080	void	1035	void
1081	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)	1036	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1082	{	1037	{
1083	int fix_screen;	1038	int fix_screen;
1084	int old_width = szHint.width, old_height = szHint.height;	1039	int old_width = szHint.width;
1085	dDisp;	1040	int old_height = szHint.height;
1086		1041
1087	window_calc (newwidth, newheight);	1042	window_calc (newwidth, newheight);
		1043
		1044	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1088	XSetWMNormalHints (disp, parent[0], &szHint);	1045	XSetWMNormalHints (dpy, parent[0], &szHint);
1089		1046
1090	if (!ignoreparent)	1047	if (!ignoreparent)
1091	{	1048	{
1092	#ifdef SMART_RESIZE	1049	#ifdef SMART_RESIZE
1093	/*	1050	/*
…		…
1097	int x, y, x1, y1;	1054	int x, y, x1, y1;
1098	int dx, dy;	1055	int dx, dy;
1099	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1056	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1100	Window unused_cr;	1057	Window unused_cr;
1101		1058
1102	XTranslateCoordinates (disp, parent[0], display->root,	1059	XTranslateCoordinates (dpy, parent[0], display->root,
1103	0, 0, &x, &y, &unused_cr);	1060	0, 0, &x, &y, &unused_cr);
1104	XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,	1061	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1105	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1062	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1106	/*	1063	/*
1107	* if display->root isn't the parent window, a WM will probably have offset	1064	* if display->root isn't the parent window, a WM will probably have offset
1108	* our position for handles and decorations. Counter it	1065	* our position for handles and decorations. Counter it
1109	*/	1066	*/
…		…
1111	{	1068	{
1112	x -= x1;	1069	x -= x1;
1113	y -= y1;	1070	y -= y1;
1114	}	1071	}
1115		1072
1116	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1073	x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1117	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1074	y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1118	dx = old_width - szHint.width;	1075	dx = old_width - szHint.width;
1119	dy = old_height - szHint.height;	1076	dy = old_height - szHint.height;
1120		1077
1121	/* Check position of the center of the window */	1078	/* Check position of the center of the window */
1122	if (x < x1) /* left half */	1079	if (x < x1) /* left half */
1123	dx = 0;	1080	dx = 0;
…		…
1126	if (y < y1) /* top half */	1083	if (y < y1) /* top half */
1127	dy = 0;	1084	dy = 0;
1128	else if (y == y1) /* exact center */	1085	else if (y == y1) /* exact center */
1129	dy /= 2;	1086	dy /= 2;
1130		1087
1131	XMoveResizeWindow (disp, parent[0], x + dx, y + dy,	1088	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1132	szHint.width, szHint.height);	1089	szHint.width, szHint.height);
1133	#else	1090	#else
1134	XResizeWindow (disp, parent[0], szHint.width, szHint.height);	1091	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1135	#endif	1092	#endif
1136	}	1093	}
1137		1094
1138	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1095	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1139		1096
1140	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1097	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1141	{	1098	{
1142	if (scrollBar.state)	1099	if (scrollBar.state)
1143	{	1100	{
1144	XMoveResizeWindow (disp, scrollBar.win,	1101	XMoveResizeWindow (dpy, scrollBar.win,
1145	window_sb_x, 0,	1102	window_sb_x, 0,
1146	scrollbar_TotalWidth (), szHint.height);	1103	scrollbar_TotalWidth (), szHint.height);
1147	resize_scrollbar ();	1104	resize_scrollbar ();
1148	}	1105	}
1149		1106
1150	XMoveResizeWindow (disp, vt,	1107	XMoveResizeWindow (dpy, vt,
1151	window_vt_x, window_vt_y,	1108	window_vt_x, window_vt_y,
1152	width, height);	1109	width, height);
1153		1110
1154	scr_clear ();	1111	scr_clear ();
1155	#ifdef XPM_BACKGROUND	1112	#ifdef XPM_BACKGROUND
1156	resize_pixmap ();	1113	resize_pixmap ();
1157	#endif	1114	#endif
1158	}	1115	}
1159		1116
1160	if (fix_screen \|\| old_height == 0)	1117	if (fix_screen \|\| old_height == 0)
1161	{
1162	int curr_screen = -1;
1163	int old_ncol = prev_ncol;
1164
1165	/* scr_reset only works on the primary screen */
1166	if (old_height) /* this is not the first time through */
1167	{
1168	unsigned int ocol = ncol;
1169	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1170	curr_screen = scr_change_screen (PRIMARY);
1171	ncol = ocol;
1172	}
1173
1174	scr_reset ();	1118	scr_reset ();
1175		1119
1176	if (curr_screen >= 0) /* this is not the first time through */	1120	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1177	{	1121	//scr_touch (false);
1178	scr_change_screen (curr_screen);
1179	selection_check (old_ncol != ncol ? 4 : 0);
1180	}
1181	}
1182
1183	old_width = szHint.width;
1184	old_height = szHint.height;
1185		1122
1186	#ifdef XPM_BACKGROUND	1123	#ifdef XPM_BACKGROUND
1187	if (pixmap)	1124	if (pixmap)
1188	scr_touch (false);	1125	scr_touch (false);
1189	#endif	1126	#endif
1190		1127
1191	#ifdef USE_XIM	1128	#ifdef USE_XIM
1192	IMSetStatusPosition ();	1129	IMSetPosition ();
1193	#endif	1130	#endif
1194	}	1131	}
1195		1132
1196	/*	1133	/*
1197	* Set the width/height of the vt window in characters. Units are pixels.	1134	* Set the width/height of the vt window in characters. Units are pixels.
…		…
1202	{	1139	{
1203	XWindowAttributes wattr;	1140	XWindowAttributes wattr;
1204		1141
1205	if (newwidth == 0 \|\| newheight == 0)	1142	if (newwidth == 0 \|\| newheight == 0)
1206	{	1143	{
1207	XGetWindowAttributes (display->display, display->root, &wattr);	1144	XGetWindowAttributes (dpy, display->root, &wattr);
1208		1145
1209	if (newwidth == 0)	1146	if (newwidth == 0)
1210	newwidth = wattr.width - szHint.base_width;	1147	newwidth = wattr.width - szHint.base_width;
1211	if (newheight == 0)	1148	if (newheight == 0)
1212	newheight = wattr.height - szHint.base_height;	1149	newheight = wattr.height - szHint.base_height;
…		…
1226	#ifdef USE_XIM	1163	#ifdef USE_XIM
1227		1164
1228	void	1165	void
1229	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)	1166	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1230	{	1167	{
1231	fg = pix_colors[Color_fg];	1168	fg = pix_colors [Color_fg];
1232	bg = pix_colors[Color_bg];	1169	bg = pix_colors [Color_bg];
1233	}	1170	}
1234		1171
1235	void	1172	void
1236	rxvt_term::im_set_size (XRectangle &size)	1173	rxvt_term::im_set_size (XRectangle &size)
1237	{	1174	{
…		…
1274	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1211	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1275		1212
1276	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1213	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1277	*p = '\0';	1214	*p = '\0';
1278		1215
1279	atom = XInternAtom (display->display, server, False);	1216	atom = XInternAtom (dpy, server, False);
1280	win = XGetSelectionOwner (display->display, atom);	1217	win = XGetSelectionOwner (dpy, atom);
1281		1218
1282	if (win != None)	1219	if (win != None)
1283	return True;	1220	return True;
1284	}	1221	}
1285		1222
…		…
1292	XPoint nspot;	1229	XPoint nspot;
1293	XVaNestedList preedit_attr;	1230	XVaNestedList preedit_attr;
1294		1231
1295	if (!Input_Context	1232	if (!Input_Context
1296	\|\| !focus	1233	\|\| !focus
1297	\|\| !(input_style & XIMPreeditPosition))	1234	\|\| !(input_style & (XIMPreeditPosition \| XIMPreeditCallbacks)))
1298	return;	1235	return;
1299		1236
1300	im_set_position (nspot);	1237	im_set_position (nspot);
1301		1238
1302	if (nspot.x == spot.x && nspot.y == spot.y)	1239	if (nspot.x == spot.x && nspot.y == spot.y)
…		…
1321	input_method = 0;	1258	input_method = 0;
1322	}	1259	}
1323		1260
1324	Input_Context = 0;	1261	Input_Context = 0;
1325	}	1262	}
		1263
		1264	#ifdef ENABLE_XIM_ONTHESPOT
		1265
		1266	static void
		1267	xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
		1268	{
		1269	((rxvt_term *)client_data)->make_current ();
		1270	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
		1271	}
		1272
		1273	static void
		1274	xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
		1275	{
		1276	((rxvt_term *)client_data)->make_current ();
		1277	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
		1278	}
		1279
		1280	static void
		1281	xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
		1282	{
		1283	rxvt_term term = (rxvt_term )client_data;
		1284	XIMText *text = call_data->text;
		1285
		1286	term->make_current ();
		1287
		1288	if (text)
		1289	{
		1290	void *str;
		1291
		1292	if (!text->encoding_is_wchar && text->string.multi_byte)
		1293	{
		1294	// of course, X makes it ugly again
		1295	if (term->rs[Rs_imLocale])
		1296	SET_LOCALE (term->rs[Rs_imLocale]);
		1297
		1298	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
		1299	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
		1300
		1301	if (term->rs[Rs_imLocale])
		1302	SET_LOCALE (term->locale);
		1303	}
		1304	else
		1305	str = (void *)text->string.wide_char;
		1306
		1307	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1308	DT_INT, call_data->caret,
		1309	DT_INT, call_data->chg_first,
		1310	DT_INT, call_data->chg_length,
		1311	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
		1312	DT_WCS_LEN, str, str ? (int)text->length : 0,
		1313	DT_END));
		1314	}
		1315	else
		1316	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1317	DT_INT, call_data->caret,
		1318	DT_INT, call_data->chg_first,
		1319	DT_INT, call_data->chg_length,
		1320	DT_END));
		1321	}
		1322
		1323	#if 0
		1324	static void
		1325	xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
		1326	{
		1327	((rxvt_term *)client_data)->make_current ();
		1328	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
		1329	DT_INT, call_data->position,
		1330	DT_INT, call_data->direction,
		1331	DT_INT, call_data->style,
		1332	DT_END));
		1333	}
		1334	#endif
		1335
		1336	#endif
1326		1337
1327	/*	1338	/*
1328	* Try to open a XIM with the current modifiers, then see if we can	1339	* Try to open a XIM with the current modifiers, then see if we can
1329	* open a suitable preedit type	1340	* open a suitable preedit type
1330	*/	1341	*/
…		…
1337	XRectangle rect, status_rect, needed_rect;	1348	XRectangle rect, status_rect, needed_rect;
1338	unsigned long fg, bg;	1349	unsigned long fg, bg;
1339	const char *p;	1350	const char *p;
1340	char **s;	1351	char **s;
1341	XIMStyles *xim_styles;	1352	XIMStyles *xim_styles;
		1353	#ifdef ENABLE_XIM_ONTHESPOT
		1354	XIMCallback xcb[4];
		1355	#endif
1342		1356
1343	set_environ (envv);	1357	set_environ (envv);
1344		1358
1345	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1359	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1346	return false;	1360	return false;
1347		1361
1348	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1349	input_method = display->get_xim (locale, modifiers);	1362	input_method = display->get_xim (locale, modifiers);
1350	if (input_method == NULL)	1363	if (input_method == NULL)
1351	return false;	1364	return false;
1352		1365
1353	xim = input_method->xim;	1366	xim = input_method->xim;
…		…
1373	s = rxvt_splitcommastring (p);	1386	s = rxvt_splitcommastring (p);
1374		1387
1375	for (i = found = 0; !found && s[i]; i++)	1388	for (i = found = 0; !found && s[i]; i++)
1376	{	1389	{
1377	if (!strcmp (s[i], "OverTheSpot"))	1390	if (!strcmp (s[i], "OverTheSpot"))
1378	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1391	input_style = XIMPreeditPosition \| XIMStatusNothing;
1379	else if (!strcmp (s[i], "OffTheSpot"))	1392	else if (!strcmp (s[i], "OffTheSpot"))
1380	input_style = (XIMPreeditArea \| XIMStatusArea);	1393	input_style = XIMPreeditArea \| XIMStatusArea;
1381	else if (!strcmp (s[i], "Root"))	1394	else if (!strcmp (s[i], "Root"))
1382	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1395	input_style = XIMPreeditNothing \| XIMStatusNothing;
1383	else if (!strcmp (s[i], "None"))	1396	else if (!strcmp (s[i], "None"))
1384	input_style = (XIMPreeditNone \| XIMStatusNone);	1397	input_style = XIMPreeditNone \| XIMStatusNone;
		1398	#ifdef ENABLE_XIM_ONTHESPOT
		1399	else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
		1400	input_style = XIMPreeditCallbacks \| XIMStatusNothing;
		1401	#endif
		1402	else
		1403	input_style = XIMPreeditNothing \| XIMStatusNothing;
1385		1404
1386	for (j = 0; j < xim_styles->count_styles; j++)	1405	for (j = 0; j < xim_styles->count_styles; j++)
1387	if (input_style == xim_styles->supported_styles[j])	1406	if (input_style == xim_styles->supported_styles[j])
1388	{	1407	{
1389	rxvt_freecommastring (s);	1408	rxvt_freecommastring (s);
…		…
1427	"*",	1446	"*",
1428	fheight,	1447	fheight,
1429	fheight + 1, fheight - 1,	1448	fheight + 1, fheight - 1,
1430	fheight - 2, fheight + 2);	1449	fheight - 2, fheight + 2);
1431		1450
1432	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,	1451	fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1433	&missing_charset_list, &missing_charset_count, &def_string);	1452	&missing_charset_list, &missing_charset_count, &def_string);
1434		1453
1435	if (missing_charset_list)	1454	if (missing_charset_list)
1436	XFreeStringList (missing_charset_list);	1455	XFreeStringList (missing_charset_list);
1437		1456
…		…
1478	XNBackground, bg,	1497	XNBackground, bg,
1479	XNArea, &status_rect,	1498	XNArea, &status_rect,
1480	XNFontSet, fs,	1499	XNFontSet, fs,
1481	NULL);	1500	NULL);
1482	}	1501	}
		1502	#if ENABLE_XIM_ONTHESPOT
		1503	else if (input_style & XIMPreeditCallbacks)
		1504	{
		1505	im_set_position (spot);
		1506
		1507	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
		1508	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
		1509	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
		1510	# if 0
		1511	xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
		1512	# endif
		1513
		1514	preedit_attr = XVaCreateNestedList (0,
		1515	XNSpotLocation, &spot,
		1516	XNPreeditStartCallback, &xcb[0],
		1517	XNPreeditDoneCallback , &xcb[1],
		1518	XNPreeditDrawCallback , &xcb[2],
		1519	# if 0
		1520	XNPreeditCaretCallback, &xcb[3],
		1521	# endif
		1522	NULL);
		1523	}
		1524	#endif
1483		1525
1484	Input_Context = XCreateIC (xim,	1526	Input_Context = XCreateIC (xim,
1485	XNInputStyle, input_style,	1527	XNInputStyle, input_style,
1486	XNClientWindow, vt,	1528	XNClientWindow, vt,
1487	XNFocusWindow, parent[0],	1529	XNFocusWindow, parent[0],
…		…
1489	preedit_attr,	1531	preedit_attr,
1490	status_attr ? XNStatusAttributes : NULL,	1532	status_attr ? XNStatusAttributes : NULL,
1491	status_attr, NULL);	1533	status_attr, NULL);
1492		1534
1493	if (preedit_attr) XFree (preedit_attr);	1535	if (preedit_attr) XFree (preedit_attr);
1494	if (status_attr) XFree (status_attr);	1536	if (status_attr) XFree (status_attr);
1495	if (fs) XFreeFontSet (display->display, fs);	1537	if (fs) XFreeFontSet (dpy, fs);
1496		1538
1497	if (Input_Context == NULL)	1539	if (Input_Context == NULL)
1498	{	1540	{
1499	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1541	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1500	im_destroy ();	1542	im_destroy ();
1501	return false;	1543	return false;
1502	}	1544	}
1503		1545
1504	if (input_style & XIMPreeditArea)	1546	#if 0
		1547	// unfortunately, only the focus window is used by XIM, hard to fix
		1548	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1549	vt_select_input ();
		1550	#endif
		1551
1505	IMSetStatusPosition ();	1552	IMSetPosition ();
1506		1553
1507	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1508	return true;	1554	return true;
1509	}	1555	}
1510		1556
1511	void	1557	void
1512	rxvt_term::im_cb ()	1558	rxvt_term::im_cb ()
…		…
1518		1564
1519	make_current ();	1565	make_current ();
1520		1566
1521	im_destroy ();	1567	im_destroy ();
1522		1568
1523	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1524	if (Input_Context)	1569	if (Input_Context)
1525	return;	1570	return;
1526		1571
1527	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1572	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1528	if (rs[Rs_imLocale])	1573	if (rs[Rs_imLocale])
…		…
1570	SET_LOCALE (locale);	1615	SET_LOCALE (locale);
1571	#endif	1616	#endif
1572	}	1617	}
1573		1618
1574	void	1619	void
1575	rxvt_term::IMSetStatusPosition ()	1620	rxvt_term::IMSetPosition ()
1576	{	1621	{
1577	XRectangle preedit_rect, status_rect, *needed_rect;	1622	XRectangle preedit_rect, status_rect, *needed_rect;
1578	XVaNestedList preedit_attr, status_attr;	1623	XVaNestedList preedit_attr, status_attr;
1579		1624
1580	if (!Input_Context	1625	if (!Input_Context
1581	\|\| !focus	1626	\|\| !focus
1582	\|\| !(input_style & XIMPreeditArea)	1627	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))
1583	\|\| !IMisRunning ())	1628	\|\| !IMisRunning ())
1584	return;	1629	return;
1585		1630
		1631	if (input_style & XIMPreeditPosition)
		1632	{
		1633	im_set_size (preedit_rect);
		1634	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
		1635
		1636	XSetICValues (Input_Context,
		1637	XNPreeditAttributes, preedit_attr, NULL);
		1638	}
		1639	else
		1640	{
1586	/* Getting the necessary width of preedit area */	1641	/* Getting the necessary width of preedit area */
1587	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);	1642	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1588	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);	1643	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1589	XFree (status_attr);	1644	XFree (status_attr);
1590		1645
1591	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);	1646	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1592	XFree (needed_rect);	1647	XFree (needed_rect);
1593		1648
1594	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1649	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1595	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);	1650	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1596		1651
1597	XSetICValues (Input_Context,	1652	XSetICValues (Input_Context,
1598	XNPreeditAttributes, preedit_attr,	1653	XNPreeditAttributes, preedit_attr,
1599	XNStatusAttributes, status_attr, NULL);	1654	XNStatusAttributes, status_attr,
		1655	NULL);
1600		1656
		1657	XFree (status_attr);
		1658	}
		1659
1601	XFree (preedit_attr);	1660	XFree (preedit_attr);
1602	XFree (status_attr);
1603	}	1661	}
1604	#endif /* USE_XIM */	1662	#endif /* USE_XIM */
1605		1663
1606	/----------------------------------------------------------------------/
1607	rxvt_t rxvt_current_term;
1608
1609	/----------------------- end-of-file (C source) -----------------------/	1664	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.188 by root, Wed Jan 18 08:33:34 2006 UTC vs. Revision 1.234 by root, Sat Jun 9 13:04:27 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.188 by root, Wed Jan 18 08:33:34 2006 UTC vs.
Revision 1.234 by root, Sat Jun 9 13:04:27 2007 UTC