[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.98 by root, Fri Apr 14 02:06:22 2006 UTC vs.
Revision 1.119 by root, Sun Apr 16 07:25:30 2006 UTC

…		…
7		7
8	use CFClient;	8	use CFClient;
9		9
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	10	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		11
12	our $TOPLEVEL;	12	our $ROOT;
13	our $BUTTON_STATE;	13	our $BUTTON_STATE;
14		14
15	# class methods for events	15	# class methods for events
16	sub feed_sdl_key_down_event {	16	sub feed_sdl_key_down_event {
17	$FOCUS->key_down ($_[0]) if $FOCUS;	17	$FOCUS->key_down ($_[0]) if $FOCUS;
…		…
24	sub feed_sdl_button_down_event {	24	sub feed_sdl_button_down_event {
25	my ($ev) = @_;	25	my ($ev) = @_;
26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27		27
28	if (!$BUTTON_STATE) {	28	if (!$BUTTON_STATE) {
29	my $widget = $TOPLEVEL->find_widget ($x, $y);	29	my $widget = $ROOT->find_widget ($x, $y);
30		30
31	$GRAB = $widget;	31	$GRAB = $widget;
32	$GRAB->update if $GRAB;	32	$GRAB->update if $GRAB;
33	}	33	}
34		34
35	$BUTTON_STATE \|= 1 << ($ev->button - 1);	35	$BUTTON_STATE \|= 1 << ($ev->button - 1);
36		36
37	$GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;	37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38	}	38	}
39		39
40	sub feed_sdl_button_up_event {	40	sub feed_sdl_button_up_event {
41	my ($ev) = @_;	41	my ($ev) = @_;
42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43		43
44	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);	44	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);
45		45
46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));	46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));
47		47
48	$GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;	48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49		49
50	if (!$BUTTON_STATE) {	50	if (!$BUTTON_STATE) {
51	my $grab = $GRAB; undef $GRAB;	51	my $grab = $GRAB; undef $GRAB;
52	$grab->update if $grab;	52	$grab->update if $grab;
53	$GRAB->update if $GRAB;	53	$GRAB->update if $GRAB;
…		…
56		56
57	sub feed_sdl_motion_event {	57	sub feed_sdl_motion_event {
58	my ($ev) = @_;	58	my ($ev) = @_;
59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60		60
61	my $widget = $GRAB \|\| $TOPLEVEL->find_widget ($x, $y);	61	my $widget = $GRAB \|\| $ROOT->find_widget ($x, $y);
62		62
63	if ($widget != $HOVER) {	63	if ($widget != $HOVER) {
64	my $hover = $HOVER; $HOVER = $widget;	64	my $hover = $HOVER; $HOVER = $widget;
65		65
66	$hover->update if $hover;	66	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $HOVER;	67	$HOVER->update if $HOVER && $HOVER->{can_hover};
68	}	68	}
69		69
70	$HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;	70	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
		71	}
		72
		73	# convert position array to integers
		74	sub harmonize {
		75	my ($vals) = @_;
		76
		77	my $rem = 0;
		78
		79	for (@$vals) {
		80	my $i = int $_ + $rem;
		81	$rem += $_ - $i;
		82	$_ = $i;
		83	}
71	}	84	}
72		85
73	#############################################################################	86	#############################################################################
74		87
75	package CFClient::UI::Base;	88	package CFClient::UI::Base;
…		…
99	$self	112	$self
100	}	113	}
101		114
102	sub move {	115	sub move {
103	my ($self, $x, $y, $z) = @_;	116	my ($self, $x, $y, $z) = @_;
104	$self->{x} = $x;	117	$self->{x} = int $x;
105	$self->{y} = $y;	118	$self->{y} = int $y;
106	$self->{z} = $z if defined $z;	119	$self->{z} = $z if defined $z;
107	}	120	}
108		121
109	sub needs_redraw {	122	sub needs_redraw {
110	0	123	0
…		…
133	my ($self, $x, $y, $w, $h) = @_;	146	my ($self, $x, $y, $w, $h) = @_;
134		147
135	$self->_size_allocate ($x, $y, $w, $h);	148	$self->_size_allocate ($x, $y, $w, $h);
136	}	149	}
137		150
		151	# return top left coordinates
		152	sub _topleft {
		153	my ($self, $x, $y) = @_;
		154
		155	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
		156	}
		157
138	# translate global coordinates to local coordinate system	158	# translate global coordinates to local coordinate system
139	sub translate {	159	sub coord2local {
140	my ($self, $x, $y) = @_;	160	my ($self, $x, $y) = @_;
141		161
142	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});	162	my ($X, $Y) = $self->_topleft;
		163	($x - $X, $y - $Y)
		164	}
		165
		166	# translate local coordinates to global coordinate system
		167	sub coord2global {
		168	my ($self, $x, $y) = @_;
		169
		170	my ($X, $Y) = $self->_topleft;
		171	($x + $X, $y + $Y)
143	}	172	}
144		173
145	sub focus_in {	174	sub focus_in {
146	my ($self) = @_;	175	my ($self) = @_;
147		176
…		…
220		249
221	()	250	()
222	}	251	}
223		252
224	sub set_parent {	253	sub set_parent {
225	my ($self, $par) = @_;	254	my ($self, $parent) = @_;
226		255
227	$self->{parent} = $par;
228	Scalar::Util::weaken $self->{parent};	256	Scalar::Util::weaken ($self->{parent} = $parent);
229	}
230
231	sub get_parent {
232	$_[0]->{parent}
233	}	257	}
234		258
235	sub update {	259	sub update {
236	my ($self) = @_;	260	my ($self) = @_;
237		261
…		…
326		350
327	$self	351	$self
328	}	352	}
329		353
330	sub add {	354	sub add {
331	my ($self, $chld) = @_;	355	my ($self, $child) = @_;
332		356
333	$chld->set_parent ($self);	357	$child->set_parent ($self);
		358
		359	use sort 'stable';
334		360
335	$self->{children} = [	361	$self->{children} = [
336	sort { $a->{z} <=> $b->{z} }	362	sort { $a->{z} <=> $b->{z} }
337	@{$self->{children}}, $chld	363	@{$self->{children}}, $child
338	];	364	];
339		365
340	$self->{w} = $self->{h} = -1;	366	$self->{w} = $self->{h} = -1;
341	$self->update;	367	$self->update;
342	}	368	}
…		…
439	}	465	}
440		466
441	sub render_chld {	467	sub render_chld {
442	my ($self) = @_;	468	my ($self) = @_;
443		469
444	$self->{texture} =	470	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445	CFClient::Texture->new_from_opengl (	471	glClearColor 0, 0, 0, 1;
446	$self->{w}, $self->{h}, sub { $self->child->draw }	472	glClear GL_COLOR_BUFFER_BIT;
447	);	473	$self->child->draw;
		474	};
448	}	475	}
449		476
450	sub size_allocate {	477	sub size_allocate {
451	my ($self, $x, $y, $w, $h) = @_;	478	my ($self, $x, $y, $w, $h) = @_;
452		479
…		…
538	# TODO: user_x, user_y, overwrite moveto?	565	# TODO: user_x, user_y, overwrite moveto?
539		566
540	$class->SUPER::new (	567	$class->SUPER::new (
541	bg => [1, 1, 1, 1],	568	bg => [1, 1, 1, 1],
542	border_bg => [1, 1, 1, 1],	569	border_bg => [1, 1, 1, 1],
543	border => $::FONTSIZE * 0.8,	570	border => int $::FONTSIZE * 0.8,
544	@_	571	@_
545	)	572	)
546	}	573	}
547		574
548	sub size_request {	575	sub size_request {
…		…
639	# TODO: repeat texture not scale	666	# TODO: repeat texture not scale
640	my $rep_x = $cw / $bg->{w};	667	my $rep_x = $cw / $bg->{w};
641	my $rep_y = $ch / $bg->{h};	668	my $rep_y = $ch / $bg->{h};
642		669
643	glColor @{ $self->{bg} };	670	glColor @{ $self->{bg} };
		671
		672	$bg->{s} = $rep_x;
		673	$bg->{t} = $rep_y;
		674	$bg->{wrap_mode} = 1;
644	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);	675	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
645		676
646	glDisable GL_TEXTURE_2D;	677	glDisable GL_TEXTURE_2D;
647	glDisable GL_BLEND;	678	glDisable GL_BLEND;
648		679
…		…
667	@_	698	@_
668	)	699	)
669	}	700	}
670		701
671	sub add {	702	sub add {
672	my ($self, $x, $y, $chld) = @_;	703	my ($self, $x, $y, $child) = @_;
673		704
		705	$child->set_parent ($self);
674	$self->{children}[$y][$x] = $chld;	706	$self->{children}[$y][$x] = $child;
675	$chld->set_parent ($self);
676		707
677	$self->{w} = $self->{h} = -1;	708	$self->{w} = $self->{h} = -1;
		709	$self->update;
		710	}
		711
		712	# TODO: move to container class maybe? send childs a signal on removal?
		713	sub clear {
		714	my ($self) = @_;
		715
		716	delete $self->{children};
678	$self->update;	717	$self->update;
679	}	718	}
680		719
681	sub get_wh {	720	sub get_wh {
682	my ($self) = @_;	721	my ($self) = @_;
…		…
727	my $col_expand = (sum @col_expand) \|\| 1;	766	my $col_expand = (sum @col_expand) \|\| 1;
728		767
729	# linearly scale sizes	768	# linearly scale sizes
730	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	769	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
731	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;	770	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
		771
		772	CFClient::UI::harmonize $ws;
		773	CFClient::UI::harmonize $hs;
732		774
733	my $y;	775	my $y;
734		776
735	for my $r (0 .. $#{$self->{children}}) {	777	for my $r (0 .. $#{$self->{children}}) {
736	my $row = $self->{children}[$r]	778	my $row = $self->{children}[$r]
…		…
824	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	866	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825	$h[$_] = $alloc_h;	867	$h[$_] = $alloc_h;
826	}	868	}
827	}	869	}
828		870
		871	CFClient::UI::harmonize \@h;
		872
829	my $y = 0;	873	my $y = 0;
830	for (0 .. $#$children) {	874	for (0 .. $#$children) {
831	my $child = $children->[$_];	875	my $child = $children->[$_];
832	my $h = $h[$_];	876	my $h = $h[$_];
833	$child->size_allocate ($y, 0, $h, $w);	877	$child->size_allocate ($y, 0, $h, $w);
…		…
878		922
879	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	923	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
880	}	924	}
881	}	925	}
882		926
		927	CFClient::UI::harmonize \@h;
		928
883	my $y = 0;	929	my $y = 0;
884	for (0 .. $#$children) {	930	for (0 .. $#$children) {
885	my $child = $children->[$_];	931	my $child = $children->[$_];
886	my $h = $h[$_];	932	my $h = $h[$_];
887	$child->size_allocate (0, $y, $w, $h);	933	$child->size_allocate (0, $y, $w, $h);
…		…
900		946
901	sub new {	947	sub new {
902	my ($class, %arg) = @_;	948	my ($class, %arg) = @_;
903		949
904	my $self = $class->SUPER::new (	950	my $self = $class->SUPER::new (
905	fg => [1, 1, 1],	951	fg => [1, 1, 1],
906	height => $::FONTSIZE,	952	fontsize => $::FONTSIZE,
907	text => "",	953	text => "",
908	align => -1,	954	align => -1,
		955	valign => -1,
909	padding => 2,	956	padding => 2,
910	layout => new CFClient::Layout,	957	layout => new CFClient::Layout,
911	%arg	958	%arg
912	);	959	);
913		960
914	$self->set_text ($self->{text});	961	$self->set_text ($self->{text});
915		962
…		…
945		992
946	sub size_request {	993	sub size_request {
947	my ($self) = @_;	994	my ($self) = @_;
948		995
949	$self->{layout}->set_width;	996	$self->{layout}->set_width;
950	$self->{layout}->set_height ($self->{height});	997	$self->{layout}->set_height ($self->{fontsize});
951	my ($w, $h) = $self->{layout}->size;	998	my ($w, $h) = $self->{layout}->size;
952		999
953	(	1000	(
954	$w + $self->{padding} * 2,	1001	$w + $self->{padding} * 2,
955	$h + $self->{padding} * 2,	1002	$h + $self->{padding} * 2,
…		…
974	sub _draw {	1021	sub _draw {
975	my ($self) = @_;	1022	my ($self) = @_;
976		1023
977	my $tex = $self->{texture} \|\|= do {	1024	my $tex = $self->{texture} \|\|= do {
978	$self->{layout}->set_width ($self->{w});	1025	$self->{layout}->set_width ($self->{w});
979	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});	1026	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
980	new_from_layout CFClient::Texture $self->{layout}	1027	new_from_layout CFClient::Texture $self->{layout}
981	};	1028	};
982		1029
983	glEnable GL_BLEND;	1030	glEnable GL_BLEND;
984	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1031	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
985	glEnable GL_TEXTURE_2D;	1032	glEnable GL_TEXTURE_2D;
986	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1033	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
987		1034
988	glColor @{$self->{fg}};	1035	glColor @{$self->{fg}};
989		1036
990	my $x =	1037	my $x =
991	$self->{align} < 0 ? $self->{padding}	1038	$self->{align} < 0 ? $self->{padding}
992	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1039	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
993	: ($self->{w} - $tex->{w}) * 0.5;	1040	: ($self->{w} - $tex->{w}) * 0.5;
994		1041
995	glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;	1042	my $y =
		1043	$self->{valign} < 0 ? $self->{padding}
		1044	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1045	: ($self->{h} - $tex->{h}) * 0.5;
		1046
996	$tex->draw_quad (0, 0);	1047	$tex->draw_quad (int $x, int $y);
997		1048
998	glDisable GL_TEXTURE_2D;	1049	glDisable GL_TEXTURE_2D;
999	glDisable GL_BLEND;	1050	glDisable GL_BLEND;
1000	}	1051	}
1001		1052
…		…
1016	bg => [0, 0, 0, 0.2],	1067	bg => [0, 0, 0, 0.2],
1017	active_bg => [1, 1, 1, 0.5],	1068	active_bg => [1, 1, 1, 0.5],
1018	active_fg => [0, 0, 0],	1069	active_fg => [0, 0, 0],
1019	can_hover => 1,	1070	can_hover => 1,
1020	can_focus => 1,	1071	can_focus => 1,
		1072	valign => 0,
1021	@_	1073	@_
1022	)	1074	)
1023	}	1075	}
1024		1076
1025	sub _set_text {	1077	sub _set_text {
1026	my ($self, $text) = @_;	1078	my ($self, $text) = @_;
1027		1079
		1080	my $old_text = $self->{text};
		1081
1028	$self->{last_activity} = $::NOW;	1082	$self->{last_activity} = $::NOW;
1029		1083
1030	$self->{text} = $text;	1084	$self->{text} = $text;
1031	$self->{layout}->set_width ($self->{w});	1085	$self->{layout}->set_width ($self->{w});
1032	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});	1086	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1033		1087
1034	$text =~ s/./*/g if $self->{hidden};	1088	$text =~ s/./*/g if $self->{hidden};
1035		1089
1036	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1090	$self->{layout}->set_markup ($self->escape_text ($text) . " ");
1037		1091
1038	$text = substr $text, 0, $self->{cursor};	1092	$text = substr $text, 0, $self->{cursor};
1039	utf8::encode $text;	1093	utf8::encode $text;
1040		1094
1041	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);	1095	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
		1096
		1097	$self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
		1098	if $old_text ne $self->{text};
1042	}	1099	}
1043		1100
1044	sub size_request {	1101	sub size_request {
1045	my ($self) = @_;	1102	my ($self) = @_;
1046		1103
…		…
1085	++$self->{cursor} if $self->{cursor} < length $self->{text};	1142	++$self->{cursor} if $self->{cursor} < length $self->{text};
1086	} elsif ($sym == SDLK_HOME) {	1143	} elsif ($sym == SDLK_HOME) {
1087	$self->{cursor} = 0;	1144	$self->{cursor} = 0;
1088	} elsif ($sym == SDLK_END) {	1145	} elsif ($sym == SDLK_END) {
1089	$self->{cursor} = length $text;	1146	$self->{cursor} = length $text;
		1147	} elsif ($sym == SDLK_ESCAPE) {
		1148	$self->emit ('escape');
1090	} elsif ($uni) {	1149	} elsif ($uni) {
1091	substr $text, $self->{cursor}++, 0, chr $uni;	1150	substr $text, $self->{cursor}++, 0, chr $uni;
1092	}	1151	}
1093		1152
1094	$self->_set_text ($text);	1153	$self->_set_text ($text);
…		…
1156	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1215	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1157	glEnd;	1216	glEnd;
1158	}	1217	}
1159	}	1218	}
1160		1219
		1220	package CFClient::UI::LineEntry;
		1221
		1222	our @ISA = CFClient::UI::Entry::;
		1223
		1224	use SDL;
		1225	use SDL::OpenGL;
		1226
		1227	sub key_down {
		1228	my ($self, $ev) = @_;
		1229
		1230	my $sym = $ev->key_sym;
		1231
		1232	if ($sym == SDLK_RETURN) {
		1233	$self->emit (activate => $self->get_text);
		1234	$self->update;
		1235
		1236	} else {
		1237	$self->SUPER::key_down ($ev);
		1238	}
		1239
		1240	}
		1241
1161	#############################################################################	1242	#############################################################################
1162		1243
1163	package CFClient::UI::Button;	1244	package CFClient::UI::Button;
1164		1245
1165	our @ISA = CFClient::UI::Label::;	1246	our @ISA = CFClient::UI::Label::;
…		…
1195		1276
1196	sub _draw {	1277	sub _draw {
1197	my ($self) = @_;	1278	my ($self) = @_;
1198		1279
1199	local $self->{fg} = $self->{fg};	1280	local $self->{fg} = $self->{fg};
1200	my $tex = $tex[0];
1201
1202	glEnable GL_BLEND;
1203	glEnable GL_TEXTURE_2D;
1204	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205		1281
1206	if ($GRAB == $self) {	1282	if ($GRAB == $self) {
1207	$self->{fg} = $self->{active_fg};	1283	$self->{fg} = $self->{active_fg};
1208	}	1284	}
1209		1285
1210	glBindTexture GL_TEXTURE_2D, $tex->{name};	1286	glEnable GL_BLEND;
		1287	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1288	glEnable GL_TEXTURE_2D;
1211	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1289	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1290	glColor 0, 0, 0, 1;
1212		1291
1213	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	1292	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1214		1293
1215	glDisable GL_TEXTURE_2D;	1294	glDisable GL_TEXTURE_2D;
1216	glDisable GL_BLEND;	1295	glDisable GL_BLEND;
1217		1296
1218	$self->SUPER::_draw;	1297	$self->SUPER::_draw;
…		…
1221	#############################################################################	1300	#############################################################################
1222		1301
1223	package CFClient::UI::CheckBox;	1302	package CFClient::UI::CheckBox;
1224		1303
1225	our @ISA = CFClient::UI::DrawBG::;	1304	our @ISA = CFClient::UI::DrawBG::;
		1305
		1306	my @tex =
		1307	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1308	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1226		1309
1227	use SDL;	1310	use SDL;
1228	use SDL::OpenGL;	1311	use SDL::OpenGL;
1229		1312
1230	sub new {	1313	sub new {
…		…
1268	$self->SUPER::_draw;	1351	$self->SUPER::_draw;
1269		1352
1270	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1353	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1271		1354
1272	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1355	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1273		1356
1274	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1357	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1275		1358
1276	glBegin GL_LINE_LOOP;	1359	glEnable GL_BLEND;
1277	glVertex 0 , 0;	1360	glEnable GL_TEXTURE_2D;
1278	glVertex 0 , $s;	1361	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1279	glVertex $s, $s;
1280	glVertex $s, 0;
1281	glEnd;
1282		1362
1283	if ($self->{state}) {	1363	my $tex = $self->{state} ? $tex[1] : $tex[0];
1284	glBegin GL_LINES;	1364
1285	glVertex 0 , 0;	1365	$tex->draw_quad (0, 0, $s, $s);
1286	glVertex $s, $s;	1366
1287	glVertex $s, 0;	1367	glDisable GL_TEXTURE_2D;
1288	glVertex 0 , $s;	1368	glDisable GL_BLEND;
1289	glEnd;
1290	}
1291	}	1369	}
1292		1370
1293	#############################################################################	1371	#############################################################################
1294		1372
1295	package CFClient::UI::Slider;	1373	package CFClient::UI::Slider;
…		…
1297	use strict;	1375	use strict;
1298		1376
1299	use SDL::OpenGL;	1377	use SDL::OpenGL;
1300		1378
1301	our @ISA = CFClient::UI::DrawBG::;	1379	our @ISA = CFClient::UI::DrawBG::;
		1380
		1381	my @tex =
		1382	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1383	qw(s1_slider.png s1_slider_bg.png);
1302		1384
1303	sub new {	1385	sub new {
1304	my $class = shift;	1386	my $class = shift;
1305		1387
1306	# range [value, low, high, page]	1388	# range [value, low, high, page]
…		…
1314	range => [0, 0, 100, 10],	1396	range => [0, 0, 100, 10],
1315	req_w => 40,	1397	req_w => 40,
1316	req_h => 13,	1398	req_h => 13,
1317	vertical => 0,	1399	vertical => 0,
1318	can_hover => 1,	1400	can_hover => 1,
		1401	inner_pad => 5,
1319	@_	1402	@_
1320	);	1403	);
1321		1404
1322	$self	1405	$self
1323	}	1406	}
…		…
1344	if ($GRAB == $self) {	1427	if ($GRAB == $self) {
1345	my ($value, $lo, $hi, $page) = @{$self->{range}};	1428	my ($value, $lo, $hi, $page) = @{$self->{range}};
1346		1429
1347	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	1430	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1348		1431
		1432	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1433	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1434
		1435	$x -= $inner_pad_px; # substract the padding
1349	$x = $x * ($hi - $lo) / $w + $lo;	1436	$x = $x * ($hi - $lo) / $inner_w + $lo;
1350	$x = $lo if $x < $lo;	1437	$x = $lo if $x < $lo;
1351	$x = $hi - $page if $x > $hi - $page;	1438	$x = $hi - $page if $x > $hi - $page;
1352	$self->{range}[0] = $x;	1439	$self->{range}[0] = $x;
1353		1440
1354	$self->emit (changed => $x);	1441	$self->emit (changed => $x);
1355	$self->update;	1442	$self->update;
1356	}	1443	}
		1444	}
		1445
		1446	# the inner_* stuff is for generating a padding for the slider handle,
		1447	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1448	# correct propably, but it does the job for now
		1449	sub _calc_inner_pad_px {
		1450	my ($self, $w) = @_;
		1451	($w / 100) * $self->{inner_pad} # % to pixels
1357	}	1452	}
1358		1453
1359	sub _draw {	1454	sub _draw {
1360	my ($self) = @_;	1455	my ($self) = @_;
1361		1456
…		…
1375	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1470	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1376	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1471	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1377		1472
1378	my ($value, $lo, $hi, $page) = @{$self->{range}};	1473	my ($value, $lo, $hi, $page) = @{$self->{range}};
1379		1474
		1475	$hi = $value + 1 if $lo == $hi;
		1476
		1477	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1478	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1479
1380	$page = int $page * $w / ($hi - $lo);	1480	$page = int $page * $inner_w / ($hi - $lo);
1381	$value = int +($value - $lo) * $w / ($hi - $lo);	1481	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1382		1482
1383	$w -= $page;	1483	$w -= $page;
1384	$page &= ~1;	1484	$page &= ~1;
1385	glTranslate $page * 0.5, 0, 0;	1485	glTranslate $page * 0.5, 0, 0;
1386	$page \|\|= 2;	1486	$page \|\|= 2;
1387		1487
1388	glColor @$fg;
1389	glBegin GL_LINES;
1390	glVertex 0, 0; glVertex 0, $h;
1391	glVertex $w - 1, 0; glVertex $w - 1, $h;
1392	glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1393	glEnd;
1394
1395	my $knob_a = $value - $page * 0.5;	1488	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1396	my $knob_b = $value + $page * 0.5;	1489	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1397		1490
1398	glBegin GL_QUADS;	1491	glEnable GL_BLEND;
1399	glColor @$fg;	1492	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1400	glVertex $knob_a, 0;	1493	glEnable GL_TEXTURE_2D;
1401	glVertex $knob_a, $h;	1494	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1402	glVertex $knob_b, $h;
1403	glVertex $knob_b, 0;
1404		1495
1405	if ($knob_a < $knob_b - 2) {	1496	# draw background
1406	glColor @$bg;	1497	$tex[1]->draw_quad (0, 0, $w, $h);
1407	glVertex $knob_a + 1, 1;	1498
1408	glVertex $knob_a + 1, $h - 1;	1499	# draw handle
1409	glVertex $knob_b - 1, $h - 1;	1500	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1410	glVertex $knob_b - 1, 1;	1501
1411	}	1502	glDisable GL_BLEND;
1412	glEnd;	1503	glDisable GL_TEXTURE_2D;
1413	}	1504	}
1414		1505
1415	#############################################################################	1506	#############################################################################
1416		1507
1417	package CFClient::UI::TextView;	1508	package CFClient::UI::TextView;
…		…
1422		1513
1423	sub new {	1514	sub new {
1424	my $class = shift;	1515	my $class = shift;
1425		1516
1426	my $self = $class->SUPER::new (	1517	my $self = $class->SUPER::new (
		1518	req_w => $::WIDTH / 6,
		1519	req_h => $::HEIGHT / 6,
		1520	fontsize => $::FONTSIZE,
		1521	@_,
		1522
		1523	layout => (new CFClient::Layout),
1427	par => [],	1524	par => [],
1428	@_,	1525	height => 0,
1429	children => [	1526	children => [
1430	(new CFClient::UI::Empty expand => 1),	1527	(new CFClient::UI::Empty expand => 1),
1431	(new CFClient::UI::Slider vertical => 1),	1528	(new CFClient::UI::Slider vertical => 1),
1432	],	1529	],
1433	);	1530	);
1434		1531
		1532	$self->{children}[1]->connect (changed => sub {
		1533	$self->update;
		1534	});
		1535
1435	$self	1536	$self
		1537	}
		1538
		1539	sub set_fontsize {
		1540	my ($self, $fontsize) = @_;
		1541
		1542	$self->{fontsize} = $fontsize;
		1543	$self->reflow;
		1544	}
		1545
		1546	sub text_height {
		1547	my ($self, $text) = @_;
		1548
		1549	my $layout = $self->{layout};
		1550
		1551	$layout->set_height ($self->{fontsize});
		1552	$layout->set_width ($self->{w});
		1553	$layout->set_text ($text);
		1554
		1555	($layout->size)[1]
		1556	}
		1557
		1558	sub reflow {
		1559	my ($self) = @_;
		1560
		1561	$self->{need_reflow}++;
		1562	$self->update;
		1563	}
		1564
		1565	sub size_request {
		1566	my ($self) = @_;
		1567
		1568	($self->{req_w}, $self->{req_h})
		1569	}
		1570
		1571	sub size_allocate {
		1572	my ($self, $x, $y, $w, $h) = @_;
		1573
		1574	$self->SUPER::size_allocate ($x, $y, $w, $h);
		1575
		1576	$self->{layout}->set_height ($self->{fontsize});
		1577	$self->{layout}->set_width ($self->{w});
		1578
		1579	$self->reflow;
1436	}	1580	}
1437		1581
1438	sub add_paragraph {	1582	sub add_paragraph {
1439	my ($self, $color, $text) = @_;	1583	my ($self, $color, $text) = @_;
1440		1584
		1585	#TODO: intelligently "reformat" paragraph
		1586
		1587	my $height = $self->text_height ($text);
		1588
		1589	$self->{height} += $height;
		1590
1441	push @{$self->{par}}, [$color, $text];	1591	push @{$self->{par}}, [$height, $color, $text];
1442	my $count = scalar @{$self->{par}};	1592
1443	$self->{children}[1]{range} = [$count - 1, 0, $count, 1];	1593	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1444	$self->{children}[1]->update;	1594	$self->{children}[1]->update;
1445	}	1595	}
1446		1596
		1597	sub update {
		1598	my ($self) = @_;
		1599
		1600	$self->SUPER::update;
		1601
		1602	return unless $self->{h} > 0;
		1603
		1604	delete $self->{texture};
		1605
		1606	$ROOT->on_refresh ($self, sub {
		1607	if (delete $self->{need_reflow}) {
		1608	my $height = 0;
		1609
		1610	$height += $_->[0] = $self->text_height ($_->[2])
		1611	for @{$self->{par}};
		1612
		1613	$self->{height} = $height;
		1614
		1615	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1616
		1617	delete $self->{texture};
		1618	}
		1619
		1620	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		1621	glClearColor 0, 0, 0, 1;
		1622	glClear GL_COLOR_BUFFER_BIT;
		1623
		1624	glEnable GL_BLEND;
		1625	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1626	glEnable GL_TEXTURE_2D;
		1627	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1628
		1629	my $top = int $self->{children}[1]{range}[0];
		1630
		1631	my $y0 = $top;
		1632	my $y1 = $top + $self->{h};
		1633
		1634	my $y = 0;
		1635
		1636	my $layout = $self->{layout};
		1637
		1638	for my $par (@{$self->{par}}) {
		1639	my $h = $par->[0];
		1640
		1641	if ($y0 < $y + $h && $y < $y1) {
		1642	$layout->set_text ($par->[2]);
		1643
		1644	glColor @{ $par->[1] };
		1645	my ($W, $H) = $layout->size;
		1646	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1647	}
		1648
		1649	$y += $h;
		1650	}
		1651
		1652	glDisable GL_TEXTURE_2D;
		1653	glDisable GL_BLEND;
		1654	};
		1655	});
		1656	}
		1657
1447	sub _draw {	1658	sub _draw {
1448	my ($self) = @_;	1659	my ($self) = @_;
1449		1660
1450	my $par = $self->{par};	1661	if ($self->{texture}) {
1451
1452	my $bottom = (scalar @$par) - 1;
1453
1454	my $w = $self->{children}[0]{w};
1455	my $y = $self->{h};
1456
1457	glEnable GL_BLEND;
1458	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1459	glEnable GL_TEXTURE_2D;	1662	glEnable GL_TEXTURE_2D;
1460	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1663	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1461		1664	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1462	# TODO: everything!
1463	while ($y > 0 && $bottom >= 0) {
1464	my $par = $par->[$bottom--];
1465
1466	my $layout = new CFClient::Layout;
1467
1468	$layout->set_height ($::FONTSIZE);
1469	$layout->set_width ($w);
1470	$layout->set_text ($par->[1]);
1471	my $tex = new_from_layout CFClient::Texture $layout;
1472	$y -= $tex->{h};
1473
1474	glColor @{ $par->[0] };
1475	$tex->draw_quad (0, $y);
1476	}
1477
1478	glDisable GL_TEXTURE_2D;	1665	glDisable GL_TEXTURE_2D;
1479	glDisable GL_BLEND;	1666	}
		1667
		1668	$self->{children}[1]->draw;
		1669
1480	}	1670	}
1481		1671
1482	#############################################################################	1672	#############################################################################
1483		1673
1484	package CFClient::UI::MapWidget;	1674	package CFClient::UI::MapWidget;
…		…
1508	}	1698	}
1509		1699
1510	sub key_up {	1700	sub key_up {
1511	}	1701	}
1512		1702
		1703	sub button_down {
		1704	my ($self, $ev, $x, $y) = @_;
		1705
		1706	$self->focus_in;
		1707
		1708	if ($ev->button == 2) {
		1709	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1710	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1711
		1712	$self->{motion} = sub {
		1713	my ($ev, $x, $y) = @_;
		1714
		1715	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1716
		1717	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1718	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1719
		1720	$self->update;
		1721	};
		1722	}
		1723	}
		1724
		1725	sub button_up {
		1726	my ($self, $ev, $x, $y) = @_;
		1727
		1728	delete $self->{motion};
		1729	}
		1730
		1731	sub mouse_motion {
		1732	my ($self, $ev, $x, $y) = @_;
		1733
		1734	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1735	}
		1736
1513	sub size_request {	1737	sub size_request {
1514	(	1738	(
1515	1 + 32 * int $::WIDTH / 32,	1739	1 + 32 * int $::WIDTH / 32,
1516	1 + 32 * int $::HEIGHT / 32,	1740	1 + 32 * int $::HEIGHT / 32,
1517	)	1741	)
…		…
1525	}	1749	}
1526		1750
1527	sub draw {	1751	sub draw {
1528	my ($self) = @_;	1752	my ($self) = @_;
1529		1753
1530	$self->{need_update}++;#d#
1531	if (delete $self->{need_update}) {	1754	if (delete $self->{need_update}) {
1532	glNewList $self->{list}, GL_COMPILE;	1755	glNewList $self->{list}, GL_COMPILE;
1533		1756
1534	my $sw = int $::WIDTH / 32;
1535	my $sh = int $::HEIGHT / 32;
1536
1537	if ($::MAP) {	1757	if ($::MAP) {
		1758	my $sw = int $::WIDTH / 32;
		1759	my $sh = int $::HEIGHT / 32;
		1760
		1761	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
		1762	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
		1763
		1764	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1765
1538	my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);	1766	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1539		1767
1540	if ($::CFG->{fow_enable}) {	1768	if ($::CFG->{fow_enable}) {
1541	if ($::CFG->{fow_smooth}) { # smooth fog of war	1769	if ($::CFG->{fow_smooth}) { # smooth fog of war
1542	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;	1770	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1543	glConvolutionFilter2D	1771	glConvolutionFilter2D
…		…
1551	0.1, 0.1, 0.1,	1779	0.1, 0.1, 0.1,
1552	;	1780	;
1553	glEnable GL_CONVOLUTION_2D;	1781	glEnable GL_CONVOLUTION_2D;
1554	}	1782	}
1555		1783
1556	my $tex = new CFClient::Texture	1784	$self->{fow_texture} = new CFClient::Texture
1557	w => $w,	1785	w => $w,
1558	h => $h,	1786	h => $h,
1559	data => $data,	1787	data => $data,
1560	internalformat => GL_ALPHA,	1788	internalformat => GL_ALPHA,
1561	format => GL_ALPHA;	1789	format => GL_ALPHA;
1562		1790
1563	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	1791	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1564		1792
1565	glEnable GL_BLEND;	1793	glEnable GL_BLEND;
		1794	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1566	glEnable GL_TEXTURE_2D;	1795	glEnable GL_TEXTURE_2D;
1567	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1796	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1568		1797
1569	glColor +($::CFG->{fow_intensity}) x 3, 1;	1798	glColor +($::CFG->{fow_intensity}) x 3, 1;
1570	$tex->draw_quad (0, 0, $w * 32, $h * 32);	1799	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1571		1800
1572	glDisable GL_TEXTURE_2D;	1801	glDisable GL_TEXTURE_2D;
1573	glDisable GL_BLEND;	1802	glDisable GL_BLEND;
1574	}	1803	}
		1804
		1805	# HACK BEGIN
		1806	{
		1807	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1808	my ($w, $h) = (250, 250);
		1809
		1810	glEnable GL_BLEND;
		1811	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1812	glEnable GL_TEXTURE_2D;
		1813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1814
		1815	$self->{mapmap_texture} =
		1816	new CFClient::Texture
		1817	w => $w,
		1818	h => $h,
		1819	data => $::MAP->mapmap ($w, $h),
		1820	type => GL_UNSIGNED_INT_8_8_8_8_REV;
		1821
		1822	$self->{mapmap_texture}->draw_quad (100, 100);
		1823
		1824	glDisable GL_TEXTURE_2D;
		1825	glDisable GL_BLEND;
		1826	}
		1827	# HACK END
1575	}	1828	}
1576		1829
1577	glEndList;	1830	glEndList;
1578	}	1831	}
1579		1832
		1833	glPushMatrix;
1580	glCallList $self->{list};	1834	glCallList $self->{list};
		1835	glPopMatrix;
1581		1836
1582	if ($FOCUS != $self) {	1837	if ($FOCUS != $self) {
1583	glColor 64/255, 64/255, 64/255;	1838	glColor 64/255, 64/255, 64/255;
1584	glLogicOp GL_AND;	1839	glLogicOp GL_AND;
1585	glEnable GL_COLOR_LOGIC_OP;	1840	glEnable GL_COLOR_LOGIC_OP;
…		…
1617		1872
1618	if ($sym == SDLK_KP5) {	1873	if ($sym == SDLK_KP5) {
1619	$::CONN->user_send ("command stay fire");	1874	$::CONN->user_send ("command stay fire");
1620	} elsif ($sym == SDLK_a) {	1875	} elsif ($sym == SDLK_a) {
1621	$::CONN->user_send ("command apply");	1876	$::CONN->user_send ("command apply");
		1877	} elsif ($sym == SDLK_QUOTE) {
		1878	$self->emit ('activate_console');
		1879	} elsif ($sym == SDLK_SLASH) {
		1880	$self->emit ('activate_console' => '/');
1622	} elsif (exists $DIR{$sym}) {	1881	} elsif (exists $DIR{$sym}) {
1623	if ($mod & KMOD_SHIFT) {	1882	if ($mod & KMOD_SHIFT) {
1624	$self->{shft}++;	1883	$self->{shft}++;
1625	$::CONN->user_send ("command fire $DIR{$sym}[0]");	1884	$::CONN->user_send ("command fire $DIR{$sym}[0]");
1626	} elsif ($mod & KMOD_CTRL) {	1885	} elsif ($mod & KMOD_CTRL) {
…		…
1714	sub toggle_flopper {	1973	sub toggle_flopper {
1715	my ($self) = @_;	1974	my ($self) = @_;
1716		1975
1717	# TODO: use animation	1976	# TODO: use animation
1718	if ($self->{state} = !$self->{state}) {	1977	if ($self->{state} = !$self->{state}) {
1719	$CFClient::UI::TOPLEVEL->add ($self->{other});	1978	$CFClient::UI::ROOT->add ($self->{other});
1720	$self->{other}->move (	1979	$self->{other}->move ($self->coord2global (0, $self->{h}));
1721	($::WIDTH - $self->{other}{w}) * 0.5,	1980	$self->emit ("open");
1722	($::HEIGHT - $self->{other}{h}) * 0.5,
1723	);
1724	} else {	1981	} else {
1725	$CFClient::UI::TOPLEVEL->remove ($self->{other});	1982	$CFClient::UI::ROOT->remove ($self->{other});
		1983	$self->emit ("close");
1726	}	1984	}
1727	}
1728		1985
1729	#############################################################################	1986	$self->emit (changed => $self->{state});
		1987	}
1730		1988
		1989	#############################################################################
		1990
1731	package CFClient::UI::Toplevel;	1991	package CFClient::UI::Root;
1732		1992
1733	our @ISA = CFClient::UI::Container::;	1993	our @ISA = CFClient::UI::Container::;
		1994
		1995	use SDL::OpenGL;
1734		1996
1735	sub size_request {	1997	sub size_request {
1736	($::WIDTH, $::HEIGHT)	1998	($::WIDTH, $::HEIGHT)
1737	}	1999	}
1738		2000
…		…
1743		2005
1744	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	2006	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1745	for @{$self->{children}};	2007	for @{$self->{children}};
1746	}	2008	}
1747		2009
1748	sub translate {	2010	sub _topleft {
1749	my ($self, $x, $y) = @_;	2011	my ($self, $x, $y) = @_;
1750		2012
1751	($x, $y)	2013	($x, $y)
1752	}	2014	}
1753		2015
…		…
1761	sub add {	2023	sub add {
1762	my ($self, $widget) = @_;	2024	my ($self, $widget) = @_;
1763		2025
1764	$self->SUPER::add ($widget);	2026	$self->SUPER::add ($widget);
1765		2027
1766	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	2028	$widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
		2029	}
		2030
		2031	sub on_refresh {
		2032	my ($self, $id, $cb) = @_;
		2033
		2034	$self->{refresh_hook}{$id} = $cb;
1767	}	2035	}
1768		2036
1769	sub draw {	2037	sub draw {
1770	my ($self) = @_;	2038	my ($self) = @_;
1771		2039
		2040	while (my $rcb = delete $self->{refresh_hook}) {
		2041	$_->() for values %$rcb;
		2042	}
		2043
		2044	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2045	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2046	glClear GL_COLOR_BUFFER_BIT;
		2047
		2048	glMatrixMode GL_PROJECTION;
		2049	glLoadIdentity;
		2050	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2051	glMatrixMode GL_MODELVIEW;
		2052	glLoadIdentity;
		2053
1772	$self->_draw;	2054	$self->_draw;
1773	}	2055	}
1774		2056
1775	#############################################################################	2057	#############################################################################
1776		2058
1777	package CFClient::UI;	2059	package CFClient::UI;
1778		2060
1779	$TOPLEVEL = new CFClient::UI::Toplevel;	2061	$ROOT = new CFClient::UI::Root;
1780		2062
1781	1	2063	1
1782		2064

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.98 by root, Fri Apr 14 02:06:22 2006 UTC vs. Revision 1.119 by root, Sun Apr 16 07:25:30 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.98 by root, Fri Apr 14 02:06:22 2006 UTC vs.
Revision 1.119 by root, Sun Apr 16 07:25:30 2006 UTC