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.277 by root, Sun Jun 4 00:21:52 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->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
		1166	$self->realloc;
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;	1179	# HACK: the next line is required to enforce placement
1075	$self->move ($self->{user_x}, $self->{user_y});	1180	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1076	$self->update;
1077	};	1181	};
		1182	} else {
		1183	return 0;
		1184	}
		1185
1078	}	1186	1
1079	}	1187	}
1080		1188
1081	sub button_up {	1189	sub button_up {
1082	my ($self, $ev, $x, $y) = @_;	1190	my ($self, $ev, $x, $y) = @_;
1083		1191
1084	delete $self->{motion};	1192	!!delete $self->{motion}
1085	}	1193	}
1086		1194
1087	sub mouse_motion {	1195	sub mouse_motion {
1088	my ($self, $ev, $x, $y) = @_;	1196	my ($self, $ev, $x, $y) = @_;
1089		1197
1090	$self->{motion}->($ev, $x, $y) if $self->{motion};	1198	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1199
		1200	!!$self->{motion}
1091	}	1201	}
1092		1202
1093	sub _draw {	1203	sub _draw {
1094	my ($self) = @_;	1204	my ($self) = @_;
1095		1205
		1206	my $child = $self->{children}[0];
		1207
1096	my ($w, $h ) = ($self->{w}, $self->{h});	1208	my ($w, $h ) = ($self->{w}, $self->{h});
1097	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1209	my ($cw, $ch) = ($child->{w}, $child->{h});
1098		1210
1099	glEnable GL_TEXTURE_2D;	1211	glEnable GL_TEXTURE_2D;
1100	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1212	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1101		1213
1102	my $border = $self->border;	1214	my $border = $self->border;
1103		1215
1104	glColor @{ $self->{border_bg} };	1216	glColor @{ $self->{border_bg} };
1105	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1217	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1106	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1218	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1107	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1219	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1108	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1220	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1109		1221
1110	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1222	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1111	my $bg = $tex[0];	1223	glColor @{ $self->{bg} };
1112		1224
1113	# TODO: repeat texture not scale	1225	# TODO: repeat texture not scale
		1226	# solve this better(?)
1114	my $rep_x = $cw / $bg->{w};	1227	$bg->{s} = $cw / $bg->{w};
1115	my $rep_y = $ch / $bg->{h};	1228	$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);	1229	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1123	}	1230	}
1124		1231
1125	glDisable GL_TEXTURE_2D;	1232	glDisable GL_TEXTURE_2D;
1126		1233
1127	$self->{title}->draw if $self->{title};
1128
1129	$self->child->draw;	1234	$child->draw;
		1235
		1236	if ($self->{title}) {
		1237	glTranslate 0, $border - $self->{h};
		1238	$self->{title}->_draw;
		1239	}
1130	}	1240	}
1131		1241
1132	#############################################################################	1242	#############################################################################
1133		1243
1134	package CFClient::UI::Table;	1244	package CFClient::UI::Table;
…		…
1156	my ($self, $x, $y, $child) = @_;	1266	my ($self, $x, $y, $child) = @_;
1157		1267
1158	$child->set_parent ($self);	1268	$child->set_parent ($self);
1159	$self->{children}[$y][$x] = $child;	1269	$self->{children}[$y][$x] = $child;
1160		1270
1161	$self->check_size (1);	1271	$self->realloc;
1162	}	1272	}
1163		1273
1164	# TODO: move to container class maybe? send children a signal on removal?	1274	# TODO: move to container class maybe? send children a signal on removal?
1165	sub clear {	1275	sub clear {
1166	my ($self) = @_;	1276	my ($self) = @_;
…		…
1171	for (@children) {	1281	for (@children) {
1172	delete $_->{parent};	1282	delete $_->{parent};
1173	$_->hide;	1283	$_->hide;
1174	}	1284	}
1175		1285
1176	$self->check_size (1);	1286	$self->realloc;
1177	$self->update;
1178	}	1287	}
1179		1288
1180	sub get_wh {	1289	sub get_wh {
1181	my ($self) = @_;	1290	my ($self) = @_;
1182		1291
…		…
1278	}	1387	}
1279	}	1388	}
1280		1389
1281	#############################################################################	1390	#############################################################################
1282		1391
1283	package CFClient::UI::HBox;	1392	package CFClient::UI::Box;
1284
1285	# TODO: wrap into common Box base class
1286		1393
1287	our @ISA = CFClient::UI::Container::;	1394	our @ISA = CFClient::UI::Container::;
1288		1395
1289	sub size_request {	1396	sub size_request {
1290	my ($self) = @_;	1397	my ($self) = @_;
1291		1398
1292	my @alloc = map [$_->size_request], @{$self->{children}};	1399	$self->{vertical}
1293		1400	? (
1294	(	1401	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1295	(List::Util::sum map $_->[0], @alloc),	1402	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1296	(List::Util::max map $_->[1], @alloc),	1403	)
1297	)	1404	: (
		1405	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1406	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1407	)
1298	}	1408	}
1299		1409
1300	sub size_allocate {	1410	sub size_allocate {
1301	my ($self, $w, $h) = @_;	1411	my ($self, $w, $h) = @_;
1302		1412
1303	($h, $w) = ($w, $h);	1413	my $space = $self->{vertical} ? $h : $w;
1304
1305	my $children = $self->{children};	1414	my $children = $self->{children};
1306		1415
1307	my @h = map $_->{req_w}, @$children;	1416	my @req;
1308		1417
1309	my $req_h = List::Util::sum @h;	1418	if ($self->{homogeneous}) {
1310		1419	@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 {	1420	} else {
		1421	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1422	my $req = List::Util::sum @req;
		1423
		1424	if ($req > $space) {
		1425	# ah well, not enough space
		1426	$_ *= $space / $req for @req;
		1427	} else {
1315	my $exp = List::Util::sum map $_->{expand}, @$children;	1428	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1316	$exp ||= 1;
1317		1429
		1430	$space = ($space - $req) / $expand; # remaining space to give away
		1431
		1432	$req[$_] += $space * $children->[$_]{expand}
1318	for (0 .. $#$children) {	1433	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	}	1434	}
1325	}	1435	}
1326		1436
1327	CFClient::UI::harmonize \@h;	1437	CFClient::UI::harmonize \@req;
1328		1438
1329	my $y = 0;	1439	my $pos = 0;
1330	for (0 .. $#$children) {	1440	for (0 .. $#$children) {
1331	my $child = $children->[$_];
1332	my $h = $h[$_];	1441	my $alloc = $req[$_];
1333	$child->configure ($y, 0, $h, $w);	1442	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1334		1443
1335	$y += $h;	1444	$pos += $alloc;
1336	}	1445	}
1337		1446
1338	1	1447	1
1339	}	1448	}
1340		1449
1341	#############################################################################	1450	#############################################################################
1342		1451
		1452	package CFClient::UI::HBox;
		1453
		1454	our @ISA = CFClient::UI::Box::;
		1455
		1456	sub new {
		1457	my $class = shift;
		1458
		1459	$class->SUPER::new (
		1460	vertical => 0,
		1461	@_,
		1462	)
		1463	}
		1464
		1465	#############################################################################
		1466
1343	package CFClient::UI::VBox;	1467	package CFClient::UI::VBox;
1344		1468
1345	# TODO: wrap into common Box base class
1346
1347	our @ISA = CFClient::UI::Container::;	1469	our @ISA = CFClient::UI::Box::;
1348		1470
1349	sub size_request {	1471	sub new {
1350	my ($self) = @_;	1472	my $class = shift;
1351		1473
1352	my @alloc = map [$_->size_request], @{$self->{children}};	1474	$class->SUPER::new (
1353		1475	vertical => 1,
1354	(	1476	@_,
1355	(List::Util::max map $_->[0], @alloc),
1356	(List::Util::sum map $_->[1], @alloc),
1357	)	1477	)
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	}	1478	}
1398		1479
1399	#############################################################################	1480	#############################################################################
1400		1481
1401	package CFClient::UI::Label;	1482	package CFClient::UI::Label;
…		…
1418	ellipsise => 3, # end	1499	ellipsise => 3, # end
1419	layout => (new CFClient::Layout),	1500	layout => (new CFClient::Layout),
1420	fontsize => 1,	1501	fontsize => 1,
1421	align => -1,	1502	align => -1,
1422	valign => -1,	1503	valign => -1,
1423	padding => 2,	1504	padding_x => 2,
		1505	padding_y => 2,
1424	can_events => 0,	1506	can_events => 0,
1425	%arg	1507	%arg
1426	);	1508	);
1427		1509
1428	if (exists $self->{template}) {	1510	if (exists $self->{template}) {
…		…
1464	$self->{text} = "T$text";	1546	$self->{text} = "T$text";
1465		1547
1466	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1548	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1467	$self->{layout}->set_text ($text);	1549	$self->{layout}->set_text ($text);
1468		1550
		1551	$self->realloc;
1469	$self->update;	1552	$self->update;
1470	$self->check_size;
1471	}	1553	}
1472		1554
1473	sub set_markup {	1555	sub set_markup {
1474	my ($self, $markup) = @_;	1556	my ($self, $markup) = @_;
1475		1557
…		…
1479	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1561	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1480		1562
1481	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1563	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1482	$self->{layout}->set_markup ($markup);	1564	$self->{layout}->set_markup ($markup);
1483		1565
		1566	$self->realloc;
1484	$self->update;	1567	$self->update;
1485	$self->check_size;
1486	}	1568	}
1487		1569
1488	sub size_request {	1570	sub size_request {
1489	my ($self) = @_;	1571	my ($self) = @_;
1490		1572
…		…
1504		1586
1505	$w = List::Util::max $w, $w2;	1587	$w = List::Util::max $w, $w2;
1506	$h = List::Util::max $h, $h2;	1588	$h = List::Util::max $h, $h2;
1507	}	1589	}
1508		1590
1509	(	1591	($w, $h)
1510	$w + $self->{padding} * 2,
1511	$h + $self->{padding} * 2,
1512	)
1513	}	1592	}
1514		1593
1515	sub size_allocate {	1594	sub size_allocate {
1516	my ($self, $w, $h) = @_;	1595	my ($self, $w, $h) = @_;
1517		1596
		1597	delete $self->{ox};
		1598
1518	delete $self->{texture};	1599	delete $self->{texture}
		1600	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1519	}	1601	}
1520		1602
1521	sub set_fontsize {	1603	sub set_fontsize {
1522	my ($self, $fontsize) = @_;	1604	my ($self, $fontsize) = @_;
1523		1605
1524	$self->{fontsize} = $fontsize;	1606	$self->{fontsize} = $fontsize;
1525	delete $self->{texture};	1607	delete $self->{texture};
1526		1608
1527	$self->update;	1609	$self->realloc;
1528	$self->check_size;
1529	}	1610	}
1530		1611
1531	sub _draw {	1612	sub _draw {
1532	my ($self) = @_;	1613	my ($self) = @_;
1533		1614
…		…
1539	$self->{layout}->set_width ($self->{w});	1620	$self->{layout}->set_width ($self->{w});
1540	$self->{layout}->set_ellipsise ($self->{ellipsise});	1621	$self->{layout}->set_ellipsise ($self->{ellipsise});
1541	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1622	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1542	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1623	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1543		1624
1544	my $tex = new_from_layout CFClient::Texture $self->{layout};	1625	new_from_layout CFClient::Texture $self->{layout}
		1626	};
1545		1627
		1628	unless (exists $self->{ox}) {
1546	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1629	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1547	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1630	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1548	: ($self->{w} - $tex->{w}) * 0.5);	1631	: ($self->{w} - $tex->{w}) * 0.5);
1549		1632
1550	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1633	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1551	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1634	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1552	: ($self->{h} - $tex->{h}) * 0.5);	1635	: ($self->{h} - $tex->{h}) * 0.5);
1553
1554	$tex
1555	};	1636	};
1556		1637
1557	glEnable GL_TEXTURE_2D;	1638	glEnable GL_TEXTURE_2D;
1558	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1639	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1559		1640
…		…
1597		1678
1598	delete $self->{cur_h};	1679	delete $self->{cur_h};
1599		1680
1600	return if $self->{text} eq $text;	1681	return if $self->{text} eq $text;
1601		1682
1602	delete $self->{texture};
1603
1604	$self->{last_activity} = $::NOW;	1683	$self->{last_activity} = $::NOW;
1605	$self->{text} = $text;	1684	$self->{text} = $text;
1606		1685
1607	$text =~ s/./*/g if $self->{hidden};	1686	$text =~ s/./*/g if $self->{hidden};
1608	$self->{layout}->set_text ("$text ");	1687	$self->{layout}->set_text ("$text ");
1609		1688
1610	$self->_emit (changed => $self->{text});	1689	$self->_emit (changed => $self->{text});
		1690	$self->update;
1611	}	1691	}
1612		1692
1613	sub set_text {	1693	sub set_text {
1614	my ($self, $text) = @_;	1694	my ($self, $text) = @_;
1615		1695
1616	$self->{cursor} = length $text;	1696	$self->{cursor} = length $text;
1617	$self->_set_text ($text);	1697	$self->_set_text ($text);
1618	$self->update;	1698
1619	$self->check_size;	1699	$self->realloc;
1620	}	1700	}
1621		1701
1622	sub get_text {	1702	sub get_text {
1623	$_[0]{text}	1703	$_[0]{text}
1624	}	1704	}
…		…
1654	$self->{cursor} = length $text;	1734	$self->{cursor} = length $text;
1655	} elsif ($uni == 27) {	1735	} elsif ($uni == 27) {
1656	$self->_emit ('escape');	1736	$self->_emit ('escape');
1657	} elsif ($uni) {	1737	} elsif ($uni) {
1658	substr $text, $self->{cursor}++, 0, chr $uni;	1738	substr $text, $self->{cursor}++, 0, chr $uni;
		1739	} else {
		1740	return 0;
1659	}	1741	}
1660		1742
1661	$self->_set_text ($text);	1743	$self->_set_text ($text);
1662	$self->update;	1744
1663	$self->check_size;	1745	$self->realloc;
		1746
		1747	1
1664	}	1748	}
1665		1749
1666	sub focus_in {	1750	sub focus_in {
1667	my ($self) = @_;	1751	my ($self) = @_;
1668		1752
…		…
1683	utf8::encode $text;	1767	utf8::encode $text;
1684	$self->{cursor} = length substr $text, 0, $idx;	1768	$self->{cursor} = length substr $text, 0, $idx;
1685		1769
1686	$self->_set_text ($self->{text});	1770	$self->_set_text ($self->{text});
1687	$self->update;	1771	$self->update;
		1772
		1773	1
1688	}	1774	}
1689		1775
1690	sub mouse_motion {	1776	sub mouse_motion {
1691	my ($self, $ev, $x, $y) = @_;	1777	my ($self, $ev, $x, $y) = @_;
1692	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1778	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1779
		1780	0
1693	}	1781	}
1694		1782
1695	sub _draw {	1783	sub _draw {
1696	my ($self) = @_;	1784	my ($self) = @_;
1697		1785
…		…
1774	} else {	1862	} else {
1775	$self->set_text ($self->{history_saveback});	1863	$self->set_text ($self->{history_saveback});
1776	}	1864	}
1777		1865
1778	} else {	1866	} else {
1779	$self->SUPER::key_down ($ev);	1867	return $self->SUPER::key_down ($ev)
		1868	}
		1869
1780	}	1870	1
1781
1782	}	1871	}
1783		1872
1784	#############################################################################	1873	#############################################################################
1785		1874
1786	package CFClient::UI::Button;	1875	package CFClient::UI::Button;
…		…
1795		1884
1796	sub new {	1885	sub new {
1797	my $class = shift;	1886	my $class = shift;
1798		1887
1799	$class->SUPER::new (	1888	$class->SUPER::new (
1800	padding => 4,	1889	padding_x => 4,
		1890	padding_y => 4,
1801	fg => [1, 1, 1],	1891	fg => [1, 1, 1],
1802	active_fg => [0, 0, 1],	1892	active_fg => [0, 0, 1],
1803	can_hover => 1,	1893	can_hover => 1,
1804	align => 0,	1894	align => 0,
1805	valign => 0,	1895	valign => 0,
…		…
1814	my ($self, $ev, $x, $y) = @_;	1904	my ($self, $ev, $x, $y) = @_;
1815		1905
1816	$self->emit ("activate")	1906	$self->emit ("activate")
1817	if $x >= 0 && $x < $self->{w}	1907	if $x >= 0 && $x < $self->{w}
1818	&& $y >= 0 && $y < $self->{h};	1908	&& $y >= 0 && $y < $self->{h};
		1909
		1910	1
1819	}	1911	}
1820		1912
1821	sub _draw {	1913	sub _draw {
1822	my ($self) = @_;	1914	my ($self) = @_;
1823		1915
…		…
1852		1944
1853	sub new {	1945	sub new {
1854	my $class = shift;	1946	my $class = shift;
1855		1947
1856	$class->SUPER::new (	1948	$class->SUPER::new (
1857	padding => 2,	1949	padding_x => 2,
		1950	padding_y => 2,
1858	fg => [1, 1, 1],	1951	fg => [1, 1, 1],
1859	active_fg => [1, 1, 0],	1952	active_fg => [1, 1, 0],
1860	bg => [0, 0, 0, 0.2],	1953	bg => [0, 0, 0, 0.2],
1861	active_bg => [1, 1, 1, 0.5],	1954	active_bg => [1, 1, 1, 0.5],
1862	state => 0,	1955	state => 0,
…		…
1866	}	1959	}
1867		1960
1868	sub size_request {	1961	sub size_request {
1869	my ($self) = @_;	1962	my ($self) = @_;
1870		1963
1871	($self->{padding} * 2 + 6) x 2	1964	(6) x 2
1872	}	1965	}
1873		1966
1874	sub button_down {	1967	sub button_down {
1875	my ($self, $ev, $x, $y) = @_;	1968	my ($self, $ev, $x, $y) = @_;
1876		1969
1877	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1970	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1878	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1971	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1879	$self->{state} = !$self->{state};	1972	$self->{state} = !$self->{state};
1880	$self->_emit (changed => $self->{state});	1973	$self->_emit (changed => $self->{state});
		1974	} else {
		1975	return 0
		1976	}
		1977
1881	}	1978	1
1882	}	1979	}
1883		1980
1884	sub _draw {	1981	sub _draw {
1885	my ($self) = @_;	1982	my ($self) = @_;
1886		1983
1887	$self->SUPER::_draw;	1984	$self->SUPER::_draw;
1888		1985
1889	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1986	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1890		1987
1891	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1988	my ($w, $h) = @$self{qw(w h)};
		1989
		1990	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1892		1991
1893	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1992	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1894		1993
1895	my $tex = $self->{state} ? $tex[1] : $tex[0];	1994	my $tex = $self->{state} ? $tex[1] : $tex[0];
1896		1995
…		…
2161	fg => [1, 1, 1],	2260	fg => [1, 1, 1],
2162	active_fg => [0, 0, 0],	2261	active_fg => [0, 0, 0],
2163	bg => [0, 0, 0, 0.2],	2262	bg => [0, 0, 0, 0.2],
2164	active_bg => [1, 1, 1, 0.5],	2263	active_bg => [1, 1, 1, 0.5],
2165	range => [0, 0, 100, 10, 0],	2264	range => [0, 0, 100, 10, 0],
2166	req_w => $::WIDTH / 80,	2265	min_w => $::WIDTH / 80,
2167	req_h => $::WIDTH / 80,	2266	min_h => $::WIDTH / 80,
2168	vertical => 0,	2267	vertical => 0,
2169	can_hover => 1,	2268	can_hover => 1,
2170	inner_pad => 0.02,	2269	inner_pad => 0.02,
2171	@_	2270	@_
2172	);	2271	);
…		…
2175	$self->update;	2274	$self->update;
2176		2275
2177	$self	2276	$self
2178	}	2277	}
2179		2278
		2279	sub changed { }
		2280
2180	sub set_range {	2281	sub set_range {
2181	my ($self, $range) = @_;	2282	my ($self, $range) = @_;
2182		2283
2183	($range, $self->{range}) = ($self->{range}, $range);	2284	($range, $self->{range}) = ($self->{range}, $range);
2184		2285
…		…
2210	}	2311	}
2211		2312
2212	sub size_request {	2313	sub size_request {
2213	my ($self) = @_;	2314	my ($self) = @_;
2214		2315
2215	my $w = $self->{req_w};	2316	($self->{req_w}, $self->{req_h})
2216	my $h = $self->{req_h};
2217
2218	$self->{vertical} ? ($h, $w) : ($w, $h)
2219	}	2317	}
2220		2318
2221	sub button_down {	2319	sub button_down {
2222	my ($self, $ev, $x, $y) = @_;	2320	my ($self, $ev, $x, $y) = @_;
2223		2321
2224	$self->SUPER::button_down ($ev, $x, $y);	2322	$self->SUPER::button_down ($ev, $x, $y);
2225		2323
2226	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2324	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227		2325
2228	$self->mouse_motion ($ev, $x, $y);	2326	$self->mouse_motion ($ev, $x, $y)
2229	}	2327	}
2230		2328
2231	sub mouse_motion {	2329	sub mouse_motion {
2232	my ($self, $ev, $x, $y) = @_;	2330	my ($self, $ev, $x, $y) = @_;
2233		2331
…		…
2237	my (undef, $lo, $hi, $page) = @{$self->{range}};	2335	my (undef, $lo, $hi, $page) = @{$self->{range}};
2238		2336
2239	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2337	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240		2338
2241	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2339	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2340	} else {
		2341	return 0;
		2342	}
		2343
2242	}	2344	1
2243	}	2345	}
2244		2346
2245	sub update {	2347	sub update {
2246	my ($self) = @_;	2348	my ($self) = @_;
2247		2349
2248	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2350	delete $self->{knob_w};
		2351	$self->SUPER::update;
		2352	}
		2353
		2354	sub _draw {
		2355	my ($self) = @_;
		2356
		2357	unless ($self->{knob_w}) {
2249	$self->set_value ($self->{range}[0]);	2358	$self->set_value ($self->{range}[0]);
2250		2359
2251	my ($value, $lo, $hi, $page) = @{$self->{range}};	2360	my ($value, $lo, $hi, $page) = @{$self->{range}};
2252	my $range = ($hi - $page - $lo) || 1e-100;	2361	my $range = ($hi - $page - $lo) || 1e-100;
2253		2362
…		…
2259	$value = ($value - $lo) / $range;	2368	$value = ($value - $lo) / $range;
2260	$value = $value * $self->{scale} + $self->{offset};	2369	$value = $value * $self->{scale} + $self->{offset};
2261		2370
2262	$self->{knob_x} = $value - $knob_w * 0.5;	2371	$self->{knob_x} = $value - $knob_w * 0.5;
2263	$self->{knob_w} = $knob_w;	2372	$self->{knob_w} = $knob_w;
2264	});	2373	}
2265
2266	$self->SUPER::update;
2267	}
2268
2269	sub _draw {
2270	my ($self) = @_;
2271		2374
2272	$self->SUPER::_draw ();	2375	$self->SUPER::_draw ();
2273		2376
2274	glScale $self->{w}, $self->{h};	2377	glScale $self->{w}, $self->{h};
2275		2378
…		…
2579	state => 0,	2682	state => 0,
2580	on_activate => \&toggle_flopper,	2683	on_activate => \&toggle_flopper,
2581	@_	2684	@_
2582	);	2685	);
2583		2686
2584	if ($self->{state}) {
2585	$self->{state} = 0;
2586	$self->toggle_flopper;
2587	}
2588
2589	$self	2687	$self
2590	}	2688	}
2591		2689
2592	sub toggle_flopper {	2690	sub toggle_flopper {
2593	my ($self) = @_;	2691	my ($self) = @_;
2594		2692
2595	# TODO: use animation	2693	$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	}	2694	}
2607		2695
2608	#############################################################################	2696	#############################################################################
2609		2697
2610	package CFClient::UI::Tooltip;	2698	package CFClient::UI::Tooltip;
…		…
2623	}	2711	}
2624		2712
2625	sub set_tooltip_from {	2713	sub set_tooltip_from {
2626	my ($self, $widget) = @_;	2714	my ($self, $widget) = @_;
2627		2715
		2716	my $tooltip = $widget->{tooltip};
		2717
		2718	if ($ENV{CFPLUS_DEBUG} & 2) {
		2719	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2720	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2721	. "req $widget->{req_w} $widget->{req_h}\n"
		2722	. "visible $widget->{visible}";
		2723	}
		2724
2628	$self->add (new CFClient::UI::Label	2725	$self->add (new CFClient::UI::Label
2629	markup => $widget->{tooltip},	2726	markup => $tooltip,
2630	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2727	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2631	fontsize => 0.8,	2728	fontsize => 0.8,
2632	fg => [0, 0, 0, 1],	2729	fg => [0, 0, 0, 1],
2633	ellipsise => 0,	2730	ellipsise => 0,
2634	font => ($widget->{tooltip_font} || $::FONT_PROP),	2731	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2645		2742
2646	sub size_allocate {	2743	sub size_allocate {
2647	my ($self, $w, $h) = @_;	2744	my ($self, $w, $h) = @_;
2648		2745
2649	$self->SUPER::size_allocate ($w - 4, $h - 4);	2746	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2747	}
		2748
		2749	sub visibility_change {
		2750	my ($self, $visible) = @_;
		2751
		2752	return unless $visible;
		2753
		2754	$self->{root}->on_post_alloc ("move_$self" => sub {
		2755	my $widget = $self->{owner}
		2756	or return;
		2757
		2758	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2759
		2760	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2761	if $x + $self->{w} > $::WIDTH;
		2762
		2763	$self->move_abs ($x, $y);
		2764	});
2650	}	2765	}
2651		2766
2652	sub _draw {	2767	sub _draw {
2653	my ($self) = @_;	2768	my ($self) = @_;
2654		2769
…		…
2671	glVertex $w, $h;	2786	glVertex $w, $h;
2672	glVertex $w, 0;	2787	glVertex $w, 0;
2673	glEnd;	2788	glEnd;
2674		2789
2675	glTranslate 2 - 0.375, 2 - 0.375;	2790	glTranslate 2 - 0.375, 2 - 0.375;
		2791
2676	$self->SUPER::_draw;	2792	$self->SUPER::_draw;
2677	}	2793	}
2678		2794
2679	#############################################################################	2795	#############################################################################
2680		2796
…		…
2756	$self->SUPER::DESTROY;	2872	$self->SUPER::DESTROY;
2757	}	2873	}
2758		2874
2759	#############################################################################	2875	#############################################################################
2760		2876
2761	package CFClient::UI::Inventory;	2877	package CFClient::UI::Buttonbar;
2762		2878
2763	our @ISA = CFClient::UI::ScrolledWindow::;	2879	our @ISA = CFClient::UI::HBox::;
2764		2880
2765	sub new {	2881	# 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		2882
2806	#############################################################################	2883	#############################################################################
2807		2884
2808	package CFClient::UI::Menu;	2885	package CFClient::UI::Menu;
2809		2886
…		…
2850	# maybe save $GRAB? must be careful about events...	2927	# maybe save $GRAB? must be careful about events...
2851	$GRAB = $self;	2928	$GRAB = $self;
2852	$self->{button} = $ev->{button};	2929	$self->{button} = $ev->{button};
2853		2930
2854	$self->show;	2931	$self->show;
2855	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2932	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2856	}	2933	}
2857		2934
2858	sub mouse_motion {	2935	sub mouse_motion {
2859	my ($self, $ev, $x, $y) = @_;	2936	my ($self, $ev, $x, $y) = @_;
2860		2937
2861	# TODO: should use vbox->find_widget or so	2938	# TODO: should use vbox->find_widget or so
2862	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2939	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2863	$self->{hover} = $self->{item}{$HOVER};	2940	$self->{hover} = $self->{item}{$HOVER};
		2941
		2942	0
2864	}	2943	}
2865		2944
2866	sub button_up {	2945	sub button_up {
2867	my ($self, $ev, $x, $y) = @_;	2946	my ($self, $ev, $x, $y) = @_;
2868		2947
…		…
2870	undef $GRAB;	2949	undef $GRAB;
2871	$self->hide;	2950	$self->hide;
2872		2951
2873	$self->_emit ("popdown");	2952	$self->_emit ("popdown");
2874	$self->{hover}[1]->() if $self->{hover};	2953	$self->{hover}[1]->() if $self->{hover};
		2954	} else {
		2955	return 0
		2956	}
		2957
		2958	1
		2959	}
		2960
		2961	#############################################################################
		2962
		2963	package CFClient::UI::Multiplexer;
		2964
		2965	our @ISA = CFClient::UI::Container::;
		2966
		2967	sub new {
		2968	my $class = shift;
		2969
		2970	my $self = $class->SUPER::new (
		2971	@_,
		2972	);
		2973
		2974	$self->{current} = $self->{children}[0]
		2975	if @{ $self->{children} };
		2976
		2977	$self
		2978	}
		2979
		2980	sub add {
		2981	my ($self, @widgets) = @_;
		2982
		2983	$self->SUPER::add (@widgets);
		2984
		2985	$self->{current} = $self->{children}[0]
		2986	if @{ $self->{children} };
		2987	}
		2988
		2989	sub set_current_page {
		2990	my ($self, $page_or_widget) = @_;
		2991
		2992	my $widget = ref $page_or_widget
		2993	? $page_or_widget
		2994	: $self->{children}[$page_or_widget];
		2995
		2996	$self->{current} = $widget;
		2997	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2998
		2999	$self->_emit (page_changed => $self->{current});
		3000
		3001	$self->realloc;
		3002	}
		3003
		3004	sub visible_children {
		3005	$_[0]{current}
		3006	}
		3007
		3008	sub size_request {
		3009	my ($self) = @_;
		3010
		3011	$self->{current}->size_request
		3012	}
		3013
		3014	sub size_allocate {
		3015	my ($self, $w, $h) = @_;
		3016
		3017	$self->{current}->configure (0, 0, $w, $h);
		3018	}
		3019
		3020	sub _draw {
		3021	my ($self) = @_;
		3022
		3023	$self->{current}->draw;
		3024	}
		3025
		3026	#############################################################################
		3027
		3028	package CFClient::UI::Notebook;
		3029
		3030	our @ISA = CFClient::UI::VBox::;
		3031
		3032	sub new {
		3033	my $class = shift;
		3034
		3035	my $self = $class->SUPER::new (
		3036	buttonbar => (new CFClient::UI::Buttonbar),
		3037	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3038	# filter => # will be put between multiplexer and $self
		3039	@_,
		3040	);
2875	}	3041
		3042	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3043	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3044
		3045	$self
		3046	}
		3047
		3048	sub add {
		3049	my ($self, $title, $widget, $tooltip) = @_;
		3050
		3051	Scalar::Util::weaken $self;
		3052
		3053	$self->{buttonbar}->add (new CFClient::UI::Button
		3054	markup => $title,
		3055	tooltip => $tooltip,
		3056	on_activate => sub { $self->set_current_page ($widget) },
		3057	);
		3058
		3059	$self->{multiplexer}->add ($widget);
		3060	}
		3061
		3062	sub set_current_page {
		3063	my ($self, $page) = @_;
		3064
		3065	$self->{multiplexer}->set_current_page ($page);
		3066	$self->_emit (page_changed => $self->{multiplexer}{current});
2876	}	3067	}
2877		3068
2878	#############################################################################	3069	#############################################################################
2879		3070
2880	package CFClient::UI::Statusbox;	3071	package CFClient::UI::Statusbox;
…		…
2985	$self->SUPER::reconfigure;	3176	$self->SUPER::reconfigure;
2986	}	3177	}
2987		3178
2988	#############################################################################	3179	#############################################################################
2989		3180
2990	package CFClient::UI::Root;	3181	package CFClient::UI::Inventory;
2991		3182
2992	our @ISA = CFClient::UI::Container::;	3183	our @ISA = CFClient::UI::ScrolledWindow::;
2993
2994	use CFClient::OpenGL;
2995		3184
2996	sub new {	3185	sub new {
2997	my $class = shift;	3186	my $class = shift;
2998		3187
2999	$class->SUPER::new (	3188	my $self = $class->SUPER::new (
		3189	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3190	@_,
		3191	);
		3192
		3193	$self
		3194	}
		3195
		3196	sub set_items {
		3197	my ($self, $items) = @_;
		3198
		3199	$self->{child}->clear;
		3200	return unless $items;
		3201
		3202	my @items = sort {
		3203	($a->{type} <=> $b->{type})
		3204	or ($a->{name} cmp $b->{name})
		3205	} @$items;
		3206
		3207	$self->{real_items} = \@items;
		3208
		3209	my $row = 0;
		3210	for my $item (@items) {
		3211	CFClient::Item::update_widgets $item;
		3212
		3213	$self->{child}->add (0, $row, $item->{face_widget});
		3214	$self->{child}->add (1, $row, $item->{desc_widget});
		3215	$self->{child}->add (2, $row, $item->{weight_widget});
		3216
		3217	$row++;
		3218	}
		3219	}
		3220
		3221	#############################################################################
		3222
		3223	package CFClient::UI::BindEditor;
		3224
		3225	our @ISA = CFClient::UI::FancyFrame::;
		3226
		3227	sub new {
		3228	my $class = shift;
		3229
		3230	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3231
		3232	$self->add (my $vb = new CFClient::UI::VBox);
		3233
		3234
		3235	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3236	text => "start recording",
		3237	tooltip => "Start/Stops recording of actions."
		3238	."All subsequent actions after the recording started will be captured."
		3239	."The actions are displayed after the record was stopped."
		3240	."To bind the action you have to click on the 'Bind' button",
		3241	on_activate => sub {
		3242	unless ($self->{recording}) {
		3243	$self->start;
		3244	} else {
		3245	$self->stop;
		3246	}
		3247	});
		3248
		3249	$vb->add (new CFClient::UI::Label text => "Actions:");
		3250	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3251
		3252	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3253	$vb->add (my $hb = new CFClient::UI::HBox);
		3254	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3255	$hb->add (new CFClient::UI::Button
		3256	text => "bind",
		3257	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3258	on_activate => sub {
		3259	$self->ask_for_bind;
		3260	});
		3261
		3262	$vb->add (my $hb = new CFClient::UI::HBox);
		3263	$hb->add (new CFClient::UI::Button
		3264	text => "ok",
		3265	expand => 1,
		3266	tooltip => "This closes the binding editor and saves the binding",
		3267	on_activate => sub {
		3268	$self->hide;
		3269	$self->commit;
		3270	});
		3271
		3272	$hb->add (new CFClient::UI::Button
		3273	text => "cancel",
		3274	expand => 1,
		3275	tooltip => "This closes the binding editor without saving",
		3276	on_activate => sub {
		3277	$self->hide;
		3278	$self->{binding_cancel}->()
		3279	if $self->{binding_cancel};
		3280	});
		3281
		3282	$self->update_binding_widgets;
		3283
		3284	$self
		3285	}
		3286
		3287	sub commit {
		3288	my ($self) = @_;
		3289	my ($mod, $sym, $cmds) = $self->get_binding;
		3290	if ($sym != 0 && @$cmds > 0) {
		3291	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3292	."'. Don't forget 'Save Config'!");
		3293	$self->{binding_change}->($mod, $sym, $cmds)
		3294	if $self->{binding_change};
		3295	} else {
		3296	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3297	$self->{binding_cancel}->()
		3298	if $self->{binding_cancel};
		3299	}
		3300	}
		3301
		3302	sub start {
		3303	my ($self) = @_;
		3304
		3305	$self->{rec_btn}->set_text ("stop recording");
		3306	$self->{recording} = 1;
		3307	$self->clear_command_list;
		3308	$::CONN->start_record if $::CONN;
		3309	}
		3310
		3311	sub stop {
		3312	my ($self) = @_;
		3313
		3314	$self->{rec_btn}->set_text ("start recording");
		3315	$self->{recording} = 0;
		3316
		3317	my $rec;
		3318	$rec = $::CONN->stop_record if $::CONN;
		3319	return unless ref $rec eq 'ARRAY';
		3320	$self->set_command_list ($rec);
		3321	}
		3322
		3323
		3324	sub ask_for_bind_and_commit {
		3325	my ($self) = @_;
		3326	$self->ask_for_bind (1);
		3327	}
		3328
		3329	sub ask_for_bind {
		3330	my ($self, $commit) = @_;
		3331
		3332	CFClient::Binder::open_binding_dialog (sub {
		3333	my ($mod, $sym) = @_;
		3334	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3335	$self->update_binding_widgets;
		3336	$self->commit if $commit;
		3337	});
		3338	}
		3339
		3340	# $mod and $sym are the modifiers and key symbol
		3341	# $cmds is a array ref of strings (the commands)
		3342	# $cb is the callback that is executed on OK
		3343	# $ccb is the callback that is executed on CANCEL and
		3344	# when the binding was unsuccessful on OK
		3345	sub set_binding {
		3346	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3347
		3348	$self->clear_command_list;
		3349	$self->{recording} = 0;
		3350	$self->{rec_btn}->set_text ("start recording");
		3351
		3352	$self->{binding} = [$mod, $sym];
		3353	$self->{commands} = $cmds;
		3354
		3355	$self->{binding_change} = $cb;
		3356	$self->{binding_cancel} = $ccb;
		3357
		3358	$self->update_binding_widgets;
		3359	}
		3360
		3361	# this is a shortcut method that asks for a binding
		3362	# and then just binds it.
		3363	sub do_quick_binding {
		3364	my ($self, $cmds) = @_;
		3365	$self->set_binding (undef, undef, $cmds, sub {
		3366	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3367	});
		3368	$self->ask_for_bind (1);
		3369	}
		3370
		3371	sub update_binding_widgets {
		3372	my ($self) = @_;
		3373	my ($mod, $sym, $cmds) = $self->get_binding;
		3374	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3375	$self->set_command_list ($cmds);
		3376	}
		3377
		3378	sub get_binding {
		3379	my ($self) = @_;
		3380	return (
		3381	$self->{binding}->[0],
		3382	$self->{binding}->[1],
		3383	[ grep { defined $_ } @{$self->{commands}} ]
		3384	);
		3385	}
		3386
		3387	sub clear_command_list {
		3388	my ($self) = @_;
		3389	$self->{cmdbox}->clear ();
		3390	}
		3391
		3392	sub set_command_list {
		3393	my ($self, $cmds) = @_;
		3394
		3395	$self->{cmdbox}->clear ();
		3396	$self->{commands} = $cmds;
		3397
		3398	my $idx = 0;
		3399
		3400	for (@$cmds) {
		3401	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3402
		3403	my $i = $idx;
		3404	$hb->add (new CFClient::UI::Label text => $_);
		3405	$hb->add (new CFClient::UI::Button
		3406	text => "delete",
		3407	tooltip => "Deletes the action from the record",
		3408	on_activate => sub {
		3409	$self->{cmdbox}->remove ($hb);
		3410	$cmds->[$i] = undef;
		3411	});
		3412
		3413
		3414	$idx++
		3415	}
		3416	}
		3417
		3418	#############################################################################
		3419
		3420	package CFClient::UI::SpellList;
		3421
		3422	our @ISA = CFClient::UI::Table::;
		3423
		3424	sub new {
		3425	my $class = shift;
		3426
		3427	my $self = $class->SUPER::new (
		3428	binding => [],
		3429	commands => [],
		3430	@_,
		3431	)
		3432	}
		3433
		3434	# XXX: Do sorting? Argl...
		3435	sub add_spell {
		3436	my ($self, $spell) = @_;
		3437	$self->{spells}->{$spell->{name}} = $spell;
		3438
		3439	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3440	face => $spell->{face},
		3441	can_hover => 1,
		3442	can_events => 1,
		3443	tooltip => $spell->{message});
		3444
		3445	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3446	text => $spell->{name},
		3447	can_hover => 1,
		3448	can_events => 1,
		3449	tooltip => $spell->{message},
		3450	expand => 1);
		3451
		3452	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3453	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3454	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3455	expand => 1);
		3456
		3457	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3458	text => "bind to key",
		3459	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3460	}
		3461
		3462	sub rebuild_spell_list {
		3463	my ($self) = @_;
		3464	$self->{tbl_idx} = 0;
		3465	$self->add_spell ($_) for values %{$self->{spells}};
		3466	}
		3467
		3468	sub remove_spell {
		3469	my ($self, $spell) = @_;
		3470	delete $self->{spells}->{$spell->{name}};
		3471	$self->rebuild_spell_list;
		3472	}
		3473
		3474	#############################################################################
		3475
		3476	package CFClient::UI::Root;
		3477
		3478	our @ISA = CFClient::UI::Container::;
		3479
		3480	use CFClient::OpenGL;
		3481
		3482	sub new {
		3483	my $class = shift;
		3484
		3485	my $self = $class->SUPER::new (
3000	visible => 1,	3486	visible => 1,
3001	@_,	3487	@_,
3002	)	3488	);
3003	}
3004		3489
3005	sub configure {	3490	Scalar::Util::weaken ($self->{root} = $self);
3006	my ($self, $x, $y, $w, $h) = @_;
3007		3491
3008	$self->{w} = $w;	3492	$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	}	3493	}
3018		3494
3019	sub size_request {	3495	sub size_request {
3020	my ($self) = @_;	3496	my ($self) = @_;
3021		3497
3022	($self->{w}, $self->{h})	3498	($self->{w}, $self->{h})
		3499	}
		3500
		3501	sub _to_pixel {
		3502	my ($coord, $size, $max) = @_;
		3503
		3504	$coord =
		3505	$coord eq "center" ? ($max - $size) * 0.5
		3506	: $coord eq "max" ? $max
		3507	: $coord;
		3508
		3509	$coord = 0 if $coord < 0;
		3510	$coord = $max - $size if $coord > $max - $size;
		3511
		3512	int $coord + 0.5
3023	}	3513	}
3024		3514
3025	sub size_allocate {	3515	sub size_allocate {
3026	my ($self, $w, $h) = @_;	3516	my ($self, $w, $h) = @_;
3027		3517
3028	for my $child ($self->children) {	3518	for my $child ($self->children) {
3029	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3519	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3030		3520
3031	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3521	$X = $child->{force_x} if exists $child->{force_x};
3032	if exists $child->{req_x};	3522	$Y = $child->{force_y} if exists $child->{force_y};
3033		3523
3034	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3524	$X = _to_pixel $X, $W, $self->{w};
3035	if exists $child->{req_y};	3525	$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		3526
3040	$child->configure ($X, $Y, $W, $H);	3527	$child->configure ($X, $Y, $W, $H);
3041	}	3528	}
3042	}	3529	}
3043		3530
…		…
3054	}	3541	}
3055		3542
3056	sub update {	3543	sub update {
3057	my ($self) = @_;	3544	my ($self) = @_;
3058		3545
3059	$self->check_size;
3060	$::WANT_REFRESH++;	3546	$::WANT_REFRESH++;
3061	}	3547	}
3062		3548
3063	sub add {	3549	sub add {
3064	my ($self, @children) = @_;	3550	my ($self, @children) = @_;
3065		3551
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;	3552	$_->{is_toplevel} = 1
3074		3553	for @children;
3075	# integerise window positions
3076	$child->{x} = int $child->{x};
3077	$child->{y} = int $child->{y};
3078	}
3079		3554
3080	$self->SUPER::add (@children);	3555	$self->SUPER::add (@children);
3081	}	3556	}
3082		3557
3083	sub remove {	3558	sub remove {
3084	my ($self, @children) = @_;	3559	my ($self, @children) = @_;
3085		3560
3086	$self->SUPER::remove (@children);	3561	$self->SUPER::remove (@children);
		3562
		3563	delete $self->{is_toplevel}
		3564	for @children;
3087		3565
3088	while (@children) {	3566	while (@children) {
3089	my $w = pop @children;	3567	my $w = pop @children;
3090	push @children, $w->children;	3568	push @children, $w->children;
3091	$w->set_invisible;	3569	$w->set_invisible;
…		…
3110	while ($self->{refresh_hook}) {	3588	while ($self->{refresh_hook}) {
3111	$_->()	3589	$_->()
3112	for values %{delete $self->{refresh_hook}};	3590	for values %{delete $self->{refresh_hook}};
3113	}	3591	}
3114		3592
3115	if ($self->{check_size}) {	3593	if ($self->{realloc}) {
		3594	my %queue;
3116	my @queue;	3595	my @queue;
		3596	my $widget;
3117		3597
3118	for (;;) {	3598	outer:
3119	if ($self->{check_size}) {	3599	while () {
3120	#TODO use array-of-depth approach	3600	if (my $realloc = delete $self->{realloc}) {
		3601	for $widget (values %$realloc) {
		3602	$widget->{visible} or next; # do not resize invisible widgets
3121		3603
3122	@queue = sort { $a->{visible} <=> $b->{visible} }	3604	$queue{$widget+0}++ and next; # duplicates are common
3123	@queue, values %{delete $self->{check_size}};	3605
		3606	push @{ $queue[$widget->{visible}] }, $widget;
		3607	}
3124	}	3608	}
3125		3609
		3610	while () {
		3611	@queue or last outer;
		3612
3126	my $widget = pop @queue || last;	3613	$widget = pop @{ $queue[-1] || [] }
3127		3614	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		3615
		3616	pop @queue;
		3617	}
		3618
		3619	delete $queue{$widget+0};
		3620
		3621	my ($w, $h) = $widget->size_request;
		3622
		3623	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3624	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3625
		3626	$w = $widget->{force_w} if exists $widget->{force_w};
		3627	$h = $widget->{force_h} if exists $widget->{force_h};
		3628
		3629	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3630	|| delete $widget->{force_realloc}) {
3138	$widget->{req_w} = $w;	3631	$widget->{req_w} = $w;
3139	$widget->{req_h} = $h;	3632	$widget->{req_h} = $h;
3140		3633
3141	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3634	$self->{size_alloc}{$widget+0} = $widget;
3142		3635
3143	$widget->{parent}->check_size
3144	if $widget->{parent};	3636	if (my $parent = $widget->{parent}) {
		3637	$self->{realloc}{$parent+0} = $parent
		3638	unless $queue{$parent+0};
		3639
		3640	$parent->{force_size_alloc} = 1;
		3641	$self->{size_alloc}{$parent+0} = $parent;
		3642	}
3145	}	3643	}
		3644
		3645	delete $self->{realloc}{$widget+0};
3146	}	3646	}
3147	}	3647	}
3148		3648
3149	while ($self->{size_alloc}) {	3649	while (my $size_alloc = delete $self->{size_alloc}) {
3150	for (values %{delete $self->{size_alloc}}) {	3650	my @queue = sort { $b->{visible} <=> $a->{visible} }
3151	my ($widget, $w, $h) = @$_;	3651	values %$size_alloc;
		3652
		3653	while () {
		3654	my $widget = pop @queue || last;
		3655
		3656	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3152		3657
3153	$w = 0 if $w < 0;	3658	$w = 0 if $w < 0;
3154	$h = 0 if $h < 0;	3659	$h = 0 if $h < 0;
3155		3660
		3661	$w = int $w + 0.5;
		3662	$h = int $h + 0.5;
		3663
		3664	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3665	$widget->{old_w} = $widget->{w};
		3666	$widget->{old_h} = $widget->{h};
		3667
3156	$widget->{w} = $w;	3668	$widget->{w} = $w;
3157	$widget->{h} = $h;	3669	$widget->{h} = $h;
		3670
3158	$widget->emit (size_allocate => $w, $h);	3671	$widget->emit (size_allocate => $w, $h);
		3672	}
3159	}	3673	}
3160	}	3674	}
3161		3675
3162	while ($self->{post_alloc_hook}) {	3676	while ($self->{post_alloc_hook}) {
3163	$_->()	3677	$_->()
3164	for values %{delete $self->{post_alloc_hook}};	3678	for values %{delete $self->{post_alloc_hook}};
3165	}	3679	}
		3680
3166		3681
3167	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3682	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3168	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3683	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3169	glClear GL_COLOR_BUFFER_BIT;	3684	glClear GL_COLOR_BUFFER_BIT;
3170		3685
…		…
3172	glLoadIdentity;	3687	glLoadIdentity;
3173	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3688	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3174	glMatrixMode GL_MODELVIEW;	3689	glMatrixMode GL_MODELVIEW;
3175	glLoadIdentity;	3690	glLoadIdentity;
3176		3691
		3692	{
		3693	package CFClient::UI::Base;
		3694
		3695	($draw_x, $draw_y, $draw_w, $draw_h) =
		3696	(0, 0, $self->{w}, $self->{h});
		3697	}
		3698
3177	$self->_draw;	3699	$self->_draw;
3178	}	3700	}
3179		3701
3180	#############################################################################	3702	#############################################################################
3181		3703

Diff Legend

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