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.244 by root, Sat May 27 21:06:09 2006 UTC vs.
Revision 1.272 by root, Sat Jun 3 01:47:14 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	return unless $self->{visible};	272	return unless $self->{visible};
259		273
260	# broken show/hide model	274	$_->set_invisible for $self->children;
261		275
262	delete $self->{root};	276	delete $self->{root};
263	delete $self->{visible};	277	delete $self->{visible};
264		278
265	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
266	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
267		281
268	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
269	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
270		284
271	$self->focus_out;	285	$self->focus_out;
272		286
273	$self->emit (visibility_change => 0);	287	$self->emit (visibility_change => 0);
		288	}
		289
		290	sub set_visibility {
		291	my ($self, $visible) = @_;
		292
		293	return if $self->{visible} == $visible;
		294
		295	$visible ? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub toggle_visibility {
		300	my ($self) = @_;
		301
		302	$self->{visible}
		303	? $self->hide
		304	: $self->show;
274	}	305	}
275		306
276	sub hide {	307	sub hide {
277	my ($self) = @_;	308	my ($self) = @_;
278		309
…		…
280		311
281	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
282	if $self->{parent};	313	if $self->{parent};
283	}	314	}
284		315
285	sub move {	316	sub move_abs {
286	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
287		318
288	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
289	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
290	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
291		322
292	$self->update;	323	$self->update;
293	}	324	}
294		325
295	sub set_size {	326	sub set_size {
296	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
297		328
298	$self->{user_w} = $w;	329	$self->{force_w} = $w;
299	$self->{user_h} = $h;	330	$self->{force_h} = $h;
300		331
301	$self->check_size;	332	$self->realloc;
302	}	333	}
303		334
304	sub size_request {	335	sub size_request {
305	require Carp;	336	require Carp;
306	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
308		339
309	sub configure {	340	sub configure {
310	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
311		342
312	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
313	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
314	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
315		348
316	# use alignment to adjust x, y	349	# use alignment to adjust x, y
317		350
318	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
319	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
320
321	($w, $h) = ($w2, $h2);
322	}	353	}
323		354
324	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
325	$self->{x} = $x;	356	$self->{x} = $x;
326	$self->{y} = $y;	357	$self->{y} = $y;
327	$self->update;	358	$self->update;
328	}	359	}
329		360
330	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
331	$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;
332	}	368	}
333	}	369	}
334		370
335	sub size_allocate {	371	sub size_allocate {
336	# nothing to be done	372	# nothing to be done
337	}	373	}
338		374
339	sub reconfigure {
340	my ($self) = @_;
341
342	$self->check_size (1);
343	$self->update;
344	}
345
346	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
347	}	381	}
348		382
349	sub set_max_size {	383	sub set_max_size {
350	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
351		385
…		…
410		444
411	$::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
412	unless $FOCUS;	446	unless $FOCUS;
413	}	447	}
414		448
415	sub mouse_motion { }	449	sub mouse_motion { 0 }
416	sub button_up { }	450	sub button_up { 0 }
417	sub key_down { }	451	sub key_down { 0 }
418	sub key_up { }	452	sub key_up { 0 }
419		453
420	sub button_down {	454	sub button_down {
421	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
422		456
423	$self->focus_in;	457	$self->focus_in;
424	}
425		458
426	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
427	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
428	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	461
429	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	462	sub find_widget {
430	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
431		535
432	sub draw {	536	sub draw {
433	my ($self) = @_;	537	my ($self) = @_;
434		538
435	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);
436		550
437	glPushMatrix;	551	glPushMatrix;
438	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
439	$self->_draw;	553	$self->_draw;
440	glPopMatrix;	554	glPopMatrix;
…		…
452	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
453	glEnd;	567	glEnd;
454	glDisable GL_BLEND;	568	glDisable GL_BLEND;
455	}	569	}
456		570
457	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
458	glPushMatrix;	572	glPushMatrix;
459	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
460	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
461	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
462	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
473	my ($self) = @_;	587	my ($self) = @_;
474		588
475	warn "no draw defined for $self\n";	589	warn "no draw defined for $self\n";
476	}	590	}
477		591
478	sub find_widget {
479	my ($self, $x, $y) = @_;
480
481	return () unless $self->{can_events};
482
483	return $self
484	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
485	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
486
487	()
488	}
489
490	sub set_parent {
491	my ($self, $parent) = @_;
492
493	Scalar::Util::weaken ($self->{parent} = $parent);
494
495	if ($parent->{visible} || 1) {
496	$self->{root} = $parent->{root};
497	$self->{visible} = $parent->{visible} + 1;
498
499	$self->emit (visibility_change => 1)
500	unless $self->{parent}{visible};
501	}
502
503	# TODO: req_w _does_change after ->reconfigure
504	$self->check_size
505	unless exists $self->{req_w};
506
507	$self->show;
508	}
509
510	sub check_size {
511	my ($self, $forced) = @_;
512
513	$self->{force_alloc} = 1 if $forced;
514	$CFClient::UI::ROOT->{check_size}{$self} = $self;
515	}
516
517	sub update {
518	my ($self) = @_;
519
520	$self->{parent}->update
521	if $self->{parent};
522	}
523
524	sub connect {
525	my ($self, $signal, $cb) = @_;
526
527	push @{ $self->{signal_cb}{$signal} }, $cb;
528	}
529
530	sub _emit {
531	my ($self, $signal, @args) = @_;
532
533	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
534	}
535
536	sub emit {
537	my ($self, $signal, @args) = @_;
538
539	$self->_emit ($signal, @args)
540	|| $self->$signal (@args);
541	}
542
543	sub visibility_change {
544	#my ($self, $visible) = @_;
545	}
546
547	sub DESTROY {	592	sub DESTROY {
548	my ($self) = @_;	593	my ($self) = @_;
549		594
550	delete $WIDGET{$self+0};	595	delete $WIDGET{$self+0};
551	#$self->deactivate;	596	#$self->deactivate;
…		…
607	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
608	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
609	}	654	}
610		655
611	sub size_request {	656	sub size_request {
612	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
613	}	660	}
614		661
615	sub draw { }	662	sub draw { }
616		663
617	#############################################################################	664	#############################################################################
…		…
621	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
622		669
623	sub new {	670	sub new {
624	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
625		672
626	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
627		674
628	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
629	children => [],	676	children => [],
630	can_events => 0,	677	can_events => 0,
631	%arg,	678	%arg,
632	);	679	);
		680
633	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
634		683
635	$self	684	$self
636	}	685	}
637		686
638	sub add {	687	sub add {
…		…
646	$self->{children} = [	695	$self->{children} = [
647	sort { $a->{z} <=> $b->{z} }	696	sort { $a->{z} <=> $b->{z} }
648	@{$self->{children}}, @widgets	697	@{$self->{children}}, @widgets
649	];	698	];
650		699
651	$self->check_size (1);	700	$self->realloc;
652	$self->update;
653	}	701	}
654		702
655	sub children {	703	sub children {
656	@{ $_[0]{children} }	704	@{ $_[0]{children} }
657	}	705	}
…		…
662	delete $child->{parent};	710	delete $child->{parent};
663	$child->hide;	711	$child->hide;
664		712
665	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	713	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
666		714
667	$self->check_size (1);	715	$self->realloc;
668	$self->update;
669	}	716	}
670		717
671	sub clear {	718	sub clear {
672	my ($self) = @_;	719	my ($self) = @_;
673		720
…		…
677	for (@$children) {	724	for (@$children) {
678	delete $_->{parent};	725	delete $_->{parent};
679	$_->hide;	726	$_->hide;
680	}	727	}
681		728
682	$self->check_size;	729	$self->realloc;
683	$self->update;
684	}	730	}
685		731
686	sub find_widget {	732	sub find_widget {
687	my ($self, $x, $y) = @_;	733	my ($self, $x, $y) = @_;
688		734
689	$x -= $self->{x};	735	$x -= $self->{x};
690	$y -= $self->{y};	736	$y -= $self->{y};
691		737
692	my $res;	738	my $res;
693		739
694	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
695	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
696	and return $res;	742	and return $res;
697	}	743	}
698		744
699	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
775	$self->SUPER::size_allocate ($w, $h);	821	$self->SUPER::size_allocate ($w, $h);
776	$self->update;	822	$self->update;
777	}	823	}
778		824
779	sub _render {	825	sub _render {
		826	my ($self) = @_;
		827
780	$_[0]{children}[0]->draw;	828	$self->{children}[0]->draw;
781	}	829	}
782		830
783	sub render_child {	831	sub render_child {
784	my ($self) = @_;	832	my ($self) = @_;
785		833
786	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	834	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
787	glClearColor 0, 0, 0, 0;	835	glClearColor 0, 0, 0, 0;
788	glClear GL_COLOR_BUFFER_BIT;	836	glClear GL_COLOR_BUFFER_BIT;
789		837
		838	{
		839	package CFClient::UI::Base;
		840
		841	($draw_x, $draw_y, $draw_w, $draw_h) =
		842	(0, 0, $self->{w}, $self->{h});
		843	}
		844
790	$self->_render;	845	$self->_render;
791	};	846	};
792	}	847	}
793		848
794	sub _draw {	849	sub _draw {
795	my ($self) = @_;	850	my ($self) = @_;
796		851
797	my ($w, $h) = ($self->w, $self->h);	852	my ($w, $h) = @$self{qw(w h)};
798		853
799	my $tex = $self->{texture}	854	my $tex = $self->{texture}
800	or return;	855	or return;
801		856
802	glEnable GL_TEXTURE_2D;	857	glEnable GL_TEXTURE_2D;
…		…
825	}	880	}
826		881
827	sub size_request {	882	sub size_request {
828	my ($self) = @_;	883	my ($self) = @_;
829		884
830	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	885	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
831		886
832	@$self{qw(child_w child_h)}	887	$w = 10 if $self->{scroll_x};
		888	$h = 10 if $self->{scroll_y};
		889
		890	($w, $h)
833	}	891	}
834		892
835	sub size_allocate {	893	sub size_allocate {
836	my ($self, $w, $h) = @_;	894	my ($self, $w, $h) = @_;
837		895
		896	my $child = $self->child;
		897
838	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	898	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
839	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	899	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
840		900
841	$self->child->configure (0, 0, $w, $h);	901	$self->child->configure (0, 0, $w, $h);
842	$self->update;	902	$self->update;
843	}	903	}
844		904
…		…
879	}	939	}
880	}	940	}
881		941
882	sub _render {	942	sub _render {
883	my ($self) = @_;	943	my ($self) = @_;
		944
		945	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		946	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
884		947
885	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	948	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
886		949
887	$self->SUPER::_render;	950	$self->SUPER::_render;
888	}	951	}
…		…
987		1050
988	our @ISA = CFClient::UI::Bin::;	1051	our @ISA = CFClient::UI::Bin::;
989		1052
990	use CFClient::OpenGL;	1053	use CFClient::OpenGL;
991		1054
992	my @tex =	1055	my $bg =
		1056	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1057	mipmap => 1, wrap => 1;
		1058
		1059	my @border =
993	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1060	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
994	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1061	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
995		1062
996	sub new {	1063	sub new {
997	my $class = shift;	1064	my ($class, %arg) = @_;
998		1065
999	# TODO: user_x, user_y, overwrite moveto?	1066	my $title = delete $arg{title};
1000		1067
1001	my $self = $class->SUPER::new (	1068	my $self = $class->SUPER::new (
1002	bg => [1, 1, 1, 1],	1069	bg => [1, 1, 1, 1],
1003	border_bg => [1, 1, 1, 1],	1070	border_bg => [1, 1, 1, 1],
1004	border => 0.6,	1071	border => 0.6,
1005	is_toplevel => 1,
1006	can_events => 1,	1072	can_events => 1,
1007	@_	1073	min_w => 16,
		1074	min_h => 16,
		1075	%arg,
1008	);	1076	);
1009		1077
1010	$self->{title} &&= new CFClient::UI::Label	1078	$self->{title} = new CFClient::UI::Label
1011	align => 0,	1079	align => 0,
1012	valign => 1,	1080	valign => 1,
1013	text => $self->{title},	1081	text => $title,
1014	fontsize => $self->{border};	1082	fontsize => $self->{border}
		1083	if defined $title;
1015		1084
1016	$self	1085	$self
		1086	}
		1087
		1088	sub add {
		1089	my ($self, @widgets) = @_;
		1090
		1091	$self->SUPER::add (@widgets);
		1092	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1017	}	1093	}
1018		1094
1019	sub border {	1095	sub border {
1020	int $_[0]{border} * $::FONTSIZE	1096	int $_[0]{border} * $::FONTSIZE
1021	}	1097	}
1022		1098
1023	sub size_request {	1099	sub size_request {
1024	my ($self) = @_;	1100	my ($self) = @_;
		1101
		1102	$self->{title}->size_request
		1103	if $self->{title};
1025		1104
1026	my ($w, $h) = $self->SUPER::size_request;	1105	my ($w, $h) = $self->SUPER::size_request;
1027		1106
1028	(	1107	(
1029	$w + $self->border * 2,	1108	$w + $self->border * 2,
…		…
1032	}	1111	}
1033		1112
1034	sub size_allocate {	1113	sub size_allocate {
1035	my ($self, $w, $h) = @_;	1114	my ($self, $w, $h) = @_;
1036		1115
		1116	if ($self->{title}) {
		1117	$self->{title}{w} = $w;
		1118	$self->{title}{h} = $h;
		1119	$self->{title}->size_allocate ($w, $h);
		1120	}
		1121
		1122	my $border = $self->border;
		1123
1037	$h -= List::Util::max 0, $self->border * 2;	1124	$h -= List::Util::max 0, $border * 2;
1038	$w -= List::Util::max 0, $self->border * 2;	1125	$w -= List::Util::max 0, $border * 2;
1039		1126
1040	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1041	if $self->{title};
1042
1043	$self->child->configure ($self->border, $self->border, $w, $h);	1127	$self->child->configure ($border, $border, $w, $h);
1044	}	1128	}
1045		1129
1046	sub button_down {	1130	sub button_down {
1047	my ($self, $ev, $x, $y) = @_;	1131	my ($self, $ev, $x, $y) = @_;
1048		1132
…		…
1064	my ($ev, $x, $y) = @_;	1148	my ($ev, $x, $y) = @_;
1065		1149
1066	my $dx = $ev->{x} - $ox;	1150	my $dx = $ev->{x} - $ox;
1067	my $dy = $ev->{y} - $oy;	1151	my $dy = $ev->{y} - $oy;
1068		1152
1069	$self->{user_x} = $wx + $dx * $mx;
1070	$self->{user_y} = $wy + $dy * $my;
1071	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1153	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1072	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1154	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1073	$self->move ($self->{user_x}, $self->{user_y});	1155
1074	$self->check_size;	1156	$self->realloc;
		1157	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1075	};	1158	};
1076		1159
1077	} elsif ($lr ^ $td) {	1160	} elsif ($lr ^ $td) {
1078	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1161	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1079	my ($bx, $by) = ($self->{x}, $self->{y});	1162	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1081	$self->{motion} = sub {	1164	$self->{motion} = sub {
1082	my ($ev, $x, $y) = @_;	1165	my ($ev, $x, $y) = @_;
1083		1166
1084	($x, $y) = ($ev->{x}, $ev->{y});	1167	($x, $y) = ($ev->{x}, $ev->{y});
1085		1168
1086	$self->{user_x} = $bx + $x - $ox;	1169	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1087	$self->{user_y} = $by + $y - $oy;
1088	$self->move ($self->{user_x}, $self->{user_y});
1089	$self->update;
1090	};	1170	};
		1171	} else {
		1172	return 0;
		1173	}
		1174
1091	}	1175	1
1092	}	1176	}
1093		1177
1094	sub button_up {	1178	sub button_up {
1095	my ($self, $ev, $x, $y) = @_;	1179	my ($self, $ev, $x, $y) = @_;
1096		1180
1097	delete $self->{motion};	1181	!!delete $self->{motion}
1098	}	1182	}
1099		1183
1100	sub mouse_motion {	1184	sub mouse_motion {
1101	my ($self, $ev, $x, $y) = @_;	1185	my ($self, $ev, $x, $y) = @_;
1102		1186
1103	$self->{motion}->($ev, $x, $y) if $self->{motion};	1187	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1188
		1189	!!$self->{motion}
1104	}	1190	}
1105		1191
1106	sub _draw {	1192	sub _draw {
1107	my ($self) = @_;	1193	my ($self) = @_;
1108		1194
		1195	my $child = $self->{children}[0];
		1196
1109	my ($w, $h ) = ($self->{w}, $self->{h});	1197	my ($w, $h ) = ($self->{w}, $self->{h});
1110	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1198	my ($cw, $ch) = ($child->{w}, $child->{h});
1111		1199
1112	glEnable GL_TEXTURE_2D;	1200	glEnable GL_TEXTURE_2D;
1113	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1201	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1114		1202
1115	my $border = $self->border;	1203	my $border = $self->border;
1116		1204
1117	glColor @{ $self->{border_bg} };	1205	glColor @{ $self->{border_bg} };
1118	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1206	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1119	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1207	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1120	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1208	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1121	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1209	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1122		1210
1123	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1211	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1124	my $bg = $tex[0];	1212	glColor @{ $self->{bg} };
1125		1213
1126	# TODO: repeat texture not scale	1214	# TODO: repeat texture not scale
		1215	# solve this better(?)
1127	my $rep_x = $cw / $bg->{w};	1216	$bg->{s} = $cw / $bg->{w};
1128	my $rep_y = $ch / $bg->{h};	1217	$bg->{t} = $ch / $bg->{h};
1129
1130	glColor @{ $self->{bg} };
1131
1132	$bg->{s} = $rep_x;
1133	$bg->{t} = $rep_y;
1134	$bg->{wrap_mode} = 1;
1135	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1218	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1136	}	1219	}
1137		1220
1138	glDisable GL_TEXTURE_2D;	1221	glDisable GL_TEXTURE_2D;
1139		1222
1140	$self->{title}->draw if $self->{title};
1141
1142	$self->child->draw;	1223	$child->draw;
		1224
		1225	if ($self->{title}) {
		1226	glTranslate 0, $border - $self->{h};
		1227	$self->{title}->_draw;
		1228	}
1143	}	1229	}
1144		1230
1145	#############################################################################	1231	#############################################################################
1146		1232
1147	package CFClient::UI::Table;	1233	package CFClient::UI::Table;
…		…
1169	my ($self, $x, $y, $child) = @_;	1255	my ($self, $x, $y, $child) = @_;
1170		1256
1171	$child->set_parent ($self);	1257	$child->set_parent ($self);
1172	$self->{children}[$y][$x] = $child;	1258	$self->{children}[$y][$x] = $child;
1173		1259
1174	$self->check_size (1);	1260	$self->realloc;
1175	}	1261	}
1176		1262
1177	# TODO: move to container class maybe? send children a signal on removal?	1263	# TODO: move to container class maybe? send children a signal on removal?
1178	sub clear {	1264	sub clear {
1179	my ($self) = @_;	1265	my ($self) = @_;
…		…
1184	for (@children) {	1270	for (@children) {
1185	delete $_->{parent};	1271	delete $_->{parent};
1186	$_->hide;	1272	$_->hide;
1187	}	1273	}
1188		1274
1189	$self->check_size (1);	1275	$self->realloc;
1190	$self->update;
1191	}	1276	}
1192		1277
1193	sub get_wh {	1278	sub get_wh {
1194	my ($self) = @_;	1279	my ($self) = @_;
1195		1280
…		…
1291	}	1376	}
1292	}	1377	}
1293		1378
1294	#############################################################################	1379	#############################################################################
1295		1380
1296	package CFClient::UI::HBox;	1381	package CFClient::UI::Box;
1297
1298	# TODO: wrap into common Box base class
1299		1382
1300	our @ISA = CFClient::UI::Container::;	1383	our @ISA = CFClient::UI::Container::;
1301		1384
1302	sub size_request {	1385	sub size_request {
1303	my ($self) = @_;	1386	my ($self) = @_;
1304		1387
1305	my @alloc = map [$_->size_request], @{$self->{children}};	1388	$self->{vertical}
1306		1389	? (
1307	(	1390	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1308	(List::Util::sum map $_->[0], @alloc),	1391	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1309	(List::Util::max map $_->[1], @alloc),	1392	)
1310	)	1393	: (
		1394	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1395	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1396	)
1311	}	1397	}
1312		1398
1313	sub size_allocate {	1399	sub size_allocate {
1314	my ($self, $w, $h) = @_;	1400	my ($self, $w, $h) = @_;
1315		1401
1316	($h, $w) = ($w, $h);	1402	my $space = $self->{vertical} ? $h : $w;
1317
1318	my $children = $self->{children};	1403	my $children = $self->{children};
1319		1404
1320	my @h = map $_->{req_w}, @$children;	1405	my @req;
1321		1406
1322	my $req_h = List::Util::sum @h;	1407	if ($self->{homogeneous}) {
1323		1408	@req = ($space / (@$children || 1)) x @$children;
1324	if ($req_h > $h) {
1325	# ah well, not enough space
1326	$_ *= $h / $req_h for @h;
1327	} else {	1409	} else {
		1410	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1411	my $req = List::Util::sum @req;
		1412
		1413	if ($req > $space) {
		1414	# ah well, not enough space
		1415	$_ *= $space / $req for @req;
		1416	} else {
1328	my $exp = List::Util::sum map $_->{expand}, @$children;	1417	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1329	$exp ||= 1;
1330		1418
		1419	$space = ($space - $req) / $expand; # remaining space to give away
		1420
		1421	$req[$_] += $space * $children->[$_]{expand}
1331	for (0 .. $#$children) {	1422	for 0 .. $#$children;
1332	my $child = $children->[$_];
1333
1334	my $alloc_h = $h[$_];
1335	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1336	$h[$_] = $alloc_h;
1337	}	1423	}
1338	}	1424	}
1339		1425
1340	CFClient::UI::harmonize \@h;	1426	CFClient::UI::harmonize \@req;
1341		1427
1342	my $y = 0;	1428	my $pos = 0;
1343	for (0 .. $#$children) {	1429	for (0 .. $#$children) {
1344	my $child = $children->[$_];
1345	my $h = $h[$_];	1430	my $alloc = $req[$_];
1346	$child->configure ($y, 0, $h, $w);	1431	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1347		1432
1348	$y += $h;	1433	$pos += $alloc;
1349	}	1434	}
1350		1435
1351	1	1436	1
1352	}	1437	}
1353		1438
1354	#############################################################################	1439	#############################################################################
1355		1440
		1441	package CFClient::UI::HBox;
		1442
		1443	our @ISA = CFClient::UI::Box::;
		1444
		1445	sub new {
		1446	my $class = shift;
		1447
		1448	$class->SUPER::new (
		1449	vertical => 0,
		1450	@_,
		1451	)
		1452	}
		1453
		1454	#############################################################################
		1455
1356	package CFClient::UI::VBox;	1456	package CFClient::UI::VBox;
1357		1457
1358	# TODO: wrap into common Box base class
1359
1360	our @ISA = CFClient::UI::Container::;	1458	our @ISA = CFClient::UI::Box::;
1361		1459
1362	sub size_request {	1460	sub new {
1363	my ($self) = @_;	1461	my $class = shift;
1364		1462
1365	my @alloc = map [$_->size_request], @{$self->{children}};	1463	$class->SUPER::new (
1366		1464	vertical => 1,
1367	(	1465	@_,
1368	(List::Util::max map $_->[0], @alloc),
1369	(List::Util::sum map $_->[1], @alloc),
1370	)	1466	)
1371	}
1372
1373	sub size_allocate {
1374	my ($self, $w, $h) = @_;
1375
1376	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1377
1378	my $children = $self->{children};
1379
1380	my @h = map $_->{req_h}, @$children;
1381
1382	my $req_h = List::Util::sum @h;
1383
1384	if ($req_h > $h) {
1385	# ah well, not enough space
1386	$_ *= $h / $req_h for @h;
1387	} else {
1388	my $exp = List::Util::sum map $_->{expand}, @$children;
1389	$exp ||= 1;
1390
1391	for (0 .. $#$children) {
1392	my $child = $children->[$_];
1393
1394	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1395	}
1396	}
1397
1398	CFClient::UI::harmonize \@h;
1399
1400	my $y = 0;
1401	for (0 .. $#$children) {
1402	my $child = $children->[$_];
1403	my $h = $h[$_];
1404	$child->configure (0, $y, $w, $h);
1405
1406	$y += $h;
1407	}
1408
1409	1
1410	}	1467	}
1411		1468
1412	#############################################################################	1469	#############################################################################
1413		1470
1414	package CFClient::UI::Label;	1471	package CFClient::UI::Label;
…		…
1431	ellipsise => 3, # end	1488	ellipsise => 3, # end
1432	layout => (new CFClient::Layout),	1489	layout => (new CFClient::Layout),
1433	fontsize => 1,	1490	fontsize => 1,
1434	align => -1,	1491	align => -1,
1435	valign => -1,	1492	valign => -1,
1436	padding => 2,	1493	padding_x => 2,
		1494	padding_y => 2,
1437	can_events => 0,	1495	can_events => 0,
1438	%arg	1496	%arg
1439	);	1497	);
1440		1498
1441	if (exists $self->{template}) {	1499	if (exists $self->{template}) {
…		…
1477	$self->{text} = "T$text";	1535	$self->{text} = "T$text";
1478		1536
1479	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1537	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1480	$self->{layout}->set_text ($text);	1538	$self->{layout}->set_text ($text);
1481		1539
		1540	$self->realloc;
1482	$self->update;	1541	$self->update;
1483	$self->check_size;
1484	}	1542	}
1485		1543
1486	sub set_markup {	1544	sub set_markup {
1487	my ($self, $markup) = @_;	1545	my ($self, $markup) = @_;
1488		1546
…		…
1492	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1550	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493		1551
1494	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1552	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1495	$self->{layout}->set_markup ($markup);	1553	$self->{layout}->set_markup ($markup);
1496		1554
		1555	$self->realloc;
1497	$self->update;	1556	$self->update;
1498	$self->check_size;
1499	}	1557	}
1500		1558
1501	sub size_request {	1559	sub size_request {
1502	my ($self) = @_;	1560	my ($self) = @_;
1503		1561
…		…
1517		1575
1518	$w = List::Util::max $w, $w2;	1576	$w = List::Util::max $w, $w2;
1519	$h = List::Util::max $h, $h2;	1577	$h = List::Util::max $h, $h2;
1520	}	1578	}
1521		1579
1522	(	1580	($w, $h)
1523	$w + $self->{padding} * 2,
1524	$h + $self->{padding} * 2,
1525	)
1526	}	1581	}
1527		1582
1528	sub size_allocate {	1583	sub size_allocate {
1529	my ($self, $w, $h) = @_;	1584	my ($self, $w, $h) = @_;
1530		1585
		1586	delete $self->{ox};
		1587
1531	delete $self->{texture};	1588	delete $self->{texture}
		1589	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1532	}	1590	}
1533		1591
1534	sub set_fontsize {	1592	sub set_fontsize {
1535	my ($self, $fontsize) = @_;	1593	my ($self, $fontsize) = @_;
1536		1594
1537	$self->{fontsize} = $fontsize;	1595	$self->{fontsize} = $fontsize;
1538	delete $self->{texture};	1596	delete $self->{texture};
1539		1597
1540	$self->update;	1598	$self->realloc;
1541	$self->check_size;
1542	}	1599	}
1543		1600
1544	sub _draw {	1601	sub _draw {
1545	my ($self) = @_;	1602	my ($self) = @_;
1546		1603
…		…
1552	$self->{layout}->set_width ($self->{w});	1609	$self->{layout}->set_width ($self->{w});
1553	$self->{layout}->set_ellipsise ($self->{ellipsise});	1610	$self->{layout}->set_ellipsise ($self->{ellipsise});
1554	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1611	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1555	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1612	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1556		1613
1557	my $tex = new_from_layout CFClient::Texture $self->{layout};	1614	new_from_layout CFClient::Texture $self->{layout}
		1615	};
1558		1616
		1617	unless (exists $self->{ox}) {
1559	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1618	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1560	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1619	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1561	: ($self->{w} - $tex->{w}) * 0.5);	1620	: ($self->{w} - $tex->{w}) * 0.5);
1562		1621
1563	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1622	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1564	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1623	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1565	: ($self->{h} - $tex->{h}) * 0.5);	1624	: ($self->{h} - $tex->{h}) * 0.5);
1566
1567	$tex
1568	};	1625	};
1569		1626
1570	glEnable GL_TEXTURE_2D;	1627	glEnable GL_TEXTURE_2D;
1571	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1628	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1572		1629
…		…
1626	sub set_text {	1683	sub set_text {
1627	my ($self, $text) = @_;	1684	my ($self, $text) = @_;
1628		1685
1629	$self->{cursor} = length $text;	1686	$self->{cursor} = length $text;
1630	$self->_set_text ($text);	1687	$self->_set_text ($text);
1631	$self->update;	1688
1632	$self->check_size;	1689	$self->realloc;
1633	}	1690	}
1634		1691
1635	sub get_text {	1692	sub get_text {
1636	$_[0]{text}	1693	$_[0]{text}
1637	}	1694	}
…		…
1667	$self->{cursor} = length $text;	1724	$self->{cursor} = length $text;
1668	} elsif ($uni == 27) {	1725	} elsif ($uni == 27) {
1669	$self->_emit ('escape');	1726	$self->_emit ('escape');
1670	} elsif ($uni) {	1727	} elsif ($uni) {
1671	substr $text, $self->{cursor}++, 0, chr $uni;	1728	substr $text, $self->{cursor}++, 0, chr $uni;
		1729	} else {
		1730	return 0;
1672	}	1731	}
1673		1732
1674	$self->_set_text ($text);	1733	$self->_set_text ($text);
1675	$self->update;	1734
1676	$self->check_size;	1735	$self->realloc;
		1736
		1737	1
1677	}	1738	}
1678		1739
1679	sub focus_in {	1740	sub focus_in {
1680	my ($self) = @_;	1741	my ($self) = @_;
1681		1742
…		…
1696	utf8::encode $text;	1757	utf8::encode $text;
1697	$self->{cursor} = length substr $text, 0, $idx;	1758	$self->{cursor} = length substr $text, 0, $idx;
1698		1759
1699	$self->_set_text ($self->{text});	1760	$self->_set_text ($self->{text});
1700	$self->update;	1761	$self->update;
		1762
		1763	1
1701	}	1764	}
1702		1765
1703	sub mouse_motion {	1766	sub mouse_motion {
1704	my ($self, $ev, $x, $y) = @_;	1767	my ($self, $ev, $x, $y) = @_;
1705	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1768	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1769
		1770	0
1706	}	1771	}
1707		1772
1708	sub _draw {	1773	sub _draw {
1709	my ($self) = @_;	1774	my ($self) = @_;
1710		1775
…		…
1787	} else {	1852	} else {
1788	$self->set_text ($self->{history_saveback});	1853	$self->set_text ($self->{history_saveback});
1789	}	1854	}
1790		1855
1791	} else {	1856	} else {
1792	$self->SUPER::key_down ($ev);	1857	return $self->SUPER::key_down ($ev)
		1858	}
		1859
1793	}	1860	1
1794
1795	}	1861	}
1796		1862
1797	#############################################################################	1863	#############################################################################
1798		1864
1799	package CFClient::UI::Button;	1865	package CFClient::UI::Button;
…		…
1808		1874
1809	sub new {	1875	sub new {
1810	my $class = shift;	1876	my $class = shift;
1811		1877
1812	$class->SUPER::new (	1878	$class->SUPER::new (
1813	padding => 4,	1879	padding_x => 4,
		1880	padding_y => 4,
1814	fg => [1, 1, 1],	1881	fg => [1, 1, 1],
1815	active_fg => [0, 0, 1],	1882	active_fg => [0, 0, 1],
1816	can_hover => 1,	1883	can_hover => 1,
1817	align => 0,	1884	align => 0,
1818	valign => 0,	1885	valign => 0,
…		…
1827	my ($self, $ev, $x, $y) = @_;	1894	my ($self, $ev, $x, $y) = @_;
1828		1895
1829	$self->emit ("activate")	1896	$self->emit ("activate")
1830	if $x >= 0 && $x < $self->{w}	1897	if $x >= 0 && $x < $self->{w}
1831	&& $y >= 0 && $y < $self->{h};	1898	&& $y >= 0 && $y < $self->{h};
		1899
		1900	1
1832	}	1901	}
1833		1902
1834	sub _draw {	1903	sub _draw {
1835	my ($self) = @_;	1904	my ($self) = @_;
1836		1905
…		…
1865		1934
1866	sub new {	1935	sub new {
1867	my $class = shift;	1936	my $class = shift;
1868		1937
1869	$class->SUPER::new (	1938	$class->SUPER::new (
1870	padding => 2,	1939	padding_x => 2,
		1940	padding_y => 2,
1871	fg => [1, 1, 1],	1941	fg => [1, 1, 1],
1872	active_fg => [1, 1, 0],	1942	active_fg => [1, 1, 0],
1873	bg => [0, 0, 0, 0.2],	1943	bg => [0, 0, 0, 0.2],
1874	active_bg => [1, 1, 1, 0.5],	1944	active_bg => [1, 1, 1, 0.5],
1875	state => 0,	1945	state => 0,
…		…
1879	}	1949	}
1880		1950
1881	sub size_request {	1951	sub size_request {
1882	my ($self) = @_;	1952	my ($self) = @_;
1883		1953
1884	($self->{padding} * 2 + 6) x 2	1954	(6) x 2
1885	}	1955	}
1886		1956
1887	sub button_down {	1957	sub button_down {
1888	my ($self, $ev, $x, $y) = @_;	1958	my ($self, $ev, $x, $y) = @_;
1889		1959
1890	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1960	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1891	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1961	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1892	$self->{state} = !$self->{state};	1962	$self->{state} = !$self->{state};
1893	$self->_emit (changed => $self->{state});	1963	$self->_emit (changed => $self->{state});
		1964	} else {
		1965	return 0
		1966	}
		1967
1894	}	1968	1
1895	}	1969	}
1896		1970
1897	sub _draw {	1971	sub _draw {
1898	my ($self) = @_;	1972	my ($self) = @_;
1899		1973
1900	$self->SUPER::_draw;	1974	$self->SUPER::_draw;
1901		1975
1902	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1976	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1903		1977
1904	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1978	my ($w, $h) = @$self{qw(w h)};
		1979
		1980	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1905		1981
1906	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1982	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1907		1983
1908	my $tex = $self->{state} ? $tex[1] : $tex[0];	1984	my $tex = $self->{state} ? $tex[1] : $tex[0];
1909		1985
…		…
2174	fg => [1, 1, 1],	2250	fg => [1, 1, 1],
2175	active_fg => [0, 0, 0],	2251	active_fg => [0, 0, 0],
2176	bg => [0, 0, 0, 0.2],	2252	bg => [0, 0, 0, 0.2],
2177	active_bg => [1, 1, 1, 0.5],	2253	active_bg => [1, 1, 1, 0.5],
2178	range => [0, 0, 100, 10, 0],	2254	range => [0, 0, 100, 10, 0],
2179	req_w => $::WIDTH / 80,	2255	min_w => $::WIDTH / 80,
2180	req_h => $::WIDTH / 80,	2256	min_h => $::WIDTH / 80,
2181	vertical => 0,	2257	vertical => 0,
2182	can_hover => 1,	2258	can_hover => 1,
2183	inner_pad => 0.02,	2259	inner_pad => 0.02,
2184	@_	2260	@_
2185	);	2261	);
…		…
2188	$self->update;	2264	$self->update;
2189		2265
2190	$self	2266	$self
2191	}	2267	}
2192		2268
		2269	sub changed { }
		2270
2193	sub set_range {	2271	sub set_range {
2194	my ($self, $range) = @_;	2272	my ($self, $range) = @_;
2195		2273
2196	($range, $self->{range}) = ($self->{range}, $range);	2274	($range, $self->{range}) = ($self->{range}, $range);
2197		2275
…		…
2223	}	2301	}
2224		2302
2225	sub size_request {	2303	sub size_request {
2226	my ($self) = @_;	2304	my ($self) = @_;
2227		2305
2228	my $w = $self->{req_w};	2306	($self->{req_w}, $self->{req_h})
2229	my $h = $self->{req_h};
2230
2231	$self->{vertical} ? ($h, $w) : ($w, $h)
2232	}	2307	}
2233		2308
2234	sub button_down {	2309	sub button_down {
2235	my ($self, $ev, $x, $y) = @_;	2310	my ($self, $ev, $x, $y) = @_;
2236		2311
2237	$self->SUPER::button_down ($ev, $x, $y);	2312	$self->SUPER::button_down ($ev, $x, $y);
2238		2313
2239	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2314	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240		2315
2241	$self->mouse_motion ($ev, $x, $y);	2316	$self->mouse_motion ($ev, $x, $y)
2242	}	2317	}
2243		2318
2244	sub mouse_motion {	2319	sub mouse_motion {
2245	my ($self, $ev, $x, $y) = @_;	2320	my ($self, $ev, $x, $y) = @_;
2246		2321
…		…
2250	my (undef, $lo, $hi, $page) = @{$self->{range}};	2325	my (undef, $lo, $hi, $page) = @{$self->{range}};
2251		2326
2252	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2327	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253		2328
2254	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2329	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2330	} else {
		2331	return 0;
		2332	}
		2333
2255	}	2334	1
2256	}	2335	}
2257		2336
2258	sub update {	2337	sub update {
2259	my ($self) = @_;	2338	my ($self) = @_;
2260		2339
…		…
2592	state => 0,	2671	state => 0,
2593	on_activate => \&toggle_flopper,	2672	on_activate => \&toggle_flopper,
2594	@_	2673	@_
2595	);	2674	);
2596		2675
2597	if ($self->{state}) {
2598	$self->{state} = 0;
2599	$self->toggle_flopper;
2600	}
2601
2602	$self	2676	$self
2603	}	2677	}
2604		2678
2605	sub toggle_flopper {	2679	sub toggle_flopper {
2606	my ($self) = @_;	2680	my ($self) = @_;
2607		2681
2608	# TODO: use animation	2682	$self->{other}->toggle_visibility;
2609	if ($self->{state} = !$self->{state}) {
2610	$CFClient::UI::ROOT->add ($self->{other});
2611	$self->{other}->move ($self->coord2global (0, $self->{h}));
2612	$self->_emit ("open");
2613	} else {
2614	$CFClient::UI::ROOT->remove ($self->{other});
2615	$self->_emit ("close");
2616	}
2617
2618	$self->_emit (changed => $self->{state});
2619	}	2683	}
2620		2684
2621	#############################################################################	2685	#############################################################################
2622		2686
2623	package CFClient::UI::Tooltip;	2687	package CFClient::UI::Tooltip;
…		…
2636	}	2700	}
2637		2701
2638	sub set_tooltip_from {	2702	sub set_tooltip_from {
2639	my ($self, $widget) = @_;	2703	my ($self, $widget) = @_;
2640		2704
		2705	my $tooltip = $widget->{tooltip};
		2706
		2707	if ($ENV{CFPLUS_DEBUG} & 2) {
		2708	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2709	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2710	. "req $widget->{req_w} $widget->{req_h}\n"
		2711	. "visible $widget->{visible}";
		2712	}
		2713
2641	$self->add (new CFClient::UI::Label	2714	$self->add (new CFClient::UI::Label
2642	markup => $widget->{tooltip},	2715	markup => $tooltip,
2643	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2716	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2644	fontsize => 0.8,	2717	fontsize => 0.8,
2645	fg => [0, 0, 0, 1],	2718	fg => [0, 0, 0, 1],
2646	ellipsise => 0,	2719	ellipsise => 0,
2647	font => ($widget->{tooltip_font} || $::FONT_PROP),	2720	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2658		2731
2659	sub size_allocate {	2732	sub size_allocate {
2660	my ($self, $w, $h) = @_;	2733	my ($self, $w, $h) = @_;
2661		2734
2662	$self->SUPER::size_allocate ($w - 4, $h - 4);	2735	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2736	}
		2737
		2738	sub visibility_change {
		2739	my ($self, $visible) = @_;
		2740
		2741	return unless $visible;
		2742
		2743	$self->{root}->on_post_alloc ("move_$self" => sub {
		2744	my $widget = $self->{owner}
		2745	or return;
		2746
		2747	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2748
		2749	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2750	if $x + $self->{w} > $::WIDTH;
		2751
		2752	$self->move_abs ($x, $y);
		2753	});
2663	}	2754	}
2664		2755
2665	sub _draw {	2756	sub _draw {
2666	my ($self) = @_;	2757	my ($self) = @_;
2667		2758
…		…
2684	glVertex $w, $h;	2775	glVertex $w, $h;
2685	glVertex $w, 0;	2776	glVertex $w, 0;
2686	glEnd;	2777	glEnd;
2687		2778
2688	glTranslate 2 - 0.375, 2 - 0.375;	2779	glTranslate 2 - 0.375, 2 - 0.375;
		2780
2689	$self->SUPER::_draw;	2781	$self->SUPER::_draw;
2690	}	2782	}
2691		2783
2692	#############################################################################	2784	#############################################################################
2693		2785
…		…
2769	$self->SUPER::DESTROY;	2861	$self->SUPER::DESTROY;
2770	}	2862	}
2771		2863
2772	#############################################################################	2864	#############################################################################
2773		2865
2774	package CFClient::UI::Inventory;	2866	package CFClient::UI::Buttonbar;
2775		2867
2776	our @ISA = CFClient::UI::ScrolledWindow::;	2868	our @ISA = CFClient::UI::HBox::;
2777		2869
2778	sub new {	2870	# TODO: should actualyl wrap buttons and other goodies.
2779	my $class = shift;
2780
2781	my $self = $class->SUPER::new (
2782	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2783	@_,
2784	);
2785
2786	$self
2787	}
2788
2789	sub set_items {
2790	my ($self, $items) = @_;
2791
2792	$self->{scrolled}->clear;
2793	return unless $items;
2794
2795	my @items = sort {
2796	($a->{type} <=> $b->{type})
2797	or ($a->{name} cmp $b->{name})
2798	} @$items;
2799
2800	$self->{real_items} = \@items;
2801
2802	my $row = 0;
2803	for my $item (@items) {
2804	CFClient::Item::update_widgets $item;
2805
2806	$self->{scrolled}->add (0, $row, $item->{face_widget});
2807	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2808	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2809
2810	$row++;
2811	}
2812	}
2813
2814	sub size_request {
2815	my ($self) = @_;
2816	($self->{req_w}, $self->{req_h});
2817	}
2818		2871
2819	#############################################################################	2872	#############################################################################
2820		2873
2821	package CFClient::UI::Menu;	2874	package CFClient::UI::Menu;
2822		2875
…		…
2863	# maybe save $GRAB? must be careful about events...	2916	# maybe save $GRAB? must be careful about events...
2864	$GRAB = $self;	2917	$GRAB = $self;
2865	$self->{button} = $ev->{button};	2918	$self->{button} = $ev->{button};
2866		2919
2867	$self->show;	2920	$self->show;
2868	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2921	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2869	}	2922	}
2870		2923
2871	sub mouse_motion {	2924	sub mouse_motion {
2872	my ($self, $ev, $x, $y) = @_;	2925	my ($self, $ev, $x, $y) = @_;
2873		2926
2874	# TODO: should use vbox->find_widget or so	2927	# TODO: should use vbox->find_widget or so
2875	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2928	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2876	$self->{hover} = $self->{item}{$HOVER};	2929	$self->{hover} = $self->{item}{$HOVER};
		2930
		2931	0
2877	}	2932	}
2878		2933
2879	sub button_up {	2934	sub button_up {
2880	my ($self, $ev, $x, $y) = @_;	2935	my ($self, $ev, $x, $y) = @_;
2881		2936
…		…
2883	undef $GRAB;	2938	undef $GRAB;
2884	$self->hide;	2939	$self->hide;
2885		2940
2886	$self->_emit ("popdown");	2941	$self->_emit ("popdown");
2887	$self->{hover}[1]->() if $self->{hover};	2942	$self->{hover}[1]->() if $self->{hover};
		2943	} else {
		2944	return 0
		2945	}
		2946
2888	}	2947	1
		2948	}
		2949
		2950	#############################################################################
		2951
		2952	package CFClient::UI::Multiplexer;
		2953
		2954	our @ISA = CFClient::UI::Container::;
		2955
		2956	sub new {
		2957	my $class = shift;
		2958
		2959	my $self = $class->SUPER::new (
		2960	@_,
		2961	);
		2962
		2963	$self->{current} = $self->{children}[0]
		2964	if @{ $self->{children} };
		2965
		2966	$self
		2967	}
		2968
		2969	sub add {
		2970	my ($self, @widgets) = @_;
		2971
		2972	$self->SUPER::add (@widgets);
		2973
		2974	$self->{current} = $self->{children}[0]
		2975	if @{ $self->{children} };
		2976	}
		2977
		2978	sub set_current_page {
		2979	my ($self, $page_or_widget) = @_;
		2980
		2981	my $widget = ref $page_or_widget
		2982	? $page_or_widget
		2983	: $self->{children}[$page_or_widget];
		2984
		2985	$self->{current} = $widget;
		2986	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2987
		2988	$self->_emit (page_changed => $self->{current});
		2989
		2990	$self->realloc;
		2991	}
		2992
		2993	sub visible_children {
		2994	$_[0]{current}
		2995	}
		2996
		2997	sub size_request {
		2998	my ($self) = @_;
		2999
		3000	$self->{current}->size_request
		3001	}
		3002
		3003	sub size_allocate {
		3004	my ($self, $w, $h) = @_;
		3005
		3006	$self->{current}->configure (0, 0, $w, $h);
		3007	}
		3008
		3009	sub _draw {
		3010	my ($self) = @_;
		3011
		3012	$self->{current}->draw;
		3013	}
		3014
		3015	#############################################################################
		3016
		3017	package CFClient::UI::Notebook;
		3018
		3019	our @ISA = CFClient::UI::VBox::;
		3020
		3021	sub new {
		3022	my $class = shift;
		3023
		3024	my $self = $class->SUPER::new (
		3025	buttonbar => (new CFClient::UI::Buttonbar),
		3026	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3027	@_,
		3028	);
		3029
		3030	$self->SUPER::add ($self->{buttonbar}, $self->{multiplexer});
		3031
		3032	$self
		3033	}
		3034
		3035	sub add {
		3036	my ($self, $title, $widget, $tooltip) = @_;
		3037
		3038	Scalar::Util::weaken $self;
		3039
		3040	$self->{buttonbar}->add (new CFClient::UI::Button
		3041	markup => $title,
		3042	tooltip => $tooltip,
		3043	on_activate => sub { $self->set_current_page ($widget) },
		3044	);
		3045
		3046	$self->{multiplexer}->add ($widget);
		3047	}
		3048
		3049	sub set_current_page {
		3050	my ($self, $page) = @_;
		3051
		3052	$self->{multiplexer}->set_current_page ($page);
		3053	$self->_emit (page_changed => $self->{multiplexer}{current});
2889	}	3054	}
2890		3055
2891	#############################################################################	3056	#############################################################################
2892		3057
2893	package CFClient::UI::Statusbox;	3058	package CFClient::UI::Statusbox;
…		…
2998	$self->SUPER::reconfigure;	3163	$self->SUPER::reconfigure;
2999	}	3164	}
3000		3165
3001	#############################################################################	3166	#############################################################################
3002		3167
3003	package CFClient::UI::Root;	3168	package CFClient::UI::Inventory;
3004		3169
3005	our @ISA = CFClient::UI::Container::;	3170	our @ISA = CFClient::UI::ScrolledWindow::;
3006
3007	use CFClient::OpenGL;
3008		3171
3009	sub new {	3172	sub new {
3010	my $class = shift;	3173	my $class = shift;
3011		3174
3012	$class->SUPER::new (	3175	my $self = $class->SUPER::new (
		3176	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3177	@_,
		3178	);
		3179
		3180	$self
		3181	}
		3182
		3183	sub set_items {
		3184	my ($self, $items) = @_;
		3185
		3186	$self->{scrolled}->clear;
		3187	return unless $items;
		3188
		3189	my @items = sort {
		3190	($a->{type} <=> $b->{type})
		3191	or ($a->{name} cmp $b->{name})
		3192	} @$items;
		3193
		3194	$self->{real_items} = \@items;
		3195
		3196	my $row = 0;
		3197	for my $item (@items) {
		3198	CFClient::Item::update_widgets $item;
		3199
		3200	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3201	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3202	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3203
		3204	$row++;
		3205	}
		3206	}
		3207
		3208	#############################################################################
		3209
		3210	package CFClient::UI::BindEditor;
		3211
		3212	our @ISA = CFClient::UI::FancyFrame::;
		3213
		3214	sub new {
		3215	my $class = shift;
		3216
		3217	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3218
		3219	$self->add (my $vb = new CFClient::UI::VBox);
		3220
		3221
		3222	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3223	text => "start recording",
		3224	tooltip => "Start/Stops recording of actions."
		3225	."All subsequent actions after the recording started will be captured."
		3226	."The actions are displayed after the record was stopped."
		3227	."To bind the action you have to click on the 'Bind' button",
		3228	on_activate => sub {
		3229	unless ($self->{recording}) {
		3230	$self->start;
		3231	} else {
		3232	$self->stop;
		3233	}
		3234	});
		3235
		3236	$vb->add (new CFClient::UI::Label text => "Actions:");
		3237	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3238
		3239	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3240	$vb->add (my $hb = new CFClient::UI::HBox);
		3241	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3242	$hb->add (new CFClient::UI::Button
		3243	text => "bind",
		3244	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3245	on_activate => sub {
		3246	$self->ask_for_bind;
		3247	});
		3248
		3249	$vb->add (my $hb = new CFClient::UI::HBox);
		3250	$hb->add (new CFClient::UI::Button
		3251	text => "ok",
		3252	expand => 1,
		3253	tooltip => "This closes the binding editor and saves the binding",
		3254	on_activate => sub {
		3255	$self->hide;
		3256	$self->commit;
		3257	});
		3258
		3259	$hb->add (new CFClient::UI::Button
		3260	text => "cancel",
		3261	expand => 1,
		3262	tooltip => "This closes the binding editor without saving",
		3263	on_activate => sub {
		3264	$self->hide;
		3265	$self->{binding_cancel}->()
		3266	if $self->{binding_cancel};
		3267	});
		3268
		3269	$self->update_binding_widgets;
		3270
		3271	$self
		3272	}
		3273
		3274	sub commit {
		3275	my ($self) = @_;
		3276	my ($mod, $sym, $cmds) = $self->get_binding;
		3277	if ($sym != 0 && @$cmds > 0) {
		3278	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3279	."'. Don't forget 'Save Config'!");
		3280	$self->{binding_change}->($mod, $sym, $cmds)
		3281	if $self->{binding_change};
		3282	} else {
		3283	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3284	$self->{binding_cancel}->()
		3285	if $self->{binding_cancel};
		3286	}
		3287	}
		3288
		3289	sub start {
		3290	my ($self) = @_;
		3291
		3292	$self->{rec_btn}->set_text ("stop recording");
		3293	$self->{recording} = 1;
		3294	$self->clear_command_list;
		3295	$::CONN->start_record if $::CONN;
		3296	}
		3297
		3298	sub stop {
		3299	my ($self) = @_;
		3300
		3301	$self->{rec_btn}->set_text ("start recording");
		3302	$self->{recording} = 0;
		3303
		3304	my $rec;
		3305	$rec = $::CONN->stop_record if $::CONN;
		3306	return unless ref $rec eq 'ARRAY';
		3307	$self->set_command_list ($rec);
		3308	}
		3309
		3310
		3311	sub ask_for_bind_and_commit {
		3312	my ($self) = @_;
		3313	$self->ask_for_bind (1);
		3314	}
		3315
		3316	sub ask_for_bind {
		3317	my ($self, $commit) = @_;
		3318
		3319	CFClient::Binder::open_binding_dialog (sub {
		3320	my ($mod, $sym) = @_;
		3321	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3322	$self->update_binding_widgets;
		3323	$self->commit if $commit;
		3324	});
		3325	}
		3326
		3327	# $mod and $sym are the modifiers and key symbol
		3328	# $cmds is a array ref of strings (the commands)
		3329	# $cb is the callback that is executed on OK
		3330	# $ccb is the callback that is executed on CANCEL and
		3331	# when the binding was unsuccessful on OK
		3332	sub set_binding {
		3333	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3334
		3335	$self->clear_command_list;
		3336	$self->{recording} = 0;
		3337	$self->{rec_btn}->set_text ("start recording");
		3338
		3339	$self->{binding} = [$mod, $sym];
		3340	$self->{commands} = $cmds;
		3341
		3342	$self->{binding_change} = $cb;
		3343	$self->{binding_cancel} = $ccb;
		3344
		3345	$self->update_binding_widgets;
		3346	}
		3347
		3348	# this is a shortcut method that asks for a binding
		3349	# and then just binds it.
		3350	sub do_quick_binding {
		3351	my ($self, $cmds) = @_;
		3352	$self->set_binding (undef, undef, $cmds, sub {
		3353	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3354	});
		3355	$self->ask_for_bind (1);
		3356	}
		3357
		3358	sub update_binding_widgets {
		3359	my ($self) = @_;
		3360	my ($mod, $sym, $cmds) = $self->get_binding;
		3361	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3362	$self->set_command_list ($cmds);
		3363	}
		3364
		3365	sub get_binding {
		3366	my ($self) = @_;
		3367	return (
		3368	$self->{binding}->[0],
		3369	$self->{binding}->[1],
		3370	[ grep { defined $_ } @{$self->{commands}} ]
		3371	);
		3372	}
		3373
		3374	sub clear_command_list {
		3375	my ($self) = @_;
		3376	$self->{cmdbox}->clear ();
		3377	}
		3378
		3379	sub set_command_list {
		3380	my ($self, $cmds) = @_;
		3381
		3382	$self->{cmdbox}->clear ();
		3383	$self->{commands} = $cmds;
		3384
		3385	my $idx = 0;
		3386
		3387	for (@$cmds) {
		3388	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3389
		3390	my $i = $idx;
		3391	$hb->add (new CFClient::UI::Label text => $_);
		3392	$hb->add (new CFClient::UI::Button
		3393	text => "delete",
		3394	tooltip => "Deletes the action from the record",
		3395	on_activate => sub {
		3396	$self->{cmdbox}->remove ($hb);
		3397	$cmds->[$i] = undef;
		3398	});
		3399
		3400
		3401	$idx++
		3402	}
		3403	}
		3404
		3405	#############################################################################
		3406
		3407	package CFClient::UI::SpellList;
		3408
		3409	our @ISA = CFClient::UI::ScrolledWindow::;
		3410
		3411	sub new {
		3412	my $class = shift;
		3413
		3414	my $self = $class->SUPER::new (
		3415	binding => [],
		3416	commands => [],
		3417	scrolled => (new CFClient::UI::Table),
		3418	@_,
		3419	)
		3420	}
		3421
		3422	# XXX: Do sorting? Argl...
		3423	sub add_spell {
		3424	my ($self, $spell) = @_;
		3425	$self->{spells}->{$spell->{name}} = $spell;
		3426
		3427	$self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3428	face => $spell->{face},
		3429	can_hover => 1,
		3430	can_events => 1,
		3431	tooltip => $spell->{message});
		3432
		3433	$self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3434	text => $spell->{name},
		3435	can_hover => 1,
		3436	can_events => 1,
		3437	tooltip => $spell->{message},
		3438	expand => 1);
		3439
		3440	$self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3441	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3442	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3443	expand => 1);
		3444
		3445	$self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3446	text => "bind to key",
		3447	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3448	}
		3449
		3450	sub rebuild_spell_list {
		3451	my ($self) = @_;
		3452	$self->{tbl_idx} = 0;
		3453	$self->add_spell ($_) for values %{$self->{spells}};
		3454	}
		3455
		3456	sub remove_spell {
		3457	my ($self, $spell) = @_;
		3458	delete $self->{spells}->{$spell->{name}};
		3459	$self->rebuild_spell_list;
		3460	}
		3461
		3462	#############################################################################
		3463
		3464	package CFClient::UI::Root;
		3465
		3466	our @ISA = CFClient::UI::Container::;
		3467
		3468	use CFClient::OpenGL;
		3469
		3470	sub new {
		3471	my $class = shift;
		3472
		3473	my $self = $class->SUPER::new (
3013	visible => 1,	3474	visible => 1,
3014	@_,	3475	@_,
3015	)	3476	);
3016	}
3017		3477
3018	sub configure {	3478	Scalar::Util::weaken ($self->{root} = $self);
3019	my ($self, $x, $y, $w, $h) = @_;
3020		3479
3021	$self->{w} = $w;	3480	$self
3022	$self->{h} = $h;
3023	}
3024
3025	sub check_size {
3026	my ($self) = @_;
3027
3028	$self->size_allocate ($self->{w}, $self->{h})
3029	if $self->{w};
3030	}	3481	}
3031		3482
3032	sub size_request {	3483	sub size_request {
3033	my ($self) = @_;	3484	my ($self) = @_;
3034		3485
3035	($self->{w}, $self->{h})	3486	($self->{w}, $self->{h})
		3487	}
		3488
		3489	sub _to_pixel {
		3490	my ($coord, $size, $max) = @_;
		3491
		3492	$coord =
		3493	$coord eq "center" ? ($max - $size) * 0.5
		3494	: $coord eq "max" ? $max
		3495	: $coord;
		3496
		3497	$coord = 0 if $coord < 0;
		3498	$coord = $max - $size if $coord > $max - $size;
		3499
		3500	int $coord + 0.5
3036	}	3501	}
3037		3502
3038	sub size_allocate {	3503	sub size_allocate {
3039	my ($self, $w, $h) = @_;	3504	my ($self, $w, $h) = @_;
3040		3505
3041	for my $child ($self->children) {	3506	for my $child ($self->children) {
3042	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3507	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3043		3508
3044	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3509	$X = $child->{force_x} if exists $child->{force_x};
3045	if exists $child->{req_x};	3510	$Y = $child->{force_y} if exists $child->{force_y};
3046		3511
3047	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3512	$X = _to_pixel $X, $W, $self->{w};
3048	if exists $child->{req_y};	3513	$Y = _to_pixel $Y, $H, $self->{h};
3049
3050	$X = $self->{user_x} if exists $self->{user_x};
3051	$Y = $self->{user_y} if exists $self->{user_y};
3052
3053	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3054	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3055		3514
3056	$child->configure ($X, $Y, $W, $H);	3515	$child->configure ($X, $Y, $W, $H);
3057	}	3516	}
3058	}	3517	}
3059		3518
…		…
3070	}	3529	}
3071		3530
3072	sub update {	3531	sub update {
3073	my ($self) = @_;	3532	my ($self) = @_;
3074		3533
3075	$self->check_size;
3076	$::WANT_REFRESH++;	3534	$::WANT_REFRESH++;
3077	}	3535	}
3078		3536
3079	sub add {	3537	sub add {
3080	my ($self, @children) = @_;	3538	my ($self, @children) = @_;
3081		3539
3082	for (my @widgets = @children; my $w = pop @widgets; ) {
3083	push @widgets, $w->children;
3084	$w->{root} = $self;
3085	$w->{visible} = $self->{visible} + 1;
3086	}
3087
3088	for my $child (@children) {
3089	$child->{is_toplevel} = 1;	3540	$_->{is_toplevel} = 1
3090		3541	for @children;
3091	# integerise window positions
3092	$child->{x} = int $child->{x};
3093	$child->{y} = int $child->{y};
3094	}
3095		3542
3096	$self->SUPER::add (@children);	3543	$self->SUPER::add (@children);
3097	}	3544	}
3098		3545
3099	sub remove {	3546	sub remove {
3100	my ($self, @children) = @_;	3547	my ($self, @children) = @_;
3101		3548
3102	$self->SUPER::remove (@children);	3549	$self->SUPER::remove (@children);
		3550
		3551	delete $self->{is_toplevel}
		3552	for @children;
3103		3553
3104	while (@children) {	3554	while (@children) {
3105	my $w = pop @children;	3555	my $w = pop @children;
3106	push @children, $w->children;	3556	push @children, $w->children;
3107	$w->set_invisible;	3557	$w->set_invisible;
…		…
3126	while ($self->{refresh_hook}) {	3576	while ($self->{refresh_hook}) {
3127	$_->()	3577	$_->()
3128	for values %{delete $self->{refresh_hook}};	3578	for values %{delete $self->{refresh_hook}};
3129	}	3579	}
3130		3580
3131	if ($self->{check_size}) {	3581	if ($self->{realloc}) {
		3582	my %queue;
3132	my @queue;	3583	my @queue;
		3584	my $widget;
3133		3585
3134	for (;;) {	3586	outer:
3135	if ($self->{check_size}) {	3587	while () {
3136	#TODO use array-of-depth approach	3588	if (my $realloc = delete $self->{realloc}) {
		3589	for $widget (values %$realloc) {
		3590	$widget->{visible} or next; # do not resize invisible widgets
3137		3591
3138	@queue = sort { $a->{visible} <=> $b->{visible} }	3592	$queue{$widget+0}++ and next; # duplicates are common
3139	@queue, values %{delete $self->{check_size}};	3593
		3594	push @{ $queue[$widget->{visible}] }, $widget;
		3595	}
3140	}	3596	}
3141		3597
		3598	while () {
		3599	@queue or last outer;
		3600
3142	my $widget = pop @queue || last;	3601	$widget = pop @{ $queue[-1] || [] }
3143		3602	and last;
3144	defined $widget->{visible} or last; # do not resize invisible widgets
3145
3146	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3147	? @$widget{qw(user_w user_h)}
3148	: $widget->size_request;
3149
3150	if (delete $widget->{force_alloc}
3151	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3152	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3153		3603
		3604	pop @queue;
		3605	}
		3606
		3607	delete $queue{$widget+0};
		3608
		3609	my ($w, $h) = $widget->size_request;
		3610
		3611	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3612	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3613
		3614	$w = $widget->{force_w} if exists $widget->{force_w};
		3615	$h = $widget->{force_h} if exists $widget->{force_h};
		3616
		3617	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3618	|| delete $widget->{force_realloc}) {
3154	$widget->{req_w} = $w;	3619	$widget->{req_w} = $w;
3155	$widget->{req_h} = $h;	3620	$widget->{req_h} = $h;
3156		3621
3157	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3622	$self->{size_alloc}{$widget+0} = $widget;
3158		3623
3159	$widget->{parent}->check_size
3160	if $widget->{parent};	3624	if (my $parent = $widget->{parent}) {
		3625	$self->{realloc}{$parent+0} = $parent
		3626	unless $queue{$parent+0};
		3627
		3628	$parent->{force_size_alloc} = 1;
		3629	$self->{size_alloc}{$parent+0} = $parent;
		3630	}
3161	}	3631	}
		3632
		3633	delete $self->{realloc}{$widget+0};
3162	}	3634	}
3163	}	3635	}
3164		3636
3165	while ($self->{size_alloc}) {	3637	while (my $size_alloc = delete $self->{size_alloc}) {
3166	for (values %{delete $self->{size_alloc}}) {	3638	my @queue = sort { $b->{visible} <=> $a->{visible} }
3167	my ($widget, $w, $h) = @$_;	3639	values %$size_alloc;
		3640
		3641	while () {
		3642	my $widget = pop @queue || last;
		3643
		3644	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3168		3645
3169	$w = 0 if $w < 0;	3646	$w = 0 if $w < 0;
3170	$h = 0 if $h < 0;	3647	$h = 0 if $h < 0;
3171		3648
		3649	$w = int $w + 0.5;
		3650	$h = int $h + 0.5;
		3651
		3652	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3653	$widget->{old_w} = $widget->{w};
		3654	$widget->{old_h} = $widget->{h};
		3655
3172	$widget->{w} = $w;	3656	$widget->{w} = $w;
3173	$widget->{h} = $h;	3657	$widget->{h} = $h;
		3658
3174	$widget->emit (size_allocate => $w, $h);	3659	$widget->emit (size_allocate => $w, $h);
		3660	}
3175	}	3661	}
3176	}	3662	}
3177		3663
3178	while ($self->{post_alloc_hook}) {	3664	while ($self->{post_alloc_hook}) {
3179	$_->()	3665	$_->()
3180	for values %{delete $self->{post_alloc_hook}};	3666	for values %{delete $self->{post_alloc_hook}};
3181	}	3667	}
		3668
3182		3669
3183	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3670	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3184	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3671	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3185	glClear GL_COLOR_BUFFER_BIT;	3672	glClear GL_COLOR_BUFFER_BIT;
3186		3673
…		…
3188	glLoadIdentity;	3675	glLoadIdentity;
3189	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3676	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3190	glMatrixMode GL_MODELVIEW;	3677	glMatrixMode GL_MODELVIEW;
3191	glLoadIdentity;	3678	glLoadIdentity;
3192		3679
		3680	{
		3681	package CFClient::UI::Base;
		3682
		3683	($draw_x, $draw_y, $draw_w, $draw_h) =
		3684	(0, 0, $self->{w}, $self->{h});
		3685	}
		3686
3193	$self->_draw;	3687	$self->_draw;
3194	}	3688	}
3195		3689
3196	#############################################################################	3690	#############################################################################
3197		3691

Diff Legend

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