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.276 by root, Sun Jun 4 00:16:01 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})
…		…
748	$self->{children}[0]->configure (0, 0, $w, $h);	794	$self->{children}[0]->configure (0, 0, $w, $h);
749	}	795	}
750		796
751	#############################################################################	797	#############################################################################
752		798
		799	# back-buffered drawing area
		800
753	package CFClient::UI::Window;	801	package CFClient::UI::Window;
754		802
755	our @ISA = CFClient::UI::Bin::;	803	our @ISA = CFClient::UI::Bin::;
756		804
757	use CFClient::OpenGL;	805	use CFClient::OpenGL;
…		…
775	$self->SUPER::size_allocate ($w, $h);	823	$self->SUPER::size_allocate ($w, $h);
776	$self->update;	824	$self->update;
777	}	825	}
778		826
779	sub _render {	827	sub _render {
		828	my ($self) = @_;
		829
780	$_[0]{children}[0]->draw;	830	$self->{children}[0]->draw;
781	}	831	}
782		832
783	sub render_child {	833	sub render_child {
784	my ($self) = @_;	834	my ($self) = @_;
785		835
786	$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 {
787	glClearColor 0, 0, 0, 0;	837	glClearColor 0, 0, 0, 0;
788	glClear GL_COLOR_BUFFER_BIT;	838	glClear GL_COLOR_BUFFER_BIT;
789		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
790	$self->_render;	847	$self->_render;
791	};	848	};
792	}	849	}
793		850
794	sub _draw {	851	sub _draw {
795	my ($self) = @_;	852	my ($self) = @_;
796		853
797	my ($w, $h) = ($self->w, $self->h);	854	my ($w, $h) = @$self{qw(w h)};
798		855
799	my $tex = $self->{texture}	856	my $tex = $self->{texture}
800	or return;	857	or return;
801		858
802	glEnable GL_TEXTURE_2D;	859	glEnable GL_TEXTURE_2D;
…		…
825	}	882	}
826		883
827	sub size_request {	884	sub size_request {
828	my ($self) = @_;	885	my ($self) = @_;
829		886
830	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	887	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
831		888
832	@$self{qw(child_w child_h)}	889	$w = 10 if $self->{scroll_x};
		890	$h = 10 if $self->{scroll_y};
		891
		892	($w, $h)
833	}	893	}
834		894
835	sub size_allocate {	895	sub size_allocate {
836	my ($self, $w, $h) = @_;	896	my ($self, $w, $h) = @_;
837		897
		898	my $child = $self->child;
		899
838	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	900	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
839	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	901	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
840		902
841	$self->child->configure (0, 0, $w, $h);	903	$self->child->configure (0, 0, $w, $h);
842	$self->update;	904	$self->update;
843	}	905	}
844		906
…		…
880	}	942	}
881		943
882	sub _render {	944	sub _render {
883	my ($self) = @_;	945	my ($self) = @_;
884		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
885	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
886		951
887	$self->SUPER::_render;	952	$self->SUPER::_render;
888	}	953	}
889		954
…		…
892	package CFClient::UI::ScrolledWindow;	957	package CFClient::UI::ScrolledWindow;
893		958
894	our @ISA = CFClient::UI::HBox::;	959	our @ISA = CFClient::UI::HBox::;
895		960
896	sub new {	961	sub new {
897	my $class = shift;	962	my ($class, %arg) = @_;
		963
		964	my $child = delete $arg{child};
898		965
899	my $self;	966	my $self;
900		967
901	my $slider = new CFClient::UI::Slider	968	my $slider = new CFClient::UI::Slider
902	vertical => 1,	969	vertical => 1,
…		…
907	;	974	;
908		975
909	$self = $class->SUPER::new (	976	$self = $class->SUPER::new (
910	vp => (new CFClient::UI::ViewPort expand => 1),	977	vp => (new CFClient::UI::ViewPort expand => 1),
911	slider => $slider,	978	slider => $slider,
912	@_,	979	%arg,
913	);	980	);
914		981
915	$self->{vp}->add ($self->{scrolled});
916	$self->add ($self->{vp});
917	$self->add ($self->{slider});	982	$self->SUPER::add ($self->{vp}, $self->{slider});
		983	$self->add ($child) if $child;
918		984
919	$self	985	$self
		986	}
		987
		988	sub add {
		989	my ($self, $widget) = @_;
		990
		991	$self->{vp}->add ($self->{child} = $widget);
920	}	992	}
921		993
922	sub update {	994	sub update {
923	my ($self) = @_;	995	my ($self) = @_;
924		996
…		…
987		1059
988	our @ISA = CFClient::UI::Bin::;	1060	our @ISA = CFClient::UI::Bin::;
989		1061
990	use CFClient::OpenGL;	1062	use CFClient::OpenGL;
991		1063
992	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 =
993	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1069	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);	1070	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
995		1071
996	sub new {	1072	sub new {
997	my $class = shift;	1073	my ($class, %arg) = @_;
998		1074
999	# TODO: user_x, user_y, overwrite moveto?	1075	my $title = delete $arg{title};
1000		1076
1001	my $self = $class->SUPER::new (	1077	my $self = $class->SUPER::new (
1002	bg => [1, 1, 1, 1],	1078	bg => [1, 1, 1, 1],
1003	border_bg => [1, 1, 1, 1],	1079	border_bg => [1, 1, 1, 1],
1004	border => 0.6,	1080	border => 0.6,
1005	is_toplevel => 1,
1006	can_events => 1,	1081	can_events => 1,
1007	@_	1082	min_w => 16,
		1083	min_h => 16,
		1084	%arg,
1008	);	1085	);
1009		1086
1010	$self->{title} &&= new CFClient::UI::Label	1087	$self->{title} = new CFClient::UI::Label
1011	align => 0,	1088	align => 0,
1012	valign => 1,	1089	valign => 1,
1013	text => $self->{title},	1090	text => $title,
1014	fontsize => $self->{border};	1091	fontsize => $self->{border}
		1092	if defined $title;
1015		1093
1016	$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};
1017	}	1102	}
1018		1103
1019	sub border {	1104	sub border {
1020	int $_[0]{border} * $::FONTSIZE	1105	int $_[0]{border} * $::FONTSIZE
1021	}	1106	}
1022		1107
1023	sub size_request {	1108	sub size_request {
1024	my ($self) = @_;	1109	my ($self) = @_;
		1110
		1111	$self->{title}->size_request
		1112	if $self->{title};
1025		1113
1026	my ($w, $h) = $self->SUPER::size_request;	1114	my ($w, $h) = $self->SUPER::size_request;
1027		1115
1028	(	1116	(
1029	$w + $self->border * 2,	1117	$w + $self->border * 2,
…		…
1032	}	1120	}
1033		1121
1034	sub size_allocate {	1122	sub size_allocate {
1035	my ($self, $w, $h) = @_;	1123	my ($self, $w, $h) = @_;
1036		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
1037	$h -= List::Util::max 0, $self->border * 2;	1133	$h -= List::Util::max 0, $border * 2;
1038	$w -= List::Util::max 0, $self->border * 2;	1134	$w -= List::Util::max 0, $border * 2;
1039		1135
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);	1136	$self->child->configure ($border, $border, $w, $h);
1044	}	1137	}
1045		1138
1046	sub button_down {	1139	sub button_down {
1047	my ($self, $ev, $x, $y) = @_;	1140	my ($self, $ev, $x, $y) = @_;
1048		1141
…		…
1064	my ($ev, $x, $y) = @_;	1157	my ($ev, $x, $y) = @_;
1065		1158
1066	my $dx = $ev->{x} - $ox;	1159	my $dx = $ev->{x} - $ox;
1067	my $dy = $ev->{y} - $oy;	1160	my $dy = $ev->{y} - $oy;
1068		1161
1069	$self->{user_x} = $wx + $dx * $mx;
1070	$self->{user_y} = $wy + $dy * $my;
1071	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1162	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1072	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1163	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1073	$self->move ($self->{user_x}, $self->{user_y});	1164
1074	$self->check_size;	1165	$self->realloc;
		1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1075	};	1167	};
1076		1168
1077	} elsif ($lr ^ $td) {	1169	} elsif ($lr ^ $td) {
1078	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1170	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1079	my ($bx, $by) = ($self->{x}, $self->{y});	1171	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1081	$self->{motion} = sub {	1173	$self->{motion} = sub {
1082	my ($ev, $x, $y) = @_;	1174	my ($ev, $x, $y) = @_;
1083		1175
1084	($x, $y) = ($ev->{x}, $ev->{y});	1176	($x, $y) = ($ev->{x}, $ev->{y});
1085		1177
1086	$self->{user_x} = $bx + $x - $ox;	1178	$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	};	1179	};
		1180	} else {
		1181	return 0;
		1182	}
		1183
1091	}	1184	1
1092	}	1185	}
1093		1186
1094	sub button_up {	1187	sub button_up {
1095	my ($self, $ev, $x, $y) = @_;	1188	my ($self, $ev, $x, $y) = @_;
1096		1189
1097	delete $self->{motion};	1190	!!delete $self->{motion}
1098	}	1191	}
1099		1192
1100	sub mouse_motion {	1193	sub mouse_motion {
1101	my ($self, $ev, $x, $y) = @_;	1194	my ($self, $ev, $x, $y) = @_;
1102		1195
1103	$self->{motion}->($ev, $x, $y) if $self->{motion};	1196	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1197
		1198	!!$self->{motion}
1104	}	1199	}
1105		1200
1106	sub _draw {	1201	sub _draw {
1107	my ($self) = @_;	1202	my ($self) = @_;
1108		1203
		1204	my $child = $self->{children}[0];
		1205
1109	my ($w, $h ) = ($self->{w}, $self->{h});	1206	my ($w, $h ) = ($self->{w}, $self->{h});
1110	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1207	my ($cw, $ch) = ($child->{w}, $child->{h});
1111		1208
1112	glEnable GL_TEXTURE_2D;	1209	glEnable GL_TEXTURE_2D;
1113	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1210	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1114		1211
1115	my $border = $self->border;	1212	my $border = $self->border;
1116		1213
1117	glColor @{ $self->{border_bg} };	1214	glColor @{ $self->{border_bg} };
1118	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1215	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1119	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1216	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1120	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1217	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1121	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1218	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1122		1219
1123	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1220	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1124	my $bg = $tex[0];	1221	glColor @{ $self->{bg} };
1125		1222
1126	# TODO: repeat texture not scale	1223	# TODO: repeat texture not scale
		1224	# solve this better(?)
1127	my $rep_x = $cw / $bg->{w};	1225	$bg->{s} = $cw / $bg->{w};
1128	my $rep_y = $ch / $bg->{h};	1226	$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);	1227	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1136	}	1228	}
1137		1229
1138	glDisable GL_TEXTURE_2D;	1230	glDisable GL_TEXTURE_2D;
1139		1231
1140	$self->{title}->draw if $self->{title};
1141
1142	$self->child->draw;	1232	$child->draw;
		1233
		1234	if ($self->{title}) {
		1235	glTranslate 0, $border - $self->{h};
		1236	$self->{title}->_draw;
		1237	}
1143	}	1238	}
1144		1239
1145	#############################################################################	1240	#############################################################################
1146		1241
1147	package CFClient::UI::Table;	1242	package CFClient::UI::Table;
…		…
1169	my ($self, $x, $y, $child) = @_;	1264	my ($self, $x, $y, $child) = @_;
1170		1265
1171	$child->set_parent ($self);	1266	$child->set_parent ($self);
1172	$self->{children}[$y][$x] = $child;	1267	$self->{children}[$y][$x] = $child;
1173		1268
1174	$self->check_size (1);	1269	$self->realloc;
1175	}	1270	}
1176		1271
1177	# TODO: move to container class maybe? send children a signal on removal?	1272	# TODO: move to container class maybe? send children a signal on removal?
1178	sub clear {	1273	sub clear {
1179	my ($self) = @_;	1274	my ($self) = @_;
…		…
1184	for (@children) {	1279	for (@children) {
1185	delete $_->{parent};	1280	delete $_->{parent};
1186	$_->hide;	1281	$_->hide;
1187	}	1282	}
1188		1283
1189	$self->check_size (1);	1284	$self->realloc;
1190	$self->update;
1191	}	1285	}
1192		1286
1193	sub get_wh {	1287	sub get_wh {
1194	my ($self) = @_;	1288	my ($self) = @_;
1195		1289
…		…
1291	}	1385	}
1292	}	1386	}
1293		1387
1294	#############################################################################	1388	#############################################################################
1295		1389
1296	package CFClient::UI::HBox;	1390	package CFClient::UI::Box;
1297
1298	# TODO: wrap into common Box base class
1299		1391
1300	our @ISA = CFClient::UI::Container::;	1392	our @ISA = CFClient::UI::Container::;
1301		1393
1302	sub size_request {	1394	sub size_request {
1303	my ($self) = @_;	1395	my ($self) = @_;
1304		1396
1305	my @alloc = map [$_->size_request], @{$self->{children}};	1397	$self->{vertical}
1306		1398	? (
1307	(	1399	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1308	(List::Util::sum map $_->[0], @alloc),	1400	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1309	(List::Util::max map $_->[1], @alloc),	1401	)
1310	)	1402	: (
		1403	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1404	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1405	)
1311	}	1406	}
1312		1407
1313	sub size_allocate {	1408	sub size_allocate {
1314	my ($self, $w, $h) = @_;	1409	my ($self, $w, $h) = @_;
1315		1410
1316	($h, $w) = ($w, $h);	1411	my $space = $self->{vertical} ? $h : $w;
1317
1318	my $children = $self->{children};	1412	my $children = $self->{children};
1319		1413
1320	my @h = map $_->{req_w}, @$children;	1414	my @req;
1321		1415
1322	my $req_h = List::Util::sum @h;	1416	if ($self->{homogeneous}) {
1323		1417	@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 {	1418	} else {
		1419	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1420	my $req = List::Util::sum @req;
		1421
		1422	if ($req > $space) {
		1423	# ah well, not enough space
		1424	$_ *= $space / $req for @req;
		1425	} else {
1328	my $exp = List::Util::sum map $_->{expand}, @$children;	1426	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1329	$exp ||= 1;
1330		1427
		1428	$space = ($space - $req) / $expand; # remaining space to give away
		1429
		1430	$req[$_] += $space * $children->[$_]{expand}
1331	for (0 .. $#$children) {	1431	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	}	1432	}
1338	}	1433	}
1339		1434
1340	CFClient::UI::harmonize \@h;	1435	CFClient::UI::harmonize \@req;
1341		1436
1342	my $y = 0;	1437	my $pos = 0;
1343	for (0 .. $#$children) {	1438	for (0 .. $#$children) {
1344	my $child = $children->[$_];
1345	my $h = $h[$_];	1439	my $alloc = $req[$_];
1346	$child->configure ($y, 0, $h, $w);	1440	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1347		1441
1348	$y += $h;	1442	$pos += $alloc;
1349	}	1443	}
1350		1444
1351	1	1445	1
1352	}	1446	}
1353		1447
1354	#############################################################################	1448	#############################################################################
1355		1449
		1450	package CFClient::UI::HBox;
		1451
		1452	our @ISA = CFClient::UI::Box::;
		1453
		1454	sub new {
		1455	my $class = shift;
		1456
		1457	$class->SUPER::new (
		1458	vertical => 0,
		1459	@_,
		1460	)
		1461	}
		1462
		1463	#############################################################################
		1464
1356	package CFClient::UI::VBox;	1465	package CFClient::UI::VBox;
1357		1466
1358	# TODO: wrap into common Box base class
1359
1360	our @ISA = CFClient::UI::Container::;	1467	our @ISA = CFClient::UI::Box::;
1361		1468
1362	sub size_request {	1469	sub new {
1363	my ($self) = @_;	1470	my $class = shift;
1364		1471
1365	my @alloc = map [$_->size_request], @{$self->{children}};	1472	$class->SUPER::new (
1366		1473	vertical => 1,
1367	(	1474	@_,
1368	(List::Util::max map $_->[0], @alloc),
1369	(List::Util::sum map $_->[1], @alloc),
1370	)	1475	)
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	}	1476	}
1411		1477
1412	#############################################################################	1478	#############################################################################
1413		1479
1414	package CFClient::UI::Label;	1480	package CFClient::UI::Label;
…		…
1431	ellipsise => 3, # end	1497	ellipsise => 3, # end
1432	layout => (new CFClient::Layout),	1498	layout => (new CFClient::Layout),
1433	fontsize => 1,	1499	fontsize => 1,
1434	align => -1,	1500	align => -1,
1435	valign => -1,	1501	valign => -1,
1436	padding => 2,	1502	padding_x => 2,
		1503	padding_y => 2,
1437	can_events => 0,	1504	can_events => 0,
1438	%arg	1505	%arg
1439	);	1506	);
1440		1507
1441	if (exists $self->{template}) {	1508	if (exists $self->{template}) {
…		…
1477	$self->{text} = "T$text";	1544	$self->{text} = "T$text";
1478		1545
1479	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1546	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1480	$self->{layout}->set_text ($text);	1547	$self->{layout}->set_text ($text);
1481		1548
		1549	$self->realloc;
1482	$self->update;	1550	$self->update;
1483	$self->check_size;
1484	}	1551	}
1485		1552
1486	sub set_markup {	1553	sub set_markup {
1487	my ($self, $markup) = @_;	1554	my ($self, $markup) = @_;
1488		1555
…		…
1492	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1559	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493		1560
1494	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1561	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1495	$self->{layout}->set_markup ($markup);	1562	$self->{layout}->set_markup ($markup);
1496		1563
		1564	$self->realloc;
1497	$self->update;	1565	$self->update;
1498	$self->check_size;
1499	}	1566	}
1500		1567
1501	sub size_request {	1568	sub size_request {
1502	my ($self) = @_;	1569	my ($self) = @_;
1503		1570
…		…
1517		1584
1518	$w = List::Util::max $w, $w2;	1585	$w = List::Util::max $w, $w2;
1519	$h = List::Util::max $h, $h2;	1586	$h = List::Util::max $h, $h2;
1520	}	1587	}
1521		1588
1522	(	1589	($w, $h)
1523	$w + $self->{padding} * 2,
1524	$h + $self->{padding} * 2,
1525	)
1526	}	1590	}
1527		1591
1528	sub size_allocate {	1592	sub size_allocate {
1529	my ($self, $w, $h) = @_;	1593	my ($self, $w, $h) = @_;
1530		1594
		1595	delete $self->{ox};
		1596
1531	delete $self->{texture};	1597	delete $self->{texture}
		1598	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1532	}	1599	}
1533		1600
1534	sub set_fontsize {	1601	sub set_fontsize {
1535	my ($self, $fontsize) = @_;	1602	my ($self, $fontsize) = @_;
1536		1603
1537	$self->{fontsize} = $fontsize;	1604	$self->{fontsize} = $fontsize;
1538	delete $self->{texture};	1605	delete $self->{texture};
1539		1606
1540	$self->update;	1607	$self->realloc;
1541	$self->check_size;
1542	}	1608	}
1543		1609
1544	sub _draw {	1610	sub _draw {
1545	my ($self) = @_;	1611	my ($self) = @_;
1546		1612
…		…
1552	$self->{layout}->set_width ($self->{w});	1618	$self->{layout}->set_width ($self->{w});
1553	$self->{layout}->set_ellipsise ($self->{ellipsise});	1619	$self->{layout}->set_ellipsise ($self->{ellipsise});
1554	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1620	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1555	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1621	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1556		1622
1557	my $tex = new_from_layout CFClient::Texture $self->{layout};	1623	new_from_layout CFClient::Texture $self->{layout}
		1624	};
1558		1625
		1626	unless (exists $self->{ox}) {
1559	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1627	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1560	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1628	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1561	: ($self->{w} - $tex->{w}) * 0.5);	1629	: ($self->{w} - $tex->{w}) * 0.5);
1562		1630
1563	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1631	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1564	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1632	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1565	: ($self->{h} - $tex->{h}) * 0.5);	1633	: ($self->{h} - $tex->{h}) * 0.5);
1566
1567	$tex
1568	};	1634	};
1569		1635
1570	glEnable GL_TEXTURE_2D;	1636	glEnable GL_TEXTURE_2D;
1571	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1637	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1572		1638
…		…
1610		1676
1611	delete $self->{cur_h};	1677	delete $self->{cur_h};
1612		1678
1613	return if $self->{text} eq $text;	1679	return if $self->{text} eq $text;
1614		1680
1615	delete $self->{texture};
1616
1617	$self->{last_activity} = $::NOW;	1681	$self->{last_activity} = $::NOW;
1618	$self->{text} = $text;	1682	$self->{text} = $text;
1619		1683
1620	$text =~ s/./*/g if $self->{hidden};	1684	$text =~ s/./*/g if $self->{hidden};
1621	$self->{layout}->set_text ("$text ");	1685	$self->{layout}->set_text ("$text ");
1622		1686
1623	$self->_emit (changed => $self->{text});	1687	$self->_emit (changed => $self->{text});
		1688	$self->update;
1624	}	1689	}
1625		1690
1626	sub set_text {	1691	sub set_text {
1627	my ($self, $text) = @_;	1692	my ($self, $text) = @_;
1628		1693
1629	$self->{cursor} = length $text;	1694	$self->{cursor} = length $text;
1630	$self->_set_text ($text);	1695	$self->_set_text ($text);
1631	$self->update;	1696
1632	$self->check_size;	1697	$self->realloc;
1633	}	1698	}
1634		1699
1635	sub get_text {	1700	sub get_text {
1636	$_[0]{text}	1701	$_[0]{text}
1637	}	1702	}
…		…
1667	$self->{cursor} = length $text;	1732	$self->{cursor} = length $text;
1668	} elsif ($uni == 27) {	1733	} elsif ($uni == 27) {
1669	$self->_emit ('escape');	1734	$self->_emit ('escape');
1670	} elsif ($uni) {	1735	} elsif ($uni) {
1671	substr $text, $self->{cursor}++, 0, chr $uni;	1736	substr $text, $self->{cursor}++, 0, chr $uni;
		1737	} else {
		1738	return 0;
1672	}	1739	}
1673		1740
1674	$self->_set_text ($text);	1741	$self->_set_text ($text);
1675	$self->update;	1742
1676	$self->check_size;	1743	$self->realloc;
		1744
		1745	1
1677	}	1746	}
1678		1747
1679	sub focus_in {	1748	sub focus_in {
1680	my ($self) = @_;	1749	my ($self) = @_;
1681		1750
…		…
1696	utf8::encode $text;	1765	utf8::encode $text;
1697	$self->{cursor} = length substr $text, 0, $idx;	1766	$self->{cursor} = length substr $text, 0, $idx;
1698		1767
1699	$self->_set_text ($self->{text});	1768	$self->_set_text ($self->{text});
1700	$self->update;	1769	$self->update;
		1770
		1771	1
1701	}	1772	}
1702		1773
1703	sub mouse_motion {	1774	sub mouse_motion {
1704	my ($self, $ev, $x, $y) = @_;	1775	my ($self, $ev, $x, $y) = @_;
1705	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1776	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1777
		1778	0
1706	}	1779	}
1707		1780
1708	sub _draw {	1781	sub _draw {
1709	my ($self) = @_;	1782	my ($self) = @_;
1710		1783
…		…
1787	} else {	1860	} else {
1788	$self->set_text ($self->{history_saveback});	1861	$self->set_text ($self->{history_saveback});
1789	}	1862	}
1790		1863
1791	} else {	1864	} else {
1792	$self->SUPER::key_down ($ev);	1865	return $self->SUPER::key_down ($ev)
		1866	}
		1867
1793	}	1868	1
1794
1795	}	1869	}
1796		1870
1797	#############################################################################	1871	#############################################################################
1798		1872
1799	package CFClient::UI::Button;	1873	package CFClient::UI::Button;
…		…
1808		1882
1809	sub new {	1883	sub new {
1810	my $class = shift;	1884	my $class = shift;
1811		1885
1812	$class->SUPER::new (	1886	$class->SUPER::new (
1813	padding => 4,	1887	padding_x => 4,
		1888	padding_y => 4,
1814	fg => [1, 1, 1],	1889	fg => [1, 1, 1],
1815	active_fg => [0, 0, 1],	1890	active_fg => [0, 0, 1],
1816	can_hover => 1,	1891	can_hover => 1,
1817	align => 0,	1892	align => 0,
1818	valign => 0,	1893	valign => 0,
…		…
1827	my ($self, $ev, $x, $y) = @_;	1902	my ($self, $ev, $x, $y) = @_;
1828		1903
1829	$self->emit ("activate")	1904	$self->emit ("activate")
1830	if $x >= 0 && $x < $self->{w}	1905	if $x >= 0 && $x < $self->{w}
1831	&& $y >= 0 && $y < $self->{h};	1906	&& $y >= 0 && $y < $self->{h};
		1907
		1908	1
1832	}	1909	}
1833		1910
1834	sub _draw {	1911	sub _draw {
1835	my ($self) = @_;	1912	my ($self) = @_;
1836		1913
…		…
1865		1942
1866	sub new {	1943	sub new {
1867	my $class = shift;	1944	my $class = shift;
1868		1945
1869	$class->SUPER::new (	1946	$class->SUPER::new (
1870	padding => 2,	1947	padding_x => 2,
		1948	padding_y => 2,
1871	fg => [1, 1, 1],	1949	fg => [1, 1, 1],
1872	active_fg => [1, 1, 0],	1950	active_fg => [1, 1, 0],
1873	bg => [0, 0, 0, 0.2],	1951	bg => [0, 0, 0, 0.2],
1874	active_bg => [1, 1, 1, 0.5],	1952	active_bg => [1, 1, 1, 0.5],
1875	state => 0,	1953	state => 0,
…		…
1879	}	1957	}
1880		1958
1881	sub size_request {	1959	sub size_request {
1882	my ($self) = @_;	1960	my ($self) = @_;
1883		1961
1884	($self->{padding} * 2 + 6) x 2	1962	(6) x 2
1885	}	1963	}
1886		1964
1887	sub button_down {	1965	sub button_down {
1888	my ($self, $ev, $x, $y) = @_;	1966	my ($self, $ev, $x, $y) = @_;
1889		1967
1890	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1968	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1891	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1969	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1892	$self->{state} = !$self->{state};	1970	$self->{state} = !$self->{state};
1893	$self->_emit (changed => $self->{state});	1971	$self->_emit (changed => $self->{state});
		1972	} else {
		1973	return 0
		1974	}
		1975
1894	}	1976	1
1895	}	1977	}
1896		1978
1897	sub _draw {	1979	sub _draw {
1898	my ($self) = @_;	1980	my ($self) = @_;
1899		1981
1900	$self->SUPER::_draw;	1982	$self->SUPER::_draw;
1901		1983
1902	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1984	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1903		1985
1904	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1986	my ($w, $h) = @$self{qw(w h)};
		1987
		1988	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1905		1989
1906	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1990	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1907		1991
1908	my $tex = $self->{state} ? $tex[1] : $tex[0];	1992	my $tex = $self->{state} ? $tex[1] : $tex[0];
1909		1993
…		…
2174	fg => [1, 1, 1],	2258	fg => [1, 1, 1],
2175	active_fg => [0, 0, 0],	2259	active_fg => [0, 0, 0],
2176	bg => [0, 0, 0, 0.2],	2260	bg => [0, 0, 0, 0.2],
2177	active_bg => [1, 1, 1, 0.5],	2261	active_bg => [1, 1, 1, 0.5],
2178	range => [0, 0, 100, 10, 0],	2262	range => [0, 0, 100, 10, 0],
2179	req_w => $::WIDTH / 80,	2263	min_w => $::WIDTH / 80,
2180	req_h => $::WIDTH / 80,	2264	min_h => $::WIDTH / 80,
2181	vertical => 0,	2265	vertical => 0,
2182	can_hover => 1,	2266	can_hover => 1,
2183	inner_pad => 0.02,	2267	inner_pad => 0.02,
2184	@_	2268	@_
2185	);	2269	);
…		…
2188	$self->update;	2272	$self->update;
2189		2273
2190	$self	2274	$self
2191	}	2275	}
2192		2276
		2277	sub changed { }
		2278
2193	sub set_range {	2279	sub set_range {
2194	my ($self, $range) = @_;	2280	my ($self, $range) = @_;
2195		2281
2196	($range, $self->{range}) = ($self->{range}, $range);	2282	($range, $self->{range}) = ($self->{range}, $range);
2197		2283
…		…
2223	}	2309	}
2224		2310
2225	sub size_request {	2311	sub size_request {
2226	my ($self) = @_;	2312	my ($self) = @_;
2227		2313
2228	my $w = $self->{req_w};	2314	($self->{req_w}, $self->{req_h})
2229	my $h = $self->{req_h};
2230
2231	$self->{vertical} ? ($h, $w) : ($w, $h)
2232	}	2315	}
2233		2316
2234	sub button_down {	2317	sub button_down {
2235	my ($self, $ev, $x, $y) = @_;	2318	my ($self, $ev, $x, $y) = @_;
2236		2319
2237	$self->SUPER::button_down ($ev, $x, $y);	2320	$self->SUPER::button_down ($ev, $x, $y);
2238		2321
2239	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2322	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240		2323
2241	$self->mouse_motion ($ev, $x, $y);	2324	$self->mouse_motion ($ev, $x, $y)
2242	}	2325	}
2243		2326
2244	sub mouse_motion {	2327	sub mouse_motion {
2245	my ($self, $ev, $x, $y) = @_;	2328	my ($self, $ev, $x, $y) = @_;
2246		2329
…		…
2250	my (undef, $lo, $hi, $page) = @{$self->{range}};	2333	my (undef, $lo, $hi, $page) = @{$self->{range}};
2251		2334
2252	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2335	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253		2336
2254	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2337	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2338	} else {
		2339	return 0;
		2340	}
		2341
2255	}	2342	1
2256	}	2343	}
2257		2344
2258	sub update {	2345	sub update {
2259	my ($self) = @_;	2346	my ($self) = @_;
2260		2347
2261	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2348	delete $self->{knob_w};
		2349	$self->SUPER::update;
		2350	}
		2351
		2352	sub _draw {
		2353	my ($self) = @_;
		2354
		2355	unless ($self->{knob_w}) {
2262	$self->set_value ($self->{range}[0]);	2356	$self->set_value ($self->{range}[0]);
2263		2357
2264	my ($value, $lo, $hi, $page) = @{$self->{range}};	2358	my ($value, $lo, $hi, $page) = @{$self->{range}};
2265	my $range = ($hi - $page - $lo) || 1e-100;	2359	my $range = ($hi - $page - $lo) || 1e-100;
2266		2360
…		…
2272	$value = ($value - $lo) / $range;	2366	$value = ($value - $lo) / $range;
2273	$value = $value * $self->{scale} + $self->{offset};	2367	$value = $value * $self->{scale} + $self->{offset};
2274		2368
2275	$self->{knob_x} = $value - $knob_w * 0.5;	2369	$self->{knob_x} = $value - $knob_w * 0.5;
2276	$self->{knob_w} = $knob_w;	2370	$self->{knob_w} = $knob_w;
2277	});	2371	}
2278
2279	$self->SUPER::update;
2280	}
2281
2282	sub _draw {
2283	my ($self) = @_;
2284		2372
2285	$self->SUPER::_draw ();	2373	$self->SUPER::_draw ();
2286		2374
2287	glScale $self->{w}, $self->{h};	2375	glScale $self->{w}, $self->{h};
2288		2376
…		…
2592	state => 0,	2680	state => 0,
2593	on_activate => \&toggle_flopper,	2681	on_activate => \&toggle_flopper,
2594	@_	2682	@_
2595	);	2683	);
2596		2684
2597	if ($self->{state}) {
2598	$self->{state} = 0;
2599	$self->toggle_flopper;
2600	}
2601
2602	$self	2685	$self
2603	}	2686	}
2604		2687
2605	sub toggle_flopper {	2688	sub toggle_flopper {
2606	my ($self) = @_;	2689	my ($self) = @_;
2607		2690
2608	# TODO: use animation	2691	$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	}	2692	}
2620		2693
2621	#############################################################################	2694	#############################################################################
2622		2695
2623	package CFClient::UI::Tooltip;	2696	package CFClient::UI::Tooltip;
…		…
2636	}	2709	}
2637		2710
2638	sub set_tooltip_from {	2711	sub set_tooltip_from {
2639	my ($self, $widget) = @_;	2712	my ($self, $widget) = @_;
2640		2713
		2714	my $tooltip = $widget->{tooltip};
		2715
		2716	if ($ENV{CFPLUS_DEBUG} & 2) {
		2717	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2718	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2719	. "req $widget->{req_w} $widget->{req_h}\n"
		2720	. "visible $widget->{visible}";
		2721	}
		2722
2641	$self->add (new CFClient::UI::Label	2723	$self->add (new CFClient::UI::Label
2642	markup => $widget->{tooltip},	2724	markup => $tooltip,
2643	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2725	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2644	fontsize => 0.8,	2726	fontsize => 0.8,
2645	fg => [0, 0, 0, 1],	2727	fg => [0, 0, 0, 1],
2646	ellipsise => 0,	2728	ellipsise => 0,
2647	font => ($widget->{tooltip_font} || $::FONT_PROP),	2729	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2658		2740
2659	sub size_allocate {	2741	sub size_allocate {
2660	my ($self, $w, $h) = @_;	2742	my ($self, $w, $h) = @_;
2661		2743
2662	$self->SUPER::size_allocate ($w - 4, $h - 4);	2744	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2745	}
		2746
		2747	sub visibility_change {
		2748	my ($self, $visible) = @_;
		2749
		2750	return unless $visible;
		2751
		2752	$self->{root}->on_post_alloc ("move_$self" => sub {
		2753	my $widget = $self->{owner}
		2754	or return;
		2755
		2756	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2757
		2758	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2759	if $x + $self->{w} > $::WIDTH;
		2760
		2761	$self->move_abs ($x, $y);
		2762	});
2663	}	2763	}
2664		2764
2665	sub _draw {	2765	sub _draw {
2666	my ($self) = @_;	2766	my ($self) = @_;
2667		2767
…		…
2684	glVertex $w, $h;	2784	glVertex $w, $h;
2685	glVertex $w, 0;	2785	glVertex $w, 0;
2686	glEnd;	2786	glEnd;
2687		2787
2688	glTranslate 2 - 0.375, 2 - 0.375;	2788	glTranslate 2 - 0.375, 2 - 0.375;
		2789
2689	$self->SUPER::_draw;	2790	$self->SUPER::_draw;
2690	}	2791	}
2691		2792
2692	#############################################################################	2793	#############################################################################
2693		2794
…		…
2769	$self->SUPER::DESTROY;	2870	$self->SUPER::DESTROY;
2770	}	2871	}
2771		2872
2772	#############################################################################	2873	#############################################################################
2773		2874
2774	package CFClient::UI::Inventory;	2875	package CFClient::UI::Buttonbar;
2775		2876
2776	our @ISA = CFClient::UI::ScrolledWindow::;	2877	our @ISA = CFClient::UI::HBox::;
2777		2878
2778	sub new {	2879	# 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		2880
2819	#############################################################################	2881	#############################################################################
2820		2882
2821	package CFClient::UI::Menu;	2883	package CFClient::UI::Menu;
2822		2884
…		…
2863	# maybe save $GRAB? must be careful about events...	2925	# maybe save $GRAB? must be careful about events...
2864	$GRAB = $self;	2926	$GRAB = $self;
2865	$self->{button} = $ev->{button};	2927	$self->{button} = $ev->{button};
2866		2928
2867	$self->show;	2929	$self->show;
2868	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2930	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2869	}	2931	}
2870		2932
2871	sub mouse_motion {	2933	sub mouse_motion {
2872	my ($self, $ev, $x, $y) = @_;	2934	my ($self, $ev, $x, $y) = @_;
2873		2935
2874	# TODO: should use vbox->find_widget or so	2936	# TODO: should use vbox->find_widget or so
2875	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2937	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2876	$self->{hover} = $self->{item}{$HOVER};	2938	$self->{hover} = $self->{item}{$HOVER};
		2939
		2940	0
2877	}	2941	}
2878		2942
2879	sub button_up {	2943	sub button_up {
2880	my ($self, $ev, $x, $y) = @_;	2944	my ($self, $ev, $x, $y) = @_;
2881		2945
…		…
2883	undef $GRAB;	2947	undef $GRAB;
2884	$self->hide;	2948	$self->hide;
2885		2949
2886	$self->_emit ("popdown");	2950	$self->_emit ("popdown");
2887	$self->{hover}[1]->() if $self->{hover};	2951	$self->{hover}[1]->() if $self->{hover};
		2952	} else {
		2953	return 0
		2954	}
		2955
		2956	1
		2957	}
		2958
		2959	#############################################################################
		2960
		2961	package CFClient::UI::Multiplexer;
		2962
		2963	our @ISA = CFClient::UI::Container::;
		2964
		2965	sub new {
		2966	my $class = shift;
		2967
		2968	my $self = $class->SUPER::new (
		2969	@_,
		2970	);
		2971
		2972	$self->{current} = $self->{children}[0]
		2973	if @{ $self->{children} };
		2974
		2975	$self
		2976	}
		2977
		2978	sub add {
		2979	my ($self, @widgets) = @_;
		2980
		2981	$self->SUPER::add (@widgets);
		2982
		2983	$self->{current} = $self->{children}[0]
		2984	if @{ $self->{children} };
		2985	}
		2986
		2987	sub set_current_page {
		2988	my ($self, $page_or_widget) = @_;
		2989
		2990	my $widget = ref $page_or_widget
		2991	? $page_or_widget
		2992	: $self->{children}[$page_or_widget];
		2993
		2994	$self->{current} = $widget;
		2995	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2996
		2997	$self->_emit (page_changed => $self->{current});
		2998
		2999	$self->realloc;
		3000	}
		3001
		3002	sub visible_children {
		3003	$_[0]{current}
		3004	}
		3005
		3006	sub size_request {
		3007	my ($self) = @_;
		3008
		3009	$self->{current}->size_request
		3010	}
		3011
		3012	sub size_allocate {
		3013	my ($self, $w, $h) = @_;
		3014
		3015	$self->{current}->configure (0, 0, $w, $h);
		3016	}
		3017
		3018	sub _draw {
		3019	my ($self) = @_;
		3020
		3021	$self->{current}->draw;
		3022	}
		3023
		3024	#############################################################################
		3025
		3026	package CFClient::UI::Notebook;
		3027
		3028	our @ISA = CFClient::UI::VBox::;
		3029
		3030	sub new {
		3031	my $class = shift;
		3032
		3033	my $self = $class->SUPER::new (
		3034	buttonbar => (new CFClient::UI::Buttonbar),
		3035	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3036	# filter => # will be put between multiplexer and $self
		3037	@_,
		3038	);
2888	}	3039
		3040	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3041	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3042
		3043	$self
		3044	}
		3045
		3046	sub add {
		3047	my ($self, $title, $widget, $tooltip) = @_;
		3048
		3049	Scalar::Util::weaken $self;
		3050
		3051	$self->{buttonbar}->add (new CFClient::UI::Button
		3052	markup => $title,
		3053	tooltip => $tooltip,
		3054	on_activate => sub { $self->set_current_page ($widget) },
		3055	);
		3056
		3057	$self->{multiplexer}->add ($widget);
		3058	}
		3059
		3060	sub set_current_page {
		3061	my ($self, $page) = @_;
		3062
		3063	$self->{multiplexer}->set_current_page ($page);
		3064	$self->_emit (page_changed => $self->{multiplexer}{current});
2889	}	3065	}
2890		3066
2891	#############################################################################	3067	#############################################################################
2892		3068
2893	package CFClient::UI::Statusbox;	3069	package CFClient::UI::Statusbox;
…		…
2998	$self->SUPER::reconfigure;	3174	$self->SUPER::reconfigure;
2999	}	3175	}
3000		3176
3001	#############################################################################	3177	#############################################################################
3002		3178
3003	package CFClient::UI::Root;	3179	package CFClient::UI::Inventory;
3004		3180
3005	our @ISA = CFClient::UI::Container::;	3181	our @ISA = CFClient::UI::ScrolledWindow::;
3006
3007	use CFClient::OpenGL;
3008		3182
3009	sub new {	3183	sub new {
3010	my $class = shift;	3184	my $class = shift;
3011		3185
3012	$class->SUPER::new (	3186	my $self = $class->SUPER::new (
		3187	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3188	@_,
		3189	);
		3190
		3191	$self
		3192	}
		3193
		3194	sub set_items {
		3195	my ($self, $items) = @_;
		3196
		3197	$self->{child}->clear;
		3198	return unless $items;
		3199
		3200	my @items = sort {
		3201	($a->{type} <=> $b->{type})
		3202	or ($a->{name} cmp $b->{name})
		3203	} @$items;
		3204
		3205	$self->{real_items} = \@items;
		3206
		3207	my $row = 0;
		3208	for my $item (@items) {
		3209	CFClient::Item::update_widgets $item;
		3210
		3211	$self->{child}->add (0, $row, $item->{face_widget});
		3212	$self->{child}->add (1, $row, $item->{desc_widget});
		3213	$self->{child}->add (2, $row, $item->{weight_widget});
		3214
		3215	$row++;
		3216	}
		3217	}
		3218
		3219	#############################################################################
		3220
		3221	package CFClient::UI::BindEditor;
		3222
		3223	our @ISA = CFClient::UI::FancyFrame::;
		3224
		3225	sub new {
		3226	my $class = shift;
		3227
		3228	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3229
		3230	$self->add (my $vb = new CFClient::UI::VBox);
		3231
		3232
		3233	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3234	text => "start recording",
		3235	tooltip => "Start/Stops recording of actions."
		3236	."All subsequent actions after the recording started will be captured."
		3237	."The actions are displayed after the record was stopped."
		3238	."To bind the action you have to click on the 'Bind' button",
		3239	on_activate => sub {
		3240	unless ($self->{recording}) {
		3241	$self->start;
		3242	} else {
		3243	$self->stop;
		3244	}
		3245	});
		3246
		3247	$vb->add (new CFClient::UI::Label text => "Actions:");
		3248	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3249
		3250	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3251	$vb->add (my $hb = new CFClient::UI::HBox);
		3252	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3253	$hb->add (new CFClient::UI::Button
		3254	text => "bind",
		3255	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3256	on_activate => sub {
		3257	$self->ask_for_bind;
		3258	});
		3259
		3260	$vb->add (my $hb = new CFClient::UI::HBox);
		3261	$hb->add (new CFClient::UI::Button
		3262	text => "ok",
		3263	expand => 1,
		3264	tooltip => "This closes the binding editor and saves the binding",
		3265	on_activate => sub {
		3266	$self->hide;
		3267	$self->commit;
		3268	});
		3269
		3270	$hb->add (new CFClient::UI::Button
		3271	text => "cancel",
		3272	expand => 1,
		3273	tooltip => "This closes the binding editor without saving",
		3274	on_activate => sub {
		3275	$self->hide;
		3276	$self->{binding_cancel}->()
		3277	if $self->{binding_cancel};
		3278	});
		3279
		3280	$self->update_binding_widgets;
		3281
		3282	$self
		3283	}
		3284
		3285	sub commit {
		3286	my ($self) = @_;
		3287	my ($mod, $sym, $cmds) = $self->get_binding;
		3288	if ($sym != 0 && @$cmds > 0) {
		3289	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3290	."'. Don't forget 'Save Config'!");
		3291	$self->{binding_change}->($mod, $sym, $cmds)
		3292	if $self->{binding_change};
		3293	} else {
		3294	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3295	$self->{binding_cancel}->()
		3296	if $self->{binding_cancel};
		3297	}
		3298	}
		3299
		3300	sub start {
		3301	my ($self) = @_;
		3302
		3303	$self->{rec_btn}->set_text ("stop recording");
		3304	$self->{recording} = 1;
		3305	$self->clear_command_list;
		3306	$::CONN->start_record if $::CONN;
		3307	}
		3308
		3309	sub stop {
		3310	my ($self) = @_;
		3311
		3312	$self->{rec_btn}->set_text ("start recording");
		3313	$self->{recording} = 0;
		3314
		3315	my $rec;
		3316	$rec = $::CONN->stop_record if $::CONN;
		3317	return unless ref $rec eq 'ARRAY';
		3318	$self->set_command_list ($rec);
		3319	}
		3320
		3321
		3322	sub ask_for_bind_and_commit {
		3323	my ($self) = @_;
		3324	$self->ask_for_bind (1);
		3325	}
		3326
		3327	sub ask_for_bind {
		3328	my ($self, $commit) = @_;
		3329
		3330	CFClient::Binder::open_binding_dialog (sub {
		3331	my ($mod, $sym) = @_;
		3332	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3333	$self->update_binding_widgets;
		3334	$self->commit if $commit;
		3335	});
		3336	}
		3337
		3338	# $mod and $sym are the modifiers and key symbol
		3339	# $cmds is a array ref of strings (the commands)
		3340	# $cb is the callback that is executed on OK
		3341	# $ccb is the callback that is executed on CANCEL and
		3342	# when the binding was unsuccessful on OK
		3343	sub set_binding {
		3344	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3345
		3346	$self->clear_command_list;
		3347	$self->{recording} = 0;
		3348	$self->{rec_btn}->set_text ("start recording");
		3349
		3350	$self->{binding} = [$mod, $sym];
		3351	$self->{commands} = $cmds;
		3352
		3353	$self->{binding_change} = $cb;
		3354	$self->{binding_cancel} = $ccb;
		3355
		3356	$self->update_binding_widgets;
		3357	}
		3358
		3359	# this is a shortcut method that asks for a binding
		3360	# and then just binds it.
		3361	sub do_quick_binding {
		3362	my ($self, $cmds) = @_;
		3363	$self->set_binding (undef, undef, $cmds, sub {
		3364	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3365	});
		3366	$self->ask_for_bind (1);
		3367	}
		3368
		3369	sub update_binding_widgets {
		3370	my ($self) = @_;
		3371	my ($mod, $sym, $cmds) = $self->get_binding;
		3372	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3373	$self->set_command_list ($cmds);
		3374	}
		3375
		3376	sub get_binding {
		3377	my ($self) = @_;
		3378	return (
		3379	$self->{binding}->[0],
		3380	$self->{binding}->[1],
		3381	[ grep { defined $_ } @{$self->{commands}} ]
		3382	);
		3383	}
		3384
		3385	sub clear_command_list {
		3386	my ($self) = @_;
		3387	$self->{cmdbox}->clear ();
		3388	}
		3389
		3390	sub set_command_list {
		3391	my ($self, $cmds) = @_;
		3392
		3393	$self->{cmdbox}->clear ();
		3394	$self->{commands} = $cmds;
		3395
		3396	my $idx = 0;
		3397
		3398	for (@$cmds) {
		3399	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3400
		3401	my $i = $idx;
		3402	$hb->add (new CFClient::UI::Label text => $_);
		3403	$hb->add (new CFClient::UI::Button
		3404	text => "delete",
		3405	tooltip => "Deletes the action from the record",
		3406	on_activate => sub {
		3407	$self->{cmdbox}->remove ($hb);
		3408	$cmds->[$i] = undef;
		3409	});
		3410
		3411
		3412	$idx++
		3413	}
		3414	}
		3415
		3416	#############################################################################
		3417
		3418	package CFClient::UI::SpellList;
		3419
		3420	our @ISA = CFClient::UI::Table::;
		3421
		3422	sub new {
		3423	my $class = shift;
		3424
		3425	my $self = $class->SUPER::new (
		3426	binding => [],
		3427	commands => [],
		3428	@_,
		3429	)
		3430	}
		3431
		3432	# XXX: Do sorting? Argl...
		3433	sub add_spell {
		3434	my ($self, $spell) = @_;
		3435	$self->{spells}->{$spell->{name}} = $spell;
		3436
		3437	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3438	face => $spell->{face},
		3439	can_hover => 1,
		3440	can_events => 1,
		3441	tooltip => $spell->{message});
		3442
		3443	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3444	text => $spell->{name},
		3445	can_hover => 1,
		3446	can_events => 1,
		3447	tooltip => $spell->{message},
		3448	expand => 1);
		3449
		3450	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3451	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3452	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3453	expand => 1);
		3454
		3455	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3456	text => "bind to key",
		3457	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3458	}
		3459
		3460	sub rebuild_spell_list {
		3461	my ($self) = @_;
		3462	$self->{tbl_idx} = 0;
		3463	$self->add_spell ($_) for values %{$self->{spells}};
		3464	}
		3465
		3466	sub remove_spell {
		3467	my ($self, $spell) = @_;
		3468	delete $self->{spells}->{$spell->{name}};
		3469	$self->rebuild_spell_list;
		3470	}
		3471
		3472	#############################################################################
		3473
		3474	package CFClient::UI::Root;
		3475
		3476	our @ISA = CFClient::UI::Container::;
		3477
		3478	use CFClient::OpenGL;
		3479
		3480	sub new {
		3481	my $class = shift;
		3482
		3483	my $self = $class->SUPER::new (
3013	visible => 1,	3484	visible => 1,
3014	@_,	3485	@_,
3015	)	3486	);
3016	}
3017		3487
3018	sub configure {	3488	Scalar::Util::weaken ($self->{root} = $self);
3019	my ($self, $x, $y, $w, $h) = @_;
3020		3489
3021	$self->{w} = $w;	3490	$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	}	3491	}
3031		3492
3032	sub size_request {	3493	sub size_request {
3033	my ($self) = @_;	3494	my ($self) = @_;
3034		3495
3035	($self->{w}, $self->{h})	3496	($self->{w}, $self->{h})
		3497	}
		3498
		3499	sub _to_pixel {
		3500	my ($coord, $size, $max) = @_;
		3501
		3502	$coord =
		3503	$coord eq "center" ? ($max - $size) * 0.5
		3504	: $coord eq "max" ? $max
		3505	: $coord;
		3506
		3507	$coord = 0 if $coord < 0;
		3508	$coord = $max - $size if $coord > $max - $size;
		3509
		3510	int $coord + 0.5
3036	}	3511	}
3037		3512
3038	sub size_allocate {	3513	sub size_allocate {
3039	my ($self, $w, $h) = @_;	3514	my ($self, $w, $h) = @_;
3040		3515
3041	for my $child ($self->children) {	3516	for my $child ($self->children) {
3042	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3517	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3043		3518
3044	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3519	$X = $child->{force_x} if exists $child->{force_x};
3045	if exists $child->{req_x};	3520	$Y = $child->{force_y} if exists $child->{force_y};
3046		3521
3047	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3522	$X = _to_pixel $X, $W, $self->{w};
3048	if exists $child->{req_y};	3523	$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		3524
3056	$child->configure ($X, $Y, $W, $H);	3525	$child->configure ($X, $Y, $W, $H);
3057	}	3526	}
3058	}	3527	}
3059		3528
…		…
3070	}	3539	}
3071		3540
3072	sub update {	3541	sub update {
3073	my ($self) = @_;	3542	my ($self) = @_;
3074		3543
3075	$self->check_size;
3076	$::WANT_REFRESH++;	3544	$::WANT_REFRESH++;
3077	}	3545	}
3078		3546
3079	sub add {	3547	sub add {
3080	my ($self, @children) = @_;	3548	my ($self, @children) = @_;
3081		3549
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;	3550	$_->{is_toplevel} = 1
3090		3551	for @children;
3091	# integerise window positions
3092	$child->{x} = int $child->{x};
3093	$child->{y} = int $child->{y};
3094	}
3095		3552
3096	$self->SUPER::add (@children);	3553	$self->SUPER::add (@children);
3097	}	3554	}
3098		3555
3099	sub remove {	3556	sub remove {
3100	my ($self, @children) = @_;	3557	my ($self, @children) = @_;
3101		3558
3102	$self->SUPER::remove (@children);	3559	$self->SUPER::remove (@children);
		3560
		3561	delete $self->{is_toplevel}
		3562	for @children;
3103		3563
3104	while (@children) {	3564	while (@children) {
3105	my $w = pop @children;	3565	my $w = pop @children;
3106	push @children, $w->children;	3566	push @children, $w->children;
3107	$w->set_invisible;	3567	$w->set_invisible;
…		…
3126	while ($self->{refresh_hook}) {	3586	while ($self->{refresh_hook}) {
3127	$_->()	3587	$_->()
3128	for values %{delete $self->{refresh_hook}};	3588	for values %{delete $self->{refresh_hook}};
3129	}	3589	}
3130		3590
3131	if ($self->{check_size}) {	3591	if ($self->{realloc}) {
		3592	my %queue;
3132	my @queue;	3593	my @queue;
		3594	my $widget;
3133		3595
3134	for (;;) {	3596	outer:
3135	if ($self->{check_size}) {	3597	while () {
3136	#TODO use array-of-depth approach	3598	if (my $realloc = delete $self->{realloc}) {
		3599	for $widget (values %$realloc) {
		3600	$widget->{visible} or next; # do not resize invisible widgets
3137		3601
3138	@queue = sort { $a->{visible} <=> $b->{visible} }	3602	$queue{$widget+0}++ and next; # duplicates are common
3139	@queue, values %{delete $self->{check_size}};	3603
		3604	push @{ $queue[$widget->{visible}] }, $widget;
		3605	}
3140	}	3606	}
3141		3607
		3608	while () {
		3609	@queue or last outer;
		3610
3142	my $widget = pop @queue || last;	3611	$widget = pop @{ $queue[-1] || [] }
3143		3612	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		3613
		3614	pop @queue;
		3615	}
		3616
		3617	delete $queue{$widget+0};
		3618
		3619	my ($w, $h) = $widget->size_request;
		3620
		3621	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3622	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3623
		3624	$w = $widget->{force_w} if exists $widget->{force_w};
		3625	$h = $widget->{force_h} if exists $widget->{force_h};
		3626
		3627	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3628	|| delete $widget->{force_realloc}) {
3154	$widget->{req_w} = $w;	3629	$widget->{req_w} = $w;
3155	$widget->{req_h} = $h;	3630	$widget->{req_h} = $h;
3156		3631
3157	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3632	$self->{size_alloc}{$widget+0} = $widget;
3158		3633
3159	$widget->{parent}->check_size
3160	if $widget->{parent};	3634	if (my $parent = $widget->{parent}) {
		3635	$self->{realloc}{$parent+0} = $parent
		3636	unless $queue{$parent+0};
		3637
		3638	$parent->{force_size_alloc} = 1;
		3639	$self->{size_alloc}{$parent+0} = $parent;
		3640	}
3161	}	3641	}
		3642
		3643	delete $self->{realloc}{$widget+0};
3162	}	3644	}
3163	}	3645	}
3164		3646
3165	while ($self->{size_alloc}) {	3647	while (my $size_alloc = delete $self->{size_alloc}) {
3166	for (values %{delete $self->{size_alloc}}) {	3648	my @queue = sort { $b->{visible} <=> $a->{visible} }
3167	my ($widget, $w, $h) = @$_;	3649	values %$size_alloc;
		3650
		3651	while () {
		3652	my $widget = pop @queue || last;
		3653
		3654	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3168		3655
3169	$w = 0 if $w < 0;	3656	$w = 0 if $w < 0;
3170	$h = 0 if $h < 0;	3657	$h = 0 if $h < 0;
3171		3658
		3659	$w = int $w + 0.5;
		3660	$h = int $h + 0.5;
		3661
		3662	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3663	$widget->{old_w} = $widget->{w};
		3664	$widget->{old_h} = $widget->{h};
		3665
3172	$widget->{w} = $w;	3666	$widget->{w} = $w;
3173	$widget->{h} = $h;	3667	$widget->{h} = $h;
		3668
3174	$widget->emit (size_allocate => $w, $h);	3669	$widget->emit (size_allocate => $w, $h);
		3670	}
3175	}	3671	}
3176	}	3672	}
3177		3673
3178	while ($self->{post_alloc_hook}) {	3674	while ($self->{post_alloc_hook}) {
3179	$_->()	3675	$_->()
3180	for values %{delete $self->{post_alloc_hook}};	3676	for values %{delete $self->{post_alloc_hook}};
3181	}	3677	}
		3678
3182		3679
3183	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3680	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3184	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3681	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3185	glClear GL_COLOR_BUFFER_BIT;	3682	glClear GL_COLOR_BUFFER_BIT;
3186		3683
…		…
3188	glLoadIdentity;	3685	glLoadIdentity;
3189	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3686	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3190	glMatrixMode GL_MODELVIEW;	3687	glMatrixMode GL_MODELVIEW;
3191	glLoadIdentity;	3688	glLoadIdentity;
3192		3689
		3690	{
		3691	package CFClient::UI::Base;
		3692
		3693	($draw_x, $draw_y, $draw_w, $draw_h) =
		3694	(0, 0, $self->{w}, $self->{h});
		3695	}
		3696
3193	$self->_draw;	3697	$self->_draw;
3194	}	3698	}
3195		3699
3196	#############################################################################	3700	#############################################################################
3197		3701

Diff Legend

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