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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.305 by ayin, Sun Feb 17 11:37:21 2008 UTC vs.
Revision 1.342 by sf-exg, Sun Dec 19 00:49:32 2010 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2010 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.
…		…
30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31	---------------------------------------------------------------------/	31	---------------------------------------------------------------------/
32		32
33	#include "../config.h" /* NECESSARY */	33	#include "../config.h" /* NECESSARY */
34	#include "rxvt.h" /* NECESSARY */	34	#include "rxvt.h" /* NECESSARY */
		35	#include "init.h"
35	#include "keyboard.h"	36	#include "keyboard.h"
36	#include "rxvtperl.h"	37	#include "rxvtperl.h"
37		38
38	#include <limits>	39	#include <limits>
39		40
		41	#include <cassert>
40	#include <csignal>	42	#include <csignal>
41	#include <cstring>	43	#include <cstring>
42		44
43	#include <termios.h>	45	#include <termios.h>
44		46
…		…
49	# ifdef HAVE_SETLOCALE	51	# ifdef HAVE_SETLOCALE
50	# include <clocale>	52	# include <clocale>
51	# endif	53	# endif
52	#endif	54	#endif
53		55
		56	struct termios rxvt_term::def_tio;
54	vector<rxvt_term *> rxvt_term::termlist;	57	vector<rxvt_term *> rxvt_term::termlist;
55		58
56	// used to tell global functions which terminal instance is "active"	59	// used to tell global functions which terminal instance is "active"
57	rxvt_t rxvt_current_term;	60	rxvt_t rxvt_current_term;
58		61
…		…
101	{	104	{
102	if (cc->c2 == c2) return c1;	105	if (cc->c2 == c2) return c1;
103	cc = (*this)[cc->c1];	106	cc = (*this)[cc->c1];
104	}	107	}
105		108
106	// check to see wether this combination already exists otherwise	109	// check to see whether this combination already exists otherwise
107	for (cc = v.end (); cc-- > v.begin (); )	110	for (cc = v.end (); cc-- > v.begin (); )
108	{	111	{
109	if (cc->c1 == c1 && cc->c2 == c2)	112	if (cc->c1 == c1 && cc->c2 == c2)
110	return COMPOSE_LO + (cc - v.begin ());	113	return COMPOSE_LO + (cc - v.begin ());
111	}	114	}
…		…
227	delete fontset[0];	230	delete fontset[0];
228		231
229	#ifdef HAVE_BG_PIXMAP	232	#ifdef HAVE_BG_PIXMAP
230	bgPixmap.destroy ();	233	bgPixmap.destroy ();
231	#endif	234	#endif
		235	#ifdef HAVE_AFTERIMAGE
		236	if (asv)
		237	destroy_asvisual (asv, 0);
		238	if (asimman)
		239	destroy_image_manager (asimman, 0);
		240	#endif
232		241
233	if (display)	242	if (display)
234	{	243	{
235	selection_clear ();	244	selection_clear ();
		245	selection_clear (true);
236		246
237	#ifdef USE_XIM	247	#ifdef USE_XIM
238	im_destroy ();	248	im_destroy ();
239	#endif	249	#endif
240	#ifdef XTERM_SCROLLBAR	250	scrollBar.destroy ();
241	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
242	if (ShadowGC) XFreeGC (dpy, ShadowGC);
243	#endif
244	#ifdef PLAIN_SCROLLBAR
245	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
246	#endif
247	#ifdef NEXT_SCROLLBAR
248	if (blackGC) XFreeGC (dpy, blackGC);
249	if (whiteGC) XFreeGC (dpy, whiteGC);
250	if (grayGC) XFreeGC (dpy, grayGC);
251	if (darkGC) XFreeGC (dpy, darkGC);
252	if (stippleGC) XFreeGC (dpy, stippleGC);
253	if (dimple) XFreePixmap (dpy, dimple);
254	if (upArrow) XFreePixmap (dpy, upArrow);
255	if (downArrow) XFreePixmap (dpy, downArrow);
256	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
257	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
258	#endif
259	#ifdef RXVT_SCROLLBAR
260	if (topShadowGC) XFreeGC (dpy, topShadowGC);
261	if (botShadowGC) XFreeGC (dpy, botShadowGC);
262	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
263	#endif
264	if (gc) XFreeGC (dpy, gc);	251	if (gc) XFreeGC (dpy, gc);
265		252
266	delete drawable;	253	delete drawable;
267	// destroy all windows	254	// destroy all windows
268	if (parent[0])	255	if (parent[0])
…		…
288	/* clear all resources */	275	/* clear all resources */
289	for (int i = 0; i < allocated.size (); i++)	276	for (int i = 0; i < allocated.size (); i++)
290	free (allocated [i]);	277	free (allocated [i]);
291		278
292	free (selection.text);	279	free (selection.text);
		280	free (selection.clip_text);
293	// TODO: manage env vars in child only(!)	281	// TODO: manage env vars in child only(!)
294	free (env_display);	282	free (env_display);
295	free (env_term);	283	free (env_term);
296	free (locale);	284	free (locale);
297	free (v_buffer);	285	free (v_buffer);
…		…
373	make_current ();	361	make_current ();
374		362
375	delete this;	363	delete this;
376	}	364	}
377		365
		366	void
		367	rxvt_term::set_option (uint8_t opt, bool set)
		368	{
		369	if (!opt)
		370	return;
		371
		372	uint8_t mask = 1 << (opt & 7);
		373	uint8_t &val = options [opt >> 3];
		374
		375	val = val & ~mask \| (set ? mask : 0);
		376	}
		377
378	/----------------------------------------------------------------------/	378	/----------------------------------------------------------------------/
379	/*	379	/*
380	* Exit gracefully, clearing the utmp entry and restoring tty attributes	380	* Exit gracefully, clearing the utmp entry and restoring tty attributes
381	* TODO: if debugging, this should free up any known resources if we can	381	* TODO: if debugging, this should free up any known resources if we can
382	*/	382	*/
…		…
397	char mesg[BUFSIZ];	397	char mesg[BUFSIZ];
398	char number[32];	398	char number[32];
399	char *mtype = "XlibMessage";	399	char *mtype = "XlibMessage";
400	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	400	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
401	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	401	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
402	rxvt_warn ("An X Error occured, trying to continue after report.\n");	402	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
403	rxvt_warn ("%s: %s\n", mesg, buffer);	403	rxvt_warn ("%s: %s\n", mesg, buffer);
404	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	404	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
405	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	405	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
406	sprintf(number, "%d", event->request_code);	406	sprintf(number, "%d", event->request_code);
407	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	407	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
408	rxvt_warn ("(which is %s)\n", buffer);	408	rxvt_warn ("(which is %s)\n", buffer);
409	if (event->request_code >= 128) {	409	if (event->request_code >= 128) {
410	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	410	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
411	mesg, BUFSIZ);	411	mesg, BUFSIZ);
412	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	412	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
413	}	413	}
414	if ((event->error_code == BadWindow) \|\|	414	if ((event->error_code == BadWindow) \|\|
415	(event->error_code == BadPixmap) \|\|	415	(event->error_code == BadPixmap) \|\|
416	(event->error_code == BadCursor) \|\|	416	(event->error_code == BadCursor) \|\|
417	(event->error_code == BadFont) \|\|	417	(event->error_code == BadFont) \|\|
418	(event->error_code == BadDrawable) \|\|	418	(event->error_code == BadDrawable) \|\|
419	(event->error_code == BadColor) \|\|	419	(event->error_code == BadColor) \|\|
420	(event->error_code == BadGC) \|\|	420	(event->error_code == BadGC) \|\|
421	(event->error_code == BadIDChoice) \|\|	421	(event->error_code == BadIDChoice) \|\|
422	(event->error_code == BadValue) \|\|	422	(event->error_code == BadValue) \|\|
423	(event->error_code == BadAtom)) {	423	(event->error_code == BadAtom)) {
424	if (event->error_code == BadValue)	424	if (event->error_code == BadValue)
425	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	425	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
426	mesg, BUFSIZ);	426	mesg, BUFSIZ);
427	else if (event->error_code == BadAtom)	427	else if (event->error_code == BadAtom)
428	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	428	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
429	mesg, BUFSIZ);	429	mesg, BUFSIZ);
430	else	430	else
431	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	431	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
432	mesg, BUFSIZ);	432	mesg, BUFSIZ);
433	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	433	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
434	}	434	}
435	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	435	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
436	mesg, BUFSIZ);	436	mesg, BUFSIZ);
437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
438	}	438	}
439	#endif	439	#endif
440		440
441	int	441	int
…		…
488	rxvt_emergency_cleanup ();	488	rxvt_emergency_cleanup ();
489	w.stop ();	489	w.stop ();
490	kill (getpid (), w.signum);	490	kill (getpid (), w.signum);
491	}	491	}
492		492
		493	static void
		494	rxvt_get_ttymode (struct termios *tio)
		495	{
		496	if (tcgetattr (STDIN_FILENO, tio) < 0)
		497	memset (tio, 0, sizeof (struct termios));
		498
		499	for (int i = 0; i < NCCS; i++)
		500	tio->c_cc[i] = VDISABLE;
		501
		502	tio->c_cc[VINTR] = CINTR;
		503	tio->c_cc[VQUIT] = CQUIT;
		504	tio->c_cc[VERASE] = CERASE;
		505	#ifdef VERASE2
		506	tio->c_cc[VERASE2] = CERASE2;
		507	#endif
		508	tio->c_cc[VKILL] = CKILL;
		509	tio->c_cc[VEOF] = CEOF;
		510	tio->c_cc[VSTART] = CSTART;
		511	tio->c_cc[VSTOP] = CSTOP;
		512	tio->c_cc[VSUSP] = CSUSP;
		513	# ifdef VDSUSP
		514	tio->c_cc[VDSUSP] = CDSUSP;
		515	# endif
		516	# ifdef VREPRINT
		517	tio->c_cc[VREPRINT] = CRPRNT;
		518	# endif
		519	# ifdef VDISCRD
		520	tio->c_cc[VDISCRD] = CFLUSH;
		521	# endif
		522	# ifdef VWERSE
		523	tio->c_cc[VWERSE] = CWERASE;
		524	# endif
		525	# ifdef VLNEXT
		526	tio->c_cc[VLNEXT] = CLNEXT;
		527	# endif
		528	# ifdef VSTATUS
		529	tio->c_cc[VSTATUS] = CSTATUS;
		530	# endif
		531
		532	# if VMIN != VEOF
		533	tio->c_cc[VMIN] = 1;
		534	# endif
		535	# if VTIME != VEOL
		536	tio->c_cc[VTIME] = 0;
		537	# endif
		538
		539	/* input modes */
		540	tio->c_iflag = (BRKINT \| IGNPAR \| ICRNL
		541	# ifdef IMAXBEL
		542	\| IMAXBEL
		543	# endif
		544	\| IXON);
		545
		546	/* output modes */
		547	tio->c_oflag = (OPOST \| ONLCR);
		548
		549	/* control modes */
		550	tio->c_cflag = (CS8 \| CREAD);
		551
		552	/* local modes */
		553	tio->c_lflag = (ISIG \| ICANON \| IEXTEN \| ECHO
		554	# if defined (ECHOCTL) && defined (ECHOKE)
		555	\| ECHOCTL \| ECHOKE
		556	# endif
		557	\| ECHOE \| ECHOK);
		558	}
		559
493	char **rxvt_environ; // startup environment	560	char **rxvt_environ; // startup environment
494		561
495	void	562	void
496	rxvt_init ()	563	rxvt_init ()
497	{	564	{
498	ptytty::init ();	565	assert (("fontMask must not overlap other RS masks",
		566	0 == (RS_fontMask & (RS_Sel \| RS_baseattrMask \| RS_customMask \| RS_bgMask \| RS_fgMask))));
499		567
		568	rxvt_get_ttymode (&rxvt_term::def_tio);
		569
		570	// get rid of stdin/stdout as we don't need them, to free resources
		571	dup2 (STDERR_FILENO, STDIN_FILENO);
		572	dup2 (STDERR_FILENO, STDOUT_FILENO);
		573
500	if (!ev_default_loop (0))	574	if (!ev_default_loop ())
501	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");	575	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
502		576
503	rxvt_environ = environ;	577	rxvt_environ = environ;
504		578
505	signal (SIGHUP, SIG_IGN);	579	signal (SIGHUP, SIG_IGN);
506	signal (SIGPIPE, SIG_IGN);	580	signal (SIGPIPE, SIG_IGN);
507		581
508	sig_handlers.sw_term.start (SIGTERM); ev_unref ();	582	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
509	sig_handlers.sw_int.start (SIGINT); ev_unref ();	583	sig_handlers.sw_int.start (SIGINT); ev_unref ();
510
511	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
512	/* signal (SIGURG, SIG_DFL); */
513		584
514	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	585	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
515	// TODO: handle this with exceptions and tolerate the memory loss	586	// TODO: handle this with exceptions and tolerate the memory loss
516	XSetIOErrorHandler (rxvt_xioerror_handler);	587	XSetIOErrorHandler (rxvt_xioerror_handler);
517		588
…		…
525	*/	596	*/
526	void	597	void
527	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	598	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
528	{	599	{
529	short recalc_x, recalc_y;	600	short recalc_x, recalc_y;
530	int x, y, sb_w, flags;	601	int x, y, flags;
531	unsigned int w, h;	602	unsigned int w, h;
532	unsigned int max_width, max_height;	603	unsigned int max_width, max_height;
533		604
534	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	605	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
535	szHint.win_gravity = NorthWestGravity;	606	szHint.win_gravity = NorthWestGravity;
…		…
545	if (rs[Rs_geometry])	616	if (rs[Rs_geometry])
546	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	617	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
547		618
548	if (flags & WidthValue)	619	if (flags & WidthValue)
549	{	620	{
		621	if (!w)
		622	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		623
550	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	624	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
551	szHint.flags \|= USSize;	625	szHint.flags \|= USSize;
552	}	626	}
553		627
554	if (flags & HeightValue)	628	if (flags & HeightValue)
555	{	629	{
		630	if (!h)
		631	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		632
556	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	633	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
557	szHint.flags \|= USSize;	634	szHint.flags \|= USSize;
558	}	635	}
559		636
560	if (flags & XValue)	637	if (flags & XValue)
561	{	638	{
…		…
592	max_width = MAX_COLS * fwidth;	669	max_width = MAX_COLS * fwidth;
593	max_height = MAX_ROWS * fheight;	670	max_height = MAX_ROWS * fheight;
594		671
595	szHint.base_width = szHint.base_height = 2 * int_bwidth;	672	szHint.base_width = szHint.base_height = 2 * int_bwidth;
596		673
597	sb_w = 0;
598	window_vt_x = window_vt_y = int_bwidth;	674	window_vt_x = window_vt_y = int_bwidth;
599		675
600	if (scrollBar.state)	676	if (scrollBar.state)
601	{	677	{
602	sb_w = scrollBar.total_width ();	678	int sb_w = scrollBar.total_width ();
603	szHint.base_width += sb_w;	679	szHint.base_width += sb_w;
604		680
605	if (!option (Opt_scrollBar_right))	681	if (!option (Opt_scrollBar_right))
606	window_vt_x += sb_w;	682	window_vt_x += sb_w;
607	}	683	}
…		…
631	{	707	{
632	min_it (height, max_height);	708	min_it (height, max_height);
633	szHint.height = szHint.base_height + height;	709	szHint.height = szHint.base_height + height;
634	}	710	}
635		711
636	if (scrollBar.state && option (Opt_scrollBar_right))
637	window_sb_x = szHint.width - sb_w;
638
639	if (recalc_x)	712	if (recalc_x)
640	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	713	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
641		714
642	if (recalc_y)	715	if (recalc_y)
643	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	716	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
644		717
645	ncol = width / fwidth;	718	ncol = width / fwidth;
646	nrow = height / fheight;	719	nrow = height / fheight;
647	}	720	}
648		721
649	/----------------------------------------------------------------------/	722	/----------------------------------------------------------------------/
650	/*	723	/*
…		…
661		734
662	ws.ws_col = ncol;	735	ws.ws_col = ncol;
663	ws.ws_row = nrow;	736	ws.ws_row = nrow;
664	ws.ws_xpixel = width;	737	ws.ws_xpixel = width;
665	ws.ws_ypixel = height;	738	ws.ws_ypixel = height;
666	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	739	ioctl (pty->pty, TIOCSWINSZ, &ws);
667		740
668	#if 0	741	#if 0
669	// TIOCSWINSZ is supposed to do this automatically and correctly	742	// TIOCSWINSZ is supposed to do this automatically and correctly
670	if (cmd_pid) /* force through to the command */	743	if (cmd_pid) /* force through to the command */
671	kill (-cmd_pid, SIGWINCH);	744	kill (-cmd_pid, SIGWINCH);
…		…
701	#endif	774	#endif
702		775
703	delete fontset[0];	776	delete fontset[0];
704	fontset[0] = fs;	777	fontset[0] = fs;
705		778
706	prop = (*fs)[1]->properties ();	779	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
707	prop.height += lineSpace;	780	prop.height += lineSpace;
		781	prop.width += letterSpace;
708		782
709	fs->set_prop (prop, false);	783	fs->set_prop (prop, false);
710		784
711	fwidth = prop.width;	785	fwidth = prop.width;
712	fheight = prop.height;	786	fheight = prop.height;
…		…
762	prop, XA_STRING, 8, PropModeReplace,	836	prop, XA_STRING, 8, PropModeReplace,
763	(const unsigned char *)str, len >= 0 ? len : strlen (str));	837	(const unsigned char *)str, len >= 0 ? len : strlen (str));
764	}	838	}
765		839
766	void	840	void
		841	rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
		842	{
		843	XTextProperty ct;
		844
		845	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
		846	{
		847	XSetTextProperty (dpy, parent[0], &ct, prop);
		848	XFree (ct.value);
		849	}
		850	}
		851
		852	void
767	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	853	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
768	{	854	{
769	wchar_t *ws = rxvt_mbstowcs (str, len);	855	wchar_t *ws = rxvt_mbstowcs (str, len);
770	char *s = rxvt_wcstoutf8 (ws);	856	char *s = rxvt_wcstoutf8 (ws);
771		857
…		…
781	/----------------------------------------------------------------------/	867	/----------------------------------------------------------------------/
782	/* xterm sequences - title, iconName, color (exptl) */	868	/* xterm sequences - title, iconName, color (exptl) */
783	void	869	void
784	rxvt_term::set_title (const char *str)	870	rxvt_term::set_title (const char *str)
785	{	871	{
786	set_string_property (XA_WM_NAME, str);	872	set_mbstring_property (XA_WM_NAME, str);
787	#if ENABLE_EWMH	873	#if ENABLE_EWMH
788	set_utf8_property (xa[XA_NET_WM_NAME], str);	874	set_utf8_property (xa[XA_NET_WM_NAME], str);
789	#endif	875	#endif
790	}	876	}
791		877
792	void	878	void
793	rxvt_term::set_icon_name (const char *str)	879	rxvt_term::set_icon_name (const char *str)
794	{	880	{
795	set_string_property (XA_WM_ICON_NAME, str);	881	set_mbstring_property (XA_WM_ICON_NAME, str);
796	#if ENABLE_EWMH	882	#if ENABLE_EWMH
797	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	883	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
798	#endif	884	#endif
799	}	885	}
800		886
…		…
926	int old_width = szHint.width;	1012	int old_width = szHint.width;
927	int old_height = szHint.height;	1013	int old_height = szHint.height;
928		1014
929	window_calc (newwidth, newheight);	1015	window_calc (newwidth, newheight);
930		1016
931	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	1017	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		1018
		1019	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		1020	if (set_hint)
		1021	{
		1022	szHint.flags &= ~(PBaseSize \| PResizeInc);
932	XSetWMNormalHints (dpy, parent[0], &szHint);	1023	XSetWMNormalHints (dpy, parent[0], &szHint);
		1024	szHint.flags \|= PBaseSize \| PResizeInc;
		1025	}
933		1026
934	if (!ignoreparent)	1027	if (!ignoreparent)
935	{	1028	{
936	#ifdef SMART_RESIZE	1029	#ifdef SMART_RESIZE
937	/*	1030	/*
…		…
977	#else	1070	#else
978	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1071	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
979	#endif	1072	#endif
980	}	1073	}
981		1074
		1075	if (set_hint)
		1076	XSetWMNormalHints (dpy, parent[0], &szHint);
		1077
982	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1078	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
983		1079
984	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1080	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
985	{	1081	{
986	if (scrollBar.state)	1082	if (scrollBar.state)
987	{	1083	scrollBar.resize ();
988	XMoveResizeWindow (dpy, scrollBar.win,
989	window_sb_x, 0,
990	scrollBar.total_width (), szHint.height);
991	resize_scrollbar ();
992	}
993		1084
994	XMoveResizeWindow (dpy, vt,	1085	XMoveResizeWindow (dpy, vt,
995	window_vt_x, window_vt_y,	1086	window_vt_x, window_vt_y,
996	width, height);	1087	width, height);
997		1088
998	#ifdef HAVE_BG_PIXMAP	1089	#ifdef HAVE_BG_PIXMAP
999	if (bgPixmap.window_size_sensitive ())	1090	if (bgPixmap.window_size_sensitive ())
1000	update_background ();	1091	update_background ();
1001	#endif	1092	#endif
1002
1003	scr_clear ();
1004	}	1093	}
1005		1094
1006	if (fix_screen \|\| old_height == 0)	1095	if (fix_screen \|\| old_height == 0)
1007	scr_reset ();	1096	scr_reset ();
1008
1009	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1010	//scr_touch (false);
1011		1097
1012	#ifdef HAVE_BG_PIXMAP	1098	#ifdef HAVE_BG_PIXMAP
1013	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?	1099	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1014	// if (bgPixmap.pixmap)	1100	// if (bgPixmap.pixmap)
1015	// scr_touch (false);	1101	// scr_touch (false);
…		…
1087		1173
1088	/* Checking whether input method is running. */	1174	/* Checking whether input method is running. */
1089	bool	1175	bool
1090	rxvt_term::IMisRunning ()	1176	rxvt_term::IMisRunning ()
1091	{	1177	{
1092	char *p;
1093	Atom atom;	1178	Atom atom;
1094	Window win;	1179	Window win;
1095	char server[IMBUFSIZ];	1180	char server[IMBUFSIZ];
1096		1181
1097	/* get current locale modifier */	1182	/* get current locale modifier */
1098	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1183	if (char *p = XSetLocaleModifiers (0))
1099	{	1184	{
1100	strcpy (server, "@server=");	1185	strcpy (server, "@server=");
1101	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1186	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1102		1187
1103	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1188	if (p = strchr (server + 1, '@')) /* first one only */
1104	*p = '\0';	1189	*p = '\0';
1105		1190
1106	atom = XInternAtom (dpy, server, False);	1191	atom = XInternAtom (dpy, server, False);
1107	win = XGetSelectionOwner (dpy, atom);	1192	win = XGetSelectionOwner (dpy, atom);
1108		1193
…		…
1175		1260
1176	term->make_current ();	1261	term->make_current ();
1177		1262
1178	if (text)	1263	if (text)
1179	{	1264	{
1180	void *str;	1265	wchar_t *str;
1181		1266
1182	if (!text->encoding_is_wchar && text->string.multi_byte)	1267	if (!text->encoding_is_wchar && text->string.multi_byte)
1183	{	1268	{
1184	// of course, X makes it ugly again	1269	// of course, X makes it ugly again
1185	if (term->rs[Rs_imLocale])	1270	if (term->rs[Rs_imLocale])
1186	SET_LOCALE (term->rs[Rs_imLocale]);	1271	SET_LOCALE (term->rs[Rs_imLocale]);
1187		1272
1188	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));	1273	str = rxvt_temp_buf<wchar_t> (text->length + 1);
1189	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);	1274	mbstowcs (str, text->string.multi_byte, text->length + 1);
1190		1275
1191	if (term->rs[Rs_imLocale])	1276	if (term->rs[Rs_imLocale])
1192	SET_LOCALE (term->locale);	1277	SET_LOCALE (term->locale);
1193	}	1278	}
1194	else	1279	else
1195	str = (void *)text->string.wide_char;	1280	str = text->string.wide_char;
1196		1281
1197	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1282	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1198	DT_INT, call_data->caret,	1283	DT_INT, call_data->caret,
1199	DT_INT, call_data->chg_first,	1284	DT_INT, call_data->chg_first,
1200	DT_INT, call_data->chg_length,	1285	DT_INT, call_data->chg_length,
…		…
1554	void	1639	void
1555	rxvt_term::get_window_origin (int &x, int &y)	1640	rxvt_term::get_window_origin (int &x, int &y)
1556	{	1641	{
1557	Window cr;	1642	Window cr;
1558	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1643	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1559	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1560	}	1644	}
1561		1645
1562	Pixmap	1646	Pixmap
1563	rxvt_term::get_pixmap_property (int prop_id)	1647	rxvt_term::get_pixmap_property (Atom property)
1564	{	1648	{
1565	if (prop_id > 0 && prop_id < NUM_XA)	1649	Pixmap pixmap = None;
1566	if (xa[prop_id])	1650
1567	{
1568	int aformat;	1651	int aformat;
1569	unsigned long nitems, bytes_after;	1652	unsigned long nitems, bytes_after;
1570	Atom atype;	1653	Atom atype;
1571	unsigned char *prop = NULL;	1654	unsigned char *prop;
1572	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],	1655	int result = XGetWindowProperty (dpy, display->root, property,
1573	0L, 1L, False, XA_PIXMAP, &atype, &aformat,	1656	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1574	&nitems, &bytes_after, &prop);	1657	&nitems, &bytes_after, &prop);
1575	if (result == Success && prop && atype == XA_PIXMAP)	1658	if (result == Success)
		1659	{
		1660	if (atype == XA_PIXMAP)
1576	return (Pixmap )prop;	1661	pixmap = (Pixmap )prop;
		1662	XFree (prop);
1577	}	1663	}
1578		1664
1579	return None;	1665	return pixmap;
1580	}	1666	}
1581		1667
1582	#ifdef HAVE_BG_PIXMAP	1668	#ifdef HAVE_BG_PIXMAP
1583	# if TRACE_PIXMAPS
1584	# undef update_background
1585	void
1586	rxvt_term::trace_update_background (const char *file, int line)
1587	{
1588	fprintf (stderr, "%s:%d:update_background()\n", file, line);
1589	update_background ();
1590	}
1591	# endif
1592		1669
1593	void	1670	void
1594	rxvt_term::update_background ()	1671	rxvt_term::update_background ()
1595	{	1672	{
1596	if (update_background_ev.is_active ())	1673	if (update_background_ev.is_active ())

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.305 by ayin, Sun Feb 17 11:37:21 2008 UTC vs. Revision 1.342 by sf-exg, Sun Dec 19 00:49:32 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.305 by ayin, Sun Feb 17 11:37:21 2008 UTC vs.
Revision 1.342 by sf-exg, Sun Dec 19 00:49:32 2010 UTC