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.75 by root, Tue Apr 11 20:44:49 2006 UTC vs.
Revision 1.120 by elmex, Sun Apr 16 17:43:17 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 1, 1, 1, 0.1;	230	glColor 0, 0, 1, 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
…		…
275	my $class = shift;	301	my $class = shift;
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.4],	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 {
287	my ($self) = @_;	313	my ($self) = @_;
288		314
289	my ($w, $h) = @$self{qw(w h)};	315	my ($w, $h) = @$self{qw(w h)};
290		316
		317	glEnable GL_BLEND;
		318	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
291	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	319	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
		320
292	glBegin GL_QUADS;	321	glBegin GL_QUADS;
293	glVertex 0 , 0;	322	glVertex 0 , 0;
294	glVertex 0 , $h;	323	glVertex 0 , $h;
295	glVertex $w, $h;	324	glVertex $w, $h;
296	glVertex $w, 0;	325	glVertex $w, 0;
297	glEnd;	326	glEnd;
		327
		328	glDisable GL_BLEND;
298	}	329	}
299		330
300	#############################################################################	331	#############################################################################
301		332
302	package CFClient::UI::Empty;	333	package CFClient::UI::Empty;
…		…
325		356
326	$self	357	$self
327	}	358	}
328		359
329	sub add {	360	sub add {
330	my ($self, $chld, $expand) = @_;	361	my ($self, $child) = @_;
331		362
332	$chld->{expand} = $expand;
333	$chld->set_parent ($self);	363	$child->set_parent ($self);
		364
		365	use sort 'stable';
334		366
335	$self->{children} = [	367	$self->{children} = [
336	sort { $a->{z} <=> $b->{z} }	368	sort { $a->{z} <=> $b->{z} }
337	@{$self->{children}}, $chld	369	@{$self->{children}}, $child
338	];	370	];
339		371
340	$self->{w} = $self->{h} = -1;	372	$self->{w} = $self->{h} = -1;
341	$self->update;	373	$self->update;
342	}	374	}
…		…
439	}	471	}
440		472
441	sub render_chld {	473	sub render_chld {
442	my ($self) = @_;	474	my ($self) = @_;
443		475
444	$self->{texture} =	476	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445	CFClient::Texture->new_from_opengl (	477	glClearColor 0, 0, 0, 1;
446	$self->{w}, $self->{h}, sub { $self->child->draw }	478	glClear GL_COLOR_BUFFER_BIT;
447	);	479	$self->child->draw;
		480	};
448	}	481	}
449		482
450	sub size_allocate {	483	sub size_allocate {
451	my ($self, $x, $y, $w, $h) = @_;	484	my ($self, $x, $y, $w, $h) = @_;
452		485
…		…
530		563
531	my @tex =	564	my @tex =
532	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	565	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
533	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);
534		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
535	sub size_request {	581	sub size_request {
536	my ($self) = @_;	582	my ($self) = @_;
537		583
		584	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
		585
538	my ($w, $h) = $self->SUPER::size_request;	586	my ($w, $h) = $self->SUPER::size_request;
539		587
540	$h += $tex[1]->{h};	588	(
541	$h += $tex[4]->{h};	589	$w + $self->{border} * 2,
542	$w += $tex[2]->{w};	590	$h + $self->{border} * 2,
543	$w += $tex[3]->{w};	591	)
544
545	($w, $h)
546	}	592	}
547		593
548	sub size_allocate {	594	sub size_allocate {
549	my ($self, $x, $y, $w, $h) = @_;	595	my ($self, $x, $y, $w, $h) = @_;
550		596
551	$self->_size_allocate ($x, $y, $w, $h) or return;	597	$self->_size_allocate ($x, $y, $w, $h) or return;
552		598
553	$h -= $tex[1]->{h};	599	$h -= List::Util::max 0, $self->{border} * 2;
554	$h -= $tex[4]->{h};	600	$w -= List::Util::max 0, $self->{border} * 2;
555	$w -= $tex[2]->{w};
556	$w -= $tex[3]->{w};
557		601
558	$h = $h < 0 ? 0 : $h;	602	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
559	$w = $w < 0 ? 0 : $w;	603	}
560		604
561	my $child = $self->child;	605	sub button_down {
		606	my ($self, $ev, $x, $y) = @_;
562		607
563	$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};
564	}	651	}
565		652
566	sub _draw {	653	sub _draw {
567	my ($self) = @_;	654	my ($self) = @_;
568		655
569	my ($w, $h) = ($self->{w}, $self->{h});	656	my ($w, $h ) = ($self->{w}, $self->{h});
570	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	657	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
571		658
572	glEnable GL_BLEND;	659	glEnable GL_BLEND;
573	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	660	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
574	glEnable GL_TEXTURE_2D;	661	glEnable GL_TEXTURE_2D;
575	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	662	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
576		663
577	my $top = $tex[1];	664	glColor @{ $self->{border_bg} };
578	$top->draw_quad (0, 0, $w, $top->{h});	665	$tex[1]->draw_quad (0, 0, $w, $self->{border});
579		666	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
580	my $left = $tex[3];	667	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
581	$left->draw_quad (0, $top->{h}, $left->{w}, $ch);	668	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
582
583	my $right = $tex[2];
584	$right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
585
586	my $bottom = $tex[4];
587	$bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
588		669
589	my $bg = $tex[0];	670	my $bg = $tex[0];
590	glBindTexture GL_TEXTURE_2D, $bg->{name};
591	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
592	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
593	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
594		671
		672	# TODO: repeat texture not scale
595	my $rep_x = $cw / $bg->{w};	673	my $rep_x = $cw / $bg->{w};
596	my $rep_y = $ch / $bg->{h};	674	my $rep_y = $ch / $bg->{h};
597		675
		676	glColor @{ $self->{bg} };
		677
		678	$bg->{s} = $rep_x;
		679	$bg->{t} = $rep_y;
		680	$bg->{wrap_mode} = 1;
598	$bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);	681	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
599		682
		683	glDisable GL_TEXTURE_2D;
600	glDisable GL_BLEND;	684	glDisable GL_BLEND;
601	glDisable GL_TEXTURE_2D;
602		685
603	$self->child->draw;	686	$self->child->draw;
604
605	}	687	}
606		688
607	#############################################################################	689	#############################################################################
608		690
609	package CFClient::UI::Table;	691	package CFClient::UI::Table;
…		…
612		694
613	use List::Util qw(max sum);	695	use List::Util qw(max sum);
614		696
615	use SDL::OpenGL;	697	use SDL::OpenGL;
616		698
		699	sub new {
		700	my $class = shift;
		701
		702	$class->SUPER::new (
		703	col_expand => [],
		704	@_
		705	)
		706	}
		707
617	sub add {	708	sub add {
618	my ($self, $x, $y, $chld) = @_;	709	my ($self, $x, $y, $child) = @_;
619		710
		711	$child->set_parent ($self);
620	$self->{children}[$y][$x] = $chld;	712	$self->{children}[$y][$x] = $child;
621	$chld->set_parent ($self);
622		713
623	$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};
624	$self->update;	723	$self->update;
625	}	724	}
626		725
627	sub get_wh {	726	sub get_wh {
628	my ($self) = @_;	727	my ($self) = @_;
…		…
650	my ($self) = @_;	749	my ($self) = @_;
651		750
652	my ($ws, $hs) = $self->get_wh;	751	my ($ws, $hs) = $self->get_wh;
653		752
654	(	753	(
655	(List::Util::sum @$ws),	754	(sum @$ws),
656	(List::Util::sum @$hs),	755	(sum @$hs),
657	)	756	)
658	}	757	}
659		758
660	sub size_allocate {	759	sub size_allocate {
661	my ($self, $x, $y, $w, $h) = @_;	760	my ($self, $x, $y, $w, $h) = @_;
662		761
663	$self->_size_allocate ($x, $y, $w, $h) or return;	762	$self->_size_allocate ($x, $y, $w, $h) or return;
664		763
665	my ($ws, $hs) = $self->get_wh;	764	my ($ws, $hs) = $self->get_wh;
666		765
667	my $req_w = List::Util::sum @$ws;	766	my $req_w = sum @$ws;
668	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;
669		773
670	# linearly scale sizes	774	# linearly scale sizes
671	$_ *= $req_w / $w for @$ws;	775	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
672	$_ *= $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;
673		780
674	my $y;	781	my $y;
675		782
676	for my $r (0 .. $#{$self->{children}}) {	783	for my $r (0 .. $#{$self->{children}}) {
677	my $row = $self->{children}[$r]	784	my $row = $self->{children}[$r]
…		…
679		786
680	my $x = 0;	787	my $x = 0;
681	my $row_h = $hs->[$r];	788	my $row_h = $hs->[$r];
682		789
683	for my $c (0 .. $#$row) {	790	for my $c (0 .. $#$row) {
684	my $widget = $row->[$c]
685	or next;
686
687	my $col_w = $ws->[$c];	791	my $col_w = $ws->[$c];
688		792
		793	if (my $widget = $row->[$c]) {
689	$widget->size_allocate ($x, $y, $col_w, $row_h);	794	$widget->size_allocate ($x, $y, $col_w, $row_h);
		795	}
690		796
691	$x += $col_w;	797	$x += $col_w;
692	}	798	}
693		799
694	$y += $row_h;	800	$y += $row_h;
695	}	801	}
696		802
697	}	803	}
698		804
		805	sub find_widget {
		806	my ($self, $x, $y) = @_;
		807
		808	$x -= $self->{x};
		809	$y -= $self->{y};
		810
		811	my $res;
		812
		813	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
		814	$res = $_->find_widget ($x, $y)
		815	and return $res;
		816	}
		817
		818	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
		819	}
		820
699	sub _draw {	821	sub _draw {
700	my ($self) = @_;	822	my ($self) = @_;
701		823
702	for (grep $_, @{$self->{children}}) {	824	for (grep $_, @{$self->{children}}) {
703	$_->draw for grep $_, @$_;	825	$_->draw for grep $_, @$_;
704	}	826	}
705	}	827	}
706		828
707	#############################################################################	829	#############################################################################
708		830
		831	package CFClient::UI::HBox;
		832
		833	# TODO: wrap into common Box base class
		834
		835	our @ISA = CFClient::UI::Container::;
		836
		837	sub size_request {
		838	my ($self) = @_;
		839
		840	my @alloc = map [$_->size_request], @{$self->{children}};
		841
		842	(
		843	(List::Util::sum map $_->[0], @alloc),
		844	(List::Util::max map $_->[1], @alloc),
		845	)
		846	}
		847
		848	sub size_allocate {
		849	my ($self, $x, $y, $w, $h) = @_;
		850
		851	$self->_size_allocate ($x, $y, $w, $h);
		852
		853	($h, $w) = ($w, $h);
		854
		855	my $children = $self->{children};
		856
		857	my @h = map +($_->size_request)[0], @$children;
		858
		859	my $req_h = List::Util::sum @h;
		860
		861	if ($req_h > $h) {
		862	# ah well, not enough space
		863	$_ *= $h / $req_h for @h;
		864	} else {
		865	my $exp = List::Util::sum map $_->{expand}, @$children;
		866	$exp ||= 1;
		867
		868	for (0 .. $#$children) {
		869	my $child = $children->[$_];
		870
		871	my $alloc_h = $h[$_];
		872	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
		873	$h[$_] = $alloc_h;
		874	}
		875	}
		876
		877	CFClient::UI::harmonize \@h;
		878
		879	my $y = 0;
		880	for (0 .. $#$children) {
		881	my $child = $children->[$_];
		882	my $h = $h[$_];
		883	$child->size_allocate ($y, 0, $h, $w);
		884
		885	$y += $h;
		886	}
		887	}
		888
		889	#############################################################################
		890
709	package CFClient::UI::VBox;	891	package CFClient::UI::VBox;
710		892
		893	# TODO: wrap into common Box base class
		894
711	our @ISA = CFClient::UI::Container::;	895	our @ISA = CFClient::UI::Container::;
712
713	use SDL::OpenGL;
714		896
715	sub size_request {	897	sub size_request {
716	my ($self) = @_;	898	my ($self) = @_;
717		899
718	my @alloc = map [$_->size_request], @{$self->{children}};	900	my @alloc = map [$_->size_request], @{$self->{children}};
…		…
724	}	906	}
725		907
726	sub size_allocate {	908	sub size_allocate {
727	my ($self, $x, $y, $w, $h) = @_;	909	my ($self, $x, $y, $w, $h) = @_;
728		910
729	$self->_size_allocate ($x, $y, $w, $h) or return;	911	$self->_size_allocate ($x, $y, $w, $h);
730
731	return unless $self->{h};
732		912
733	my $children = $self->{children};	913	my $children = $self->{children};
734		914
735	my @h = map +($_->size_request)[1], @$children;	915	my @h = map +($_->size_request)[1], @$children;
736		916
737	my $req_h = List::Util::sum @h;	917	my $req_h = List::Util::sum @h;
738		918
739	if ($req_h > $h) {	919	if ($req_h > $h) {
740	# ah well, not enough space	920	# ah well, not enough space
741	$_ = $h[$_] * $h / $req_h for @h;	921	$_ *= $h / $req_h for @h;
742	} else {	922	} else {
743	my @exp = grep $_->{expand}, @$children;	923	my $exp = List::Util::sum map $_->{expand}, @$children;
744	@exp = @$children unless @exp;	924	$exp ||= 1;
745		925
746	my %exp = map +($_ => 1), @exp;
747
748	for (0 .. $#$children) {	926	for (0 .. $#$children) {
749	my $child = $children->[$_];	927	my $child = $children->[$_];
750		928
751	my $alloc_h = $h[$_];	929	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
752	$alloc_h += ($h - $req_h) / @exp if $exp{$child};
753	$h[$_] = $alloc_h;
754	}	930	}
755	}	931	}
		932
		933	CFClient::UI::harmonize \@h;
756		934
757	my $y = 0;	935	my $y = 0;
758	for (0 .. $#$children) {	936	for (0 .. $#$children) {
759	my $child = $children->[$_];	937	my $child = $children->[$_];
760	my $h = $h[$_];	938	my $h = $h[$_];
…		…
774		952
775	sub new {	953	sub new {
776	my ($class, %arg) = @_;	954	my ($class, %arg) = @_;
777		955
778	my $self = $class->SUPER::new (	956	my $self = $class->SUPER::new (
779	fg => [1, 1, 1],	957	fg => [1, 1, 1],
780	height => $::FONTSIZE,	958	fontsize => $::FONTSIZE,
781	text => "",	959	text => "",
782	align => -1,	960	align => -1,
		961	valign => -1,
		962	padding => 2,
783	layout => new CFClient::Layout,	963	layout => new CFClient::Layout,
784	%arg	964	%arg
785	);	965	);
786		966
787	$self->set_text ($self->{text});	967	$self->set_text ($self->{text});
788		968
…		…
804		984
805	$self->{text} = $text;	985	$self->{text} = $text;
806	$self->{layout}->set_markup ($text);	986	$self->{layout}->set_markup ($text);
807		987
808	delete $self->{texture};	988	delete $self->{texture};
		989	# $self->{w} = $self->{h} = -1;
809	$self->update;	990	$self->update;
810	}	991	}
811		992
812	sub get_text {	993	sub get_text {
813	my ($self, $text) = @_;	994	my ($self, $text) = @_;
…		…
817		998
818	sub size_request {	999	sub size_request {
819	my ($self) = @_;	1000	my ($self) = @_;
820		1001
821	$self->{layout}->set_width;	1002	$self->{layout}->set_width;
822	$self->{layout}->set_height ($self->{height});	1003	$self->{layout}->set_height ($self->{fontsize});
823	$self->{layout}->size	1004	my ($w, $h) = $self->{layout}->size;
824	# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack	1005
825	# (	1006	(
826	# $self->{texture}{w},	1007	$w + $self->{padding} * 2,
827	# $self->{texture}{h},	1008	$h + $self->{padding} * 2,
828	# )	1009	)
829	# } else {
830	# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h};
831	#
832	# ($w, $h)
833	# }
834	}	1010	}
835		1011
836	sub size_allocate {	1012	sub size_allocate {
837	my ($self, $x, $y, $w, $h) = @_;	1013	my ($self, $x, $y, $w, $h) = @_;
838		1014
…		…
851	sub _draw {	1027	sub _draw {
852	my ($self) = @_;	1028	my ($self) = @_;
853		1029
854	my $tex = $self->{texture} ||= do {	1030	my $tex = $self->{texture} ||= do {
855	$self->{layout}->set_width ($self->{w});	1031	$self->{layout}->set_width ($self->{w});
		1032	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
856	new_from_layout CFClient::Texture $self->{layout}	1033	new_from_layout CFClient::Texture $self->{layout}
857	};	1034	};
858		1035
859	glEnable GL_BLEND;	1036	glEnable GL_BLEND;
860	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1037	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
861	glEnable GL_TEXTURE_2D;	1038	glEnable GL_TEXTURE_2D;
862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1039	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863		1040
864	glColor @{$self->{fg}};	1041	glColor @{$self->{fg}};
865		1042
866	my $x =	1043	my $x =
867	$self->{align} < 0 ? 0	1044	$self->{align} < 0 ? $self->{padding}
868	: $self->{align} > 0 ? $self->{w} - $tex->{w}	1045	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
869	: ($self->{w} - $tex->{w}) * 0.5;	1046	: ($self->{w} - $tex->{w}) * 0.5;
870		1047
		1048	my $y =
		1049	$self->{valign} < 0 ? $self->{padding}
		1050	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1051	: ($self->{h} - $tex->{h}) * 0.5;
		1052
871	$tex->draw_quad ($x, 0);	1053	$tex->draw_quad (int $x, int $y);
872		1054
873	glDisable GL_TEXTURE_2D;	1055	glDisable GL_TEXTURE_2D;
874	glDisable GL_BLEND;	1056	glDisable GL_BLEND;
875	}	1057	}
876		1058
…		…
886	sub new {	1068	sub new {
887	my $class = shift;	1069	my $class = shift;
888		1070
889	$class->SUPER::new (	1071	$class->SUPER::new (
890	fg => [1, 1, 1],	1072	fg => [1, 1, 1],
891	bg => [0, 0, 0, 0.4],	1073	bg => [0, 0, 0, 0.2],
892	active_bg => [1, 1, 1],	1074	active_bg => [1, 1, 1, 0.5],
893	active_fg => [0, 0, 0],	1075	active_fg => [0, 0, 0],
		1076	can_hover => 1,
		1077	can_focus => 1,
		1078	valign => 0,
894	@_	1079	@_
895	)	1080	)
896	}	1081	}
897		1082
898	sub _set_text {	1083	sub _set_text {
899	my ($self, $text) = @_;	1084	my ($self, $text) = @_;
900		1085
		1086	my $old_text = $self->{text};
		1087
901	$self->{last_activity} = $::NOW;	1088	$self->{last_activity} = $::NOW;
902		1089
903	$self->{text} = $text;	1090	$self->{text} = $text;
904	$self->{layout}->set_width ($self->{w});	1091	$self->{layout}->set_width ($self->{w});
		1092	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
905		1093
906	$text =~ s/./*/g if $self->{hidden};	1094	$text =~ s/./*/g if $self->{hidden};
907		1095
908
909	$self->{layout}->set_markup ($self->escape_text ($text));	1096	$self->{layout}->set_markup ($self->escape_text ($text) . " ");
910		1097
911	$text = substr $text, 0, $self->{cursor};	1098	$text = substr $text, 0, $self->{cursor};
912	utf8::encode $text;	1099	utf8::encode $text;
913		1100
914	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);	1101	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
		1102
		1103	$self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
		1104	if $old_text ne $self->{text};
915	}	1105	}
916		1106
917	sub size_request {	1107	sub size_request {
918	my ($self) = @_;	1108	my ($self) = @_;
919		1109
…		…
954	substr $text, $self->{cursor}, 1, "";	1144	substr $text, $self->{cursor}, 1, "";
955	} elsif ($sym == SDLK_LEFT) {	1145	} elsif ($sym == SDLK_LEFT) {
956	--$self->{cursor} if $self->{cursor};	1146	--$self->{cursor} if $self->{cursor};
957	} elsif ($sym == SDLK_RIGHT) {	1147	} elsif ($sym == SDLK_RIGHT) {
958	++$self->{cursor} if $self->{cursor} < length $self->{text};	1148	++$self->{cursor} if $self->{cursor} < length $self->{text};
		1149	} elsif ($sym == SDLK_HOME) {
		1150	$self->{cursor} = 0;
		1151	} elsif ($sym == SDLK_END) {
		1152	$self->{cursor} = length $text;
		1153	} elsif ($sym == SDLK_ESCAPE) {
		1154	$self->emit ('escape');
959	} elsif ($uni) {	1155	} elsif ($uni) {
960	substr $text, $self->{cursor}++, 0, chr $uni;	1156	substr $text, $self->{cursor}++, 0, chr $uni;
961	}	1157	}
962		1158
963	$self->_set_text ($text);	1159	$self->_set_text ($text);
…		…
978	$self->SUPER::button_down ($ev, $x, $y);	1174	$self->SUPER::button_down ($ev, $x, $y);
979		1175
980	my $idx = $self->{layout}->xy_to_index ($x, $y);	1176	my $idx = $self->{layout}->xy_to_index ($x, $y);
981		1177
982	# byte-index to char-index	1178	# byte-index to char-index
983	my $text = $self->{layout};	1179	my $text = $self->{text};
984	utf8::encode $text;	1180	utf8::encode $text;
985	$self->{cursor} = length substr $text, 0, $idx;	1181	$self->{cursor} = length substr $text, 0, $idx;
986		1182
987	$self->_set_text ($self->{text});	1183	$self->_set_text ($self->{text});
988	$self->update;	1184	$self->update;
…		…
1003	$self->{fg} = $self->{active_fg};	1199	$self->{fg} = $self->{active_fg};
1004	} else {	1200	} else {
1005	glColor @{$self->{bg}};	1201	glColor @{$self->{bg}};
1006	}	1202	}
1007		1203
		1204	glEnable GL_BLEND;
		1205	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1008	glBegin GL_QUADS;	1206	glBegin GL_QUADS;
1009	glVertex 0 , 0;	1207	glVertex 0 , 0;
1010	glVertex 0 , $self->{h};	1208	glVertex 0 , $self->{h};
1011	glVertex $self->{w}, $self->{h};	1209	glVertex $self->{w}, $self->{h};
1012	glVertex $self->{w}, 0;	1210	glVertex $self->{w}, 0;
1013	glEnd;	1211	glEnd;
		1212	glDisable GL_BLEND;
1014		1213
1015	$self->SUPER::_draw;	1214	$self->SUPER::_draw;
1016		1215
1017	#TODO: force update every cursor change :(	1216	#TODO: force update every cursor change :(
1018	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {	1217	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
…		…
1022	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1221	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1023	glEnd;	1222	glEnd;
1024	}	1223	}
1025	}	1224	}
1026		1225
1027	#############################################################################
1028
1029	package CFClient::UI::Slider;	1226	package CFClient::UI::LineEntry;
1030		1227
1031	use strict;	1228	our @ISA = CFClient::UI::Entry::;
1032		1229
		1230	use SDL;
1033	use SDL::OpenGL;	1231	use SDL::OpenGL;
1034		1232
1035	our @ISA = CFClient::UI::DrawBG::;	1233	sub key_down {
1036
1037	sub size_request {
1038	my ($self) = @_;	1234	my ($self, $ev) = @_;
1039		1235
1040	my $w = 50;	1236	my $sym = $ev->key_sym;
1041	my $h = 10;
1042		1237
1043	$self->{vertical} ? ($h, $w) : ($w, $h)	1238	if ($sym == SDLK_RETURN) {
		1239	$self->emit (activate => $self->get_text);
		1240	$self->update;
		1241
		1242	} else {
		1243	$self->SUPER::key_down ($ev);
		1244	}
		1245
1044	}	1246	}
		1247
		1248	#############################################################################
		1249
		1250	package CFClient::UI::Button;
		1251
		1252	our @ISA = CFClient::UI::Label::;
		1253
		1254	use SDL;
		1255	use SDL::OpenGL;
		1256
		1257	my @tex =
		1258	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1259	qw(b1_button_active.png);
1045		1260
1046	sub new {	1261	sub new {
1047	my $class = shift;	1262	my $class = shift;
1048		1263
		1264	$class->SUPER::new (
		1265	padding => 4,
		1266	fg => [1, 1, 1],
		1267	bg => [1, 1, 1, 0.2],
		1268	active_fg => [1, 1, 0],
		1269	can_hover => 1,
		1270	@_
		1271	)
		1272	}
		1273
		1274	sub button_up {
		1275	my ($self, $ev, $x, $y) = @_;
		1276
		1277	if ($x >= 0 && $x < $self->{w}
		1278	&& $y >= 0 && $y < $self->{h}) {
		1279	$self->emit ("activate");
		1280	}
		1281	}
		1282
		1283	sub _draw {
		1284	my ($self) = @_;
		1285
		1286	local $self->{fg} = $self->{fg};
		1287
		1288	if ($GRAB == $self) {
		1289	$self->{fg} = $self->{active_fg};
		1290	}
		1291
		1292	glEnable GL_BLEND;
		1293	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1294	glEnable GL_TEXTURE_2D;
		1295	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1296	glColor 0, 0, 0, 1;
		1297
		1298	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
		1299
		1300	glDisable GL_TEXTURE_2D;
		1301	glDisable GL_BLEND;
		1302
		1303	$self->SUPER::_draw;
		1304	}
		1305
		1306	#############################################################################
		1307
		1308	package CFClient::UI::CheckBox;
		1309
		1310	our @ISA = CFClient::UI::DrawBG::;
		1311
		1312	my @tex =
		1313	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1314	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		1315
		1316	use SDL;
		1317	use SDL::OpenGL;
		1318
		1319	sub new {
		1320	my $class = shift;
		1321
		1322	$class->SUPER::new (
		1323	padding => 2,
		1324	fg => [1, 1, 1],
		1325	active_fg => [1, 1, 0],
		1326	state => 0,
		1327	can_hover => 1,
		1328	@_
		1329	)
		1330	}
		1331
		1332	sub size_request {
		1333	my ($self) = @_;
		1334
		1335	($self->{padding} * 2 + 6) x 2
		1336	}
		1337
		1338	sub size_allocate {
		1339	my ($self, $x, $y, $w, $h) = @_;
		1340
		1341	$self->_size_allocate ($x, $y, $w, $h);
		1342	}
		1343
		1344	sub button_down {
		1345	my ($self, $ev, $x, $y) = @_;
		1346
		1347	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
		1348	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
		1349	$self->{state} = !$self->{state};
		1350	$self->emit (changed => $self->{state});
		1351	}
		1352	}
		1353
		1354	sub _draw {
		1355	my ($self) = @_;
		1356
		1357	$self->SUPER::_draw;
		1358
		1359	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
		1360
		1361	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
		1362
		1363	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		1364
		1365	glEnable GL_BLEND;
		1366	glEnable GL_TEXTURE_2D;
		1367	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1368
		1369	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1370
		1371	$tex->draw_quad (0, 0, $s, $s);
		1372
		1373	glDisable GL_TEXTURE_2D;
		1374	glDisable GL_BLEND;
		1375	}
		1376
		1377	#############################################################################
		1378
		1379	package CFClient::UI::Slider;
		1380
		1381	use strict;
		1382
		1383	use SDL::OpenGL;
		1384
		1385	our @ISA = CFClient::UI::DrawBG::;
		1386
		1387	my @tex =
		1388	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1389	qw(s1_slider.png s1_slider_bg.png);
		1390
		1391	sub new {
		1392	my $class = shift;
		1393
1049	# range [value, low, high, page]	1394	# range [value, low, high, page]
1050		1395
		1396	# TODO: 0-width page
		1397	# TODO: req_w/h are wrong with vertical
		1398	# TODO: calculations are off
1051	$class->SUPER::new (	1399	my $self = $class->SUPER::new (
1052	fg => [1, 1, 1],	1400	fg => [1, 1, 1],
1053	active_fg => [0, 0, 0],	1401	active_fg => [0, 0, 0],
1054	range => [0, 0, 100, 10],	1402	range => [0, 0, 100, 10],
		1403	req_w => 40,
		1404	req_h => 13,
1055	vertical => 1,	1405	vertical => 0,
		1406	can_hover => 1,
		1407	inner_pad => 5,
1056	@_	1408	@_
1057	)	1409	);
		1410
		1411	$self
		1412	}
		1413
		1414	sub size_request {
		1415	my ($self) = @_;
		1416
		1417	my $w = $self->{req_w};
		1418	my $h = $self->{req_h};
		1419
		1420	$self->{vertical} ? ($h, $w) : ($w, $h)
1058	}	1421	}
1059		1422
1060	sub button_down {	1423	sub button_down {
1061	my ($self, $ev, $x, $y) = @_;	1424	my ($self, $ev, $x, $y) = @_;
1062		1425
…		…
1070	if ($GRAB == $self) {	1433	if ($GRAB == $self) {
1071	my ($value, $lo, $hi, $page) = @{$self->{range}};	1434	my ($value, $lo, $hi, $page) = @{$self->{range}};
1072		1435
1073	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	1436	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1074		1437
		1438	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1439	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1440
		1441	$x -= $inner_pad_px; # substract the padding
1075	$x = $x * ($hi - $lo) / $w + $lo;	1442	$x = $x * ($hi - $lo) / $inner_w + $lo;
1076	$x = $lo if $x < $lo;	1443	$x = $lo if $x < $lo;
1077	$x = $hi - $page if $x > $hi - $page;	1444	$x = $hi - $page if $x > $hi - $page;
1078	$self->{range}[0] = $x;	1445	$self->{range}[0] = $x;
1079		1446
1080	$self->emit (changed => $x);	1447	$self->emit (changed => $x);
1081	$self->update;	1448	$self->update;
1082	}	1449	}
		1450	}
		1451
		1452	# the inner_* stuff is for generating a padding for the slider handle,
		1453	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1454	# correct propably, but it does the job for now
		1455	sub _calc_inner_pad_px {
		1456	my ($self, $w) = @_;
		1457	($w / 100) * $self->{inner_pad} # % to pixels
1083	}	1458	}
1084		1459
1085	sub _draw {	1460	sub _draw {
1086	my ($self) = @_;	1461	my ($self) = @_;
1087		1462
…		…
1101	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1476	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1102	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1477	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1103		1478
1104	my ($value, $lo, $hi, $page) = @{$self->{range}};	1479	my ($value, $lo, $hi, $page) = @{$self->{range}};
1105		1480
		1481	$hi = $value + 1 if $lo == $hi;
		1482
		1483	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1484	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1485
1106	$page = int $page * $w / ($hi - $lo);	1486	$page = int $page * $inner_w / ($hi - $lo);
1107	$value = int +($value - $lo) * $w / ($hi - $lo);	1487	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1108		1488
1109	$w -= $page;	1489	$w -= $page;
1110	$page &= ~1;	1490	$page &= ~1;
1111	glTranslate $page * 0.5, 0, 0;	1491	glTranslate $page * 0.5, 0, 0;
		1492	$page ||= 2;
1112		1493
1113	glColor @$fg;
1114	glBegin GL_LINES;
1115	glVertex 0, 0; glVertex 0, $h;
1116	glVertex $w - 1, 0; glVertex $w - 1, $h;
1117	glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1118	glEnd;
1119
1120	my $knob_a = $value - $page * 0.5;	1494	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1121	my $knob_b = $value + $page * 0.5;	1495	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1122		1496
1123	glBegin GL_QUADS;	1497	glEnable GL_BLEND;
1124	glColor @$fg;	1498	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1125	glVertex $knob_a, 0;	1499	glEnable GL_TEXTURE_2D;
1126	glVertex $knob_a, $h;	1500	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1127	glVertex $knob_b, $h;
1128	glVertex $knob_b, 0;
1129		1501
1130	if ($knob_a < $knob_b - 2) {	1502	# draw background
1131	glColor @$bg;	1503	$tex[1]->draw_quad (0, 0, $w, $h);
1132	glVertex $knob_a + 1, 1;	1504
1133	glVertex $knob_a + 1, $h - 1;	1505	# draw handle
1134	glVertex $knob_b - 1, $h - 1;	1506	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1135	glVertex $knob_b - 1, 1;	1507
		1508	glDisable GL_BLEND;
		1509	glDisable GL_TEXTURE_2D;
		1510	}
		1511
		1512	#############################################################################
		1513
		1514	package CFClient::UI::TextView;
		1515
		1516	our @ISA = CFClient::UI::HBox::;
		1517
		1518	use SDL::OpenGL;
		1519
		1520	sub new {
		1521	my $class = shift;
		1522
		1523	my $self = $class->SUPER::new (
		1524	req_w => $::WIDTH / 6,
		1525	req_h => $::HEIGHT / 6,
		1526	fontsize => $::FONTSIZE,
		1527	@_,
		1528
		1529	layout => (new CFClient::Layout),
		1530	par => [],
		1531	height => 0,
		1532	children => [
		1533	(new CFClient::UI::Empty expand => 1),
		1534	(new CFClient::UI::Slider vertical => 1),
		1535	],
		1536	);
		1537
		1538	$self->{children}[1]->connect (changed => sub {
		1539	$self->update;
		1540	});
		1541
		1542	$self
		1543	}
		1544
		1545	sub set_fontsize {
		1546	my ($self, $fontsize) = @_;
		1547
		1548	$self->{fontsize} = $fontsize;
		1549	$self->reflow;
		1550	}
		1551
		1552	sub text_height {
		1553	my ($self, $text) = @_;
		1554
		1555	my $layout = $self->{layout};
		1556
		1557	$layout->set_height ($self->{fontsize});
		1558	$layout->set_width ($self->{w});
		1559	$layout->set_text ($text);
1136	}	1560
1137	glEnd;	1561	($layout->size)[1]
		1562	}
		1563
		1564	sub reflow {
		1565	my ($self) = @_;
		1566
		1567	$self->{need_reflow}++;
		1568	$self->update;
		1569	}
		1570
		1571	sub size_request {
		1572	my ($self) = @_;
		1573
		1574	($self->{req_w}, $self->{req_h})
		1575	}
		1576
		1577	sub size_allocate {
		1578	my ($self, $x, $y, $w, $h) = @_;
		1579
		1580	$self->SUPER::size_allocate ($x, $y, $w, $h);
		1581
		1582	$self->{layout}->set_height ($self->{fontsize});
		1583	$self->{layout}->set_width ($self->{w});
		1584
		1585	$self->reflow;
		1586	}
		1587
		1588	sub add_paragraph {
		1589	my ($self, $color, $text) = @_;
		1590
		1591	#TODO: intelligently "reformat" paragraph
		1592
		1593	my $height = $self->text_height ($text);
		1594
		1595	$self->{height} += $height;
		1596
		1597	push @{$self->{par}}, [$height, $color, $text];
		1598
		1599	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
		1600	$self->{children}[1]->update;
		1601	}
		1602
		1603	sub update {
		1604	my ($self) = @_;
		1605
		1606	$self->SUPER::update;
		1607
		1608	return unless $self->{h} > 0;
		1609
		1610	delete $self->{texture};
		1611
		1612	$ROOT->on_refresh ($self, sub {
		1613	if (delete $self->{need_reflow}) {
		1614	my $height = 0;
		1615
		1616	$height += $_->[0] = $self->text_height ($_->[2])
		1617	for @{$self->{par}};
		1618
		1619	$self->{height} = $height;
		1620
		1621	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
		1622
		1623	delete $self->{texture};
		1624	}
		1625
		1626	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		1627	glClearColor 0, 0, 0, 1;
		1628	glClear GL_COLOR_BUFFER_BIT;
		1629
		1630	glEnable GL_BLEND;
		1631	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1632	glEnable GL_TEXTURE_2D;
		1633	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1634
		1635	my $top = int $self->{children}[1]{range}[0];
		1636
		1637	my $y0 = $top;
		1638	my $y1 = $top + $self->{h};
		1639
		1640	my $y = 0;
		1641
		1642	my $layout = $self->{layout};
		1643
		1644	for my $par (@{$self->{par}}) {
		1645	my $h = $par->[0];
		1646
		1647	if ($y0 < $y + $h && $y < $y1) {
		1648	$layout->set_text ($par->[2]);
		1649
		1650	glColor @{ $par->[1] };
		1651	my ($W, $H) = $layout->size;
		1652	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		1653	}
		1654
		1655	$y += $h;
		1656	}
		1657
		1658	glDisable GL_TEXTURE_2D;
		1659	glDisable GL_BLEND;
		1660	};
		1661	});
		1662	}
		1663
		1664	sub _draw {
		1665	my ($self) = @_;
		1666
		1667	if ($self->{texture}) {
		1668	glEnable GL_TEXTURE_2D;
		1669	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1670	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
		1671	glDisable GL_TEXTURE_2D;
		1672	}
		1673
		1674	$self->{children}[1]->draw;
		1675
1138	}	1676	}
1139		1677
1140	#############################################################################	1678	#############################################################################
1141		1679
1142	package CFClient::UI::MapWidget;	1680	package CFClient::UI::MapWidget;
…		…
1152		1690
1153	sub new {	1691	sub new {
1154	my $class = shift;	1692	my $class = shift;
1155		1693
1156	$class->SUPER::new (	1694	$class->SUPER::new (
1157	z => -1,	1695	z => -1,
		1696	can_focus => 1,
1158	list => (glGenLists 1),	1697	list => (glGenLists 1),
1159	@_	1698	@_
1160	)	1699	)
1161	}	1700	}
1162		1701
1163	sub key_down {	1702	sub key_down {
…		…
1165	}	1704	}
1166		1705
1167	sub key_up {	1706	sub key_up {
1168	}	1707	}
1169		1708
		1709	sub button_down {
		1710	my ($self, $ev, $x, $y) = @_;
		1711
		1712	$self->focus_in;
		1713
		1714	if ($ev->button == 2) {
		1715	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		1716	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
		1717
		1718	$self->{motion} = sub {
		1719	my ($ev, $x, $y) = @_;
		1720
		1721	($x, $y) = ($ev->motion_x, $ev->motion_y);
		1722
		1723	$::CFG->{map_shift_x} = $bw + $x - $ox;
		1724	$::CFG->{map_shift_y} = $bh + $y - $oy;
		1725
		1726	$self->update;
		1727	};
		1728	}
		1729	}
		1730
		1731	sub button_up {
		1732	my ($self, $ev, $x, $y) = @_;
		1733
		1734	delete $self->{motion};
		1735	}
		1736
		1737	sub mouse_motion {
		1738	my ($self, $ev, $x, $y) = @_;
		1739
		1740	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1741	}
		1742
1170	sub size_request {	1743	sub size_request {
1171	(	1744	(
1172	1 + int $::WIDTH / 32,	1745	1 + 32 * int $::WIDTH / 32,
1173	1 + int $::HEIGHT / 32,	1746	1 + 32 * int $::HEIGHT / 32,
1174	)	1747	)
1175	}	1748	}
1176		1749
1177	sub update {	1750	sub update {
1178	my ($self) = @_;	1751	my ($self) = @_;
1179		1752
1180	$self->{need_update} = 1;	1753	$self->{need_update} = 1;
1181	$self->SUPER::update;	1754	$self->SUPER::update;
1182	}	1755	}
1183		1756
1184	sub _draw {	1757	sub draw {
1185	my ($self) = @_;	1758	my ($self) = @_;
1186		1759
1187	if (delete $self->{need_update}) {	1760	if (delete $self->{need_update}) {
1188	glNewList $self->{list}, GL_COMPILE;	1761	glNewList $self->{list}, GL_COMPILE;
1189		1762
1190	my $mx = $::CONN->{mapx};	1763	if ($::MAP) {
1191	my $my = $::CONN->{mapy};
1192
1193	my $map = $::CONN->{map};
1194
1195	my ($xofs, $yofs);
1196
1197	my $sw = 1 + int $::WIDTH / 32;	1764	my $sw = int $::WIDTH / 32;
1198	my $sh = 1 + int $::HEIGHT / 32;	1765	my $sh = int $::HEIGHT / 32;
1199		1766
1200	if ($::CONN->{mapw} > $sw) {	1767	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1201	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	1768	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1202	} else {	1769
1203	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};	1770	glTranslate $sx0 - 32, $sy0 - 32, 0;
		1771
		1772	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
		1773
		1774	if ($::CFG->{fow_enable}) {
		1775	if ($::CFG->{fow_smooth}) { # smooth fog of war
		1776	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
		1777	glConvolutionFilter2D
		1778	GL_CONVOLUTION_2D,
		1779	GL_ALPHA,
		1780	3, 3,
		1781	GL_ALPHA, GL_FLOAT,
		1782	pack "f*",
		1783	0.1, 0.1, 0.1,
		1784	0.1, 0.2, 0.1,
		1785	0.1, 0.1, 0.1,
		1786	;
		1787	glEnable GL_CONVOLUTION_2D;
		1788	}
		1789
		1790	$self->{fow_texture} = new CFClient::Texture
		1791	w => $w,
		1792	h => $h,
		1793	data => $data,
		1794	internalformat => GL_ALPHA,
		1795	format => GL_ALPHA;
		1796
		1797	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
		1798
		1799	glEnable GL_BLEND;
		1800	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1801	glEnable GL_TEXTURE_2D;
		1802	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1803
		1804	glColor +($::CFG->{fow_intensity}) x 3, 1;
		1805	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
		1806
		1807	glDisable GL_TEXTURE_2D;
		1808	glDisable GL_BLEND;
		1809	}
		1810
		1811	# HACK BEGIN
		1812	{
		1813	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		1814	my ($w, $h) = (250, 250);
		1815
		1816	glEnable GL_BLEND;
		1817	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1818	glEnable GL_TEXTURE_2D;
		1819	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1820
		1821	$self->{mapmap_texture} =
		1822	new CFClient::Texture
		1823	w => $w,
		1824	h => $h,
		1825	data => $::MAP->mapmap ($w, $h),
		1826	type => GL_UNSIGNED_INT_8_8_8_8_REV;
		1827
		1828	$self->{mapmap_texture}->draw_quad (100, 100);
		1829
		1830	glDisable GL_TEXTURE_2D;
		1831	glDisable GL_BLEND;
		1832	}
		1833	# HACK END
1204	}	1834	}
1205		1835
1206	if ($::CONN->{maph} > $sh) {
1207	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1208	} else {
1209	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1210	}
1211
1212	glEnable GL_TEXTURE_2D;
1213	glEnable GL_BLEND;
1214	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1215	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1216
1217	my $sw4 = ($sw + 3) & ~3;
1218	my $darkness = "\x00" x ($sw4 * $sh);
1219
1220	for my $x (0 .. $sw - 1) {
1221	my $row = $map->[$x + $xofs];
1222	for my $y (0 .. $sh - 1) {
1223
1224	my $cell = $row->[$y + $yofs]
1225	or next;
1226
1227	my $dark = $cell->[0];
1228	if ($dark < 0) {
1229	substr $darkness, $y * $sw4 + $x, 1, chr 224;
1230	} else {
1231	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1232	}
1233
1234	for my $num (grep $_, @$cell[1,2,3]) {
1235	my $tex = $::CONN->{face}[$num]{texture} || next;
1236
1237	my ($w, $h) = @$tex{qw(w h)};
1238
1239	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1240	}
1241	}
1242	}
1243
1244	# if (1) { # higher quality darkness
1245	# $lighting =~ s/(.)/$1$1$1/gs;
1246	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1247	#
1248	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1249	#
1250	# $lighting = $pb->get_pixels;
1251	# $lighting =~ s/(.)../$1/gs;
1252	# }
1253
1254	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1255
1256	$darkness = new CFClient::Texture
1257	w => $sw4,
1258	h => $sh,
1259	data => $darkness,
1260	internalformat => GL_ALPHA,
1261	format => GL_ALPHA;
1262
1263	glColor 0.45, 0.45, 0.45, 1;
1264	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1265
1266	glDisable GL_TEXTURE_2D;
1267	glDisable GL_BLEND;
1268
1269	glEndList;	1836	glEndList;
1270	}	1837	}
1271		1838
		1839	glPushMatrix;
1272	glCallList $self->{list};	1840	glCallList $self->{list};
		1841	glPopMatrix;
		1842
		1843	if ($FOCUS != $self) {
		1844	glColor 64/255, 64/255, 64/255;
		1845	glLogicOp GL_AND;
		1846	glEnable GL_COLOR_LOGIC_OP;
		1847	glBegin GL_QUADS;
		1848	glVertex 0, 0;
		1849	glVertex 0, $::HEIGHT;
		1850	glVertex $::WIDTH, $::HEIGHT;
		1851	glVertex $::WIDTH, 0;
		1852	glEnd;
		1853	glDisable GL_COLOR_LOGIC_OP;
		1854	}
1273	}	1855	}
1274		1856
1275	my %DIR = (	1857	my %DIR = (
1276	SDLK_KP8, [1, "north"],	1858	SDLK_KP8, [1, "north"],
1277	SDLK_KP9, [2, "northeast"],	1859	SDLK_KP9, [2, "northeast"],
…		…
1293		1875
1294	my $mod = $ev->key_mod;	1876	my $mod = $ev->key_mod;
1295	my $sym = $ev->key_sym;	1877	my $sym = $ev->key_sym;
1296		1878
1297	if ($sym == SDLK_KP5) {	1879	if ($sym == SDLK_KP5) {
1298	$::CONN->send ("command stay fire");	1880	$::CONN->user_send ("command stay fire");
		1881	} elsif ($sym == SDLK_a) {
		1882	$::CONN->user_send ("command apply");
		1883	} elsif ($sym == SDLK_QUOTE) {
		1884	$self->emit ('activate_console');
		1885	} elsif ($sym == SDLK_SLASH) {
		1886	$self->emit ('activate_console' => '/');
1299	} elsif (exists $DIR{$sym}) {	1887	} elsif (exists $DIR{$sym}) {
1300	if ($mod & KMOD_SHIFT) {	1888	if ($mod & KMOD_SHIFT) {
1301	$self->{shft}++;	1889	$self->{shft}++;
1302	$::CONN->send ("command fire $DIR{$sym}[0]");	1890	$::CONN->user_send ("command fire $DIR{$sym}[0]");
1303	} elsif ($mod & KMOD_CTRL) {	1891	} elsif ($mod & KMOD_CTRL) {
1304	$self->{ctrl}++;	1892	$self->{ctrl}++;
1305	$::CONN->send ("command run $DIR{$sym}[0]");	1893	$::CONN->user_send ("command run $DIR{$sym}[0]");
1306	} else {	1894	} else {
1307	$::CONN->send ("command $DIR{$sym}[1]");	1895	$::CONN->user_send ("command $DIR{$sym}[1]");
1308	}	1896	}
1309	}	1897	}
1310	}	1898	}
1311		1899
1312	sub key_up {	1900	sub key_up {
…		…
1314		1902
1315	my $mod = $ev->key_mod;	1903	my $mod = $ev->key_mod;
1316	my $sym = $ev->key_sym;	1904	my $sym = $ev->key_sym;
1317		1905
1318	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {	1906	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1319	$::CONN->send ("command fire_stop");	1907	$::CONN->user_send ("command fire_stop");
1320	}	1908	}
1321	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	1909	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1322	$::CONN->send ("command run_stop");	1910	$::CONN->user_send ("command run_stop");
1323	}	1911	}
1324	}	1912	}
1325		1913
1326	#############################################################################	1914	#############################################################################
1327		1915
…		…
1365	glPopMatrix;	1953	glPopMatrix;
1366	}	1954	}
1367		1955
1368	#############################################################################	1956	#############################################################################
1369		1957
1370	package CFClient::UI::Toplevel;	1958	package CFClient::UI::Flopper;
		1959
		1960	our @ISA = CFClient::UI::Button::;
		1961
		1962	sub new {
		1963	my $class = shift;
		1964
		1965	my $self = $class->SUPER::new (
		1966	state => 0,
		1967	connect_activate => \&toggle_flopper,
		1968	@_
		1969	);
		1970
		1971	if ($self->{state}) {
		1972	$self->{state} = 0;
		1973	$self->toggle_flopper;
		1974	}
		1975
		1976	$self
		1977	}
		1978
		1979	sub toggle_flopper {
		1980	my ($self) = @_;
		1981
		1982	# TODO: use animation
		1983	if ($self->{state} = !$self->{state}) {
		1984	$CFClient::UI::ROOT->add ($self->{other});
		1985	$self->{other}->move ($self->coord2global (0, $self->{h}));
		1986	$self->emit ("open");
		1987	} else {
		1988	$CFClient::UI::ROOT->remove ($self->{other});
		1989	$self->emit ("close");
		1990	}
		1991
		1992	$self->emit (changed => $self->{state});
		1993	}
		1994
		1995	#############################################################################
		1996
		1997	package CFClient::UI::Root;
1371		1998
1372	our @ISA = CFClient::UI::Container::;	1999	our @ISA = CFClient::UI::Container::;
		2000
		2001	use SDL::OpenGL;
1373		2002
1374	sub size_request {	2003	sub size_request {
1375	($::WIDTH, $::HEIGHT)	2004	($::WIDTH, $::HEIGHT)
1376	}	2005	}
1377		2006
…		…
1382		2011
1383	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)	2012	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1384	for @{$self->{children}};	2013	for @{$self->{children}};
1385	}	2014	}
1386		2015
1387	sub translate {	2016	sub _topleft {
1388	my ($self, $x, $y) = @_;	2017	my ($self, $x, $y) = @_;
1389		2018
1390	($x, $y)	2019	($x, $y)
1391	}	2020	}
1392		2021
…		…
1400	sub add {	2029	sub add {
1401	my ($self, $widget) = @_;	2030	my ($self, $widget) = @_;
1402		2031
1403	$self->SUPER::add ($widget);	2032	$self->SUPER::add ($widget);
1404		2033
1405	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	2034	$widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
		2035	}
		2036
		2037	sub on_refresh {
		2038	my ($self, $id, $cb) = @_;
		2039
		2040	$self->{refresh_hook}{$id} = $cb;
1406	}	2041	}
1407		2042
1408	sub draw {	2043	sub draw {
1409	my ($self) = @_;	2044	my ($self) = @_;
1410		2045
		2046	while (my $rcb = delete $self->{refresh_hook}) {
		2047	$_->() for values %$rcb;
		2048	}
		2049
		2050	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2051	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2052	glClear GL_COLOR_BUFFER_BIT;
		2053
		2054	glMatrixMode GL_PROJECTION;
		2055	glLoadIdentity;
		2056	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2057	glMatrixMode GL_MODELVIEW;
		2058	glLoadIdentity;
		2059
1411	$self->_draw;	2060	$self->_draw;
1412	}	2061	}
1413		2062
1414	#############################################################################	2063	#############################################################################
1415		2064
1416	package CFClient::UI;	2065	package CFClient::UI;
1417		2066
1418	$TOPLEVEL = new CFClient::UI::Toplevel;	2067	$ROOT = new CFClient::UI::Root;
1419		2068
1420	1	2069	1
1421		2070

Diff Legend

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