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.137 by root, Wed Apr 19 21:38:05 2006 UTC vs.
Revision 1.197 by root, Fri May 12 01:47:04 2006 UTC

1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
8	use CFClient;	9	use CFClient;
9		10
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		12
12	our $ROOT;	13	our $ROOT;
		14	our $TOOLTIP;
13	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	sub check_tooltip {
		18	if (!$GRAB) {
		19	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		20	if (length $widget->{tooltip}) {
		21
		22	if ($TOOLTIP->{owner} != $widget) {
		23	$TOOLTIP->{owner} = $widget;
		24
		25	my $tip = $widget->{tooltip};
		26
		27	$tip = $tip->($widget) if CODE:: eq ref $tip;
		28
		29	$TOOLTIP->set_tooltip_from ($widget);
		30	$TOOLTIP->show;
		31
		32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		33
		34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
		35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
		36	}
		37
		38	$TOOLTIP->move ($x, $y);
		39	$TOOLTIP->check_size;
		40	$TOOLTIP->update;
		41	}
		42
		43	return;
		44	}
		45	}
		46	}
		47
		48	$TOOLTIP->hide;
		49	delete $TOOLTIP->{owner};
		50	}
14		51
15	# class methods for events	52	# class methods for events
16	sub feed_sdl_key_down_event {	53	sub feed_sdl_key_down_event {
17	$FOCUS->key_down ($_[0]) if $FOCUS;	54	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
		55	if $FOCUS;
18	}	56	}
19		57
20	sub feed_sdl_key_up_event {	58	sub feed_sdl_key_up_event {
21	$FOCUS->key_up ($_[0]) if $FOCUS;	59	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
		60	if $FOCUS;
22	}	61	}
23		62
24	sub feed_sdl_button_down_event {	63	sub feed_sdl_button_down_event {
25	my ($ev) = @_;	64	my ($ev) = @_;
26	my ($x, $y) = ($ev->{x}, $ev->{y});	65	my ($x, $y) = ($ev->{x}, $ev->{y});
…		…
28	if (!$BUTTON_STATE) {	67	if (!$BUTTON_STATE) {
29	my $widget = $ROOT->find_widget ($x, $y);	68	my $widget = $ROOT->find_widget ($x, $y);
30		69
31	$GRAB = $widget;	70	$GRAB = $widget;
32	$GRAB->update if $GRAB;	71	$GRAB->update if $GRAB;
		72
		73	check_tooltip;
33	}	74	}
34		75
35	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	76	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
36		77
37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	78	if ($GRAB) {
		79	($x, $y) = $GRAB->coord2local ($x, $y);
		80	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
		81	}
38	}	82	}
39		83
40	sub feed_sdl_button_up_event {	84	sub feed_sdl_button_up_event {
41	my ($ev) = @_;	85	my ($ev) = @_;
42	my ($x, $y) = ($ev->{x}, $ev->{y});	86	my ($x, $y) = ($ev->{x}, $ev->{y});
43		87
44	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	88	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45		89
46	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	90	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47		91
48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	92	if ($GRAB) {
		93	($x, $y) = $GRAB->coord2local ($x, $y);
		94	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
		95	}
49		96
50	if (!$BUTTON_STATE) {	97	if (!$BUTTON_STATE) {
51	my $grab = $GRAB; undef $GRAB;	98	my $grab = $GRAB; undef $GRAB;
52	$grab->update if $grab;	99	$grab->update if $grab;
53	$GRAB->update if $GRAB;	100	$GRAB->update if $GRAB;
		101
		102	check_tooltip;
54	}	103	}
55	}	104	}
56		105
57	sub feed_sdl_motion_event {	106	sub feed_sdl_motion_event {
58	my ($ev) = @_;	107	my ($ev) = @_;
…		…
63	if ($widget != $HOVER) {	112	if ($widget != $HOVER) {
64	my $hover = $HOVER; $HOVER = $widget;	113	my $hover = $HOVER; $HOVER = $widget;
65		114
66	$hover->update if $hover && $hover->{can_hover};	115	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $HOVER && $HOVER->{can_hover};	116	$HOVER->update if $HOVER && $HOVER->{can_hover};
68	}
69		117
70	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;	118	check_tooltip;
		119	}
		120
		121	if ($HOVER) {
		122	($x, $y) = $HOVER->coord2local ($x, $y);
		123	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
		124	}
71	}	125	}
72		126
73	# convert position array to integers	127	# convert position array to integers
74	sub harmonize {	128	sub harmonize {
75	my ($vals) = @_;	129	my ($vals) = @_;
…		…
87		141
88	package CFClient::UI::Base;	142	package CFClient::UI::Base;
89		143
90	use strict;	144	use strict;
91		145
92	use SDL::OpenGL;	146	use CFClient::OpenGL;
93		147
94	sub new {	148	sub new {
95	my $class = shift;	149	my $class = shift;
96		150
97	my $self = bless {	151	my $self = bless {
98	x => 0,	152	x => 0,
99	y => 0,	153	y => 0,
100	z => 0,	154	z => 0,
		155	can_events => 1,
101	@_	156	@_
102	}, $class;	157	}, $class;
103		158
104	for (keys %$self) {	159	for (keys %$self) {
105	if (/^connect_(.*)$/) {	160	if (/^connect_(.*)$/) {
…		…
108	}	163	}
109		164
110	$self	165	$self
111	}	166	}
112		167
		168	sub destroy {
		169	my ($self) = @_;
		170
		171	$self->hide;
		172	%$self = ();
		173	}
		174
113	sub show {	175	sub show {
114	my ($self) = @_;	176	my ($self) = @_;
115		177
116	return if $self->{parent};	178	return if $self->{parent};
117		179
…		…
119	}	181	}
120		182
121	sub hide {	183	sub hide {
122	my ($self) = @_;	184	my ($self) = @_;
123		185
124	return unless $self->{parent};	186	undef $GRAB if $GRAB == $self;
		187	undef $HOVER if $HOVER == $self;
125		188
126	$self->{parent}->remove ($self);	189	$self->{parent}->remove ($self)
		190	if $self->{parent};
127	}	191	}
128		192
129	sub move {	193	sub move {
130	my ($self, $x, $y, $z) = @_;	194	my ($self, $x, $y, $z) = @_;
131		195
…		…
134	$self->{z} = $z if defined $z;	198	$self->{z} = $z if defined $z;
135		199
136	$self->update;	200	$self->update;
137	}	201	}
138		202
139	sub needs_redraw {	203	sub set_size {
140	0	204	my ($self, $w, $h) = @_;
		205
		206	$self->{user_w} = $w;
		207	$self->{user_h} = $h;
		208
		209	$self->check_size;
141	}	210	}
142		211
143	sub size_request {	212	sub size_request {
144	require Carp;	213	require Carp;
145	Carp::confess "size_request is abtract";	214	Carp::confess "size_request is abstract";
146	}	215	}
147		216
148	sub configure {	217	sub configure {
149	my ($self, $x, $y, $w, $h) = @_;	218	my ($self, $x, $y, $w, $h) = @_;
150		219
		220	if ($self->{aspect}) {
		221	my $w2 = List::Util::min $w, int $h * $self->{aspect};
		222	my $h2 = List::Util::min $h, int $w / $self->{aspect};
		223
		224	# use alignment to adjust x, y
		225
		226	$x += int +($w - $w2) * 0.5;
		227	$y += int +($h - $h2) * 0.5;
		228
		229	($w, $h) = ($w2, $h2);
		230	}
		231
		232	if ($self->{x} != $x || $self->{y} != $y) {
151	$self->{x} = $x;	233	$self->{x} = $x;
152	$self->{y} = $y;	234	$self->{y} = $y;
153
154	return unless $self->{w} != $w || $self->{h} != $h;
155
156	$self->{w} = $w;
157	$self->{h} = $h;
158
159	$self->size_allocate ($w, $h);
160	$self->update;	235	$self->update;
		236	}
		237
		238	if ($self->{w} != $w || $self->{h} != $h) {
		239	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
		240	}
161	}	241	}
162		242
163	sub size_allocate {	243	sub size_allocate {
164	# nothing to be done	244	# nothing to be done
165	}	245	}
166		246
167	# return top left coordinates	247	sub children {
168	sub _topleft {	248	}
		249
		250	# call when resolution changes etc.
		251	sub reconfigure {
		252	my ($self) = @_;
		253
		254	$_->reconfigure
		255	for $self->children;
		256
		257	$self->check_size;
		258	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
		259	$self->update;
		260	}
		261
		262	sub set_max_size {
169	my ($self, $x, $y) = @_;	263	my ($self, $w, $h) = @_;
170		264
171	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	265	delete $self->{max_w}; $self->{max_w} = $w if $w;
		266	delete $self->{max_h}; $self->{max_h} = $h if $h;
172	}	267	}
173		268
174	# translate global coordinates to local coordinate system	269	# translate global coordinates to local coordinate system
175	sub coord2local {	270	sub coord2local {
176	my ($self, $x, $y) = @_;	271	my ($self, $x, $y) = @_;
177		272
178	my ($X, $Y) = $self->_topleft;	273	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
179	($x - $X, $y - $Y)
180	}	274	}
181		275
182	# translate local coordinates to global coordinate system	276	# translate local coordinates to global coordinate system
183	sub coord2global {	277	sub coord2global {
184	my ($self, $x, $y) = @_;	278	my ($self, $x, $y) = @_;
185		279
186	my ($X, $Y) = $self->_topleft;	280	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
187	($x + $X, $y + $Y)
188	}	281	}
189		282
190	sub focus_in {	283	sub focus_in {
191	my ($self) = @_;	284	my ($self) = @_;
192		285
…		…
252	glVertex $x + $self->{w}, $y + $self->{h};	345	glVertex $x + $self->{w}, $y + $self->{h};
253	glVertex $x , $y + $self->{h};	346	glVertex $x , $y + $self->{h};
254	glEnd;	347	glEnd;
255	glDisable GL_BLEND;	348	glDisable GL_BLEND;
256	}	349	}
		350
		351	if ($ENV{PCLIENT_DEBUG}) {
		352	glPushMatrix;
		353	glColor 1, 1, 0, 1;
		354	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
		355	glBegin GL_LINE_LOOP;
		356	glVertex 0 , 0;
		357	glVertex $self->{w}, 0;
		358	glVertex $self->{w}, $self->{h};
		359	glVertex 0 , $self->{h};
		360	glEnd;
		361	glPopMatrix;
		362	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		363	}
257	}	364	}
258		365
259	sub _draw {	366	sub _draw {
260	my ($self) = @_;	367	my ($self) = @_;
261		368
262	warn "no draw defined for $self\n";	369	warn "no draw defined for $self\n";
263	}	370	}
264		371
265	sub find_widget {	372	sub find_widget {
266	my ($self, $x, $y) = @_;	373	my ($self, $x, $y) = @_;
		374
		375	return () unless $self->{can_events};
267		376
268	return $self	377	return $self
269	if $x >= $self->{x} && $x < $self->{x} + $self->{w}	378	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
270	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};	379	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
271		380
…		…
274		383
275	sub set_parent {	384	sub set_parent {
276	my ($self, $parent) = @_;	385	my ($self, $parent) = @_;
277		386
278	Scalar::Util::weaken ($self->{parent} = $parent);	387	Scalar::Util::weaken ($self->{parent} = $parent);
		388
		389	$self->check_size
		390	unless exists $self->{req_w};
279	}	391	}
280		392
281	sub check_size {	393	sub check_size {
282	my ($self) = @_;	394	my ($self, $forced) = @_;
283		395
284	my ($w, $h) = $self->size_request;	396	$self->{force_alloc} = 1 if $forced;
285		397	$CFClient::UI::ROOT->{check_size}{$self} = $self;
286	if ($w != $self->{req_w} || $h != $self->{req_h}) {
287	$self->{req_w} = $w;
288	$self->{req_h} = $h;
289
290	$self->{parent}->check_size
291	if $self->{parent};
292	}
293	}	398	}
294		399
295	sub update {	400	sub update {
296	my ($self) = @_;	401	my ($self) = @_;
297		402
…		…
306	}	411	}
307		412
308	sub emit {	413	sub emit {
309	my ($self, $signal, @args) = @_;	414	my ($self, $signal, @args) = @_;
310		415
311	for my $cb (@{$self->{signal_cb}{$signal} || []}) {	416	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
312	$cb->($self, @args);
313	}
314	}	417	}
315		418
316	sub DESTROY {	419	sub DESTROY {
317	my ($self) = @_;	420	my ($self) = @_;
318		421
…		…
324	package CFClient::UI::DrawBG;	427	package CFClient::UI::DrawBG;
325		428
326	our @ISA = CFClient::UI::Base::;	429	our @ISA = CFClient::UI::Base::;
327		430
328	use strict;	431	use strict;
329	use SDL::OpenGL;	432	use CFClient::OpenGL;
330		433
331	sub new {	434	sub new {
332	my $class = shift;	435	my $class = shift;
333		436
334	# range [value, low, high, page]	437	# range [value, low, high, page]
…		…
363		466
364	package CFClient::UI::Empty;	467	package CFClient::UI::Empty;
365		468
366	our @ISA = CFClient::UI::Base::;	469	our @ISA = CFClient::UI::Base::;
367		470
		471	sub new {
		472	my ($class, %arg) = @_;
		473	$class->SUPER::new (can_events => 0, %arg);
		474	}
		475
368	sub size_request {	476	sub size_request {
369	(0, 0)	477	(0, 0)
370	}	478	}
371		479
372	sub draw { }	480	sub draw { }
…		…
380	sub new {	488	sub new {
381	my ($class, %arg) = @_;	489	my ($class, %arg) = @_;
382		490
383	my $children = delete $arg{children} || [];	491	my $children = delete $arg{children} || [];
384		492
385	my $self = $class->SUPER::new (children => [], %arg);	493	my $self = $class->SUPER::new (
		494	children => [],
		495	can_events => 0,
		496	%arg,
		497	);
386	$self->add ($_) for @$children;	498	$self->add ($_) for @$children;
387		499
388	$self	500	$self
389	}	501	}
390		502
391	sub add {	503	sub add {
392	my ($self, $child) = @_;	504	my ($self, @widgets) = @_;
393		505
394	$child->set_parent ($self);	506	$_->set_parent ($self)
		507	for @widgets;
395		508
396	use sort 'stable';	509	use sort 'stable';
397		510
398	$self->{children} = [	511	$self->{children} = [
399	sort { $a->{z} <=> $b->{z} }	512	sort { $a->{z} <=> $b->{z} }
400	@{$self->{children}}, $child	513	@{$self->{children}}, @widgets
401	];	514	];
402		515
403	$child->check_size;	516	$self->check_size (1);
		517	$self->update;
		518	}
		519
		520	sub children {
		521	@{ $_[0]{children} }
404	}	522	}
405		523
406	sub remove {	524	sub remove {
407	my ($self, $child) = @_;	525	my ($self, $child) = @_;
408		526
409	delete $child->{parent};	527	delete $child->{parent};
		528	$child->hide;
410		529
411	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	530	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
412		531
413	$self->check_size;	532	$self->check_size;
		533	$self->update;
		534	}
		535
		536	sub clear {
		537	my ($self) = @_;
		538
		539	my $children = delete $self->{children};
		540	$self->{children} = [];
		541
		542	for (@$children) {
		543	delete $_->{parent};
		544	$_->hide;
		545	}
		546
		547	$self->check_size;
		548	$self->update;
414	}	549	}
415		550
416	sub find_widget {	551	sub find_widget {
417	my ($self, $x, $y) = @_;	552	my ($self, $x, $y) = @_;
418		553
…		…
482		617
483	package CFClient::UI::Window;	618	package CFClient::UI::Window;
484		619
485	our @ISA = CFClient::UI::Bin::;	620	our @ISA = CFClient::UI::Bin::;
486		621
487	use SDL::OpenGL;	622	use CFClient::OpenGL;
488		623
489	sub new {	624	sub new {
490	my ($class, %arg) = @_;	625	my ($class, %arg) = @_;
491		626
492	my $self = $class->SUPER::new (%arg);	627	my $self = $class->SUPER::new (%arg);
493	}	628	}
494		629
495	sub update {	630	sub update {
496	my ($self) = @_;	631	my ($self) = @_;
497		632
498	# we want to do this delayed...	633	$ROOT->on_refresh ($self => sub { $self->render_child });
499	$self->render_chld;
500	$self->SUPER::update;	634	$self->SUPER::update;
501	}
502
503	sub render_chld {
504	my ($self) = @_;
505
506	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
507	glClearColor 0, 0, 0, 1;
508	glClear GL_COLOR_BUFFER_BIT;
509	$self->child->draw;
510	};
511	}	635	}
512		636
513	sub size_allocate {	637	sub size_allocate {
514	my ($self, $w, $h) = @_;	638	my ($self, $w, $h) = @_;
515		639
516	$self->child->configure (0, 0, $w, $h);	640	$self->SUPER::size_allocate ($w, $h);
		641	$self->update;
		642	}
517		643
		644	sub _render {
		645	$_[0]{children}[0]->draw;
		646	}
		647
		648	sub render_child {
		649	my ($self) = @_;
		650
		651	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		652	glClearColor 0, 0, 0, 0;
		653	glClear GL_COLOR_BUFFER_BIT;
		654
518	$self->render_chld;	655	$self->_render;
		656	# glColorMask 1, 1, 1, 0;
		657	# glEnable GL_BLEND;
		658	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
		659	# glRasterPos 0, 0;
		660	# glCopyPixels 0, 0, $self->{w}, $self->{h};
		661	# glDisable GL_BLEND;
		662	# glColorMask 1, 1, 1, 1;
		663	};
519	}	664	}
520		665
521	sub _draw {	666	sub _draw {
522	my ($self) = @_;	667	my ($self) = @_;
523		668
524	my ($w, $h) = ($self->w, $self->h);	669	my ($w, $h) = ($self->w, $self->h);
525		670
526	my $tex = $self->{texture}	671	my $tex = $self->{texture}
527	or return;	672	or return;
528		673
529	glEnable GL_BLEND;
530	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
531	glEnable GL_TEXTURE_2D;	674	glEnable GL_TEXTURE_2D;
532	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	675	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		676	glColor 0, 0, 0, 1;
533		677
534	$tex->draw_quad (0, 0, $w, $h);	678	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
535		679
536	glDisable GL_BLEND;
537	glDisable GL_TEXTURE_2D;	680	glDisable GL_TEXTURE_2D;
538	}	681	}
539		682
540	#############################################################################	683	#############################################################################
541		684
542	package CFClient::UI::ViewPort;	685	package CFClient::UI::ViewPort;
543		686
544	our @ISA = CFClient::UI::Window::;	687	our @ISA = CFClient::UI::Window::;
545		688
546	sub new { die }
547
548	sub size_request {	689	sub size_request {
549	my ($self) = @_;	690	my ($self) = @_;
550		691
551	@$self{qw(child_w child_h)} = $self->child->size_request;	692	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
552	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	693	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
553		694
554	@$self{qw(child_w child_h)}	695	@$self{qw(child_w child_h)}
555	}	696	}
556		697
557	sub _draw {
558	my ($self) = @_;
559
560	$self->{children}[1]->draw;
561	}
562
563
564	#############################################################################
565
566	package CFClient::UI::Frame;
567
568	our @ISA = CFClient::UI::Bin::;
569
570	use SDL::OpenGL;
571
572	sub size_request {
573	my ($self) = @_;
574	my $chld = $self->child
575	or return (0, 0);
576
577	$chld->move (2, 2);
578
579	map { $_ + 4 } $chld->size_request;
580	}
581
582	sub size_allocate {	698	sub size_allocate {
583	my ($self, $x, $y, $w, $h) = @_;	699	my ($self, $w, $h) = @_;
		700
		701	$self->update;
		702	}
		703
		704	sub set_offset {
		705	my ($self, $x, $y) = @_;
		706
		707	$self->{view_x} = int $x;
		708	$self->{view_y} = int $y;
		709
		710	$self->update;
		711	}
		712
		713	# hmm, this does not work for topleft of $self... but we should not ask for that
		714	sub coord2local {
		715	my ($self, $x, $y) = @_;
		716
		717	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		718	}
		719
		720	sub coord2global {
		721	my ($self, $x, $y) = @_;
		722
		723	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		724	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		725
		726	$self->SUPER::coord2global ($x, $y)
		727	}
		728
		729	sub find_widget {
		730	my ($self, $x, $y) = @_;
		731
		732	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		733	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		734	) {
		735	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		736	} else {
		737	$self->CFClient::UI::Base::find_widget ($x, $y)
584		738	}
585	$self->child->configure (2, 2, $w - 4, $h - 4);
586	}	739	}
587		740
588	sub _draw {	741	sub _render {
589	my ($self) = @_;	742	my ($self) = @_;
590		743
591	my $chld = $self->child;	744	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
592		745
593	my ($w, $h) = $chld->size_request;	746	$self->SUPER::_render;
594
595	glBegin GL_QUADS;
596	glColor 0, 0, 0;
597	glVertex 0 , 0;
598	glVertex 0 , $h + 4;
599	glVertex $w + 4 , $h + 4;
600	glVertex $w + 4 , 0;
601	glEnd;
602
603	$chld->draw;
604	}	747	}
605		748
606	#############################################################################	749	#############################################################################
607		750
608	package CFClient::UI::FancyFrame;	751	package CFClient::UI::ScrolledWindow;
609		752
610	our @ISA = CFClient::UI::Bin::;	753	our @ISA = CFClient::UI::HBox::;
611
612	use SDL::OpenGL;
613
614	my @tex =
615	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
616	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
617		754
618	sub new {	755	sub new {
619	my $class = shift;	756	my $class = shift;
620		757
		758	my $self;
		759
		760	my $slider = new CFClient::UI::Slider
		761	vertical => 1,
		762	range => [0, 0, 1, 0.01], # HACK fix
		763	connect_changed => sub {
		764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		765	},
		766	;
		767
		768	$self = $class->SUPER::new (
		769	vp => (new CFClient::UI::ViewPort),
		770	slider => $slider,
		771	@_,
		772	);
		773
		774	$self->{vp}->add ($self->{scrolled});
		775	$self->add ($self->{vp});
		776	$self->add ($self->{slider});
		777
		778	$self
		779	}
		780
		781	#TODO# update range on size_allocate depeneing on child
		782	# update viewport offset on scroll
		783
		784	#############################################################################
		785
		786	package CFClient::UI::Frame;
		787
		788	our @ISA = CFClient::UI::Bin::;
		789
		790	use CFClient::OpenGL;
		791
		792	#############################################################################
		793
		794	package CFClient::UI::FancyFrame;
		795
		796	our @ISA = CFClient::UI::Bin::;
		797
		798	use CFClient::OpenGL;
		799
		800	my @tex =
		801	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		802	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		803
		804	sub new {
		805	my $class = shift;
		806
621	# TODO: user_x, user_y, overwrite moveto?	807	# TODO: user_x, user_y, overwrite moveto?
622		808
623	$class->SUPER::new (	809	my $self = $class->SUPER::new (
624	bg => [1, 1, 1, 1],	810	bg => [1, 1, 1, 1],
625	border_bg => [1, 1, 1, 1],	811	border_bg => [1, 1, 1, 1],
626	border => 0.8,	812	border => 0.6,
		813	can_events => 1,
627	@_	814	@_
628	)	815	);
		816
		817	$self->{title} &&= new CFClient::UI::Label
		818	align => 0,
		819	valign => 1,
		820	text => $self->{title},
		821	fontsize => $self->{border};
		822
		823	$self
629	}	824	}
630		825
631	sub border {	826	sub border {
632	int $_[0]{border} * $::FONTSIZE	827	int $_[0]{border} * $::FONTSIZE
633	}	828	}
634		829
635	sub size_request {	830	sub size_request {
636	my ($self) = @_;	831	my ($self) = @_;
637
638	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
639		832
640	my ($w, $h) = $self->SUPER::size_request;	833	my ($w, $h) = $self->SUPER::size_request;
641		834
642	(	835	(
643	$w + $self->border * 2,	836	$w + $self->border * 2,
…		…
649	my ($self, $w, $h) = @_;	842	my ($self, $w, $h) = @_;
650		843
651	$h -= List::Util::max 0, $self->border * 2;	844	$h -= List::Util::max 0, $self->border * 2;
652	$w -= List::Util::max 0, $self->border * 2;	845	$w -= List::Util::max 0, $self->border * 2;
653		846
		847	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
		848	if $self->{title};
		849
654	$self->child->configure ($self->border, $self->border, $w, $h);	850	$self->child->configure ($self->border, $self->border, $w, $h);
655	}	851	}
656		852
657	sub button_down {	853	sub button_down {
658	my ($self, $ev, $x, $y) = @_;	854	my ($self, $ev, $x, $y) = @_;
659		855
		856	my ($w, $h) = @$self{qw(w h)};
660	my $border = $self->border;	857	my $border = $self->border;
661		858
662	if ($x < $self->{w} && $x >= $self->{w} - $border	859	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
663	&& $y < $self->{h} && $y >= $self->{h} - $border) {	860	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
664		861
		862	if ($lr & $td) {
		863	my ($wx, $wy) = ($self->{x}, $self->{y});
665	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	864	my ($ox, $oy) = ($ev->{x}, $ev->{y});
666	my ($bw, $bh) = ($self->{w}, $self->{h});	865	my ($bw, $bh) = ($self->{w}, $self->{h});
		866
		867	my $mx = $x < $border;
		868	my $my = $y < $border;
667		869
668	$self->{motion} = sub {	870	$self->{motion} = sub {
669	my ($ev, $x, $y) = @_;	871	my ($ev, $x, $y) = @_;
670		872
671	($x, $y) = ($ev->motion_x, $ev->motion_y);	873	my $dx = $ev->{x} - $ox;
		874	my $dy = $ev->{y} - $oy;
672		875
673	$self->{user_w} = $bw + $x - $ox;	876	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
674	$self->{user_h} = $bh + $y - $oy;	877	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		878	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
675	$self->check_size;	879	$self->check_size;
676	};	880	};
677		881
678	} elsif ($x >= 0 && $x < $self->{w}	882	} elsif ($lr ^ $td) {
679	&& $y >= 0 && $y < $border) {
680
681	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	883	my ($ox, $oy) = ($ev->{x}, $ev->{y});
682	my ($bx, $by) = ($self->{x}, $self->{y});	884	my ($bx, $by) = ($self->{x}, $self->{y});
683		885
684	$self->{motion} = sub {	886	$self->{motion} = sub {
685	my ($ev, $x, $y) = @_;	887	my ($ev, $x, $y) = @_;
686		888
687	($x, $y) = ($ev->motion_x, $ev->motion_y);	889	($x, $y) = ($ev->{x}, $ev->{y});
688		890
689	$self->move ($bx + $x - $ox, $by + $y - $oy);	891	$self->move ($bx + $x - $ox, $by + $y - $oy);
690	$self->update;	892	$self->update;
691	};	893	};
692	}	894	}
…		…
708	my ($self) = @_;	910	my ($self) = @_;
709		911
710	my ($w, $h ) = ($self->{w}, $self->{h});	912	my ($w, $h ) = ($self->{w}, $self->{h});
711	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	913	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
712		914
713	glEnable GL_BLEND;
714	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
715	glEnable GL_TEXTURE_2D;	915	glEnable GL_TEXTURE_2D;
716	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	916	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
717		917
718	my $border = $self->border;	918	my $border = $self->border;
719		919
720	glColor @{ $self->{border_bg} };	920	glColor @{ $self->{border_bg} };
721	$tex[1]->draw_quad (0, 0, $w, $border);	921	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
722	$tex[3]->draw_quad (0, $border, $border, $ch);	922	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
723	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	923	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
724	$tex[4]->draw_quad (0, $h - $border, $w, $border);	924	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
725		925
		926	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
726	my $bg = $tex[0];	927	my $bg = $tex[0];
727		928
728	# TODO: repeat texture not scale	929	# TODO: repeat texture not scale
729	my $rep_x = $cw / $bg->{w};	930	my $rep_x = $cw / $bg->{w};
730	my $rep_y = $ch / $bg->{h};	931	my $rep_y = $ch / $bg->{h};
731		932
732	glColor @{ $self->{bg} };	933	glColor @{ $self->{bg} };
733		934
734	$bg->{s} = $rep_x;	935	$bg->{s} = $rep_x;
735	$bg->{t} = $rep_y;	936	$bg->{t} = $rep_y;
736	$bg->{wrap_mode} = 1;	937	$bg->{wrap_mode} = 1;
737	$bg->draw_quad ($border, $border, $cw, $ch);	938	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		939	}
738		940
739	glDisable GL_TEXTURE_2D;	941	glDisable GL_TEXTURE_2D;
740	glDisable GL_BLEND;	942
		943	$self->{title}->draw if $self->{title};
741		944
742	$self->child->draw;	945	$self->child->draw;
743	}	946	}
744		947
745	#############################################################################	948	#############################################################################
…		…
748		951
749	our @ISA = CFClient::UI::Base::;	952	our @ISA = CFClient::UI::Base::;
750		953
751	use List::Util qw(max sum);	954	use List::Util qw(max sum);
752		955
753	use SDL::OpenGL;	956	use CFClient::OpenGL;
754		957
755	sub new {	958	sub new {
756	my $class = shift;	959	my $class = shift;
757		960
758	$class->SUPER::new (	961	$class->SUPER::new (
…		…
768	$self->{children}[$y][$x] = $child;	971	$self->{children}[$y][$x] = $child;
769		972
770	$child->check_size;	973	$child->check_size;
771	}	974	}
772		975
		976	sub children {
		977	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		978	}
		979
773	# TODO: move to container class maybe? send childs a signal on removal?	980	# TODO: move to container class maybe? send childs a signal on removal?
774	sub clear {	981	sub clear {
775	my ($self) = @_;	982	my ($self) = @_;
776		983
		984	my @children = $self->children;
777	delete $self->{children};	985	delete $self->{children};
		986
		987	for (@children) {
		988	delete $_->{parent};
		989	$_->hide;
		990	}
		991
778	$self->update;	992	$self->update;
779	}	993	}
780		994
781	sub get_wh {	995	sub get_wh {
782	my ($self) = @_;	996	my ($self) = @_;
…		…
788	or next;	1002	or next;
789		1003
790	for my $x (0 .. $#$row) {	1004	for my $x (0 .. $#$row) {
791	my $widget = $row->[$x]	1005	my $widget = $row->[$x]
792	or next;	1006	or next;
793	my ($w, $h) = $widget->size_request;	1007	my ($w, $h) = @$widget{qw(req_w req_h)};
794		1008
795	$w[$x] = max $w[$x], $w;	1009	$w[$x] = max $w[$x], $w;
796	$h[$y] = max $h[$y], $h;	1010	$h[$y] = max $h[$y], $h;
797	}	1011	}
798	}	1012	}
…		…
903		1117
904	($h, $w) = ($w, $h);	1118	($h, $w) = ($w, $h);
905		1119
906	my $children = $self->{children};	1120	my $children = $self->{children};
907		1121
908	my @h = map +($_->size_request)[0], @$children;	1122	my @h = map $_->{req_w}, @$children;
909		1123
910	my $req_h = List::Util::sum @h;	1124	my $req_h = List::Util::sum @h;
911		1125
912	if ($req_h > $h) {	1126	if ($req_h > $h) {
913	# ah well, not enough space	1127	# ah well, not enough space
…		…
959	}	1173	}
960		1174
961	sub size_allocate {	1175	sub size_allocate {
962	my ($self, $w, $h) = @_;	1176	my ($self, $w, $h) = @_;
963		1177
		1178	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1179
964	my $children = $self->{children};	1180	my $children = $self->{children};
965		1181
966	my @h = map +($_->size_request)[1], @$children;	1182	my @h = map $_->{req_h}, @$children;
967		1183
968	my $req_h = List::Util::sum @h;	1184	my $req_h = List::Util::sum @h;
969		1185
970	if ($req_h > $h) {	1186	if ($req_h > $h) {
971	# ah well, not enough space	1187	# ah well, not enough space
…		…
999		1215
1000	package CFClient::UI::Label;	1216	package CFClient::UI::Label;
1001		1217
1002	our @ISA = CFClient::UI::Base::;	1218	our @ISA = CFClient::UI::Base::;
1003		1219
1004	use SDL::OpenGL;	1220	use CFClient::OpenGL;
1005		1221
1006	sub new {	1222	sub new {
1007	my ($class, %arg) = @_;	1223	my ($class, %arg) = @_;
1008		1224
1009	my $self = $class->SUPER::new (	1225	my $self = $class->SUPER::new (
1010	fg => [1, 1, 1],	1226	fg => [1, 1, 1],
		1227	#font => default_font
		1228	#text => initial text
		1229	#markup => initial narkup
		1230	layout => (new CFClient::Layout),
1011	fontsize => 1,	1231	fontsize => 1,
1012	text => "",
1013	align => -1,	1232	align => -1,
1014	valign => -1,	1233	valign => -1,
1015	padding => 2,	1234	padding => 2,
1016	layout => new CFClient::Layout,	1235	can_events => 0,
1017	%arg	1236	%arg
1018	);	1237	);
1019		1238
1020	$self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#	1239	if (exists $self->{template}) {
		1240	my $layout = new CFClient::Layout;
		1241	$layout->set_text (delete $self->{template});
		1242	$self->{template} = $layout;
		1243	}
1021		1244
1022	$self->set_text (delete $self->{text}) if exists $self->{text};	1245	if (exists $self->{markup}) {
1023	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1246	$self->set_markup (delete $self->{markup});
		1247	} else {
		1248	$self->set_text (delete $self->{text});
		1249	}
1024		1250
1025	$self	1251	$self
1026	}	1252	}
1027		1253
1028	sub escape_text {	1254	sub escape {
1029	local $_ = $_[1];	1255	local $_ = $_[1];
1030		1256
1031	s/&/&amp;/g;	1257	s/&/&amp;/g;
1032	s/>/&gt;/g;	1258	s/>/&gt;/g;
1033	s/</&lt;/g;	1259	s/</&lt;/g;
1034		1260
1035	$_[1]	1261	$_[1]
1036	}	1262	}
1037		1263
		1264	sub update {
		1265	my ($self) = @_;
		1266
		1267	delete $self->{texture};
		1268	$self->SUPER::update;
		1269	}
		1270
1038	sub set_text {	1271	sub set_text {
1039	my ($self, $text) = @_;	1272	my ($self, $text) = @_;
1040		1273
		1274	return if $self->{text} eq "T$text";
		1275	$self->{text} = "T$text";
		1276
		1277	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1041	$self->{layout}->set_text ($text);	1278	$self->{layout}->set_text ($text);
1042		1279
1043	delete $self->{texture};
1044	$self->update;	1280	$self->update;
		1281	$self->check_size;
1045	}	1282	}
1046		1283
1047	sub set_markup {	1284	sub set_markup {
1048	my ($self, $markup) = @_;	1285	my ($self, $markup) = @_;
1049		1286
		1287	return if $self->{text} eq "M$markup";
		1288	$self->{text} = "M$markup";
		1289
		1290	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1291
		1292	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1050	$self->{layout}->set_markup ($markup);	1293	$self->{layout}->set_markup ($markup);
1051		1294
1052	delete $self->{texture};
1053	$self->update;	1295	$self->update;
		1296	$self->check_size;
1054	}	1297	}
1055		1298
1056	sub size_request {	1299	sub size_request {
1057	my ($self) = @_;	1300	my ($self) = @_;
1058		1301
1059	$self->{layout}->set_width;	1302	$self->{layout}->set_font ($self->{font}) if $self->{font};
		1303	$self->{layout}->set_width ($self->{max_w} || -1);
1060	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1304	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1061		1305
1062	my ($w, $h) = $self->{layout}->size;	1306	my ($w, $h) = $self->{layout}->size;
		1307
		1308	if (exists $self->{template}) {
		1309	$self->{template}->set_font ($self->{font}) if $self->{font};
		1310	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
		1311
		1312	my ($w2, $h2) = $self->{template}->size;
		1313
		1314	$w = List::Util::max $w, $w2;
		1315	$h = List::Util::max $h, $h2;
		1316	}
1063		1317
1064	(	1318	(
1065	$w + $self->{padding} * 2,	1319	$w + $self->{padding} * 2,
1066	$h + $self->{padding} * 2,	1320	$h + $self->{padding} * 2,
1067	)	1321	)
…		…
1071	my ($self, $w, $h) = @_;	1325	my ($self, $w, $h) = @_;
1072		1326
1073	delete $self->{texture};	1327	delete $self->{texture};
1074	}	1328	}
1075		1329
		1330	sub set_fontsize {
		1331	my ($self, $fontsize) = @_;
		1332
		1333	$self->{fontsize} = $fontsize;
		1334	delete $self->{texture};
		1335
		1336	$self->update;
		1337	$self->check_size;
		1338	}
		1339
1076	sub _draw {	1340	sub _draw {
1077	my ($self) = @_;	1341	my ($self) = @_;
1078		1342
1079	my $tex = $self->{texture} ||= do {	1343	my $tex = $self->{texture} ||= do {
		1344	$self->{layout}->set_foreground (@{$self->{fg}});
		1345	$self->{layout}->set_font ($self->{font}) if $self->{font};
1080	$self->{layout}->set_width ($self->{w});	1346	$self->{layout}->set_width ($self->{w});
1081	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1347	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
		1348
1082	new_from_layout CFClient::Texture $self->{layout}	1349	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1350
		1351	$self->{ox} = int $self->{align} < 0 ? $self->{padding}
		1352	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1353	: ($self->{w} - $tex->{w}) * 0.5;
		1354
		1355	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}
		1356	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1357	: ($self->{h} - $tex->{h}) * 0.5;
		1358
		1359	$tex
1083	};	1360	};
1084		1361
1085	glEnable GL_BLEND;
1086	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1087	glEnable GL_TEXTURE_2D;	1362	glEnable GL_TEXTURE_2D;
1088	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1363	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1089		1364
		1365	if ($tex->{format} == GL_ALPHA) {
1090	glColor @{$self->{fg}};	1366	glColor @{$self->{fg}};
1091
1092	$self->{ox} = int (
1093	$self->{align} < 0 ? $self->{padding}
1094	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1095	: ($self->{w} - $tex->{w}) * 0.5
1096	);
1097
1098	$self->{oy} = int (
1099	$self->{valign} < 0 ? $self->{padding}
1100	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1101	: ($self->{h} - $tex->{h}) * 0.5
1102	);
1103
1104	$tex->draw_quad ($self->{ox}, $self->{oy});	1367	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1368	} else {
		1369	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1370	}
1105		1371
1106	glDisable GL_TEXTURE_2D;	1372	glDisable GL_TEXTURE_2D;
1107	glDisable GL_BLEND;
1108	}	1373	}
1109		1374
1110	#############################################################################	1375	#############################################################################
1111		1376
1112	package CFClient::UI::EntryBase;	1377	package CFClient::UI::EntryBase;
1113		1378
1114	our @ISA = CFClient::UI::Label::;	1379	our @ISA = CFClient::UI::Label::;
1115		1380
1116	use SDL::OpenGL;	1381	use CFClient::OpenGL;
1117		1382
1118	sub new {	1383	sub new {
1119	my $class = shift;	1384	my $class = shift;
1120		1385
1121	$class->SUPER::new (	1386	$class->SUPER::new (
1122	fg => [1, 1, 1],	1387	fg => [1, 1, 1],
1123	bg => [0, 0, 0, 0.2],	1388	bg => [0, 0, 0, 0.2],
1124	active_bg => [1, 1, 1, 0.5],	1389	active_bg => [1, 1, 1, 0.5],
1125	active_fg => [0, 0, 0],	1390	active_fg => [0, 0, 0],
1126	can_hover => 1,	1391	can_hover => 1,
1127	can_focus => 1,	1392	can_focus => 1,
1128	valign => 0,	1393	valign => 0,
		1394	can_events => 1,
1129	@_	1395	@_
1130	)	1396	)
1131	}	1397	}
1132		1398
1133	sub _set_text {	1399	sub _set_text {
…		…
1146	$self->{layout}->set_text ("$text ");	1412	$self->{layout}->set_text ("$text ");
1147		1413
1148	$self->emit (changed => $self->{text});	1414	$self->emit (changed => $self->{text});
1149	}	1415	}
1150		1416
		1417	sub set_text {
		1418	my ($self, $text) = @_;
		1419
		1420	$self->{cursor} = length $text;
		1421	$self->_set_text ($text);
		1422	$self->check_size;
		1423	$self->update;
		1424	}
		1425
1151	sub get_text {	1426	sub get_text {
1152	$_[0]{text}	1427	$_[0]{text}
1153	}	1428	}
1154		1429
1155	sub size_request {	1430	sub size_request {
…		…
1161	}	1436	}
1162		1437
1163	sub size_allocate {	1438	sub size_allocate {
1164	my ($self, $w, $h) = @_;	1439	my ($self, $w, $h) = @_;
1165		1440
1166	$self->_set_text ($self->{text});	1441	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1167	}
1168
1169	sub set_text {
1170	my ($self, $text) = @_;
1171
1172	$self->{cursor} = length $text;
1173	$self->_set_text ($text);
1174	$self->update;
1175	}	1442	}
1176		1443
1177	sub key_down {	1444	sub key_down {
1178	my ($self, $ev) = @_;	1445	my ($self, $ev) = @_;
1179		1446
…		…
1278		1545
1279	package CFClient::UI::Entry;	1546	package CFClient::UI::Entry;
1280		1547
1281	our @ISA = CFClient::UI::EntryBase::;	1548	our @ISA = CFClient::UI::EntryBase::;
1282		1549
1283	use SDL::OpenGL;	1550	use CFClient::OpenGL;
1284		1551
1285	sub key_down {	1552	sub key_down {
1286	my ($self, $ev) = @_;	1553	my ($self, $ev) = @_;
1287		1554
1288	my $sym = $ev->{sym};	1555	my $sym = $ev->{sym};
1289		1556
1290	if ($sym == 13) {	1557	if ($sym == 13) {
		1558	unshift @{$self->{history}},
		1559	my $txt = $self->get_text;
		1560	$self->{history_pointer} = -1;
		1561	$self->{history_saveback} = '';
1291	$self->emit (activate => $self->get_text);	1562	$self->emit (activate => $txt);
1292	$self->update;	1563	$self->update;
		1564
		1565	} elsif ($sym == CFClient::SDLK_UP) {
		1566	if ($self->{history_pointer} < 0) {
		1567	$self->{history_saveback} = $self->get_text;
		1568	}
		1569	if (@{$self->{history} || []} > 0) {
		1570	$self->{history_pointer}++;
		1571	if ($self->{history_pointer} >= @{$self->{history} || []}) {
		1572	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1573	}
		1574	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1575	}
		1576
		1577	} elsif ($sym == CFClient::SDLK_DOWN) {
		1578	$self->{history_pointer}--;
		1579	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1580
		1581	if ($self->{history_pointer} >= 0) {
		1582	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1583	} else {
		1584	$self->set_text ($self->{history_saveback});
		1585	}
1293		1586
1294	} else {	1587	} else {
1295	$self->SUPER::key_down ($ev);	1588	$self->SUPER::key_down ($ev);
1296	}	1589	}
1297		1590
…		…
1301		1594
1302	package CFClient::UI::Button;	1595	package CFClient::UI::Button;
1303		1596
1304	our @ISA = CFClient::UI::Label::;	1597	our @ISA = CFClient::UI::Label::;
1305		1598
1306	use SDL::OpenGL;	1599	use CFClient::OpenGL;
1307		1600
1308	my @tex =	1601	my @tex =
1309	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1602	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1310	qw(b1_button_active.png);	1603	qw(b1_button_active.png);
1311		1604
1312	sub new {	1605	sub new {
1313	my $class = shift;	1606	my $class = shift;
1314		1607
1315	$class->SUPER::new (	1608	$class->SUPER::new (
1316	padding => 4,	1609	padding => 4,
1317	fg => [1, 1, 1],	1610	fg => [1, 1, 1],
1318	bg => [1, 1, 1, 0.2],	1611	bg => [1, 1, 1, 0.2],
1319	active_fg => [0, 0, 1],	1612	active_fg => [0, 0, 1],
1320	can_hover => 1,	1613	can_hover => 1,
1321	align => 0,	1614	align => 0,
1322	valign => 0,	1615	valign => 0,
		1616	can_events => 1,
1323	@_	1617	@_
1324	)	1618	)
1325	}	1619	}
1326		1620
1327	sub button_up {	1621	sub button_up {
…		…
1340		1634
1341	if ($GRAB == $self) {	1635	if ($GRAB == $self) {
1342	$self->{fg} = $self->{active_fg};	1636	$self->{fg} = $self->{active_fg};
1343	}	1637	}
1344		1638
1345	glEnable GL_BLEND;
1346	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1347	glEnable GL_TEXTURE_2D;	1639	glEnable GL_TEXTURE_2D;
1348	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1640	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1349	glColor 0, 0, 0, 1;	1641	glColor 0, 0, 0, 1;
1350		1642
1351	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1643	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1352		1644
1353	glDisable GL_TEXTURE_2D;	1645	glDisable GL_TEXTURE_2D;
1354	glDisable GL_BLEND;
1355		1646
1356	$self->SUPER::_draw;	1647	$self->SUPER::_draw;
1357	}	1648	}
1358		1649
1359	#############################################################################	1650	#############################################################################
…		…
1361	package CFClient::UI::CheckBox;	1652	package CFClient::UI::CheckBox;
1362		1653
1363	our @ISA = CFClient::UI::DrawBG::;	1654	our @ISA = CFClient::UI::DrawBG::;
1364		1655
1365	my @tex =	1656	my @tex =
1366	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1657	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1367	qw(c1_checkbox_bg.png c1_checkbox_active.png);	1658	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1368		1659
1369	use SDL::OpenGL;	1660	use CFClient::OpenGL;
1370		1661
1371	sub new {	1662	sub new {
1372	my $class = shift;	1663	my $class = shift;
1373		1664
1374	$class->SUPER::new (	1665	$class->SUPER::new (
…		…
1406		1697
1407	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1698	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1408		1699
1409	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1700	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1410		1701
1411	glEnable GL_BLEND;	1702	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1703
1412	glEnable GL_TEXTURE_2D;	1704	glEnable GL_TEXTURE_2D;
1413	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1414
1415	my $tex = $self->{state} ? $tex[1] : $tex[0];
1416
1417	$tex->draw_quad (0, 0, $s, $s);	1705	$tex->draw_quad_alpha (0, 0, $s, $s);
1418
1419	glDisable GL_TEXTURE_2D;	1706	glDisable GL_TEXTURE_2D;
		1707	}
		1708
		1709	#############################################################################
		1710
		1711	package CFClient::UI::Image;
		1712
		1713	our @ISA = CFClient::UI::Base::;
		1714
		1715	use CFClient::OpenGL;
		1716	use Carp qw/confess/;
		1717
		1718	our %loaded_images;
		1719
		1720	sub new {
		1721	my $class = shift;
		1722
		1723	my $self = $class->SUPER::new (can_events => 0, @_);
		1724
		1725	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
		1726
		1727	$loaded_images{$self->{image}} ||=
		1728	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
		1729
		1730	my $tex = $self->{tex} = $loaded_images{$self->{image}};
		1731
		1732	Scalar::Util::weaken $loaded_images{$self->{image}};
		1733
		1734	$self->{aspect} = $tex->{w} / $tex->{h};
		1735
		1736	$self
		1737	}
		1738
		1739	sub size_request {
		1740	my ($self) = @_;
		1741
		1742	($self->{tex}->{w}, $self->{tex}->{h})
		1743	}
		1744
		1745	sub _draw {
		1746	my ($self) = @_;
		1747
		1748	my $tex = $self->{tex};
		1749
		1750	my ($w, $h) = ($self->{w}, $self->{h});
		1751
		1752	if ($self->{rot90}) {
		1753	glRotate 90, 0, 0, 1;
		1754	glTranslate 0, -$self->{w}, 0;
		1755
		1756	($w, $h) = ($h, $w);
		1757	}
		1758
		1759	glEnable GL_TEXTURE_2D;
		1760	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1761
		1762	$tex->draw_quad_alpha (0, 0, $w, $h);
		1763
1420	glDisable GL_BLEND;	1764	glDisable GL_TEXTURE_2D;
1421	}	1765	}
1422		1766
1423	#############################################################################	1767	#############################################################################
1424		1768
1425	package CFClient::UI::VGauge;	1769	package CFClient::UI::VGauge;
1426		1770
1427	our @ISA = CFClient::UI::Base::;	1771	our @ISA = CFClient::UI::Base::;
1428		1772
1429	use SDL::OpenGL;	1773	use List::Util qw(min max);
		1774
		1775	use CFClient::OpenGL;
1430		1776
1431	my %tex = (	1777	my %tex = (
1432	food => [	1778	food => [
1433	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1779	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1434	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	1780	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1435	],	1781	],
1436	grace => [	1782	grace => [
1437	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1783	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1438	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/	1784	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1439	],	1785	],
1440	hp => [	1786	hp => [
1441	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1787	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1442	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	1788	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1443	],	1789	],
1444	mana => [	1790	mana => [
1445	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1791	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1446	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/	1792	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1447	],	1793	],
1448	);	1794	);
1449		1795
1450	# eg. VGauge->new (gauge => 'food'), default gauge: food	1796	# eg. VGauge->new (gauge => 'food'), default gauge: food
1451	sub new {	1797	sub new {
1452	my $class = shift;	1798	my $class = shift;
1453		1799
1454	my $self = $class->SUPER::new (gauge => 'food', @_);	1800	my $self = $class->SUPER::new (
		1801	type => 'food',
		1802	@_
		1803	);
		1804
		1805	$self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1455		1806
1456	$self	1807	$self
1457	}	1808	}
1458		1809
1459	sub size_request {	1810	sub size_request {
1460	my ($self) = @_;	1811	my ($self) = @_;
1461		1812
1462	my $tex = $tex{$self->{gauge}}[0];	1813	#my $tex = $tex{$self->{type}}[0];
1463
1464	@$tex{qw(w h)}	1814	#@$tex{qw(w h)}
		1815	(0, 0)
1465	}	1816	}
1466		1817
1467	sub set_max {	1818	sub set_max {
1468	my ($self, $max) = @_;	1819	my ($self, $max) = @_;
1469		1820
		1821	return if $self->{max_val} == $max;
		1822
1470	$self->{max_val} = $max;	1823	$self->{max_val} = $max;
		1824	$self->update;
1471	}	1825	}
1472		1826
1473	sub set_value {	1827	sub set_value {
1474	my ($self, $val, $max) = @_;	1828	my ($self, $val, $max) = @_;
1475		1829
1476	$self->set_max ($max)	1830	$self->set_max ($max)
1477	if defined $max;	1831	if defined $max;
1478		1832
1479	$max = $self->{max_val};	1833	return if $self->{val} == $val;
		1834
1480	$self->{val} = $val;	1835	$self->{val} = $val;
1481
1482	$self->update;	1836	$self->update;
1483	}	1837	}
1484		1838
1485	sub _draw {	1839	sub _draw {
1486	my ($self) = @_;	1840	my ($self) = @_;
1487		1841
1488	my $tex = $tex{$self->{gauge}};	1842	my $tex = $tex{$self->{type}};
		1843	my ($t1, $t2, $t3) = @$tex;
1489		1844
1490	my ($w, $h) = ($self->{w}, $self->{h});	1845	my ($w, $h) = ($self->{w}, $self->{h});
1491		1846
		1847	if ($self->{vertical}) {
		1848	glRotate 90, 0, 0, 1;
		1849	glTranslate 0, -$self->{w}, 0;
		1850
		1851	($w, $h) = ($h, $w);
		1852	}
		1853
1492	my $ycut = $self->{val} / ($self->{max_val} || 1);	1854	my $ycut = $self->{val} / ($self->{max_val} || 1);
1493	$ycut = 1 if $self->{val} > $self->{max_val};
1494		1855
1495	my $t1 = $tex->[0];	1856	my $ycut1 = max 0, min 1, $ycut;
1496	my $t2 = $tex->[1];	1857	my $ycut2 = max 0, min 1, $ycut - 1;
		1858
		1859	my $h1 = $self->{h} * (1 - $ycut1);
		1860	my $h2 = $self->{h} * (1 - $ycut2);
1497		1861
1498	glEnable GL_BLEND;	1862	glEnable GL_BLEND;
1499	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1863	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1500	glEnable GL_TEXTURE_2D;	1864	glEnable GL_TEXTURE_2D;
1501	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1865	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1502		1866
1503	my $h1 = $self->{h} - $ycut * $self->{h};
1504	my $h2 = $ycut * $self->{h};
1505
1506	my $yp = 0;
1507
1508	glBindTexture GL_TEXTURE_2D, $t1->{name};	1867	glBindTexture GL_TEXTURE_2D, $t1->{name};
1509	glBegin GL_QUADS;	1868	glBegin GL_QUADS;
1510	glTexCoord 0 , 0; glVertex 0 , $yp;	1869	glTexCoord 0 , 0; glVertex 0 , 0;
1511	glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1;	1870	glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1512	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1;	1871	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1513	glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp;	1872	glTexCoord $t1->{s}, 0; glVertex $w, 0;
1514	glEnd;	1873	glEnd;
1515		1874
1516	$yp += $h1;	1875	my $ycut1 = List::Util::min 1, $ycut;
1517
1518	glBindTexture GL_TEXTURE_2D, $t2->{name};	1876	glBindTexture GL_TEXTURE_2D, $t2->{name};
1519	glBegin GL_QUADS;	1877	glBegin GL_QUADS;
1520	glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp;	1878	glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1521	glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2;	1879	glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1522	glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1523	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp;	1880	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
		1881	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1524	glEnd;	1882	glEnd;
		1883
		1884	if ($t3) {
		1885	glBindTexture GL_TEXTURE_2D, $t3->{name};
		1886	glBegin GL_QUADS;
		1887	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
		1888	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
		1889	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
		1890	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
		1891	glEnd;
		1892	}
1525		1893
1526	glDisable GL_BLEND;	1894	glDisable GL_BLEND;
1527	glDisable GL_TEXTURE_2D;	1895	glDisable GL_TEXTURE_2D;
1528	}	1896	}
1529		1897
1530	#############################################################################	1898	#############################################################################
1531		1899
		1900	package CFClient::UI::Gauge;
		1901
		1902	our @ISA = CFClient::UI::VBox::;
		1903
		1904	sub new {
		1905	my ($class, %arg) = @_;
		1906
		1907	my $self = $class->SUPER::new (
		1908	tooltip => $arg{type},
		1909	can_hover => 1,
		1910	can_events => 1,
		1911	%arg,
		1912	);
		1913
		1914	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
		1915	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
		1916	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
		1917
		1918	$self
		1919	}
		1920
		1921	sub set_fontsize {
		1922	my ($self, $fsize) = @_;
		1923
		1924	$self->{value}->set_fontsize ($fsize);
		1925	$self->{max} ->set_fontsize ($fsize);
		1926	}
		1927
		1928	sub set_max {
		1929	my ($self, $max) = @_;
		1930
		1931	$self->{gauge}->set_max ($max);
		1932	$self->{max}->set_text ($max);
		1933	}
		1934
		1935	sub set_value {
		1936	my ($self, $val, $max) = @_;
		1937
		1938	$self->set_max ($max)
		1939	if defined $max;
		1940
		1941	$self->{gauge}->set_value ($val, $max);
		1942	$self->{value}->set_text ($val);
		1943	}
		1944
		1945	#############################################################################
		1946
1532	package CFClient::UI::Slider;	1947	package CFClient::UI::Slider;
1533		1948
1534	use strict;	1949	use strict;
1535		1950
1536	use SDL::OpenGL;	1951	use CFClient::OpenGL;
1537		1952
1538	our @ISA = CFClient::UI::DrawBG::;	1953	our @ISA = CFClient::UI::DrawBG::;
1539		1954
1540	my @tex =	1955	my @tex =
1541	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1956	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
…		…
1551	# TODO: calculations are off	1966	# TODO: calculations are off
1552	my $self = $class->SUPER::new (	1967	my $self = $class->SUPER::new (
1553	fg => [1, 1, 1],	1968	fg => [1, 1, 1],
1554	active_fg => [0, 0, 0],	1969	active_fg => [0, 0, 0],
1555	range => [0, 0, 100, 10],	1970	range => [0, 0, 100, 10],
1556	req_w => 20,	1971	req_w => $::WIDTH / 80,
1557	req_h => 20,	1972	req_h => $::WIDTH / 80,
1558	vertical => 0,	1973	vertical => 0,
1559	can_hover => 1,	1974	can_hover => 1,
1560	inner_pad => 5,	1975	inner_pad => 5,
1561	@_	1976	@_
1562	);	1977	);
…		…
1645	$page ||= 2;	2060	$page ||= 2;
1646		2061
1647	my $knob_a = $inner_pad_px + ($value - $page * 0.5);	2062	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1648	my $knob_b = $inner_pad_px + ($value + $page * 0.5);	2063	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1649		2064
1650	glEnable GL_BLEND;
1651	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1652	glEnable GL_TEXTURE_2D;	2065	glEnable GL_TEXTURE_2D;
1653	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2066	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1654		2067
1655	# draw background	2068	# draw background
1656	$tex[1]->draw_quad (0, 0, $w, $h);	2069	$tex[1]->draw_quad_alpha (0, 0, $w, $h);
1657		2070
1658	# draw handle	2071	# draw handle
1659	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2072	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1660		2073
1661	glDisable GL_BLEND;
1662	glDisable GL_TEXTURE_2D;	2074	glDisable GL_TEXTURE_2D;
1663	}	2075	}
1664		2076
1665	#############################################################################	2077	#############################################################################
1666		2078
1667	package CFClient::UI::TextView;	2079	package CFClient::UI::TextView;
1668		2080
1669	our @ISA = CFClient::UI::HBox::;	2081	our @ISA = CFClient::UI::HBox::;
1670		2082
1671	use SDL::OpenGL;	2083	use CFClient::OpenGL;
1672		2084
1673	sub new {	2085	sub new {
1674	my $class = shift;	2086	my $class = shift;
1675		2087
1676	my $self = $class->SUPER::new (	2088	my $self = $class->SUPER::new (
1677	fontsize => 1,	2089	fontsize => 1,
		2090	can_events => 0,
		2091	#font => default_font
1678	@_,	2092	@_,
1679		2093
1680	layout => (new CFClient::Layout),	2094	layout => (new CFClient::Layout 1),
1681	par => [],	2095	par => [],
1682	height => 0,	2096	height => 0,
1683	children => [	2097	children => [
1684	(new CFClient::UI::Empty expand => 1),	2098	(new CFClient::UI::Empty expand => 1),
1685	(new CFClient::UI::Slider vertical => 1),	2099	(new CFClient::UI::Slider vertical => 1),
1686	],	2100	],
1687	);	2101	);
1688		2102
1689	$self->{children}[1]->connect (changed => sub {	2103	$self->{children}[1]->connect (changed => sub { $self->update });
1690	$self->update;
1691	});
1692		2104
1693	$self	2105	$self
1694	}	2106	}
1695		2107
1696	sub set_fontsize {	2108	sub set_fontsize {
…		…
1704	my ($self, $text) = @_;	2116	my ($self, $text) = @_;
1705		2117
1706	my $layout = $self->{layout};	2118	my $layout = $self->{layout};
1707		2119
1708	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2120	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1709	$layout->set_width ($self->{w});	2121	$layout->set_width ($self->{children}[0]{w});
1710	$layout->set_text ($text);	2122	$layout->set_markup ($text);
1711		2123
1712	($layout->size)[1]	2124	($layout->size)[1]
1713	}	2125	}
1714		2126
1715	sub reflow {	2127	sub reflow {
…		…
1722	sub size_allocate {	2134	sub size_allocate {
1723	my ($self, $w, $h) = @_;	2135	my ($self, $w, $h) = @_;
1724		2136
1725	$self->SUPER::size_allocate ($w, $h);	2137	$self->SUPER::size_allocate ($w, $h);
1726		2138
		2139	$self->{layout}->set_font ($self->{font}) if $self->{font};
1727	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2140	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1728	$self->{layout}->set_width ($self->{children}[0]{w});	2141	$self->{layout}->set_width ($self->{children}[0]{w});
1729		2142
1730	$self->reflow;	2143	$self->reflow;
1731	}	2144	}
…		…
1766	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2179	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1767		2180
1768	delete $self->{texture};	2181	delete $self->{texture};
1769	}	2182	}
1770		2183
1771	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2184	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1772	glClearColor 0, 0, 0, 1;	2185	glClearColor 0, 0, 0, 0;
1773	glClear GL_COLOR_BUFFER_BIT;	2186	glClear GL_COLOR_BUFFER_BIT;
1774		2187
1775	glEnable GL_BLEND;
1776	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1777	glEnable GL_TEXTURE_2D;	2188	glEnable GL_TEXTURE_2D;
1778	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2189	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1779		2190
1780	my $top = int $self->{children}[1]{range}[0];	2191	my $top = int $self->{children}[1]{range}[0];
1781		2192
…		…
1784		2195
1785	my $y = 0;	2196	my $y = 0;
1786		2197
1787	my $layout = $self->{layout};	2198	my $layout = $self->{layout};
1788		2199
		2200	$layout->set_font ($self->{font}) if $self->{font};
		2201
1789	for my $par (@{$self->{par}}) {	2202	for my $par (@{$self->{par}}) {
1790	my $h = $par->[0];	2203	my $h = $par->[0];
1791		2204
1792	if ($y0 < $y + $h && $y < $y1) {	2205	if ($y0 < $y + $h && $y < $y1) {
		2206	$layout->set_foreground (@{ $par->[1] });
1793	$layout->set_text ($par->[2]);	2207	$layout->set_markup ($par->[2]);
1794		2208
1795	glColor @{ $par->[1] };
1796	my ($W, $H) = $layout->size;	2209	my ($W, $H) = $layout->size;
1797	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2210	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
1798	}	2211	}
1799		2212
1800	$y += $h;	2213	$y += $h;
1801	}	2214	}
1802		2215
1803	glDisable GL_TEXTURE_2D;	2216	glDisable GL_TEXTURE_2D;
1804	glDisable GL_BLEND;
1805	};	2217	};
1806	});	2218	});
1807	}	2219	}
1808		2220
1809	sub _draw {	2221	sub _draw {
1810	my ($self) = @_;	2222	my ($self) = @_;
1811		2223
1812	if ($self->{texture}) {
1813	glEnable GL_TEXTURE_2D;	2224	glEnable GL_TEXTURE_2D;
1814	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2225	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1815	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2226	glColor 1, 1, 1, 1;
		2227	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1816	glDisable GL_TEXTURE_2D;	2228	glDisable GL_TEXTURE_2D;
1817	}
1818		2229
1819	$self->{children}[1]->draw;	2230	$self->{children}[1]->draw;
1820		2231
1821	}	2232	}
1822		2233
1823	#############################################################################	2234	#############################################################################
1824		2235
1825	package CFClient::UI::Animator;	2236	package CFClient::UI::Animator;
1826		2237
1827	use SDL::OpenGL;	2238	use CFClient::OpenGL;
1828		2239
1829	our @ISA = CFClient::UI::Bin::;	2240	our @ISA = CFClient::UI::Bin::;
1830		2241
1831	sub moveto {	2242	sub moveto {
1832	my ($self, $x, $y) = @_;	2243	my ($self, $x, $y) = @_;
…		…
1870		2281
1871	sub new {	2282	sub new {
1872	my $class = shift;	2283	my $class = shift;
1873		2284
1874	my $self = $class->SUPER::new (	2285	my $self = $class->SUPER::new (
1875	state => 0,	2286	state => 0,
1876	connect_activate => \&toggle_flopper,	2287	connect_activate => \&toggle_flopper,
1877	@_	2288	@_
1878	);	2289	);
1879		2290
1880	if ($self->{state}) {	2291	if ($self->{state}) {
…		…
1901	$self->emit (changed => $self->{state});	2312	$self->emit (changed => $self->{state});
1902	}	2313	}
1903		2314
1904	#############################################################################	2315	#############################################################################
1905		2316
		2317	package CFClient::UI::Tooltip;
		2318
		2319	our @ISA = CFClient::UI::Bin::;
		2320
		2321	use CFClient::OpenGL;
		2322
		2323	sub new {
		2324	my $class = shift;
		2325
		2326	$class->SUPER::new (
		2327	@_,
		2328	can_events => 0,
		2329	)
		2330	}
		2331
		2332	sub set_tooltip_from {
		2333	my ($self, $widget) = @_;
		2334
		2335	$self->add (new CFClient::UI::Label
		2336	markup => $widget->{tooltip},
		2337	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2338	fontsize => 0.8,
		2339	fg => [0, 0, 0, 1],
		2340	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2341	);
		2342	}
		2343
		2344	sub size_request {
		2345	my ($self) = @_;
		2346
		2347	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
		2348
		2349	($w + 4, $h + 4)
		2350	}
		2351
		2352	sub size_allocate {
		2353	my ($self, $w, $h) = @_;
		2354
		2355	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2356	}
		2357
		2358	sub _draw {
		2359	my ($self) = @_;
		2360
		2361	glTranslate 0.375, 0.375;
		2362
		2363	my ($w, $h) = @$self{qw(w h)};
		2364
		2365	glColor 1, 0.8, 0.4;
		2366	glBegin GL_QUADS;
		2367	glVertex 0 , 0;
		2368	glVertex 0 , $h;
		2369	glVertex $w, $h;
		2370	glVertex $w, 0;
		2371	glEnd;
		2372
		2373	glColor 0, 0, 0;
		2374	glBegin GL_LINE_LOOP;
		2375	glVertex 0 , 0;
		2376	glVertex 0 , $h;
		2377	glVertex $w, $h;
		2378	glVertex $w, 0;
		2379	glEnd;
		2380
		2381	glTranslate 2 - 0.375, 2 - 0.375;
		2382	$self->SUPER::_draw;
		2383	}
		2384
		2385	#############################################################################
		2386
		2387	package CFClient::UI::Face;
		2388
		2389	our @ISA = CFClient::UI::Base::;
		2390
		2391	use CFClient::OpenGL;
		2392
		2393	sub new {
		2394	my $class = shift;
		2395
		2396	$class->SUPER::new (
		2397	aspect => 1,
		2398	@_,
		2399	)
		2400	}
		2401
		2402	sub size_request {
		2403	(32, 8)
		2404	}
		2405
		2406	sub _draw {
		2407	my ($self) = @_;
		2408
		2409	return unless $::CONN;#d# manage and cache textures differently
		2410	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
		2411
		2412	# TODO animation
		2413	if ($tex) {
		2414	glEnable GL_TEXTURE_2D;
		2415	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2416	glColor 1, 1, 1, 1;
		2417	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2418	glDisable GL_TEXTURE_2D;
		2419	}
		2420	}
		2421
		2422	#############################################################################
		2423
		2424	package CFClient::UI::InventoryItem;
		2425
		2426	our @ISA = CFClient::UI::HBox::;
		2427
		2428	sub new {
		2429	my $class = shift;
		2430
		2431	my %args = @_;
		2432
		2433	my $item = delete $args{item};
		2434
		2435	my $desc = $item->{nrof} < 2
		2436	? $item->{name}
		2437	: "$item->{nrof} $item->{name_pl}";
		2438
		2439
		2440	my $self = $class->SUPER::new (
		2441	can_hover => 1,
		2442	can_events => 1,
		2443	tooltip => (CFClient::UI::Label->escape ($desc)
		2444	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2445	connect_button_down => sub {
		2446	my ($self, $ev, $x, $y) = @_;
		2447
		2448	# todo: maybe put examine on 1? but should just be a tooltip :(
		2449	if ($ev->{button} == 1) {
		2450	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
		2451	} elsif ($ev->{button} == 2) {
		2452	$::CONN->send ("apply $item->{tag}");
		2453	} elsif ($ev->{button} == 3) {
		2454	CFClient::UI::Menu->new (
		2455	items => [
		2456	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2457	[
		2458	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2459	sub { $::CONN->send ("lock $item->{tag}") },
		2460	],
		2461	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2462	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2463	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
		2464	],
		2465	)->popup ($ev);
		2466	}
		2467
		2468	1
		2469	},
		2470	%args
		2471	);
		2472
		2473	$self->add (new CFClient::UI::Face
		2474	can_events => 0,
		2475	face => $item->{face},
		2476	anim => $item->{anim},
		2477	animspeed => $item->{animspeed},
		2478	);
		2479
		2480	$self->add (new CFClient::UI::Label
		2481	can_events => 0,
		2482	text => $desc,
		2483	);
		2484
		2485	$self
		2486	}
		2487
		2488	#############################################################################
		2489
		2490	package CFClient::UI::Inventory;
		2491
		2492	our @ISA = CFClient::UI::ScrolledWindow::;
		2493
		2494	sub new {
		2495	my $class = shift;
		2496
		2497	my $self = $class->SUPER::new (
		2498	scrolled => (new CFClient::UI::VBox),
		2499	@_,
		2500	);
		2501
		2502	$self
		2503	}
		2504
		2505	sub set_items {
		2506	my ($self, $items) = @_;
		2507
		2508	$self->{scrolled}->clear;
		2509	return unless $items;
		2510
		2511	my @items = sort { $a->{type} <=> $b->{type} } @$items;
		2512
		2513	$self->{real_items} = \@items;
		2514
		2515	for my $item (@items) {
		2516	my $desc = $item->{nrof} < 2
		2517	? $item->{name}
		2518	: "$item->{nrof} $item->{name_pl}";
		2519
		2520	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
		2521	}
		2522
		2523	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2524	}
		2525
		2526	sub size_request {
		2527	my ($self) = @_;
		2528	($self->{req_w}, $self->{req_h});
		2529	}
		2530
		2531	#############################################################################
		2532
		2533	package CFClient::UI::Menu;
		2534
		2535	our @ISA = CFClient::UI::FancyFrame::;
		2536
		2537	use CFClient::OpenGL;
		2538
		2539	sub new {
		2540	my $class = shift;
		2541
		2542	my $self = $class->SUPER::new (
		2543	items => [],
		2544	z => 100,
		2545	@_,
		2546	);
		2547
		2548	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2549
		2550	for my $item (@{ $self->{items} }) {
		2551	my ($widget, $cb) = @$item;
		2552
		2553	# handle various types of items, only text for now
		2554	if (!ref $widget) {
		2555	$widget = new CFClient::UI::Label
		2556	can_hover => 1,
		2557	can_events => 1,
		2558	text => $widget;
		2559	}
		2560
		2561	$self->{item}{$widget} = $item;
		2562
		2563	$self->{vbox}->add ($widget);
		2564	}
		2565
		2566	$self
		2567	}
		2568
		2569	# popup given the event (must be a mouse button down event currently)
		2570	sub popup {
		2571	my ($self, $ev) = @_;
		2572
		2573	$self->emit ("popdown");
		2574
		2575	# maybe save $GRAB? must be careful about events...
		2576	$GRAB = $self;
		2577	$self->{button} = $ev->{button};
		2578
		2579	$self->show;
		2580	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2581	}
		2582
		2583	sub mouse_motion {
		2584	my ($self, $ev, $x, $y) = @_;
		2585
		2586	# TODO: should use vbox->find_widget or so
		2587	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2588	$self->{hover} = $self->{item}{$HOVER};
		2589	}
		2590
		2591	sub button_up {
		2592	my ($self, $ev, $x, $y) = @_;
		2593
		2594	if ($ev->{button} == $self->{button}) {
		2595	undef $GRAB;
		2596	$self->hide;
		2597
		2598	$self->emit ("popdown");
		2599	$self->{hover}[1]->() if $self->{hover};
		2600	}
		2601	}
		2602
		2603	#############################################################################
		2604
		2605	package CFClient::UI::Statusbox;
		2606
		2607	our @ISA = CFClient::UI::VBox::;
		2608
		2609	sub reorder {
		2610	my ($self) = @_;
		2611	my $NOW = time;
		2612
		2613	while (my ($k, $v) = each %{ $self->{item} }) {
		2614	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2615	}
		2616
		2617	my @widgets;
		2618
		2619	my @items = sort {
		2620	$a->{pri} <=> $b->{pri}
		2621	or $b->{id} <=> $a->{id}
		2622	} values %{ $self->{item} };
		2623
		2624	my $count = 10 + 1;
		2625	for my $item (@items) {
		2626	last unless --$count;
		2627
		2628	push @widgets, $item->{label} ||= do {
		2629	# TODO: doesn't handle markup well (read as: at all)
		2630	my $short = $item->{count} > 1
		2631	? "<b>$item->{count} ×</b> $item->{text}"
		2632	: $item->{text};
		2633
		2634	for ($short) {
		2635	s/^\s+//;
		2636	s/\012.*/…/s;
		2637	my $len = int 30 / $item->{fontsize};
		2638	substr $_, $len, length, "…" if $len < length;
		2639	}
		2640
		2641	new CFClient::UI::Label
		2642	markup => $short,
		2643	tooltip => $item->{tooltip},
		2644	tooltip_font => $::FONT_PROP,
		2645	tooltip_width => 0.67,
		2646	fontsize => $item->{fontsize},
		2647	color => $item->{color},
		2648	can_events => 1,
		2649	can_hover => 1
		2650	};
		2651	}
		2652
		2653	$self->clear;
		2654	$self->SUPER::add (reverse @widgets);
		2655	}
		2656
		2657	sub add {
		2658	my ($self, $text, %arg) = @_;
		2659
		2660	my $timeout = time + ((delete $arg{timeout}) || 60);
		2661
		2662	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2663
		2664	if (my $item = $self->{item}{$group}) {
		2665	if ($item->{text} eq $text) {
		2666	$item->{count}++;
		2667	} else {
		2668	$item->{count} = 1;
		2669	$item->{text} = $item->{tooltip} = $text;
		2670	}
		2671	$item->{timeout} = $timeout;
		2672	delete $item->{label};
		2673	} else {
		2674	$self->{item}{$group} = {
		2675	id => ++$self->{id},
		2676	text => $text,
		2677	timeout => $timeout,
		2678	tooltip => $text,
		2679	fontsize => 0.8,
		2680	color => [0.8, 0.8, 0.8, 0.8],
		2681	pri => 0,
		2682	count => 1,
		2683	%arg,
		2684	};
		2685	}
		2686
		2687	$self->reorder;
		2688	}
		2689
		2690	#############################################################################
		2691
1906	package CFClient::UI::Root;	2692	package CFClient::UI::Root;
1907		2693
1908	our @ISA = CFClient::UI::Container::;	2694	our @ISA = CFClient::UI::Container::;
1909		2695
1910	use SDL::OpenGL;	2696	use CFClient::OpenGL;
1911		2697
1912	sub check_size {	2698	sub new {
1913	my ($self) = @_;	2699	my $class = shift;
1914		2700
1915	$self->configure (0, 0, $::WITH, $::HEIGHT);	2701	$class->SUPER::new (
1916	}	2702	@_,
1917		2703	)
1918	sub size_request {
1919	($::WIDTH, $::HEIGHT)
1920	}	2704	}
1921		2705
1922	sub configure {	2706	sub configure {
1923	my ($self, $x, $y, $w, $h) = @_;	2707	my ($self, $x, $y, $w, $h) = @_;
1924		2708
1925	$self->SUPER::configure ($x, $y, $w, $h);	2709	$self->{w} = $w;
1926		2710	$self->{h} = $h;
1927	$_->configure ($_->{x}, $_->{y}, $_->size_request)
1928	for @{$self->{children}};
1929	}	2711	}
1930		2712
1931	sub _topleft {	2713	sub check_size {
		2714	my ($self) = @_;
		2715
		2716	$self->size_allocate ($self->{w}, $self->{h})
		2717	if $self->{w};
		2718	}
		2719
		2720	sub size_request {
		2721	my ($self) = @_;
		2722
		2723	($self->{w}, $self->{h})
		2724	}
		2725
		2726	sub size_allocate {
		2727	my ($self, $w, $h) = @_;
		2728
		2729	my $old_w = $self->{old_w};
		2730	my $old_h = $self->{old_h};
		2731
		2732	if ($old_w && $old_h) {
		2733	for my $child ($self->children) {
		2734	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
		2735	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
		2736	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
		2737	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
		2738	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
		2739	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
		2740	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
		2741	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
		2742	}
		2743	}
		2744
		2745	for my $child ($self->children) {
		2746	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
		2747
		2748	$X = List::Util::max 0, List::Util::min $w - $W, $X;
		2749	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
		2750	$child->configure ($X, $Y, $W, $H);
		2751	}
		2752
		2753	$self->{old_w} = $w;
		2754	$self->{old_h} = $h;
		2755	}
		2756
		2757	sub coord2local {
1932	my ($self, $x, $y) = @_;	2758	my ($self, $x, $y) = @_;
1933		2759
1934	($x, $y)	2760	($x, $y)
1935	}	2761	}
1936		2762
		2763	sub coord2global {
		2764	my ($self, $x, $y) = @_;
		2765
		2766	($x, $y)
		2767	}
		2768
1937	sub update {	2769	sub update {
1938	my ($self) = @_;	2770	my ($self) = @_;
1939		2771
1940	$self->check_size;	2772	$self->check_size;
1941	::refresh ();	2773	$::WANT_REFRESH++;
1942	}	2774	}
1943		2775
1944	sub add {	2776	sub add {
1945	my ($self, $child) = @_;	2777	my ($self, $child) = @_;
1946		2778
		2779	# integerise window positions
		2780	$child->{x} = int $child->{x};
		2781	$child->{y} = int $child->{y};
		2782
1947	$self->SUPER::add ($child);	2783	$self->SUPER::add ($child);
1948	}	2784	}
1949		2785
1950	sub on_refresh {	2786	sub on_refresh {
1951	my ($self, $id, $cb) = @_;	2787	my ($self, $id, $cb) = @_;
1952		2788
1953	$self->{refresh_hook}{$id} = $cb;	2789	$self->{refresh_hook}{$id} = $cb;
1954	}	2790	}
1955		2791
1956	sub draw {	2792	sub draw {
1957	my ($self) = @_;	2793	my ($self) = @_;
1958		2794
		2795	if ($self->{check_size}) {
		2796	my @queue = ([], []);
		2797
		2798	for (;;) {
		2799	if ($self->{check_size}) {
		2800	# heuristic: check containers last
		2801	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		2802	for values %{delete $self->{check_size}}
		2803	}
		2804
		2805	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		2806
		2807	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		2808	? @$widget{qw(user_w user_h)}
		2809	: $widget->size_request;
		2810
		2811	if (delete $widget->{force_alloc}
		2812	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		2813	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		2814
		2815	$widget->{req_w} = $w;
		2816	$widget->{req_h} = $h;
		2817
		2818	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		2819
		2820	$widget->{parent}->check_size
		2821	if $widget->{parent};
		2822	}
		2823	}
		2824	}
		2825
		2826	while ($self->{size_alloc}) {
		2827	for (values %{delete $self->{size_alloc}}) {
		2828	my ($widget, $w, $h) = @$_;
		2829
		2830	$w = 0 if $w < 0;
		2831	$h = 0 if $h < 0;
		2832
		2833	$widget->{w} = $w;
		2834	$widget->{h} = $h;
		2835	$widget->size_allocate ($w, $h);
		2836	$widget->emit (size_allocate => $w, $h);
		2837	}
		2838	}
		2839
1959	while (my $rcb = delete $self->{refresh_hook}) {	2840	while ($self->{refresh_hook}) {
1960	$_->() for values %$rcb;	2841	$_->()
		2842	for values %{delete $self->{refresh_hook}};
1961	}	2843	}
1962		2844
1963	glViewport 0, 0, $::WIDTH, $::HEIGHT;	2845	glViewport 0, 0, $::WIDTH, $::HEIGHT;
1964	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	2846	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
1965	glClear GL_COLOR_BUFFER_BIT;	2847	glClear GL_COLOR_BUFFER_BIT;
…		…
1976	#############################################################################	2858	#############################################################################
1977		2859
1978	package CFClient::UI;	2860	package CFClient::UI;
1979		2861
1980	$ROOT = new CFClient::UI::Root;	2862	$ROOT = new CFClient::UI::Root;
		2863	$TOOLTIP = new CFClient::UI::Tooltip;
1981		2864
1982	1	2865	1
1983		2866

Diff Legend

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