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.242 by elmex, Sat May 27 20:00:40 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->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181	$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.]+$/;
182	$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};
183	$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};
184	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_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
185	}	189	}
186	}	190	}
187		191
188	reconfigure_widgets;	192	reconfigure_widgets;
189	}	193	}
…		…
198		202
199	sub new {	203	sub new {
200	my $class = shift;	204	my $class = shift;
201		205
202	my $self = bless {	206	my $self = bless {
203	x => 0,	207	x => "center",
204	y => 0,	208	y => "center",
205	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
206	can_events => 1,	212	can_events => 1,
207	@_	213	@_
208	}, $class;	214	}, $class;
209		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
210	for (keys %$self) {	218	for (keys %$self) {
211	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
212	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
213	}	221	}
214	}	222	}
215		223
216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219	$self->{user_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220	$self->{user_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221	$self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222	$self->{user_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};
223	}	234	}
224		235
225	$self	236	$self
226	}	237	}
227		238
…		…
232	%$self = ();	243	%$self = ();
233	}	244	}
234		245
235	sub show {	246	sub show {
236	my ($self) = @_;	247	my ($self) = @_;
		248
237	return if $self->{parent};	249	return if $self->{parent};
238		250
239	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
240	}	252	}
241		253
242	sub show_centered {	254	sub set_visible {
243	my ($self) = @_;	255	my ($self) = @_;
		256
244	return if $self->{parent};	257	return if $self->{visible};
245		258
246	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
247		261
248	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
249	"centered $self" => sub {	263
250	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
251	},	265
252	);	266	$_->set_visible for $self->children;
253	}	267	}
254		268
255	sub set_invisible {	269	sub set_invisible {
256	my ($self) = @_;	270	my ($self) = @_;
257		271
258	# broken show/hide model	272	return unless $self->{visible};
		273
		274	$_->set_invisible for $self->children;
259		275
260	delete $self->{root};	276	delete $self->{root};
261	delete $self->{visible};	277	delete $self->{visible};
262		278
263	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
264	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
265		281
266	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
267	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
268		284
269	$self->focus_out;	285	$self->focus_out;
		286
		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;
270	}	305	}
271		306
272	sub hide {	307	sub hide {
273	my ($self) = @_;	308	my ($self) = @_;
274		309
…		…
276		311
277	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
278	if $self->{parent};	313	if $self->{parent};
279	}	314	}
280		315
281	sub move {	316	sub move_abs {
282	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
283		318
284	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
285	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
286	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
287		322
288	$self->update;	323	$self->update;
289	}	324	}
290		325
291	sub set_size {	326	sub set_size {
292	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
293		328
294	$self->{user_w} = $w;	329	$self->{force_w} = $w;
295	$self->{user_h} = $h;	330	$self->{force_h} = $h;
296		331
297	$self->check_size;	332	$self->realloc;
298	}	333	}
299		334
300	sub size_request {	335	sub size_request {
301	require Carp;	336	require Carp;
302	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
304		339
305	sub configure {	340	sub configure {
306	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
307		342
308	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
309	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
310	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
311		348
312	# use alignment to adjust x, y	349	# use alignment to adjust x, y
313		350
314	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
315	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
316
317	($w, $h) = ($w2, $h2);
318	}	353	}
319		354
320	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
321	$self->{x} = $x;	356	$self->{x} = $x;
322	$self->{y} = $y;	357	$self->{y} = $y;
323	$self->update;	358	$self->update;
324	}	359	}
325		360
326	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
327	$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;
328	}	368	}
329	}	369	}
330		370
331	sub size_allocate {	371	sub size_allocate {
332	# nothing to be done	372	# nothing to be done
333	}
334
335	sub reconfigure {
336	my ($self) = @_;
337
338	$self->check_size (1);
339	$self->update;
340	}	373	}
341		374
342	sub children {	375	sub children {
343	}	376	}
344		377
…		…
406		439
407	$::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
408	unless $FOCUS;	441	unless $FOCUS;
409	}	442	}
410		443
411	sub mouse_motion { }	444	sub mouse_motion { 0 }
412	sub button_up { }	445	sub button_up { 0 }
413	sub key_down { }	446	sub key_down { 0 }
414	sub key_up { }	447	sub key_up { 0 }
415		448
416	sub button_down {	449	sub button_down {
417	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
418		451
419	$self->focus_in;	452	$self->focus_in;
420	}
421		453
422	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	454	0
423	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	455	}
424	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	456
425	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	457	sub find_widget {
426	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
427		530
428	sub draw {	531	sub draw {
429	my ($self) = @_;	532	my ($self) = @_;
430		533
431	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);
432		545
433	glPushMatrix;	546	glPushMatrix;
434	glTranslate $self->{x}, $self->{y}, 0;	547	glTranslate $self->{x}, $self->{y}, 0;
435	$self->_draw;	548	$self->_draw;
436	glPopMatrix;	549	glPopMatrix;
…		…
448	glVertex $x , $y + $self->{h};	561	glVertex $x , $y + $self->{h};
449	glEnd;	562	glEnd;
450	glDisable GL_BLEND;	563	glDisable GL_BLEND;
451	}	564	}
452		565
453	if ($ENV{PCLIENT_DEBUG}) {	566	if ($ENV{CFPLUS_DEBUG} & 1) {
454	glPushMatrix;	567	glPushMatrix;
455	glColor 1, 1, 0, 1;	568	glColor 1, 1, 0, 1;
456	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	569	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
457	glBegin GL_LINE_LOOP;	570	glBegin GL_LINE_LOOP;
458	glVertex 0 , 0;	571	glVertex 0 , 0;
…		…
469	my ($self) = @_;	582	my ($self) = @_;
470		583
471	warn "no draw defined for $self\n";	584	warn "no draw defined for $self\n";
472	}	585	}
473		586
474	sub find_widget {
475	my ($self, $x, $y) = @_;
476
477	return () unless $self->{can_events};
478
479	return $self
480	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483	()
484	}
485
486	sub set_parent {
487	my ($self, $parent) = @_;
488
489	Scalar::Util::weaken ($self->{parent} = $parent);
490
491	$self->{root} = $parent->{root};
492	$self->{visible} = $parent->{visible} + 1;
493
494	# TODO: req_w _does_change after ->reconfigure
495	$self->check_size
496	unless exists $self->{req_w};
497
498	$self->show;
499	}
500
501	sub check_size {
502	my ($self, $forced) = @_;
503
504	$self->{force_alloc} = 1 if $forced;
505	$CFClient::UI::ROOT->{check_size}{$self} = $self;
506	}
507
508	sub update {
509	my ($self) = @_;
510
511	$self->{parent}->update
512	if $self->{parent};
513	}
514
515	sub connect {
516	my ($self, $signal, $cb) = @_;
517
518	push @{ $self->{signal_cb}{$signal} }, $cb;
519	}
520
521	sub _emit {
522	my ($self, $signal, @args) = @_;
523
524	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525	}
526
527	sub emit {
528	my ($self, $signal, @args) = @_;
529
530	$self->_emit ($signal, @args)
531	|| $self->$signal (@args);
532	}
533
534	sub DESTROY {	587	sub DESTROY {
535	my ($self) = @_;	588	my ($self) = @_;
536		589
537	delete $WIDGET{$self+0};	590	delete $WIDGET{$self+0};
538	#$self->deactivate;	591	#$self->deactivate;
…		…
594	my ($class, %arg) = @_;	647	my ($class, %arg) = @_;
595	$class->SUPER::new (can_events => 0, %arg);	648	$class->SUPER::new (can_events => 0, %arg);
596	}	649	}
597		650
598	sub size_request {	651	sub size_request {
599	(0, 0)	652	my ($self) = @_;
		653
		654	($self->{w} + 0, $self->{h} + 0)
600	}	655	}
601		656
602	sub draw { }	657	sub draw { }
603		658
604	#############################################################################	659	#############################################################################
…		…
633	$self->{children} = [	688	$self->{children} = [
634	sort { $a->{z} <=> $b->{z} }	689	sort { $a->{z} <=> $b->{z} }
635	@{$self->{children}}, @widgets	690	@{$self->{children}}, @widgets
636	];	691	];
637		692
638	$self->check_size (1);	693	$self->realloc;
639	$self->update;
640	}	694	}
641		695
642	sub children {	696	sub children {
643	@{ $_[0]{children} }	697	@{ $_[0]{children} }
644	}	698	}
…		…
649	delete $child->{parent};	703	delete $child->{parent};
650	$child->hide;	704	$child->hide;
651		705
652	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	706	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653		707
654	$self->check_size (1);	708	$self->realloc;
655	$self->update;
656	}	709	}
657		710
658	sub clear {	711	sub clear {
659	my ($self) = @_;	712	my ($self) = @_;
660		713
…		…
664	for (@$children) {	717	for (@$children) {
665	delete $_->{parent};	718	delete $_->{parent};
666	$_->hide;	719	$_->hide;
667	}	720	}
668		721
669	$self->check_size;	722	$self->realloc;
670	$self->update;
671	}	723	}
672		724
673	sub find_widget {	725	sub find_widget {
674	my ($self, $x, $y) = @_;	726	my ($self, $x, $y) = @_;
675		727
…		…
762	$self->SUPER::size_allocate ($w, $h);	814	$self->SUPER::size_allocate ($w, $h);
763	$self->update;	815	$self->update;
764	}	816	}
765		817
766	sub _render {	818	sub _render {
		819	my ($self) = @_;
		820
767	$_[0]{children}[0]->draw;	821	$self->{children}[0]->draw;
768	}	822	}
769		823
770	sub render_child {	824	sub render_child {
771	my ($self) = @_;	825	my ($self) = @_;
772		826
773	$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 {
774	glClearColor 0, 0, 0, 0;	828	glClearColor 0, 0, 0, 0;
775	glClear GL_COLOR_BUFFER_BIT;	829	glClear GL_COLOR_BUFFER_BIT;
776		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
777	$self->_render;	838	$self->_render;
778	};	839	};
779	}	840	}
780		841
781	sub _draw {	842	sub _draw {
782	my ($self) = @_;	843	my ($self) = @_;
783		844
784	my ($w, $h) = ($self->w, $self->h);	845	my ($w, $h) = @$self{qw(w h)};
785		846
786	my $tex = $self->{texture}	847	my $tex = $self->{texture}
787	or return;	848	or return;
788		849
789	glEnable GL_TEXTURE_2D;	850	glEnable GL_TEXTURE_2D;
…		…
812	}	873	}
813		874
814	sub size_request {	875	sub size_request {
815	my ($self) = @_;	876	my ($self) = @_;
816		877
817	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	878	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818		879
819	@$self{qw(child_w child_h)}	880	$w = 10 if $self->{scroll_x};
		881	$h = 10 if $self->{scroll_y};
		882
		883	($w, $h)
820	}	884	}
821		885
822	sub size_allocate {	886	sub size_allocate {
823	my ($self, $w, $h) = @_;	887	my ($self, $w, $h) = @_;
824		888
		889	my $child = $self->child;
		890
825	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	891	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	892	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827		893
828	$self->child->configure (0, 0, $w, $h);	894	$self->child->configure (0, 0, $w, $h);
829	$self->update;	895	$self->update;
830	}	896	}
831		897
…		…
867	}	933	}
868		934
869	sub _render {	935	sub _render {
870	my ($self) = @_;	936	my ($self) = @_;
871		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};
		940
872	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	941	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
873		942
874	$self->SUPER::_render;	943	$self->SUPER::_render;
875	}	944	}
876		945
…		…
884	my $class = shift;	953	my $class = shift;
885		954
886	my $self;	955	my $self;
887		956
888	my $slider = new CFClient::UI::Slider	957	my $slider = new CFClient::UI::Slider
889	vertical => 1,	958	vertical => 1,
890	range => [0, 0, 1, 0.01], # HACK fix	959	range => [0, 0, 1, 0.01], # HACK fix
891	connect_changed => sub {	960	on_changed => sub {
892	$self->{vp}->set_offset (0, $_[1]);	961	$self->{vp}->set_offset (0, $_[1]);
893	},	962	},
894	;	963	;
895		964
896	$self = $class->SUPER::new (	965	$self = $class->SUPER::new (
…		…
974		1043
975	our @ISA = CFClient::UI::Bin::;	1044	our @ISA = CFClient::UI::Bin::;
976		1045
977	use CFClient::OpenGL;	1046	use CFClient::OpenGL;
978		1047
979	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 =
980	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1053	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981	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);
982		1055
983	sub new {	1056	sub new {
984	my $class = shift;	1057	my ($class, %arg) = @_;
985		1058
986	# TODO: user_x, user_y, overwrite moveto?	1059	my $title = delete $arg{title};
987		1060
988	my $self = $class->SUPER::new (	1061	my $self = $class->SUPER::new (
989	bg => [1, 1, 1, 1],	1062	bg => [1, 1, 1, 1],
990	border_bg => [1, 1, 1, 1],	1063	border_bg => [1, 1, 1, 1],
991	border => 0.6,	1064	border => 0.6,
992	is_toplevel => 1,
993	can_events => 1,	1065	can_events => 1,
994	@_	1066	min_w => 16,
		1067	min_h => 16,
		1068	%arg,
995	);	1069	);
996		1070
997	$self->{title} &&= new CFClient::UI::Label	1071	$self->{title} = new CFClient::UI::Label
998	align => 0,	1072	align => 0,
999	valign => 1,	1073	valign => 1,
1000	text => $self->{title},	1074	text => $title,
1001	fontsize => $self->{border};	1075	fontsize => $self->{border}
		1076	if defined $title;
1002		1077
1003	$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};
1004	}	1086	}
1005		1087
1006	sub border {	1088	sub border {
1007	int $_[0]{border} * $::FONTSIZE	1089	int $_[0]{border} * $::FONTSIZE
1008	}	1090	}
1009		1091
1010	sub size_request {	1092	sub size_request {
1011	my ($self) = @_;	1093	my ($self) = @_;
		1094
		1095	$self->{title}->size_request
		1096	if $self->{title};
1012		1097
1013	my ($w, $h) = $self->SUPER::size_request;	1098	my ($w, $h) = $self->SUPER::size_request;
1014		1099
1015	(	1100	(
1016	$w + $self->border * 2,	1101	$w + $self->border * 2,
…		…
1019	}	1104	}
1020		1105
1021	sub size_allocate {	1106	sub size_allocate {
1022	my ($self, $w, $h) = @_;	1107	my ($self, $w, $h) = @_;
1023		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
1024	$h -= List::Util::max 0, $self->border * 2;	1117	$h -= List::Util::max 0, $border * 2;
1025	$w -= List::Util::max 0, $self->border * 2;	1118	$w -= List::Util::max 0, $border * 2;
1026		1119
1027	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1028	if $self->{title};
1029
1030	$self->child->configure ($self->border, $self->border, $w, $h);	1120	$self->child->configure ($border, $border, $w, $h);
1031	}	1121	}
1032		1122
1033	sub button_down {	1123	sub button_down {
1034	my ($self, $ev, $x, $y) = @_;	1124	my ($self, $ev, $x, $y) = @_;
1035		1125
…		…
1051	my ($ev, $x, $y) = @_;	1141	my ($ev, $x, $y) = @_;
1052		1142
1053	my $dx = $ev->{x} - $ox;	1143	my $dx = $ev->{x} - $ox;
1054	my $dy = $ev->{y} - $oy;	1144	my $dy = $ev->{y} - $oy;
1055		1145
1056	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1146	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1057	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1147	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1148
		1149	$self->realloc;
1058	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1150	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1059	$self->check_size;
1060	};	1151	};
1061		1152
1062	} elsif ($lr ^ $td) {	1153	} elsif ($lr ^ $td) {
1063	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1154	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1064	my ($bx, $by) = ($self->{x}, $self->{y});	1155	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1066	$self->{motion} = sub {	1157	$self->{motion} = sub {
1067	my ($ev, $x, $y) = @_;	1158	my ($ev, $x, $y) = @_;
1068		1159
1069	($x, $y) = ($ev->{x}, $ev->{y});	1160	($x, $y) = ($ev->{x}, $ev->{y});
1070		1161
1071	$self->move ($bx + $x - $ox, $by + $y - $oy);	1162	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1072	$self->update;
1073	};	1163	};
		1164	} else {
		1165	return 0;
		1166	}
		1167
1074	}	1168	1
1075	}	1169	}
1076		1170
1077	sub button_up {	1171	sub button_up {
1078	my ($self, $ev, $x, $y) = @_;	1172	my ($self, $ev, $x, $y) = @_;
1079		1173
1080	delete $self->{motion};	1174	!!delete $self->{motion}
1081	}	1175	}
1082		1176
1083	sub mouse_motion {	1177	sub mouse_motion {
1084	my ($self, $ev, $x, $y) = @_;	1178	my ($self, $ev, $x, $y) = @_;
1085		1179
1086	$self->{motion}->($ev, $x, $y) if $self->{motion};	1180	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1181
		1182	!!$self->{motion}
1087	}	1183	}
1088		1184
1089	sub _draw {	1185	sub _draw {
1090	my ($self) = @_;	1186	my ($self) = @_;
1091		1187
		1188	my $child = $self->{children}[0];
		1189
1092	my ($w, $h ) = ($self->{w}, $self->{h});	1190	my ($w, $h ) = ($self->{w}, $self->{h});
1093	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1191	my ($cw, $ch) = ($child->{w}, $child->{h});
1094		1192
1095	glEnable GL_TEXTURE_2D;	1193	glEnable GL_TEXTURE_2D;
1096	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1194	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1097		1195
1098	my $border = $self->border;	1196	my $border = $self->border;
1099		1197
1100	glColor @{ $self->{border_bg} };	1198	glColor @{ $self->{border_bg} };
1101	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1199	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1102	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1200	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1103	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1201	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1104	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1202	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1105		1203
1106	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1204	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1107	my $bg = $tex[0];	1205	glColor @{ $self->{bg} };
1108		1206
1109	# TODO: repeat texture not scale	1207	# TODO: repeat texture not scale
		1208	# solve this better(?)
1110	my $rep_x = $cw / $bg->{w};	1209	$bg->{s} = $cw / $bg->{w};
1111	my $rep_y = $ch / $bg->{h};	1210	$bg->{t} = $ch / $bg->{h};
1112
1113	glColor @{ $self->{bg} };
1114
1115	$bg->{s} = $rep_x;
1116	$bg->{t} = $rep_y;
1117	$bg->{wrap_mode} = 1;
1118	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1211	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1119	}	1212	}
1120		1213
1121	glDisable GL_TEXTURE_2D;	1214	glDisable GL_TEXTURE_2D;
1122		1215
1123	$self->{title}->draw if $self->{title};
1124
1125	$self->child->draw;	1216	$child->draw;
		1217
		1218	if ($self->{title}) {
		1219	glTranslate 0, $border - $self->{h};
		1220	$self->{title}->_draw;
		1221	}
1126	}	1222	}
1127		1223
1128	#############################################################################	1224	#############################################################################
1129		1225
1130	package CFClient::UI::Table;	1226	package CFClient::UI::Table;
…		…
1152	my ($self, $x, $y, $child) = @_;	1248	my ($self, $x, $y, $child) = @_;
1153		1249
1154	$child->set_parent ($self);	1250	$child->set_parent ($self);
1155	$self->{children}[$y][$x] = $child;	1251	$self->{children}[$y][$x] = $child;
1156		1252
1157	$self->check_size (1);	1253	$self->realloc;
1158	}	1254	}
1159		1255
1160	# 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?
1161	sub clear {	1257	sub clear {
1162	my ($self) = @_;	1258	my ($self) = @_;
…		…
1167	for (@children) {	1263	for (@children) {
1168	delete $_->{parent};	1264	delete $_->{parent};
1169	$_->hide;	1265	$_->hide;
1170	}	1266	}
1171		1267
1172	$self->check_size (1);	1268	$self->realloc;
1173	$self->update;
1174	}	1269	}
1175		1270
1176	sub get_wh {	1271	sub get_wh {
1177	my ($self) = @_;	1272	my ($self) = @_;
1178		1273
…		…
1274	}	1369	}
1275	}	1370	}
1276		1371
1277	#############################################################################	1372	#############################################################################
1278		1373
1279	package CFClient::UI::HBox;	1374	package CFClient::UI::Box;
1280
1281	# TODO: wrap into common Box base class
1282		1375
1283	our @ISA = CFClient::UI::Container::;	1376	our @ISA = CFClient::UI::Container::;
1284		1377
1285	sub size_request {	1378	sub size_request {
1286	my ($self) = @_;	1379	my ($self) = @_;
1287		1380
1288	my @alloc = map [$_->size_request], @{$self->{children}};	1381	$self->{vertical}
1289		1382	? (
1290	(	1383	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1291	(List::Util::sum map $_->[0], @alloc),	1384	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1292	(List::Util::max map $_->[1], @alloc),	1385	)
1293	)	1386	: (
		1387	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1388	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1389	)
1294	}	1390	}
1295		1391
1296	sub size_allocate {	1392	sub size_allocate {
1297	my ($self, $w, $h) = @_;	1393	my ($self, $w, $h) = @_;
1298		1394
1299	($h, $w) = ($w, $h);	1395	my $space = $self->{vertical} ? $h : $w;
1300
1301	my $children = $self->{children};	1396	my $children = $self->{children};
1302		1397
1303	my @h = map $_->{req_w}, @$children;	1398	my @req;
1304		1399
1305	my $req_h = List::Util::sum @h;	1400	if ($self->{homogeneous}) {
1306		1401	@req = ($space / (@$children || 1)) x @$children;
1307	if ($req_h > $h) {
1308	# ah well, not enough space
1309	$_ *= $h / $req_h for @h;
1310	} else {	1402	} else {
		1403	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1404	my $req = List::Util::sum @req;
		1405
		1406	if ($req > $space) {
		1407	# ah well, not enough space
		1408	$_ *= $space / $req for @req;
		1409	} else {
1311	my $exp = List::Util::sum map $_->{expand}, @$children;	1410	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1312	$exp ||= 1;
1313		1411
		1412	$space = ($space - $req) / $expand; # remaining space to give away
		1413
		1414	$req[$_] += $space * $children->[$_]{expand}
1314	for (0 .. $#$children) {	1415	for 0 .. $#$children;
1315	my $child = $children->[$_];
1316
1317	my $alloc_h = $h[$_];
1318	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1319	$h[$_] = $alloc_h;
1320	}	1416	}
1321	}	1417	}
1322		1418
1323	CFClient::UI::harmonize \@h;	1419	CFClient::UI::harmonize \@req;
1324		1420
1325	my $y = 0;	1421	my $pos = 0;
1326	for (0 .. $#$children) {	1422	for (0 .. $#$children) {
1327	my $child = $children->[$_];
1328	my $h = $h[$_];	1423	my $alloc = $req[$_];
1329	$child->configure ($y, 0, $h, $w);	1424	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1330		1425
1331	$y += $h;	1426	$pos += $alloc;
1332	}	1427	}
1333		1428
1334	1	1429	1
1335	}	1430	}
1336		1431
1337	#############################################################################	1432	#############################################################################
1338		1433
		1434	package CFClient::UI::HBox;
		1435
		1436	our @ISA = CFClient::UI::Box::;
		1437
		1438	sub new {
		1439	my $class = shift;
		1440
		1441	$class->SUPER::new (
		1442	vertical => 0,
		1443	@_,
		1444	)
		1445	}
		1446
		1447	#############################################################################
		1448
1339	package CFClient::UI::VBox;	1449	package CFClient::UI::VBox;
1340		1450
1341	# TODO: wrap into common Box base class
1342
1343	our @ISA = CFClient::UI::Container::;	1451	our @ISA = CFClient::UI::Box::;
1344		1452
1345	sub size_request {	1453	sub new {
1346	my ($self) = @_;	1454	my $class = shift;
1347		1455
1348	my @alloc = map [$_->size_request], @{$self->{children}};	1456	$class->SUPER::new (
1349		1457	vertical => 1,
1350	(	1458	@_,
1351	(List::Util::max map $_->[0], @alloc),
1352	(List::Util::sum map $_->[1], @alloc),
1353	)	1459	)
1354	}
1355
1356	sub size_allocate {
1357	my ($self, $w, $h) = @_;
1358
1359	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1360
1361	my $children = $self->{children};
1362
1363	my @h = map $_->{req_h}, @$children;
1364
1365	my $req_h = List::Util::sum @h;
1366
1367	if ($req_h > $h) {
1368	# ah well, not enough space
1369	$_ *= $h / $req_h for @h;
1370	} else {
1371	my $exp = List::Util::sum map $_->{expand}, @$children;
1372	$exp ||= 1;
1373
1374	for (0 .. $#$children) {
1375	my $child = $children->[$_];
1376
1377	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1378	}
1379	}
1380
1381	CFClient::UI::harmonize \@h;
1382
1383	my $y = 0;
1384	for (0 .. $#$children) {
1385	my $child = $children->[$_];
1386	my $h = $h[$_];
1387	$child->configure (0, $y, $w, $h);
1388
1389	$y += $h;
1390	}
1391
1392	1
1393	}	1460	}
1394		1461
1395	#############################################################################	1462	#############################################################################
1396		1463
1397	package CFClient::UI::Label;	1464	package CFClient::UI::Label;
…		…
1414	ellipsise => 3, # end	1481	ellipsise => 3, # end
1415	layout => (new CFClient::Layout),	1482	layout => (new CFClient::Layout),
1416	fontsize => 1,	1483	fontsize => 1,
1417	align => -1,	1484	align => -1,
1418	valign => -1,	1485	valign => -1,
1419	padding => 2,	1486	padding_x => 2,
		1487	padding_y => 2,
1420	can_events => 0,	1488	can_events => 0,
1421	%arg	1489	%arg
1422	);	1490	);
1423		1491
1424	if (exists $self->{template}) {	1492	if (exists $self->{template}) {
…		…
1460	$self->{text} = "T$text";	1528	$self->{text} = "T$text";
1461		1529
1462	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1530	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463	$self->{layout}->set_text ($text);	1531	$self->{layout}->set_text ($text);
1464		1532
		1533	$self->realloc;
1465	$self->update;	1534	$self->update;
1466	$self->check_size;
1467	}	1535	}
1468		1536
1469	sub set_markup {	1537	sub set_markup {
1470	my ($self, $markup) = @_;	1538	my ($self, $markup) = @_;
1471		1539
…		…
1475	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1543	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476		1544
1477	$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;
1478	$self->{layout}->set_markup ($markup);	1546	$self->{layout}->set_markup ($markup);
1479		1547
		1548	$self->realloc;
1480	$self->update;	1549	$self->update;
1481	$self->check_size;
1482	}	1550	}
1483		1551
1484	sub size_request {	1552	sub size_request {
1485	my ($self) = @_;	1553	my ($self) = @_;
1486		1554
…		…
1500		1568
1501	$w = List::Util::max $w, $w2;	1569	$w = List::Util::max $w, $w2;
1502	$h = List::Util::max $h, $h2;	1570	$h = List::Util::max $h, $h2;
1503	}	1571	}
1504		1572
1505	(	1573	($w, $h)
1506	$w + $self->{padding} * 2,
1507	$h + $self->{padding} * 2,
1508	)
1509	}	1574	}
1510		1575
1511	sub size_allocate {	1576	sub size_allocate {
1512	my ($self, $w, $h) = @_;	1577	my ($self, $w, $h) = @_;
1513		1578
		1579	delete $self->{ox};
		1580
1514	delete $self->{texture};	1581	delete $self->{texture}
		1582	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1515	}	1583	}
1516		1584
1517	sub set_fontsize {	1585	sub set_fontsize {
1518	my ($self, $fontsize) = @_;	1586	my ($self, $fontsize) = @_;
1519		1587
1520	$self->{fontsize} = $fontsize;	1588	$self->{fontsize} = $fontsize;
1521	delete $self->{texture};	1589	delete $self->{texture};
1522		1590
1523	$self->update;	1591	$self->realloc;
1524	$self->check_size;
1525	}	1592	}
1526		1593
1527	sub _draw {	1594	sub _draw {
1528	my ($self) = @_;	1595	my ($self) = @_;
1529		1596
…		…
1535	$self->{layout}->set_width ($self->{w});	1602	$self->{layout}->set_width ($self->{w});
1536	$self->{layout}->set_ellipsise ($self->{ellipsise});	1603	$self->{layout}->set_ellipsise ($self->{ellipsise});
1537	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1604	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1538	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1605	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539		1606
1540	my $tex = new_from_layout CFClient::Texture $self->{layout};	1607	new_from_layout CFClient::Texture $self->{layout}
		1608	};
1541		1609
		1610	unless (exists $self->{ox}) {
1542	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1611	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1543	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1612	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1544	: ($self->{w} - $tex->{w}) * 0.5);	1613	: ($self->{w} - $tex->{w}) * 0.5);
1545		1614
1546	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1615	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1547	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1616	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1548	: ($self->{h} - $tex->{h}) * 0.5);	1617	: ($self->{h} - $tex->{h}) * 0.5);
1549
1550	$tex
1551	};	1618	};
1552		1619
1553	glEnable GL_TEXTURE_2D;	1620	glEnable GL_TEXTURE_2D;
1554	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1621	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1555		1622
…		…
1609	sub set_text {	1676	sub set_text {
1610	my ($self, $text) = @_;	1677	my ($self, $text) = @_;
1611		1678
1612	$self->{cursor} = length $text;	1679	$self->{cursor} = length $text;
1613	$self->_set_text ($text);	1680	$self->_set_text ($text);
1614	$self->update;	1681
1615	$self->check_size;	1682	$self->realloc;
1616	}	1683	}
1617		1684
1618	sub get_text {	1685	sub get_text {
1619	$_[0]{text}	1686	$_[0]{text}
1620	}	1687	}
…		…
1650	$self->{cursor} = length $text;	1717	$self->{cursor} = length $text;
1651	} elsif ($uni == 27) {	1718	} elsif ($uni == 27) {
1652	$self->_emit ('escape');	1719	$self->_emit ('escape');
1653	} elsif ($uni) {	1720	} elsif ($uni) {
1654	substr $text, $self->{cursor}++, 0, chr $uni;	1721	substr $text, $self->{cursor}++, 0, chr $uni;
		1722	} else {
		1723	return 0;
1655	}	1724	}
1656		1725
1657	$self->_set_text ($text);	1726	$self->_set_text ($text);
1658	$self->update;	1727
1659	$self->check_size;	1728	$self->realloc;
		1729
		1730	1
1660	}	1731	}
1661		1732
1662	sub focus_in {	1733	sub focus_in {
1663	my ($self) = @_;	1734	my ($self) = @_;
1664		1735
…		…
1679	utf8::encode $text;	1750	utf8::encode $text;
1680	$self->{cursor} = length substr $text, 0, $idx;	1751	$self->{cursor} = length substr $text, 0, $idx;
1681		1752
1682	$self->_set_text ($self->{text});	1753	$self->_set_text ($self->{text});
1683	$self->update;	1754	$self->update;
		1755
		1756	1
1684	}	1757	}
1685		1758
1686	sub mouse_motion {	1759	sub mouse_motion {
1687	my ($self, $ev, $x, $y) = @_;	1760	my ($self, $ev, $x, $y) = @_;
1688	# 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
1689	}	1764	}
1690		1765
1691	sub _draw {	1766	sub _draw {
1692	my ($self) = @_;	1767	my ($self) = @_;
1693		1768
…		…
1770	} else {	1845	} else {
1771	$self->set_text ($self->{history_saveback});	1846	$self->set_text ($self->{history_saveback});
1772	}	1847	}
1773		1848
1774	} else {	1849	} else {
1775	$self->SUPER::key_down ($ev);	1850	return $self->SUPER::key_down ($ev)
		1851	}
		1852
1776	}	1853	1
1777
1778	}	1854	}
1779		1855
1780	#############################################################################	1856	#############################################################################
1781		1857
1782	package CFClient::UI::Button;	1858	package CFClient::UI::Button;
…		…
1791		1867
1792	sub new {	1868	sub new {
1793	my $class = shift;	1869	my $class = shift;
1794		1870
1795	$class->SUPER::new (	1871	$class->SUPER::new (
1796	padding => 4,	1872	padding_x => 4,
		1873	padding_y => 4,
1797	fg => [1, 1, 1],	1874	fg => [1, 1, 1],
1798	active_fg => [0, 0, 1],	1875	active_fg => [0, 0, 1],
1799	can_hover => 1,	1876	can_hover => 1,
1800	align => 0,	1877	align => 0,
1801	valign => 0,	1878	valign => 0,
…		…
1810	my ($self, $ev, $x, $y) = @_;	1887	my ($self, $ev, $x, $y) = @_;
1811		1888
1812	$self->emit ("activate")	1889	$self->emit ("activate")
1813	if $x >= 0 && $x < $self->{w}	1890	if $x >= 0 && $x < $self->{w}
1814	&& $y >= 0 && $y < $self->{h};	1891	&& $y >= 0 && $y < $self->{h};
		1892
		1893	1
1815	}	1894	}
1816		1895
1817	sub _draw {	1896	sub _draw {
1818	my ($self) = @_;	1897	my ($self) = @_;
1819		1898
…		…
1848		1927
1849	sub new {	1928	sub new {
1850	my $class = shift;	1929	my $class = shift;
1851		1930
1852	$class->SUPER::new (	1931	$class->SUPER::new (
1853	padding => 2,	1932	padding_x => 2,
		1933	padding_y => 2,
1854	fg => [1, 1, 1],	1934	fg => [1, 1, 1],
1855	active_fg => [1, 1, 0],	1935	active_fg => [1, 1, 0],
1856	bg => [0, 0, 0, 0.2],	1936	bg => [0, 0, 0, 0.2],
1857	active_bg => [1, 1, 1, 0.5],	1937	active_bg => [1, 1, 1, 0.5],
1858	state => 0,	1938	state => 0,
…		…
1862	}	1942	}
1863		1943
1864	sub size_request {	1944	sub size_request {
1865	my ($self) = @_;	1945	my ($self) = @_;
1866		1946
1867	($self->{padding} * 2 + 6) x 2	1947	(6) x 2
1868	}	1948	}
1869		1949
1870	sub button_down {	1950	sub button_down {
1871	my ($self, $ev, $x, $y) = @_;	1951	my ($self, $ev, $x, $y) = @_;
1872		1952
1873	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1953	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1874	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1954	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1875	$self->{state} = !$self->{state};	1955	$self->{state} = !$self->{state};
1876	$self->_emit (changed => $self->{state});	1956	$self->_emit (changed => $self->{state});
		1957	} else {
		1958	return 0
		1959	}
		1960
1877	}	1961	1
1878	}	1962	}
1879		1963
1880	sub _draw {	1964	sub _draw {
1881	my ($self) = @_;	1965	my ($self) = @_;
1882		1966
1883	$self->SUPER::_draw;	1967	$self->SUPER::_draw;
1884		1968
1885	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1969	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1886		1970
1887	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;
1888		1974
1889	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1975	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1890		1976
1891	my $tex = $self->{state} ? $tex[1] : $tex[0];	1977	my $tex = $self->{state} ? $tex[1] : $tex[0];
1892		1978
…		…
2157	fg => [1, 1, 1],	2243	fg => [1, 1, 1],
2158	active_fg => [0, 0, 0],	2244	active_fg => [0, 0, 0],
2159	bg => [0, 0, 0, 0.2],	2245	bg => [0, 0, 0, 0.2],
2160	active_bg => [1, 1, 1, 0.5],	2246	active_bg => [1, 1, 1, 0.5],
2161	range => [0, 0, 100, 10, 0],	2247	range => [0, 0, 100, 10, 0],
2162	req_w => $::WIDTH / 80,	2248	min_w => $::WIDTH / 80,
2163	req_h => $::WIDTH / 80,	2249	min_h => $::WIDTH / 80,
2164	vertical => 0,	2250	vertical => 0,
2165	can_hover => 1,	2251	can_hover => 1,
2166	inner_pad => 0.02,	2252	inner_pad => 0.02,
2167	@_	2253	@_
2168	);	2254	);
…		…
2171	$self->update;	2257	$self->update;
2172		2258
2173	$self	2259	$self
2174	}	2260	}
2175		2261
		2262	sub changed { }
		2263
2176	sub set_range {	2264	sub set_range {
2177	my ($self, $range) = @_;	2265	my ($self, $range) = @_;
2178		2266
2179	($range, $self->{range}) = ($self->{range}, $range);	2267	($range, $self->{range}) = ($self->{range}, $range);
2180		2268
…		…
2206	}	2294	}
2207		2295
2208	sub size_request {	2296	sub size_request {
2209	my ($self) = @_;	2297	my ($self) = @_;
2210		2298
2211	my $w = $self->{req_w};	2299	($self->{req_w}, $self->{req_h})
2212	my $h = $self->{req_h};
2213
2214	$self->{vertical} ? ($h, $w) : ($w, $h)
2215	}	2300	}
2216		2301
2217	sub button_down {	2302	sub button_down {
2218	my ($self, $ev, $x, $y) = @_;	2303	my ($self, $ev, $x, $y) = @_;
2219		2304
2220	$self->SUPER::button_down ($ev, $x, $y);	2305	$self->SUPER::button_down ($ev, $x, $y);
2221		2306
2222	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2307	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2223		2308
2224	$self->mouse_motion ($ev, $x, $y);	2309	$self->mouse_motion ($ev, $x, $y)
2225	}	2310	}
2226		2311
2227	sub mouse_motion {	2312	sub mouse_motion {
2228	my ($self, $ev, $x, $y) = @_;	2313	my ($self, $ev, $x, $y) = @_;
2229		2314
…		…
2233	my (undef, $lo, $hi, $page) = @{$self->{range}};	2318	my (undef, $lo, $hi, $page) = @{$self->{range}};
2234		2319
2235	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2320	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2236		2321
2237	$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
2238	}	2327	1
2239	}	2328	}
2240		2329
2241	sub update {	2330	sub update {
2242	my ($self) = @_;	2331	my ($self) = @_;
2243		2332
…		…
2570		2659
2571	sub new {	2660	sub new {
2572	my $class = shift;	2661	my $class = shift;
2573		2662
2574	my $self = $class->SUPER::new (	2663	my $self = $class->SUPER::new (
2575	state => 0,	2664	state => 0,
2576	connect_activate => \&toggle_flopper,	2665	on_activate => \&toggle_flopper,
2577	@_	2666	@_
2578	);	2667	);
2579		2668
2580	if ($self->{state}) {
2581	$self->{state} = 0;
2582	$self->toggle_flopper;
2583	}
2584
2585	$self	2669	$self
2586	}	2670	}
2587		2671
2588	sub toggle_flopper {	2672	sub toggle_flopper {
2589	my ($self) = @_;	2673	my ($self) = @_;
2590		2674
2591	# TODO: use animation	2675	$self->{other}->toggle_visibility;
2592	if ($self->{state} = !$self->{state}) {
2593	$CFClient::UI::ROOT->add ($self->{other});
2594	$self->{other}->move ($self->coord2global (0, $self->{h}));
2595	$self->_emit ("open");
2596	} else {
2597	$CFClient::UI::ROOT->remove ($self->{other});
2598	$self->_emit ("close");
2599	}
2600
2601	$self->_emit (changed => $self->{state});
2602	}	2676	}
2603		2677
2604	#############################################################################	2678	#############################################################################
2605		2679
2606	package CFClient::UI::Tooltip;	2680	package CFClient::UI::Tooltip;
…		…
2619	}	2693	}
2620		2694
2621	sub set_tooltip_from {	2695	sub set_tooltip_from {
2622	my ($self, $widget) = @_;	2696	my ($self, $widget) = @_;
2623		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
2624	$self->add (new CFClient::UI::Label	2707	$self->add (new CFClient::UI::Label
2625	markup => $widget->{tooltip},	2708	markup => $tooltip,
2626	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2709	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627	fontsize => 0.8,	2710	fontsize => 0.8,
2628	fg => [0, 0, 0, 1],	2711	fg => [0, 0, 0, 1],
2629	ellipsise => 0,	2712	ellipsise => 0,
2630	font => ($widget->{tooltip_font} || $::FONT_PROP),	2713	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2641		2724
2642	sub size_allocate {	2725	sub size_allocate {
2643	my ($self, $w, $h) = @_;	2726	my ($self, $w, $h) = @_;
2644		2727
2645	$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	});
2646	}	2747	}
2647		2748
2648	sub _draw {	2749	sub _draw {
2649	my ($self) = @_;	2750	my ($self) = @_;
2650		2751
…		…
2667	glVertex $w, $h;	2768	glVertex $w, $h;
2668	glVertex $w, 0;	2769	glVertex $w, 0;
2669	glEnd;	2770	glEnd;
2670		2771
2671	glTranslate 2 - 0.375, 2 - 0.375;	2772	glTranslate 2 - 0.375, 2 - 0.375;
		2773
2672	$self->SUPER::_draw;	2774	$self->SUPER::_draw;
2673	}	2775	}
2674		2776
2675	#############################################################################	2777	#############################################################################
2676		2778
…		…
2752	$self->SUPER::DESTROY;	2854	$self->SUPER::DESTROY;
2753	}	2855	}
2754		2856
2755	#############################################################################	2857	#############################################################################
2756		2858
2757	package CFClient::UI::Inventory;
2758
2759	our @ISA = CFClient::UI::ScrolledWindow::;
2760
2761	sub new {
2762	my $class = shift;
2763
2764	my $self = $class->SUPER::new (
2765	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2766	@_,
2767	);
2768
2769	$self
2770	}
2771
2772	sub set_items {
2773	my ($self, $items) = @_;
2774
2775	$self->{scrolled}->clear;
2776	return unless $items;
2777
2778	my @items = sort {
2779	($a->{type} <=> $b->{type})
2780	or ($a->{name} cmp $b->{name})
2781	} @$items;
2782
2783	$self->{real_items} = \@items;
2784
2785	my $row = 0;
2786	for my $item (@items) {
2787	CFClient::Item::update_widgets $item;
2788
2789	$self->{scrolled}->add (0, $row, $item->{face_widget});
2790	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2791	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2792
2793	$row++;
2794	}
2795	}
2796
2797	sub size_request {
2798	my ($self) = @_;
2799	($self->{req_w}, $self->{req_h});
2800	}
2801
2802	#############################################################################
2803
2804	package CFClient::UI::Menu;	2859	package CFClient::UI::Menu;
2805		2860
2806	our @ISA = CFClient::UI::FancyFrame::;	2861	our @ISA = CFClient::UI::FancyFrame::;
2807		2862
2808	use CFClient::OpenGL;	2863	use CFClient::OpenGL;
…		…
2846	# maybe save $GRAB? must be careful about events...	2901	# maybe save $GRAB? must be careful about events...
2847	$GRAB = $self;	2902	$GRAB = $self;
2848	$self->{button} = $ev->{button};	2903	$self->{button} = $ev->{button};
2849		2904
2850	$self->show;	2905	$self->show;
2851	$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);
2852	}	2907	}
2853		2908
2854	sub mouse_motion {	2909	sub mouse_motion {
2855	my ($self, $ev, $x, $y) = @_;	2910	my ($self, $ev, $x, $y) = @_;
2856		2911
2857	# TODO: should use vbox->find_widget or so	2912	# TODO: should use vbox->find_widget or so
2858	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2913	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2859	$self->{hover} = $self->{item}{$HOVER};	2914	$self->{hover} = $self->{item}{$HOVER};
		2915
		2916	0
2860	}	2917	}
2861		2918
2862	sub button_up {	2919	sub button_up {
2863	my ($self, $ev, $x, $y) = @_;	2920	my ($self, $ev, $x, $y) = @_;
2864		2921
…		…
2866	undef $GRAB;	2923	undef $GRAB;
2867	$self->hide;	2924	$self->hide;
2868		2925
2869	$self->_emit ("popdown");	2926	$self->_emit ("popdown");
2870	$self->{hover}[1]->() if $self->{hover};	2927	$self->{hover}[1]->() if $self->{hover};
		2928	} else {
		2929	return 0
		2930	}
		2931
2871	}	2932	1
2872	}	2933	}
2873		2934
2874	#############################################################################	2935	#############################################################################
2875		2936
2876	package CFClient::UI::Statusbox;	2937	package CFClient::UI::Statusbox;
…		…
2981	$self->SUPER::reconfigure;	3042	$self->SUPER::reconfigure;
2982	}	3043	}
2983		3044
2984	#############################################################################	3045	#############################################################################
2985		3046
2986	package CFClient::UI::Root;	3047	package CFClient::UI::Inventory;
2987		3048
2988	our @ISA = CFClient::UI::Container::;	3049	our @ISA = CFClient::UI::ScrolledWindow::;
2989
2990	use CFClient::OpenGL;
2991		3050
2992	sub new {	3051	sub new {
2993	my $class = shift;	3052	my $class = shift;
2994		3053
2995	$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 (
2996	visible => 1,	3353	visible => 1,
2997	@_,	3354	@_,
2998	)	3355	);
2999	}
3000		3356
3001	sub configure {	3357	Scalar::Util::weaken ($self->{root} = $self);
3002	my ($self, $x, $y, $w, $h) = @_;
3003		3358
3004	$self->{w} = $w;	3359	$self
3005	$self->{h} = $h;
3006	}
3007
3008	sub check_size {
3009	my ($self) = @_;
3010
3011	$self->size_allocate ($self->{w}, $self->{h})
3012	if $self->{w};
3013	}	3360	}
3014		3361
3015	sub size_request {	3362	sub size_request {
3016	my ($self) = @_;	3363	my ($self) = @_;
3017		3364
3018	($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
3019	}	3380	}
3020		3381
3021	sub size_allocate {	3382	sub size_allocate {
3022	my ($self, $w, $h) = @_;	3383	my ($self, $w, $h) = @_;
3023		3384
3024	for my $child ($self->children) {	3385	for my $child ($self->children) {
3025	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)};
3026		3387
3027	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3388	$X = $child->{force_x} if exists $child->{force_x};
3028	if exists $child->{req_x};	3389	$Y = $child->{force_y} if exists $child->{force_y};
3029		3390
3030	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3391	$X = _to_pixel $X, $W, $self->{w};
3031	if exists $child->{req_y};	3392	$Y = _to_pixel $Y, $H, $self->{h};
3032
3033	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3034	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035		3393
3036	$child->configure ($X, $Y, $W, $H);	3394	$child->configure ($X, $Y, $W, $H);
3037	}	3395	}
3038	}	3396	}
3039		3397
…		…
3050	}	3408	}
3051		3409
3052	sub update {	3410	sub update {
3053	my ($self) = @_;	3411	my ($self) = @_;
3054		3412
3055	$self->check_size;
3056	$::WANT_REFRESH++;	3413	$::WANT_REFRESH++;
3057	}	3414	}
3058		3415
3059	sub add {	3416	sub add {
3060	my ($self, @children) = @_;	3417	my ($self, @children) = @_;
3061		3418
3062	for (my @widgets = @children; my $w = pop @widgets; ) {
3063	push @widgets, $w->children;
3064	$w->{root} = $self;
3065	$w->{visible} = $self->{visible} + 1;
3066	}
3067
3068	for my $child (@children) {
3069	$child->{is_toplevel} = 1;	3419	$_->{is_toplevel} = 1
3070		3420	for @children;
3071	# integerise window positions
3072	$child->{x} = int $child->{x};
3073	$child->{y} = int $child->{y};
3074	}
3075		3421
3076	$self->SUPER::add (@children);	3422	$self->SUPER::add (@children);
3077	}	3423	}
3078		3424
3079	sub remove {	3425	sub remove {
3080	my ($self, @children) = @_;	3426	my ($self, @children) = @_;
3081		3427
3082	$self->SUPER::remove (@children);	3428	$self->SUPER::remove (@children);
		3429
		3430	delete $self->{is_toplevel}
		3431	for @children;
3083		3432
3084	while (@children) {	3433	while (@children) {
3085	my $w = pop @children;	3434	my $w = pop @children;
3086	push @children, $w->children;	3435	push @children, $w->children;
3087	$w->set_invisible;	3436	$w->set_invisible;
…		…
3106	while ($self->{refresh_hook}) {	3455	while ($self->{refresh_hook}) {
3107	$_->()	3456	$_->()
3108	for values %{delete $self->{refresh_hook}};	3457	for values %{delete $self->{refresh_hook}};
3109	}	3458	}
3110		3459
3111	if ($self->{check_size}) {	3460	if ($self->{realloc}) {
3112	my @queue = ([], []);	3461	my %queue;
		3462	my @queue;
		3463	my $widget;
3113		3464
3114	for (;;) {	3465	outer:
3115	if ($self->{check_size}) {	3466	while () {
3116	# heuristic: check containers last	3467	if (my $realloc = delete $self->{realloc}) {
3117	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3468	for $widget (values %$realloc) {
3118	for values %{delete $self->{check_size}}	3469	$widget->{visible} or next; # do not resize invisible widgets
		3470
		3471	$queue{$widget+0}++ and next; # duplicates are common
		3472
		3473	push @{ $queue[$widget->{visible}] }, $widget;
		3474	}
3119	}	3475	}
3120		3476
3121	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3477	while () {
		3478	@queue or last outer;
3122		3479
3123	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3480	$widget = pop @{ $queue[-1] || [] }
3124	? @$widget{qw(user_w user_h)}	3481	and last;
3125	: $widget->size_request;
3126
3127	if (delete $widget->{force_alloc}
3128	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3129	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3130		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}) {
3131	$widget->{req_w} = $w;	3498	$widget->{req_w} = $w;
3132	$widget->{req_h} = $h;	3499	$widget->{req_h} = $h;
3133		3500
3134	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3501	$self->{size_alloc}{$widget+0} = $widget;
3135		3502
3136	$widget->{parent}->check_size
3137	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	}
3138	}	3510	}
		3511
		3512	delete $self->{realloc}{$widget+0};
3139	}	3513	}
3140	}	3514	}
3141		3515
3142	while ($self->{size_alloc}) {	3516	while (my $size_alloc = delete $self->{size_alloc}) {
3143	for (values %{delete $self->{size_alloc}}) {	3517	my @queue = sort { $b->{visible} <=> $a->{visible} }
3144	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)};
3145		3524
3146	$w = 0 if $w < 0;	3525	$w = 0 if $w < 0;
3147	$h = 0 if $h < 0;	3526	$h = 0 if $h < 0;
3148		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
3149	$widget->{w} = $w;	3535	$widget->{w} = $w;
3150	$widget->{h} = $h;	3536	$widget->{h} = $h;
		3537
3151	$widget->emit (size_allocate => $w, $h);	3538	$widget->emit (size_allocate => $w, $h);
		3539	}
3152	}	3540	}
3153	}	3541	}
3154		3542
3155	while ($self->{post_alloc_hook}) {	3543	while ($self->{post_alloc_hook}) {
3156	$_->()	3544	$_->()
3157	for values %{delete $self->{post_alloc_hook}};	3545	for values %{delete $self->{post_alloc_hook}};
3158	}	3546	}
		3547
3159		3548
3160	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3549	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3161	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3550	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3162	glClear GL_COLOR_BUFFER_BIT;	3551	glClear GL_COLOR_BUFFER_BIT;
3163		3552
…		…
3165	glLoadIdentity;	3554	glLoadIdentity;
3166	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3555	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3167	glMatrixMode GL_MODELVIEW;	3556	glMatrixMode GL_MODELVIEW;
3168	glLoadIdentity;	3557	glLoadIdentity;
3169		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
3170	$self->_draw;	3566	$self->_draw;
3171	}	3567	}
3172		3568
3173	#############################################################################	3569	#############################################################################
3174		3570

Diff Legend

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