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

Diff Legend

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