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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.104 by elmex, Fri Apr 14 14:02:52 2006 UTC vs.
Revision 1.115 by root, Sat Apr 15 19:35:20 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
…		…
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,
913	padding => 2,	955	padding => 2,
914	layout => new CFClient::Layout,	956	layout => new CFClient::Layout,
915	%arg	957	%arg
916	);	958	);
917		959
918	$self->set_text ($self->{text});	960	$self->set_text ($self->{text});
919		961
…		…
949		991
950	sub size_request {	992	sub size_request {
951	my ($self) = @_;	993	my ($self) = @_;
952		994
953	$self->{layout}->set_width;	995	$self->{layout}->set_width;
954	$self->{layout}->set_height ($self->{height});	996	$self->{layout}->set_height ($self->{fontsize});
955	my ($w, $h) = $self->{layout}->size;	997	my ($w, $h) = $self->{layout}->size;
956		998
957	(	999	(
958	$w + $self->{padding} * 2,	1000	$w + $self->{padding} * 2,
959	$h + $self->{padding} * 2,	1001	$h + $self->{padding} * 2,
…		…
978	sub _draw {	1020	sub _draw {
979	my ($self) = @_;	1021	my ($self) = @_;
980		1022
981	my $tex = $self->{texture} \|\|= do {	1023	my $tex = $self->{texture} \|\|= do {
982	$self->{layout}->set_width ($self->{w});	1024	$self->{layout}->set_width ($self->{w});
983	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});	1025	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
984	new_from_layout CFClient::Texture $self->{layout}	1026	new_from_layout CFClient::Texture $self->{layout}
985	};	1027	};
986		1028
987	glEnable GL_BLEND;	1029	glEnable GL_BLEND;
988	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1030	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
989	glEnable GL_TEXTURE_2D;	1031	glEnable GL_TEXTURE_2D;
990	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1032	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
991		1033
992	glColor @{$self->{fg}};	1034	glColor @{$self->{fg}};
993		1035
994	my $x =	1036	my $x =
995	$self->{align} < 0 ? $self->{padding}	1037	$self->{align} < 0 ? $self->{padding}
996	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1038	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
997	: ($self->{w} - $tex->{w}) * 0.5;	1039	: ($self->{w} - $tex->{w}) * 0.5;
998		1040
999	glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;	1041	$tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
1000	$tex->draw_quad (0, 0);
1001		1042
1002	glDisable GL_TEXTURE_2D;	1043	glDisable GL_TEXTURE_2D;
1003	glDisable GL_BLEND;	1044	glDisable GL_BLEND;
1004	}	1045	}
1005		1046
…		…
1033		1074
1034	$self->{last_activity} = $::NOW;	1075	$self->{last_activity} = $::NOW;
1035		1076
1036	$self->{text} = $text;	1077	$self->{text} = $text;
1037	$self->{layout}->set_width ($self->{w});	1078	$self->{layout}->set_width ($self->{w});
1038	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});	1079	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1039		1080
1040	$text =~ s/./*/g if $self->{hidden};	1081	$text =~ s/./*/g if $self->{hidden};
1041		1082
1042	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1083	$self->{layout}->set_markup ($self->escape_text ($text) . " ");
1043		1084
…		…
1424	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1465	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1425	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1466	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1426		1467
1427	my ($value, $lo, $hi, $page) = @{$self->{range}};	1468	my ($value, $lo, $hi, $page) = @{$self->{range}};
1428		1469
		1470	$hi = $value + 1 if $lo == $hi;
		1471
1429	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	1472	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1430	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	1473	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1431		1474
1432	$page = int $page * $inner_w / ($hi - $lo);	1475	$page = int $page * $inner_w / ($hi - $lo);
1433	$value = int +($value - $lo) * $inner_w / ($hi - $lo);	1476	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
…		…
1465		1508
1466	sub new {	1509	sub new {
1467	my $class = shift;	1510	my $class = shift;
1468		1511
1469	my $self = $class->SUPER::new (	1512	my $self = $class->SUPER::new (
		1513	req_w => $::WIDTH / 6,
		1514	req_h => $::HEIGHT / 6,
		1515	fontsize => $::FONTSIZE,
		1516	@_,
		1517
		1518	layout => (new CFClient::Layout),
1470	par => [],	1519	par => [],
1471	@_,	1520	height => 0,
1472	children => [	1521	children => [
1473	(new CFClient::UI::Empty expand => 1),	1522	(new CFClient::UI::Empty expand => 1),
1474	(new CFClient::UI::Slider vertical => 1),	1523	(new CFClient::UI::Slider vertical => 1),
1475	],	1524	],
1476	);	1525	);
1477		1526
		1527	$self->{children}[1]->connect (changed => sub {
		1528	$self->update;
		1529	});
		1530
1478	$self	1531	$self
		1532	}
		1533
		1534	sub set_fontsize {
		1535	my ($self, $fontsize) = @_;
		1536
		1537	$self->{fontsize} = $fontsize;
		1538	$self->reflow;
		1539	}
		1540
		1541	sub text_height {
		1542	my ($self, $text) = @_;
		1543
		1544	my $layout = $self->{layout};
		1545
		1546	$layout->set_height ($self->{fontsize});
		1547	$layout->set_width ($self->{w});
		1548	$layout->set_text ($text);
		1549
		1550	($layout->size)[1]
		1551	}
		1552
		1553	sub reflow {
		1554	my ($self) = @_;
		1555
		1556	$self->{need_reflow}++;
		1557	$self->update;
		1558	}
		1559
		1560	sub size_request {
		1561	my ($self) = @_;
		1562
		1563	($self->{req_w}, $self->{req_h})
		1564	}
		1565
		1566	sub size_allocate {
		1567	my ($self, $x, $y, $w, $h) = @_;
		1568
		1569	$self->SUPER::size_allocate ($x, $y, $w, $h);
		1570
		1571	$self->{layout}->set_height ($self->{fontsize});
		1572	$self->{layout}->set_width ($self->{w});
		1573
		1574	$self->reflow;
1479	}	1575	}
1480		1576
1481	sub add_paragraph {	1577	sub add_paragraph {
1482	my ($self, $color, $text) = @_;	1578	my ($self, $color, $text) = @_;
1483		1579
		1580	#TODO: intelligently "reformat" paragraph
		1581
		1582	my $height = $self->text_height ($text);
		1583
		1584	$self->{height} += $height;
		1585
1484	push @{$self->{par}}, [$color, $text];	1586	push @{$self->{par}}, [$height, $color, $text];
1485	my $count = scalar @{$self->{par}};	1587
1486	$self->{children}[1]{range} = [$count - 1, 0, $count, 1];	1588	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1487	$self->{children}[1]->update;	1589	$self->{children}[1]->update;
1488	}	1590	}
1489		1591
		1592	sub update {
		1593	my ($self) = @_;
		1594
		1595	$self->SUPER::update;
		1596
		1597	return unless $self->{h} > 0;
		1598
		1599	delete $self->{texture};
		1600
		1601	$ROOT->on_refresh ($self, sub {
		1602	if (delete $self->{need_reflow}) {
		1603	my $height = 0;
		1604
		1605	$height += $_->[0] = $self->text_height ($_->[2])
		1606	for @{$self->{par}};
		1607
		1608	$self->{height} = $height;
		1609
		1610	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1611
		1612	delete $self->{texture};
		1613	}
		1614
		1615	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		1616	glClearColor 0, 0, 0, 1;
		1617	glClear GL_COLOR_BUFFER_BIT;
		1618
		1619	glEnable GL_BLEND;
		1620	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1621	glEnable GL_TEXTURE_2D;
		1622	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1623
		1624	my $top = int $self->{children}[1]{range}[0];
		1625
		1626	my $y0 = $top;
		1627	my $y1 = $top + $self->{h};
		1628
		1629	my $y = 0;
		1630
		1631	my $layout = $self->{layout};
		1632
		1633	for my $par (@{$self->{par}}) {
		1634	my $h = $par->[0];
		1635
		1636	if ($y0 < $y + $h && $y < $y1) {
		1637	$layout->set_text ($par->[2]);
		1638
		1639	glColor @{ $par->[1] };
		1640	my ($W, $H) = $layout->size;
		1641	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1642	}
		1643
		1644	$y += $h;
		1645	}
		1646
		1647	glDisable GL_TEXTURE_2D;
		1648	glDisable GL_BLEND;
		1649	};
		1650	});
		1651	}
		1652
1490	sub _draw {	1653	sub _draw {
1491	my ($self) = @_;	1654	my ($self) = @_;
1492		1655
1493	my $par = $self->{par};	1656	if ($self->{texture}) {
1494
1495	my $bottom = (scalar @$par) - 1;
1496
1497	my $w = $self->{children}[0]{w};
1498	my $y = $self->{h};
1499
1500	glEnable GL_BLEND;
1501	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1502	glEnable GL_TEXTURE_2D;	1657	glEnable GL_TEXTURE_2D;
1503	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1658	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1504		1659	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1505	# TODO: everything!
1506	while ($y > 0 && $bottom >= 0) {
1507	my $par = $par->[$bottom--];
1508
1509	my $layout = new CFClient::Layout;
1510
1511	$layout->set_height ($::FONTSIZE);
1512	$layout->set_width ($w);
1513	$layout->set_text ($par->[1]);
1514	my $tex = new_from_layout CFClient::Texture $layout;
1515	$y -= $tex->{h};
1516
1517	glColor @{ $par->[0] };
1518	$tex->draw_quad (0, $y);
1519	}
1520
1521	glDisable GL_TEXTURE_2D;	1660	glDisable GL_TEXTURE_2D;
1522	glDisable GL_BLEND;	1661	}
		1662
		1663	$self->{children}[1]->draw;
		1664
1523	}	1665	}
1524		1666
1525	#############################################################################	1667	#############################################################################
1526		1668
1527	package CFClient::UI::MapWidget;	1669	package CFClient::UI::MapWidget;
…		…
1551	}	1693	}
1552		1694
1553	sub key_up {	1695	sub key_up {
1554	}	1696	}
1555		1697
		1698	sub button_down {
		1699	my ($self, $ev, $x, $y) = @_;
		1700
		1701	$self->focus_in;
		1702
		1703	if ($ev->button == 2) {
		1704	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1705	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1706
		1707	$self->{motion} = sub {
		1708	my ($ev, $x, $y) = @_;
		1709
		1710	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1711
		1712	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1713	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1714
		1715	$self->update;
		1716	};
		1717	}
		1718	}
		1719
		1720	sub button_up {
		1721	my ($self, $ev, $x, $y) = @_;
		1722
		1723	delete $self->{motion};
		1724	}
		1725
		1726	sub mouse_motion {
		1727	my ($self, $ev, $x, $y) = @_;
		1728
		1729	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1730	}
		1731
1556	sub size_request {	1732	sub size_request {
1557	(	1733	(
1558	1 + 32 * int $::WIDTH / 32,	1734	1 + 32 * int $::WIDTH / 32,
1559	1 + 32 * int $::HEIGHT / 32,	1735	1 + 32 * int $::HEIGHT / 32,
1560	)	1736	)
…		…
1568	}	1744	}
1569		1745
1570	sub draw {	1746	sub draw {
1571	my ($self) = @_;	1747	my ($self) = @_;
1572		1748
1573	$self->{need_update}++;#d#
1574	if (delete $self->{need_update}) {	1749	if (delete $self->{need_update}) {
1575	glNewList $self->{list}, GL_COMPILE;	1750	glNewList $self->{list}, GL_COMPILE;
1576		1751
1577	my $sw = int $::WIDTH / 32;
1578	my $sh = int $::HEIGHT / 32;
1579
1580	if ($::MAP) {	1752	if ($::MAP) {
		1753	my $sw = int $::WIDTH / 32;
		1754	my $sh = int $::HEIGHT / 32;
		1755
		1756	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
		1757	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
		1758
		1759	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1760
1581	my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);	1761	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1582		1762
1583	if ($::CFG->{fow_enable}) {	1763	if ($::CFG->{fow_enable}) {
1584	if ($::CFG->{fow_smooth}) { # smooth fog of war	1764	if ($::CFG->{fow_smooth}) { # smooth fog of war
1585	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;	1765	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1586	glConvolutionFilter2D	1766	glConvolutionFilter2D
…		…
1604	format => GL_ALPHA;	1784	format => GL_ALPHA;
1605		1785
1606	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	1786	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1607		1787
1608	glEnable GL_BLEND;	1788	glEnable GL_BLEND;
		1789	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1609	glEnable GL_TEXTURE_2D;	1790	glEnable GL_TEXTURE_2D;
1610	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1791	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1611		1792
1612	glColor +($::CFG->{fow_intensity}) x 3, 1;	1793	glColor +($::CFG->{fow_intensity}) x 3, 1;
1613	$tex->draw_quad (0, 0, $w * 32, $h * 32);	1794	$tex->draw_quad (0, 0, $w * 32, $h * 32);
1614		1795
1615	glDisable GL_TEXTURE_2D;	1796	glDisable GL_TEXTURE_2D;
1616	glDisable GL_BLEND;	1797	glDisable GL_BLEND;
1617	}	1798	}
		1799
		1800	# HACK BEGIN
		1801	{
		1802	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1803	my ($w, $h) = (250, 250);
		1804
		1805	glEnable GL_BLEND;
		1806	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1807	glEnable GL_TEXTURE_2D;
		1808	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1809
		1810	CFClient::Texture->new (
		1811	w => $w,
		1812	h => $h,
		1813	data => $::MAP->mapmap ($w, $h),
		1814	type => GL_UNSIGNED_INT_8_8_8_8_REV
		1815	)->draw_quad (100, 100);
		1816
		1817	glDisable GL_TEXTURE_2D;
		1818	glDisable GL_BLEND;
		1819	}
		1820	# HACK END
1618	}	1821	}
1619		1822
1620	glEndList;	1823	glEndList;
1621	}	1824	}
1622		1825
		1826	glPushMatrix;
1623	glCallList $self->{list};	1827	glCallList $self->{list};
		1828	glPopMatrix;
1624		1829
1625	if ($FOCUS != $self) {	1830	if ($FOCUS != $self) {
1626	glColor 64/255, 64/255, 64/255;	1831	glColor 64/255, 64/255, 64/255;
1627	glLogicOp GL_AND;	1832	glLogicOp GL_AND;
1628	glEnable GL_COLOR_LOGIC_OP;	1833	glEnable GL_COLOR_LOGIC_OP;
…		…
1761	sub toggle_flopper {	1966	sub toggle_flopper {
1762	my ($self) = @_;	1967	my ($self) = @_;
1763		1968
1764	# TODO: use animation	1969	# TODO: use animation
1765	if ($self->{state} = !$self->{state}) {	1970	if ($self->{state} = !$self->{state}) {
1766	$CFClient::UI::TOPLEVEL->add ($self->{other});	1971	$CFClient::UI::ROOT->add ($self->{other});
1767	$self->{other}->move (	1972	$self->{other}->move ($self->coord2global (0, $self->{h}));
1768	($::WIDTH - $self->{other}{w}) * 0.5,	1973	$self->emit ("open");
1769	($::HEIGHT - $self->{other}{h}) * 0.5,
1770	);
1771	} else {	1974	} else {
1772	$CFClient::UI::TOPLEVEL->remove ($self->{other});	1975	$CFClient::UI::ROOT->remove ($self->{other});
		1976	$self->emit ("close");
1773	}	1977	}
1774	}
1775		1978
1776	#############################################################################	1979	$self->emit (changed => $self->{state});
		1980	}
1777		1981
		1982	#############################################################################
		1983
1778	package CFClient::UI::Toplevel;	1984	package CFClient::UI::Root;
1779		1985
1780	our @ISA = CFClient::UI::Container::;	1986	our @ISA = CFClient::UI::Container::;
		1987
		1988	use SDL::OpenGL;
1781		1989
1782	sub size_request {	1990	sub size_request {
1783	($::WIDTH, $::HEIGHT)	1991	($::WIDTH, $::HEIGHT)
1784	}	1992	}
1785		1993
…		…
1790		1998
1791	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	1999	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1792	for @{$self->{children}};	2000	for @{$self->{children}};
1793	}	2001	}
1794		2002
1795	sub translate {	2003	sub _topleft {
1796	my ($self, $x, $y) = @_;	2004	my ($self, $x, $y) = @_;
1797		2005
1798	($x, $y)	2006	($x, $y)
1799	}	2007	}
1800		2008
…		…
1811	$self->SUPER::add ($widget);	2019	$self->SUPER::add ($widget);
1812		2020
1813	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	2021	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1814	}	2022	}
1815		2023
		2024	sub on_refresh {
		2025	my ($self, $id, $cb) = @_;
		2026
		2027	$self->{refresh_hook}{$id} = $cb;
		2028	}
		2029
1816	sub draw {	2030	sub draw {
1817	my ($self) = @_;	2031	my ($self) = @_;
1818		2032
		2033	while (my $rcb = delete $self->{refresh_hook}) {
		2034	$_->() for values %$rcb;
		2035	}
		2036
		2037	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2038	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2039	glClear GL_COLOR_BUFFER_BIT;
		2040
		2041	glMatrixMode GL_PROJECTION;
		2042	glLoadIdentity;
		2043	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2044	glMatrixMode GL_MODELVIEW;
		2045	glLoadIdentity;
		2046
1819	$self->_draw;	2047	$self->_draw;
1820	}	2048	}
1821		2049
1822	#############################################################################	2050	#############################################################################
1823		2051
1824	package CFClient::UI;	2052	package CFClient::UI;
1825		2053
1826	$TOPLEVEL = new CFClient::UI::Toplevel;	2054	$ROOT = new CFClient::UI::Root;
1827		2055
1828	1	2056	1
1829		2057

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.104 by elmex, Fri Apr 14 14:02:52 2006 UTC vs. Revision 1.115 by root, Sat Apr 15 19:35:20 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.104 by elmex, Fri Apr 14 14:02:52 2006 UTC vs.
Revision 1.115 by root, Sat Apr 15 19:35:20 2006 UTC