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.243 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.275 by root, Sat Jun 3 22:50:48 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;
		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209		217
210	for (keys %$self) {	218	for (keys %$self) {
211	if (/^on_(.*)$/) {	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	}	373	}
334		374
335	sub reconfigure {
336	my ($self) = @_;
337
338	$self->check_size (1);
339	$self->update;
340	}
341
342	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
343	}	381	}
344		382
345	sub set_max_size {	383	sub set_max_size {
346	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
347		385
…		…
406		444
407	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	445	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
408	unless $FOCUS;	446	unless $FOCUS;
409	}	447	}
410		448
411	sub mouse_motion { }	449	sub mouse_motion { 0 }
412	sub button_up { }	450	sub button_up { 0 }
413	sub key_down { }	451	sub key_down { 0 }
414	sub key_up { }	452	sub key_up { 0 }
415		453
416	sub button_down {	454	sub button_down {
417	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
418		456
419	$self->focus_in;	457	$self->focus_in;
420	}
421		458
422	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
423	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
424	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	461
425	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	462	sub find_widget {
426	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	463	my ($self, $x, $y) = @_;
		464
		465	return () unless $self->{can_events};
		466
		467	return $self
		468	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		469	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		470
		471	()
		472	}
		473
		474	sub set_parent {
		475	my ($self, $parent) = @_;
		476
		477	Scalar::Util::weaken ($self->{parent} = $parent);
		478	$self->set_visible if $parent->{visible};
		479	}
		480
		481	sub connect {
		482	my ($self, $signal, $cb) = @_;
		483
		484	push @{ $self->{signal_cb}{$signal} }, $cb;
		485	}
		486
		487	sub _emit {
		488	my ($self, $signal, @args) = @_;
		489
		490	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		491	}
		492
		493	sub emit {
		494	my ($self, $signal, @args) = @_;
		495
		496	$self->_emit ($signal, @args)
		497	|| $self->$signal (@args);
		498	}
		499
		500	sub visibility_change {
		501	#my ($self, $visible) = @_;
		502	}
		503
		504	sub realloc {
		505	my ($self) = @_;
		506
		507	if ($self->{visible}) {
		508	return if $self->{root}{realloc}{$self+0};
		509
		510	$self->{root}{realloc}{$self+0} = $self;
		511	$self->{root}->update;
		512	} else {
		513	delete $self->{req_w};
		514	delete $self->{req_h};
		515	}
		516	}
		517
		518	sub update {
		519	my ($self) = @_;
		520
		521	$self->{parent}->update
		522	if $self->{parent};
		523	}
		524
		525	sub reconfigure {
		526	my ($self) = @_;
		527
		528	$self->realloc;
		529	$self->update;
		530	}
		531
		532	# using global variables seems a bit hacky, but passing through all drawing
		533	# functions seems pointless.
		534	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
427		535
428	sub draw {	536	sub draw {
429	my ($self) = @_;	537	my ($self) = @_;
430		538
431	return unless $self->{h} && $self->{w};	539	return unless $self->{h} && $self->{w};
		540
		541	# update screen rectangle
		542	local $draw_x = $draw_x + $self->{x};
		543	local $draw_y = $draw_y + $self->{y};
		544	local $draw_w = $draw_x + $self->{w};
		545	local $draw_h = $draw_y + $self->{h};
		546
		547	# skip widgets that are entirely outside the drawing area
		548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
432		550
433	glPushMatrix;	551	glPushMatrix;
434	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
435	$self->_draw;	553	$self->_draw;
436	glPopMatrix;	554	glPopMatrix;
…		…
448	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
449	glEnd;	567	glEnd;
450	glDisable GL_BLEND;	568	glDisable GL_BLEND;
451	}	569	}
452		570
453	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
454	glPushMatrix;	572	glPushMatrix;
455	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
456	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
457	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
458	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
469	my ($self) = @_;	587	my ($self) = @_;
470		588
471	warn "no draw defined for $self\n";	589	warn "no draw defined for $self\n";
472	}	590	}
473		591
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 {	592	sub DESTROY {
535	my ($self) = @_;	593	my ($self) = @_;
536		594
537	delete $WIDGET{$self+0};	595	delete $WIDGET{$self+0};
538	#$self->deactivate;	596	#$self->deactivate;
…		…
594	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
595	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
596	}	654	}
597		655
598	sub size_request {	656	sub size_request {
599	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
600	}	660	}
601		661
602	sub draw { }	662	sub draw { }
603		663
604	#############################################################################	664	#############################################################################
…		…
608	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
609		669
610	sub new {	670	sub new {
611	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
612		672
613	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
614		674
615	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
616	children => [],	676	children => [],
617	can_events => 0,	677	can_events => 0,
618	%arg,	678	%arg,
619	);	679	);
		680
620	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
621		683
622	$self	684	$self
623	}	685	}
624		686
625	sub add {	687	sub add {
…		…
633	$self->{children} = [	695	$self->{children} = [
634	sort { $a->{z} <=> $b->{z} }	696	sort { $a->{z} <=> $b->{z} }
635	@{$self->{children}}, @widgets	697	@{$self->{children}}, @widgets
636	];	698	];
637		699
638	$self->check_size (1);	700	$self->realloc;
639	$self->update;
640	}	701	}
641		702
642	sub children {	703	sub children {
643	@{ $_[0]{children} }	704	@{ $_[0]{children} }
644	}	705	}
…		…
649	delete $child->{parent};	710	delete $child->{parent};
650	$child->hide;	711	$child->hide;
651		712
652	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	713	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653		714
654	$self->check_size (1);	715	$self->realloc;
655	$self->update;
656	}	716	}
657		717
658	sub clear {	718	sub clear {
659	my ($self) = @_;	719	my ($self) = @_;
660		720
…		…
664	for (@$children) {	724	for (@$children) {
665	delete $_->{parent};	725	delete $_->{parent};
666	$_->hide;	726	$_->hide;
667	}	727	}
668		728
669	$self->check_size;	729	$self->realloc;
670	$self->update;
671	}	730	}
672		731
673	sub find_widget {	732	sub find_widget {
674	my ($self, $x, $y) = @_;	733	my ($self, $x, $y) = @_;
675		734
676	$x -= $self->{x};	735	$x -= $self->{x};
677	$y -= $self->{y};	736	$y -= $self->{y};
678		737
679	my $res;	738	my $res;
680		739
681	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
682	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
683	and return $res;	742	and return $res;
684	}	743	}
685		744
686	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
735	$self->{children}[0]->configure (0, 0, $w, $h);	794	$self->{children}[0]->configure (0, 0, $w, $h);
736	}	795	}
737		796
738	#############################################################################	797	#############################################################################
739		798
		799	# back-buffered drawing area
		800
740	package CFClient::UI::Window;	801	package CFClient::UI::Window;
741		802
742	our @ISA = CFClient::UI::Bin::;	803	our @ISA = CFClient::UI::Bin::;
743		804
744	use CFClient::OpenGL;	805	use CFClient::OpenGL;
…		…
762	$self->SUPER::size_allocate ($w, $h);	823	$self->SUPER::size_allocate ($w, $h);
763	$self->update;	824	$self->update;
764	}	825	}
765		826
766	sub _render {	827	sub _render {
		828	my ($self) = @_;
		829
767	$_[0]{children}[0]->draw;	830	$self->{children}[0]->draw;
768	}	831	}
769		832
770	sub render_child {	833	sub render_child {
771	my ($self) = @_;	834	my ($self) = @_;
772		835
773	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	836	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
774	glClearColor 0, 0, 0, 0;	837	glClearColor 0, 0, 0, 0;
775	glClear GL_COLOR_BUFFER_BIT;	838	glClear GL_COLOR_BUFFER_BIT;
776		839
		840	{
		841	package CFClient::UI::Base;
		842
		843	($draw_x, $draw_y, $draw_w, $draw_h) =
		844	(0, 0, $self->{w}, $self->{h});
		845	}
		846
777	$self->_render;	847	$self->_render;
778	};	848	};
779	}	849	}
780		850
781	sub _draw {	851	sub _draw {
782	my ($self) = @_;	852	my ($self) = @_;
783		853
784	my ($w, $h) = ($self->w, $self->h);	854	my ($w, $h) = @$self{qw(w h)};
785		855
786	my $tex = $self->{texture}	856	my $tex = $self->{texture}
787	or return;	857	or return;
788		858
789	glEnable GL_TEXTURE_2D;	859	glEnable GL_TEXTURE_2D;
…		…
812	}	882	}
813		883
814	sub size_request {	884	sub size_request {
815	my ($self) = @_;	885	my ($self) = @_;
816		886
817	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	887	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818		888
819	@$self{qw(child_w child_h)}	889	$w = 10 if $self->{scroll_x};
		890	$h = 10 if $self->{scroll_y};
		891
		892	($w, $h)
820	}	893	}
821		894
822	sub size_allocate {	895	sub size_allocate {
823	my ($self, $w, $h) = @_;	896	my ($self, $w, $h) = @_;
824		897
		898	my $child = $self->child;
		899
825	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	900	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	901	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827		902
828	$self->child->configure (0, 0, $w, $h);	903	$self->child->configure (0, 0, $w, $h);
829	$self->update;	904	$self->update;
830	}	905	}
831		906
…		…
867	}	942	}
868		943
869	sub _render {	944	sub _render {
870	my ($self) = @_;	945	my ($self) = @_;
871		946
		947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		948	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		949
872	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
873		951
874	$self->SUPER::_render;	952	$self->SUPER::_render;
875	}	953	}
876		954
…		…
879	package CFClient::UI::ScrolledWindow;	957	package CFClient::UI::ScrolledWindow;
880		958
881	our @ISA = CFClient::UI::HBox::;	959	our @ISA = CFClient::UI::HBox::;
882		960
883	sub new {	961	sub new {
884	my $class = shift;	962	my ($class, %arg) = @_;
		963
		964	my $child = delete $arg{child};
885		965
886	my $self;	966	my $self;
887		967
888	my $slider = new CFClient::UI::Slider	968	my $slider = new CFClient::UI::Slider
889	vertical => 1,	969	vertical => 1,
…		…
894	;	974	;
895		975
896	$self = $class->SUPER::new (	976	$self = $class->SUPER::new (
897	vp => (new CFClient::UI::ViewPort expand => 1),	977	vp => (new CFClient::UI::ViewPort expand => 1),
898	slider => $slider,	978	slider => $slider,
899	@_,	979	%arg,
900	);	980	);
901		981
902	$self->{vp}->add ($self->{scrolled});
903	$self->add ($self->{vp});
904	$self->add ($self->{slider});	982	$self->SUPER::add ($self->{vp}, $self->{slider});
		983	$self->add ($child) if $child;
905		984
906	$self	985	$self
		986	}
		987
		988	sub add {
		989	my ($self, $widget) = @_;
		990
		991	$self->{vp}->add ($self->{child} = $widget);
907	}	992	}
908		993
909	sub update {	994	sub update {
910	my ($self) = @_;	995	my ($self) = @_;
911		996
…		…
974		1059
975	our @ISA = CFClient::UI::Bin::;	1060	our @ISA = CFClient::UI::Bin::;
976		1061
977	use CFClient::OpenGL;	1062	use CFClient::OpenGL;
978		1063
979	my @tex =	1064	my $bg =
		1065	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1066	mipmap => 1, wrap => 1;
		1067
		1068	my @border =
980	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1069	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);	1070	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
982		1071
983	sub new {	1072	sub new {
984	my $class = shift;	1073	my ($class, %arg) = @_;
985		1074
986	# TODO: user_x, user_y, overwrite moveto?	1075	my $title = delete $arg{title};
987		1076
988	my $self = $class->SUPER::new (	1077	my $self = $class->SUPER::new (
989	bg => [1, 1, 1, 1],	1078	bg => [1, 1, 1, 1],
990	border_bg => [1, 1, 1, 1],	1079	border_bg => [1, 1, 1, 1],
991	border => 0.6,	1080	border => 0.6,
992	is_toplevel => 1,
993	can_events => 1,	1081	can_events => 1,
994	@_	1082	min_w => 16,
		1083	min_h => 16,
		1084	%arg,
995	);	1085	);
996		1086
997	$self->{title} &&= new CFClient::UI::Label	1087	$self->{title} = new CFClient::UI::Label
998	align => 0,	1088	align => 0,
999	valign => 1,	1089	valign => 1,
1000	text => $self->{title},	1090	text => $title,
1001	fontsize => $self->{border};	1091	fontsize => $self->{border}
		1092	if defined $title;
1002		1093
1003	$self	1094	$self
		1095	}
		1096
		1097	sub add {
		1098	my ($self, @widgets) = @_;
		1099
		1100	$self->SUPER::add (@widgets);
		1101	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1004	}	1102	}
1005		1103
1006	sub border {	1104	sub border {
1007	int $_[0]{border} * $::FONTSIZE	1105	int $_[0]{border} * $::FONTSIZE
1008	}	1106	}
1009		1107
1010	sub size_request {	1108	sub size_request {
1011	my ($self) = @_;	1109	my ($self) = @_;
		1110
		1111	$self->{title}->size_request
		1112	if $self->{title};
1012		1113
1013	my ($w, $h) = $self->SUPER::size_request;	1114	my ($w, $h) = $self->SUPER::size_request;
1014		1115
1015	(	1116	(
1016	$w + $self->border * 2,	1117	$w + $self->border * 2,
…		…
1019	}	1120	}
1020		1121
1021	sub size_allocate {	1122	sub size_allocate {
1022	my ($self, $w, $h) = @_;	1123	my ($self, $w, $h) = @_;
1023		1124
		1125	if ($self->{title}) {
		1126	$self->{title}{w} = $w;
		1127	$self->{title}{h} = $h;
		1128	$self->{title}->size_allocate ($w, $h);
		1129	}
		1130
		1131	my $border = $self->border;
		1132
1024	$h -= List::Util::max 0, $self->border * 2;	1133	$h -= List::Util::max 0, $border * 2;
1025	$w -= List::Util::max 0, $self->border * 2;	1134	$w -= List::Util::max 0, $border * 2;
1026		1135
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);	1136	$self->child->configure ($border, $border, $w, $h);
1031	}	1137	}
1032		1138
1033	sub button_down {	1139	sub button_down {
1034	my ($self, $ev, $x, $y) = @_;	1140	my ($self, $ev, $x, $y) = @_;
1035		1141
…		…
1051	my ($ev, $x, $y) = @_;	1157	my ($ev, $x, $y) = @_;
1052		1158
1053	my $dx = $ev->{x} - $ox;	1159	my $dx = $ev->{x} - $ox;
1054	my $dy = $ev->{y} - $oy;	1160	my $dy = $ev->{y} - $oy;
1055		1161
1056	$self->{user_x} = $wx + $dx * $mx;
1057	$self->{user_y} = $wy + $dy * $my;
1058	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1162	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1059	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1163	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1060	$self->move ($self->{user_x}, $self->{user_y});	1164
1061	$self->check_size;	1165	$self->realloc;
		1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1062	};	1167	};
1063		1168
1064	} elsif ($lr ^ $td) {	1169	} elsif ($lr ^ $td) {
1065	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1170	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1066	my ($bx, $by) = ($self->{x}, $self->{y});	1171	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1068	$self->{motion} = sub {	1173	$self->{motion} = sub {
1069	my ($ev, $x, $y) = @_;	1174	my ($ev, $x, $y) = @_;
1070		1175
1071	($x, $y) = ($ev->{x}, $ev->{y});	1176	($x, $y) = ($ev->{x}, $ev->{y});
1072		1177
1073	$self->{user_x} = $bx + $x - $ox;	1178	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1074	$self->{user_y} = $by + $y - $oy;
1075	$self->move ($self->{user_x}, $self->{user_y});
1076	$self->update;
1077	};	1179	};
		1180	} else {
		1181	return 0;
		1182	}
		1183
1078	}	1184	1
1079	}	1185	}
1080		1186
1081	sub button_up {	1187	sub button_up {
1082	my ($self, $ev, $x, $y) = @_;	1188	my ($self, $ev, $x, $y) = @_;
1083		1189
1084	delete $self->{motion};	1190	!!delete $self->{motion}
1085	}	1191	}
1086		1192
1087	sub mouse_motion {	1193	sub mouse_motion {
1088	my ($self, $ev, $x, $y) = @_;	1194	my ($self, $ev, $x, $y) = @_;
1089		1195
1090	$self->{motion}->($ev, $x, $y) if $self->{motion};	1196	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1197
		1198	!!$self->{motion}
1091	}	1199	}
1092		1200
1093	sub _draw {	1201	sub _draw {
1094	my ($self) = @_;	1202	my ($self) = @_;
1095		1203
		1204	my $child = $self->{children}[0];
		1205
1096	my ($w, $h ) = ($self->{w}, $self->{h});	1206	my ($w, $h ) = ($self->{w}, $self->{h});
1097	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1207	my ($cw, $ch) = ($child->{w}, $child->{h});
1098		1208
1099	glEnable GL_TEXTURE_2D;	1209	glEnable GL_TEXTURE_2D;
1100	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1210	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1101		1211
1102	my $border = $self->border;	1212	my $border = $self->border;
1103		1213
1104	glColor @{ $self->{border_bg} };	1214	glColor @{ $self->{border_bg} };
1105	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1215	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1106	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1216	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1107	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1217	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1108	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1218	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1109		1219
1110	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1220	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1111	my $bg = $tex[0];	1221	glColor @{ $self->{bg} };
1112		1222
1113	# TODO: repeat texture not scale	1223	# TODO: repeat texture not scale
		1224	# solve this better(?)
1114	my $rep_x = $cw / $bg->{w};	1225	$bg->{s} = $cw / $bg->{w};
1115	my $rep_y = $ch / $bg->{h};	1226	$bg->{t} = $ch / $bg->{h};
1116
1117	glColor @{ $self->{bg} };
1118
1119	$bg->{s} = $rep_x;
1120	$bg->{t} = $rep_y;
1121	$bg->{wrap_mode} = 1;
1122	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1227	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1123	}	1228	}
1124		1229
1125	glDisable GL_TEXTURE_2D;	1230	glDisable GL_TEXTURE_2D;
1126		1231
1127	$self->{title}->draw if $self->{title};
1128
1129	$self->child->draw;	1232	$child->draw;
		1233
		1234	if ($self->{title}) {
		1235	glTranslate 0, $border - $self->{h};
		1236	$self->{title}->_draw;
		1237	}
1130	}	1238	}
1131		1239
1132	#############################################################################	1240	#############################################################################
1133		1241
1134	package CFClient::UI::Table;	1242	package CFClient::UI::Table;
…		…
1156	my ($self, $x, $y, $child) = @_;	1264	my ($self, $x, $y, $child) = @_;
1157		1265
1158	$child->set_parent ($self);	1266	$child->set_parent ($self);
1159	$self->{children}[$y][$x] = $child;	1267	$self->{children}[$y][$x] = $child;
1160		1268
1161	$self->check_size (1);	1269	$self->realloc;
1162	}	1270	}
1163		1271
1164	# TODO: move to container class maybe? send children a signal on removal?	1272	# TODO: move to container class maybe? send children a signal on removal?
1165	sub clear {	1273	sub clear {
1166	my ($self) = @_;	1274	my ($self) = @_;
…		…
1171	for (@children) {	1279	for (@children) {
1172	delete $_->{parent};	1280	delete $_->{parent};
1173	$_->hide;	1281	$_->hide;
1174	}	1282	}
1175		1283
1176	$self->check_size (1);	1284	$self->realloc;
1177	$self->update;
1178	}	1285	}
1179		1286
1180	sub get_wh {	1287	sub get_wh {
1181	my ($self) = @_;	1288	my ($self) = @_;
1182		1289
…		…
1278	}	1385	}
1279	}	1386	}
1280		1387
1281	#############################################################################	1388	#############################################################################
1282		1389
1283	package CFClient::UI::HBox;	1390	package CFClient::UI::Box;
1284
1285	# TODO: wrap into common Box base class
1286		1391
1287	our @ISA = CFClient::UI::Container::;	1392	our @ISA = CFClient::UI::Container::;
1288		1393
1289	sub size_request {	1394	sub size_request {
1290	my ($self) = @_;	1395	my ($self) = @_;
1291		1396
1292	my @alloc = map [$_->size_request], @{$self->{children}};	1397	$self->{vertical}
1293		1398	? (
1294	(	1399	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1295	(List::Util::sum map $_->[0], @alloc),	1400	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1296	(List::Util::max map $_->[1], @alloc),	1401	)
1297	)	1402	: (
		1403	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1404	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1405	)
1298	}	1406	}
1299		1407
1300	sub size_allocate {	1408	sub size_allocate {
1301	my ($self, $w, $h) = @_;	1409	my ($self, $w, $h) = @_;
1302		1410
1303	($h, $w) = ($w, $h);	1411	my $space = $self->{vertical} ? $h : $w;
1304
1305	my $children = $self->{children};	1412	my $children = $self->{children};
1306		1413
1307	my @h = map $_->{req_w}, @$children;	1414	my @req;
1308		1415
1309	my $req_h = List::Util::sum @h;	1416	if ($self->{homogeneous}) {
1310		1417	@req = ($space / (@$children || 1)) x @$children;
1311	if ($req_h > $h) {
1312	# ah well, not enough space
1313	$_ *= $h / $req_h for @h;
1314	} else {	1418	} else {
		1419	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1420	my $req = List::Util::sum @req;
		1421
		1422	if ($req > $space) {
		1423	# ah well, not enough space
		1424	$_ *= $space / $req for @req;
		1425	} else {
1315	my $exp = List::Util::sum map $_->{expand}, @$children;	1426	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1316	$exp ||= 1;
1317		1427
		1428	$space = ($space - $req) / $expand; # remaining space to give away
		1429
		1430	$req[$_] += $space * $children->[$_]{expand}
1318	for (0 .. $#$children) {	1431	for 0 .. $#$children;
1319	my $child = $children->[$_];
1320
1321	my $alloc_h = $h[$_];
1322	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1323	$h[$_] = $alloc_h;
1324	}	1432	}
1325	}	1433	}
1326		1434
1327	CFClient::UI::harmonize \@h;	1435	CFClient::UI::harmonize \@req;
1328		1436
1329	my $y = 0;	1437	my $pos = 0;
1330	for (0 .. $#$children) {	1438	for (0 .. $#$children) {
1331	my $child = $children->[$_];
1332	my $h = $h[$_];	1439	my $alloc = $req[$_];
1333	$child->configure ($y, 0, $h, $w);	1440	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1334		1441
1335	$y += $h;	1442	$pos += $alloc;
1336	}	1443	}
1337		1444
1338	1	1445	1
1339	}	1446	}
1340		1447
1341	#############################################################################	1448	#############################################################################
1342		1449
		1450	package CFClient::UI::HBox;
		1451
		1452	our @ISA = CFClient::UI::Box::;
		1453
		1454	sub new {
		1455	my $class = shift;
		1456
		1457	$class->SUPER::new (
		1458	vertical => 0,
		1459	@_,
		1460	)
		1461	}
		1462
		1463	#############################################################################
		1464
1343	package CFClient::UI::VBox;	1465	package CFClient::UI::VBox;
1344		1466
1345	# TODO: wrap into common Box base class
1346
1347	our @ISA = CFClient::UI::Container::;	1467	our @ISA = CFClient::UI::Box::;
1348		1468
1349	sub size_request {	1469	sub new {
1350	my ($self) = @_;	1470	my $class = shift;
1351		1471
1352	my @alloc = map [$_->size_request], @{$self->{children}};	1472	$class->SUPER::new (
1353		1473	vertical => 1,
1354	(	1474	@_,
1355	(List::Util::max map $_->[0], @alloc),
1356	(List::Util::sum map $_->[1], @alloc),
1357	)	1475	)
1358	}
1359
1360	sub size_allocate {
1361	my ($self, $w, $h) = @_;
1362
1363	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1364
1365	my $children = $self->{children};
1366
1367	my @h = map $_->{req_h}, @$children;
1368
1369	my $req_h = List::Util::sum @h;
1370
1371	if ($req_h > $h) {
1372	# ah well, not enough space
1373	$_ *= $h / $req_h for @h;
1374	} else {
1375	my $exp = List::Util::sum map $_->{expand}, @$children;
1376	$exp ||= 1;
1377
1378	for (0 .. $#$children) {
1379	my $child = $children->[$_];
1380
1381	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1382	}
1383	}
1384
1385	CFClient::UI::harmonize \@h;
1386
1387	my $y = 0;
1388	for (0 .. $#$children) {
1389	my $child = $children->[$_];
1390	my $h = $h[$_];
1391	$child->configure (0, $y, $w, $h);
1392
1393	$y += $h;
1394	}
1395
1396	1
1397	}	1476	}
1398		1477
1399	#############################################################################	1478	#############################################################################
1400		1479
1401	package CFClient::UI::Label;	1480	package CFClient::UI::Label;
…		…
1418	ellipsise => 3, # end	1497	ellipsise => 3, # end
1419	layout => (new CFClient::Layout),	1498	layout => (new CFClient::Layout),
1420	fontsize => 1,	1499	fontsize => 1,
1421	align => -1,	1500	align => -1,
1422	valign => -1,	1501	valign => -1,
1423	padding => 2,	1502	padding_x => 2,
		1503	padding_y => 2,
1424	can_events => 0,	1504	can_events => 0,
1425	%arg	1505	%arg
1426	);	1506	);
1427		1507
1428	if (exists $self->{template}) {	1508	if (exists $self->{template}) {
…		…
1464	$self->{text} = "T$text";	1544	$self->{text} = "T$text";
1465		1545
1466	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1546	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1467	$self->{layout}->set_text ($text);	1547	$self->{layout}->set_text ($text);
1468		1548
		1549	$self->realloc;
1469	$self->update;	1550	$self->update;
1470	$self->check_size;
1471	}	1551	}
1472		1552
1473	sub set_markup {	1553	sub set_markup {
1474	my ($self, $markup) = @_;	1554	my ($self, $markup) = @_;
1475		1555
…		…
1479	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1559	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1480		1560
1481	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1561	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1482	$self->{layout}->set_markup ($markup);	1562	$self->{layout}->set_markup ($markup);
1483		1563
		1564	$self->realloc;
1484	$self->update;	1565	$self->update;
1485	$self->check_size;
1486	}	1566	}
1487		1567
1488	sub size_request {	1568	sub size_request {
1489	my ($self) = @_;	1569	my ($self) = @_;
1490		1570
…		…
1504		1584
1505	$w = List::Util::max $w, $w2;	1585	$w = List::Util::max $w, $w2;
1506	$h = List::Util::max $h, $h2;	1586	$h = List::Util::max $h, $h2;
1507	}	1587	}
1508		1588
1509	(	1589	($w, $h)
1510	$w + $self->{padding} * 2,
1511	$h + $self->{padding} * 2,
1512	)
1513	}	1590	}
1514		1591
1515	sub size_allocate {	1592	sub size_allocate {
1516	my ($self, $w, $h) = @_;	1593	my ($self, $w, $h) = @_;
1517		1594
		1595	delete $self->{ox};
		1596
1518	delete $self->{texture};	1597	delete $self->{texture}
		1598	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1519	}	1599	}
1520		1600
1521	sub set_fontsize {	1601	sub set_fontsize {
1522	my ($self, $fontsize) = @_;	1602	my ($self, $fontsize) = @_;
1523		1603
1524	$self->{fontsize} = $fontsize;	1604	$self->{fontsize} = $fontsize;
1525	delete $self->{texture};	1605	delete $self->{texture};
1526		1606
1527	$self->update;	1607	$self->realloc;
1528	$self->check_size;
1529	}	1608	}
1530		1609
1531	sub _draw {	1610	sub _draw {
1532	my ($self) = @_;	1611	my ($self) = @_;
1533		1612
…		…
1539	$self->{layout}->set_width ($self->{w});	1618	$self->{layout}->set_width ($self->{w});
1540	$self->{layout}->set_ellipsise ($self->{ellipsise});	1619	$self->{layout}->set_ellipsise ($self->{ellipsise});
1541	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1620	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1542	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1621	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1543		1622
1544	my $tex = new_from_layout CFClient::Texture $self->{layout};	1623	new_from_layout CFClient::Texture $self->{layout}
		1624	};
1545		1625
		1626	unless (exists $self->{ox}) {
1546	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1627	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1547	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1628	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1548	: ($self->{w} - $tex->{w}) * 0.5);	1629	: ($self->{w} - $tex->{w}) * 0.5);
1549		1630
1550	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1631	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1551	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1632	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1552	: ($self->{h} - $tex->{h}) * 0.5);	1633	: ($self->{h} - $tex->{h}) * 0.5);
1553
1554	$tex
1555	};	1634	};
1556		1635
1557	glEnable GL_TEXTURE_2D;	1636	glEnable GL_TEXTURE_2D;
1558	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1637	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1559		1638
…		…
1613	sub set_text {	1692	sub set_text {
1614	my ($self, $text) = @_;	1693	my ($self, $text) = @_;
1615		1694
1616	$self->{cursor} = length $text;	1695	$self->{cursor} = length $text;
1617	$self->_set_text ($text);	1696	$self->_set_text ($text);
1618	$self->update;	1697
1619	$self->check_size;	1698	$self->realloc;
1620	}	1699	}
1621		1700
1622	sub get_text {	1701	sub get_text {
1623	$_[0]{text}	1702	$_[0]{text}
1624	}	1703	}
…		…
1654	$self->{cursor} = length $text;	1733	$self->{cursor} = length $text;
1655	} elsif ($uni == 27) {	1734	} elsif ($uni == 27) {
1656	$self->_emit ('escape');	1735	$self->_emit ('escape');
1657	} elsif ($uni) {	1736	} elsif ($uni) {
1658	substr $text, $self->{cursor}++, 0, chr $uni;	1737	substr $text, $self->{cursor}++, 0, chr $uni;
		1738	} else {
		1739	return 0;
1659	}	1740	}
1660		1741
1661	$self->_set_text ($text);	1742	$self->_set_text ($text);
1662	$self->update;	1743
1663	$self->check_size;	1744	$self->realloc;
		1745
		1746	1
1664	}	1747	}
1665		1748
1666	sub focus_in {	1749	sub focus_in {
1667	my ($self) = @_;	1750	my ($self) = @_;
1668		1751
…		…
1683	utf8::encode $text;	1766	utf8::encode $text;
1684	$self->{cursor} = length substr $text, 0, $idx;	1767	$self->{cursor} = length substr $text, 0, $idx;
1685		1768
1686	$self->_set_text ($self->{text});	1769	$self->_set_text ($self->{text});
1687	$self->update;	1770	$self->update;
		1771
		1772	1
1688	}	1773	}
1689		1774
1690	sub mouse_motion {	1775	sub mouse_motion {
1691	my ($self, $ev, $x, $y) = @_;	1776	my ($self, $ev, $x, $y) = @_;
1692	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1777	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1778
		1779	0
1693	}	1780	}
1694		1781
1695	sub _draw {	1782	sub _draw {
1696	my ($self) = @_;	1783	my ($self) = @_;
1697		1784
…		…
1774	} else {	1861	} else {
1775	$self->set_text ($self->{history_saveback});	1862	$self->set_text ($self->{history_saveback});
1776	}	1863	}
1777		1864
1778	} else {	1865	} else {
1779	$self->SUPER::key_down ($ev);	1866	return $self->SUPER::key_down ($ev)
		1867	}
		1868
1780	}	1869	1
1781
1782	}	1870	}
1783		1871
1784	#############################################################################	1872	#############################################################################
1785		1873
1786	package CFClient::UI::Button;	1874	package CFClient::UI::Button;
…		…
1795		1883
1796	sub new {	1884	sub new {
1797	my $class = shift;	1885	my $class = shift;
1798		1886
1799	$class->SUPER::new (	1887	$class->SUPER::new (
1800	padding => 4,	1888	padding_x => 4,
		1889	padding_y => 4,
1801	fg => [1, 1, 1],	1890	fg => [1, 1, 1],
1802	active_fg => [0, 0, 1],	1891	active_fg => [0, 0, 1],
1803	can_hover => 1,	1892	can_hover => 1,
1804	align => 0,	1893	align => 0,
1805	valign => 0,	1894	valign => 0,
…		…
1814	my ($self, $ev, $x, $y) = @_;	1903	my ($self, $ev, $x, $y) = @_;
1815		1904
1816	$self->emit ("activate")	1905	$self->emit ("activate")
1817	if $x >= 0 && $x < $self->{w}	1906	if $x >= 0 && $x < $self->{w}
1818	&& $y >= 0 && $y < $self->{h};	1907	&& $y >= 0 && $y < $self->{h};
		1908
		1909	1
1819	}	1910	}
1820		1911
1821	sub _draw {	1912	sub _draw {
1822	my ($self) = @_;	1913	my ($self) = @_;
1823		1914
…		…
1852		1943
1853	sub new {	1944	sub new {
1854	my $class = shift;	1945	my $class = shift;
1855		1946
1856	$class->SUPER::new (	1947	$class->SUPER::new (
1857	padding => 2,	1948	padding_x => 2,
		1949	padding_y => 2,
1858	fg => [1, 1, 1],	1950	fg => [1, 1, 1],
1859	active_fg => [1, 1, 0],	1951	active_fg => [1, 1, 0],
1860	bg => [0, 0, 0, 0.2],	1952	bg => [0, 0, 0, 0.2],
1861	active_bg => [1, 1, 1, 0.5],	1953	active_bg => [1, 1, 1, 0.5],
1862	state => 0,	1954	state => 0,
…		…
1866	}	1958	}
1867		1959
1868	sub size_request {	1960	sub size_request {
1869	my ($self) = @_;	1961	my ($self) = @_;
1870		1962
1871	($self->{padding} * 2 + 6) x 2	1963	(6) x 2
1872	}	1964	}
1873		1965
1874	sub button_down {	1966	sub button_down {
1875	my ($self, $ev, $x, $y) = @_;	1967	my ($self, $ev, $x, $y) = @_;
1876		1968
1877	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1969	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1878	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1970	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1879	$self->{state} = !$self->{state};	1971	$self->{state} = !$self->{state};
1880	$self->_emit (changed => $self->{state});	1972	$self->_emit (changed => $self->{state});
		1973	} else {
		1974	return 0
		1975	}
		1976
1881	}	1977	1
1882	}	1978	}
1883		1979
1884	sub _draw {	1980	sub _draw {
1885	my ($self) = @_;	1981	my ($self) = @_;
1886		1982
1887	$self->SUPER::_draw;	1983	$self->SUPER::_draw;
1888		1984
1889	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1985	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1890		1986
1891	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1987	my ($w, $h) = @$self{qw(w h)};
		1988
		1989	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1892		1990
1893	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1991	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1894		1992
1895	my $tex = $self->{state} ? $tex[1] : $tex[0];	1993	my $tex = $self->{state} ? $tex[1] : $tex[0];
1896		1994
…		…
2161	fg => [1, 1, 1],	2259	fg => [1, 1, 1],
2162	active_fg => [0, 0, 0],	2260	active_fg => [0, 0, 0],
2163	bg => [0, 0, 0, 0.2],	2261	bg => [0, 0, 0, 0.2],
2164	active_bg => [1, 1, 1, 0.5],	2262	active_bg => [1, 1, 1, 0.5],
2165	range => [0, 0, 100, 10, 0],	2263	range => [0, 0, 100, 10, 0],
2166	req_w => $::WIDTH / 80,	2264	min_w => $::WIDTH / 80,
2167	req_h => $::WIDTH / 80,	2265	min_h => $::WIDTH / 80,
2168	vertical => 0,	2266	vertical => 0,
2169	can_hover => 1,	2267	can_hover => 1,
2170	inner_pad => 0.02,	2268	inner_pad => 0.02,
2171	@_	2269	@_
2172	);	2270	);
…		…
2175	$self->update;	2273	$self->update;
2176		2274
2177	$self	2275	$self
2178	}	2276	}
2179		2277
		2278	sub changed { }
		2279
2180	sub set_range {	2280	sub set_range {
2181	my ($self, $range) = @_;	2281	my ($self, $range) = @_;
2182		2282
2183	($range, $self->{range}) = ($self->{range}, $range);	2283	($range, $self->{range}) = ($self->{range}, $range);
2184		2284
…		…
2210	}	2310	}
2211		2311
2212	sub size_request {	2312	sub size_request {
2213	my ($self) = @_;	2313	my ($self) = @_;
2214		2314
2215	my $w = $self->{req_w};	2315	($self->{req_w}, $self->{req_h})
2216	my $h = $self->{req_h};
2217
2218	$self->{vertical} ? ($h, $w) : ($w, $h)
2219	}	2316	}
2220		2317
2221	sub button_down {	2318	sub button_down {
2222	my ($self, $ev, $x, $y) = @_;	2319	my ($self, $ev, $x, $y) = @_;
2223		2320
2224	$self->SUPER::button_down ($ev, $x, $y);	2321	$self->SUPER::button_down ($ev, $x, $y);
2225		2322
2226	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2323	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227		2324
2228	$self->mouse_motion ($ev, $x, $y);	2325	$self->mouse_motion ($ev, $x, $y)
2229	}	2326	}
2230		2327
2231	sub mouse_motion {	2328	sub mouse_motion {
2232	my ($self, $ev, $x, $y) = @_;	2329	my ($self, $ev, $x, $y) = @_;
2233		2330
…		…
2237	my (undef, $lo, $hi, $page) = @{$self->{range}};	2334	my (undef, $lo, $hi, $page) = @{$self->{range}};
2238		2335
2239	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2336	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240		2337
2241	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2338	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2339	} else {
		2340	return 0;
		2341	}
		2342
2242	}	2343	1
2243	}	2344	}
2244		2345
2245	sub update {	2346	sub update {
2246	my ($self) = @_;	2347	my ($self) = @_;
2247		2348
2248	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2349	delete $self->{knob_w};
		2350	$self->SUPER::update;
		2351	}
		2352
		2353	sub _draw {
		2354	my ($self) = @_;
		2355
		2356	unless ($self->{knob_w}) {
2249	$self->set_value ($self->{range}[0]);	2357	$self->set_value ($self->{range}[0]);
2250		2358
2251	my ($value, $lo, $hi, $page) = @{$self->{range}};	2359	my ($value, $lo, $hi, $page) = @{$self->{range}};
2252	my $range = ($hi - $page - $lo) || 1e-100;	2360	my $range = ($hi - $page - $lo) || 1e-100;
2253		2361
…		…
2259	$value = ($value - $lo) / $range;	2367	$value = ($value - $lo) / $range;
2260	$value = $value * $self->{scale} + $self->{offset};	2368	$value = $value * $self->{scale} + $self->{offset};
2261		2369
2262	$self->{knob_x} = $value - $knob_w * 0.5;	2370	$self->{knob_x} = $value - $knob_w * 0.5;
2263	$self->{knob_w} = $knob_w;	2371	$self->{knob_w} = $knob_w;
2264	});	2372	}
2265
2266	$self->SUPER::update;
2267	}
2268
2269	sub _draw {
2270	my ($self) = @_;
2271		2373
2272	$self->SUPER::_draw ();	2374	$self->SUPER::_draw ();
2273		2375
2274	glScale $self->{w}, $self->{h};	2376	glScale $self->{w}, $self->{h};
2275		2377
…		…
2579	state => 0,	2681	state => 0,
2580	on_activate => \&toggle_flopper,	2682	on_activate => \&toggle_flopper,
2581	@_	2683	@_
2582	);	2684	);
2583		2685
2584	if ($self->{state}) {
2585	$self->{state} = 0;
2586	$self->toggle_flopper;
2587	}
2588
2589	$self	2686	$self
2590	}	2687	}
2591		2688
2592	sub toggle_flopper {	2689	sub toggle_flopper {
2593	my ($self) = @_;	2690	my ($self) = @_;
2594		2691
2595	# TODO: use animation	2692	$self->{other}->toggle_visibility;
2596	if ($self->{state} = !$self->{state}) {
2597	$CFClient::UI::ROOT->add ($self->{other});
2598	$self->{other}->move ($self->coord2global (0, $self->{h}));
2599	$self->_emit ("open");
2600	} else {
2601	$CFClient::UI::ROOT->remove ($self->{other});
2602	$self->_emit ("close");
2603	}
2604
2605	$self->_emit (changed => $self->{state});
2606	}	2693	}
2607		2694
2608	#############################################################################	2695	#############################################################################
2609		2696
2610	package CFClient::UI::Tooltip;	2697	package CFClient::UI::Tooltip;
…		…
2623	}	2710	}
2624		2711
2625	sub set_tooltip_from {	2712	sub set_tooltip_from {
2626	my ($self, $widget) = @_;	2713	my ($self, $widget) = @_;
2627		2714
		2715	my $tooltip = $widget->{tooltip};
		2716
		2717	if ($ENV{CFPLUS_DEBUG} & 2) {
		2718	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2719	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2720	. "req $widget->{req_w} $widget->{req_h}\n"
		2721	. "visible $widget->{visible}";
		2722	}
		2723
2628	$self->add (new CFClient::UI::Label	2724	$self->add (new CFClient::UI::Label
2629	markup => $widget->{tooltip},	2725	markup => $tooltip,
2630	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2726	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2631	fontsize => 0.8,	2727	fontsize => 0.8,
2632	fg => [0, 0, 0, 1],	2728	fg => [0, 0, 0, 1],
2633	ellipsise => 0,	2729	ellipsise => 0,
2634	font => ($widget->{tooltip_font} || $::FONT_PROP),	2730	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2645		2741
2646	sub size_allocate {	2742	sub size_allocate {
2647	my ($self, $w, $h) = @_;	2743	my ($self, $w, $h) = @_;
2648		2744
2649	$self->SUPER::size_allocate ($w - 4, $h - 4);	2745	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2746	}
		2747
		2748	sub visibility_change {
		2749	my ($self, $visible) = @_;
		2750
		2751	return unless $visible;
		2752
		2753	$self->{root}->on_post_alloc ("move_$self" => sub {
		2754	my $widget = $self->{owner}
		2755	or return;
		2756
		2757	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2758
		2759	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2760	if $x + $self->{w} > $::WIDTH;
		2761
		2762	$self->move_abs ($x, $y);
		2763	});
2650	}	2764	}
2651		2765
2652	sub _draw {	2766	sub _draw {
2653	my ($self) = @_;	2767	my ($self) = @_;
2654		2768
…		…
2671	glVertex $w, $h;	2785	glVertex $w, $h;
2672	glVertex $w, 0;	2786	glVertex $w, 0;
2673	glEnd;	2787	glEnd;
2674		2788
2675	glTranslate 2 - 0.375, 2 - 0.375;	2789	glTranslate 2 - 0.375, 2 - 0.375;
		2790
2676	$self->SUPER::_draw;	2791	$self->SUPER::_draw;
2677	}	2792	}
2678		2793
2679	#############################################################################	2794	#############################################################################
2680		2795
…		…
2756	$self->SUPER::DESTROY;	2871	$self->SUPER::DESTROY;
2757	}	2872	}
2758		2873
2759	#############################################################################	2874	#############################################################################
2760		2875
2761	package CFClient::UI::Inventory;	2876	package CFClient::UI::Buttonbar;
2762		2877
2763	our @ISA = CFClient::UI::ScrolledWindow::;	2878	our @ISA = CFClient::UI::HBox::;
2764		2879
2765	sub new {	2880	# TODO: should actualyl wrap buttons and other goodies.
2766	my $class = shift;
2767
2768	my $self = $class->SUPER::new (
2769	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2770	@_,
2771	);
2772
2773	$self
2774	}
2775
2776	sub set_items {
2777	my ($self, $items) = @_;
2778
2779	$self->{scrolled}->clear;
2780	return unless $items;
2781
2782	my @items = sort {
2783	($a->{type} <=> $b->{type})
2784	or ($a->{name} cmp $b->{name})
2785	} @$items;
2786
2787	$self->{real_items} = \@items;
2788
2789	my $row = 0;
2790	for my $item (@items) {
2791	CFClient::Item::update_widgets $item;
2792
2793	$self->{scrolled}->add (0, $row, $item->{face_widget});
2794	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2795	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2796
2797	$row++;
2798	}
2799	}
2800
2801	sub size_request {
2802	my ($self) = @_;
2803	($self->{req_w}, $self->{req_h});
2804	}
2805		2881
2806	#############################################################################	2882	#############################################################################
2807		2883
2808	package CFClient::UI::Menu;	2884	package CFClient::UI::Menu;
2809		2885
…		…
2850	# maybe save $GRAB? must be careful about events...	2926	# maybe save $GRAB? must be careful about events...
2851	$GRAB = $self;	2927	$GRAB = $self;
2852	$self->{button} = $ev->{button};	2928	$self->{button} = $ev->{button};
2853		2929
2854	$self->show;	2930	$self->show;
2855	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2931	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2856	}	2932	}
2857		2933
2858	sub mouse_motion {	2934	sub mouse_motion {
2859	my ($self, $ev, $x, $y) = @_;	2935	my ($self, $ev, $x, $y) = @_;
2860		2936
2861	# TODO: should use vbox->find_widget or so	2937	# TODO: should use vbox->find_widget or so
2862	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2938	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2863	$self->{hover} = $self->{item}{$HOVER};	2939	$self->{hover} = $self->{item}{$HOVER};
		2940
		2941	0
2864	}	2942	}
2865		2943
2866	sub button_up {	2944	sub button_up {
2867	my ($self, $ev, $x, $y) = @_;	2945	my ($self, $ev, $x, $y) = @_;
2868		2946
…		…
2870	undef $GRAB;	2948	undef $GRAB;
2871	$self->hide;	2949	$self->hide;
2872		2950
2873	$self->_emit ("popdown");	2951	$self->_emit ("popdown");
2874	$self->{hover}[1]->() if $self->{hover};	2952	$self->{hover}[1]->() if $self->{hover};
		2953	} else {
		2954	return 0
		2955	}
		2956
		2957	1
		2958	}
		2959
		2960	#############################################################################
		2961
		2962	package CFClient::UI::Multiplexer;
		2963
		2964	our @ISA = CFClient::UI::Container::;
		2965
		2966	sub new {
		2967	my $class = shift;
		2968
		2969	my $self = $class->SUPER::new (
		2970	@_,
		2971	);
		2972
		2973	$self->{current} = $self->{children}[0]
		2974	if @{ $self->{children} };
		2975
		2976	$self
		2977	}
		2978
		2979	sub add {
		2980	my ($self, @widgets) = @_;
		2981
		2982	$self->SUPER::add (@widgets);
		2983
		2984	$self->{current} = $self->{children}[0]
		2985	if @{ $self->{children} };
		2986	}
		2987
		2988	sub set_current_page {
		2989	my ($self, $page_or_widget) = @_;
		2990
		2991	my $widget = ref $page_or_widget
		2992	? $page_or_widget
		2993	: $self->{children}[$page_or_widget];
		2994
		2995	$self->{current} = $widget;
		2996	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2997
		2998	$self->_emit (page_changed => $self->{current});
		2999
		3000	$self->realloc;
		3001	}
		3002
		3003	sub visible_children {
		3004	$_[0]{current}
		3005	}
		3006
		3007	sub size_request {
		3008	my ($self) = @_;
		3009
		3010	$self->{current}->size_request
		3011	}
		3012
		3013	sub size_allocate {
		3014	my ($self, $w, $h) = @_;
		3015
		3016	$self->{current}->configure (0, 0, $w, $h);
		3017	}
		3018
		3019	sub _draw {
		3020	my ($self) = @_;
		3021
		3022	$self->{current}->draw;
		3023	}
		3024
		3025	#############################################################################
		3026
		3027	package CFClient::UI::Notebook;
		3028
		3029	our @ISA = CFClient::UI::VBox::;
		3030
		3031	sub new {
		3032	my $class = shift;
		3033
		3034	my $self = $class->SUPER::new (
		3035	buttonbar => (new CFClient::UI::Buttonbar),
		3036	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3037	# filter => # will be put between multiplexer and $self
		3038	@_,
		3039	);
2875	}	3040
		3041	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3042	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3043
		3044	$self
		3045	}
		3046
		3047	sub add {
		3048	my ($self, $title, $widget, $tooltip) = @_;
		3049
		3050	Scalar::Util::weaken $self;
		3051
		3052	$self->{buttonbar}->add (new CFClient::UI::Button
		3053	markup => $title,
		3054	tooltip => $tooltip,
		3055	on_activate => sub { $self->set_current_page ($widget) },
		3056	);
		3057
		3058	$self->{multiplexer}->add ($widget);
		3059	}
		3060
		3061	sub set_current_page {
		3062	my ($self, $page) = @_;
		3063
		3064	$self->{multiplexer}->set_current_page ($page);
		3065	$self->_emit (page_changed => $self->{multiplexer}{current});
2876	}	3066	}
2877		3067
2878	#############################################################################	3068	#############################################################################
2879		3069
2880	package CFClient::UI::Statusbox;	3070	package CFClient::UI::Statusbox;
…		…
2985	$self->SUPER::reconfigure;	3175	$self->SUPER::reconfigure;
2986	}	3176	}
2987		3177
2988	#############################################################################	3178	#############################################################################
2989		3179
2990	package CFClient::UI::Root;	3180	package CFClient::UI::Inventory;
2991		3181
2992	our @ISA = CFClient::UI::Container::;	3182	our @ISA = CFClient::UI::ScrolledWindow::;
2993
2994	use CFClient::OpenGL;
2995		3183
2996	sub new {	3184	sub new {
2997	my $class = shift;	3185	my $class = shift;
2998		3186
2999	$class->SUPER::new (	3187	my $self = $class->SUPER::new (
		3188	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3189	@_,
		3190	);
		3191
		3192	$self
		3193	}
		3194
		3195	sub set_items {
		3196	my ($self, $items) = @_;
		3197
		3198	$self->{child}->clear;
		3199	return unless $items;
		3200
		3201	my @items = sort {
		3202	($a->{type} <=> $b->{type})
		3203	or ($a->{name} cmp $b->{name})
		3204	} @$items;
		3205
		3206	$self->{real_items} = \@items;
		3207
		3208	my $row = 0;
		3209	for my $item (@items) {
		3210	CFClient::Item::update_widgets $item;
		3211
		3212	$self->{child}->add (0, $row, $item->{face_widget});
		3213	$self->{child}->add (1, $row, $item->{desc_widget});
		3214	$self->{child}->add (2, $row, $item->{weight_widget});
		3215
		3216	$row++;
		3217	}
		3218	}
		3219
		3220	#############################################################################
		3221
		3222	package CFClient::UI::BindEditor;
		3223
		3224	our @ISA = CFClient::UI::FancyFrame::;
		3225
		3226	sub new {
		3227	my $class = shift;
		3228
		3229	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3230
		3231	$self->add (my $vb = new CFClient::UI::VBox);
		3232
		3233
		3234	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3235	text => "start recording",
		3236	tooltip => "Start/Stops recording of actions."
		3237	."All subsequent actions after the recording started will be captured."
		3238	."The actions are displayed after the record was stopped."
		3239	."To bind the action you have to click on the 'Bind' button",
		3240	on_activate => sub {
		3241	unless ($self->{recording}) {
		3242	$self->start;
		3243	} else {
		3244	$self->stop;
		3245	}
		3246	});
		3247
		3248	$vb->add (new CFClient::UI::Label text => "Actions:");
		3249	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3250
		3251	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3252	$vb->add (my $hb = new CFClient::UI::HBox);
		3253	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3254	$hb->add (new CFClient::UI::Button
		3255	text => "bind",
		3256	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3257	on_activate => sub {
		3258	$self->ask_for_bind;
		3259	});
		3260
		3261	$vb->add (my $hb = new CFClient::UI::HBox);
		3262	$hb->add (new CFClient::UI::Button
		3263	text => "ok",
		3264	expand => 1,
		3265	tooltip => "This closes the binding editor and saves the binding",
		3266	on_activate => sub {
		3267	$self->hide;
		3268	$self->commit;
		3269	});
		3270
		3271	$hb->add (new CFClient::UI::Button
		3272	text => "cancel",
		3273	expand => 1,
		3274	tooltip => "This closes the binding editor without saving",
		3275	on_activate => sub {
		3276	$self->hide;
		3277	$self->{binding_cancel}->()
		3278	if $self->{binding_cancel};
		3279	});
		3280
		3281	$self->update_binding_widgets;
		3282
		3283	$self
		3284	}
		3285
		3286	sub commit {
		3287	my ($self) = @_;
		3288	my ($mod, $sym, $cmds) = $self->get_binding;
		3289	if ($sym != 0 && @$cmds > 0) {
		3290	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3291	."'. Don't forget 'Save Config'!");
		3292	$self->{binding_change}->($mod, $sym, $cmds)
		3293	if $self->{binding_change};
		3294	} else {
		3295	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3296	$self->{binding_cancel}->()
		3297	if $self->{binding_cancel};
		3298	}
		3299	}
		3300
		3301	sub start {
		3302	my ($self) = @_;
		3303
		3304	$self->{rec_btn}->set_text ("stop recording");
		3305	$self->{recording} = 1;
		3306	$self->clear_command_list;
		3307	$::CONN->start_record if $::CONN;
		3308	}
		3309
		3310	sub stop {
		3311	my ($self) = @_;
		3312
		3313	$self->{rec_btn}->set_text ("start recording");
		3314	$self->{recording} = 0;
		3315
		3316	my $rec;
		3317	$rec = $::CONN->stop_record if $::CONN;
		3318	return unless ref $rec eq 'ARRAY';
		3319	$self->set_command_list ($rec);
		3320	}
		3321
		3322
		3323	sub ask_for_bind_and_commit {
		3324	my ($self) = @_;
		3325	$self->ask_for_bind (1);
		3326	}
		3327
		3328	sub ask_for_bind {
		3329	my ($self, $commit) = @_;
		3330
		3331	CFClient::Binder::open_binding_dialog (sub {
		3332	my ($mod, $sym) = @_;
		3333	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3334	$self->update_binding_widgets;
		3335	$self->commit if $commit;
		3336	});
		3337	}
		3338
		3339	# $mod and $sym are the modifiers and key symbol
		3340	# $cmds is a array ref of strings (the commands)
		3341	# $cb is the callback that is executed on OK
		3342	# $ccb is the callback that is executed on CANCEL and
		3343	# when the binding was unsuccessful on OK
		3344	sub set_binding {
		3345	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3346
		3347	$self->clear_command_list;
		3348	$self->{recording} = 0;
		3349	$self->{rec_btn}->set_text ("start recording");
		3350
		3351	$self->{binding} = [$mod, $sym];
		3352	$self->{commands} = $cmds;
		3353
		3354	$self->{binding_change} = $cb;
		3355	$self->{binding_cancel} = $ccb;
		3356
		3357	$self->update_binding_widgets;
		3358	}
		3359
		3360	# this is a shortcut method that asks for a binding
		3361	# and then just binds it.
		3362	sub do_quick_binding {
		3363	my ($self, $cmds) = @_;
		3364	$self->set_binding (undef, undef, $cmds, sub {
		3365	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3366	});
		3367	$self->ask_for_bind (1);
		3368	}
		3369
		3370	sub update_binding_widgets {
		3371	my ($self) = @_;
		3372	my ($mod, $sym, $cmds) = $self->get_binding;
		3373	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3374	$self->set_command_list ($cmds);
		3375	}
		3376
		3377	sub get_binding {
		3378	my ($self) = @_;
		3379	return (
		3380	$self->{binding}->[0],
		3381	$self->{binding}->[1],
		3382	[ grep { defined $_ } @{$self->{commands}} ]
		3383	);
		3384	}
		3385
		3386	sub clear_command_list {
		3387	my ($self) = @_;
		3388	$self->{cmdbox}->clear ();
		3389	}
		3390
		3391	sub set_command_list {
		3392	my ($self, $cmds) = @_;
		3393
		3394	$self->{cmdbox}->clear ();
		3395	$self->{commands} = $cmds;
		3396
		3397	my $idx = 0;
		3398
		3399	for (@$cmds) {
		3400	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3401
		3402	my $i = $idx;
		3403	$hb->add (new CFClient::UI::Label text => $_);
		3404	$hb->add (new CFClient::UI::Button
		3405	text => "delete",
		3406	tooltip => "Deletes the action from the record",
		3407	on_activate => sub {
		3408	$self->{cmdbox}->remove ($hb);
		3409	$cmds->[$i] = undef;
		3410	});
		3411
		3412
		3413	$idx++
		3414	}
		3415	}
		3416
		3417	#############################################################################
		3418
		3419	package CFClient::UI::SpellList;
		3420
		3421	our @ISA = CFClient::UI::Table::;
		3422
		3423	sub new {
		3424	my $class = shift;
		3425
		3426	my $self = $class->SUPER::new (
		3427	binding => [],
		3428	commands => [],
		3429	@_,
		3430	)
		3431	}
		3432
		3433	# XXX: Do sorting? Argl...
		3434	sub add_spell {
		3435	my ($self, $spell) = @_;
		3436	$self->{spells}->{$spell->{name}} = $spell;
		3437
		3438	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3439	face => $spell->{face},
		3440	can_hover => 1,
		3441	can_events => 1,
		3442	tooltip => $spell->{message});
		3443
		3444	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3445	text => $spell->{name},
		3446	can_hover => 1,
		3447	can_events => 1,
		3448	tooltip => $spell->{message},
		3449	expand => 1);
		3450
		3451	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3452	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3453	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3454	expand => 1);
		3455
		3456	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3457	text => "bind to key",
		3458	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3459	}
		3460
		3461	sub rebuild_spell_list {
		3462	my ($self) = @_;
		3463	$self->{tbl_idx} = 0;
		3464	$self->add_spell ($_) for values %{$self->{spells}};
		3465	}
		3466
		3467	sub remove_spell {
		3468	my ($self, $spell) = @_;
		3469	delete $self->{spells}->{$spell->{name}};
		3470	$self->rebuild_spell_list;
		3471	}
		3472
		3473	#############################################################################
		3474
		3475	package CFClient::UI::Root;
		3476
		3477	our @ISA = CFClient::UI::Container::;
		3478
		3479	use CFClient::OpenGL;
		3480
		3481	sub new {
		3482	my $class = shift;
		3483
		3484	my $self = $class->SUPER::new (
3000	visible => 1,	3485	visible => 1,
3001	@_,	3486	@_,
3002	)	3487	);
3003	}
3004		3488
3005	sub configure {	3489	Scalar::Util::weaken ($self->{root} = $self);
3006	my ($self, $x, $y, $w, $h) = @_;
3007		3490
3008	$self->{w} = $w;	3491	$self
3009	$self->{h} = $h;
3010	}
3011
3012	sub check_size {
3013	my ($self) = @_;
3014
3015	$self->size_allocate ($self->{w}, $self->{h})
3016	if $self->{w};
3017	}	3492	}
3018		3493
3019	sub size_request {	3494	sub size_request {
3020	my ($self) = @_;	3495	my ($self) = @_;
3021		3496
3022	($self->{w}, $self->{h})	3497	($self->{w}, $self->{h})
		3498	}
		3499
		3500	sub _to_pixel {
		3501	my ($coord, $size, $max) = @_;
		3502
		3503	$coord =
		3504	$coord eq "center" ? ($max - $size) * 0.5
		3505	: $coord eq "max" ? $max
		3506	: $coord;
		3507
		3508	$coord = 0 if $coord < 0;
		3509	$coord = $max - $size if $coord > $max - $size;
		3510
		3511	int $coord + 0.5
3023	}	3512	}
3024		3513
3025	sub size_allocate {	3514	sub size_allocate {
3026	my ($self, $w, $h) = @_;	3515	my ($self, $w, $h) = @_;
3027		3516
3028	for my $child ($self->children) {	3517	for my $child ($self->children) {
3029	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3518	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3030		3519
3031	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3520	$X = $child->{force_x} if exists $child->{force_x};
3032	if exists $child->{req_x};	3521	$Y = $child->{force_y} if exists $child->{force_y};
3033		3522
3034	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3523	$X = _to_pixel $X, $W, $self->{w};
3035	if exists $child->{req_y};	3524	$Y = _to_pixel $Y, $H, $self->{h};
3036
3037	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3038	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039		3525
3040	$child->configure ($X, $Y, $W, $H);	3526	$child->configure ($X, $Y, $W, $H);
3041	}	3527	}
3042	}	3528	}
3043		3529
…		…
3054	}	3540	}
3055		3541
3056	sub update {	3542	sub update {
3057	my ($self) = @_;	3543	my ($self) = @_;
3058		3544
3059	$self->check_size;
3060	$::WANT_REFRESH++;	3545	$::WANT_REFRESH++;
3061	}	3546	}
3062		3547
3063	sub add {	3548	sub add {
3064	my ($self, @children) = @_;	3549	my ($self, @children) = @_;
3065		3550
3066	for (my @widgets = @children; my $w = pop @widgets; ) {
3067	push @widgets, $w->children;
3068	$w->{root} = $self;
3069	$w->{visible} = $self->{visible} + 1;
3070	}
3071
3072	for my $child (@children) {
3073	$child->{is_toplevel} = 1;	3551	$_->{is_toplevel} = 1
3074		3552	for @children;
3075	# integerise window positions
3076	$child->{x} = int $child->{x};
3077	$child->{y} = int $child->{y};
3078	}
3079		3553
3080	$self->SUPER::add (@children);	3554	$self->SUPER::add (@children);
3081	}	3555	}
3082		3556
3083	sub remove {	3557	sub remove {
3084	my ($self, @children) = @_;	3558	my ($self, @children) = @_;
3085		3559
3086	$self->SUPER::remove (@children);	3560	$self->SUPER::remove (@children);
		3561
		3562	delete $self->{is_toplevel}
		3563	for @children;
3087		3564
3088	while (@children) {	3565	while (@children) {
3089	my $w = pop @children;	3566	my $w = pop @children;
3090	push @children, $w->children;	3567	push @children, $w->children;
3091	$w->set_invisible;	3568	$w->set_invisible;
…		…
3110	while ($self->{refresh_hook}) {	3587	while ($self->{refresh_hook}) {
3111	$_->()	3588	$_->()
3112	for values %{delete $self->{refresh_hook}};	3589	for values %{delete $self->{refresh_hook}};
3113	}	3590	}
3114		3591
3115	if ($self->{check_size}) {	3592	if ($self->{realloc}) {
		3593	my %queue;
3116	my @queue;	3594	my @queue;
		3595	my $widget;
3117		3596
3118	for (;;) {	3597	outer:
3119	if ($self->{check_size}) {	3598	while () {
3120	#TODO use array-of-depth approach	3599	if (my $realloc = delete $self->{realloc}) {
		3600	for $widget (values %$realloc) {
		3601	$widget->{visible} or next; # do not resize invisible widgets
3121		3602
3122	@queue = sort { $a->{visible} <=> $b->{visible} }	3603	$queue{$widget+0}++ and next; # duplicates are common
3123	@queue, values %{delete $self->{check_size}};	3604
		3605	push @{ $queue[$widget->{visible}] }, $widget;
		3606	}
3124	}	3607	}
3125		3608
		3609	while () {
		3610	@queue or last outer;
		3611
3126	my $widget = pop @queue || last;	3612	$widget = pop @{ $queue[-1] || [] }
3127		3613	and last;
3128	defined $widget->{visible} or last; # do not resize invisible widgets
3129
3130	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3131	? @$widget{qw(user_w user_h)}
3132	: $widget->size_request;
3133
3134	if (delete $widget->{force_alloc}
3135	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3136	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3137		3614
		3615	pop @queue;
		3616	}
		3617
		3618	delete $queue{$widget+0};
		3619
		3620	my ($w, $h) = $widget->size_request;
		3621
		3622	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3623	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3624
		3625	$w = $widget->{force_w} if exists $widget->{force_w};
		3626	$h = $widget->{force_h} if exists $widget->{force_h};
		3627
		3628	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3629	|| delete $widget->{force_realloc}) {
3138	$widget->{req_w} = $w;	3630	$widget->{req_w} = $w;
3139	$widget->{req_h} = $h;	3631	$widget->{req_h} = $h;
3140		3632
3141	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3633	$self->{size_alloc}{$widget+0} = $widget;
3142		3634
3143	$widget->{parent}->check_size
3144	if $widget->{parent};	3635	if (my $parent = $widget->{parent}) {
		3636	$self->{realloc}{$parent+0} = $parent
		3637	unless $queue{$parent+0};
		3638
		3639	$parent->{force_size_alloc} = 1;
		3640	$self->{size_alloc}{$parent+0} = $parent;
		3641	}
3145	}	3642	}
		3643
		3644	delete $self->{realloc}{$widget+0};
3146	}	3645	}
3147	}	3646	}
3148		3647
3149	while ($self->{size_alloc}) {	3648	while (my $size_alloc = delete $self->{size_alloc}) {
3150	for (values %{delete $self->{size_alloc}}) {	3649	my @queue = sort { $b->{visible} <=> $a->{visible} }
3151	my ($widget, $w, $h) = @$_;	3650	values %$size_alloc;
		3651
		3652	while () {
		3653	my $widget = pop @queue || last;
		3654
		3655	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3152		3656
3153	$w = 0 if $w < 0;	3657	$w = 0 if $w < 0;
3154	$h = 0 if $h < 0;	3658	$h = 0 if $h < 0;
3155		3659
		3660	$w = int $w + 0.5;
		3661	$h = int $h + 0.5;
		3662
		3663	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3664	$widget->{old_w} = $widget->{w};
		3665	$widget->{old_h} = $widget->{h};
		3666
3156	$widget->{w} = $w;	3667	$widget->{w} = $w;
3157	$widget->{h} = $h;	3668	$widget->{h} = $h;
		3669
3158	$widget->emit (size_allocate => $w, $h);	3670	$widget->emit (size_allocate => $w, $h);
		3671	}
3159	}	3672	}
3160	}	3673	}
3161		3674
3162	while ($self->{post_alloc_hook}) {	3675	while ($self->{post_alloc_hook}) {
3163	$_->()	3676	$_->()
3164	for values %{delete $self->{post_alloc_hook}};	3677	for values %{delete $self->{post_alloc_hook}};
3165	}	3678	}
		3679
3166		3680
3167	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3681	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3168	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3682	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3169	glClear GL_COLOR_BUFFER_BIT;	3683	glClear GL_COLOR_BUFFER_BIT;
3170		3684
…		…
3172	glLoadIdentity;	3686	glLoadIdentity;
3173	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3687	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3174	glMatrixMode GL_MODELVIEW;	3688	glMatrixMode GL_MODELVIEW;
3175	glLoadIdentity;	3689	glLoadIdentity;
3176		3690
		3691	{
		3692	package CFClient::UI::Base;
		3693
		3694	($draw_x, $draw_y, $draw_w, $draw_h) =
		3695	(0, 0, $self->{w}, $self->{h});
		3696	}
		3697
3177	$self->_draw;	3698	$self->_draw;
3178	}	3699	}
3179		3700
3180	#############################################################################	3701	#############################################################################
3181		3702

Diff Legend

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