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.247 by root, Sun May 28 01:16:04 2006 UTC vs.
Revision 1.271 by root, Fri Jun 2 22:13:47 2006 UTC

…		…
17	our $BUTTON_STATE;	17	our $BUTTON_STATE;
18		18
19	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
20		20
21	sub get_layout {	21	sub get_layout {
		22	my $layout;
		23
22	for (grep { $_->{name} } values %WIDGET) {	24	for (grep { $_->{name} } values %WIDGET) {
23	$LAYOUT->{$_->{name}} = {	25	my $win = $layout->{$_->{name}} = { };
24	x => $_->{x} / $::WIDTH,
25	y => $_->{y} / $::HEIGHT,
26	w => $_->{w} / $::WIDTH,
27	h => $_->{h} / $::HEIGHT
28	};	26
29	}	27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
30		31
31	return $LAYOUT;	32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
32	}	36	}
33		37
34	sub set_layout {	38	sub set_layout {
35	my ($layout) = @_;	39	my ($layout) = @_;
		40
36	$LAYOUT = $layout;	41	$LAYOUT = $layout;
37	}	42	}
38		43
39	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
40	if (!$GRAB) {	47	if (!$GRAB) {
41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
43
44	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
45	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
46		54
47	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
48		56
49	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
50		58
51	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
52	$TOOLTIP->show;	60	$TOOLTIP->show;
53
54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57	if $x + $TOOLTIP->{w} > $::WIDTH;
58
59	$TOOLTIP->move ($x, $y);
60	$TOOLTIP->check_size;
61	$TOOLTIP->update;
62	}	61	}
63		62
64	return;	63	return;
65	}	64	}
66	}	65	}
…		…
172	sub rescale_widgets {	171	sub rescale_widgets {
173	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
174		173
175	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
176	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
		176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		178
177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
181	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
		185
		186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
183	}	189	}
184	}	190	}
185		191
186	reconfigure_widgets;	192	reconfigure_widgets;
187	}	193	}
…		…
196		202
197	sub new {	203	sub new {
198	my $class = shift;	204	my $class = shift;
199		205
200	my $self = bless {	206	my $self = bless {
201	x => 0,	207	x => "center",
202	y => 0,	208	y => "center",
203	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
204	can_events => 1,	212	can_events => 1,
205	@_	213	@_
206	}, $class;	214	}, $class;
		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207		217
208	for (keys %$self) {	218	for (keys %$self) {
209	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
210	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
211	}	221	}
212	}	222	}
213		223
214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217	$self->{req_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218	$self->{req_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;	228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
221	}	234	}
222		235
223	$self	236	$self
224	}
225
226	sub toggle_visibility {
227	my ($self) = @_;
228
229	if ($self->{visible}) {
230	$self->hide;
231	} else {
232	$self->show;
233	}
234	}	237	}
235		238
236	sub destroy {	239	sub destroy {
237	my ($self) = @_;	240	my ($self) = @_;
238		241
…		…
240	%$self = ();	243	%$self = ();
241	}	244	}
242		245
243	sub show {	246	sub show {
244	my ($self) = @_;	247	my ($self) = @_;
		248
245	return if $self->{parent};	249	return if $self->{parent};
246		250
247	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
248	}
249
250	sub center {
251	my ($self) = @_;
252
253	$CFClient::UI::ROOT->on_post_alloc (
254	"center_$self" => sub {
255	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
256	},
257	);
258
259	$self->update;
260	}	252	}
261		253
262	sub set_visible {	254	sub set_visible {
263	my ($self) = @_;	255	my ($self) = @_;
264		256
265	return if $self->{visible};	257	return if $self->{visible};
266		258
267	$self->{root} = $self->{parent}{root};	259	$self->{root} = $self->{parent}{root};
268	$self->{visible} = $self->{parent}{visible} + 1;	260	$self->{visible} = $self->{parent}{visible} + 1;
269		261
270	$self->emit (visibility_change => 1)	262	$self->emit (visibility_change => 1);
		263
		264	$self->realloc if !exists $self->{req_w};
		265
		266	$_->set_visible for $self->children;
271	}	267	}
272		268
273	sub set_invisible {	269	sub set_invisible {
274	my ($self) = @_;	270	my ($self) = @_;
275		271
276	return unless $self->{visible};	272	return unless $self->{visible};
277		273
278	# broken show/hide model	274	$_->set_invisible for $self->children;
279		275
280	delete $self->{root};	276	delete $self->{root};
281	delete $self->{visible};	277	delete $self->{visible};
282		278
283	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
284	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
285		281
286	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
287	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
288		284
289	$self->focus_out;	285	$self->focus_out;
290		286
291	$self->emit (visibility_change => 0);	287	$self->emit (visibility_change => 0);
		288	}
		289
		290	sub set_visibility {
		291	my ($self, $visible) = @_;
		292
		293	return if $self->{visible} == $visible;
		294
		295	$visible ? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub toggle_visibility {
		300	my ($self) = @_;
		301
		302	$self->{visible}
		303	? $self->hide
		304	: $self->show;
292	}	305	}
293		306
294	sub hide {	307	sub hide {
295	my ($self) = @_;	308	my ($self) = @_;
296		309
…		…
298		311
299	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
300	if $self->{parent};	313	if $self->{parent};
301	}	314	}
302		315
303	sub move {	316	sub move_abs {
304	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
305		318
306	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
307	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
308	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
309		322
310	$self->update;	323	$self->update;
311	}	324	}
312		325
313	sub set_size {	326	sub set_size {
314	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
315		328
316	$self->{def_w} = $w;	329	$self->{force_w} = $w;
317	$self->{def_h} = $h;	330	$self->{force_h} = $h;
318		331
319	$self->check_size;	332	$self->realloc;
320	}	333	}
321		334
322	sub size_request {	335	sub size_request {
323	require Carp;	336	require Carp;
324	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
326		339
327	sub configure {	340	sub configure {
328	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
329		342
330	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
331	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
332	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
333		348
334	# use alignment to adjust x, y	349	# use alignment to adjust x, y
335		350
336	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
337	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
338
339	($w, $h) = ($w2, $h2);
340	}	353	}
341		354
342	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
343	$self->{x} = $x;	356	$self->{x} = $x;
344	$self->{y} = $y;	357	$self->{y} = $y;
345	$self->update;	358	$self->update;
346	}	359	}
347		360
348	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
349	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	362	return unless $self->{visible};
		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
		367	$self->{root}{size_alloc}{$self+0} = $self;
350	}	368	}
351	}	369	}
352		370
353	sub size_allocate {	371	sub size_allocate {
354	# nothing to be done	372	# nothing to be done
355	}
356
357	sub reconfigure {
358	my ($self) = @_;
359
360	$self->check_size (1);
361	$self->update;
362	}	373	}
363		374
364	sub children {	375	sub children {
365	}	376	}
366		377
…		…
428		439
429	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	440	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
430	unless $FOCUS;	441	unless $FOCUS;
431	}	442	}
432		443
433	sub mouse_motion { }	444	sub mouse_motion { 0 }
434	sub button_up { }	445	sub button_up { 0 }
435	sub key_down { }	446	sub key_down { 0 }
436	sub key_up { }	447	sub key_up { 0 }
437		448
438	sub button_down {	449	sub button_down {
439	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
440		451
441	$self->focus_in;	452	$self->focus_in;
442	}
443		453
444	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	454	0
445	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	455	}
446	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	456
447	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	457	sub find_widget {
448	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	458	my ($self, $x, $y) = @_;
		459
		460	return () unless $self->{can_events};
		461
		462	return $self
		463	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		464	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		465
		466	()
		467	}
		468
		469	sub set_parent {
		470	my ($self, $parent) = @_;
		471
		472	Scalar::Util::weaken ($self->{parent} = $parent);
		473	$self->set_visible if $parent->{visible};
		474	}
		475
		476	sub connect {
		477	my ($self, $signal, $cb) = @_;
		478
		479	push @{ $self->{signal_cb}{$signal} }, $cb;
		480	}
		481
		482	sub _emit {
		483	my ($self, $signal, @args) = @_;
		484
		485	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		486	}
		487
		488	sub emit {
		489	my ($self, $signal, @args) = @_;
		490
		491	$self->_emit ($signal, @args)
		492	|| $self->$signal (@args);
		493	}
		494
		495	sub visibility_change {
		496	#my ($self, $visible) = @_;
		497	}
		498
		499	sub realloc {
		500	my ($self) = @_;
		501
		502	if ($self->{visible}) {
		503	return if $self->{root}{realloc}{$self+0};
		504
		505	$self->{root}{realloc}{$self+0} = $self;
		506	$self->{root}->update;
		507	} else {
		508	delete $self->{req_w};
		509	delete $self->{req_h};
		510	}
		511	}
		512
		513	sub update {
		514	my ($self) = @_;
		515
		516	$self->{parent}->update
		517	if $self->{parent};
		518	}
		519
		520	sub reconfigure {
		521	my ($self) = @_;
		522
		523	$self->realloc;
		524	$self->update;
		525	}
		526
		527	# using global variables seems a bit hacky, but passing through all drawing
		528	# functions seems pointless.
		529	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
449		530
450	sub draw {	531	sub draw {
451	my ($self) = @_;	532	my ($self) = @_;
452		533
453	return unless $self->{h} && $self->{w};	534	return unless $self->{h} && $self->{w};
		535
		536	# update screen rectangle
		537	local $draw_x = $draw_x + $self->{x};
		538	local $draw_y = $draw_y + $self->{y};
		539	local $draw_w = $draw_x + $self->{w};
		540	local $draw_h = $draw_y + $self->{h};
		541
		542	# skip widgets that are entirely outside the drawing area
		543	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		544	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
454		545
455	glPushMatrix;	546	glPushMatrix;
456	glTranslate $self->{x}, $self->{y}, 0;	547	glTranslate $self->{x}, $self->{y}, 0;
457	$self->_draw;	548	$self->_draw;
458	glPopMatrix;	549	glPopMatrix;
…		…
470	glVertex $x , $y + $self->{h};	561	glVertex $x , $y + $self->{h};
471	glEnd;	562	glEnd;
472	glDisable GL_BLEND;	563	glDisable GL_BLEND;
473	}	564	}
474		565
475	if ($ENV{PCLIENT_DEBUG}) {	566	if ($ENV{CFPLUS_DEBUG} & 1) {
476	glPushMatrix;	567	glPushMatrix;
477	glColor 1, 1, 0, 1;	568	glColor 1, 1, 0, 1;
478	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	569	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
479	glBegin GL_LINE_LOOP;	570	glBegin GL_LINE_LOOP;
480	glVertex 0 , 0;	571	glVertex 0 , 0;
…		…
491	my ($self) = @_;	582	my ($self) = @_;
492		583
493	warn "no draw defined for $self\n";	584	warn "no draw defined for $self\n";
494	}	585	}
495		586
496	sub find_widget {
497	my ($self, $x, $y) = @_;
498
499	return () unless $self->{can_events};
500
501	return $self
502	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
503	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
504
505	()
506	}
507
508	sub set_parent {
509	my ($self, $parent) = @_;
510
511	Scalar::Util::weaken ($self->{parent} = $parent);
512
513	$self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
514
515	$self->check_size;
516	}
517
518	sub check_size {
519	my ($self, $forced) = @_;
520
521	$self->{force_alloc} = 1 if $forced;
522	$CFClient::UI::ROOT->{check_size}{$self} = $self;
523	}
524
525	sub update {
526	my ($self) = @_;
527
528	$self->{parent}->update
529	if $self->{parent};
530	}
531
532	sub connect {
533	my ($self, $signal, $cb) = @_;
534
535	push @{ $self->{signal_cb}{$signal} }, $cb;
536	}
537
538	sub _emit {
539	my ($self, $signal, @args) = @_;
540
541	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
542	}
543
544	sub emit {
545	my ($self, $signal, @args) = @_;
546
547	$self->_emit ($signal, @args)
548	|| $self->$signal (@args);
549	}
550
551	sub visibility_change {
552	#my ($self, $visible) = @_;
553	}
554
555	sub DESTROY {	587	sub DESTROY {
556	my ($self) = @_;	588	my ($self) = @_;
557		589
558	delete $WIDGET{$self+0};	590	delete $WIDGET{$self+0};
559	#$self->deactivate;	591	#$self->deactivate;
…		…
615	my ($class, %arg) = @_;	647	my ($class, %arg) = @_;
616	$class->SUPER::new (can_events => 0, %arg);	648	$class->SUPER::new (can_events => 0, %arg);
617	}	649	}
618		650
619	sub size_request {	651	sub size_request {
620	(0, 0)	652	my ($self) = @_;
		653
		654	($self->{w} + 0, $self->{h} + 0)
621	}	655	}
622		656
623	sub draw { }	657	sub draw { }
624		658
625	#############################################################################	659	#############################################################################
…		…
654	$self->{children} = [	688	$self->{children} = [
655	sort { $a->{z} <=> $b->{z} }	689	sort { $a->{z} <=> $b->{z} }
656	@{$self->{children}}, @widgets	690	@{$self->{children}}, @widgets
657	];	691	];
658		692
659	$self->check_size (1);	693	$self->realloc;
660	$self->update;
661	}	694	}
662		695
663	sub children {	696	sub children {
664	@{ $_[0]{children} }	697	@{ $_[0]{children} }
665	}	698	}
…		…
670	delete $child->{parent};	703	delete $child->{parent};
671	$child->hide;	704	$child->hide;
672		705
673	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	706	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
674		707
675	$self->check_size (1);	708	$self->realloc;
676	$self->update;
677	}	709	}
678		710
679	sub clear {	711	sub clear {
680	my ($self) = @_;	712	my ($self) = @_;
681		713
…		…
685	for (@$children) {	717	for (@$children) {
686	delete $_->{parent};	718	delete $_->{parent};
687	$_->hide;	719	$_->hide;
688	}	720	}
689		721
690	$self->check_size;	722	$self->realloc;
691	$self->update;
692	}	723	}
693		724
694	sub find_widget {	725	sub find_widget {
695	my ($self, $x, $y) = @_;	726	my ($self, $x, $y) = @_;
696		727
…		…
783	$self->SUPER::size_allocate ($w, $h);	814	$self->SUPER::size_allocate ($w, $h);
784	$self->update;	815	$self->update;
785	}	816	}
786		817
787	sub _render {	818	sub _render {
		819	my ($self) = @_;
		820
788	$_[0]{children}[0]->draw;	821	$self->{children}[0]->draw;
789	}	822	}
790		823
791	sub render_child {	824	sub render_child {
792	my ($self) = @_;	825	my ($self) = @_;
793		826
794	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	827	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
795	glClearColor 0, 0, 0, 0;	828	glClearColor 0, 0, 0, 0;
796	glClear GL_COLOR_BUFFER_BIT;	829	glClear GL_COLOR_BUFFER_BIT;
797		830
		831	{
		832	package CFClient::UI::Base;
		833
		834	($draw_x, $draw_y, $draw_w, $draw_h) =
		835	(0, 0, $self->{w}, $self->{h});
		836	}
		837
798	$self->_render;	838	$self->_render;
799	};	839	};
800	}	840	}
801		841
802	sub _draw {	842	sub _draw {
803	my ($self) = @_;	843	my ($self) = @_;
804		844
805	my ($w, $h) = ($self->w, $self->h);	845	my ($w, $h) = @$self{qw(w h)};
806		846
807	my $tex = $self->{texture}	847	my $tex = $self->{texture}
808	or return;	848	or return;
809		849
810	glEnable GL_TEXTURE_2D;	850	glEnable GL_TEXTURE_2D;
…		…
833	}	873	}
834		874
835	sub size_request {	875	sub size_request {
836	my ($self) = @_;	876	my ($self) = @_;
837		877
838	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	878	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
839		879
840	$w = 10 if $self->{scroll_x};	880	$w = 10 if $self->{scroll_x};
841	$h = 10 if $self->{scroll_y};	881	$h = 10 if $self->{scroll_y};
842		882
843	($w, $h)	883	($w, $h)
844	}	884	}
845		885
846	sub size_allocate {	886	sub size_allocate {
847	my ($self, $w, $h) = @_;	887	my ($self, $w, $h) = @_;
848		888
		889	my $child = $self->child;
		890
849	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	891	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
850	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	892	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
851		893
852	$self->child->configure (0, 0, $w, $h);	894	$self->child->configure (0, 0, $w, $h);
853	$self->update;	895	$self->update;
854	}	896	}
855		897
…		…
890	}	932	}
891	}	933	}
892		934
893	sub _render {	935	sub _render {
894	my ($self) = @_;	936	my ($self) = @_;
		937
		938	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		939	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
895		940
896	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	941	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
897		942
898	$self->SUPER::_render;	943	$self->SUPER::_render;
899	}	944	}
…		…
998		1043
999	our @ISA = CFClient::UI::Bin::;	1044	our @ISA = CFClient::UI::Bin::;
1000		1045
1001	use CFClient::OpenGL;	1046	use CFClient::OpenGL;
1002		1047
1003	my @tex =	1048	my $bg =
		1049	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1050	mipmap => 1, wrap => 1;
		1051
		1052	my @border =
1004	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1053	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1005	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1054	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1006		1055
1007	sub new {	1056	sub new {
1008	my $class = shift;	1057	my ($class, %arg) = @_;
		1058
		1059	my $title = delete $arg{title};
1009		1060
1010	my $self = $class->SUPER::new (	1061	my $self = $class->SUPER::new (
1011	bg => [1, 1, 1, 1],	1062	bg => [1, 1, 1, 1],
1012	border_bg => [1, 1, 1, 1],	1063	border_bg => [1, 1, 1, 1],
1013	border => 0.6,	1064	border => 0.6,
1014	is_toplevel => 1,
1015	can_events => 1,	1065	can_events => 1,
1016	@_	1066	min_w => 16,
		1067	min_h => 16,
		1068	%arg,
1017	);	1069	);
1018		1070
1019	$self->{title} &&= new CFClient::UI::Label	1071	$self->{title} = new CFClient::UI::Label
1020	align => 0,	1072	align => 0,
1021	valign => 1,	1073	valign => 1,
1022	text => $self->{title},	1074	text => $title,
1023	fontsize => $self->{border};	1075	fontsize => $self->{border}
		1076	if defined $title;
1024		1077
1025	$self	1078	$self
		1079	}
		1080
		1081	sub add {
		1082	my ($self, @widgets) = @_;
		1083
		1084	$self->SUPER::add (@widgets);
		1085	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1026	}	1086	}
1027		1087
1028	sub border {	1088	sub border {
1029	int $_[0]{border} * $::FONTSIZE	1089	int $_[0]{border} * $::FONTSIZE
1030	}	1090	}
1031		1091
1032	sub size_request {	1092	sub size_request {
1033	my ($self) = @_;	1093	my ($self) = @_;
		1094
		1095	$self->{title}->size_request
		1096	if $self->{title};
1034		1097
1035	my ($w, $h) = $self->SUPER::size_request;	1098	my ($w, $h) = $self->SUPER::size_request;
1036		1099
1037	(	1100	(
1038	$w + $self->border * 2,	1101	$w + $self->border * 2,
…		…
1041	}	1104	}
1042		1105
1043	sub size_allocate {	1106	sub size_allocate {
1044	my ($self, $w, $h) = @_;	1107	my ($self, $w, $h) = @_;
1045		1108
		1109	if ($self->{title}) {
		1110	$self->{title}{w} = $w;
		1111	$self->{title}{h} = $h;
		1112	$self->{title}->size_allocate ($w, $h);
		1113	}
		1114
		1115	my $border = $self->border;
		1116
1046	$h -= List::Util::max 0, $self->border * 2;	1117	$h -= List::Util::max 0, $border * 2;
1047	$w -= List::Util::max 0, $self->border * 2;	1118	$w -= List::Util::max 0, $border * 2;
1048		1119
1049	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1050	if $self->{title};
1051
1052	$self->child->configure ($self->border, $self->border, $w, $h);	1120	$self->child->configure ($border, $border, $w, $h);
1053	}	1121	}
1054		1122
1055	sub button_down {	1123	sub button_down {
1056	my ($self, $ev, $x, $y) = @_;	1124	my ($self, $ev, $x, $y) = @_;
1057		1125
…		…
1073	my ($ev, $x, $y) = @_;	1141	my ($ev, $x, $y) = @_;
1074		1142
1075	my $dx = $ev->{x} - $ox;	1143	my $dx = $ev->{x} - $ox;
1076	my $dy = $ev->{y} - $oy;	1144	my $dy = $ev->{y} - $oy;
1077		1145
1078	$self->{user_x} = $wx + $dx * $mx;
1079	$self->{user_y} = $wy + $dy * $my;
1080	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1146	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1081	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1147	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1082	$self->move ($self->{user_x}, $self->{user_y});	1148
1083	$self->check_size;	1149	$self->realloc;
		1150	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1084	};	1151	};
1085		1152
1086	} elsif ($lr ^ $td) {	1153	} elsif ($lr ^ $td) {
1087	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1154	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1088	my ($bx, $by) = ($self->{x}, $self->{y});	1155	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1090	$self->{motion} = sub {	1157	$self->{motion} = sub {
1091	my ($ev, $x, $y) = @_;	1158	my ($ev, $x, $y) = @_;
1092		1159
1093	($x, $y) = ($ev->{x}, $ev->{y});	1160	($x, $y) = ($ev->{x}, $ev->{y});
1094		1161
1095	$self->{user_x} = $bx + $x - $ox;	1162	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1096	$self->{user_y} = $by + $y - $oy;
1097
1098	$self->move ($self->{user_x}, $self->{user_y});
1099	$self->update;
1100	};	1163	};
		1164	} else {
		1165	return 0;
		1166	}
		1167
1101	}	1168	1
1102	}	1169	}
1103		1170
1104	sub button_up {	1171	sub button_up {
1105	my ($self, $ev, $x, $y) = @_;	1172	my ($self, $ev, $x, $y) = @_;
1106		1173
1107	delete $self->{motion};	1174	!!delete $self->{motion}
1108	}	1175	}
1109		1176
1110	sub mouse_motion {	1177	sub mouse_motion {
1111	my ($self, $ev, $x, $y) = @_;	1178	my ($self, $ev, $x, $y) = @_;
1112		1179
1113	$self->{motion}->($ev, $x, $y) if $self->{motion};	1180	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1181
		1182	!!$self->{motion}
1114	}	1183	}
1115		1184
1116	sub _draw {	1185	sub _draw {
1117	my ($self) = @_;	1186	my ($self) = @_;
1118		1187
		1188	my $child = $self->{children}[0];
		1189
1119	my ($w, $h ) = ($self->{w}, $self->{h});	1190	my ($w, $h ) = ($self->{w}, $self->{h});
1120	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1191	my ($cw, $ch) = ($child->{w}, $child->{h});
1121		1192
1122	glEnable GL_TEXTURE_2D;	1193	glEnable GL_TEXTURE_2D;
1123	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1194	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124		1195
1125	my $border = $self->border;	1196	my $border = $self->border;
1126		1197
1127	glColor @{ $self->{border_bg} };	1198	glColor @{ $self->{border_bg} };
1128	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1199	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1129	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1200	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1201	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1202	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132		1203
1133	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1204	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134	my $bg = $tex[0];	1205	glColor @{ $self->{bg} };
1135		1206
1136	# TODO: repeat texture not scale	1207	# TODO: repeat texture not scale
		1208	# solve this better(?)
1137	my $rep_x = $cw / $bg->{w};	1209	$bg->{s} = $cw / $bg->{w};
1138	my $rep_y = $ch / $bg->{h};	1210	$bg->{t} = $ch / $bg->{h};
1139
1140	glColor @{ $self->{bg} };
1141
1142	$bg->{s} = $rep_x;
1143	$bg->{t} = $rep_y;
1144	$bg->{wrap_mode} = 1;
1145	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1211	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146	}	1212	}
1147		1213
1148	glDisable GL_TEXTURE_2D;	1214	glDisable GL_TEXTURE_2D;
1149		1215
1150	$self->{title}->draw if $self->{title};
1151
1152	$self->child->draw;	1216	$child->draw;
		1217
		1218	if ($self->{title}) {
		1219	glTranslate 0, $border - $self->{h};
		1220	$self->{title}->_draw;
		1221	}
1153	}	1222	}
1154		1223
1155	#############################################################################	1224	#############################################################################
1156		1225
1157	package CFClient::UI::Table;	1226	package CFClient::UI::Table;
…		…
1179	my ($self, $x, $y, $child) = @_;	1248	my ($self, $x, $y, $child) = @_;
1180		1249
1181	$child->set_parent ($self);	1250	$child->set_parent ($self);
1182	$self->{children}[$y][$x] = $child;	1251	$self->{children}[$y][$x] = $child;
1183		1252
1184	$self->check_size (1);	1253	$self->realloc;
1185	}	1254	}
1186		1255
1187	# TODO: move to container class maybe? send children a signal on removal?	1256	# TODO: move to container class maybe? send children a signal on removal?
1188	sub clear {	1257	sub clear {
1189	my ($self) = @_;	1258	my ($self) = @_;
…		…
1194	for (@children) {	1263	for (@children) {
1195	delete $_->{parent};	1264	delete $_->{parent};
1196	$_->hide;	1265	$_->hide;
1197	}	1266	}
1198		1267
1199	$self->check_size (1);	1268	$self->realloc;
1200	$self->update;
1201	}	1269	}
1202		1270
1203	sub get_wh {	1271	sub get_wh {
1204	my ($self) = @_;	1272	my ($self) = @_;
1205		1273
…		…
1413	ellipsise => 3, # end	1481	ellipsise => 3, # end
1414	layout => (new CFClient::Layout),	1482	layout => (new CFClient::Layout),
1415	fontsize => 1,	1483	fontsize => 1,
1416	align => -1,	1484	align => -1,
1417	valign => -1,	1485	valign => -1,
1418	padding => 2,	1486	padding_x => 2,
		1487	padding_y => 2,
1419	can_events => 0,	1488	can_events => 0,
1420	%arg	1489	%arg
1421	);	1490	);
1422		1491
1423	if (exists $self->{template}) {	1492	if (exists $self->{template}) {
…		…
1459	$self->{text} = "T$text";	1528	$self->{text} = "T$text";
1460		1529
1461	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1530	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1462	$self->{layout}->set_text ($text);	1531	$self->{layout}->set_text ($text);
1463		1532
		1533	$self->realloc;
1464	$self->update;	1534	$self->update;
1465	$self->check_size;
1466	}	1535	}
1467		1536
1468	sub set_markup {	1537	sub set_markup {
1469	my ($self, $markup) = @_;	1538	my ($self, $markup) = @_;
1470		1539
…		…
1474	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1543	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1475		1544
1476	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1545	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1477	$self->{layout}->set_markup ($markup);	1546	$self->{layout}->set_markup ($markup);
1478		1547
		1548	$self->realloc;
1479	$self->update;	1549	$self->update;
1480	$self->check_size;
1481	}	1550	}
1482		1551
1483	sub size_request {	1552	sub size_request {
1484	my ($self) = @_;	1553	my ($self) = @_;
1485		1554
…		…
1499		1568
1500	$w = List::Util::max $w, $w2;	1569	$w = List::Util::max $w, $w2;
1501	$h = List::Util::max $h, $h2;	1570	$h = List::Util::max $h, $h2;
1502	}	1571	}
1503		1572
1504	(	1573	($w, $h)
1505	$w + $self->{padding} * 2,
1506	$h + $self->{padding} * 2,
1507	)
1508	}	1574	}
1509		1575
1510	sub size_allocate {	1576	sub size_allocate {
1511	my ($self, $w, $h) = @_;	1577	my ($self, $w, $h) = @_;
1512		1578
		1579	delete $self->{ox};
		1580
1513	delete $self->{texture};	1581	delete $self->{texture}
		1582	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1514	}	1583	}
1515		1584
1516	sub set_fontsize {	1585	sub set_fontsize {
1517	my ($self, $fontsize) = @_;	1586	my ($self, $fontsize) = @_;
1518		1587
1519	$self->{fontsize} = $fontsize;	1588	$self->{fontsize} = $fontsize;
1520	delete $self->{texture};	1589	delete $self->{texture};
1521		1590
1522	$self->update;	1591	$self->realloc;
1523	$self->check_size;
1524	}	1592	}
1525		1593
1526	sub _draw {	1594	sub _draw {
1527	my ($self) = @_;	1595	my ($self) = @_;
1528		1596
…		…
1534	$self->{layout}->set_width ($self->{w});	1602	$self->{layout}->set_width ($self->{w});
1535	$self->{layout}->set_ellipsise ($self->{ellipsise});	1603	$self->{layout}->set_ellipsise ($self->{ellipsise});
1536	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1604	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1537	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1605	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1538		1606
1539	my $tex = new_from_layout CFClient::Texture $self->{layout};	1607	new_from_layout CFClient::Texture $self->{layout}
		1608	};
1540		1609
		1610	unless (exists $self->{ox}) {
1541	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1611	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1542	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1612	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1543	: ($self->{w} - $tex->{w}) * 0.5);	1613	: ($self->{w} - $tex->{w}) * 0.5);
1544		1614
1545	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1615	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1546	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1616	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1547	: ($self->{h} - $tex->{h}) * 0.5);	1617	: ($self->{h} - $tex->{h}) * 0.5);
1548
1549	$tex
1550	};	1618	};
1551		1619
1552	glEnable GL_TEXTURE_2D;	1620	glEnable GL_TEXTURE_2D;
1553	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1621	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1554		1622
…		…
1608	sub set_text {	1676	sub set_text {
1609	my ($self, $text) = @_;	1677	my ($self, $text) = @_;
1610		1678
1611	$self->{cursor} = length $text;	1679	$self->{cursor} = length $text;
1612	$self->_set_text ($text);	1680	$self->_set_text ($text);
1613	$self->update;	1681
1614	$self->check_size;	1682	$self->realloc;
1615	}	1683	}
1616		1684
1617	sub get_text {	1685	sub get_text {
1618	$_[0]{text}	1686	$_[0]{text}
1619	}	1687	}
…		…
1649	$self->{cursor} = length $text;	1717	$self->{cursor} = length $text;
1650	} elsif ($uni == 27) {	1718	} elsif ($uni == 27) {
1651	$self->_emit ('escape');	1719	$self->_emit ('escape');
1652	} elsif ($uni) {	1720	} elsif ($uni) {
1653	substr $text, $self->{cursor}++, 0, chr $uni;	1721	substr $text, $self->{cursor}++, 0, chr $uni;
		1722	} else {
		1723	return 0;
1654	}	1724	}
1655		1725
1656	$self->_set_text ($text);	1726	$self->_set_text ($text);
1657	$self->update;	1727
1658	$self->check_size;	1728	$self->realloc;
		1729
		1730	1
1659	}	1731	}
1660		1732
1661	sub focus_in {	1733	sub focus_in {
1662	my ($self) = @_;	1734	my ($self) = @_;
1663		1735
…		…
1678	utf8::encode $text;	1750	utf8::encode $text;
1679	$self->{cursor} = length substr $text, 0, $idx;	1751	$self->{cursor} = length substr $text, 0, $idx;
1680		1752
1681	$self->_set_text ($self->{text});	1753	$self->_set_text ($self->{text});
1682	$self->update;	1754	$self->update;
		1755
		1756	1
1683	}	1757	}
1684		1758
1685	sub mouse_motion {	1759	sub mouse_motion {
1686	my ($self, $ev, $x, $y) = @_;	1760	my ($self, $ev, $x, $y) = @_;
1687	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1761	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1762
		1763	0
1688	}	1764	}
1689		1765
1690	sub _draw {	1766	sub _draw {
1691	my ($self) = @_;	1767	my ($self) = @_;
1692		1768
…		…
1769	} else {	1845	} else {
1770	$self->set_text ($self->{history_saveback});	1846	$self->set_text ($self->{history_saveback});
1771	}	1847	}
1772		1848
1773	} else {	1849	} else {
1774	$self->SUPER::key_down ($ev);	1850	return $self->SUPER::key_down ($ev)
		1851	}
		1852
1775	}	1853	1
1776
1777	}	1854	}
1778		1855
1779	#############################################################################	1856	#############################################################################
1780		1857
1781	package CFClient::UI::Button;	1858	package CFClient::UI::Button;
…		…
1790		1867
1791	sub new {	1868	sub new {
1792	my $class = shift;	1869	my $class = shift;
1793		1870
1794	$class->SUPER::new (	1871	$class->SUPER::new (
1795	padding => 4,	1872	padding_x => 4,
		1873	padding_y => 4,
1796	fg => [1, 1, 1],	1874	fg => [1, 1, 1],
1797	active_fg => [0, 0, 1],	1875	active_fg => [0, 0, 1],
1798	can_hover => 1,	1876	can_hover => 1,
1799	align => 0,	1877	align => 0,
1800	valign => 0,	1878	valign => 0,
…		…
1809	my ($self, $ev, $x, $y) = @_;	1887	my ($self, $ev, $x, $y) = @_;
1810		1888
1811	$self->emit ("activate")	1889	$self->emit ("activate")
1812	if $x >= 0 && $x < $self->{w}	1890	if $x >= 0 && $x < $self->{w}
1813	&& $y >= 0 && $y < $self->{h};	1891	&& $y >= 0 && $y < $self->{h};
		1892
		1893	1
1814	}	1894	}
1815		1895
1816	sub _draw {	1896	sub _draw {
1817	my ($self) = @_;	1897	my ($self) = @_;
1818		1898
…		…
1847		1927
1848	sub new {	1928	sub new {
1849	my $class = shift;	1929	my $class = shift;
1850		1930
1851	$class->SUPER::new (	1931	$class->SUPER::new (
1852	padding => 2,	1932	padding_x => 2,
		1933	padding_y => 2,
1853	fg => [1, 1, 1],	1934	fg => [1, 1, 1],
1854	active_fg => [1, 1, 0],	1935	active_fg => [1, 1, 0],
1855	bg => [0, 0, 0, 0.2],	1936	bg => [0, 0, 0, 0.2],
1856	active_bg => [1, 1, 1, 0.5],	1937	active_bg => [1, 1, 1, 0.5],
1857	state => 0,	1938	state => 0,
…		…
1861	}	1942	}
1862		1943
1863	sub size_request {	1944	sub size_request {
1864	my ($self) = @_;	1945	my ($self) = @_;
1865		1946
1866	($self->{padding} * 2 + 6) x 2	1947	(6) x 2
1867	}	1948	}
1868		1949
1869	sub button_down {	1950	sub button_down {
1870	my ($self, $ev, $x, $y) = @_;	1951	my ($self, $ev, $x, $y) = @_;
1871		1952
1872	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1953	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1873	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1954	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1874	$self->{state} = !$self->{state};	1955	$self->{state} = !$self->{state};
1875	$self->_emit (changed => $self->{state});	1956	$self->_emit (changed => $self->{state});
		1957	} else {
		1958	return 0
		1959	}
		1960
1876	}	1961	1
1877	}	1962	}
1878		1963
1879	sub _draw {	1964	sub _draw {
1880	my ($self) = @_;	1965	my ($self) = @_;
1881		1966
1882	$self->SUPER::_draw;	1967	$self->SUPER::_draw;
1883		1968
1884	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1969	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1885		1970
1886	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1971	my ($w, $h) = @$self{qw(w h)};
		1972
		1973	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1887		1974
1888	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1975	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1889		1976
1890	my $tex = $self->{state} ? $tex[1] : $tex[0];	1977	my $tex = $self->{state} ? $tex[1] : $tex[0];
1891		1978
…		…
2156	fg => [1, 1, 1],	2243	fg => [1, 1, 1],
2157	active_fg => [0, 0, 0],	2244	active_fg => [0, 0, 0],
2158	bg => [0, 0, 0, 0.2],	2245	bg => [0, 0, 0, 0.2],
2159	active_bg => [1, 1, 1, 0.5],	2246	active_bg => [1, 1, 1, 0.5],
2160	range => [0, 0, 100, 10, 0],	2247	range => [0, 0, 100, 10, 0],
2161	req_w => $::WIDTH / 80,	2248	min_w => $::WIDTH / 80,
2162	req_h => $::WIDTH / 80,	2249	min_h => $::WIDTH / 80,
2163	vertical => 0,	2250	vertical => 0,
2164	can_hover => 1,	2251	can_hover => 1,
2165	inner_pad => 0.02,	2252	inner_pad => 0.02,
2166	@_	2253	@_
2167	);	2254	);
…		…
2170	$self->update;	2257	$self->update;
2171		2258
2172	$self	2259	$self
2173	}	2260	}
2174		2261
		2262	sub changed { }
		2263
2175	sub set_range {	2264	sub set_range {
2176	my ($self, $range) = @_;	2265	my ($self, $range) = @_;
2177		2266
2178	($range, $self->{range}) = ($self->{range}, $range);	2267	($range, $self->{range}) = ($self->{range}, $range);
2179		2268
…		…
2205	}	2294	}
2206		2295
2207	sub size_request {	2296	sub size_request {
2208	my ($self) = @_;	2297	my ($self) = @_;
2209		2298
2210	my $w = $self->{req_w};	2299	($self->{req_w}, $self->{req_h})
2211	my $h = $self->{req_h};
2212
2213	$self->{vertical} ? ($h, $w) : ($w, $h)
2214	}	2300	}
2215		2301
2216	sub button_down {	2302	sub button_down {
2217	my ($self, $ev, $x, $y) = @_;	2303	my ($self, $ev, $x, $y) = @_;
2218		2304
2219	$self->SUPER::button_down ($ev, $x, $y);	2305	$self->SUPER::button_down ($ev, $x, $y);
2220		2306
2221	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2307	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2222		2308
2223	$self->mouse_motion ($ev, $x, $y);	2309	$self->mouse_motion ($ev, $x, $y)
2224	}	2310	}
2225		2311
2226	sub mouse_motion {	2312	sub mouse_motion {
2227	my ($self, $ev, $x, $y) = @_;	2313	my ($self, $ev, $x, $y) = @_;
2228		2314
…		…
2232	my (undef, $lo, $hi, $page) = @{$self->{range}};	2318	my (undef, $lo, $hi, $page) = @{$self->{range}};
2233		2319
2234	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2320	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2235		2321
2236	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2322	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2323	} else {
		2324	return 0;
		2325	}
		2326
2237	}	2327	1
2238	}	2328	}
2239		2329
2240	sub update {	2330	sub update {
2241	my ($self) = @_;	2331	my ($self) = @_;
2242		2332
…		…
2603	}	2693	}
2604		2694
2605	sub set_tooltip_from {	2695	sub set_tooltip_from {
2606	my ($self, $widget) = @_;	2696	my ($self, $widget) = @_;
2607		2697
		2698	my $tooltip = $widget->{tooltip};
		2699
		2700	if ($ENV{CFPLUS_DEBUG} & 2) {
		2701	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2702	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2703	. "req $widget->{req_w} $widget->{req_h}\n"
		2704	. "visible $widget->{visible}";
		2705	}
		2706
2608	$self->add (new CFClient::UI::Label	2707	$self->add (new CFClient::UI::Label
2609	markup => $widget->{tooltip},	2708	markup => $tooltip,
2610	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2709	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2611	fontsize => 0.8,	2710	fontsize => 0.8,
2612	fg => [0, 0, 0, 1],	2711	fg => [0, 0, 0, 1],
2613	ellipsise => 0,	2712	ellipsise => 0,
2614	font => ($widget->{tooltip_font} || $::FONT_PROP),	2713	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2625		2724
2626	sub size_allocate {	2725	sub size_allocate {
2627	my ($self, $w, $h) = @_;	2726	my ($self, $w, $h) = @_;
2628		2727
2629	$self->SUPER::size_allocate ($w - 4, $h - 4);	2728	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2729	}
		2730
		2731	sub visibility_change {
		2732	my ($self, $visible) = @_;
		2733
		2734	return unless $visible;
		2735
		2736	$self->{root}->on_post_alloc ("move_$self" => sub {
		2737	my $widget = $self->{owner}
		2738	or return;
		2739
		2740	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2741
		2742	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2743	if $x + $self->{w} > $::WIDTH;
		2744
		2745	$self->move_abs ($x, $y);
		2746	});
2630	}	2747	}
2631		2748
2632	sub _draw {	2749	sub _draw {
2633	my ($self) = @_;	2750	my ($self) = @_;
2634		2751
…		…
2651	glVertex $w, $h;	2768	glVertex $w, $h;
2652	glVertex $w, 0;	2769	glVertex $w, 0;
2653	glEnd;	2770	glEnd;
2654		2771
2655	glTranslate 2 - 0.375, 2 - 0.375;	2772	glTranslate 2 - 0.375, 2 - 0.375;
		2773
2656	$self->SUPER::_draw;	2774	$self->SUPER::_draw;
2657	}	2775	}
2658		2776
2659	#############################################################################	2777	#############################################################################
2660		2778
…		…
2736	$self->SUPER::DESTROY;	2854	$self->SUPER::DESTROY;
2737	}	2855	}
2738		2856
2739	#############################################################################	2857	#############################################################################
2740		2858
2741	package CFClient::UI::Inventory;
2742
2743	our @ISA = CFClient::UI::ScrolledWindow::;
2744
2745	sub new {
2746	my $class = shift;
2747
2748	my $self = $class->SUPER::new (
2749	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2750	@_,
2751	);
2752
2753	$self
2754	}
2755
2756	sub set_items {
2757	my ($self, $items) = @_;
2758
2759	$self->{scrolled}->clear;
2760	return unless $items;
2761
2762	my @items = sort {
2763	($a->{type} <=> $b->{type})
2764	or ($a->{name} cmp $b->{name})
2765	} @$items;
2766
2767	$self->{real_items} = \@items;
2768
2769	my $row = 0;
2770	for my $item (@items) {
2771	CFClient::Item::update_widgets $item;
2772
2773	$self->{scrolled}->add (0, $row, $item->{face_widget});
2774	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2775	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2776
2777	$row++;
2778	}
2779	}
2780
2781	#############################################################################
2782
2783	package CFClient::UI::Menu;	2859	package CFClient::UI::Menu;
2784		2860
2785	our @ISA = CFClient::UI::FancyFrame::;	2861	our @ISA = CFClient::UI::FancyFrame::;
2786		2862
2787	use CFClient::OpenGL;	2863	use CFClient::OpenGL;
…		…
2825	# maybe save $GRAB? must be careful about events...	2901	# maybe save $GRAB? must be careful about events...
2826	$GRAB = $self;	2902	$GRAB = $self;
2827	$self->{button} = $ev->{button};	2903	$self->{button} = $ev->{button};
2828		2904
2829	$self->show;	2905	$self->show;
2830	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2906	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2831	}	2907	}
2832		2908
2833	sub mouse_motion {	2909	sub mouse_motion {
2834	my ($self, $ev, $x, $y) = @_;	2910	my ($self, $ev, $x, $y) = @_;
2835		2911
2836	# TODO: should use vbox->find_widget or so	2912	# TODO: should use vbox->find_widget or so
2837	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2913	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2838	$self->{hover} = $self->{item}{$HOVER};	2914	$self->{hover} = $self->{item}{$HOVER};
		2915
		2916	0
2839	}	2917	}
2840		2918
2841	sub button_up {	2919	sub button_up {
2842	my ($self, $ev, $x, $y) = @_;	2920	my ($self, $ev, $x, $y) = @_;
2843		2921
…		…
2845	undef $GRAB;	2923	undef $GRAB;
2846	$self->hide;	2924	$self->hide;
2847		2925
2848	$self->_emit ("popdown");	2926	$self->_emit ("popdown");
2849	$self->{hover}[1]->() if $self->{hover};	2927	$self->{hover}[1]->() if $self->{hover};
		2928	} else {
		2929	return 0
		2930	}
		2931
2850	}	2932	1
2851	}	2933	}
2852		2934
2853	#############################################################################	2935	#############################################################################
2854		2936
2855	package CFClient::UI::Statusbox;	2937	package CFClient::UI::Statusbox;
…		…
2960	$self->SUPER::reconfigure;	3042	$self->SUPER::reconfigure;
2961	}	3043	}
2962		3044
2963	#############################################################################	3045	#############################################################################
2964		3046
2965	package CFClient::UI::Root;	3047	package CFClient::UI::Inventory;
2966		3048
2967	our @ISA = CFClient::UI::Container::;	3049	our @ISA = CFClient::UI::ScrolledWindow::;
2968
2969	use CFClient::OpenGL;
2970		3050
2971	sub new {	3051	sub new {
2972	my $class = shift;	3052	my $class = shift;
2973		3053
2974	$class->SUPER::new (	3054	my $self = $class->SUPER::new (
		3055	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3056	@_,
		3057	);
		3058
		3059	$self
		3060	}
		3061
		3062	sub set_items {
		3063	my ($self, $items) = @_;
		3064
		3065	$self->{scrolled}->clear;
		3066	return unless $items;
		3067
		3068	my @items = sort {
		3069	($a->{type} <=> $b->{type})
		3070	or ($a->{name} cmp $b->{name})
		3071	} @$items;
		3072
		3073	$self->{real_items} = \@items;
		3074
		3075	my $row = 0;
		3076	for my $item (@items) {
		3077	CFClient::Item::update_widgets $item;
		3078
		3079	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3080	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3081	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3082
		3083	$row++;
		3084	}
		3085	}
		3086
		3087	#############################################################################
		3088
		3089	package CFClient::UI::BindEditor;
		3090
		3091	our @ISA = CFClient::UI::FancyFrame::;
		3092
		3093	sub new {
		3094	my $class = shift;
		3095
		3096	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3097
		3098	$self->add (my $vb = new CFClient::UI::VBox);
		3099
		3100
		3101	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3102	text => "start recording",
		3103	tooltip => "Start/Stops recording of actions."
		3104	."All subsequent actions after the recording started will be captured."
		3105	."The actions are displayed after the record was stopped."
		3106	."To bind the action you have to click on the 'Bind' button",
		3107	on_activate => sub {
		3108	unless ($self->{recording}) {
		3109	$self->start;
		3110	} else {
		3111	$self->stop;
		3112	}
		3113	});
		3114
		3115	$vb->add (new CFClient::UI::Label text => "Actions:");
		3116	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3117
		3118	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3119	$vb->add (my $hb = new CFClient::UI::HBox);
		3120	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3121	$hb->add (new CFClient::UI::Button
		3122	text => "bind",
		3123	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3124	on_activate => sub {
		3125	$self->ask_for_bind;
		3126	});
		3127
		3128	$vb->add (my $hb = new CFClient::UI::HBox);
		3129	$hb->add (new CFClient::UI::Button
		3130	text => "ok",
		3131	expand => 1,
		3132	tooltip => "This closes the binding editor and saves the binding",
		3133	on_activate => sub {
		3134	$self->hide;
		3135	$self->commit;
		3136	});
		3137
		3138	$hb->add (new CFClient::UI::Button
		3139	text => "cancel",
		3140	expand => 1,
		3141	tooltip => "This closes the binding editor without saving",
		3142	on_activate => sub {
		3143	$self->hide;
		3144	$self->{binding_cancel}->()
		3145	if $self->{binding_cancel};
		3146	});
		3147
		3148	$self->update_binding_widgets;
		3149
		3150	$self
		3151	}
		3152
		3153	sub commit {
		3154	my ($self) = @_;
		3155	my ($mod, $sym, $cmds) = $self->get_binding;
		3156	if ($sym != 0 && @$cmds > 0) {
		3157	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3158	."'. Don't forget 'Save Config'!");
		3159	$self->{binding_change}->($mod, $sym, $cmds)
		3160	if $self->{binding_change};
		3161	} else {
		3162	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3163	$self->{binding_cancel}->()
		3164	if $self->{binding_cancel};
		3165	}
		3166	}
		3167
		3168	sub start {
		3169	my ($self) = @_;
		3170
		3171	$self->{rec_btn}->set_text ("stop recording");
		3172	$self->{recording} = 1;
		3173	$self->clear_command_list;
		3174	$::CONN->start_record if $::CONN;
		3175	}
		3176
		3177	sub stop {
		3178	my ($self) = @_;
		3179
		3180	$self->{rec_btn}->set_text ("start recording");
		3181	$self->{recording} = 0;
		3182
		3183	my $rec;
		3184	$rec = $::CONN->stop_record if $::CONN;
		3185	return unless ref $rec eq 'ARRAY';
		3186	$self->set_command_list ($rec);
		3187	}
		3188
		3189
		3190	sub ask_for_bind_and_commit {
		3191	my ($self) = @_;
		3192	$self->ask_for_bind (1);
		3193	}
		3194
		3195	sub ask_for_bind {
		3196	my ($self, $commit) = @_;
		3197
		3198	CFClient::Binder::open_binding_dialog (sub {
		3199	my ($mod, $sym) = @_;
		3200	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3201	$self->update_binding_widgets;
		3202	$self->commit if $commit;
		3203	});
		3204	}
		3205
		3206	# $mod and $sym are the modifiers and key symbol
		3207	# $cmds is a array ref of strings (the commands)
		3208	# $cb is the callback that is executed on OK
		3209	# $ccb is the callback that is executed on CANCEL and
		3210	# when the binding was unsuccessful on OK
		3211	sub set_binding {
		3212	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3213
		3214	$self->clear_command_list;
		3215	$self->{recording} = 0;
		3216	$self->{rec_btn}->set_text ("start recording");
		3217
		3218	$self->{binding} = [$mod, $sym];
		3219	$self->{commands} = $cmds;
		3220
		3221	$self->{binding_change} = $cb;
		3222	$self->{binding_cancel} = $ccb;
		3223
		3224	$self->update_binding_widgets;
		3225	}
		3226
		3227	# this is a shortcut method that asks for a binding
		3228	# and then just binds it.
		3229	sub do_quick_binding {
		3230	my ($self, $cmds) = @_;
		3231	$self->set_binding (undef, undef, $cmds, sub {
		3232	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3233	});
		3234	$self->ask_for_bind (1);
		3235	}
		3236
		3237	sub update_binding_widgets {
		3238	my ($self) = @_;
		3239	my ($mod, $sym, $cmds) = $self->get_binding;
		3240	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3241	$self->set_command_list ($cmds);
		3242	}
		3243
		3244	sub get_binding {
		3245	my ($self) = @_;
		3246	return (
		3247	$self->{binding}->[0],
		3248	$self->{binding}->[1],
		3249	[ grep { defined $_ } @{$self->{commands}} ]
		3250	);
		3251	}
		3252
		3253	sub clear_command_list {
		3254	my ($self) = @_;
		3255	$self->{cmdbox}->clear ();
		3256	}
		3257
		3258	sub set_command_list {
		3259	my ($self, $cmds) = @_;
		3260
		3261	$self->{cmdbox}->clear ();
		3262	$self->{commands} = $cmds;
		3263
		3264	my $idx = 0;
		3265
		3266	for (@$cmds) {
		3267	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3268
		3269	my $i = $idx;
		3270	$hb->add (new CFClient::UI::Label text => $_);
		3271	$hb->add (new CFClient::UI::Button
		3272	text => "delete",
		3273	tooltip => "Deletes the action from the record",
		3274	on_activate => sub {
		3275	$self->{cmdbox}->remove ($hb);
		3276	$cmds->[$i] = undef;
		3277	});
		3278
		3279
		3280	$idx++
		3281	}
		3282	}
		3283
		3284	#############################################################################
		3285
		3286	package CFClient::UI::SpellList;
		3287
		3288	our @ISA = CFClient::UI::FancyFrame::;
		3289
		3290	sub new {
		3291	my $class = shift;
		3292
		3293	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3294
		3295	$self->add (new CFClient::UI::ScrolledWindow
		3296	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3297
		3298	$self;
		3299	}
		3300
		3301	# XXX: Do sorting? Argl...
		3302	sub add_spell {
		3303	my ($self, $spell) = @_;
		3304	$self->{spells}->{$spell->{name}} = $spell;
		3305
		3306	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3307	face => $spell->{face},
		3308	can_hover => 1,
		3309	can_events => 1,
		3310	tooltip => $spell->{message});
		3311
		3312	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3313	text => $spell->{name},
		3314	can_hover => 1,
		3315	can_events => 1,
		3316	tooltip => $spell->{message},
		3317	expand => 1);
		3318
		3319	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3320	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3321	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3322	expand => 1);
		3323
		3324	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3325	text => "bind to key",
		3326	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3327	}
		3328
		3329	sub rebuild_spell_list {
		3330	my ($self) = @_;
		3331	$self->{tbl_idx} = 0;
		3332	$self->add_spell ($_) for values %{$self->{spells}};
		3333	}
		3334
		3335	sub remove_spell {
		3336	my ($self, $spell) = @_;
		3337	delete $self->{spells}->{$spell->{name}};
		3338	$self->rebuild_spell_list;
		3339	}
		3340
		3341	#############################################################################
		3342
		3343	package CFClient::UI::Root;
		3344
		3345	our @ISA = CFClient::UI::Container::;
		3346
		3347	use CFClient::OpenGL;
		3348
		3349	sub new {
		3350	my $class = shift;
		3351
		3352	my $self = $class->SUPER::new (
2975	visible => 1,	3353	visible => 1,
2976	@_,	3354	@_,
2977	)	3355	);
2978	}
2979		3356
2980	sub configure {	3357	Scalar::Util::weaken ($self->{root} = $self);
2981	my ($self, $x, $y, $w, $h) = @_;
2982		3358
2983	$self->{w} = $w;	3359	$self
2984	$self->{h} = $h;
2985	}
2986
2987	sub check_size {
2988	my ($self) = @_;
2989
2990	$self->size_allocate ($self->{w}, $self->{h})
2991	if $self->{w};
2992	}	3360	}
2993		3361
2994	sub size_request {	3362	sub size_request {
2995	my ($self) = @_;	3363	my ($self) = @_;
2996		3364
2997	($self->{w}, $self->{h})	3365	($self->{w}, $self->{h})
		3366	}
		3367
		3368	sub _to_pixel {
		3369	my ($coord, $size, $max) = @_;
		3370
		3371	$coord =
		3372	$coord eq "center" ? ($max - $size) * 0.5
		3373	: $coord eq "max" ? $max
		3374	: $coord;
		3375
		3376	$coord = 0 if $coord < 0;
		3377	$coord = $max - $size if $coord > $max - $size;
		3378
		3379	int $coord + 0.5
2998	}	3380	}
2999		3381
3000	sub size_allocate {	3382	sub size_allocate {
3001	my ($self, $w, $h) = @_;	3383	my ($self, $w, $h) = @_;
3002		3384
3003	for my $child ($self->children) {	3385	for my $child ($self->children) {
3004	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3386	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3005		3387
3006	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3388	$X = $child->{force_x} if exists $child->{force_x};
3007	if exists $child->{req_x};	3389	$Y = $child->{force_y} if exists $child->{force_y};
3008		3390
3009	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3391	$X = _to_pixel $X, $W, $self->{w};
3010	if exists $child->{req_y};	3392	$Y = _to_pixel $Y, $H, $self->{h};
3011
3012	delete @$child{qw(req_x req_y)};
3013
3014	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3015	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3016		3393
3017	$child->configure ($X, $Y, $W, $H);	3394	$child->configure ($X, $Y, $W, $H);
3018	}	3395	}
3019	}	3396	}
3020		3397
…		…
3031	}	3408	}
3032		3409
3033	sub update {	3410	sub update {
3034	my ($self) = @_;	3411	my ($self) = @_;
3035		3412
3036	$self->check_size;
3037	$::WANT_REFRESH++;	3413	$::WANT_REFRESH++;
3038	}	3414	}
3039		3415
3040	sub add {	3416	sub add {
3041	my ($self, @children) = @_;	3417	my ($self, @children) = @_;
3042		3418
3043	for my $child (@children) {
3044	$child->{is_toplevel} = 1;	3419	$_->{is_toplevel} = 1
3045		3420	for @children;
3046	# integerise window positions
3047	$child->{x} = int $child->{x};
3048	$child->{y} = int $child->{y};
3049	}
3050		3421
3051	$self->SUPER::add (@children);	3422	$self->SUPER::add (@children);
3052
3053	for (my @widgets = @children; my $w = pop @widgets; ) {
3054	push @widgets, $w->children;
3055	$w->set_visible;
3056	}
3057
3058	}	3423	}
3059		3424
3060	sub remove {	3425	sub remove {
3061	my ($self, @children) = @_;	3426	my ($self, @children) = @_;
3062		3427
3063	$self->SUPER::remove (@children);	3428	$self->SUPER::remove (@children);
		3429
		3430	delete $self->{is_toplevel}
		3431	for @children;
3064		3432
3065	while (@children) {	3433	while (@children) {
3066	my $w = pop @children;	3434	my $w = pop @children;
3067	push @children, $w->children;	3435	push @children, $w->children;
3068	$w->set_invisible;	3436	$w->set_invisible;
…		…
3087	while ($self->{refresh_hook}) {	3455	while ($self->{refresh_hook}) {
3088	$_->()	3456	$_->()
3089	for values %{delete $self->{refresh_hook}};	3457	for values %{delete $self->{refresh_hook}};
3090	}	3458	}
3091		3459
3092	if ($self->{check_size}) {	3460	if ($self->{realloc}) {
		3461	my %queue;
3093	my @queue;	3462	my @queue;
		3463	my $widget;
3094		3464
3095	for (;;) {	3465	outer:
3096	if ($self->{check_size}) {	3466	while () {
3097	#TODO use array-of-depth approach	3467	if (my $realloc = delete $self->{realloc}) {
		3468	for $widget (values %$realloc) {
		3469	$widget->{visible} or next; # do not resize invisible widgets
3098		3470
3099	@queue = sort { $a->{visible} <=> $b->{visible} }	3471	$queue{$widget+0}++ and next; # duplicates are common
3100	@queue, values %{delete $self->{check_size}};	3472
		3473	push @{ $queue[$widget->{visible}] }, $widget;
		3474	}
3101	}	3475	}
3102		3476
		3477	while () {
		3478	@queue or last outer;
		3479
3103	my $widget = pop @queue || last;	3480	$widget = pop @{ $queue[-1] || [] }
3104		3481	and last;
3105	defined $widget->{visible} or last; # do not resize invisible widgets
3106
3107	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3108	? @$widget{qw(def_w def_h)}
3109	: $widget->size_request;
3110
3111	if (delete $widget->{force_alloc}
3112	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3113	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3114		3482
		3483	pop @queue;
		3484	}
		3485
		3486	delete $queue{$widget+0};
		3487
		3488	my ($w, $h) = $widget->size_request;
		3489
		3490	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3491	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3492
		3493	$w = $widget->{force_w} if exists $widget->{force_w};
		3494	$h = $widget->{force_h} if exists $widget->{force_h};
		3495
		3496	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3497	|| delete $widget->{force_realloc}) {
3115	$widget->{req_w} = $w;	3498	$widget->{req_w} = $w;
3116	$widget->{req_h} = $h;	3499	$widget->{req_h} = $h;
3117		3500
3118	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3501	$self->{size_alloc}{$widget+0} = $widget;
3119		3502
3120	$widget->{parent}->check_size
3121	if $widget->{parent};	3503	if (my $parent = $widget->{parent}) {
		3504	$self->{realloc}{$parent+0} = $parent
		3505	unless $queue{$parent+0};
		3506
		3507	$parent->{force_size_alloc} = 1;
		3508	$self->{size_alloc}{$parent+0} = $parent;
		3509	}
3122	}	3510	}
		3511
		3512	delete $self->{realloc}{$widget+0};
3123	}	3513	}
3124	}	3514	}
3125		3515
3126	while ($self->{size_alloc}) {	3516	while (my $size_alloc = delete $self->{size_alloc}) {
3127	for (values %{delete $self->{size_alloc}}) {	3517	my @queue = sort { $b->{visible} <=> $a->{visible} }
3128	my ($widget, $w, $h) = @$_;	3518	values %$size_alloc;
		3519
		3520	while () {
		3521	my $widget = pop @queue || last;
		3522
		3523	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3129		3524
3130	$w = 0 if $w < 0;	3525	$w = 0 if $w < 0;
3131	$h = 0 if $h < 0;	3526	$h = 0 if $h < 0;
3132		3527
		3528	$w = int $w + 0.5;
		3529	$h = int $h + 0.5;
		3530
		3531	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3532	$widget->{old_w} = $widget->{w};
		3533	$widget->{old_h} = $widget->{h};
		3534
3133	$widget->{w} = $w;	3535	$widget->{w} = $w;
3134	$widget->{h} = $h;	3536	$widget->{h} = $h;
		3537
3135	$widget->emit (size_allocate => $w, $h);	3538	$widget->emit (size_allocate => $w, $h);
		3539	}
3136	}	3540	}
3137	}	3541	}
3138		3542
3139	while ($self->{post_alloc_hook}) {	3543	while ($self->{post_alloc_hook}) {
3140	$_->()	3544	$_->()
3141	for values %{delete $self->{post_alloc_hook}};	3545	for values %{delete $self->{post_alloc_hook}};
3142	}	3546	}
		3547
3143		3548
3144	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3549	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3145	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3550	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3146	glClear GL_COLOR_BUFFER_BIT;	3551	glClear GL_COLOR_BUFFER_BIT;
3147		3552
…		…
3149	glLoadIdentity;	3554	glLoadIdentity;
3150	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3555	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3151	glMatrixMode GL_MODELVIEW;	3556	glMatrixMode GL_MODELVIEW;
3152	glLoadIdentity;	3557	glLoadIdentity;
3153		3558
		3559	{
		3560	package CFClient::UI::Base;
		3561
		3562	($draw_x, $draw_y, $draw_w, $draw_h) =
		3563	(0, 0, $self->{w}, $self->{h});
		3564	}
		3565
3154	$self->_draw;	3566	$self->_draw;
3155	}	3567	}
3156		3568
3157	#############################################################################	3569	#############################################################################
3158		3570

Diff Legend

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