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.76 by root, Tue Apr 11 21:24:09 2006 UTC vs.
Revision 1.124 by elmex, Mon Apr 17 20:29:37 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_down ($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;
…		…
79	use SDL::OpenGL;	92	use SDL::OpenGL;
80		93
81	sub new {	94	sub new {
82	my $class = shift;	95	my $class = shift;
83		96
84	bless {	97	my $self = bless {
85	x => 0,	98	x => 0,
86	y => 0,	99	y => 0,
87	z => 0,	100	z => 0,
88	w => -1,	101	w => -1,
89	h => -1,	102	h => -1,
90	@_	103	@_
91	}, $class	104	}, $class;
		105
		106	for (keys %$self) {
		107	if (/^connect_(.*)$/) {
		108	$self->connect ($1 => delete $self->{$_});
		109	}
		110	}
		111
		112	$self
92	}	113	}
93		114
94	sub move {	115	sub move {
95	my ($self, $x, $y, $z) = @_;	116	my ($self, $x, $y, $z) = @_;
96	$self->{x} = $x;	117	$self->{x} = int $x;
97	$self->{y} = $y;	118	$self->{y} = int $y;
98	$self->{z} = $z if defined $z;	119	$self->{z} = $z if defined $z;
99	}	120	}
100		121
101	sub needs_redraw {	122	sub needs_redraw {
102	0	123	0
…		…
125	my ($self, $x, $y, $w, $h) = @_;	146	my ($self, $x, $y, $w, $h) = @_;
126		147
127	$self->_size_allocate ($x, $y, $w, $h);	148	$self->_size_allocate ($x, $y, $w, $h);
128	}	149	}
129		150
130	# translate global koordinates to local coordinate system	151	# return top left coordinates
131	sub translate {	152	sub _topleft {
132	my ($self, $x, $y) = @_;	153	my ($self, $x, $y) = @_;
133		154
134	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});	155	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
		156	}
		157
		158	# translate global coordinates to local coordinate system
		159	sub coord2local {
		160	my ($self, $x, $y) = @_;
		161
		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)
135	}	172	}
136		173
137	sub focus_in {	174	sub focus_in {
138	my ($self) = @_;	175	my ($self) = @_;
139		176
140	return if $FOCUS == $self;	177	return if $FOCUS == $self;
		178	return unless $self->{can_focus};
141		179
142	my $focus = $FOCUS; $FOCUS = $self;	180	my $focus = $FOCUS; $FOCUS = $self;
		181
		182	$self->emit (focus_in => $focus);
		183
143	$focus->update if $focus;	184	$focus->update if $focus;
144	$FOCUS->update;	185	$FOCUS->update;
145	}	186	}
146		187
147	sub focus_out {	188	sub focus_out {
148	my ($self) = @_;	189	my ($self) = @_;
149		190
150	return unless $FOCUS == $self;	191	return unless $FOCUS == $self;
151		192
152	my $focus = $FOCUS; undef $FOCUS;	193	my $focus = $FOCUS; undef $FOCUS;
		194
		195	$self->emit (focus_out => $focus);
		196
153	$focus->update if $focus; #?	197	$focus->update if $focus; #?
154	}	198	}
155		199
156	sub mouse_motion { }	200	sub mouse_motion { }
157	sub button_up { }	201	sub button_up { }
…		…
178	glPushMatrix;	222	glPushMatrix;
179	glTranslate $self->{x}, $self->{y}, 0;	223	glTranslate $self->{x}, $self->{y}, 0;
180	$self->_draw;	224	$self->_draw;
181	glPopMatrix;	225	glPopMatrix;
182		226
183	if ($self == $HOVER) {	227	if ($self == $HOVER && $self->{can_hover}) {
184	my ($x, $y) = @$self{qw(x y)};	228	my ($x, $y) = @$self{qw(x y)};
185		229
186	glColor 0, 0, 1, 0.2;	230	glColor 1, 0.8, 0.5, 0.2;
187	glEnable GL_BLEND;	231	glEnable GL_BLEND;
188	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	232	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
189	glBegin GL_QUADS;	233	glBegin GL_QUADS;
190	glVertex $x , $y;	234	glVertex $x , $y;
191	glVertex $x + $self->{w}, $y;	235	glVertex $x + $self->{w}, $y;
…		…
200	my ($self) = @_;	244	my ($self) = @_;
201		245
202	warn "no draw defined for $self\n";	246	warn "no draw defined for $self\n";
203	}	247	}
204		248
205	sub bbox {
206	my ($self) = @_;
207	my ($w, $h) = $self->size_request;
208	(
209	$self->{x},
210	$self->{y},
211	$self->{x} = $w,
212	$self->{y} = $h
213	)
214	}
215
216	sub find_widget {	249	sub find_widget {
217	my ($self, $x, $y) = @_;	250	my ($self, $x, $y) = @_;
218		251
219	return $self	252	return $self
220	if $x >= $self->{x} && $x < $self->{x} + $self->{w}	253	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
221	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};	254	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
222		255
223	()	256	()
224	}	257	}
225		258
226	sub del_parent { $_[0]->{parent} = undef }
227
228	sub set_parent {	259	sub set_parent {
229	my ($self, $par) = @_;	260	my ($self, $parent) = @_;
230		261
231	$self->{parent} = $par;
232	Scalar::Util::weaken $self->{parent};	262	Scalar::Util::weaken ($self->{parent} = $parent);
233	}
234
235	sub get_parent {
236	$_[0]->{parent}
237	}	263	}
238		264
239	sub update {	265	sub update {
240	my ($self) = @_;	266	my ($self) = @_;
241		267
…		…
276		302
277	# range [value, low, high, page]	303	# range [value, low, high, page]
278		304
279	$class->SUPER::new (	305	$class->SUPER::new (
280	bg => [0, 0, 0, 0.2],	306	bg => [0, 0, 0, 0.2],
281	active_bg => [1, 1, 1],	307	active_bg => [1, 1, 1, 0.5],
282	@_	308	@_
283	)	309	)
284	}	310	}
285		311
286	sub _draw {	312	sub _draw {
…		…
330		356
331	$self	357	$self
332	}	358	}
333		359
334	sub add {	360	sub add {
335	my ($self, $chld, $expand) = @_;	361	my ($self, $child) = @_;
336		362
337	$chld->{expand} = $expand;
338	$chld->set_parent ($self);	363	$child->set_parent ($self);
		364
		365	use sort 'stable';
339		366
340	$self->{children} = [	367	$self->{children} = [
341	sort { $a->{z} <=> $b->{z} }	368	sort { $a->{z} <=> $b->{z} }
342	@{$self->{children}}, $chld	369	@{$self->{children}}, $child
343	];	370	];
344		371
345	$self->{w} = $self->{h} = -1;	372	$self->{w} = $self->{h} = -1;
346	$self->update;	373	$self->update;
347	}	374	}
…		…
444	}	471	}
445		472
446	sub render_chld {	473	sub render_chld {
447	my ($self) = @_;	474	my ($self) = @_;
448		475
449	$self->{texture} =	476	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
450	CFClient::Texture->new_from_opengl (	477	glClearColor 0, 0, 0, 1;
451	$self->{w}, $self->{h}, sub { $self->child->draw }	478	glClear GL_COLOR_BUFFER_BIT;
452	);	479	$self->child->draw;
		480	};
453	}	481	}
454		482
455	sub size_allocate {	483	sub size_allocate {
456	my ($self, $x, $y, $w, $h) = @_;	484	my ($self, $x, $y, $w, $h) = @_;
457		485
…		…
535		563
536	my @tex =	564	my @tex =
537	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	565	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
538	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	566	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
539		567
		568	sub new {
		569	my $class = shift;
		570
		571	# TODO: user_x, user_y, overwrite moveto?
		572
		573	$class->SUPER::new (
		574	bg => [1, 1, 1, 1],
		575	border_bg => [1, 1, 1, 1],
		576	border => int $::FONTSIZE * 0.8,
		577	@_
		578	)
		579	}
		580
540	sub size_request {	581	sub size_request {
541	my ($self) = @_;	582	my ($self) = @_;
542		583
		584	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
		585
543	my ($w, $h) = $self->SUPER::size_request;	586	my ($w, $h) = $self->SUPER::size_request;
544		587
545	$h += $tex[1]->{h};	588	(
546	$h += $tex[4]->{h};	589	$w + $self->{border} * 2,
547	$w += $tex[2]->{w};	590	$h + $self->{border} * 2,
548	$w += $tex[3]->{w};	591	)
549
550	($w, $h)
551	}	592	}
552		593
553	sub size_allocate {	594	sub size_allocate {
554	my ($self, $x, $y, $w, $h) = @_;	595	my ($self, $x, $y, $w, $h) = @_;
555		596
556	$self->_size_allocate ($x, $y, $w, $h) or return;	597	$self->_size_allocate ($x, $y, $w, $h) or return;
557		598
558	$h -= $tex[1]->{h};	599	$h -= List::Util::max 0, $self->{border} * 2;
559	$h -= $tex[4]->{h};	600	$w -= List::Util::max 0, $self->{border} * 2;
560	$w -= $tex[2]->{w};
561	$w -= $tex[3]->{w};
562		601
563	$h = $h < 0 ? 0 : $h;	602	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
564	$w = $w < 0 ? 0 : $w;	603	}
565		604
566	my $child = $self->child;	605	sub button_down {
		606	my ($self, $ev, $x, $y) = @_;
567		607
568	$child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);	608	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
		609	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
		610
		611	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		612	my ($bw, $bh) = ($self->{w}, $self->{h});
		613
		614	$self->{motion} = sub {
		615	my ($ev, $x, $y) = @_;
		616
		617	($x, $y) = ($ev->motion_x, $ev->motion_y);
		618
		619	$self->{user_w} = $bw + $x - $ox;
		620	$self->{user_h} = $bh + $y - $oy;
		621	$self->update;
		622	};
		623
		624	} elsif ($x >= 0 && $x < $self->{w}
		625	&& $y >= 0 && $y < $self->{border}) {
		626
		627	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		628	my ($bx, $by) = ($self->{x}, $self->{y});
		629
		630	$self->{motion} = sub {
		631	my ($ev, $x, $y) = @_;
		632
		633	($x, $y) = ($ev->motion_x, $ev->motion_y);
		634
		635	$self->move ($bx + $x - $ox, $by + $y - $oy);
		636	$self->update;
		637	};
		638	}
		639	}
		640
		641	sub button_up {
		642	my ($self, $ev, $x, $y) = @_;
		643
		644	delete $self->{motion};
		645	}
		646
		647	sub mouse_motion {
		648	my ($self, $ev, $x, $y) = @_;
		649
		650	$self->{motion}->($ev, $x, $y) if $self->{motion};
569	}	651	}
570		652
571	sub _draw {	653	sub _draw {
572	my ($self) = @_;	654	my ($self) = @_;
573		655
574	my ($w, $h) = ($self->{w}, $self->{h});	656	my ($w, $h ) = ($self->{w}, $self->{h});
575	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	657	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
576		658
577	glEnable GL_BLEND;	659	glEnable GL_BLEND;
578	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	660	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
579	glEnable GL_TEXTURE_2D;	661	glEnable GL_TEXTURE_2D;
580	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	662	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
581		663
582	my $top = $tex[1];	664	glColor @{ $self->{border_bg} };
583	$top->draw_quad (0, 0, $w, $top->{h});	665	$tex[1]->draw_quad (0, 0, $w, $self->{border});
584		666	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
585	my $left = $tex[3];	667	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
586	$left->draw_quad (0, $top->{h}, $left->{w}, $ch);	668	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
587
588	my $right = $tex[2];
589	$right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
590
591	my $bottom = $tex[4];
592	$bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
593		669
594	my $bg = $tex[0];	670	my $bg = $tex[0];
595		671
596	glBindTexture GL_TEXTURE_2D, $bg->{name};	672	# TODO: repeat texture not scale
597	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
598	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
599	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
600
601	my $rep_x = $cw / $bg->{w};	673	my $rep_x = $cw / $bg->{w};
602	my $rep_y = $ch / $bg->{h};	674	my $rep_y = $ch / $bg->{h};
603		675
		676	glColor @{ $self->{bg} };
		677
		678	$bg->{s} = $rep_x;
		679	$bg->{t} = $rep_y;
		680	$bg->{wrap_mode} = 1;
604	$bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);	681	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
605		682
606	glDisable GL_TEXTURE_2D;	683	glDisable GL_TEXTURE_2D;
607	glDisable GL_BLEND;	684	glDisable GL_BLEND;
608		685
609	$self->child->draw;	686	$self->child->draw;
610
611	}	687	}
612		688
613	#############################################################################	689	#############################################################################
614		690
615	package CFClient::UI::Table;	691	package CFClient::UI::Table;
…		…
618		694
619	use List::Util qw(max sum);	695	use List::Util qw(max sum);
620		696
621	use SDL::OpenGL;	697	use SDL::OpenGL;
622		698
		699	sub new {
		700	my $class = shift;
		701
		702	$class->SUPER::new (
		703	col_expand => [],
		704	@_
		705	)
		706	}
		707
623	sub add {	708	sub add {
624	my ($self, $x, $y, $chld) = @_;	709	my ($self, $x, $y, $child) = @_;
625		710
		711	$child->set_parent ($self);
626	$self->{children}[$y][$x] = $chld;	712	$self->{children}[$y][$x] = $child;
627	$chld->set_parent ($self);
628		713
629	$self->{w} = $self->{h} = -1;	714	$self->{w} = $self->{h} = -1;
		715	$self->update;
		716	}
		717
		718	# TODO: move to container class maybe? send childs a signal on removal?
		719	sub clear {
		720	my ($self) = @_;
		721
		722	delete $self->{children};
630	$self->update;	723	$self->update;
631	}	724	}
632		725
633	sub get_wh {	726	sub get_wh {
634	my ($self) = @_;	727	my ($self) = @_;
…		…
656	my ($self) = @_;	749	my ($self) = @_;
657		750
658	my ($ws, $hs) = $self->get_wh;	751	my ($ws, $hs) = $self->get_wh;
659		752
660	(	753	(
661	(List::Util::sum @$ws),	754	(sum @$ws),
662	(List::Util::sum @$hs),	755	(sum @$hs),
663	)	756	)
664	}	757	}
665		758
666	sub size_allocate {	759	sub size_allocate {
667	my ($self, $x, $y, $w, $h) = @_;	760	my ($self, $x, $y, $w, $h) = @_;
668		761
669	$self->_size_allocate ($x, $y, $w, $h) or return;	762	$self->_size_allocate ($x, $y, $w, $h) or return;
670		763
671	my ($ws, $hs) = $self->get_wh;	764	my ($ws, $hs) = $self->get_wh;
672		765
673	my $req_w = List::Util::sum @$ws;	766	my $req_w = sum @$ws;
674	my $req_h = List::Util::sum @$hs;	767	my $req_h = sum @$hs;
		768
		769	# TODO: nicer code && do row_expand
		770	my @col_expand = @{$self->{col_expand}};
		771	@col_expand = (1) x @$ws unless @col_expand;
		772	my $col_expand = (sum @col_expand) || 1;
675		773
676	# linearly scale sizes	774	# linearly scale sizes
677	$_ *= $req_w / $w for @$ws;	775	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
678	$_ *= $req_h / $h for @$hs;	776	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
		777
		778	CFClient::UI::harmonize $ws;
		779	CFClient::UI::harmonize $hs;
679		780
680	my $y;	781	my $y;
681		782
682	for my $r (0 .. $#{$self->{children}}) {	783	for my $r (0 .. $#{$self->{children}}) {
683	my $row = $self->{children}[$r]	784	my $row = $self->{children}[$r]
…		…
685		786
686	my $x = 0;	787	my $x = 0;
687	my $row_h = $hs->[$r];	788	my $row_h = $hs->[$r];
688		789
689	for my $c (0 .. $#$row) {	790	for my $c (0 .. $#$row) {
690	my $widget = $row->[$c]
691	or next;
692
693	my $col_w = $ws->[$c];	791	my $col_w = $ws->[$c];
694		792
		793	if (my $widget = $row->[$c]) {
695	$widget->size_allocate ($x, $y, $col_w, $row_h);	794	$widget->size_allocate ($x, $y, $col_w, $row_h);
		795	}
696		796
697	$x += $col_w;	797	$x += $col_w;
698	}	798	}
699		799
700	$y += $row_h;	800	$y += $row_h;
…		…
746	}	846	}
747		847
748	sub size_allocate {	848	sub size_allocate {
749	my ($self, $x, $y, $w, $h) = @_;	849	my ($self, $x, $y, $w, $h) = @_;
750		850
751	$self->_size_allocate ($x, $y, $w, $h) or return;	851	$self->_size_allocate ($x, $y, $w, $h);
752
753	return unless $self->{w};
754		852
755	($h, $w) = ($w, $h);	853	($h, $w) = ($w, $h);
756		854
757	my $children = $self->{children};	855	my $children = $self->{children};
758		856
…		…
760		858
761	my $req_h = List::Util::sum @h;	859	my $req_h = List::Util::sum @h;
762		860
763	if ($req_h > $h) {	861	if ($req_h > $h) {
764	# ah well, not enough space	862	# ah well, not enough space
765	$_ = $h[$_] * $h / $req_h for @h;	863	$_ *= $h / $req_h for @h;
766	} else {	864	} else {
767	my @exp = grep $_->{expand}, @$children;	865	my $exp = List::Util::sum map $_->{expand}, @$children;
768	@exp = @$children unless @exp;	866	$exp ||= 1;
769		867
770	my %exp = map +($_ => 1), @exp;
771
772	for (0 .. $#$children) {	868	for (0 .. $#$children) {
773	my $child = $children->[$_];	869	my $child = $children->[$_];
774		870
775	my $alloc_h = $h[$_];	871	my $alloc_h = $h[$_];
776	$alloc_h += ($h - $req_h) / @exp if $exp{$child};	872	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
777	$h[$_] = $alloc_h;	873	$h[$_] = $alloc_h;
778	}	874	}
779	}	875	}
		876
		877	CFClient::UI::harmonize \@h;
780		878
781	my $y = 0;	879	my $y = 0;
782	for (0 .. $#$children) {	880	for (0 .. $#$children) {
783	my $child = $children->[$_];	881	my $child = $children->[$_];
784	my $h = $h[$_];	882	my $h = $h[$_];
…		…
808	}	906	}
809		907
810	sub size_allocate {	908	sub size_allocate {
811	my ($self, $x, $y, $w, $h) = @_;	909	my ($self, $x, $y, $w, $h) = @_;
812		910
813	$self->_size_allocate ($x, $y, $w, $h) or return;	911	$self->_size_allocate ($x, $y, $w, $h);
814
815	return unless $self->{h};
816		912
817	my $children = $self->{children};	913	my $children = $self->{children};
818		914
819	my @h = map +($_->size_request)[1], @$children;	915	my @h = map +($_->size_request)[1], @$children;
820		916
821	my $req_h = List::Util::sum @h;	917	my $req_h = List::Util::sum @h;
822		918
823	if ($req_h > $h) {	919	if ($req_h > $h) {
824	# ah well, not enough space	920	# ah well, not enough space
825	$_ = $h[$_] * $h / $req_h for @h;	921	$_ *= $h / $req_h for @h;
826	} else {	922	} else {
827	my @exp = grep $_->{expand}, @$children;	923	my $exp = List::Util::sum map $_->{expand}, @$children;
828	@exp = @$children unless @exp;	924	$exp ||= 1;
829		925
830	my %exp = map +($_ => 1), @exp;
831
832	for (0 .. $#$children) {	926	for (0 .. $#$children) {
833	my $child = $children->[$_];	927	my $child = $children->[$_];
834		928
835	my $alloc_h = $h[$_];	929	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
836	$alloc_h += ($h - $req_h) / @exp if $exp{$child};
837	$h[$_] = $alloc_h;
838	}	930	}
839	}	931	}
		932
		933	CFClient::UI::harmonize \@h;
840		934
841	my $y = 0;	935	my $y = 0;
842	for (0 .. $#$children) {	936	for (0 .. $#$children) {
843	my $child = $children->[$_];	937	my $child = $children->[$_];
844	my $h = $h[$_];	938	my $h = $h[$_];
…		…
858		952
859	sub new {	953	sub new {
860	my ($class, %arg) = @_;	954	my ($class, %arg) = @_;
861		955
862	my $self = $class->SUPER::new (	956	my $self = $class->SUPER::new (
863	fg => [1, 1, 1],	957	fg => [1, 1, 1],
864	height => $::FONTSIZE,	958	fontsize => $::FONTSIZE,
865	text => "",	959	text => "",
866	align => -1,	960	align => -1,
		961	valign => -1,
867	padding => 2,	962	padding => 2,
868	layout => new CFClient::Layout,	963	layout => new CFClient::Layout,
869	%arg	964	%arg
870	);	965	);
871		966
872	$self->set_text ($self->{text});	967	$self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
		968
		969	$self->set_text (delete $self->{text}) if exists $self->{text};
		970	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
873		971
874	$self	972	$self
875	}	973	}
876		974
877	sub escape_text {	975	sub escape_text {
…		…
885	}	983	}
886		984
887	sub set_text {	985	sub set_text {
888	my ($self, $text) = @_;	986	my ($self, $text) = @_;
889		987
890	$self->{text} = $text;
891	$self->{layout}->set_markup ($text);	988	$self->{layout}->set_text ($text);
892		989
893	delete $self->{texture};	990	delete $self->{texture};
894	$self->update;	991	$self->update;
895	}	992	}
896		993
897	sub get_text {	994	sub set_markup {
898	my ($self, $text) = @_;	995	my ($self, $markup) = @_;
899		996
900	$self->{text}	997	$self->{layout}->set_markup ($markup);
		998
		999	delete $self->{texture};
		1000	$self->update;
901	}	1001	}
902		1002
903	sub size_request {	1003	sub size_request {
904	my ($self) = @_;	1004	my ($self) = @_;
905		1005
906	$self->{layout}->set_width;	1006	$self->{layout}->set_width;
907	$self->{layout}->set_height ($self->{height});	1007	$self->{layout}->set_height ($self->{fontsize});
		1008
908	my ($w, $h) = $self->{layout}->size;	1009	my ($w, $h) = $self->{layout}->size;
909		1010
910	(	1011	(
911	$w + $self->{padding} * 2,	1012	$w + $self->{padding} * 2,
912	$h + $self->{padding} * 2,	1013	$h + $self->{padding} * 2,
…		…
931	sub _draw {	1032	sub _draw {
932	my ($self) = @_;	1033	my ($self) = @_;
933		1034
934	my $tex = $self->{texture} ||= do {	1035	my $tex = $self->{texture} ||= do {
935	$self->{layout}->set_width ($self->{w});	1036	$self->{layout}->set_width ($self->{w});
		1037	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
936	new_from_layout CFClient::Texture $self->{layout}	1038	new_from_layout CFClient::Texture $self->{layout}
937	};	1039	};
938		1040
939	glEnable GL_BLEND;	1041	glEnable GL_BLEND;
940	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1042	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
941	glEnable GL_TEXTURE_2D;	1043	glEnable GL_TEXTURE_2D;
942	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1044	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
943		1045
944	glColor @{$self->{fg}};	1046	glColor @{$self->{fg}};
945		1047
946	my $x =	1048	$self->{ox} = int (
947	$self->{align} < 0 ? $self->{padding}	1049	$self->{align} < 0 ? $self->{padding}
948	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1050	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
949	: ($self->{w} - $tex->{w}) * 0.5;	1051	: ($self->{w} - $tex->{w}) * 0.5
		1052	);
950		1053
951	$tex->draw_quad ($x, 0);	1054	$self->{oy} = int (
		1055	$self->{valign} < 0 ? $self->{padding}
		1056	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1057	: ($self->{h} - $tex->{h}) * 0.5
		1058	);
		1059
		1060	$tex->draw_quad ($self->{ox}, $self->{oy});
952		1061
953	glDisable GL_TEXTURE_2D;	1062	glDisable GL_TEXTURE_2D;
954	glDisable GL_BLEND;	1063	glDisable GL_BLEND;
955	}	1064	}
956		1065
957	#############################################################################	1066	#############################################################################
958		1067
959	package CFClient::UI::Entry;	1068	package CFClient::UI::EntryBase;
960		1069
961	our @ISA = CFClient::UI::Label::;	1070	our @ISA = CFClient::UI::Label::;
962		1071
963	use SDL;	1072	use SDL;
964	use SDL::OpenGL;	1073	use SDL::OpenGL;
…		…
967	my $class = shift;	1076	my $class = shift;
968		1077
969	$class->SUPER::new (	1078	$class->SUPER::new (
970	fg => [1, 1, 1],	1079	fg => [1, 1, 1],
971	bg => [0, 0, 0, 0.2],	1080	bg => [0, 0, 0, 0.2],
972	active_bg => [1, 1, 1],	1081	active_bg => [1, 1, 1, 0.5],
973	active_fg => [0, 0, 0],	1082	active_fg => [0, 0, 0],
		1083	can_hover => 1,
		1084	can_focus => 1,
		1085	valign => 0,
974	@_	1086	@_
975	)	1087	)
976	}	1088	}
977		1089
978	sub _set_text {	1090	sub _set_text {
979	my ($self, $text) = @_;	1091	my ($self, $text) = @_;
980		1092
		1093	delete $self->{cur_h};
		1094
		1095	return if $self->{text} eq $text;
		1096
981	$self->{last_activity} = $::NOW;	1097	$self->{last_activity} = $::NOW;
982
983	$self->{text} = $text;	1098	$self->{text} = $text;
984	$self->{layout}->set_width ($self->{w});
985		1099
986	$text =~ s/./*/g if $self->{hidden};	1100	$text =~ s/./*/g if $self->{hidden};
		1101	$self->{layout}->set_text ("$text ");
987		1102
988	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1103	$self->emit (changed => $self->{text});
		1104	}
989		1105
990	$text = substr $text, 0, $self->{cursor};	1106	sub get_text {
991	utf8::encode $text;	1107	$_[0]{text}
992
993	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
994	}	1108	}
995		1109
996	sub size_request {	1110	sub size_request {
997	my ($self) = @_;	1111	my ($self) = @_;
998		1112
…		…
1037	++$self->{cursor} if $self->{cursor} < length $self->{text};	1151	++$self->{cursor} if $self->{cursor} < length $self->{text};
1038	} elsif ($sym == SDLK_HOME) {	1152	} elsif ($sym == SDLK_HOME) {
1039	$self->{cursor} = 0;	1153	$self->{cursor} = 0;
1040	} elsif ($sym == SDLK_END) {	1154	} elsif ($sym == SDLK_END) {
1041	$self->{cursor} = length $text;	1155	$self->{cursor} = length $text;
		1156	} elsif ($sym == SDLK_ESCAPE) {
		1157	$self->emit ('escape');
1042	} elsif ($uni) {	1158	} elsif ($uni) {
1043	substr $text, $self->{cursor}++, 0, chr $uni;	1159	substr $text, $self->{cursor}++, 0, chr $uni;
1044	}	1160	}
1045		1161
1046	$self->_set_text ($text);	1162	$self->_set_text ($text);
…		…
1100		1216
1101	$self->SUPER::_draw;	1217	$self->SUPER::_draw;
1102		1218
1103	#TODO: force update every cursor change :(	1219	#TODO: force update every cursor change :(
1104	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {	1220	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
		1221
		1222	unless (exists $self->{cur_h}) {
		1223	my $text = substr $self->{text}, 0, $self->{cursor};
		1224	utf8::encode $text;
		1225
		1226	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
		1227	}
		1228
1105	glColor @{$self->{fg}};	1229	glColor @{$self->{fg}};
1106	glBegin GL_LINES;	1230	glBegin GL_LINES;
1107	glVertex $self->{cur_x}, $self->{cur_y};
1108	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1231	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
		1232	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1109	glEnd;	1233	glEnd;
1110	}	1234	}
1111	}	1235	}
1112		1236
1113	#############################################################################
1114
1115	package CFClient::UI::Slider;	1237	package CFClient::UI::Entry;
1116		1238
1117	use strict;	1239	our @ISA = CFClient::UI::EntryBase::;
1118		1240
		1241	use SDL;
1119	use SDL::OpenGL;	1242	use SDL::OpenGL;
1120		1243
		1244	sub key_down {
		1245	my ($self, $ev) = @_;
		1246
		1247	my $sym = $ev->key_sym;
		1248
		1249	if ($sym == SDLK_RETURN) {
		1250	$self->emit (activate => $self->get_text);
		1251	$self->update;
		1252
		1253	} else {
		1254	$self->SUPER::key_down ($ev);
		1255	}
		1256
		1257	}
		1258
		1259	#############################################################################
		1260
		1261	package CFClient::UI::Button;
		1262
1121	our @ISA = CFClient::UI::DrawBG::;	1263	our @ISA = CFClient::UI::Label::;
		1264
		1265	use SDL;
		1266	use SDL::OpenGL;
		1267
		1268	my @tex =
		1269	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1270	qw(b1_button_active.png);
1122		1271
1123	sub new {	1272	sub new {
1124	my $class = shift;	1273	my $class = shift;
1125		1274
		1275	$class->SUPER::new (
		1276	padding => 4,
		1277	fg => [1, 1, 1],
		1278	bg => [1, 1, 1, 0.2],
		1279	active_fg => [0, 0, 1],
		1280	can_hover => 1,
		1281	@_
		1282	)
		1283	}
		1284
		1285	sub button_up {
		1286	my ($self, $ev, $x, $y) = @_;
		1287
		1288	if ($x >= 0 && $x < $self->{w}
		1289	&& $y >= 0 && $y < $self->{h}) {
		1290	$self->emit ("activate");
		1291	}
		1292	}
		1293
		1294	sub _draw {
		1295	my ($self) = @_;
		1296
		1297	local $self->{fg} = $self->{fg};
		1298
		1299	if ($GRAB == $self) {
		1300	$self->{fg} = $self->{active_fg};
		1301	}
		1302
		1303	glEnable GL_BLEND;
		1304	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1305	glEnable GL_TEXTURE_2D;
		1306	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1307	glColor 0, 0, 0, 1;
		1308
		1309	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
		1310
		1311	glDisable GL_TEXTURE_2D;
		1312	glDisable GL_BLEND;
		1313
		1314	$self->SUPER::_draw;
		1315	}
		1316
		1317	#############################################################################
		1318
		1319	package CFClient::UI::CheckBox;
		1320
		1321	our @ISA = CFClient::UI::DrawBG::;
		1322
		1323	my @tex =
		1324	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1325	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		1326
		1327	use SDL;
		1328	use SDL::OpenGL;
		1329
		1330	sub new {
		1331	my $class = shift;
		1332
		1333	$class->SUPER::new (
		1334	padding => 2,
		1335	fg => [1, 1, 1],
		1336	active_fg => [1, 1, 0],
		1337	state => 0,
		1338	can_hover => 1,
		1339	@_
		1340	)
		1341	}
		1342
		1343	sub size_request {
		1344	my ($self) = @_;
		1345
		1346	($self->{padding} * 2 + 6) x 2
		1347	}
		1348
		1349	sub size_allocate {
		1350	my ($self, $x, $y, $w, $h) = @_;
		1351
		1352	$self->_size_allocate ($x, $y, $w, $h);
		1353	}
		1354
		1355	sub button_down {
		1356	my ($self, $ev, $x, $y) = @_;
		1357
		1358	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
		1359	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
		1360	$self->{state} = !$self->{state};
		1361	$self->emit (changed => $self->{state});
		1362	}
		1363	}
		1364
		1365	sub _draw {
		1366	my ($self) = @_;
		1367
		1368	$self->SUPER::_draw;
		1369
		1370	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
		1371
		1372	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
		1373
		1374	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		1375
		1376	glEnable GL_BLEND;
		1377	glEnable GL_TEXTURE_2D;
		1378	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1379
		1380	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1381
		1382	$tex->draw_quad (0, 0, $s, $s);
		1383
		1384	glDisable GL_TEXTURE_2D;
		1385	glDisable GL_BLEND;
		1386	}
		1387
		1388	#############################################################################
		1389
		1390	package CFClient::UI::VGauge;
		1391
		1392	our @ISA = CFClient::UI::Base::;
		1393
		1394	use SDL::OpenGL;
		1395
		1396	my %tex = (
		1397	food => [
		1398	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1399	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
		1400	],
		1401	grace => [
		1402	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1403	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
		1404	],
		1405	hp => [
		1406	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1407	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
		1408	],
		1409	mana => [
		1410	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1411	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
		1412	],
		1413	);
		1414
		1415	# eg. VGauge->new (gauge => 'food'), default gauge: food
		1416	sub new {
		1417	my $class = shift;
		1418
		1419	my $self = $class->SUPER::new (gauge => 'food', @_);
		1420
		1421	$self
		1422	}
		1423
		1424	sub size_request {
		1425	my ($self) = @_;
		1426
		1427	($self->{w}, $self->{h})
		1428	}
		1429
		1430	sub set_max {
		1431	my ($self, $max) = @_;
		1432	$self->{max_val} = $max;
		1433	}
		1434
		1435	sub set_value {
		1436	my ($self, $val, $max) = @_;
		1437
		1438	$self->set_max ($max)
		1439	if defined $max;
		1440
		1441	$max = $self->{max_val};
		1442	$self->{val} = $val;
		1443
		1444	$self->update;
		1445	}
		1446
		1447	sub _draw {
		1448	my ($self) = @_;
		1449
		1450	my $tex = $tex{$self->{gauge}};
		1451
		1452	my ($w, $h) = ($self->{w}, $self->{h});
		1453
		1454	my $ycut = $self->{val} / ($self->{max_val} || 1);
		1455	$ycut = 1 if $self->{val} > $self->{max_val};
		1456
		1457	my $t1 = $tex->[0];
		1458	my $t2 = $tex->[1];
		1459
		1460	glEnable GL_BLEND;
		1461	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1462	glEnable GL_TEXTURE_2D;
		1463	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1464
		1465	my $h1 = $self->{h} - $ycut * $self->{h};
		1466	my $h2 = $ycut * $self->{h};
		1467
		1468	my $yp = 0;
		1469
		1470	glBindTexture (GL_TEXTURE_2D, $t1->{name});
		1471	glBegin (GL_QUADS);
		1472	glTexCoord (0, 0); glVertex (0 , $yp);
		1473	glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1);
		1474	glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1);
		1475	glTexCoord (1, 0); glVertex (0 + $w, $yp);
		1476	glEnd ();
		1477
		1478	$yp += $h1;
		1479
		1480	glBindTexture (GL_TEXTURE_2D, $t2->{name});
		1481	glBegin (GL_QUADS);
		1482	glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp);
		1483	glTexCoord (0, 1); glVertex (0 , $yp + $h2);
		1484	glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2);
		1485	glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp);
		1486	glEnd ();
		1487
		1488	glDisable GL_BLEND;
		1489	glDisable GL_TEXTURE_2D;
		1490	}
		1491
		1492	#############################################################################
		1493
		1494	package CFClient::UI::Slider;
		1495
		1496	use strict;
		1497
		1498	use SDL::OpenGL;
		1499
		1500	our @ISA = CFClient::UI::DrawBG::;
		1501
		1502	my @tex =
		1503	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1504	qw(s1_slider.png s1_slider_bg.png);
		1505
		1506	sub new {
		1507	my $class = shift;
		1508
1126	# range [value, low, high, page]	1509	# range [value, low, high, page]
1127		1510
		1511	# TODO: 0-width page
		1512	# TODO: req_w/h are wrong with vertical
		1513	# TODO: calculations are off
1128	my $self = $class->SUPER::new (	1514	my $self = $class->SUPER::new (
1129	fg => [1, 1, 1],	1515	fg => [1, 1, 1],
1130	active_fg => [0, 0, 0],	1516	active_fg => [0, 0, 0],
1131	range => [0, 0, 100, 10],	1517	range => [0, 0, 100, 10],
1132	req_w => 40,	1518	req_w => 40,
1133	req_h => 10,	1519	req_h => 13,
1134	vertical => 0,	1520	vertical => 0,
		1521	can_hover => 1,
		1522	inner_pad => 5,
1135	@_	1523	@_
1136	);	1524	);
1137		1525
1138	$self	1526	$self
1139	}	1527	}
…		…
1160	if ($GRAB == $self) {	1548	if ($GRAB == $self) {
1161	my ($value, $lo, $hi, $page) = @{$self->{range}};	1549	my ($value, $lo, $hi, $page) = @{$self->{range}};
1162		1550
1163	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	1551	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1164		1552
		1553	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1554	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1555
		1556	$x -= $inner_pad_px; # substract the padding
1165	$x = $x * ($hi - $lo) / $w + $lo;	1557	$x = $x * ($hi - $lo) / $inner_w + $lo;
1166	$x = $lo if $x < $lo;	1558	$x = $lo if $x < $lo;
1167	$x = $hi - $page if $x > $hi - $page;	1559	$x = $hi - $page if $x > $hi - $page;
1168	$self->{range}[0] = $x;	1560	$self->{range}[0] = $x;
1169		1561
1170	$self->emit (changed => $x);	1562	$self->emit (changed => $x);
1171	$self->update;	1563	$self->update;
1172	}	1564	}
		1565	}
		1566
		1567	# the inner_* stuff is for generating a padding for the slider handle,
		1568	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1569	# correct propably, but it does the job for now
		1570	sub _calc_inner_pad_px {
		1571	my ($self, $w) = @_;
		1572	($w / 100) * $self->{inner_pad} # % to pixels
1173	}	1573	}
1174		1574
1175	sub _draw {	1575	sub _draw {
1176	my ($self) = @_;	1576	my ($self) = @_;
1177		1577
…		…
1191	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1591	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1192	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1592	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1193		1593
1194	my ($value, $lo, $hi, $page) = @{$self->{range}};	1594	my ($value, $lo, $hi, $page) = @{$self->{range}};
1195		1595
		1596	$hi = $value + 1 if $lo == $hi;
		1597
		1598	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1599	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1600
1196	$page = int $page * $w / ($hi - $lo);	1601	$page = int $page * $inner_w / ($hi - $lo);
1197	$value = int +($value - $lo) * $w / ($hi - $lo);	1602	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1198		1603
1199	$w -= $page;	1604	$w -= $page;
1200	$page &= ~1;	1605	$page &= ~1;
1201	glTranslate $page * 0.5, 0, 0;	1606	glTranslate $page * 0.5, 0, 0;
		1607	$page ||= 2;
1202		1608
1203	glColor @$fg;
1204	glBegin GL_LINES;
1205	glVertex 0, 0; glVertex 0, $h;
1206	glVertex $w - 1, 0; glVertex $w - 1, $h;
1207	glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1208	glEnd;
1209
1210	my $knob_a = $value - $page * 0.5;	1609	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1211	my $knob_b = $value + $page * 0.5;	1610	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1212		1611
1213	glBegin GL_QUADS;	1612	glEnable GL_BLEND;
1214	glColor @$fg;	1613	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1215	glVertex $knob_a, 0;	1614	glEnable GL_TEXTURE_2D;
1216	glVertex $knob_a, $h;	1615	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1217	glVertex $knob_b, $h;
1218	glVertex $knob_b, 0;
1219		1616
1220	if ($knob_a < $knob_b - 2) {	1617	# draw background
1221	glColor @$bg;	1618	$tex[1]->draw_quad (0, 0, $w, $h);
1222	glVertex $knob_a + 1, 1;	1619
1223	glVertex $knob_a + 1, $h - 1;	1620	# draw handle
1224	glVertex $knob_b - 1, $h - 1;	1621	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1225	glVertex $knob_b - 1, 1;	1622
		1623	glDisable GL_BLEND;
		1624	glDisable GL_TEXTURE_2D;
		1625	}
		1626
		1627	#############################################################################
		1628
		1629	package CFClient::UI::TextView;
		1630
		1631	our @ISA = CFClient::UI::HBox::;
		1632
		1633	use SDL::OpenGL;
		1634
		1635	sub new {
		1636	my $class = shift;
		1637
		1638	my $self = $class->SUPER::new (
		1639	req_w => $::WIDTH / 6,
		1640	req_h => $::HEIGHT / 6,
		1641	fontsize => $::FONTSIZE,
		1642	@_,
		1643
		1644	layout => (new CFClient::Layout),
		1645	par => [],
		1646	height => 0,
		1647	children => [
		1648	(new CFClient::UI::Empty expand => 1),
		1649	(new CFClient::UI::Slider vertical => 1),
		1650	],
		1651	);
		1652
		1653	$self->{children}[1]->connect (changed => sub {
		1654	$self->update;
		1655	});
		1656
		1657	$self
		1658	}
		1659
		1660	sub set_fontsize {
		1661	my ($self, $fontsize) = @_;
		1662
		1663	$self->{fontsize} = $fontsize;
		1664	$self->reflow;
		1665	}
		1666
		1667	sub text_height {
		1668	my ($self, $text) = @_;
		1669
		1670	my $layout = $self->{layout};
		1671
		1672	$layout->set_height ($self->{fontsize});
		1673	$layout->set_width ($self->{w});
		1674	$layout->set_text ($text);
1226	}	1675
1227	glEnd;	1676	($layout->size)[1]
		1677	}
		1678
		1679	sub reflow {
		1680	my ($self) = @_;
		1681
		1682	$self->{need_reflow}++;
		1683	$self->update;
		1684	}
		1685
		1686	sub size_request {
		1687	my ($self) = @_;
		1688
		1689	($self->{req_w}, $self->{req_h})
		1690	}
		1691
		1692	sub size_allocate {
		1693	my ($self, $x, $y, $w, $h) = @_;
		1694
		1695	$self->SUPER::size_allocate ($x, $y, $w, $h);
		1696
		1697	$self->{layout}->set_height ($self->{fontsize});
		1698	$self->{layout}->set_width ($self->{w});
		1699
		1700	$self->reflow;
		1701	}
		1702
		1703	sub add_paragraph {
		1704	my ($self, $color, $text) = @_;
		1705
		1706	#TODO: intelligently "reformat" paragraph
		1707
		1708	my $height = $self->text_height ($text);
		1709
		1710	$self->{height} += $height;
		1711
		1712	push @{$self->{par}}, [$height, $color, $text];
		1713
		1714	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
		1715	$self->{children}[1]->update;
		1716	}
		1717
		1718	sub update {
		1719	my ($self) = @_;
		1720
		1721	$self->SUPER::update;
		1722
		1723	return unless $self->{h} > 0;
		1724
		1725	delete $self->{texture};
		1726
		1727	$ROOT->on_refresh ($self, sub {
		1728	if (delete $self->{need_reflow}) {
		1729	my $height = 0;
		1730
		1731	$height += $_->[0] = $self->text_height ($_->[2])
		1732	for @{$self->{par}};
		1733
		1734	$self->{height} = $height;
		1735
		1736	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1737
		1738	delete $self->{texture};
		1739	}
		1740
		1741	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		1742	glClearColor 0, 0, 0, 1;
		1743	glClear GL_COLOR_BUFFER_BIT;
		1744
		1745	glEnable GL_BLEND;
		1746	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1747	glEnable GL_TEXTURE_2D;
		1748	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1749
		1750	my $top = int $self->{children}[1]{range}[0];
		1751
		1752	my $y0 = $top;
		1753	my $y1 = $top + $self->{h};
		1754
		1755	my $y = 0;
		1756
		1757	my $layout = $self->{layout};
		1758
		1759	for my $par (@{$self->{par}}) {
		1760	my $h = $par->[0];
		1761
		1762	if ($y0 < $y + $h && $y < $y1) {
		1763	$layout->set_text ($par->[2]);
		1764
		1765	glColor @{ $par->[1] };
		1766	my ($W, $H) = $layout->size;
		1767	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1768	}
		1769
		1770	$y += $h;
		1771	}
		1772
		1773	glDisable GL_TEXTURE_2D;
		1774	glDisable GL_BLEND;
		1775	};
		1776	});
		1777	}
		1778
		1779	sub _draw {
		1780	my ($self) = @_;
		1781
		1782	if ($self->{texture}) {
		1783	glEnable GL_TEXTURE_2D;
		1784	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1785	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
		1786	glDisable GL_TEXTURE_2D;
		1787	}
		1788
		1789	$self->{children}[1]->draw;
		1790
1228	}	1791	}
1229		1792
1230	#############################################################################	1793	#############################################################################
1231		1794
1232	package CFClient::UI::MapWidget;	1795	package CFClient::UI::MapWidget;
…		…
1242		1805
1243	sub new {	1806	sub new {
1244	my $class = shift;	1807	my $class = shift;
1245		1808
1246	$class->SUPER::new (	1809	$class->SUPER::new (
1247	z => -1,	1810	z => -1,
		1811	can_focus => 1,
1248	list => (glGenLists 1),	1812	list => (glGenLists 1),
1249	@_	1813	@_
1250	)	1814	)
1251	}	1815	}
1252		1816
1253	sub key_down {	1817	sub key_down {
…		…
1255	}	1819	}
1256		1820
1257	sub key_up {	1821	sub key_up {
1258	}	1822	}
1259		1823
		1824	sub button_down {
		1825	my ($self, $ev, $x, $y) = @_;
		1826
		1827	$self->focus_in;
		1828
		1829	if ($ev->button == 2) {
		1830	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1831	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1832
		1833	$self->{motion} = sub {
		1834	my ($ev, $x, $y) = @_;
		1835
		1836	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1837
		1838	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1839	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1840
		1841	$self->update;
		1842	};
		1843	}
		1844	}
		1845
		1846	sub button_up {
		1847	my ($self, $ev, $x, $y) = @_;
		1848
		1849	delete $self->{motion};
		1850	}
		1851
		1852	sub mouse_motion {
		1853	my ($self, $ev, $x, $y) = @_;
		1854
		1855	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1856	}
		1857
1260	sub size_request {	1858	sub size_request {
1261	(	1859	(
1262	1 + int $::WIDTH / 32,	1860	1 + 32 * int $::WIDTH / 32,
1263	1 + int $::HEIGHT / 32,	1861	1 + 32 * int $::HEIGHT / 32,
1264	)	1862	)
1265	}	1863	}
1266		1864
1267	sub update {	1865	sub update {
1268	my ($self) = @_;	1866	my ($self) = @_;
1269		1867
1270	$self->{need_update} = 1;	1868	$self->{need_update} = 1;
1271	$self->SUPER::update;	1869	$self->SUPER::update;
1272	}	1870	}
1273		1871
1274	sub _draw {	1872	sub draw {
1275	my ($self) = @_;	1873	my ($self) = @_;
1276		1874
1277	if (delete $self->{need_update}) {	1875	if (delete $self->{need_update}) {
1278	glNewList $self->{list}, GL_COMPILE;	1876	glNewList $self->{list}, GL_COMPILE;
1279		1877
1280	my $mx = $::CONN->{mapx};	1878	if ($::MAP) {
1281	my $my = $::CONN->{mapy};
1282
1283	my $map = $::CONN->{map};
1284
1285	my ($xofs, $yofs);
1286
1287	my $sw = 1 + int $::WIDTH / 32;	1879	my $sw = int $::WIDTH / 32;
1288	my $sh = 1 + int $::HEIGHT / 32;	1880	my $sh = int $::HEIGHT / 32;
1289		1881
1290	if ($::CONN->{mapw} > $sw) {	1882	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1291	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	1883	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1292	} else {	1884
1293	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};	1885	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1886
		1887	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
		1888
		1889	if ($::CFG->{fow_enable}) {
		1890	if ($::CFG->{fow_smooth}) { # smooth fog of war
		1891	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
		1892	glConvolutionFilter2D
		1893	GL_CONVOLUTION_2D,
		1894	GL_ALPHA,
		1895	3, 3,
		1896	GL_ALPHA, GL_FLOAT,
		1897	pack "f*",
		1898	0.1, 0.1, 0.1,
		1899	0.1, 0.2, 0.1,
		1900	0.1, 0.1, 0.1,
		1901	;
		1902	glEnable GL_CONVOLUTION_2D;
		1903	}
		1904
		1905	$self->{fow_texture} = new CFClient::Texture
		1906	w => $w,
		1907	h => $h,
		1908	data => $data,
		1909	internalformat => GL_ALPHA,
		1910	format => GL_ALPHA;
		1911
		1912	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
		1913
		1914	glEnable GL_BLEND;
		1915	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1916	glEnable GL_TEXTURE_2D;
		1917	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1918
		1919	glColor +($::CFG->{fow_intensity}) x 3, 1;
		1920	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
		1921
		1922	glDisable GL_TEXTURE_2D;
		1923	glDisable GL_BLEND;
		1924	}
		1925
		1926	# HACK BEGIN
		1927	{
		1928	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1929	my ($w, $h) = (250, 250);
		1930
		1931	glEnable GL_BLEND;
		1932	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1933	glEnable GL_TEXTURE_2D;
		1934	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1935
		1936	$self->{mapmap_texture} =
		1937	new CFClient::Texture
		1938	w => $w,
		1939	h => $h,
		1940	data => $::MAP->mapmap ($w, $h),
		1941	type => GL_UNSIGNED_INT_8_8_8_8_REV;
		1942
		1943	$self->{mapmap_texture}->draw_quad (100, 100);
		1944
		1945	glDisable GL_TEXTURE_2D;
		1946	glDisable GL_BLEND;
		1947	}
		1948	# HACK END
1294	}	1949	}
1295		1950
1296	if ($::CONN->{maph} > $sh) {
1297	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1298	} else {
1299	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1300	}
1301
1302	glEnable GL_TEXTURE_2D;
1303	glEnable GL_BLEND;
1304	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1305	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1306
1307	my $sw4 = ($sw + 3) & ~3;
1308	my $darkness = "\x00" x ($sw4 * $sh);
1309
1310	for my $x (0 .. $sw - 1) {
1311	my $row = $map->[$x + $xofs];
1312	for my $y (0 .. $sh - 1) {
1313
1314	my $cell = $row->[$y + $yofs]
1315	or next;
1316
1317	my $dark = $cell->[0];
1318	if ($dark < 0) {
1319	substr $darkness, $y * $sw4 + $x, 1, chr 224;
1320	} else {
1321	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1322	}
1323
1324	for my $num (grep $_, @$cell[1,2,3]) {
1325	my $tex = $::CONN->{face}[$num]{texture} || next;
1326
1327	my ($w, $h) = @$tex{qw(w h)};
1328
1329	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1330	}
1331	}
1332	}
1333
1334	# if (1) { # higher quality darkness
1335	# $lighting =~ s/(.)/$1$1$1/gs;
1336	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1337	#
1338	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1339	#
1340	# $lighting = $pb->get_pixels;
1341	# $lighting =~ s/(.)../$1/gs;
1342	# }
1343
1344	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1345
1346	$darkness = new CFClient::Texture
1347	w => $sw4,
1348	h => $sh,
1349	data => $darkness,
1350	internalformat => GL_ALPHA,
1351	format => GL_ALPHA;
1352
1353	glColor 0.45, 0.45, 0.45, 1;
1354	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1355
1356	glDisable GL_TEXTURE_2D;
1357	glDisable GL_BLEND;
1358
1359	glEndList;	1951	glEndList;
1360	}	1952	}
1361		1953
		1954	glPushMatrix;
1362	glCallList $self->{list};	1955	glCallList $self->{list};
		1956	glPopMatrix;
		1957
		1958	if ($FOCUS != $self) {
		1959	glColor 64/255, 64/255, 64/255;
		1960	glLogicOp GL_AND;
		1961	glEnable GL_COLOR_LOGIC_OP;
		1962	glBegin GL_QUADS;
		1963	glVertex 0, 0;
		1964	glVertex 0, $::HEIGHT;
		1965	glVertex $::WIDTH, $::HEIGHT;
		1966	glVertex $::WIDTH, 0;
		1967	glEnd;
		1968	glDisable GL_COLOR_LOGIC_OP;
		1969	}
1363	}	1970	}
1364		1971
1365	my %DIR = (	1972	my %DIR = (
1366	SDLK_KP8, [1, "north"],	1973	SDLK_KP8, [1, "north"],
1367	SDLK_KP9, [2, "northeast"],	1974	SDLK_KP9, [2, "northeast"],
…		…
1383		1990
1384	my $mod = $ev->key_mod;	1991	my $mod = $ev->key_mod;
1385	my $sym = $ev->key_sym;	1992	my $sym = $ev->key_sym;
1386		1993
1387	if ($sym == SDLK_KP5) {	1994	if ($sym == SDLK_KP5) {
1388	$::CONN->send ("command stay fire");	1995	$::CONN->user_send ("stay fire");
		1996	} elsif ($sym == SDLK_a) {
		1997	$::CONN->user_send ("apply");
		1998	} elsif ($sym == SDLK_QUOTE) {
		1999	$self->emit ('activate_console');
		2000	} elsif ($sym == SDLK_SLASH) {
		2001	$self->emit ('activate_console' => '/');
1389	} elsif (exists $DIR{$sym}) {	2002	} elsif (exists $DIR{$sym}) {
1390	if ($mod & KMOD_SHIFT) {	2003	if ($mod & KMOD_SHIFT) {
1391	$self->{shft}++;	2004	$self->{shft}++;
1392	$::CONN->send ("command fire $DIR{$sym}[0]");	2005	$::CONN->user_send ("fire $DIR{$sym}[0]");
1393	} elsif ($mod & KMOD_CTRL) {	2006	} elsif ($mod & KMOD_CTRL) {
1394	$self->{ctrl}++;	2007	$self->{ctrl}++;
1395	$::CONN->send ("command run $DIR{$sym}[0]");	2008	$::CONN->user_send ("run $DIR{$sym}[0]");
1396	} else {	2009	} else {
1397	$::CONN->send ("command $DIR{$sym}[1]");	2010	$::CONN->user_send ("$DIR{$sym}[1]");
1398	}	2011	}
1399	}	2012	}
1400	}	2013	}
1401		2014
1402	sub key_up {	2015	sub key_up {
…		…
1404		2017
1405	my $mod = $ev->key_mod;	2018	my $mod = $ev->key_mod;
1406	my $sym = $ev->key_sym;	2019	my $sym = $ev->key_sym;
1407		2020
1408	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	2021	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1409	$::CONN->send ("command fire_stop");	2022	$::CONN->user_send ("fire_stop");
1410	}	2023	}
1411	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	2024	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1412	$::CONN->send ("command run_stop");	2025	$::CONN->user_send ("run_stop");
1413	}	2026	}
1414	}	2027	}
1415		2028
1416	#############################################################################	2029	#############################################################################
1417		2030
…		…
1455	glPopMatrix;	2068	glPopMatrix;
1456	}	2069	}
1457		2070
1458	#############################################################################	2071	#############################################################################
1459		2072
1460	package CFClient::UI::Toplevel;	2073	package CFClient::UI::Flopper;
		2074
		2075	our @ISA = CFClient::UI::Button::;
		2076
		2077	sub new {
		2078	my $class = shift;
		2079
		2080	my $self = $class->SUPER::new (
		2081	state => 0,
		2082	connect_activate => \&toggle_flopper,
		2083	@_
		2084	);
		2085
		2086	if ($self->{state}) {
		2087	$self->{state} = 0;
		2088	$self->toggle_flopper;
		2089	}
		2090
		2091	$self
		2092	}
		2093
		2094	sub toggle_flopper {
		2095	my ($self) = @_;
		2096
		2097	# TODO: use animation
		2098	if ($self->{state} = !$self->{state}) {
		2099	$CFClient::UI::ROOT->add ($self->{other});
		2100	$self->{other}->move ($self->coord2global (0, $self->{h}));
		2101	$self->emit ("open");
		2102	} else {
		2103	$CFClient::UI::ROOT->remove ($self->{other});
		2104	$self->emit ("close");
		2105	}
		2106
		2107	$self->emit (changed => $self->{state});
		2108	}
		2109
		2110	#############################################################################
		2111
		2112	package CFClient::UI::Root;
1461		2113
1462	our @ISA = CFClient::UI::Container::;	2114	our @ISA = CFClient::UI::Container::;
		2115
		2116	use SDL::OpenGL;
1463		2117
1464	sub size_request {	2118	sub size_request {
1465	($::WIDTH, $::HEIGHT)	2119	($::WIDTH, $::HEIGHT)
1466	}	2120	}
1467		2121
…		…
1472		2126
1473	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	2127	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1474	for @{$self->{children}};	2128	for @{$self->{children}};
1475	}	2129	}
1476		2130
1477	sub translate {	2131	sub _topleft {
1478	my ($self, $x, $y) = @_;	2132	my ($self, $x, $y) = @_;
1479		2133
1480	($x, $y)	2134	($x, $y)
1481	}	2135	}
1482		2136
…		…
1490	sub add {	2144	sub add {
1491	my ($self, $widget) = @_;	2145	my ($self, $widget) = @_;
1492		2146
1493	$self->SUPER::add ($widget);	2147	$self->SUPER::add ($widget);
1494		2148
1495	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	2149	$widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
		2150	}
		2151
		2152	sub on_refresh {
		2153	my ($self, $id, $cb) = @_;
		2154
		2155	$self->{refresh_hook}{$id} = $cb;
1496	}	2156	}
1497		2157
1498	sub draw {	2158	sub draw {
1499	my ($self) = @_;	2159	my ($self) = @_;
1500		2160
		2161	while (my $rcb = delete $self->{refresh_hook}) {
		2162	$_->() for values %$rcb;
		2163	}
		2164
		2165	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2166	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2167	glClear GL_COLOR_BUFFER_BIT;
		2168
		2169	glMatrixMode GL_PROJECTION;
		2170	glLoadIdentity;
		2171	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2172	glMatrixMode GL_MODELVIEW;
		2173	glLoadIdentity;
		2174
1501	$self->_draw;	2175	$self->_draw;
1502	}	2176	}
1503		2177
1504	#############################################################################	2178	#############################################################################
1505		2179
1506	package CFClient::UI;	2180	package CFClient::UI;
1507		2181
1508	$TOPLEVEL = new CFClient::UI::Toplevel;	2182	$ROOT = new CFClient::UI::Root;
1509		2183
1510	1	2184	1
1511		2185

Diff Legend

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