ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.88 by root, Wed Apr 12 21:01:46 2006 UTC vs.
Revision 1.125 by root, Mon Apr 17 20:52:15 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
148	return if $FOCUS == $self;	177	return if $FOCUS == $self;
		178	return unless $self->{can_focus};
149		179
150	my $focus = $FOCUS; $FOCUS = $self;	180	my $focus = $FOCUS; $FOCUS = $self;
		181
		182	$self->emit (focus_in => $focus);
		183
151	$focus->update if $focus;	184	$focus->update if $focus;
152	$FOCUS->update;	185	$FOCUS->update;
153	}	186	}
154		187
155	sub focus_out {	188	sub focus_out {
156	my ($self) = @_;	189	my ($self) = @_;
157		190
158	return unless $FOCUS == $self;	191	return unless $FOCUS == $self;
159		192
160	my $focus = $FOCUS; undef $FOCUS;	193	my $focus = $FOCUS; undef $FOCUS;
		194
		195	$self->emit (focus_out => $focus);
		196
161	$focus->update if $focus; #?	197	$focus->update if $focus; #?
162	}	198	}
163		199
164	sub mouse_motion { }	200	sub mouse_motion { }
165	sub button_up { }	201	sub button_up { }
…		…
186	glPushMatrix;	222	glPushMatrix;
187	glTranslate $self->{x}, $self->{y}, 0;	223	glTranslate $self->{x}, $self->{y}, 0;
188	$self->_draw;	224	$self->_draw;
189	glPopMatrix;	225	glPopMatrix;
190		226
191	if ($self == $HOVER) {	227	if ($self == $HOVER && $self->{can_hover}) {
192	my ($x, $y) = @$self{qw(x y)};	228	my ($x, $y) = @$self{qw(x y)};
193		229
194	glColor 0, 0, 1, 0.2;	230	glColor 1, 0.8, 0.5, 0.2;
195	glEnable GL_BLEND;	231	glEnable GL_BLEND;
196	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	232	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
197	glBegin GL_QUADS;	233	glBegin GL_QUADS;
198	glVertex $x , $y;	234	glVertex $x , $y;
199	glVertex $x + $self->{w}, $y;	235	glVertex $x + $self->{w}, $y;
…		…
219		255
220	()	256	()
221	}	257	}
222		258
223	sub set_parent {	259	sub set_parent {
224	my ($self, $par) = @_;	260	my ($self, $parent) = @_;
225		261
226	$self->{parent} = $par;
227	Scalar::Util::weaken $self->{parent};	262	Scalar::Util::weaken ($self->{parent} = $parent);
228	}	263	}
229		264
230	sub get_parent {	265	sub check_size {
231	$_[0]->{parent}	266	my ($self) = @_;
		267
		268	my ($w, $h) = $self->size_request;
		269
		270	if ($w != $self->{req_w} || $h != $self->{req_h}) {
		271	$self->{req_w} = $w;
		272	$self->{req_h} = $h;
		273
		274	$self->{parent}->check_size
		275	if $self->{parent};
		276	}
232	}	277	}
233		278
234	sub update {	279	sub update {
235	my ($self) = @_;	280	my ($self) = @_;
236		281
…		…
325		370
326	$self	371	$self
327	}	372	}
328		373
329	sub add {	374	sub add {
330	my ($self, $chld) = @_;	375	my ($self, $child) = @_;
331		376
332	$chld->set_parent ($self);	377	$child->set_parent ($self);
		378
		379	use sort 'stable';
333		380
334	$self->{children} = [	381	$self->{children} = [
335	sort { $a->{z} <=> $b->{z} }	382	sort { $a->{z} <=> $b->{z} }
336	@{$self->{children}}, $chld	383	@{$self->{children}}, $child
337	];	384	];
338		385
339	$self->{w} = $self->{h} = -1;	386	$self->{w} = $self->{h} = -1;
340	$self->update;	387	$self->update;
341	}	388	}
…		…
343	sub remove {	390	sub remove {
344	my ($self, $widget) = @_;	391	my ($self, $widget) = @_;
345		392
346	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	393	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
347		394
348	$self->size_allocate (0, 0, $self->{w}, $self->{h});	395	$self->check_size;
349	}	396	}
350		397
351	sub find_widget {	398	sub find_widget {
352	my ($self, $x, $y) = @_;	399	my ($self, $x, $y) = @_;
353		400
…		…
438	}	485	}
439		486
440	sub render_chld {	487	sub render_chld {
441	my ($self) = @_;	488	my ($self) = @_;
442		489
443	$self->{texture} =	490	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
444	CFClient::Texture->new_from_opengl (	491	glClearColor 0, 0, 0, 1;
445	$self->{w}, $self->{h}, sub { $self->child->draw }	492	glClear GL_COLOR_BUFFER_BIT;
446	);	493	$self->child->draw;
		494	};
447	}	495	}
448		496
449	sub size_allocate {	497	sub size_allocate {
450	my ($self, $x, $y, $w, $h) = @_;	498	my ($self, $x, $y, $w, $h) = @_;
451		499
…		…
472	$tex->draw_quad (0, 0, $w, $h);	520	$tex->draw_quad (0, 0, $w, $h);
473		521
474	glDisable GL_BLEND;	522	glDisable GL_BLEND;
475	glDisable GL_TEXTURE_2D;	523	glDisable GL_TEXTURE_2D;
476	}	524	}
		525
		526	#############################################################################
		527
		528	package CFClient::UI::ViewPort;
		529
		530	our @ISA = CFClient::UI::Window::;
		531
		532	sub new { die }
		533
		534	sub size_request {
		535	my ($self) = @_;
		536
		537	@$self{qw(child_w child_h)} = $self->child->size_request;
		538	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
		539
		540	@$self{qw(child_w child_h)}
		541	}
		542
		543	sub size_allocate {
		544	my ($self, $x, $y, $w, $h) = @_;
		545
		546	$self->_size_allocate ($x, $y, $w, $h) or return;
		547	}
		548
		549	sub _draw {
		550	my ($self) = @_;
		551
		552	$self->{children}[1]->draw;
		553	}
		554
477		555
478	#############################################################################	556	#############################################################################
479		557
480	package CFClient::UI::Frame;	558	package CFClient::UI::Frame;
481		559
…		…
529		607
530	my @tex =	608	my @tex =
531	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	609	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
532	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	610	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
533		611
		612	sub new {
		613	my $class = shift;
		614
		615	# TODO: user_x, user_y, overwrite moveto?
		616
		617	$class->SUPER::new (
		618	bg => [1, 1, 1, 1],
		619	border_bg => [1, 1, 1, 1],
		620	border => int $::FONTSIZE * 0.8,
		621	@_
		622	)
		623	}
		624
534	sub size_request {	625	sub size_request {
535	my ($self) = @_;	626	my ($self) = @_;
536		627
537	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};	628	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538		629
539	my ($w, $h) = $self->SUPER::size_request;	630	my ($w, $h) = $self->SUPER::size_request;
540		631
541	$h += $tex[1]->{h};	632	(
542	$h += $tex[4]->{h};	633	$w + $self->{border} * 2,
543	$w += $tex[2]->{w};	634	$h + $self->{border} * 2,
544	$w += $tex[3]->{w};	635	)
545
546	($w, $h)
547	}	636	}
548		637
549	sub size_allocate {	638	sub size_allocate {
550	my ($self, $x, $y, $w, $h) = @_;	639	my ($self, $x, $y, $w, $h) = @_;
551		640
552	$self->_size_allocate ($x, $y, $w, $h) or return;	641	$self->_size_allocate ($x, $y, $w, $h) or return;
553		642
554	$h -= $tex[1]{h};	643	$h -= List::Util::max 0, $self->{border} * 2;
555	$h -= $tex[4]{h};	644	$w -= List::Util::max 0, $self->{border} * 2;
556	$w -= $tex[2]{w};
557	$w -= $tex[3]{w};
558		645
559	$h = $h < 0 ? 0 : $h;	646	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
560	$w = $w < 0 ? 0 : $w;
561
562	my $child = $self->child;
563
564	$child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
565	}	647	}
566		648
567	sub button_down {	649	sub button_down {
568	my ($self, $ev, $x, $y) = @_;	650	my ($self, $ev, $x, $y) = @_;
569		651
570	if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}	652	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
571	&& $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {	653	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
572		654
573	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	655	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574	my ($bw, $bh) = ($self->{w}, $self->{h});	656	my ($bw, $bh) = ($self->{w}, $self->{h});
575		657
576	$self->{motion} = sub {	658	$self->{motion} = sub {
…		…
582	$self->{user_h} = $bh + $y - $oy;	664	$self->{user_h} = $bh + $y - $oy;
583	$self->update;	665	$self->update;
584	};	666	};
585		667
586	} elsif ($x >= 0 && $x < $self->{w}	668	} elsif ($x >= 0 && $x < $self->{w}
587	&& $y >= 0 && $y < $tex[1]{h}) {	669	&& $y >= 0 && $y < $self->{border}) {
588		670
589	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	671	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590	my ($bx, $by) = ($self->{x}, $self->{y});	672	my ($bx, $by) = ($self->{x}, $self->{y});
591		673
592	$self->{motion} = sub {	674	$self->{motion} = sub {
…		…
613	}	695	}
614		696
615	sub _draw {	697	sub _draw {
616	my ($self) = @_;	698	my ($self) = @_;
617		699
618	my ($w, $h) = ($self->{w}, $self->{h});	700	my ($w, $h ) = ($self->{w}, $self->{h});
619	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	701	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
620		702
621	glEnable GL_BLEND;	703	glEnable GL_BLEND;
622	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	704	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
623	glEnable GL_TEXTURE_2D;	705	glEnable GL_TEXTURE_2D;
624	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	706	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
625		707
626	my $top = $tex[1];	708	glColor @{ $self->{border_bg} };
627	$top->draw_quad (0, 0, $w, $top->{h});	709	$tex[1]->draw_quad (0, 0, $w, $self->{border});
628		710	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
629	my $left = $tex[3];	711	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
630	$left->draw_quad (0, $top->{h}, $left->{w}, $ch);	712	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
631
632	my $right = $tex[2];
633	$right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
634
635	my $bottom = $tex[4];
636	$bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
637		713
638	my $bg = $tex[0];	714	my $bg = $tex[0];
639		715
640	glBindTexture GL_TEXTURE_2D, $bg->{name};	716	# TODO: repeat texture not scale
641	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
642
643	my $rep_x = $cw / $bg->{w};	717	my $rep_x = $cw / $bg->{w};
644	my $rep_y = $ch / $bg->{h};	718	my $rep_y = $ch / $bg->{h};
645		719
		720	glColor @{ $self->{bg} };
		721
		722	$bg->{s} = $rep_x;
		723	$bg->{t} = $rep_y;
		724	$bg->{wrap_mode} = 1;
646	$bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);	725	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
647		726
648	glDisable GL_TEXTURE_2D;	727	glDisable GL_TEXTURE_2D;
649	glDisable GL_BLEND;	728	glDisable GL_BLEND;
650		729
651	$self->child->draw;	730	$self->child->draw;
652
653	}	731	}
654		732
655	#############################################################################	733	#############################################################################
656		734
657	package CFClient::UI::Table;	735	package CFClient::UI::Table;
…		…
670	@_	748	@_
671	)	749	)
672	}	750	}
673		751
674	sub add {	752	sub add {
675	my ($self, $x, $y, $chld) = @_;	753	my ($self, $x, $y, $child) = @_;
676		754
		755	$child->set_parent ($self);
677	$self->{children}[$y][$x] = $chld;	756	$self->{children}[$y][$x] = $child;
678	$chld->set_parent ($self);
679		757
680	$self->{w} = $self->{h} = -1;	758	$self->{w} = $self->{h} = -1;
		759	$self->update;
		760	}
		761
		762	# TODO: move to container class maybe? send childs a signal on removal?
		763	sub clear {
		764	my ($self) = @_;
		765
		766	delete $self->{children};
681	$self->update;	767	$self->update;
682	}	768	}
683		769
684	sub get_wh {	770	sub get_wh {
685	my ($self) = @_;	771	my ($self) = @_;
…		…
730	my $col_expand = (sum @col_expand) || 1;	816	my $col_expand = (sum @col_expand) || 1;
731		817
732	# linearly scale sizes	818	# linearly scale sizes
733	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	819	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
734	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	820	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
		821
		822	CFClient::UI::harmonize $ws;
		823	CFClient::UI::harmonize $hs;
735		824
736	my $y;	825	my $y;
737		826
738	for my $r (0 .. $#{$self->{children}}) {	827	for my $r (0 .. $#{$self->{children}}) {
739	my $row = $self->{children}[$r]	828	my $row = $self->{children}[$r]
…		…
801	}	890	}
802		891
803	sub size_allocate {	892	sub size_allocate {
804	my ($self, $x, $y, $w, $h) = @_;	893	my ($self, $x, $y, $w, $h) = @_;
805		894
806	$self->_size_allocate ($x, $y, $w, $h);	895	$self->_size_allocate ($x, $y, $w, $h) or return;
807		896
808	($h, $w) = ($w, $h);	897	($h, $w) = ($w, $h);
809		898
810	my $children = $self->{children};	899	my $children = $self->{children};
811		900
…		…
827	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	916	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
828	$h[$_] = $alloc_h;	917	$h[$_] = $alloc_h;
829	}	918	}
830	}	919	}
831		920
		921	CFClient::UI::harmonize \@h;
		922
832	my $y = 0;	923	my $y = 0;
833	for (0 .. $#$children) {	924	for (0 .. $#$children) {
834	my $child = $children->[$_];	925	my $child = $children->[$_];
835	my $h = $h[$_];	926	my $h = $h[$_];
836	$child->size_allocate ($y, 0, $h, $w);	927	$child->size_allocate ($y, 0, $h, $w);
837		928
838	$y += $h;	929	$y += $h;
839	}	930	}
		931
		932	1
840	}	933	}
841		934
842	#############################################################################	935	#############################################################################
843		936
844	package CFClient::UI::VBox;	937	package CFClient::UI::VBox;
…		…
859	}	952	}
860		953
861	sub size_allocate {	954	sub size_allocate {
862	my ($self, $x, $y, $w, $h) = @_;	955	my ($self, $x, $y, $w, $h) = @_;
863		956
864	$self->_size_allocate ($x, $y, $w, $h);	957	$self->_size_allocate ($x, $y, $w, $h) or return;
865		958
866	my $children = $self->{children};	959	my $children = $self->{children};
867		960
868	my @h = map +($_->size_request)[1], @$children;	961	my @h = map +($_->size_request)[1], @$children;
869		962
…		…
881		974
882	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	975	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
883	}	976	}
884	}	977	}
885		978
		979	CFClient::UI::harmonize \@h;
		980
886	my $y = 0;	981	my $y = 0;
887	for (0 .. $#$children) {	982	for (0 .. $#$children) {
888	my $child = $children->[$_];	983	my $child = $children->[$_];
889	my $h = $h[$_];	984	my $h = $h[$_];
890	$child->size_allocate (0, $y, $w, $h);	985	$child->size_allocate (0, $y, $w, $h);
891		986
892	$y += $h;	987	$y += $h;
893	}	988	}
		989
		990	1
894	}	991	}
895		992
896	#############################################################################	993	#############################################################################
897		994
898	package CFClient::UI::Label;	995	package CFClient::UI::Label;
…		…
903		1000
904	sub new {	1001	sub new {
905	my ($class, %arg) = @_;	1002	my ($class, %arg) = @_;
906		1003
907	my $self = $class->SUPER::new (	1004	my $self = $class->SUPER::new (
908	fg => [1, 1, 1],	1005	fg => [1, 1, 1],
909	height => $::FONTSIZE,	1006	fontsize => $::FONTSIZE,
910	text => "",	1007	text => "",
911	align => -1,	1008	align => -1,
		1009	valign => -1,
912	padding => 2,	1010	padding => 2,
913	layout => new CFClient::Layout,	1011	layout => new CFClient::Layout,
914	%arg	1012	%arg
915	);	1013	);
916		1014
917	$self->set_text ($self->{text});	1015	$self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
		1016
		1017	$self->set_text (delete $self->{text}) if exists $self->{text};
		1018	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
918		1019
919	$self	1020	$self
920	}	1021	}
921		1022
922	sub escape_text {	1023	sub escape_text {
…		…
930	}	1031	}
931		1032
932	sub set_text {	1033	sub set_text {
933	my ($self, $text) = @_;	1034	my ($self, $text) = @_;
934		1035
935	$self->{text} = $text;
936	$self->{layout}->set_markup ($text);	1036	$self->{layout}->set_text ($text);
937		1037
938	delete $self->{texture};	1038	delete $self->{texture};
939	# $self->{w} = $self->{h} = -1;
940	$self->update;	1039	$self->update;
941	}	1040	}
942		1041
943	sub get_text {	1042	sub set_markup {
944	my ($self, $text) = @_;	1043	my ($self, $markup) = @_;
945		1044
946	$self->{text}	1045	$self->{layout}->set_markup ($markup);
		1046
		1047	delete $self->{texture};
		1048	$self->update;
947	}	1049	}
948		1050
949	sub size_request {	1051	sub size_request {
950	my ($self) = @_;	1052	my ($self) = @_;
951		1053
952	$self->{layout}->set_width;	1054	$self->{layout}->set_width;
953	$self->{layout}->set_height ($self->{height});	1055	$self->{layout}->set_height ($self->{fontsize});
		1056
954	my ($w, $h) = $self->{layout}->size;	1057	my ($w, $h) = $self->{layout}->size;
955		1058
956	(	1059	(
957	$w + $self->{padding} * 2,	1060	$w + $self->{padding} * 2,
958	$h + $self->{padding} * 2,	1061	$h + $self->{padding} * 2,
…		…
977	sub _draw {	1080	sub _draw {
978	my ($self) = @_;	1081	my ($self) = @_;
979		1082
980	my $tex = $self->{texture} ||= do {	1083	my $tex = $self->{texture} ||= do {
981	$self->{layout}->set_width ($self->{w});	1084	$self->{layout}->set_width ($self->{w});
982	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});	1085	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
983	new_from_layout CFClient::Texture $self->{layout}	1086	new_from_layout CFClient::Texture $self->{layout}
984	};	1087	};
985		1088
986	glEnable GL_BLEND;	1089	glEnable GL_BLEND;
987	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1090	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
988	glEnable GL_TEXTURE_2D;	1091	glEnable GL_TEXTURE_2D;
989	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1092	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
990		1093
991	glColor @{$self->{fg}};	1094	glColor @{$self->{fg}};
992		1095
993	my $x =	1096	$self->{ox} = int (
994	$self->{align} < 0 ? $self->{padding}	1097	$self->{align} < 0 ? $self->{padding}
995	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1098	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
996	: ($self->{w} - $tex->{w}) * 0.5;	1099	: ($self->{w} - $tex->{w}) * 0.5
		1100	);
997		1101
998	glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;	1102	$self->{oy} = int (
999	$tex->draw_quad (0, 0);	1103	$self->{valign} < 0 ? $self->{padding}
		1104	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1105	: ($self->{h} - $tex->{h}) * 0.5
		1106	);
		1107
		1108	$tex->draw_quad ($self->{ox}, $self->{oy});
1000		1109
1001	glDisable GL_TEXTURE_2D;	1110	glDisable GL_TEXTURE_2D;
1002	glDisable GL_BLEND;	1111	glDisable GL_BLEND;
1003	}	1112	}
1004		1113
1005	#############################################################################	1114	#############################################################################
1006		1115
1007	package CFClient::UI::Entry;	1116	package CFClient::UI::EntryBase;
1008		1117
1009	our @ISA = CFClient::UI::Label::;	1118	our @ISA = CFClient::UI::Label::;
1010		1119
1011	use SDL;	1120	use SDL;
1012	use SDL::OpenGL;	1121	use SDL::OpenGL;
…		…
1017	$class->SUPER::new (	1126	$class->SUPER::new (
1018	fg => [1, 1, 1],	1127	fg => [1, 1, 1],
1019	bg => [0, 0, 0, 0.2],	1128	bg => [0, 0, 0, 0.2],
1020	active_bg => [1, 1, 1, 0.5],	1129	active_bg => [1, 1, 1, 0.5],
1021	active_fg => [0, 0, 0],	1130	active_fg => [0, 0, 0],
		1131	can_hover => 1,
		1132	can_focus => 1,
		1133	valign => 0,
1022	@_	1134	@_
1023	)	1135	)
1024	}	1136	}
1025		1137
1026	sub _set_text {	1138	sub _set_text {
1027	my ($self, $text) = @_;	1139	my ($self, $text) = @_;
1028		1140
		1141	delete $self->{cur_h};
		1142
		1143	return if $self->{text} eq $text;
		1144
1029	$self->{last_activity} = $::NOW;	1145	$self->{last_activity} = $::NOW;
1030
1031	$self->{text} = $text;	1146	$self->{text} = $text;
1032	$self->{layout}->set_width ($self->{w});
1033	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1034		1147
1035	$text =~ s/./*/g if $self->{hidden};	1148	$text =~ s/./*/g if $self->{hidden};
		1149	$self->{layout}->set_text ("$text ");
1036		1150
1037	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1151	$self->emit (changed => $self->{text});
		1152	}
1038		1153
1039	$text = substr $text, 0, $self->{cursor};	1154	sub get_text {
1040	utf8::encode $text;	1155	$_[0]{text}
1041
1042	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1043	}	1156	}
1044		1157
1045	sub size_request {	1158	sub size_request {
1046	my ($self) = @_;	1159	my ($self) = @_;
1047		1160
…		…
1051	}	1164	}
1052		1165
1053	sub size_allocate {	1166	sub size_allocate {
1054	my ($self, $x, $y, $w, $h) = @_;	1167	my ($self, $x, $y, $w, $h) = @_;
1055		1168
1056	$self->SUPER::size_allocate ($x, $y, $w, $h);	1169	$self->SUPER::size_allocate ($x, $y, $w, $h) or return;
1057		1170
1058	$self->_set_text ($self->{text});	1171	$self->_set_text ($self->{text});
1059	}	1172	}
1060		1173
1061	sub set_text {	1174	sub set_text {
…		…
1086	++$self->{cursor} if $self->{cursor} < length $self->{text};	1199	++$self->{cursor} if $self->{cursor} < length $self->{text};
1087	} elsif ($sym == SDLK_HOME) {	1200	} elsif ($sym == SDLK_HOME) {
1088	$self->{cursor} = 0;	1201	$self->{cursor} = 0;
1089	} elsif ($sym == SDLK_END) {	1202	} elsif ($sym == SDLK_END) {
1090	$self->{cursor} = length $text;	1203	$self->{cursor} = length $text;
		1204	} elsif ($sym == SDLK_ESCAPE) {
		1205	$self->emit ('escape');
1091	} elsif ($uni) {	1206	} elsif ($uni) {
1092	substr $text, $self->{cursor}++, 0, chr $uni;	1207	substr $text, $self->{cursor}++, 0, chr $uni;
1093	}	1208	}
1094		1209
1095	$self->_set_text ($text);	1210	$self->_set_text ($text);
…		…
1149		1264
1150	$self->SUPER::_draw;	1265	$self->SUPER::_draw;
1151		1266
1152	#TODO: force update every cursor change :(	1267	#TODO: force update every cursor change :(
1153	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {	1268	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
		1269
		1270	unless (exists $self->{cur_h}) {
		1271	my $text = substr $self->{text}, 0, $self->{cursor};
		1272	utf8::encode $text;
		1273
		1274	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
		1275	}
		1276
1154	glColor @{$self->{fg}};	1277	glColor @{$self->{fg}};
1155	glBegin GL_LINES;	1278	glBegin GL_LINES;
1156	glVertex $self->{cur_x}, $self->{cur_y};
1157	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1279	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
		1280	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1158	glEnd;	1281	glEnd;
1159	}	1282	}
		1283	}
		1284
		1285	package CFClient::UI::Entry;
		1286
		1287	our @ISA = CFClient::UI::EntryBase::;
		1288
		1289	use SDL;
		1290	use SDL::OpenGL;
		1291
		1292	sub key_down {
		1293	my ($self, $ev) = @_;
		1294
		1295	my $sym = $ev->key_sym;
		1296
		1297	if ($sym == SDLK_RETURN) {
		1298	$self->emit (activate => $self->get_text);
		1299	$self->update;
		1300
		1301	} else {
		1302	$self->SUPER::key_down ($ev);
		1303	}
		1304
1160	}	1305	}
1161		1306
1162	#############################################################################	1307	#############################################################################
1163		1308
1164	package CFClient::UI::Button;	1309	package CFClient::UI::Button;
…		…
1177		1322
1178	$class->SUPER::new (	1323	$class->SUPER::new (
1179	padding => 4,	1324	padding => 4,
1180	fg => [1, 1, 1],	1325	fg => [1, 1, 1],
1181	bg => [1, 1, 1, 0.2],	1326	bg => [1, 1, 1, 0.2],
1182	active_fg => [1, 1, 0],
1183	# active_bg => [0, 0, 0, 0.5],	1327	active_fg => [0, 0, 1],
1184	# border_fg => [1, 1, 0],	1328	can_hover => 1,
1185	@_	1329	@_
1186	)	1330	)
1187	}	1331	}
1188		1332
1189	sub button_up {	1333	sub button_up {
…		…
1197		1341
1198	sub _draw {	1342	sub _draw {
1199	my ($self) = @_;	1343	my ($self) = @_;
1200		1344
1201	local $self->{fg} = $self->{fg};	1345	local $self->{fg} = $self->{fg};
1202	my $tex = $tex[0];
1203
1204	glEnable GL_BLEND;
1205	glEnable GL_TEXTURE_2D;
1206	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1207		1346
1208	if ($GRAB == $self) {	1347	if ($GRAB == $self) {
1209	$self->{fg} = $self->{active_fg};	1348	$self->{fg} = $self->{active_fg};
1210	}	1349	}
1211		1350
1212	glBindTexture GL_TEXTURE_2D, $tex->{name};	1351	glEnable GL_BLEND;
		1352	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1353	glEnable GL_TEXTURE_2D;
1213	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1354	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1355	glColor 0, 0, 0, 1;
1214		1356
1215	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	1357	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1216		1358
1217	glDisable GL_TEXTURE_2D;	1359	glDisable GL_TEXTURE_2D;
1218	glDisable GL_BLEND;	1360	glDisable GL_BLEND;
1219		1361
1220	$self->SUPER::_draw;	1362	$self->SUPER::_draw;
…		…
1223	#############################################################################	1365	#############################################################################
1224		1366
1225	package CFClient::UI::CheckBox;	1367	package CFClient::UI::CheckBox;
1226		1368
1227	our @ISA = CFClient::UI::DrawBG::;	1369	our @ISA = CFClient::UI::DrawBG::;
		1370
		1371	my @tex =
		1372	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1373	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1228		1374
1229	use SDL;	1375	use SDL;
1230	use SDL::OpenGL;	1376	use SDL::OpenGL;
1231		1377
1232	sub new {	1378	sub new {
…		…
1235	$class->SUPER::new (	1381	$class->SUPER::new (
1236	padding => 2,	1382	padding => 2,
1237	fg => [1, 1, 1],	1383	fg => [1, 1, 1],
1238	active_fg => [1, 1, 0],	1384	active_fg => [1, 1, 0],
1239	state => 0,	1385	state => 0,
		1386	can_hover => 1,
1240	@_	1387	@_
1241	)	1388	)
1242	}	1389	}
1243		1390
1244	sub size_request {	1391	sub size_request {
…		…
1248	}	1395	}
1249		1396
1250	sub size_allocate {	1397	sub size_allocate {
1251	my ($self, $x, $y, $w, $h) = @_;	1398	my ($self, $x, $y, $w, $h) = @_;
1252		1399
1253	$self->_size_allocate ($x, $y, $w, $h);	1400	$self->_size_allocate ($x, $y, $w, $h) or return;
1254	}	1401	}
1255		1402
1256	sub button_down {	1403	sub button_down {
1257	my ($self, $ev, $x, $y) = @_;	1404	my ($self, $ev, $x, $y) = @_;
1258		1405
…		…
1269	$self->SUPER::_draw;	1416	$self->SUPER::_draw;
1270		1417
1271	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1418	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1272		1419
1273	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1420	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1274		1421
1275	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1422	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1276		1423
1277	glBegin GL_LINE_LOOP;	1424	glEnable GL_BLEND;
1278	glVertex 0 , 0;	1425	glEnable GL_TEXTURE_2D;
1279	glVertex 0 , $s;	1426	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1280	glVertex $s, $s;
1281	glVertex $s, 0;
1282	glEnd;
1283		1427
1284	if ($self->{state}) {	1428	my $tex = $self->{state} ? $tex[1] : $tex[0];
1285	glBegin GL_LINES;
1286	glVertex 0 , 0;
1287	glVertex $s, $s;
1288	glVertex $s, 0;
1289	glVertex 0 , $s;
1290	glEnd;
1291	}
1292	}
1293		1429
1294	#############################################################################	1430	$tex->draw_quad (0, 0, $s, $s);
1295		1431
		1432	glDisable GL_TEXTURE_2D;
		1433	glDisable GL_BLEND;
		1434	}
		1435
		1436	#############################################################################
		1437
1296	package CFClient::UI::Slider;	1438	package CFClient::UI::VGauge;
1297		1439
1298	use strict;	1440	our @ISA = CFClient::UI::Base::;
1299		1441
1300	use SDL::OpenGL;	1442	use SDL::OpenGL;
1301		1443
1302	our @ISA = CFClient::UI::DrawBG::;	1444	my %tex = (
		1445	food => [
		1446	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1447	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
		1448	],
		1449	grace => [
		1450	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1451	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
		1452	],
		1453	hp => [
		1454	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1455	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
		1456	],
		1457	mana => [
		1458	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1459	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
		1460	],
		1461	);
1303		1462
		1463	# eg. VGauge->new (gauge => 'food'), default gauge: food
1304	sub new {	1464	sub new {
1305	my $class = shift;	1465	my $class = shift;
1306		1466
		1467	my $self = $class->SUPER::new (gauge => 'food', @_);
		1468
		1469	$self
		1470	}
		1471
		1472	sub size_request {
		1473	my ($self) = @_;
		1474
		1475	($self->{w}, $self->{h})
		1476	}
		1477
		1478	sub set_max {
		1479	my ($self, $max) = @_;
		1480	$self->{max_val} = $max;
		1481	}
		1482
		1483	sub set_value {
		1484	my ($self, $val, $max) = @_;
		1485
		1486	$self->set_max ($max)
		1487	if defined $max;
		1488
		1489	$max = $self->{max_val};
		1490	$self->{val} = $val;
		1491
		1492	$self->update;
		1493	}
		1494
		1495	sub _draw {
		1496	my ($self) = @_;
		1497
		1498	my $tex = $tex{$self->{gauge}};
		1499
		1500	my ($w, $h) = ($self->{w}, $self->{h});
		1501
		1502	my $ycut = $self->{val} / ($self->{max_val} || 1);
		1503	$ycut = 1 if $self->{val} > $self->{max_val};
		1504
		1505	my $t1 = $tex->[0];
		1506	my $t2 = $tex->[1];
		1507
		1508	glEnable GL_BLEND;
		1509	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1510	glEnable GL_TEXTURE_2D;
		1511	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1512
		1513	my $h1 = $self->{h} - $ycut * $self->{h};
		1514	my $h2 = $ycut * $self->{h};
		1515
		1516	my $yp = 0;
		1517
		1518	glBindTexture (GL_TEXTURE_2D, $t1->{name});
		1519	glBegin (GL_QUADS);
		1520	glTexCoord (0, 0); glVertex (0 , $yp);
		1521	glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1);
		1522	glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1);
		1523	glTexCoord (1, 0); glVertex (0 + $w, $yp);
		1524	glEnd ();
		1525
		1526	$yp += $h1;
		1527
		1528	glBindTexture (GL_TEXTURE_2D, $t2->{name});
		1529	glBegin (GL_QUADS);
		1530	glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp);
		1531	glTexCoord (0, 1); glVertex (0 , $yp + $h2);
		1532	glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2);
		1533	glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp);
		1534	glEnd ();
		1535
		1536	glDisable GL_BLEND;
		1537	glDisable GL_TEXTURE_2D;
		1538	}
		1539
		1540	#############################################################################
		1541
		1542	package CFClient::UI::Slider;
		1543
		1544	use strict;
		1545
		1546	use SDL::OpenGL;
		1547
		1548	our @ISA = CFClient::UI::DrawBG::;
		1549
		1550	my @tex =
		1551	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1552	qw(s1_slider.png s1_slider_bg.png);
		1553
		1554	sub new {
		1555	my $class = shift;
		1556
1307	# range [value, low, high, page]	1557	# range [value, low, high, page]
1308		1558
		1559	# TODO: 0-width page
		1560	# TODO: req_w/h are wrong with vertical
		1561	# TODO: calculations are off
1309	my $self = $class->SUPER::new (	1562	my $self = $class->SUPER::new (
1310	fg => [1, 1, 1],	1563	fg => [1, 1, 1],
1311	active_fg => [0, 0, 0],	1564	active_fg => [0, 0, 0],
1312	range => [0, 0, 100, 10],	1565	range => [0, 0, 100, 10],
1313	req_w => 40,	1566	req_w => 40,
1314	req_h => 10,	1567	req_h => 13,
1315	vertical => 0,	1568	vertical => 0,
		1569	can_hover => 1,
		1570	inner_pad => 5,
1316	@_	1571	@_
1317	);	1572	);
1318		1573
1319	$self	1574	$self
1320	}	1575	}
…		…
1341	if ($GRAB == $self) {	1596	if ($GRAB == $self) {
1342	my ($value, $lo, $hi, $page) = @{$self->{range}};	1597	my ($value, $lo, $hi, $page) = @{$self->{range}};
1343		1598
1344	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	1599	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1345		1600
		1601	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1602	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1603
		1604	$x -= $inner_pad_px; # substract the padding
1346	$x = $x * ($hi - $lo) / $w + $lo;	1605	$x = $x * ($hi - $lo) / $inner_w + $lo;
1347	$x = $lo if $x < $lo;	1606	$x = $lo if $x < $lo;
1348	$x = $hi - $page if $x > $hi - $page;	1607	$x = $hi - $page if $x > $hi - $page;
1349	$self->{range}[0] = $x;	1608	$self->{range}[0] = $x;
1350		1609
1351	$self->emit (changed => $x);	1610	$self->emit (changed => $x);
1352	$self->update;	1611	$self->update;
1353	}	1612	}
		1613	}
		1614
		1615	# the inner_* stuff is for generating a padding for the slider handle,
		1616	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1617	# correct propably, but it does the job for now
		1618	sub _calc_inner_pad_px {
		1619	my ($self, $w) = @_;
		1620	($w / 100) * $self->{inner_pad} # % to pixels
1354	}	1621	}
1355		1622
1356	sub _draw {	1623	sub _draw {
1357	my ($self) = @_;	1624	my ($self) = @_;
1358		1625
…		…
1372	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1639	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1373	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1640	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1374		1641
1375	my ($value, $lo, $hi, $page) = @{$self->{range}};	1642	my ($value, $lo, $hi, $page) = @{$self->{range}};
1376		1643
		1644	$hi = $value + 1 if $lo == $hi;
		1645
		1646	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1647	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1648
1377	$page = int $page * $w / ($hi - $lo);	1649	$page = int $page * $inner_w / ($hi - $lo);
1378	$value = int +($value - $lo) * $w / ($hi - $lo);	1650	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1379		1651
1380	$w -= $page;	1652	$w -= $page;
1381	$page &= ~1;	1653	$page &= ~1;
1382	glTranslate $page * 0.5, 0, 0;	1654	glTranslate $page * 0.5, 0, 0;
1383	$page ||= 2;	1655	$page ||= 2;
1384		1656
1385	glColor @$fg;
1386	glBegin GL_LINES;
1387	glVertex 0, 0; glVertex 0, $h;
1388	glVertex $w - 1, 0; glVertex $w - 1, $h;
1389	glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1390	glEnd;
1391
1392	my $knob_a = $value - $page * 0.5;	1657	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1393	my $knob_b = $value + $page * 0.5;	1658	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1394		1659
1395	glBegin GL_QUADS;	1660	glEnable GL_BLEND;
1396	glColor @$fg;	1661	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1397	glVertex $knob_a, 0;	1662	glEnable GL_TEXTURE_2D;
1398	glVertex $knob_a, $h;	1663	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1399	glVertex $knob_b, $h;
1400	glVertex $knob_b, 0;
1401		1664
1402	if ($knob_a < $knob_b - 2) {	1665	# draw background
1403	glColor @$bg;	1666	$tex[1]->draw_quad (0, 0, $w, $h);
1404	glVertex $knob_a + 1, 1;	1667
1405	glVertex $knob_a + 1, $h - 1;	1668	# draw handle
1406	glVertex $knob_b - 1, $h - 1;	1669	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1407	glVertex $knob_b - 1, 1;	1670
		1671	glDisable GL_BLEND;
		1672	glDisable GL_TEXTURE_2D;
		1673	}
		1674
		1675	#############################################################################
		1676
		1677	package CFClient::UI::TextView;
		1678
		1679	our @ISA = CFClient::UI::HBox::;
		1680
		1681	use SDL::OpenGL;
		1682
		1683	sub new {
		1684	my $class = shift;
		1685
		1686	my $self = $class->SUPER::new (
		1687	req_w => $::WIDTH / 6,
		1688	req_h => $::HEIGHT / 6,
		1689	fontsize => $::FONTSIZE,
		1690	@_,
		1691
		1692	layout => (new CFClient::Layout),
		1693	par => [],
		1694	height => 0,
		1695	children => [
		1696	(new CFClient::UI::Empty expand => 1),
		1697	(new CFClient::UI::Slider vertical => 1),
		1698	],
		1699	);
		1700
		1701	$self->{children}[1]->connect (changed => sub {
		1702	$self->update;
		1703	});
		1704
		1705	$self
		1706	}
		1707
		1708	sub set_fontsize {
		1709	my ($self, $fontsize) = @_;
		1710
		1711	$self->{fontsize} = $fontsize;
		1712	$self->reflow;
		1713	}
		1714
		1715	sub text_height {
		1716	my ($self, $text) = @_;
		1717
		1718	my $layout = $self->{layout};
		1719
		1720	$layout->set_height ($self->{fontsize});
		1721	$layout->set_width ($self->{w});
		1722	$layout->set_text ($text);
1408	}	1723
1409	glEnd;	1724	($layout->size)[1]
		1725	}
		1726
		1727	sub reflow {
		1728	my ($self) = @_;
		1729
		1730	$self->{need_reflow}++;
		1731	$self->update;
		1732	}
		1733
		1734	sub size_request {
		1735	my ($self) = @_;
		1736
		1737	($self->{req_w}, $self->{req_h})
		1738	}
		1739
		1740	sub size_allocate {
		1741	my ($self, $x, $y, $w, $h) = @_;
		1742
		1743	$self->SUPER::size_allocate ($x, $y, $w, $h) or return;
		1744
		1745	$self->{layout}->set_height ($self->{fontsize});
		1746	$self->{layout}->set_width ($self->{w});
		1747
		1748	$self->reflow;
		1749	$self->update;
		1750	}
		1751
		1752	sub add_paragraph {
		1753	my ($self, $color, $text) = @_;
		1754
		1755	#TODO: intelligently "reformat" paragraph
		1756
		1757	my $height = $self->text_height ($text);
		1758
		1759	$self->{height} += $height;
		1760
		1761	push @{$self->{par}}, [$height, $color, $text];
		1762
		1763	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
		1764	$self->{children}[1]->update;
		1765	}
		1766
		1767	sub update {
		1768	my ($self) = @_;
		1769
		1770	$self->SUPER::update;
		1771
		1772	return unless $self->{h} > 0;
		1773
		1774	delete $self->{texture};
		1775
		1776	$ROOT->on_refresh ($self, sub {
		1777	if (delete $self->{need_reflow}) {
		1778	my $height = 0;
		1779
		1780	$height += $_->[0] = $self->text_height ($_->[2])
		1781	for @{$self->{par}};
		1782
		1783	$self->{height} = $height;
		1784
		1785	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1786
		1787	delete $self->{texture};
		1788	}
		1789
		1790	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		1791	glClearColor 0, 0, 0, 1;
		1792	glClear GL_COLOR_BUFFER_BIT;
		1793
		1794	glEnable GL_BLEND;
		1795	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1796	glEnable GL_TEXTURE_2D;
		1797	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1798
		1799	my $top = int $self->{children}[1]{range}[0];
		1800
		1801	my $y0 = $top;
		1802	my $y1 = $top + $self->{h};
		1803
		1804	my $y = 0;
		1805
		1806	my $layout = $self->{layout};
		1807
		1808	for my $par (@{$self->{par}}) {
		1809	my $h = $par->[0];
		1810
		1811	if ($y0 < $y + $h && $y < $y1) {
		1812	$layout->set_text ($par->[2]);
		1813
		1814	glColor @{ $par->[1] };
		1815	my ($W, $H) = $layout->size;
		1816	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1817	}
		1818
		1819	$y += $h;
		1820	}
		1821
		1822	glDisable GL_TEXTURE_2D;
		1823	glDisable GL_BLEND;
		1824	};
		1825	});
		1826	}
		1827
		1828	sub _draw {
		1829	my ($self) = @_;
		1830
		1831	if ($self->{texture}) {
		1832	glEnable GL_TEXTURE_2D;
		1833	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1834	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
		1835	glDisable GL_TEXTURE_2D;
		1836	}
		1837
		1838	$self->{children}[1]->draw;
		1839
1410	}	1840	}
1411		1841
1412	#############################################################################	1842	#############################################################################
1413		1843
1414	package CFClient::UI::MapWidget;	1844	package CFClient::UI::MapWidget;
…		…
1424		1854
1425	sub new {	1855	sub new {
1426	my $class = shift;	1856	my $class = shift;
1427		1857
1428	$class->SUPER::new (	1858	$class->SUPER::new (
1429	z => -1,	1859	z => -1,
		1860	can_focus => 1,
1430	list => (glGenLists 1),	1861	list => (glGenLists 1),
1431	@_	1862	@_
1432	)	1863	)
1433	}	1864	}
1434		1865
1435	sub key_down {	1866	sub key_down {
1436	print "MAPKEYDOWN\n";	1867	print "MAPKEYDOWN\n";
1437	}	1868	}
1438		1869
1439	sub key_up {	1870	sub key_up {
		1871	}
		1872
		1873	sub button_down {
		1874	my ($self, $ev, $x, $y) = @_;
		1875
		1876	$self->focus_in;
		1877
		1878	if ($ev->button == 2) {
		1879	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1880	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1881
		1882	$self->{motion} = sub {
		1883	my ($ev, $x, $y) = @_;
		1884
		1885	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1886
		1887	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1888	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1889
		1890	$self->update;
		1891	};
		1892	}
		1893	}
		1894
		1895	sub button_up {
		1896	my ($self, $ev, $x, $y) = @_;
		1897
		1898	delete $self->{motion};
		1899	}
		1900
		1901	sub mouse_motion {
		1902	my ($self, $ev, $x, $y) = @_;
		1903
		1904	$self->{motion}->($ev, $x, $y) if $self->{motion};
1440	}	1905	}
1441		1906
1442	sub size_request {	1907	sub size_request {
1443	(	1908	(
1444	1 + 32 * int $::WIDTH / 32,	1909	1 + 32 * int $::WIDTH / 32,
…		…
1457	my ($self) = @_;	1922	my ($self) = @_;
1458		1923
1459	if (delete $self->{need_update}) {	1924	if (delete $self->{need_update}) {
1460	glNewList $self->{list}, GL_COMPILE;	1925	glNewList $self->{list}, GL_COMPILE;
1461		1926
1462	my $mx = $::CONN->{mapx};	1927	if ($::MAP) {
1463	my $my = $::CONN->{mapy};
1464
1465	my $map = $::CONN->{map};
1466
1467	my ($xofs, $yofs);
1468
1469	my $sw = 1 + int $::WIDTH / 32;	1928	my $sw = int $::WIDTH / 32;
1470	my $sh = 1 + int $::HEIGHT / 32;	1929	my $sh = int $::HEIGHT / 32;
1471		1930
1472	if ($::CONN->{mapw} > $sw) {	1931	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1473	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	1932	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1474	} else {	1933
1475	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};	1934	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1935
		1936	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
		1937
		1938	if ($::CFG->{fow_enable}) {
		1939	if ($::CFG->{fow_smooth}) { # smooth fog of war
		1940	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
		1941	glConvolutionFilter2D
		1942	GL_CONVOLUTION_2D,
		1943	GL_ALPHA,
		1944	3, 3,
		1945	GL_ALPHA, GL_FLOAT,
		1946	pack "f*",
		1947	0.1, 0.1, 0.1,
		1948	0.1, 0.2, 0.1,
		1949	0.1, 0.1, 0.1,
		1950	;
		1951	glEnable GL_CONVOLUTION_2D;
		1952	}
		1953
		1954	$self->{fow_texture} = new CFClient::Texture
		1955	w => $w,
		1956	h => $h,
		1957	data => $data,
		1958	internalformat => GL_ALPHA,
		1959	format => GL_ALPHA;
		1960
		1961	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
		1962
		1963	glEnable GL_BLEND;
		1964	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1965	glEnable GL_TEXTURE_2D;
		1966	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1967
		1968	glColor +($::CFG->{fow_intensity}) x 3, 1;
		1969	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
		1970
		1971	glDisable GL_TEXTURE_2D;
		1972	glDisable GL_BLEND;
		1973	}
		1974
		1975	# HACK BEGIN
		1976	{
		1977	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1978	my ($w, $h) = (250, 250);
		1979
		1980	glEnable GL_BLEND;
		1981	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1982	glEnable GL_TEXTURE_2D;
		1983	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1984
		1985	$self->{mapmap_texture} =
		1986	new CFClient::Texture
		1987	w => $w,
		1988	h => $h,
		1989	data => $::MAP->mapmap ($w, $h),
		1990	type => GL_UNSIGNED_INT_8_8_8_8_REV;
		1991
		1992	$self->{mapmap_texture}->draw_quad (100, 100);
		1993
		1994	glDisable GL_TEXTURE_2D;
		1995	glDisable GL_BLEND;
		1996	}
		1997	# HACK END
1476	}	1998	}
1477		1999
1478	if ($::CONN->{maph} > $sh) {
1479	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1480	} else {
1481	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1482	}
1483
1484	glEnable GL_TEXTURE_2D;
1485	glEnable GL_BLEND;
1486	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1487	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1488	glColor 1, 1, 1, 1;
1489
1490	my $sw4 = ($sw + 3) & ~3;
1491	my $darkness = "\x00" x ($sw4 * $sh);
1492
1493	for my $x (0 .. $sw - 1) {
1494	my $row = $map->[$x + $xofs];
1495	for my $y (0 .. $sh - 1) {
1496
1497	my $cell = $row->[$y + $yofs]
1498	or next;
1499
1500	my $dark = $cell->[0];
1501	if ($dark < 0) {
1502	substr $darkness, $y * $sw4 + $x, 1, chr 224;
1503	} else {
1504	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1505	}
1506
1507	for my $num (grep $_, @$cell[1,2,3]) {
1508	my $tex = $::CONN->{face}[$num]{texture} || next;
1509
1510	my ($w, $h) = @$tex{qw(w h)};
1511
1512	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1513	}
1514	}
1515	}
1516
1517	# if (1) { # higher quality darkness
1518	# $lighting =~ s/(.)/$1$1$1/gs;
1519	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1520	#
1521	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1522	#
1523	# $lighting = $pb->get_pixels;
1524	# $lighting =~ s/(.)../$1/gs;
1525	# }
1526
1527	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1528
1529	$darkness = new CFClient::Texture
1530	w => $sw4,
1531	h => $sh,
1532	data => $darkness,
1533	internalformat => GL_ALPHA,
1534	format => GL_ALPHA;
1535
1536	glColor 0.45, 0.45, 0.45, 1;
1537	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1538
1539	glDisable GL_TEXTURE_2D;
1540	glDisable GL_BLEND;
1541
1542	glEndList;	2000	glEndList;
1543	}	2001	}
1544		2002
		2003	glPushMatrix;
1545	glCallList $self->{list};	2004	glCallList $self->{list};
		2005	glPopMatrix;
1546		2006
1547	if ($FOCUS != $self) {	2007	if ($FOCUS != $self) {
1548	glEnable GL_BLEND;	2008	glColor 64/255, 64/255, 64/255;
1549	glColor 0, 0, 1, 0.4;	2009	glLogicOp GL_AND;
		2010	glEnable GL_COLOR_LOGIC_OP;
1550	glBegin GL_QUADS;	2011	glBegin GL_QUADS;
1551	glVertex 0, 0;	2012	glVertex 0, 0;
1552	glVertex 0, $::HEIGHT;	2013	glVertex 0, $::HEIGHT;
1553	glVertex $::WIDTH, $::HEIGHT;	2014	glVertex $::WIDTH, $::HEIGHT;
1554	glVertex $::WIDTH, 0;	2015	glVertex $::WIDTH, 0;
1555	glEnd;	2016	glEnd;
1556	glDisable GL_BLEND;	2017	glDisable GL_COLOR_LOGIC_OP;
1557	}	2018	}
1558	}	2019	}
1559		2020
1560	my %DIR = (	2021	my %DIR = (
1561	SDLK_KP8, [1, "north"],	2022	SDLK_KP8, [1, "north"],
…		…
1578		2039
1579	my $mod = $ev->key_mod;	2040	my $mod = $ev->key_mod;
1580	my $sym = $ev->key_sym;	2041	my $sym = $ev->key_sym;
1581		2042
1582	if ($sym == SDLK_KP5) {	2043	if ($sym == SDLK_KP5) {
1583	$::CONN->send ("command stay fire");	2044	$::CONN->user_send ("stay fire");
1584	} elsif ($sym == SDLK_a) {	2045	} elsif ($sym == SDLK_a) {
1585	$::CONN->send ("command apply");	2046	$::CONN->user_send ("apply");
		2047	} elsif ($sym == SDLK_QUOTE) {
		2048	$self->emit ('activate_console');
		2049	} elsif ($sym == SDLK_SLASH) {
		2050	$self->emit ('activate_console' => '/');
1586	} elsif (exists $DIR{$sym}) {	2051	} elsif (exists $DIR{$sym}) {
1587	if ($mod & KMOD_SHIFT) {	2052	if ($mod & KMOD_SHIFT) {
1588	$self->{shft}++;	2053	$self->{shft}++;
1589	$::CONN->send ("command fire $DIR{$sym}[0]");	2054	$::CONN->user_send ("fire $DIR{$sym}[0]");
1590	} elsif ($mod & KMOD_CTRL) {	2055	} elsif ($mod & KMOD_CTRL) {
1591	$self->{ctrl}++;	2056	$self->{ctrl}++;
1592	$::CONN->send ("command run $DIR{$sym}[0]");	2057	$::CONN->user_send ("run $DIR{$sym}[0]");
1593	} else {	2058	} else {
1594	$::CONN->send ("command $DIR{$sym}[1]");	2059	$::CONN->user_send ("$DIR{$sym}[1]");
1595	}	2060	}
1596	}	2061	}
1597	}	2062	}
1598		2063
1599	sub key_up {	2064	sub key_up {
…		…
1601		2066
1602	my $mod = $ev->key_mod;	2067	my $mod = $ev->key_mod;
1603	my $sym = $ev->key_sym;	2068	my $sym = $ev->key_sym;
1604		2069
1605	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	2070	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1606	$::CONN->send ("command fire_stop");	2071	$::CONN->user_send ("fire_stop");
1607	}	2072	}
1608	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	2073	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1609	$::CONN->send ("command run_stop");	2074	$::CONN->user_send ("run_stop");
1610	}	2075	}
1611	}	2076	}
1612		2077
1613	#############################################################################	2078	#############################################################################
1614		2079
…		…
1652	glPopMatrix;	2117	glPopMatrix;
1653	}	2118	}
1654		2119
1655	#############################################################################	2120	#############################################################################
1656		2121
1657	package CFClient::UI::Toplevel;	2122	package CFClient::UI::Flopper;
		2123
		2124	our @ISA = CFClient::UI::Button::;
		2125
		2126	sub new {
		2127	my $class = shift;
		2128
		2129	my $self = $class->SUPER::new (
		2130	state => 0,
		2131	connect_activate => \&toggle_flopper,
		2132	@_
		2133	);
		2134
		2135	if ($self->{state}) {
		2136	$self->{state} = 0;
		2137	$self->toggle_flopper;
		2138	}
		2139
		2140	$self
		2141	}
		2142
		2143	sub toggle_flopper {
		2144	my ($self) = @_;
		2145
		2146	# TODO: use animation
		2147	if ($self->{state} = !$self->{state}) {
		2148	$CFClient::UI::ROOT->add ($self->{other});
		2149	$self->{other}->move ($self->coord2global (0, $self->{h}));
		2150	$self->emit ("open");
		2151	} else {
		2152	$CFClient::UI::ROOT->remove ($self->{other});
		2153	$self->emit ("close");
		2154	}
		2155
		2156	$self->emit (changed => $self->{state});
		2157	}
		2158
		2159	#############################################################################
		2160
		2161	package CFClient::UI::Root;
1658		2162
1659	our @ISA = CFClient::UI::Container::;	2163	our @ISA = CFClient::UI::Container::;
		2164
		2165	use SDL::OpenGL;
		2166
		2167	sub check_size {
		2168	my ($self) = @_;
		2169
		2170	$self->size_allocate (0, 0, $::WITH, $::HEIGHT);
		2171	}
1660		2172
1661	sub size_request {	2173	sub size_request {
1662	($::WIDTH, $::HEIGHT)	2174	($::WIDTH, $::HEIGHT)
1663	}	2175	}
1664		2176
…		…
1669		2181
1670	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	2182	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1671	for @{$self->{children}};	2183	for @{$self->{children}};
1672	}	2184	}
1673		2185
1674	sub translate {	2186	sub _topleft {
1675	my ($self, $x, $y) = @_;	2187	my ($self, $x, $y) = @_;
1676		2188
1677	($x, $y)	2189	($x, $y)
1678	}	2190	}
1679		2191
1680	sub update {	2192	sub update {
1681	my ($self) = @_;	2193	my ($self) = @_;
1682		2194
1683	$self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);	2195	$self->check_size;
1684	::refresh ();	2196	::refresh ();
1685	}	2197	}
1686		2198
1687	sub add {	2199	sub add {
1688	my ($self, $widget) = @_;	2200	my ($self, $widget) = @_;
1689		2201
1690	$self->SUPER::add ($widget);	2202	$self->SUPER::add ($widget);
1691		2203
1692	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	2204	$widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
		2205	}
		2206
		2207	sub on_refresh {
		2208	my ($self, $id, $cb) = @_;
		2209
		2210	$self->{refresh_hook}{$id} = $cb;
1693	}	2211	}
1694		2212
1695	sub draw {	2213	sub draw {
1696	my ($self) = @_;	2214	my ($self) = @_;
1697		2215
		2216	while (my $rcb = delete $self->{refresh_hook}) {
		2217	$_->() for values %$rcb;
		2218	}
		2219
		2220	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2221	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2222	glClear GL_COLOR_BUFFER_BIT;
		2223
		2224	glMatrixMode GL_PROJECTION;
		2225	glLoadIdentity;
		2226	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2227	glMatrixMode GL_MODELVIEW;
		2228	glLoadIdentity;
		2229
1698	$self->_draw;	2230	$self->_draw;
1699	}	2231	}
1700		2232
1701	#############################################################################	2233	#############################################################################
1702		2234
1703	package CFClient::UI;	2235	package CFClient::UI;
1704		2236
1705	$TOPLEVEL = new CFClient::UI::Toplevel;	2237	$ROOT = new CFClient::UI::Root;
1706		2238
1707	1	2239	1
1708		2240

Diff Legend

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