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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.99 by elmex, Fri Apr 14 10:57:35 2006 UTC vs.
Revision 1.114 by root, Sat Apr 15 13:56:25 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;
…		…
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
…		…
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;
678	$self->update;	709	$self->update;
679	}	710	}
680		711
…		…
727	my $col_expand = (sum @col_expand) \|\| 1;	758	my $col_expand = (sum @col_expand) \|\| 1;
728		759
729	# linearly scale sizes	760	# linearly scale sizes
730	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	761	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
731	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;	762	$hs->[$_] = 1 $h / $req_h for 0 .. $#$hs;
		763
		764	CFClient::UI::harmonize $ws;
		765	CFClient::UI::harmonize $hs;
732		766
733	my $y;	767	my $y;
734		768
735	for my $r (0 .. $#{$self->{children}}) {	769	for my $r (0 .. $#{$self->{children}}) {
736	my $row = $self->{children}[$r]	770	my $row = $self->{children}[$r]
…		…
824	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	858	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825	$h[$_] = $alloc_h;	859	$h[$_] = $alloc_h;
826	}	860	}
827	}	861	}
828		862
		863	CFClient::UI::harmonize \@h;
		864
829	my $y = 0;	865	my $y = 0;
830	for (0 .. $#$children) {	866	for (0 .. $#$children) {
831	my $child = $children->[$_];	867	my $child = $children->[$_];
832	my $h = $h[$_];	868	my $h = $h[$_];
833	$child->size_allocate ($y, 0, $h, $w);	869	$child->size_allocate ($y, 0, $h, $w);
…		…
878		914
879	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	915	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
880	}	916	}
881	}	917	}
882		918
		919	CFClient::UI::harmonize \@h;
		920
883	my $y = 0;	921	my $y = 0;
884	for (0 .. $#$children) {	922	for (0 .. $#$children) {
885	my $child = $children->[$_];	923	my $child = $children->[$_];
886	my $h = $h[$_];	924	my $h = $h[$_];
887	$child->size_allocate (0, $y, $w, $h);	925	$child->size_allocate (0, $y, $w, $h);
…		…
900		938
901	sub new {	939	sub new {
902	my ($class, %arg) = @_;	940	my ($class, %arg) = @_;
903		941
904	my $self = $class->SUPER::new (	942	my $self = $class->SUPER::new (
905	fg => [1, 1, 1],	943	fg => [1, 1, 1],
906	height => $::FONTSIZE,	944	fontsize => $::FONTSIZE,
907	text => "",	945	text => "",
908	align => -1,	946	align => -1,
909	padding => 2,	947	padding => 2,
910	layout => new CFClient::Layout,	948	layout => new CFClient::Layout,
911	%arg	949	%arg
912	);	950	);
913		951
914	$self->set_text ($self->{text});	952	$self->set_text ($self->{text});
915		953
…		…
945		983
946	sub size_request {	984	sub size_request {
947	my ($self) = @_;	985	my ($self) = @_;
948		986
949	$self->{layout}->set_width;	987	$self->{layout}->set_width;
950	$self->{layout}->set_height ($self->{height});	988	$self->{layout}->set_height ($self->{fontsize});
951	my ($w, $h) = $self->{layout}->size;	989	my ($w, $h) = $self->{layout}->size;
952		990
953	(	991	(
954	$w + $self->{padding} * 2,	992	$w + $self->{padding} * 2,
955	$h + $self->{padding} * 2,	993	$h + $self->{padding} * 2,
…		…
974	sub _draw {	1012	sub _draw {
975	my ($self) = @_;	1013	my ($self) = @_;
976		1014
977	my $tex = $self->{texture} \|\|= do {	1015	my $tex = $self->{texture} \|\|= do {
978	$self->{layout}->set_width ($self->{w});	1016	$self->{layout}->set_width ($self->{w});
979	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});	1017	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
980	new_from_layout CFClient::Texture $self->{layout}	1018	new_from_layout CFClient::Texture $self->{layout}
981	};	1019	};
982		1020
983	glEnable GL_BLEND;	1021	glEnable GL_BLEND;
984	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1022	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
985	glEnable GL_TEXTURE_2D;	1023	glEnable GL_TEXTURE_2D;
986	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1024	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
987		1025
988	glColor @{$self->{fg}};	1026	glColor @{$self->{fg}};
989		1027
990	my $x =	1028	my $x =
991	$self->{align} < 0 ? $self->{padding}	1029	$self->{align} < 0 ? $self->{padding}
992	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1030	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
993	: ($self->{w} - $tex->{w}) * 0.5;	1031	: ($self->{w} - $tex->{w}) * 0.5;
994		1032
995	glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;	1033	$tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
996	$tex->draw_quad (0, 0);
997		1034
998	glDisable GL_TEXTURE_2D;	1035	glDisable GL_TEXTURE_2D;
999	glDisable GL_BLEND;	1036	glDisable GL_BLEND;
1000	}	1037	}
1001		1038
…		…
1023	}	1060	}
1024		1061
1025	sub _set_text {	1062	sub _set_text {
1026	my ($self, $text) = @_;	1063	my ($self, $text) = @_;
1027		1064
		1065	my $old_text = $self->{text};
		1066
1028	$self->{last_activity} = $::NOW;	1067	$self->{last_activity} = $::NOW;
1029		1068
1030	$self->{text} = $text;	1069	$self->{text} = $text;
1031	$self->{layout}->set_width ($self->{w});	1070	$self->{layout}->set_width ($self->{w});
1032	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});	1071	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1033		1072
1034	$text =~ s/./*/g if $self->{hidden};	1073	$text =~ s/./*/g if $self->{hidden};
1035		1074
1036	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1075	$self->{layout}->set_markup ($self->escape_text ($text) . " ");
1037		1076
1038	$text = substr $text, 0, $self->{cursor};	1077	$text = substr $text, 0, $self->{cursor};
1039	utf8::encode $text;	1078	utf8::encode $text;
1040		1079
1041	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);	1080	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
		1081
		1082	$self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
		1083	if $old_text ne $self->{text};
1042	}	1084	}
1043		1085
1044	sub size_request {	1086	sub size_request {
1045	my ($self) = @_;	1087	my ($self) = @_;
1046		1088
…		…
1085	++$self->{cursor} if $self->{cursor} < length $self->{text};	1127	++$self->{cursor} if $self->{cursor} < length $self->{text};
1086	} elsif ($sym == SDLK_HOME) {	1128	} elsif ($sym == SDLK_HOME) {
1087	$self->{cursor} = 0;	1129	$self->{cursor} = 0;
1088	} elsif ($sym == SDLK_END) {	1130	} elsif ($sym == SDLK_END) {
1089	$self->{cursor} = length $text;	1131	$self->{cursor} = length $text;
		1132	} elsif ($sym == SDLK_ESCAPE) {
		1133	$self->emit ('escape');
1090	} elsif ($uni) {	1134	} elsif ($uni) {
1091	substr $text, $self->{cursor}++, 0, chr $uni;	1135	substr $text, $self->{cursor}++, 0, chr $uni;
1092	}	1136	}
1093		1137
1094	$self->_set_text ($text);	1138	$self->_set_text ($text);
…		…
1244		1288
1245	package CFClient::UI::CheckBox;	1289	package CFClient::UI::CheckBox;
1246		1290
1247	our @ISA = CFClient::UI::DrawBG::;	1291	our @ISA = CFClient::UI::DrawBG::;
1248		1292
		1293	my @tex =
		1294	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1295	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		1296
1249	use SDL;	1297	use SDL;
1250	use SDL::OpenGL;	1298	use SDL::OpenGL;
1251		1299
1252	sub new {	1300	sub new {
1253	my $class = shift;	1301	my $class = shift;
…		…
1290	$self->SUPER::_draw;	1338	$self->SUPER::_draw;
1291		1339
1292	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1340	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1293		1341
1294	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1342	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1295		1343
1296	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1344	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1297		1345
1298	glBegin GL_LINE_LOOP;	1346	glEnable GL_BLEND;
1299	glVertex 0 , 0;	1347	glEnable GL_TEXTURE_2D;
1300	glVertex 0 , $s;	1348	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1301	glVertex $s, $s;
1302	glVertex $s, 0;
1303	glEnd;
1304		1349
1305	if ($self->{state}) {	1350	my $tex = $self->{state} ? $tex[1] : $tex[0];
1306	glBegin GL_LINES;	1351
1307	glVertex 0 , 0;	1352	$tex->draw_quad (0, 0, $s, $s);
1308	glVertex $s, $s;	1353
1309	glVertex $s, 0;	1354	glDisable GL_TEXTURE_2D;
1310	glVertex 0 , $s;	1355	glDisable GL_BLEND;
1311	glEnd;
1312	}
1313	}	1356	}
1314		1357
1315	#############################################################################	1358	#############################################################################
1316		1359
1317	package CFClient::UI::Slider;	1360	package CFClient::UI::Slider;
…		…
1340	range => [0, 0, 100, 10],	1383	range => [0, 0, 100, 10],
1341	req_w => 40,	1384	req_w => 40,
1342	req_h => 13,	1385	req_h => 13,
1343	vertical => 0,	1386	vertical => 0,
1344	can_hover => 1,	1387	can_hover => 1,
		1388	inner_pad => 5,
1345	@_	1389	@_
1346	);	1390	);
1347		1391
1348	$self	1392	$self
1349	}	1393	}
…		…
1370	if ($GRAB == $self) {	1414	if ($GRAB == $self) {
1371	my ($value, $lo, $hi, $page) = @{$self->{range}};	1415	my ($value, $lo, $hi, $page) = @{$self->{range}};
1372		1416
1373	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	1417	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1374		1418
		1419	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1420	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1421
		1422	$x -= $inner_pad_px; # substract the padding
1375	$x = $x * ($hi - $lo) / $w + $lo;	1423	$x = $x * ($hi - $lo) / $inner_w + $lo;
1376	$x = $lo if $x < $lo;	1424	$x = $lo if $x < $lo;
1377	$x = $hi - $page if $x > $hi - $page;	1425	$x = $hi - $page if $x > $hi - $page;
1378	$self->{range}[0] = $x;	1426	$self->{range}[0] = $x;
1379		1427
1380	$self->emit (changed => $x);	1428	$self->emit (changed => $x);
1381	$self->update;	1429	$self->update;
1382	}	1430	}
		1431	}
		1432
		1433	# the inner_* stuff is for generating a padding for the slider handle,
		1434	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1435	# correct propably, but it does the job for now
		1436	sub _calc_inner_pad_px {
		1437	my ($self, $w) = @_;
		1438	($w / 100) * $self->{inner_pad} # % to pixels
1383	}	1439	}
1384		1440
1385	sub _draw {	1441	sub _draw {
1386	my ($self) = @_;	1442	my ($self) = @_;
1387		1443
…		…
1401	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1457	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1402	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1458	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1403		1459
1404	my ($value, $lo, $hi, $page) = @{$self->{range}};	1460	my ($value, $lo, $hi, $page) = @{$self->{range}};
1405		1461
1406	# the inner_* stuff is for generating a padding for the slider handle,	1462	$hi = $value + 1 if $lo == $hi;
1407	# so that the handle doesn't leave the texture. This calculation isn't 100%	1463
1408	# correct propably, but it does the job for now	1464	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1409	my $inner_pad = 5; # 5% of width for slider bg texture border
1410	my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
1411	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	1465	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1412		1466
1413	$page = int $page * $inner_w / ($hi - $lo);	1467	$page = int $page * $inner_w / ($hi - $lo);
1414	$value = int +($value - $lo) * $inner_w / ($hi - $lo);	1468	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1415		1469
1416	$w -= $page;	1470	$w -= $page;
…		…
1446		1500
1447	sub new {	1501	sub new {
1448	my $class = shift;	1502	my $class = shift;
1449		1503
1450	my $self = $class->SUPER::new (	1504	my $self = $class->SUPER::new (
		1505	req_w => $::WIDTH / 6,
		1506	req_h => $::HEIGHT / 6,
		1507	fontsize => $::FONTSIZE,
		1508	@_,
		1509
		1510	layout => (new CFClient::Layout),
1451	par => [],	1511	par => [],
1452	@_,	1512	height => 0,
1453	children => [	1513	children => [
1454	(new CFClient::UI::Empty expand => 1),	1514	(new CFClient::UI::Empty expand => 1),
1455	(new CFClient::UI::Slider vertical => 1),	1515	(new CFClient::UI::Slider vertical => 1),
1456	],	1516	],
1457	);	1517	);
1458		1518
		1519	$self->{children}[1]->connect (changed => sub {
		1520	$self->update;
		1521	});
		1522
1459	$self	1523	$self
		1524	}
		1525
		1526	sub set_fontsize {
		1527	my ($self, $fontsize) = @_;
		1528
		1529	$self->{fontsize} = $fontsize;
		1530	$self->reflow;
		1531	}
		1532
		1533	sub text_height {
		1534	my ($self, $text) = @_;
		1535
		1536	my $layout = $self->{layout};
		1537
		1538	$layout->set_height ($self->{fontsize});
		1539	$layout->set_width ($self->{w});
		1540	$layout->set_text ($text);
		1541
		1542	($layout->size)[1]
		1543	}
		1544
		1545	sub reflow {
		1546	my ($self) = @_;
		1547
		1548	$self->{need_reflow}++;
		1549	$self->update;
		1550	}
		1551
		1552	sub size_request {
		1553	my ($self) = @_;
		1554
		1555	($self->{req_w}, $self->{req_h})
		1556	}
		1557
		1558	sub size_allocate {
		1559	my ($self, $x, $y, $w, $h) = @_;
		1560
		1561	$self->SUPER::size_allocate ($x, $y, $w, $h);
		1562
		1563	$self->{layout}->set_height ($self->{fontsize});
		1564	$self->{layout}->set_width ($self->{w});
		1565
		1566	$self->reflow;
1460	}	1567	}
1461		1568
1462	sub add_paragraph {	1569	sub add_paragraph {
1463	my ($self, $color, $text) = @_;	1570	my ($self, $color, $text) = @_;
1464		1571
		1572	#TODO: intelligently "reformat" paragraph
		1573
		1574	my $height = $self->text_height ($text);
		1575
		1576	$self->{height} += $height;
		1577
1465	push @{$self->{par}}, [$color, $text];	1578	push @{$self->{par}}, [$height, $color, $text];
1466	my $count = scalar @{$self->{par}};	1579
1467	$self->{children}[1]{range} = [$count - 1, 0, $count, 1];	1580	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1468	$self->{children}[1]->update;	1581	$self->{children}[1]->update;
1469	}	1582	}
1470		1583
		1584	sub update {
		1585	my ($self) = @_;
		1586
		1587	$self->SUPER::update;
		1588
		1589	return unless $self->{h} > 0;
		1590
		1591	delete $self->{texture};
		1592
		1593	$ROOT->on_refresh ($self, sub {
		1594	if (delete $self->{need_reflow}) {
		1595	my $height = 0;
		1596
		1597	$height += $_->[0] = $self->text_height ($_->[2])
		1598	for @{$self->{par}};
		1599
		1600	$self->{height} = $height;
		1601
		1602	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1603
		1604	delete $self->{texture};
		1605	}
		1606
		1607	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		1608	glClearColor 0, 0, 0, 1;
		1609	glClear GL_COLOR_BUFFER_BIT;
		1610
		1611	glEnable GL_BLEND;
		1612	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1613	glEnable GL_TEXTURE_2D;
		1614	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1615
		1616	my $top = int $self->{children}[1]{range}[0];
		1617
		1618	my $y0 = $top;
		1619	my $y1 = $top + $self->{h};
		1620
		1621	my $y = 0;
		1622
		1623	my $layout = $self->{layout};
		1624
		1625	for my $par (@{$self->{par}}) {
		1626	my $h = $par->[0];
		1627
		1628	if ($y0 < $y + $h && $y < $y1) {
		1629	$layout->set_text ($par->[2]);
		1630
		1631	glColor @{ $par->[1] };
		1632	my ($W, $H) = $layout->size;
		1633	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1634	}
		1635
		1636	$y += $h;
		1637	}
		1638
		1639	glDisable GL_TEXTURE_2D;
		1640	glDisable GL_BLEND;
		1641	};
		1642	});
		1643	}
		1644
1471	sub _draw {	1645	sub _draw {
1472	my ($self) = @_;	1646	my ($self) = @_;
1473		1647
1474	my $par = $self->{par};	1648	if ($self->{texture}) {
1475
1476	my $bottom = (scalar @$par) - 1;
1477
1478	my $w = $self->{children}[0]{w};
1479	my $y = $self->{h};
1480
1481	glEnable GL_BLEND;
1482	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1483	glEnable GL_TEXTURE_2D;	1649	glEnable GL_TEXTURE_2D;
1484	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1650	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1485		1651	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1486	# TODO: everything!
1487	while ($y > 0 && $bottom >= 0) {
1488	my $par = $par->[$bottom--];
1489
1490	my $layout = new CFClient::Layout;
1491
1492	$layout->set_height ($::FONTSIZE);
1493	$layout->set_width ($w);
1494	$layout->set_text ($par->[1]);
1495	my $tex = new_from_layout CFClient::Texture $layout;
1496	$y -= $tex->{h};
1497
1498	glColor @{ $par->[0] };
1499	$tex->draw_quad (0, $y);
1500	}
1501
1502	glDisable GL_TEXTURE_2D;	1652	glDisable GL_TEXTURE_2D;
1503	glDisable GL_BLEND;	1653	}
		1654
		1655	$self->{children}[1]->draw;
		1656
1504	}	1657	}
1505		1658
1506	#############################################################################	1659	#############################################################################
1507		1660
1508	package CFClient::UI::MapWidget;	1661	package CFClient::UI::MapWidget;
…		…
1532	}	1685	}
1533		1686
1534	sub key_up {	1687	sub key_up {
1535	}	1688	}
1536		1689
		1690	sub button_down {
		1691	my ($self, $ev, $x, $y) = @_;
		1692
		1693	$self->focus_in;
		1694
		1695	if ($ev->button == 2) {
		1696	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1697	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1698
		1699	$self->{motion} = sub {
		1700	my ($ev, $x, $y) = @_;
		1701
		1702	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1703
		1704	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1705	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1706
		1707	$self->update;
		1708	};
		1709	}
		1710	}
		1711
		1712	sub button_up {
		1713	my ($self, $ev, $x, $y) = @_;
		1714
		1715	delete $self->{motion};
		1716	}
		1717
		1718	sub mouse_motion {
		1719	my ($self, $ev, $x, $y) = @_;
		1720
		1721	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1722	}
		1723
1537	sub size_request {	1724	sub size_request {
1538	(	1725	(
1539	1 + 32 * int $::WIDTH / 32,	1726	1 + 32 * int $::WIDTH / 32,
1540	1 + 32 * int $::HEIGHT / 32,	1727	1 + 32 * int $::HEIGHT / 32,
1541	)	1728	)
…		…
1549	}	1736	}
1550		1737
1551	sub draw {	1738	sub draw {
1552	my ($self) = @_;	1739	my ($self) = @_;
1553		1740
1554	$self->{need_update}++;#d#
1555	if (delete $self->{need_update}) {	1741	if (delete $self->{need_update}) {
1556	glNewList $self->{list}, GL_COMPILE;	1742	glNewList $self->{list}, GL_COMPILE;
1557		1743
1558	my $sw = int $::WIDTH / 32;
1559	my $sh = int $::HEIGHT / 32;
1560
1561	if ($::MAP) {	1744	if ($::MAP) {
		1745	my $sw = int $::WIDTH / 32;
		1746	my $sh = int $::HEIGHT / 32;
		1747
		1748	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
		1749	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
		1750
		1751	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1752
1562	my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);	1753	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1563		1754
1564	if ($::CFG->{fow_enable}) {	1755	if ($::CFG->{fow_enable}) {
1565	if ($::CFG->{fow_smooth}) { # smooth fog of war	1756	if ($::CFG->{fow_smooth}) { # smooth fog of war
1566	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;	1757	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1567	glConvolutionFilter2D	1758	glConvolutionFilter2D
…		…
1585	format => GL_ALPHA;	1776	format => GL_ALPHA;
1586		1777
1587	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	1778	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1588		1779
1589	glEnable GL_BLEND;	1780	glEnable GL_BLEND;
		1781	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1590	glEnable GL_TEXTURE_2D;	1782	glEnable GL_TEXTURE_2D;
1591	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1783	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1592		1784
1593	glColor +($::CFG->{fow_intensity}) x 3, 1;	1785	glColor +($::CFG->{fow_intensity}) x 3, 1;
1594	$tex->draw_quad (0, 0, $w * 32, $h * 32);	1786	$tex->draw_quad (0, 0, $w * 32, $h * 32);
1595		1787
1596	glDisable GL_TEXTURE_2D;	1788	glDisable GL_TEXTURE_2D;
1597	glDisable GL_BLEND;	1789	glDisable GL_BLEND;
1598	}	1790	}
		1791
		1792	# HACK BEGIN
		1793	{
		1794	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1795	my ($w, $h) = (250, 250);
		1796
		1797	glEnable GL_BLEND;
		1798	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1799	glEnable GL_TEXTURE_2D;
		1800	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1801
		1802	CFClient::Texture->new (
		1803	w => $w,
		1804	h => $h,
		1805	data => $::MAP->mapmap ($w, $h),
		1806	type => GL_UNSIGNED_INT_8_8_8_8_REV
		1807	)->draw_quad (100, 100);
		1808
		1809	glDisable GL_TEXTURE_2D;
		1810	glDisable GL_BLEND;
		1811	}
		1812	# HACK END
1599	}	1813	}
1600		1814
1601	glEndList;	1815	glEndList;
1602	}	1816	}
1603		1817
		1818	glPushMatrix;
1604	glCallList $self->{list};	1819	glCallList $self->{list};
		1820	glPopMatrix;
1605		1821
1606	if ($FOCUS != $self) {	1822	if ($FOCUS != $self) {
1607	glColor 64/255, 64/255, 64/255;	1823	glColor 64/255, 64/255, 64/255;
1608	glLogicOp GL_AND;	1824	glLogicOp GL_AND;
1609	glEnable GL_COLOR_LOGIC_OP;	1825	glEnable GL_COLOR_LOGIC_OP;
…		…
1641		1857
1642	if ($sym == SDLK_KP5) {	1858	if ($sym == SDLK_KP5) {
1643	$::CONN->user_send ("command stay fire");	1859	$::CONN->user_send ("command stay fire");
1644	} elsif ($sym == SDLK_a) {	1860	} elsif ($sym == SDLK_a) {
1645	$::CONN->user_send ("command apply");	1861	$::CONN->user_send ("command apply");
		1862	} elsif ($sym == SDLK_QUOTE) {
		1863	$self->emit ('activate_console');
		1864	} elsif ($sym == SDLK_SLASH) {
		1865	$self->emit ('activate_console' => '/');
1646	} elsif (exists $DIR{$sym}) {	1866	} elsif (exists $DIR{$sym}) {
1647	if ($mod & KMOD_SHIFT) {	1867	if ($mod & KMOD_SHIFT) {
1648	$self->{shft}++;	1868	$self->{shft}++;
1649	$::CONN->user_send ("command fire $DIR{$sym}[0]");	1869	$::CONN->user_send ("command fire $DIR{$sym}[0]");
1650	} elsif ($mod & KMOD_CTRL) {	1870	} elsif ($mod & KMOD_CTRL) {
…		…
1738	sub toggle_flopper {	1958	sub toggle_flopper {
1739	my ($self) = @_;	1959	my ($self) = @_;
1740		1960
1741	# TODO: use animation	1961	# TODO: use animation
1742	if ($self->{state} = !$self->{state}) {	1962	if ($self->{state} = !$self->{state}) {
1743	$CFClient::UI::TOPLEVEL->add ($self->{other});	1963	$CFClient::UI::ROOT->add ($self->{other});
1744	$self->{other}->move (	1964	$self->{other}->move ($self->coord2global (0, $self->{h}));
1745	($::WIDTH - $self->{other}{w}) * 0.5,	1965	$self->emit ("open");
1746	($::HEIGHT - $self->{other}{h}) * 0.5,
1747	);
1748	} else {	1966	} else {
1749	$CFClient::UI::TOPLEVEL->remove ($self->{other});	1967	$CFClient::UI::ROOT->remove ($self->{other});
		1968	$self->emit ("close");
1750	}	1969	}
1751	}
1752		1970
1753	#############################################################################	1971	$self->emit (changed => $self->{state});
		1972	}
1754		1973
		1974	#############################################################################
		1975
1755	package CFClient::UI::Toplevel;	1976	package CFClient::UI::Root;
1756		1977
1757	our @ISA = CFClient::UI::Container::;	1978	our @ISA = CFClient::UI::Container::;
		1979
		1980	use SDL::OpenGL;
1758		1981
1759	sub size_request {	1982	sub size_request {
1760	($::WIDTH, $::HEIGHT)	1983	($::WIDTH, $::HEIGHT)
1761	}	1984	}
1762		1985
…		…
1767		1990
1768	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	1991	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1769	for @{$self->{children}};	1992	for @{$self->{children}};
1770	}	1993	}
1771		1994
1772	sub translate {	1995	sub _topleft {
1773	my ($self, $x, $y) = @_;	1996	my ($self, $x, $y) = @_;
1774		1997
1775	($x, $y)	1998	($x, $y)
1776	}	1999	}
1777		2000
…		…
1788	$self->SUPER::add ($widget);	2011	$self->SUPER::add ($widget);
1789		2012
1790	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	2013	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1791	}	2014	}
1792		2015
		2016	sub on_refresh {
		2017	my ($self, $id, $cb) = @_;
		2018
		2019	$self->{refresh_hook}{$id} = $cb;
		2020	}
		2021
1793	sub draw {	2022	sub draw {
1794	my ($self) = @_;	2023	my ($self) = @_;
1795		2024
		2025	while (my $rcb = delete $self->{refresh_hook}) {
		2026	$_->() for values %$rcb;
		2027	}
		2028
		2029	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2030	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2031	glClear GL_COLOR_BUFFER_BIT;
		2032
		2033	glMatrixMode GL_PROJECTION;
		2034	glLoadIdentity;
		2035	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2036	glMatrixMode GL_MODELVIEW;
		2037	glLoadIdentity;
		2038
1796	$self->_draw;	2039	$self->_draw;
1797	}	2040	}
1798		2041
1799	#############################################################################	2042	#############################################################################
1800		2043
1801	package CFClient::UI;	2044	package CFClient::UI;
1802		2045
1803	$TOPLEVEL = new CFClient::UI::Toplevel;	2046	$ROOT = new CFClient::UI::Root;
1804		2047
1805	1	2048	1
1806		2049

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.99 by elmex, Fri Apr 14 10:57:35 2006 UTC vs. Revision 1.114 by root, Sat Apr 15 13:56:25 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.99 by elmex, Fri Apr 14 10:57:35 2006 UTC vs.
Revision 1.114 by root, Sat Apr 15 13:56:25 2006 UTC