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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.102 by elmex, Fri Apr 14 12:17:06 2006 UTC vs.
Revision 1.117 by root, Sat Apr 15 22:55:59 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 {
…		…
671	@_	698	@_
672	)	699	)
673	}	700	}
674		701
675	sub add {	702	sub add {
676	my ($self, $x, $y, $chld) = @_;	703	my ($self, $x, $y, $child) = @_;
677		704
		705	$child->set_parent ($self);
678	$self->{children}[$y][$x] = $chld;	706	$self->{children}[$y][$x] = $child;
679	$chld->set_parent ($self);
680		707
681	$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};
682	$self->update;	717	$self->update;
683	}	718	}
684		719
685	sub get_wh {	720	sub get_wh {
686	my ($self) = @_;	721	my ($self) = @_;
…		…
731	my $col_expand = (sum @col_expand) \|\| 1;	766	my $col_expand = (sum @col_expand) \|\| 1;
732		767
733	# linearly scale sizes	768	# linearly scale sizes
734	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	769	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
735	$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;
736		774
737	my $y;	775	my $y;
738		776
739	for my $r (0 .. $#{$self->{children}}) {	777	for my $r (0 .. $#{$self->{children}}) {
740	my $row = $self->{children}[$r]	778	my $row = $self->{children}[$r]
…		…
828	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	866	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
829	$h[$_] = $alloc_h;	867	$h[$_] = $alloc_h;
830	}	868	}
831	}	869	}
832		870
		871	CFClient::UI::harmonize \@h;
		872
833	my $y = 0;	873	my $y = 0;
834	for (0 .. $#$children) {	874	for (0 .. $#$children) {
835	my $child = $children->[$_];	875	my $child = $children->[$_];
836	my $h = $h[$_];	876	my $h = $h[$_];
837	$child->size_allocate ($y, 0, $h, $w);	877	$child->size_allocate ($y, 0, $h, $w);
…		…
882		922
883	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	923	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
884	}	924	}
885	}	925	}
886		926
		927	CFClient::UI::harmonize \@h;
		928
887	my $y = 0;	929	my $y = 0;
888	for (0 .. $#$children) {	930	for (0 .. $#$children) {
889	my $child = $children->[$_];	931	my $child = $children->[$_];
890	my $h = $h[$_];	932	my $h = $h[$_];
891	$child->size_allocate (0, $y, $w, $h);	933	$child->size_allocate (0, $y, $w, $h);
…		…
904		946
905	sub new {	947	sub new {
906	my ($class, %arg) = @_;	948	my ($class, %arg) = @_;
907		949
908	my $self = $class->SUPER::new (	950	my $self = $class->SUPER::new (
909	fg => [1, 1, 1],	951	fg => [1, 1, 1],
910	height => $::FONTSIZE,	952	fontsize => $::FONTSIZE,
911	text => "",	953	text => "",
912	align => -1,	954	align => -1,
		955	valign => -1,
913	padding => 2,	956	padding => 2,
914	layout => new CFClient::Layout,	957	layout => new CFClient::Layout,
915	%arg	958	%arg
916	);	959	);
917		960
918	$self->set_text ($self->{text});	961	$self->set_text ($self->{text});
919		962
…		…
949		992
950	sub size_request {	993	sub size_request {
951	my ($self) = @_;	994	my ($self) = @_;
952		995
953	$self->{layout}->set_width;	996	$self->{layout}->set_width;
954	$self->{layout}->set_height ($self->{height});	997	$self->{layout}->set_height ($self->{fontsize});
955	my ($w, $h) = $self->{layout}->size;	998	my ($w, $h) = $self->{layout}->size;
956		999
957	(	1000	(
958	$w + $self->{padding} * 2,	1001	$w + $self->{padding} * 2,
959	$h + $self->{padding} * 2,	1002	$h + $self->{padding} * 2,
…		…
978	sub _draw {	1021	sub _draw {
979	my ($self) = @_;	1022	my ($self) = @_;
980		1023
981	my $tex = $self->{texture} \|\|= do {	1024	my $tex = $self->{texture} \|\|= do {
982	$self->{layout}->set_width ($self->{w});	1025	$self->{layout}->set_width ($self->{w});
983	$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});
984	new_from_layout CFClient::Texture $self->{layout}	1027	new_from_layout CFClient::Texture $self->{layout}
985	};	1028	};
986		1029
987	glEnable GL_BLEND;	1030	glEnable GL_BLEND;
988	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1031	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
989	glEnable GL_TEXTURE_2D;	1032	glEnable GL_TEXTURE_2D;
990	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1033	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
991		1034
992	glColor @{$self->{fg}};	1035	glColor @{$self->{fg}};
993		1036
994	my $x =	1037	my $x =
995	$self->{align} < 0 ? $self->{padding}	1038	$self->{align} < 0 ? $self->{padding}
996	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1039	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
997	: ($self->{w} - $tex->{w}) * 0.5;	1040	: ($self->{w} - $tex->{w}) * 0.5;
998		1041
999	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
1000	$tex->draw_quad (0, 0);	1047	$tex->draw_quad (int $x, int $y);
1001		1048
1002	glDisable GL_TEXTURE_2D;	1049	glDisable GL_TEXTURE_2D;
1003	glDisable GL_BLEND;	1050	glDisable GL_BLEND;
1004	}	1051	}
1005		1052
…		…
1020	bg => [0, 0, 0, 0.2],	1067	bg => [0, 0, 0, 0.2],
1021	active_bg => [1, 1, 1, 0.5],	1068	active_bg => [1, 1, 1, 0.5],
1022	active_fg => [0, 0, 0],	1069	active_fg => [0, 0, 0],
1023	can_hover => 1,	1070	can_hover => 1,
1024	can_focus => 1,	1071	can_focus => 1,
		1072	valign => 0,
1025	@_	1073	@_
1026	)	1074	)
1027	}	1075	}
1028		1076
1029	sub _set_text {	1077	sub _set_text {
…		…
1033		1081
1034	$self->{last_activity} = $::NOW;	1082	$self->{last_activity} = $::NOW;
1035		1083
1036	$self->{text} = $text;	1084	$self->{text} = $text;
1037	$self->{layout}->set_width ($self->{w});	1085	$self->{layout}->set_width ($self->{w});
1038	$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});
1039		1087
1040	$text =~ s/./*/g if $self->{hidden};	1088	$text =~ s/./*/g if $self->{hidden};
1041		1089
1042	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1090	$self->{layout}->set_markup ($self->escape_text ($text) . " ");
1043		1091
…		…
1350	range => [0, 0, 100, 10],	1398	range => [0, 0, 100, 10],
1351	req_w => 40,	1399	req_w => 40,
1352	req_h => 13,	1400	req_h => 13,
1353	vertical => 0,	1401	vertical => 0,
1354	can_hover => 1,	1402	can_hover => 1,
		1403	inner_pad => 5,
1355	@_	1404	@_
1356	);	1405	);
1357		1406
1358	$self	1407	$self
1359	}	1408	}
…		…
1380	if ($GRAB == $self) {	1429	if ($GRAB == $self) {
1381	my ($value, $lo, $hi, $page) = @{$self->{range}};	1430	my ($value, $lo, $hi, $page) = @{$self->{range}};
1382		1431
1383	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	1432	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1384		1433
		1434	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1435	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1436
		1437	$x -= $inner_pad_px; # substract the padding
1385	$x = $x * ($hi - $lo) / $w + $lo;	1438	$x = $x * ($hi - $lo) / $inner_w + $lo;
1386	$x = $lo if $x < $lo;	1439	$x = $lo if $x < $lo;
1387	$x = $hi - $page if $x > $hi - $page;	1440	$x = $hi - $page if $x > $hi - $page;
1388	$self->{range}[0] = $x;	1441	$self->{range}[0] = $x;
1389		1442
1390	$self->emit (changed => $x);	1443	$self->emit (changed => $x);
1391	$self->update;	1444	$self->update;
1392	}	1445	}
		1446	}
		1447
		1448	# the inner_* stuff is for generating a padding for the slider handle,
		1449	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1450	# correct propably, but it does the job for now
		1451	sub _calc_inner_pad_px {
		1452	my ($self, $w) = @_;
		1453	($w / 100) * $self->{inner_pad} # % to pixels
1393	}	1454	}
1394		1455
1395	sub _draw {	1456	sub _draw {
1396	my ($self) = @_;	1457	my ($self) = @_;
1397		1458
…		…
1411	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1472	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1412	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1473	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1413		1474
1414	my ($value, $lo, $hi, $page) = @{$self->{range}};	1475	my ($value, $lo, $hi, $page) = @{$self->{range}};
1415		1476
1416	# the inner_* stuff is for generating a padding for the slider handle,	1477	$hi = $value + 1 if $lo == $hi;
1417	# so that the handle doesn't leave the texture. This calculation isn't 100%	1478
1418	# correct propably, but it does the job for now	1479	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1419	my $inner_pad = 5; # 5% of width for slider bg texture border
1420	my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
1421	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	1480	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1422		1481
1423	$page = int $page * $inner_w / ($hi - $lo);	1482	$page = int $page * $inner_w / ($hi - $lo);
1424	$value = int +($value - $lo) * $inner_w / ($hi - $lo);	1483	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1425		1484
1426	$w -= $page;	1485	$w -= $page;
…		…
1456		1515
1457	sub new {	1516	sub new {
1458	my $class = shift;	1517	my $class = shift;
1459		1518
1460	my $self = $class->SUPER::new (	1519	my $self = $class->SUPER::new (
		1520	req_w => $::WIDTH / 6,
		1521	req_h => $::HEIGHT / 6,
		1522	fontsize => $::FONTSIZE,
		1523	@_,
		1524
		1525	layout => (new CFClient::Layout),
1461	par => [],	1526	par => [],
1462	@_,	1527	height => 0,
1463	children => [	1528	children => [
1464	(new CFClient::UI::Empty expand => 1),	1529	(new CFClient::UI::Empty expand => 1),
1465	(new CFClient::UI::Slider vertical => 1),	1530	(new CFClient::UI::Slider vertical => 1),
1466	],	1531	],
1467	);	1532	);
1468		1533
		1534	$self->{children}[1]->connect (changed => sub {
		1535	$self->update;
		1536	});
		1537
1469	$self	1538	$self
		1539	}
		1540
		1541	sub set_fontsize {
		1542	my ($self, $fontsize) = @_;
		1543
		1544	$self->{fontsize} = $fontsize;
		1545	$self->reflow;
		1546	}
		1547
		1548	sub text_height {
		1549	my ($self, $text) = @_;
		1550
		1551	my $layout = $self->{layout};
		1552
		1553	$layout->set_height ($self->{fontsize});
		1554	$layout->set_width ($self->{w});
		1555	$layout->set_text ($text);
		1556
		1557	($layout->size)[1]
		1558	}
		1559
		1560	sub reflow {
		1561	my ($self) = @_;
		1562
		1563	$self->{need_reflow}++;
		1564	$self->update;
		1565	}
		1566
		1567	sub size_request {
		1568	my ($self) = @_;
		1569
		1570	($self->{req_w}, $self->{req_h})
		1571	}
		1572
		1573	sub size_allocate {
		1574	my ($self, $x, $y, $w, $h) = @_;
		1575
		1576	$self->SUPER::size_allocate ($x, $y, $w, $h);
		1577
		1578	$self->{layout}->set_height ($self->{fontsize});
		1579	$self->{layout}->set_width ($self->{w});
		1580
		1581	$self->reflow;
1470	}	1582	}
1471		1583
1472	sub add_paragraph {	1584	sub add_paragraph {
1473	my ($self, $color, $text) = @_;	1585	my ($self, $color, $text) = @_;
1474		1586
		1587	#TODO: intelligently "reformat" paragraph
		1588
		1589	my $height = $self->text_height ($text);
		1590
		1591	$self->{height} += $height;
		1592
1475	push @{$self->{par}}, [$color, $text];	1593	push @{$self->{par}}, [$height, $color, $text];
1476	my $count = scalar @{$self->{par}};	1594
1477	$self->{children}[1]{range} = [$count - 1, 0, $count, 1];	1595	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1478	$self->{children}[1]->update;	1596	$self->{children}[1]->update;
1479	}	1597	}
1480		1598
		1599	sub update {
		1600	my ($self) = @_;
		1601
		1602	$self->SUPER::update;
		1603
		1604	return unless $self->{h} > 0;
		1605
		1606	delete $self->{texture};
		1607
		1608	$ROOT->on_refresh ($self, sub {
		1609	if (delete $self->{need_reflow}) {
		1610	my $height = 0;
		1611
		1612	$height += $_->[0] = $self->text_height ($_->[2])
		1613	for @{$self->{par}};
		1614
		1615	$self->{height} = $height;
		1616
		1617	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1618
		1619	delete $self->{texture};
		1620	}
		1621
		1622	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		1623	glClearColor 0, 0, 0, 1;
		1624	glClear GL_COLOR_BUFFER_BIT;
		1625
		1626	glEnable GL_BLEND;
		1627	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1628	glEnable GL_TEXTURE_2D;
		1629	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1630
		1631	my $top = int $self->{children}[1]{range}[0];
		1632
		1633	my $y0 = $top;
		1634	my $y1 = $top + $self->{h};
		1635
		1636	my $y = 0;
		1637
		1638	my $layout = $self->{layout};
		1639
		1640	for my $par (@{$self->{par}}) {
		1641	my $h = $par->[0];
		1642
		1643	if ($y0 < $y + $h && $y < $y1) {
		1644	$layout->set_text ($par->[2]);
		1645
		1646	glColor @{ $par->[1] };
		1647	my ($W, $H) = $layout->size;
		1648	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1649	}
		1650
		1651	$y += $h;
		1652	}
		1653
		1654	glDisable GL_TEXTURE_2D;
		1655	glDisable GL_BLEND;
		1656	};
		1657	});
		1658	}
		1659
1481	sub _draw {	1660	sub _draw {
1482	my ($self) = @_;	1661	my ($self) = @_;
1483		1662
1484	my $par = $self->{par};	1663	if ($self->{texture}) {
1485
1486	my $bottom = (scalar @$par) - 1;
1487
1488	my $w = $self->{children}[0]{w};
1489	my $y = $self->{h};
1490
1491	glEnable GL_BLEND;
1492	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1493	glEnable GL_TEXTURE_2D;	1664	glEnable GL_TEXTURE_2D;
1494	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1665	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1495		1666	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1496	# TODO: everything!
1497	while ($y > 0 && $bottom >= 0) {
1498	my $par = $par->[$bottom--];
1499
1500	my $layout = new CFClient::Layout;
1501
1502	$layout->set_height ($::FONTSIZE);
1503	$layout->set_width ($w);
1504	$layout->set_text ($par->[1]);
1505	my $tex = new_from_layout CFClient::Texture $layout;
1506	$y -= $tex->{h};
1507
1508	glColor @{ $par->[0] };
1509	$tex->draw_quad (0, $y);
1510	}
1511
1512	glDisable GL_TEXTURE_2D;	1667	glDisable GL_TEXTURE_2D;
1513	glDisable GL_BLEND;	1668	}
		1669
		1670	$self->{children}[1]->draw;
		1671
1514	}	1672	}
1515		1673
1516	#############################################################################	1674	#############################################################################
1517		1675
1518	package CFClient::UI::MapWidget;	1676	package CFClient::UI::MapWidget;
…		…
1542	}	1700	}
1543		1701
1544	sub key_up {	1702	sub key_up {
1545	}	1703	}
1546		1704
		1705	sub button_down {
		1706	my ($self, $ev, $x, $y) = @_;
		1707
		1708	$self->focus_in;
		1709
		1710	if ($ev->button == 2) {
		1711	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1712	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1713
		1714	$self->{motion} = sub {
		1715	my ($ev, $x, $y) = @_;
		1716
		1717	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1718
		1719	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1720	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1721
		1722	$self->update;
		1723	};
		1724	}
		1725	}
		1726
		1727	sub button_up {
		1728	my ($self, $ev, $x, $y) = @_;
		1729
		1730	delete $self->{motion};
		1731	}
		1732
		1733	sub mouse_motion {
		1734	my ($self, $ev, $x, $y) = @_;
		1735
		1736	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1737	}
		1738
1547	sub size_request {	1739	sub size_request {
1548	(	1740	(
1549	1 + 32 * int $::WIDTH / 32,	1741	1 + 32 * int $::WIDTH / 32,
1550	1 + 32 * int $::HEIGHT / 32,	1742	1 + 32 * int $::HEIGHT / 32,
1551	)	1743	)
…		…
1559	}	1751	}
1560		1752
1561	sub draw {	1753	sub draw {
1562	my ($self) = @_;	1754	my ($self) = @_;
1563		1755
1564	$self->{need_update}++;#d#
1565	if (delete $self->{need_update}) {	1756	if (delete $self->{need_update}) {
1566	glNewList $self->{list}, GL_COMPILE;	1757	glNewList $self->{list}, GL_COMPILE;
1567		1758
1568	my $sw = int $::WIDTH / 32;
1569	my $sh = int $::HEIGHT / 32;
1570
1571	if ($::MAP) {	1759	if ($::MAP) {
		1760	my $sw = int $::WIDTH / 32;
		1761	my $sh = int $::HEIGHT / 32;
		1762
		1763	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
		1764	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
		1765
		1766	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1767
1572	my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);	1768	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1573		1769
1574	if ($::CFG->{fow_enable}) {	1770	if ($::CFG->{fow_enable}) {
1575	if ($::CFG->{fow_smooth}) { # smooth fog of war	1771	if ($::CFG->{fow_smooth}) { # smooth fog of war
1576	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;	1772	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1577	glConvolutionFilter2D	1773	glConvolutionFilter2D
…		…
1595	format => GL_ALPHA;	1791	format => GL_ALPHA;
1596		1792
1597	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	1793	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1598		1794
1599	glEnable GL_BLEND;	1795	glEnable GL_BLEND;
		1796	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1600	glEnable GL_TEXTURE_2D;	1797	glEnable GL_TEXTURE_2D;
1601	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1798	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1602		1799
1603	glColor +($::CFG->{fow_intensity}) x 3, 1;	1800	glColor +($::CFG->{fow_intensity}) x 3, 1;
1604	$tex->draw_quad (0, 0, $w * 32, $h * 32);	1801	$tex->draw_quad (0, 0, $w * 32, $h * 32);
1605		1802
1606	glDisable GL_TEXTURE_2D;	1803	glDisable GL_TEXTURE_2D;
1607	glDisable GL_BLEND;	1804	glDisable GL_BLEND;
1608	}	1805	}
		1806
		1807	# HACK BEGIN
		1808	{
		1809	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1810	my ($w, $h) = (250, 250);
		1811
		1812	glEnable GL_BLEND;
		1813	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1814	glEnable GL_TEXTURE_2D;
		1815	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1816
		1817	CFClient::Texture->new (
		1818	w => $w,
		1819	h => $h,
		1820	data => $::MAP->mapmap ($w, $h),
		1821	type => GL_UNSIGNED_INT_8_8_8_8_REV
		1822	)->draw_quad (100, 100);
		1823
		1824	glDisable GL_TEXTURE_2D;
		1825	glDisable GL_BLEND;
		1826	}
		1827	# HACK END
1609	}	1828	}
1610		1829
1611	glEndList;	1830	glEndList;
1612	}	1831	}
1613		1832
		1833	glPushMatrix;
1614	glCallList $self->{list};	1834	glCallList $self->{list};
		1835	glPopMatrix;
1615		1836
1616	if ($FOCUS != $self) {	1837	if ($FOCUS != $self) {
1617	glColor 64/255, 64/255, 64/255;	1838	glColor 64/255, 64/255, 64/255;
1618	glLogicOp GL_AND;	1839	glLogicOp GL_AND;
1619	glEnable GL_COLOR_LOGIC_OP;	1840	glEnable GL_COLOR_LOGIC_OP;
…		…
1653	$::CONN->user_send ("command stay fire");	1874	$::CONN->user_send ("command stay fire");
1654	} elsif ($sym == SDLK_a) {	1875	} elsif ($sym == SDLK_a) {
1655	$::CONN->user_send ("command apply");	1876	$::CONN->user_send ("command apply");
1656	} elsif ($sym == SDLK_QUOTE) {	1877	} elsif ($sym == SDLK_QUOTE) {
1657	$self->emit ('activate_console');	1878	$self->emit ('activate_console');
		1879	} elsif ($sym == SDLK_SLASH) {
		1880	$self->emit ('activate_console' => '/');
1658	} elsif (exists $DIR{$sym}) {	1881	} elsif (exists $DIR{$sym}) {
1659	if ($mod & KMOD_SHIFT) {	1882	if ($mod & KMOD_SHIFT) {
1660	$self->{shft}++;	1883	$self->{shft}++;
1661	$::CONN->user_send ("command fire $DIR{$sym}[0]");	1884	$::CONN->user_send ("command fire $DIR{$sym}[0]");
1662	} elsif ($mod & KMOD_CTRL) {	1885	} elsif ($mod & KMOD_CTRL) {
…		…
1750	sub toggle_flopper {	1973	sub toggle_flopper {
1751	my ($self) = @_;	1974	my ($self) = @_;
1752		1975
1753	# TODO: use animation	1976	# TODO: use animation
1754	if ($self->{state} = !$self->{state}) {	1977	if ($self->{state} = !$self->{state}) {
1755	$CFClient::UI::TOPLEVEL->add ($self->{other});	1978	$CFClient::UI::ROOT->add ($self->{other});
1756	$self->{other}->move (	1979	$self->{other}->move ($self->coord2global (0, $self->{h}));
1757	($::WIDTH - $self->{other}{w}) * 0.5,	1980	$self->emit ("open");
1758	($::HEIGHT - $self->{other}{h}) * 0.5,
1759	);
1760	} else {	1981	} else {
1761	$CFClient::UI::TOPLEVEL->remove ($self->{other});	1982	$CFClient::UI::ROOT->remove ($self->{other});
		1983	$self->emit ("close");
1762	}	1984	}
1763	}
1764		1985
1765	#############################################################################	1986	$self->emit (changed => $self->{state});
		1987	}
1766		1988
		1989	#############################################################################
		1990
1767	package CFClient::UI::Toplevel;	1991	package CFClient::UI::Root;
1768		1992
1769	our @ISA = CFClient::UI::Container::;	1993	our @ISA = CFClient::UI::Container::;
		1994
		1995	use SDL::OpenGL;
1770		1996
1771	sub size_request {	1997	sub size_request {
1772	($::WIDTH, $::HEIGHT)	1998	($::WIDTH, $::HEIGHT)
1773	}	1999	}
1774		2000
…		…
1779		2005
1780	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	2006	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1781	for @{$self->{children}};	2007	for @{$self->{children}};
1782	}	2008	}
1783		2009
1784	sub translate {	2010	sub _topleft {
1785	my ($self, $x, $y) = @_;	2011	my ($self, $x, $y) = @_;
1786		2012
1787	($x, $y)	2013	($x, $y)
1788	}	2014	}
1789		2015
…		…
1797	sub add {	2023	sub add {
1798	my ($self, $widget) = @_;	2024	my ($self, $widget) = @_;
1799		2025
1800	$self->SUPER::add ($widget);	2026	$self->SUPER::add ($widget);
1801		2027
1802	$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;
1803	}	2035	}
1804		2036
1805	sub draw {	2037	sub draw {
1806	my ($self) = @_;	2038	my ($self) = @_;
1807		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
1808	$self->_draw;	2054	$self->_draw;
1809	}	2055	}
1810		2056
1811	#############################################################################	2057	#############################################################################
1812		2058
1813	package CFClient::UI;	2059	package CFClient::UI;
1814		2060
1815	$TOPLEVEL = new CFClient::UI::Toplevel;	2061	$ROOT = new CFClient::UI::Root;
1816		2062
1817	1	2063	1
1818		2064

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.102 by elmex, Fri Apr 14 12:17:06 2006 UTC vs. Revision 1.117 by root, Sat Apr 15 22:55:59 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.102 by elmex, Fri Apr 14 12:17:06 2006 UTC vs.
Revision 1.117 by root, Sat Apr 15 22:55:59 2006 UTC