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

Diff Legend

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