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.304 by elmex, Tue Jun 13 11:01:04 2006 UTC vs.
Revision 1.366 by root, Mon Apr 23 19:17:41 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
98		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	117	# mousewheel
100	if $GRAB;	118	$ev->{dx} = 0;
		119	$ev->{dy} = $ev->{button} * 2 - 9;
		120	$GRAB->emit (mouse_wheel => $ev);
		121	} else {
		122	$GRAB->emit (button_down => $ev)
		123	}
		124	}
101	}	125	}
102		126
103	sub feed_sdl_button_up_event {	127	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	128	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		129
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	130	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		131
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	132	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		133
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	134	$GRAB->emit (button_up => $ev)
112	if $GRAB;	135	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		136
114	if (!$BUTTON_STATE) {	137	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	138	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	139	$grab->update if $grab;
117	$GRAB->update if $GRAB;	140	$GRAB->update if $GRAB;
118		141
		142	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	143	$TOOLTIP_WATCHER->cb->();
120	}	144	}
121	}	145	}
122		146
123	sub feed_sdl_motion_event {	147	sub feed_sdl_motion_event {
124	my ($ev) = @_;	148	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	149	my ($x, $y) = ($ev->{x}, $ev->{y});
126		150
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	151	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		152
129	if ($widget != $HOVER) {	153	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		154
132	$hover->update if $hover && $hover->{can_hover};	155	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	156	if $HOVER;
140	}	157	}
141		158
142	# convert position array to integers	159	# convert position array to integers
143	sub harmonize {	160	sub harmonize {
…		…
193	reconfigure_widgets;	210	reconfigure_widgets;
194	}	211	}
195		212
196	#############################################################################	213	#############################################################################
197		214
		215	package CFPlus::UI::Event;
		216
		217	sub xy {
		218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		219	}
		220
		221	#############################################################################
		222
198	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
199		224
200	use strict;	225	use strict;
201		226
202	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
203		228
204	sub new {	229	sub new {
205	my $class = shift;	230	my $class = shift;
206		231
207	my $self = bless {	232	my $self = bless {
…		…
212	h => undef,	237	h => undef,
213	can_events => 1,	238	can_events => 1,
214	@_	239	@_
215	}, $class;	240	}, $class;
216		241
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		243
219	for (keys %$self) {	244	for (keys %$self) {
220	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
222	}	247	}
223	}	248	}
224		249
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	251	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	252	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	253	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	254	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		255
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		258
234	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
239		264
240	sub destroy {	265	sub destroy {
241	my ($self) = @_;	266	my ($self) = @_;
242		267
243	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
244	%$self = ();	270	%$self = ();
245	}	271	}
246		272
247	sub show {	273	sub show {
248	my ($self) = @_;	274	my ($self) = @_;
249		275
250	return if $self->{parent};	276	return if $self->{parent};
251		277
252	$CFClient::UI::ROOT->add ($self);	278	$CFPlus::UI::ROOT->add ($self);
253	}	279	}
254		280
255	sub set_visible {	281	sub set_visible {
256	my ($self) = @_;	282	my ($self) = @_;
257		283
…		…
278	delete $self->{root};	304	delete $self->{root};
279		305
280	undef $GRAB if $GRAB == $self;	306	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	307	undef $HOVER if $HOVER == $self;
282		308
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	309	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	310	if $TOOLTIP->{owner} == $self;
285		311
286	$self->focus_out;	312	$self->emit ("focus_out");
287
288	$self->emit (visibility_change => 0);	313	$self->emit (visibility_change => 0);
289	}	314	}
290		315
291	sub set_visibility {	316	sub set_visibility {
292	my ($self, $visible) = @_;	317	my ($self, $visible) = @_;
…		…
336	sub size_request {	361	sub size_request {
337	require Carp;	362	require Carp;
338	Carp::confess "size_request is abstract";	363	Carp::confess "size_request is abstract";
339	}	364	}
340		365
		366	sub baseline_shift {
		367	0
		368	}
		369
341	sub configure {	370	sub configure {
342	my ($self, $x, $y, $w, $h) = @_;	371	my ($self, $x, $y, $w, $h) = @_;
343		372
344	if ($self->{aspect}) {	373	if ($self->{aspect}) {
345	my ($ow, $oh) = ($w, $h);	374	my ($ow, $oh) = ($w, $h);
346		375
347	$w = List::Util::min $w, int $h * $self->{aspect};	376	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348	$h = List::Util::min $h, int $w / $self->{aspect};	377	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349		378
350	# use alignment to adjust x, y	379	# use alignment to adjust x, y
351		380
352	$x += int 0.5 * ($ow - $w);	381	$x += int 0.5 * ($ow - $w);
353	$y += int 0.5 * ($oh - $h);	382	$y += int 0.5 * ($oh - $h);
…		…
367		396
368	$self->{root}{size_alloc}{$self+0} = $self;	397	$self->{root}{size_alloc}{$self+0} = $self;
369	}	398	}
370	}	399	}
371		400
372	sub size_allocate {
373	# nothing to be done
374	}
375
376	sub children {	401	sub children {
377	# nop	402	# nop
378	}	403	}
379		404
380	sub visible_children {	405	sub visible_children {
…		…
398		423
399	return if $self->{tooltip} eq $tooltip;	424	return if $self->{tooltip} eq $tooltip;
400		425
401	$self->{tooltip} = $tooltip;	426	$self->{tooltip} = $tooltip;
402		427
403	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	428	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404	delete $CFClient::UI::TOOLTIP->{owner};	429	delete $CFPlus::UI::TOOLTIP->{owner};
405	$CFClient::UI::TOOLTIP_WATCHER->cb->();	430	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
406	}	431	}
407	}	432	}
408		433
409	# translate global coordinates to local coordinate system	434	# translate global coordinates to local coordinate system
410	sub coord2local {	435	sub coord2local {
411	my ($self, $x, $y) = @_;	436	my ($self, $x, $y) = @_;
412		437
		438	Carp::confess unless $self->{parent};#d#
		439
413	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	440	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414	}	441	}
415		442
416	# translate local coordinates to global coordinate system	443	# translate local coordinates to global coordinate system
417	sub coord2global {	444	sub coord2global {
418	my ($self, $x, $y) = @_;	445	my ($self, $x, $y) = @_;
419		446
		447	Carp::confess unless $self->{parent};#d#
		448
420	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	449	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421	}	450	}
422		451
423	sub focus_in {	452	sub invoke_focus_in {
424	my ($self) = @_;	453	my ($self) = @_;
425		454
426	return if $FOCUS == $self;	455	return if $FOCUS == $self;
427	return unless $self->{can_focus};	456	return unless $self->{can_focus};
428		457
429	my $focus = $FOCUS; $FOCUS = $self;	458	$FOCUS = $self;
430		459
431	$self->_emit (focus_in => $focus);	460	$self->update;
432		461
433	$focus->update if $focus;	462	0
434	$FOCUS->update;
435	}	463	}
436		464
437	sub focus_out {	465	sub invoke_focus_out {
438	my ($self) = @_;	466	my ($self) = @_;
439		467
440	return unless $FOCUS == $self;	468	return unless $FOCUS == $self;
441		469
442	my $focus = $FOCUS; undef $FOCUS;	470	undef $FOCUS;
443		471
444	$self->_emit (focus_out => $focus);	472	$self->update;
445		473
446	$focus->update if $focus; #?
447
448	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	474	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449	unless $FOCUS;	475	unless $FOCUS;
450	}
451		476
		477	0
		478	}
		479
		480	sub grab_focus {
		481	my ($self) = @_;
		482
		483	$FOCUS->emit ("focus_out") if $FOCUS;
		484	$self->emit ("focus_in");
		485	}
		486
452	sub mouse_motion { 0 }	487	sub invoke_mouse_motion { 0 }
453	sub button_up { 0 }	488	sub invoke_button_up { 0 }
454	sub key_down { 0 }	489	sub invoke_key_down { 0 }
455	sub key_up { 0 }	490	sub invoke_key_up { 0 }
		491	sub invoke_mouse_wheel { 0 }
456		492
457	sub button_down {	493	sub invoke_button_down {
458	my ($self, $ev, $x, $y) = @_;	494	my ($self, $ev, $x, $y) = @_;
459		495
460	$self->focus_in;	496	$self->grab_focus;
461		497
462	0	498	0
		499	}
		500
		501	sub connect {
		502	my ($self, $signal, $cb) = @_;
		503
		504	push @{ $self->{signal_cb}{$signal} }, $cb;
		505
		506	defined wantarray and CFPlus::guard {
		507	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		508	@{ $self->{signal_cb}{$signal} };
		509	}
		510	}
		511
		512	sub disconnect_all {
		513	my ($self, $signal) = @_;
		514
		515	delete $self->{signal_cb}{$signal};
		516	}
		517
		518	my %has_coords = (
		519	button_down => 1,
		520	button_up => 1,
		521	mouse_motion => 1,
		522	mouse_wheel => 1,
		523	);
		524
		525	sub emit {
		526	my ($self, $signal, @args) = @_;
		527
		528	# I do not really like this solution, but I do not like duplication
		529	# and needlessly verbose code, either.
		530	my @append
		531	= $has_coords{$signal}
		532	? $args[0]->xy ($self)
		533	: ();
		534
		535	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		536
		537	for my $cb (
		538	@{$self->{signal_cb}{$signal} || []}, # before
		539	($self->can ("invoke_$signal") || sub { 1 }), # closure
		540	) {
		541	return $cb->($self, @args, @append) || next;
		542	}
		543
		544	# parent
		545	$self->{parent} && $self->{parent}->emit ($signal, @args)
463	}	546	}
464		547
465	sub find_widget {	548	sub find_widget {
466	my ($self, $x, $y) = @_;	549	my ($self, $x, $y) = @_;
467		550
…		…
475	}	558	}
476		559
477	sub set_parent {	560	sub set_parent {
478	my ($self, $parent) = @_;	561	my ($self, $parent) = @_;
479		562
480	Scalar::Util::weaken ($self->{parent} = $parent);	563	CFPlus::weaken ($self->{parent} = $parent);
481	$self->set_visible if $parent->{visible};	564	$self->set_visible if $parent->{visible};
482	}
483
484	sub connect {
485	my ($self, $signal, $cb) = @_;
486
487	push @{ $self->{signal_cb}{$signal} }, $cb;
488	}
489
490	sub _emit {
491	my ($self, $signal, @args) = @_;
492
493	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494	}
495
496	sub emit {
497	my ($self, $signal, @args) = @_;
498
499	$self->_emit ($signal, @args)
500	|| $self->$signal (@args);
501	}
502
503	sub visibility_change {
504	#my ($self, $visible) = @_;
505	}	565	}
506		566
507	sub realloc {	567	sub realloc {
508	my ($self) = @_;	568	my ($self) = @_;
509		569
…		…
542	return unless $self->{h} && $self->{w};	602	return unless $self->{h} && $self->{w};
543		603
544	# update screen rectangle	604	# update screen rectangle
545	local $draw_x = $draw_x + $self->{x};	605	local $draw_x = $draw_x + $self->{x};
546	local $draw_y = $draw_y + $self->{y};	606	local $draw_y = $draw_y + $self->{y};
547	local $draw_w = $draw_x + $self->{w};
548	local $draw_h = $draw_y + $self->{h};
549		607
550	# skip widgets that are entirely outside the drawing area	608	# skip widgets that are entirely outside the drawing area
551	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	609	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	610	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553		611
…		…
576	glVertex $self->{w} - 1, 0;	634	glVertex $self->{w} - 1, 0;
577	glVertex $self->{w} - 1, $self->{h} - 1;	635	glVertex $self->{w} - 1, $self->{h} - 1;
578	glVertex 0 , $self->{h} - 1;	636	glVertex 0 , $self->{h} - 1;
579	glEnd;	637	glEnd;
580	glPopMatrix;	638	glPopMatrix;
581	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	639	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582	}	640	}
583		641
584	$self->_draw;	642	$self->_draw;
585	glPopMatrix;	643	glPopMatrix;
586	}	644	}
…		…
589	my ($self) = @_;	647	my ($self) = @_;
590		648
591	warn "no draw defined for $self\n";	649	warn "no draw defined for $self\n";
592	}	650	}
593		651
		652	my $cntx;#d#
594	sub DESTROY {	653	sub DESTROY {
595	my ($self) = @_;	654	my ($self) = @_;
596		655
597	delete $WIDGET{$self+0};	656	return if CFPlus::in_destruct;
598		657
599	eval { $self->destroy };	658	eval { $self->destroy };
600	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	659	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		660
		661	delete $WIDGET{$self+0};
601	}	662	}
602		663
603	#############################################################################	664	#############################################################################
604		665
605	package CFClient::UI::DrawBG;	666	package CFPlus::UI::DrawBG;
606		667
607	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFPlus::UI::Base::;
608		669
609	use strict;	670	use strict;
610	use CFClient::OpenGL;	671	use CFPlus::OpenGL;
611		672
612	sub new {	673	sub new {
613	my $class = shift;	674	my $class = shift;
614		675
615	# range [value, low, high, page]	676	# range [value, low, high, page]
…		…
646	}	707	}
647	}	708	}
648		709
649	#############################################################################	710	#############################################################################
650		711
651	package CFClient::UI::Empty;	712	package CFPlus::UI::Empty;
652		713
653	our @ISA = CFClient::UI::Base::;	714	our @ISA = CFPlus::UI::Base::;
654		715
655	sub new {	716	sub new {
656	my ($class, %arg) = @_;	717	my ($class, %arg) = @_;
657	$class->SUPER::new (can_events => 0, %arg);	718	$class->SUPER::new (can_events => 0, %arg);
658	}	719	}
…		…
665		726
666	sub draw { }	727	sub draw { }
667		728
668	#############################################################################	729	#############################################################################
669		730
670	package CFClient::UI::Container;	731	package CFPlus::UI::Container;
671		732
672	our @ISA = CFClient::UI::Base::;	733	our @ISA = CFPlus::UI::Base::;
673		734
674	sub new {	735	sub new {
675	my ($class, %arg) = @_;	736	my ($class, %arg) = @_;
676		737
677	my $children = delete $arg{children};	738	my $children = delete $arg{children};
…		…
686	if $children;	747	if $children;
687		748
688	$self	749	$self
689	}	750	}
690		751
		752	sub realloc {
		753	my ($self) = @_;
		754
		755	$self->{force_realloc} = 1;
		756	$self->{force_size_alloc} = 1;
		757	$self->SUPER::realloc;
		758	}
		759
691	sub add {	760	sub add {
692	my ($self, @widgets) = @_;	761	my ($self, @widgets) = @_;
693		762
694	$_->set_parent ($self)	763	$_->set_parent ($self)
695	for @widgets;	764	for @widgets;
…		…
755	$_->draw for @{$self->{children}};	824	$_->draw for @{$self->{children}};
756	}	825	}
757		826
758	#############################################################################	827	#############################################################################
759		828
760	package CFClient::UI::Bin;	829	package CFPlus::UI::Bin;
761		830
762	our @ISA = CFClient::UI::Container::;	831	our @ISA = CFPlus::UI::Container::;
763		832
764	sub new {	833	sub new {
765	my ($class, %arg) = @_;	834	my ($class, %arg) = @_;
766		835
767	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	836	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
768		837
769	$class->SUPER::new (children => [$child], %arg)	838	$class->SUPER::new (children => [$child], %arg)
770	}	839	}
771		840
772	sub add {	841	sub add {
…		…
779	sub remove {	848	sub remove {
780	my ($self, $widget) = @_;	849	my ($self, $widget) = @_;
781		850
782	$self->SUPER::remove ($widget);	851	$self->SUPER::remove ($widget);
783		852
784	$self->{children} = [new CFClient::UI::Empty]	853	$self->{children} = [new CFPlus::UI::Empty]
785	unless @{$self->{children}};	854	unless @{$self->{children}};
786	}	855	}
787		856
788	sub child { $_[0]->{children}[0] }	857	sub child { $_[0]->{children}[0] }
789		858
790	sub size_request {	859	sub size_request {
791	$_[0]{children}[0]->size_request	860	$_[0]{children}[0]->size_request
792	}	861	}
793		862
794	sub size_allocate {	863	sub invoke_size_allocate {
795	my ($self, $w, $h) = @_;	864	my ($self, $w, $h) = @_;
796		865
797	$self->{children}[0]->configure (0, 0, $w, $h);	866	$self->{children}[0]->configure (0, 0, $w, $h);
		867
		868	1
798	}	869	}
799		870
800	#############################################################################	871	#############################################################################
801		872
802	# back-buffered drawing area	873	# back-buffered drawing area
803		874
804	package CFClient::UI::Window;	875	package CFPlus::UI::Window;
805		876
806	our @ISA = CFClient::UI::Bin::;	877	our @ISA = CFPlus::UI::Bin::;
807		878
808	use CFClient::OpenGL;	879	use CFPlus::OpenGL;
809		880
810	sub new {	881	sub new {
811	my ($class, %arg) = @_;	882	my ($class, %arg) = @_;
812		883
813	my $self = $class->SUPER::new (%arg);	884	my $self = $class->SUPER::new (%arg);
…		…
818		889
819	$ROOT->on_post_alloc ($self => sub { $self->render_child });	890	$ROOT->on_post_alloc ($self => sub { $self->render_child });
820	$self->SUPER::update;	891	$self->SUPER::update;
821	}	892	}
822		893
823	sub size_allocate {	894	sub invoke_size_allocate {
824	my ($self, $w, $h) = @_;	895	my ($self, $w, $h) = @_;
825		896
826	$self->SUPER::size_allocate ($w, $h);
827	$self->update;	897	$self->update;
		898
		899	$self->SUPER::invoke_size_allocate ($w, $h)
828	}	900	}
829		901
830	sub _render {	902	sub _render {
831	my ($self) = @_;	903	my ($self) = @_;
832		904
…		…
834	}	906	}
835		907
836	sub render_child {	908	sub render_child {
837	my ($self) = @_;	909	my ($self) = @_;
838		910
839	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	911	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840	glClearColor 0, 0, 0, 0;	912	glClearColor 0, 0, 0, 0;
841	glClear GL_COLOR_BUFFER_BIT;	913	glClear GL_COLOR_BUFFER_BIT;
842		914
843	{	915	{
844	package CFClient::UI::Base;	916	package CFPlus::UI::Base;
845		917
846	($draw_x, $draw_y, $draw_w, $draw_h) =	918	local ($draw_x, $draw_y, $draw_w, $draw_h) =
847	(0, 0, $self->{w}, $self->{h});	919	(0, 0, $self->{w}, $self->{h});
		920
		921	$self->_render;
848	}	922	}
849
850	$self->_render;
851	};	923	};
852	}	924	}
853		925
854	sub _draw {	926	sub _draw {
855	my ($self) = @_;	927	my ($self) = @_;
856
857	my ($w, $h) = @$self{qw(w h)};
858		928
859	my $tex = $self->{texture}	929	my $tex = $self->{texture}
860	or return;	930	or return;
861		931
862	glEnable GL_TEXTURE_2D;	932	glEnable GL_TEXTURE_2D;
863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	933	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864	glColor 0, 0, 0, 1;	934	glColor 0, 0, 0, 1;
865		935
866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	936	$tex->draw_quad_alpha_premultiplied (0, 0);
867		937
868	glDisable GL_TEXTURE_2D;	938	glDisable GL_TEXTURE_2D;
869	}	939	}
870		940
871	#############################################################################	941	#############################################################################
872		942
873	package CFClient::UI::ViewPort;	943	package CFPlus::UI::ViewPort;
874		944
875	our @ISA = CFClient::UI::Window::;	945	our @ISA = CFPlus::UI::Window::;
876		946
877	sub new {	947	sub new {
878	my $class = shift;	948	my $class = shift;
879		949
880	$class->SUPER::new (	950	$class->SUPER::new (
…		…
893	$h = 10 if $self->{scroll_y};	963	$h = 10 if $self->{scroll_y};
894		964
895	($w, $h)	965	($w, $h)
896	}	966	}
897		967
898	sub size_allocate {	968	sub invoke_size_allocate {
899	my ($self, $w, $h) = @_;	969	my ($self, $w, $h) = @_;
900		970
901	my $child = $self->child;	971	my $child = $self->child;
902		972
903	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	973	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	974	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905		975
906	$self->child->configure (0, 0, $w, $h);	976	$self->child->configure (0, 0, $w, $h);
907	$self->update;	977	$self->update;
		978
		979	1
908	}	980	}
909		981
910	sub set_offset {	982	sub set_offset {
911	my ($self, $x, $y) = @_;	983	my ($self, $x, $y) = @_;
912		984
…		…
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1010	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1011	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	1012	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1013	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	1014	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1015	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1016	}
945	}	1017	}
946		1018
947	sub _render {	1019	sub _render {
948	my ($self) = @_;	1020	my ($self) = @_;
949		1021
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1022	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1023	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		1024
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1025	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1026
955	$self->SUPER::_render;	1027	$self->SUPER::_render;
956	}	1028	}
957		1029
958	#############################################################################	1030	#############################################################################
959		1031
960	package CFClient::UI::ScrolledWindow;	1032	package CFPlus::UI::ScrolledWindow;
961		1033
962	our @ISA = CFClient::UI::HBox::;	1034	our @ISA = CFPlus::UI::HBox::;
963		1035
964	sub new {	1036	sub new {
965	my ($class, %arg) = @_;	1037	my ($class, %arg) = @_;
966		1038
967	my $child = delete $arg{child};	1039	my $child = delete $arg{child};
968		1040
969	my $self;	1041	my $self;
970		1042
971	my $slider = new CFClient::UI::Slider	1043	my $slider = new CFPlus::UI::Slider
972	vertical => 1,	1044	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1045	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1046	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1047	$self->{vp}->set_offset (0, $_[1]);
976	},	1048	},
977	;	1049	;
978		1050
979	$self = $class->SUPER::new (	1051	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1052	vp => (new CFPlus::UI::ViewPort expand => 1),
		1053	can_events => 1,
981	slider => $slider,	1054	slider => $slider,
982	%arg,	1055	%arg,
983	);	1056	);
984		1057
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1058	$self->SUPER::add ($self->{vp}, $self->{slider});
986	$self->add ($child) if $child;	1059	$self->add ($child) if $child;
987		1060
988	$self	1061	$self
989	}	1062	}
990		1063
		1064	#TODO# update range on size_allocate depending on child
		1065
991	sub add {	1066	sub add {
992	my ($self, $widget) = @_;	1067	my ($self, $widget) = @_;
993		1068
994	$self->{vp}->add ($self->{child} = $widget);	1069	$self->{vp}->add ($self->{child} = $widget);
995	}	1070	}
996		1071
		1072	sub invoke_mouse_wheel {
		1073	my ($self, $ev) = @_;
		1074
		1075	return 0 unless $ev->{dy}; # only vertical movements
		1076
		1077	$self->{slider}->emit (mouse_wheel => $ev);
		1078
		1079	1
		1080	}
		1081
		1082	sub update_slider {
		1083	my ($self) = @_;
		1084
		1085	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1086	}
		1087
997	sub update {	1088	sub update {
998	my ($self) = @_;	1089	my ($self) = @_;
999		1090
1000	$self->SUPER::update;	1091	$self->SUPER::update;
1001		1092
1002	# todo: overwrite size_allocate of child	1093	$self->update_slider;
1003	my $child = $self->{vp}->child;
1004	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005	}	1094	}
1006		1095
1007	sub size_allocate {	1096	sub invoke_size_allocate {
1008	my ($self, $w, $h) = @_;	1097	my ($self, $w, $h) = @_;
1009		1098
		1099	$self->update_slider;
		1100
1010	$self->SUPER::size_allocate ($w, $h);	1101	$self->SUPER::invoke_size_allocate ($w, $h)
1011
1012	my $child = $self->{vp}->child;
1013	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014	}	1102	}
1015
1016	#TODO# update range on size_allocate depending on child
1017	# update viewport offset on scroll
1018		1103
1019	#############################################################################	1104	#############################################################################
1020		1105
1021	package CFClient::UI::Frame;	1106	package CFPlus::UI::Frame;
1022		1107
1023	our @ISA = CFClient::UI::Bin::;	1108	our @ISA = CFPlus::UI::Bin::;
1024		1109
1025	use CFClient::OpenGL;	1110	use CFPlus::OpenGL;
1026		1111
1027	sub new {	1112	sub new {
1028	my $class = shift;	1113	my $class = shift;
1029		1114
1030	$class->SUPER::new (	1115	$class->SUPER::new (
…		…
1056	$self->SUPER::_draw;	1141	$self->SUPER::_draw;
1057	}	1142	}
1058		1143
1059	#############################################################################	1144	#############################################################################
1060		1145
1061	package CFClient::UI::FancyFrame;	1146	package CFPlus::UI::FancyFrame;
1062		1147
1063	our @ISA = CFClient::UI::Bin::;	1148	our @ISA = CFPlus::UI::Bin::;
1064		1149
1065	use CFClient::OpenGL;	1150	use CFPlus::OpenGL;
		1151
		1152	sub new {
		1153	my ($class, %arg) = @_;
		1154
		1155	if ((exists $arg{label}) && !ref $arg{label}) {
		1156	$arg{label} = new CFPlus::UI::Label
		1157	align => 1,
		1158	valign => 0,
		1159	text => $arg{label},
		1160	fontsize => ($arg{border} || 0.8) * 0.75;
		1161	}
		1162
		1163	my $self = $class->SUPER::new (
		1164	# label => "",
		1165	fg => [0.6, 0.3, 0.1],
		1166	border => 0.8,
		1167	style => 'single',
		1168	%arg,
		1169	);
		1170
		1171	$self
		1172	}
		1173
		1174	sub add {
		1175	my ($self, @widgets) = @_;
		1176
		1177	$self->SUPER::add (@widgets);
		1178	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1179	}
		1180
		1181	sub border {
		1182	int $_[0]{border} * $::FONTSIZE
		1183	}
		1184
		1185	sub size_request {
		1186	my ($self) = @_;
		1187
		1188	($self->{label_w}, undef) = $self->{label}->size_request
		1189	if $self->{label};
		1190
		1191	my ($w, $h) = $self->SUPER::size_request;
		1192
		1193	(
		1194	$w + $self->border * 2,
		1195	$h + $self->border * 2,
		1196	)
		1197	}
		1198
		1199	sub invoke_size_allocate {
		1200	my ($self, $w, $h) = @_;
		1201
		1202	my $border = $self->border;
		1203
		1204	$w -= List::Util::max 0, $border * 2;
		1205	$h -= List::Util::max 0, $border * 2;
		1206
		1207	if (my $label = $self->{label}) {
		1208	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1209	$label->{h} = List::Util::min $h, $border;
		1210	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1211	}
		1212
		1213	$self->child->configure ($border, $border, $w, $h);
		1214
		1215	1
		1216	}
		1217
		1218	sub _draw {
		1219	my ($self) = @_;
		1220
		1221	my $child = $self->{children}[0];
		1222
		1223	my $border = $self->border;
		1224	my ($w, $h) = ($self->{w}, $self->{h});
		1225
		1226	$child->draw;
		1227
		1228	glColor @{$self->{fg}};
		1229	glBegin GL_LINE_STRIP;
		1230	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1231	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1232	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1233	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1234	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1235	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1236	glEnd;
		1237
		1238	if ($self->{label}) {
		1239	glTranslate $border * 2, 0;
		1240	$self->{label}->_draw;
		1241	}
		1242	}
		1243
		1244	#############################################################################
		1245
		1246	package CFPlus::UI::Toplevel;
		1247
		1248	our @ISA = CFPlus::UI::Bin::;
		1249
		1250	use CFPlus::OpenGL;
1066		1251
1067	my $bg =	1252	my $bg =
1068	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1253	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069	mipmap => 1, wrap => 1;	1254	mipmap => 1, wrap => 1;
1070		1255
1071	my @border =	1256	my @border =
1072	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1257	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1258	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074		1259
1075	sub new {	1260	sub new {
1076	my ($class, %arg) = @_;	1261	my ($class, %arg) = @_;
1077		1262
1078	my $self = $class->SUPER::new (	1263	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1264	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1265	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1266	border => 0.6,
1082	can_events => 1,	1267	can_events => 1,
1083	min_w => 16,	1268	min_w => 64,
1084	min_h => 16,	1269	min_h => 32,
1085	%arg,	1270	%arg,
1086	);	1271	);
1087		1272
1088	$self->{title_widget} = new CFClient::UI::Label	1273	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1274	align => 0,
1090	valign => 1,	1275	valign => 1,
1091	text => $self->{title},	1276	text => $self->{title},
1092	fontsize => $self->{border},	1277	fontsize => $self->{border},
1093	if exists $self->{title};	1278	if exists $self->{title};
1094		1279
1095	unless ($self->{no_close_button}) {	1280	if ($self->{has_close_button}) {
1096	$self->{close_btn} =	1281	$self->{close_button} =
1097	new CFClient::UI::ImageButton	1282	new CFPlus::UI::ImageButton
1098	image => 'x1_close.png',	1283	path => 'x1_close.png',
1099	on_activate => sub { $self->hide };	1284	on_activate => sub { $self->emit ("delete") };
1100		1285
1101	$self->CFClient::UI::Container::add ($self->{close_btn});	1286	$self->CFPlus::UI::Container::add ($self->{close_button});
1102	}	1287	}
1103		1288
1104	$self	1289	$self
1105	}	1290	}
1106		1291
1107	sub add {	1292	sub add {
1108	my ($self, @widgets) = @_;	1293	my ($self, @widgets) = @_;
1109		1294
1110	$self->SUPER::add (@widgets);	1295	$self->SUPER::add (@widgets);
1111	$self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};	1296	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1297	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113	}	1298	}
1114		1299
1115	sub border {	1300	sub border {
1116	int $_[0]{border} * $::FONTSIZE	1301	int $_[0]{border} * $::FONTSIZE
1117	}	1302	}
…		…
1120	my ($self) = @_;	1305	my ($self) = @_;
1121		1306
1122	$self->{title_widget}->size_request	1307	$self->{title_widget}->size_request
1123	if $self->{title_widget};	1308	if $self->{title_widget};
1124		1309
1125	$self->{close_btn}->size_request	1310	$self->{close_button}->size_request
1126	if $self->{close_btn};	1311	if $self->{close_button};
1127		1312
1128	my ($w, $h) = $self->SUPER::size_request;	1313	my ($w, $h) = $self->SUPER::size_request;
1129		1314
1130	(	1315	(
1131	$w + $self->border * 2,	1316	$w + $self->border * 2,
1132	$h + $self->border * 2,	1317	$h + $self->border * 2,
1133	)	1318	)
1134	}	1319	}
1135		1320
1136	sub size_allocate {	1321	sub invoke_size_allocate {
1137	my ($self, $w, $h) = @_;	1322	my ($self, $w, $h) = @_;
1138		1323
1139	if ($self->{title_widget}) {	1324	if ($self->{title_widget}) {
1140	$self->{title_widget}{w} = $w;	1325	$self->{title_widget}{w} = $w;
1141	$self->{title_widget}{h} = $h;	1326	$self->{title_widget}{h} = $h;
1142	$self->{title_widget}->size_allocate ($w, $h);	1327	$self->{title_widget}->invoke_size_allocate ($w, $h);
1143	}	1328	}
1144		1329
1145	my $border = $self->border;	1330	my $border = $self->border;
1146		1331
1147	$h -= List::Util::max 0, $border * 2;	1332	$h -= List::Util::max 0, $border * 2;
1148	$w -= List::Util::max 0, $border * 2;	1333	$w -= List::Util::max 0, $border * 2;
1149		1334
1150	$self->child->configure ($border, $border, $w, $h);	1335	$self->child->configure ($border, $border, $w, $h);
1151		1336
1152	$self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border)	1337	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153	if $self->{close_btn};	1338	if $self->{close_button};
1154	}
1155		1339
		1340	1
		1341	}
		1342
		1343	sub invoke_delete {
		1344	my ($self) = @_;
		1345
		1346	$self->hide;
		1347
		1348	1
		1349	}
		1350
1156	sub button_down {	1351	sub invoke_button_down {
1157	my ($self, $ev, $x, $y) = @_;	1352	my ($self, $ev, $x, $y) = @_;
1158		1353
1159	my ($w, $h) = @$self{qw(w h)};	1354	my ($w, $h) = @$self{qw(w h)};
1160	my $border = $self->border;	1355	my $border = $self->border;
1161		1356
…		…
1192		1387
1193	($x, $y) = ($ev->{x}, $ev->{y});	1388	($x, $y) = ($ev->{x}, $ev->{y});
1194		1389
1195	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1390	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196	# HACK: the next line is required to enforce placement	1391	# HACK: the next line is required to enforce placement
1197	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1392	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1198	};	1393	};
1199	} else {	1394	} else {
1200	return 0;	1395	return 0;
1201	}	1396	}
1202		1397
1203	1	1398	1
1204	}	1399	}
1205		1400
1206	sub button_up {	1401	sub invoke_button_up {
1207	my ($self, $ev, $x, $y) = @_;	1402	my ($self, $ev, $x, $y) = @_;
1208		1403
1209	$self->{close_btn}->button_up ($ev, $x, $y)
1210	if $self->{close_btn};
1211
1212	!!delete $self->{motion}	1404	! ! delete $self->{motion}
1213	}	1405	}
1214		1406
1215	sub mouse_motion {	1407	sub invoke_mouse_motion {
1216	my ($self, $ev, $x, $y) = @_;	1408	my ($self, $ev, $x, $y) = @_;
1217		1409
1218	$self->{motion}->($ev, $x, $y) if $self->{motion};	1410	$self->{motion}->($ev, $x, $y) if $self->{motion};
1219		1411
1220	!!$self->{motion}	1412	! ! $self->{motion}
		1413	}
		1414
		1415	sub invoke_visibility_change {
		1416	my ($self, $visible) = @_;
		1417
		1418	delete $self->{motion} unless $visible;
		1419
		1420	0
1221	}	1421	}
1222		1422
1223	sub _draw {	1423	sub _draw {
1224	my ($self) = @_;	1424	my ($self) = @_;
1225		1425
…		…
1258	$self->{title_widget}->_draw;	1458	$self->{title_widget}->_draw;
1259		1459
1260	glTranslate 0, - ($border - $self->{h});	1460	glTranslate 0, - ($border - $self->{h});
1261	}	1461	}
1262		1462
1263	$self->{close_btn}->draw	1463	$self->{close_button}->draw
1264	if $self->{close_btn};	1464	if $self->{close_button};
1265	}	1465	}
1266		1466
1267	#############################################################################	1467	#############################################################################
1268		1468
1269	package CFClient::UI::Table;	1469	package CFPlus::UI::Table;
1270		1470
1271	our @ISA = CFClient::UI::Base::;	1471	our @ISA = CFPlus::UI::Base::;
1272		1472
1273	use List::Util qw(max sum);	1473	use List::Util qw(max sum);
1274		1474
1275	use CFClient::OpenGL;	1475	use CFPlus::OpenGL;
1276		1476
1277	sub new {	1477	sub new {
1278	my $class = shift;	1478	my $class = shift;
1279		1479
1280	$class->SUPER::new (	1480	$class->SUPER::new (
…		…
1286	sub children {	1486	sub children {
1287	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1487	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1288	}	1488	}
1289		1489
1290	sub add {	1490	sub add {
1291	my ($self, $x, $y, $child) = @_;	1491	my ($self) = shift;
1292		1492
		1493	while (@_) {
		1494	my ($x, $y, $child) = splice @_, 0, 3, ();
1293	$child->set_parent ($self);	1495	$child->set_parent ($self);
1294	$self->{children}[$y][$x] = $child;	1496	$self->{children}[$y][$x] = $child;
		1497	}
1295		1498
		1499	$self->{force_realloc} = 1;
		1500	$self->{force_size_alloc} = 1;
1296	$self->realloc;	1501	$self->realloc;
1297	}	1502	}
1298		1503
1299	sub remove {	1504	sub remove {
1300	my ($self, $child) = @_;	1505	my ($self, $child) = @_;
…		…
1348	(sum @$ws),	1553	(sum @$ws),
1349	(sum @$hs),	1554	(sum @$hs),
1350	)	1555	)
1351	}	1556	}
1352		1557
1353	sub size_allocate {	1558	sub invoke_size_allocate {
1354	my ($self, $w, $h) = @_;	1559	my ($self, $w, $h) = @_;
1355		1560
1356	my ($ws, $hs) = $self->get_wh;	1561	my ($ws, $hs) = $self->get_wh;
1357		1562
1358	my $req_w = (sum @$ws) || 1;	1563	my $req_w = (sum @$ws) || 1;
…		…
1365		1570
1366	# linearly scale sizes	1571	# linearly scale sizes
1367	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1572	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1368	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1573	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1369		1574
1370	CFClient::UI::harmonize $ws;	1575	CFPlus::UI::harmonize $ws;
1371	CFClient::UI::harmonize $hs;	1576	CFPlus::UI::harmonize $hs;
1372		1577
1373	my $y;	1578	my $y;
1374		1579
1375	for my $r (0 .. $#{$self->{children}}) {	1580	for my $r (0 .. $#{$self->{children}}) {
1376	my $row = $self->{children}[$r]	1581	my $row = $self->{children}[$r]
…		…
1390	}	1595	}
1391		1596
1392	$y += $row_h;	1597	$y += $row_h;
1393	}	1598	}
1394		1599
		1600	1
1395	}	1601	}
1396		1602
1397	sub find_widget {	1603	sub find_widget {
1398	my ($self, $x, $y) = @_;	1604	my ($self, $x, $y) = @_;
1399		1605
…		…
1418	}	1624	}
1419	}	1625	}
1420		1626
1421	#############################################################################	1627	#############################################################################
1422		1628
1423	package CFClient::UI::Box;	1629	package CFPlus::UI::Box;
1424		1630
1425	our @ISA = CFClient::UI::Container::;	1631	our @ISA = CFPlus::UI::Container::;
1426		1632
1427	sub size_request {	1633	sub size_request {
1428	my ($self) = @_;	1634	my ($self) = @_;
1429		1635
1430	$self->{vertical}	1636	$self->{vertical}
…		…
1436	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1642	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1643	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1438	)	1644	)
1439	}	1645	}
1440		1646
1441	sub size_allocate {	1647	sub invoke_size_allocate {
1442	my ($self, $w, $h) = @_;	1648	my ($self, $w, $h) = @_;
1443		1649
1444	my $space = $self->{vertical} ? $h : $w;	1650	my $space = $self->{vertical} ? $h : $w;
1445	my $children = $self->{children};	1651	my @children = $self->visible_children;
1446		1652
1447	my @req;	1653	my @req;
1448		1654
1449	if ($self->{homogeneous}) {	1655	if ($self->{homogeneous}) {
1450	@req = ($space / (@$children || 1)) x @$children;	1656	@req = ($space / (@children || 1)) x @children;
1451	} else {	1657	} else {
1452	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1658	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453	my $req = List::Util::sum @req;	1659	my $req = List::Util::sum @req;
1454		1660
1455	if ($req > $space) {	1661	if ($req > $space) {
1456	# ah well, not enough space	1662	# ah well, not enough space
1457	$_ *= $space / $req for @req;	1663	$_ *= $space / $req for @req;
1458	} else {	1664	} else {
1459	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1665	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460		1666
1461	$space = ($space - $req) / $expand; # remaining space to give away	1667	$space = ($space - $req) / $expand; # remaining space to give away
1462		1668
1463	$req[$_] += $space * $children->[$_]{expand}	1669	$req[$_] += $space * $children[$_]{expand}
1464	for 0 .. $#$children;	1670	for 0 .. $#children;
1465	}	1671	}
1466	}	1672	}
1467		1673
1468	CFClient::UI::harmonize \@req;	1674	CFPlus::UI::harmonize \@req;
1469		1675
1470	my $pos = 0;	1676	my $pos = 0;
1471	for (0 .. $#$children) {	1677	for (0 .. $#children) {
1472	my $alloc = $req[$_];	1678	my $alloc = $req[$_];
1473	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1679	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1474		1680
1475	$pos += $alloc;	1681	$pos += $alloc;
1476	}	1682	}
1477		1683
1478	1	1684	1
1479	}	1685	}
1480		1686
1481	#############################################################################	1687	#############################################################################
1482		1688
1483	package CFClient::UI::HBox;	1689	package CFPlus::UI::HBox;
1484		1690
1485	our @ISA = CFClient::UI::Box::;	1691	our @ISA = CFPlus::UI::Box::;
1486		1692
1487	sub new {	1693	sub new {
1488	my $class = shift;	1694	my $class = shift;
1489		1695
1490	$class->SUPER::new (	1696	$class->SUPER::new (
…		…
1493	)	1699	)
1494	}	1700	}
1495		1701
1496	#############################################################################	1702	#############################################################################
1497		1703
1498	package CFClient::UI::VBox;	1704	package CFPlus::UI::VBox;
1499		1705
1500	our @ISA = CFClient::UI::Box::;	1706	our @ISA = CFPlus::UI::Box::;
1501		1707
1502	sub new {	1708	sub new {
1503	my $class = shift;	1709	my $class = shift;
1504		1710
1505	$class->SUPER::new (	1711	$class->SUPER::new (
…		…
1508	)	1714	)
1509	}	1715	}
1510		1716
1511	#############################################################################	1717	#############################################################################
1512		1718
1513	package CFClient::UI::Label;	1719	package CFPlus::UI::Label;
1514		1720
1515	our @ISA = CFClient::UI::DrawBG::;	1721	our @ISA = CFPlus::UI::DrawBG::;
1516		1722
1517	use CFClient::OpenGL;	1723	use CFPlus::OpenGL;
1518		1724
1519	sub new {	1725	sub new {
1520	my ($class, %arg) = @_;	1726	my ($class, %arg) = @_;
1521		1727
1522	my $self = $class->SUPER::new (	1728	my $self = $class->SUPER::new (
…		…
1525	#active_bg => none	1731	#active_bg => none
1526	#font => default_font	1732	#font => default_font
1527	#text => initial text	1733	#text => initial text
1528	#markup => initial narkup	1734	#markup => initial narkup
1529	#max_w => maximum pixel width	1735	#max_w => maximum pixel width
		1736	#style => 0, # render flags
1530	ellipsise => 3, # end	1737	ellipsise => 3, # end
1531	layout => (new CFClient::Layout),	1738	layout => (new CFPlus::Layout),
1532	fontsize => 1,	1739	fontsize => 1,
1533	align => -1,	1740	align => -1,
1534	valign => -1,	1741	valign => -1,
1535	padding_x => 2,	1742	padding_x => 2,
1536	padding_y => 2,	1743	padding_y => 2,
1537	can_events => 0,	1744	can_events => 0,
1538	%arg	1745	%arg
1539	);	1746	);
1540		1747
1541	if (exists $self->{template}) {	1748	if (exists $self->{template}) {
1542	my $layout = new CFClient::Layout;	1749	my $layout = new CFPlus::Layout;
1543	$layout->set_text (delete $self->{template});	1750	$layout->set_text (delete $self->{template});
1544	$self->{template} = $layout;	1751	$self->{template} = $layout;
1545	}	1752	}
1546		1753
1547	if (exists $self->{markup}) {	1754	if (exists $self->{markup}) {
…		…
1551	}	1758	}
1552		1759
1553	$self	1760	$self
1554	}	1761	}
1555		1762
1556	sub escape($) {
1557	local $_ = $_[0];
1558
1559	s/&/&amp;/g;
1560	s/>/&gt;/g;
1561	s/</&lt;/g;
1562
1563	$_
1564	}
1565
1566	sub update {	1763	sub update {
1567	my ($self) = @_;	1764	my ($self) = @_;
1568		1765
1569	delete $self->{texture};	1766	delete $self->{texture};
1570	$self->SUPER::update;	1767	$self->SUPER::update;
…		…
1581	my ($self, $text) = @_;	1778	my ($self, $text) = @_;
1582		1779
1583	return if $self->{text} eq "T$text";	1780	return if $self->{text} eq "T$text";
1584	$self->{text} = "T$text";	1781	$self->{text} = "T$text";
1585		1782
1586	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587	$self->{layout}->set_text ($text);	1783	$self->{layout}->set_text ($text);
1588		1784
1589	delete $self->{size_req};	1785	delete $self->{size_req};
1590	$self->realloc;	1786	$self->realloc;
1591	$self->update;	1787	$self->update;
…		…
1597	return if $self->{text} eq "M$markup";	1793	return if $self->{text} eq "M$markup";
1598	$self->{text} = "M$markup";	1794	$self->{text} = "M$markup";
1599		1795
1600	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1796	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601		1797
1602	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603	$self->{layout}->set_markup ($markup);	1798	$self->{layout}->set_markup ($markup);
1604		1799
1605	delete $self->{size_req};	1800	delete $self->{size_req};
1606	$self->realloc;	1801	$self->realloc;
1607	$self->update;	1802	$self->update;
…		…
1619		1814
1620	my ($w, $h) = $self->{layout}->size;	1815	my ($w, $h) = $self->{layout}->size;
1621		1816
1622	if (exists $self->{template}) {	1817	if (exists $self->{template}) {
1623	$self->{template}->set_font ($self->{font}) if $self->{font};	1818	$self->{template}->set_font ($self->{font}) if $self->{font};
		1819	$self->{template}->set_width ($self->{max_w} || -1);
1624	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1820	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625		1821
1626	my ($w2, $h2) = $self->{template}->size;	1822	my ($w2, $h2) = $self->{template}->size;
1627		1823
1628	$w = List::Util::max $w, $w2;	1824	$w = List::Util::max $w, $w2;
…		…
1633	};	1829	};
1634		1830
1635	@{ $self->{size_req} }	1831	@{ $self->{size_req} }
1636	}	1832	}
1637		1833
		1834	sub baseline_shift {
		1835	$_[0]{layout}->descent
		1836	}
		1837
1638	sub size_allocate {	1838	sub invoke_size_allocate {
1639	my ($self, $w, $h) = @_;	1839	my ($self, $w, $h) = @_;
1640		1840
1641	delete $self->{ox};	1841	delete $self->{ox};
1642		1842
1643	delete $self->{texture}	1843	delete $self->{texture}
1644	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1844	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1845
		1846	1
1645	}	1847	}
1646		1848
1647	sub set_fontsize {	1849	sub set_fontsize {
1648	my ($self, $fontsize) = @_;	1850	my ($self, $fontsize) = @_;
1649		1851
1650	$self->{fontsize} = $fontsize;	1852	$self->{fontsize} = $fontsize;
		1853	delete $self->{size_req};
1651	delete $self->{texture};	1854	delete $self->{texture};
1652		1855
1653	$self->realloc;	1856	$self->realloc;
1654	}	1857	}
1655		1858
1656	sub reconfigure {	1859	sub reconfigure {
1657	my ($self) = @_;	1860	my ($self) = @_;
1658		1861
1659	delete $self->{size_req};	1862	delete $self->{size_req};
		1863	delete $self->{texture};
1660		1864
1661	$self->SUPER::reconfigure;	1865	$self->SUPER::reconfigure;
1662	}	1866	}
1663		1867
1664	sub _draw {	1868	sub _draw {
1665	my ($self) = @_;	1869	my ($self) = @_;
1666		1870
1667	$self->SUPER::_draw; # draw background, if applicable	1871	$self->SUPER::_draw; # draw background, if applicable
1668		1872
1669	my $tex = $self->{texture} ||= do {	1873	my $size = $self->{texture} ||= do {
1670	$self->{layout}->set_foreground (@{$self->{fg}});	1874	$self->{layout}->set_foreground (@{$self->{fg}});
1671	$self->{layout}->set_font ($self->{font}) if $self->{font};	1875	$self->{layout}->set_font ($self->{font}) if $self->{font};
1672	$self->{layout}->set_width ($self->{w});	1876	$self->{layout}->set_width ($self->{w});
1673	$self->{layout}->set_ellipsise ($self->{ellipsise});	1877	$self->{layout}->set_ellipsise ($self->{ellipsise});
1674	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1878	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1879	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676		1880
1677	new_from_layout CFClient::Texture $self->{layout}	1881	[$self->{layout}->size]
1678	};	1882	};
1679		1883
1680	unless (exists $self->{ox}) {	1884	unless (exists $self->{ox}) {
1681	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1885	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1886	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683	: ($self->{w} - $tex->{w}) * 0.5);	1887	: ($self->{w} - $size->[0]) * 0.5);
1684		1888
1685	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1889	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1890	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687	: ($self->{h} - $tex->{h}) * 0.5);	1891	: ($self->{h} - $size->[1]) * 0.5);
1688	};	1892	};
1689		1893
1690	glEnable GL_TEXTURE_2D;
1691
1692	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1894	my $w = List::Util::min $self->{w} + 4, $size->[0];
1693	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1895	my $h = List::Util::min $self->{h} + 2, $size->[1];
1694		1896
1695	if ($tex->{format} == GL_ALPHA) {	1897	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697	glColor @{$self->{fg}};
1698	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699	} else {
1700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702	}
1703
1704	glDisable GL_TEXTURE_2D;
1705	}	1898	}
1706		1899
1707	#############################################################################	1900	#############################################################################
1708		1901
1709	package CFClient::UI::EntryBase;	1902	package CFPlus::UI::EntryBase;
1710		1903
1711	our @ISA = CFClient::UI::Label::;	1904	our @ISA = CFPlus::UI::Label::;
1712		1905
1713	use CFClient::OpenGL;	1906	use CFPlus::OpenGL;
1714		1907
1715	sub new {	1908	sub new {
1716	my $class = shift;	1909	my $class = shift;
1717		1910
1718	$class->SUPER::new (	1911	$class->SUPER::new (
…		…
1722	active_fg => [0, 0, 0],	1915	active_fg => [0, 0, 0],
1723	can_hover => 1,	1916	can_hover => 1,
1724	can_focus => 1,	1917	can_focus => 1,
1725	valign => 0,	1918	valign => 0,
1726	can_events => 1,	1919	can_events => 1,
		1920	ellipsise => 0,
1727	#text => ...	1921	#text => ...
1728	#hidden => "*",	1922	#hidden => "*",
1729	@_	1923	@_
1730	)	1924	)
1731	}	1925	}
…		…
1742		1936
1743	$text =~ s/./*/g if $self->{hidden};	1937	$text =~ s/./*/g if $self->{hidden};
1744	$self->{layout}->set_text ("$text ");	1938	$self->{layout}->set_text ("$text ");
1745	delete $self->{size_req};	1939	delete $self->{size_req};
1746		1940
1747	$self->_emit (changed => $self->{text});	1941	$self->emit (changed => $self->{text});
1748		1942
1749	$self->realloc;	1943	$self->realloc;
1750	$self->update;	1944	$self->update;
1751	}	1945	}
1752		1946
…		…
1767	my ($w, $h) = $self->SUPER::size_request;	1961	my ($w, $h) = $self->SUPER::size_request;
1768		1962
1769	($w + 1, $h) # add 1 for cursor	1963	($w + 1, $h) # add 1 for cursor
1770	}	1964	}
1771		1965
1772	sub key_down {	1966	sub invoke_key_down {
1773	my ($self, $ev) = @_;	1967	my ($self, $ev) = @_;
1774		1968
1775	my $mod = $ev->{mod};	1969	my $mod = $ev->{mod};
1776	my $sym = $ev->{sym};	1970	my $sym = $ev->{sym};
1777	my $uni = $ev->{unicode};	1971	my $uni = $ev->{unicode};
…		…
1780		1974
1781	if ($uni == 8) {	1975	if ($uni == 8) {
1782	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1976	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783	} elsif ($uni == 127) {	1977	} elsif ($uni == 127) {
1784	substr $text, $self->{cursor}, 1, "";	1978	substr $text, $self->{cursor}, 1, "";
1785	} elsif ($sym == CFClient::SDLK_LEFT) {	1979	} elsif ($sym == CFPlus::SDLK_LEFT) {
1786	--$self->{cursor} if $self->{cursor};	1980	--$self->{cursor} if $self->{cursor};
1787	} elsif ($sym == CFClient::SDLK_RIGHT) {	1981	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1788	++$self->{cursor} if $self->{cursor} < length $self->{text};	1982	++$self->{cursor} if $self->{cursor} < length $self->{text};
1789	} elsif ($sym == CFClient::SDLK_HOME) {	1983	} elsif ($sym == CFPlus::SDLK_HOME) {
		1984	# what a hack
		1985	$self->{cursor} =
		1986	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		1987	? length $1
		1988	: 0;
		1989	} elsif ($sym == CFPlus::SDLK_END) {
		1990	# uh, again
		1991	$self->{cursor} =
		1992	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		1993	? $self->{cursor} + length $1
		1994	: length $self->{text};
		1995	} elsif ($uni == 21) { # ctrl-u
		1996	$text = "";
1790	$self->{cursor} = 0;	1997	$self->{cursor} = 0;
1791	} elsif ($sym == CFClient::SDLK_END) {
1792	$self->{cursor} = length $text;
1793	} elsif ($uni == 27) {	1998	} elsif ($uni == 27) {
1794	$self->_emit ('escape');	1999	$self->emit ('escape');
1795	} elsif ($uni) {	2000	} elsif ($uni == 0x0d) {
		2001	substr $text, $self->{cursor}++, 0, "\012";
		2002	} elsif ($uni >= 0x20) {
1796	substr $text, $self->{cursor}++, 0, chr $uni;	2003	substr $text, $self->{cursor}++, 0, chr $uni;
1797	} else {	2004	} else {
1798	return 0;	2005	return 0;
1799	}	2006	}
1800		2007
1801	$self->_set_text ($text);	2008	$self->_set_text ($text);
1802		2009
1803	$self->realloc;	2010	$self->realloc;
		2011	$self->update;
1804		2012
1805	1	2013	1
1806	}	2014	}
1807		2015
1808	sub focus_in {	2016	sub invoke_focus_in {
1809	my ($self) = @_;	2017	my ($self) = @_;
1810		2018
1811	$self->{last_activity} = $::NOW;	2019	$self->{last_activity} = $::NOW;
1812		2020
1813	$self->SUPER::focus_in;	2021	$self->SUPER::invoke_focus_in
1814	}	2022	}
1815		2023
1816	sub button_down {	2024	sub invoke_button_down {
1817	my ($self, $ev, $x, $y) = @_;	2025	my ($self, $ev, $x, $y) = @_;
1818		2026
1819	$self->SUPER::button_down ($ev, $x, $y);	2027	$self->SUPER::invoke_button_down ($ev, $x, $y);
1820		2028
1821	my $idx = $self->{layout}->xy_to_index ($x, $y);	2029	my $idx = $self->{layout}->xy_to_index ($x, $y);
1822		2030
1823	# byte-index to char-index	2031	# byte-index to char-index
1824	my $text = $self->{text};	2032	my $text = $self->{text};
1825	utf8::encode $text;	2033	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826	$self->{cursor} = length substr $text, 0, $idx;	2034	$self->{cursor} = length $text;
1827		2035
1828	$self->_set_text ($self->{text});	2036	$self->_set_text ($self->{text});
1829	$self->update;	2037	$self->update;
1830		2038
1831	1	2039	1
1832	}	2040	}
1833		2041
1834	sub mouse_motion {	2042	sub invoke_mouse_motion {
1835	my ($self, $ev, $x, $y) = @_;	2043	my ($self, $ev, $x, $y) = @_;
1836	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2044	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837		2045
1838	0	2046	1
1839	}	2047	}
1840		2048
1841	sub _draw {	2049	sub _draw {
1842	my ($self) = @_;	2050	my ($self) = @_;
1843		2051
…		…
1870	utf8::encode $text;	2078	utf8::encode $text;
1871		2079
1872	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2080	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873	}	2081	}
1874		2082
1875	glColor @{$self->{fg}};
1876	glBegin GL_LINES;	2083	glBegin GL_LINES;
1877	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2084	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1878	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2085	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879	glEnd;	2086	glEnd;
1880	}	2087	}
1881	}	2088	}
1882		2089
		2090	#############################################################################
		2091
1883	package CFClient::UI::Entry;	2092	package CFPlus::UI::Entry;
1884		2093
1885	our @ISA = CFClient::UI::EntryBase::;	2094	our @ISA = CFPlus::UI::EntryBase::;
1886		2095
1887	use CFClient::OpenGL;	2096	use CFPlus::OpenGL;
1888		2097
1889	sub key_down {	2098	sub invoke_key_down {
1890	my ($self, $ev) = @_;	2099	my ($self, $ev) = @_;
1891		2100
1892	my $sym = $ev->{sym};	2101	my $sym = $ev->{sym};
1893		2102
1894	if ($sym == 13) {	2103	if ($ev->{uni} == 0x0d || $sym == 13) {
1895	unshift @{$self->{history}},	2104	unshift @{$self->{history}},
1896	my $txt = $self->get_text;	2105	my $txt = $self->get_text;
		2106
1897	$self->{history_pointer} = -1;	2107	$self->{history_pointer} = -1;
1898	$self->{history_saveback} = '';	2108	$self->{history_saveback} = '';
1899	$self->_emit (activate => $txt);	2109	$self->emit (activate => $txt);
1900	$self->update;	2110	$self->update;
1901		2111
1902	} elsif ($sym == CFClient::SDLK_UP) {	2112	} elsif ($sym == CFPlus::SDLK_UP) {
1903	if ($self->{history_pointer} < 0) {	2113	if ($self->{history_pointer} < 0) {
1904	$self->{history_saveback} = $self->get_text;	2114	$self->{history_saveback} = $self->get_text;
1905	}	2115	}
1906	if (@{$self->{history} || []} > 0) {	2116	if (@{$self->{history} || []} > 0) {
1907	$self->{history_pointer}++;	2117	$self->{history_pointer}++;
…		…
1909	$self->{history_pointer} = @{$self->{history} || []} - 1;	2119	$self->{history_pointer} = @{$self->{history} || []} - 1;
1910	}	2120	}
1911	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2121	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1912	}	2122	}
1913		2123
1914	} elsif ($sym == CFClient::SDLK_DOWN) {	2124	} elsif ($sym == CFPlus::SDLK_DOWN) {
1915	$self->{history_pointer}--;	2125	$self->{history_pointer}--;
1916	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2126	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1917		2127
1918	if ($self->{history_pointer} >= 0) {	2128	if ($self->{history_pointer} >= 0) {
1919	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2129	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1920	} else {	2130	} else {
1921	$self->set_text ($self->{history_saveback});	2131	$self->set_text ($self->{history_saveback});
1922	}	2132	}
1923		2133
1924	} else {	2134	} else {
1925	return $self->SUPER::key_down ($ev)	2135	return $self->SUPER::invoke_key_down ($ev)
1926	}	2136	}
1927		2137
1928	1	2138	1
1929	}	2139	}
1930		2140
1931	#############################################################################	2141	#############################################################################
1932		2142
		2143	package CFPlus::UI::TextEdit;
		2144
		2145	our @ISA = CFPlus::UI::EntryBase::;
		2146
		2147	use CFPlus::OpenGL;
		2148
		2149	sub move_cursor_ver {
		2150	my ($self, $dy) = @_;
		2151
		2152	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2153
		2154	$y += $dy;
		2155
		2156	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2157	$self->{cursor} = $index;
		2158	delete $self->{cur_h};
		2159	$self->update;
		2160	return;
		2161	}
		2162	}
		2163
		2164	sub invoke_key_down {
		2165	my ($self, $ev) = @_;
		2166
		2167	my $sym = $ev->{sym};
		2168
		2169	if ($sym == CFPlus::SDLK_UP) {
		2170	$self->move_cursor_ver (-1);
		2171	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2172	$self->move_cursor_ver (+1);
		2173	} else {
		2174	return $self->SUPER::invoke_key_down ($ev)
		2175	}
		2176
		2177	1
		2178	}
		2179
		2180	#############################################################################
		2181
1933	package CFClient::UI::Button;	2182	package CFPlus::UI::Button;
1934		2183
1935	our @ISA = CFClient::UI::Label::;	2184	our @ISA = CFPlus::UI::Label::;
1936		2185
1937	use CFClient::OpenGL;	2186	use CFPlus::OpenGL;
1938		2187
1939	my @tex =	2188	my @tex =
1940	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2189	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1941	qw(b1_button_active.png);	2190	qw(b1_button_active.png);
1942		2191
1943	sub new {	2192	sub new {
1944	my $class = shift;	2193	my $class = shift;
1945		2194
…		…
1954	can_events => 1,	2203	can_events => 1,
1955	@_	2204	@_
1956	)	2205	)
1957	}	2206	}
1958		2207
1959	sub activate { }
1960
1961	sub button_up {	2208	sub invoke_button_up {
1962	my ($self, $ev, $x, $y) = @_;	2209	my ($self, $ev, $x, $y) = @_;
1963		2210
1964	$self->emit ("activate")	2211	$self->emit ("activate")
1965	if $x >= 0 && $x < $self->{w}	2212	if $x >= 0 && $x < $self->{w}
1966	&& $y >= 0 && $y < $self->{h};	2213	&& $y >= 0 && $y < $self->{h};
…		…
1984	$self->SUPER::_draw;	2231	$self->SUPER::_draw;
1985	}	2232	}
1986		2233
1987	#############################################################################	2234	#############################################################################
1988		2235
		2236	package CFPlus::UI::CheckBox;
		2237
		2238	our @ISA = CFPlus::UI::DrawBG::;
		2239
		2240	my @tex =
		2241	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2242	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2243
		2244	use CFPlus::OpenGL;
		2245
		2246	sub new {
		2247	my $class = shift;
		2248
		2249	$class->SUPER::new (
		2250	padding_x => 2,
		2251	padding_y => 2,
		2252	fg => [1, 1, 1],
		2253	active_fg => [1, 1, 0],
		2254	bg => [0, 0, 0, 0.2],
		2255	active_bg => [1, 1, 1, 0.5],
		2256	state => 0,
		2257	can_hover => 1,
		2258	@_
		2259	)
		2260	}
		2261
		2262	sub size_request {
		2263	my ($self) = @_;
		2264
		2265	(6) x 2
		2266	}
		2267
		2268	sub toggle {
		2269	my ($self) = @_;
		2270
		2271	$self->{state} = !$self->{state};
		2272	$self->emit (changed => $self->{state});
		2273	$self->update;
		2274	}
		2275
		2276	sub invoke_button_down {
		2277	my ($self, $ev, $x, $y) = @_;
		2278
		2279	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2280	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2281	$self->toggle;
		2282	} else {
		2283	return 0
		2284	}
		2285
		2286	1
		2287	}
		2288
		2289	sub _draw {
		2290	my ($self) = @_;
		2291
		2292	$self->SUPER::_draw;
		2293
		2294	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2295
		2296	my ($w, $h) = @$self{qw(w h)};
		2297
		2298	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2299
		2300	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2301
		2302	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2303
		2304	glEnable GL_TEXTURE_2D;
		2305	$tex->draw_quad_alpha (0, 0, $s, $s);
		2306	glDisable GL_TEXTURE_2D;
		2307	}
		2308
		2309	#############################################################################
		2310
		2311	package CFPlus::UI::Image;
		2312
		2313	our @ISA = CFPlus::UI::Base::;
		2314
		2315	use CFPlus::OpenGL;
		2316
		2317	our %texture_cache;
		2318
		2319	sub new {
		2320	my $class = shift;
		2321
		2322	my $self = $class->SUPER::new (
		2323	can_events => 0,
		2324	@_,
		2325	);
		2326
		2327	$self->{path} || $self->{tex}
		2328	or Carp::croak "'path' or 'tex' attributes required";
		2329
		2330	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2331	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2332
		2333	CFPlus::weaken $texture_cache{$self->{path}};
		2334
		2335	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2336
		2337	$self
		2338	}
		2339
		2340	sub STORABLE_freeze {
		2341	my ($self, $cloning) = @_;
		2342
		2343	$self->{path}
		2344	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2345
		2346	$self->{path}
		2347	}
		2348
		2349	sub STORABLE_attach {
		2350	my ($self, $cloning, $path) = @_;
		2351
		2352	$self->new (path => $path)
		2353	}
		2354
		2355	sub size_request {
		2356	my ($self) = @_;
		2357
		2358	($self->{tex}{w}, $self->{tex}{h})
		2359	}
		2360
		2361	sub _draw {
		2362	my ($self) = @_;
		2363
		2364	my $tex = $self->{tex};
		2365
		2366	my ($w, $h) = ($self->{w}, $self->{h});
		2367
		2368	if ($self->{rot90}) {
		2369	glRotate 90, 0, 0, 1;
		2370	glTranslate 0, -$self->{w}, 0;
		2371
		2372	($w, $h) = ($h, $w);
		2373	}
		2374
		2375	glEnable GL_TEXTURE_2D;
		2376	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2377
		2378	$tex->draw_quad (0, 0, $w, $h);
		2379
		2380	glDisable GL_TEXTURE_2D;
		2381	}
		2382
		2383	#############################################################################
		2384
1989	package CFClient::UI::ImageButton;	2385	package CFPlus::UI::ImageButton;
1990		2386
1991	our @ISA = CFClient::UI::Image::;	2387	our @ISA = CFPlus::UI::Image::;
1992		2388
1993	use CFClient::OpenGL;	2389	use CFPlus::OpenGL;
1994		2390
1995	my %textures;	2391	my %textures;
1996		2392
1997	sub new {	2393	sub new {
1998	my $class = shift;	2394	my $class = shift;
…		…
2008	can_events => 1,	2404	can_events => 1,
2009	@_	2405	@_
2010	);	2406	);
2011	}	2407	}
2012		2408
2013	sub activate { }
2014
2015	sub button_up {	2409	sub invoke_button_up {
2016	my ($self, $ev, $x, $y) = @_;	2410	my ($self, $ev, $x, $y) = @_;
2017		2411
2018	$self->emit ("activate")	2412	$self->emit ("activate")
2019	if $x >= 0 && $x < $self->{w}	2413	if $x >= 0 && $x < $self->{w}
2020	&& $y >= 0 && $y < $self->{h};	2414	&& $y >= 0 && $y < $self->{h};
…		…
2022	1	2416	1
2023	}	2417	}
2024		2418
2025	#############################################################################	2419	#############################################################################
2026		2420
2027	package CFClient::UI::CheckBox;
2028
2029	our @ISA = CFClient::UI::DrawBG::;
2030
2031	my @tex =
2032	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2033	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2034
2035	use CFClient::OpenGL;
2036
2037	sub new {
2038	my $class = shift;
2039
2040	$class->SUPER::new (
2041	padding_x => 2,
2042	padding_y => 2,
2043	fg => [1, 1, 1],
2044	active_fg => [1, 1, 0],
2045	bg => [0, 0, 0, 0.2],
2046	active_bg => [1, 1, 1, 0.5],
2047	state => 0,
2048	can_hover => 1,
2049	@_
2050	)
2051	}
2052
2053	sub size_request {
2054	my ($self) = @_;
2055
2056	(6) x 2
2057	}
2058
2059	sub button_down {
2060	my ($self, $ev, $x, $y) = @_;
2061
2062	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2063	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2064	$self->{state} = !$self->{state};
2065	$self->_emit (changed => $self->{state});
2066	} else {
2067	return 0
2068	}
2069
2070	1
2071	}
2072
2073	sub _draw {
2074	my ($self) = @_;
2075
2076	$self->SUPER::_draw;
2077
2078	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2079
2080	my ($w, $h) = @$self{qw(w h)};
2081
2082	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2083
2084	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2085
2086	my $tex = $self->{state} ? $tex[1] : $tex[0];
2087
2088	glEnable GL_TEXTURE_2D;
2089	$tex->draw_quad_alpha (0, 0, $s, $s);
2090	glDisable GL_TEXTURE_2D;
2091	}
2092
2093	#############################################################################
2094
2095	package CFClient::UI::Image;	2421	package CFPlus::UI::VGauge;
2096		2422
2097	our @ISA = CFClient::UI::Base::;	2423	our @ISA = CFPlus::UI::Base::;
2098
2099	use CFClient::OpenGL;
2100	use Carp qw/confess/;
2101
2102	our %loaded_images;
2103
2104	sub new {
2105	my $class = shift;
2106
2107	my $self = $class->SUPER::new (can_events => 0, @_);
2108
2109	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2110
2111	$loaded_images{$self->{image}} ||=
2112	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2113
2114	my $tex = $self->{tex} = $loaded_images{$self->{image}};
2115
2116	Scalar::Util::weaken $loaded_images{$self->{image}};
2117
2118	$self->{aspect} = $tex->{w} / $tex->{h};
2119
2120	$self
2121	}
2122
2123	sub size_request {
2124	my ($self) = @_;
2125
2126	($self->{tex}->{w}, $self->{tex}->{h})
2127	}
2128
2129	sub _draw {
2130	my ($self) = @_;
2131
2132	my $tex = $self->{tex};
2133
2134	my ($w, $h) = ($self->{w}, $self->{h});
2135
2136	if ($self->{rot90}) {
2137	glRotate 90, 0, 0, 1;
2138	glTranslate 0, -$self->{w}, 0;
2139
2140	($w, $h) = ($h, $w);
2141	}
2142
2143	glEnable GL_TEXTURE_2D;
2144	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2145
2146	$tex->draw_quad_alpha (0, 0, $w, $h);
2147
2148	glDisable GL_TEXTURE_2D;
2149	}
2150
2151	#############################################################################
2152
2153	package CFClient::UI::VGauge;
2154
2155	our @ISA = CFClient::UI::Base::;
2156		2424
2157	use List::Util qw(min max);	2425	use List::Util qw(min max);
2158		2426
2159	use CFClient::OpenGL;	2427	use CFPlus::OpenGL;
2160		2428
2161	my %tex = (	2429	my %tex = (
2162	food => [	2430	food => [
2163	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2431	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2164	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2432	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2165	],	2433	],
2166	grace => [	2434	grace => [
2167	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2435	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2436	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2169	],	2437	],
2170	hp => [	2438	hp => [
2171	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2439	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2440	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2173	],	2441	],
2174	mana => [	2442	mana => [
2175	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2443	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2444	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2177	],	2445	],
2178	);	2446	);
2179		2447
2180	# eg. VGauge->new (gauge => 'food'), default gauge: food	2448	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2240	my $ycut1 = max 0, min 1, $ycut;	2508	my $ycut1 = max 0, min 1, $ycut;
2241	my $ycut2 = max 0, min 1, $ycut - 1;	2509	my $ycut2 = max 0, min 1, $ycut - 1;
2242		2510
2243	my $h1 = $self->{h} * (1 - $ycut1);	2511	my $h1 = $self->{h} * (1 - $ycut1);
2244	my $h2 = $self->{h} * (1 - $ycut2);	2512	my $h2 = $self->{h} * (1 - $ycut2);
		2513	my $h3 = $self->{h};
		2514
		2515	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2245		2516
2246	glEnable GL_BLEND;	2517	glEnable GL_BLEND;
2247	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2518	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2519	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2249	glEnable GL_TEXTURE_2D;	2520	glEnable GL_TEXTURE_2D;
…		…
2268		2539
2269	if ($t3) {	2540	if ($t3) {
2270	glBindTexture GL_TEXTURE_2D, $t3->{name};	2541	glBindTexture GL_TEXTURE_2D, $t3->{name};
2271	glBegin GL_QUADS;	2542	glBegin GL_QUADS;
2272	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2543	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2273	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2544	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2274	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2545	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2275	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2546	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2276	glEnd;	2547	glEnd;
2277	}	2548	}
2278		2549
2279	glDisable GL_BLEND;	2550	glDisable GL_BLEND;
2280	glDisable GL_TEXTURE_2D;	2551	glDisable GL_TEXTURE_2D;
2281	}	2552	}
2282		2553
2283	#############################################################################	2554	#############################################################################
2284		2555
2285	package CFClient::UI::Gauge;	2556	package CFPlus::UI::Gauge;
2286		2557
2287	our @ISA = CFClient::UI::VBox::;	2558	our @ISA = CFPlus::UI::VBox::;
2288		2559
2289	sub new {	2560	sub new {
2290	my ($class, %arg) = @_;	2561	my ($class, %arg) = @_;
2291		2562
2292	my $self = $class->SUPER::new (	2563	my $self = $class->SUPER::new (
…		…
2294	can_hover => 1,	2565	can_hover => 1,
2295	can_events => 1,	2566	can_events => 1,
2296	%arg,	2567	%arg,
2297	);	2568	);
2298		2569
2299	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2570	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2300	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2571	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2301	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2572	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2302		2573
2303	$self	2574	$self
2304	}	2575	}
2305		2576
2306	sub set_fontsize {	2577	sub set_fontsize {
…		…
2327	$self->{value}->set_text ($val);	2598	$self->{value}->set_text ($val);
2328	}	2599	}
2329		2600
2330	#############################################################################	2601	#############################################################################
2331		2602
2332	package CFClient::UI::Slider;	2603	package CFPlus::UI::Slider;
2333		2604
2334	use strict;	2605	use strict;
2335		2606
2336	use CFClient::OpenGL;	2607	use CFPlus::OpenGL;
2337		2608
2338	our @ISA = CFClient::UI::DrawBG::;	2609	our @ISA = CFPlus::UI::DrawBG::;
2339		2610
2340	my @tex =	2611	my @tex =
2341	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2612	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2342	qw(s1_slider.png s1_slider_bg.png);	2613	qw(s1_slider.png s1_slider_bg.png);
2343		2614
2344	sub new {	2615	sub new {
2345	my $class = shift;	2616	my $class = shift;
2346		2617
…		…
2367	$self->update;	2638	$self->update;
2368		2639
2369	$self	2640	$self
2370	}	2641	}
2371		2642
2372	sub changed { }
2373
2374	sub set_range {	2643	sub set_range {
2375	my ($self, $range) = @_;	2644	my ($self, $range) = @_;
2376		2645
2377	($range, $self->{range}) = ($self->{range}, $range);	2646	($range, $self->{range}) = ($self->{range}, $range);
2378		2647
…		…
2398	if $unit;	2667	if $unit;
2399		2668
2400	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2669	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401		2670
2402	if ($value != $old_value) {	2671	if ($value != $old_value) {
2403	$self->_emit (changed => $value);	2672	$self->emit (changed => $value);
2404	$self->update;	2673	$self->update;
2405	}	2674	}
2406	}	2675	}
2407		2676
2408	sub size_request {	2677	sub size_request {
2409	my ($self) = @_;	2678	my ($self) = @_;
2410		2679
2411	($self->{req_w}, $self->{req_h})	2680	($self->{req_w}, $self->{req_h})
2412	}	2681	}
2413		2682
2414	sub button_down {	2683	sub invoke_button_down {
2415	my ($self, $ev, $x, $y) = @_;	2684	my ($self, $ev, $x, $y) = @_;
2416		2685
2417	$self->SUPER::button_down ($ev, $x, $y);	2686	$self->SUPER::invoke_button_down ($ev, $x, $y);
2418		2687
2419	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2688	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420		2689
2421	$self->mouse_motion ($ev, $x, $y)	2690	$self->invoke_mouse_motion ($ev, $x, $y)
2422	}	2691	}
2423		2692
2424	sub mouse_motion {	2693	sub invoke_mouse_motion {
2425	my ($self, $ev, $x, $y) = @_;	2694	my ($self, $ev, $x, $y) = @_;
2426		2695
2427	if ($GRAB == $self) {	2696	if ($GRAB == $self) {
2428	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2697	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429		2698
…		…
2435	} else {	2704	} else {
2436	return 0;	2705	return 0;
2437	}	2706	}
2438		2707
2439	1	2708	1
		2709	}
		2710
		2711	sub invoke_mouse_wheel {
		2712	my ($self, $ev) = @_;
		2713
		2714	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2715
		2716	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2717
		2718	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2719
		2720	! ! $delta
2440	}	2721	}
2441		2722
2442	sub update {	2723	sub update {
2443	my ($self) = @_;	2724	my ($self) = @_;
2444		2725
…		…
2493	glDisable GL_TEXTURE_2D;	2774	glDisable GL_TEXTURE_2D;
2494	}	2775	}
2495		2776
2496	#############################################################################	2777	#############################################################################
2497		2778
2498	package CFClient::UI::ValSlider;	2779	package CFPlus::UI::ValSlider;
2499		2780
2500	our @ISA = CFClient::UI::HBox::;	2781	our @ISA = CFPlus::UI::HBox::;
2501		2782
2502	sub new {	2783	sub new {
2503	my ($class, %arg) = @_;	2784	my ($class, %arg) = @_;
2504		2785
2505	my $range = delete $arg{range};	2786	my $range = delete $arg{range};
2506		2787
2507	my $self = $class->SUPER::new (	2788	my $self = $class->SUPER::new (
2508	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2789	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2509	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2790	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2510	to_value => sub { shift },	2791	to_value => sub { shift },
2511	from_value => sub { shift },	2792	from_value => sub { shift },
2512	%arg,	2793	%arg,
2513	);	2794	);
2514		2795
…		…
2534	sub set_range { shift->{slider}->set_range (@_) }	2815	sub set_range { shift->{slider}->set_range (@_) }
2535	sub set_value { shift->{slider}->set_value (@_) }	2816	sub set_value { shift->{slider}->set_value (@_) }
2536		2817
2537	#############################################################################	2818	#############################################################################
2538		2819
2539	package CFClient::UI::TextScroller;	2820	package CFPlus::UI::TextScroller;
2540		2821
2541	our @ISA = CFClient::UI::HBox::;	2822	our @ISA = CFPlus::UI::HBox::;
2542		2823
2543	use CFClient::OpenGL;	2824	use CFPlus::OpenGL;
2544		2825
2545	sub new {	2826	sub new {
2546	my $class = shift;	2827	my $class = shift;
2547		2828
2548	my $self = $class->SUPER::new (	2829	my $self = $class->SUPER::new (
2549	fontsize => 1,	2830	fontsize => 1,
2550	can_events => 0,	2831	can_events => 1,
2551	indent => 0,	2832	indent => 0,
2552	#font => default_font	2833	#font => default_font
2553	@_,	2834	@_,
2554		2835
2555	layout => (new CFClient::Layout 1),	2836	layout => (new CFPlus::Layout),
2556	par => [],	2837	par => [],
		2838	max_par => 0,
2557	height => 0,	2839	height => 0,
2558	children => [	2840	children => [
2559	(new CFClient::UI::Empty expand => 1),	2841	(new CFPlus::UI::Empty expand => 1),
2560	(new CFClient::UI::Slider vertical => 1),	2842	(new CFPlus::UI::Slider vertical => 1),
2561	],	2843	],
2562	);	2844	);
2563		2845
2564	$self->{children}[1]->connect (changed => sub { $self->update });	2846	$self->{children}[1]->connect (changed => sub { $self->update });
2565		2847
…		…
2571		2853
2572	$self->{fontsize} = $fontsize;	2854	$self->{fontsize} = $fontsize;
2573	$self->reflow;	2855	$self->reflow;
2574	}	2856	}
2575		2857
		2858	sub size_request {
		2859	my ($self) = @_;
		2860
		2861	my ($empty, $slider) = @{ $self->{children} };
		2862
		2863	local $self->{children} = [$empty, $slider];
		2864	$self->SUPER::size_request
		2865	}
		2866
2576	sub size_allocate {	2867	sub invoke_size_allocate {
2577	my ($self, $w, $h) = @_;	2868	my ($self, $w, $h) = @_;
2578		2869
2579	$self->SUPER::size_allocate ($w, $h);	2870	my ($empty, $slider, @other) = @{ $self->{children} };
		2871	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580		2872
2581	$self->{layout}->set_font ($self->{font}) if $self->{font};	2873	$self->{layout}->set_font ($self->{font}) if $self->{font};
2582	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2874	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583	$self->{layout}->set_width ($self->{children}[0]{w});	2875	$self->{layout}->set_width ($empty->{w});
2584	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2876	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585		2877
2586	$self->reflow;	2878	$self->reflow;
2587	}
2588		2879
2589	sub text_size {	2880	local $self->{children} = [$empty, $slider];
		2881	$self->SUPER::invoke_size_allocate ($w, $h)
		2882	}
		2883
		2884	sub invoke_mouse_wheel {
2590	my ($self, $text, $indent) = @_;	2885	my ($self, $ev) = @_;
		2886
		2887	return 0 unless $ev->{dy}; # only vertical movements
		2888
		2889	$self->{children}[1]->emit (mouse_wheel => $ev);
		2890
		2891	1
		2892	}
		2893
		2894	sub get_layout {
		2895	my ($self, $para) = @_;
2591		2896
2592	my $layout = $self->{layout};	2897	my $layout = $self->{layout};
2593		2898
		2899	$layout->set_font ($self->{font}) if $self->{font};
		2900	$layout->set_foreground (@{$para->{fg}});
2594	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2901	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595	$layout->set_width ($self->{children}[0]{w} - $indent);	2902	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2903	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597	$layout->set_markup ($text);	2904	$layout->set_markup ($para->{markup});
		2905
		2906	$layout->set_shapes (
		2907	map
		2908	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2909	@{$para->{widget}}
2598		2910	);
		2911
2599	$layout->size	2912	$layout
2600	}	2913	}
2601		2914
2602	sub reflow {	2915	sub reflow {
2603	my ($self) = @_;	2916	my ($self) = @_;
2604		2917
…		…
2611		2924
2612	# todo: base offset on lines or so, not on pixels	2925	# todo: base offset on lines or so, not on pixels
2613	$self->{children}[1]->set_value ($offset);	2926	$self->{children}[1]->set_value ($offset);
2614	}	2927	}
2615		2928
		2929	sub current_paragraph {
		2930	my ($self) = @_;
		2931
		2932	$self->{top_paragraph} - 1
		2933	}
		2934
		2935	sub scroll_to {
		2936	my ($self, $para) = @_;
		2937
		2938	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2939
		2940	$self->{scroll_to} = $para;
		2941	$self->update;
		2942	}
		2943
2616	sub clear {	2944	sub clear {
2617	my ($self) = @_;	2945	my ($self) = @_;
		2946
		2947	my (undef, undef, @other) = @{ $self->{children} };
		2948	$self->remove ($_) for @other;
2618		2949
2619	$self->{par} = [];	2950	$self->{par} = [];
2620	$self->{height} = 0;	2951	$self->{height} = 0;
2621	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2952	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622	}	2953	}
2623		2954
2624	sub add_paragraph {	2955	sub add_paragraph {
2625	my ($self, $color, $text, $indent) = @_;	2956	my $self = shift;
2626		2957
2627	for my $line (split /\n/, $text) {	2958	for my $para (@_) {
2628	my ($w, $h) = $self->text_size ($line);	2959	$para = {
		2960	fg => [1, 1, 1, 1],
		2961	indent => 0,
		2962	markup => "",
		2963	widget => [],
		2964	ref $para ? %$para : (markup => $para),
		2965	w => 1e10,
		2966	wrapped => 1,
		2967	};
		2968
		2969	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2970	push @{$self->{par}}, $para;
		2971	}
		2972
		2973	if (my $max = $self->{max_par}) {
		2974	shift @{$self->{par}} while @{$self->{par}} > $max;
		2975	}
		2976
		2977	$self->{need_reflow}++;
		2978	$self->update;
		2979	}
		2980
		2981	sub scroll_to_bottom {
		2982	my ($self) = @_;
		2983
		2984	$self->{scroll_to} = $#{$self->{par}};
		2985	$self->update;
		2986	}
		2987
		2988	sub force_uptodate {
		2989	my ($self) = @_;
		2990
		2991	if (delete $self->{need_reflow}) {
		2992	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2993
		2994	my $height = 0;
		2995
		2996	for my $para (@{$self->{par}}) {
		2997	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2998	my $layout = $self->get_layout ($para);
		2999	my ($w, $h) = $layout->size;
		3000
		3001	$para->{w} = $w + $para->{indent};
		3002	$para->{h} = $h;
		3003	$para->{wrapped} = $layout->has_wrapped;
		3004	}
		3005
		3006	$para->{y} = $height;
		3007	$height += $para->{h};
		3008	}
		3009
2629	$self->{height} += $h;	3010	$self->{height} = $height;
2630	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3011	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2631	}
2632		3012
2633	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3013	delete $self->{texture};
		3014	}
		3015
		3016	if (my $paridx = delete $self->{scroll_to}) {
		3017	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3018	}
2634	}	3019	}
2635		3020
2636	sub update {	3021	sub update {
2637	my ($self) = @_;	3022	my ($self) = @_;
2638		3023
…		…
2641	return unless $self->{h} > 0;	3026	return unless $self->{h} > 0;
2642		3027
2643	delete $self->{texture};	3028	delete $self->{texture};
2644		3029
2645	$ROOT->on_post_alloc ($self => sub {	3030	$ROOT->on_post_alloc ($self => sub {
		3031	$self->force_uptodate;
		3032
2646	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3033	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647		3034
2648	if (delete $self->{need_reflow}) {
2649	my $height = 0;
2650
2651	my $layout = $self->{layout};
2652
2653	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2655	for (@{$self->{par}}) {
2656	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2657	$layout->set_width ($W - $_->[3]);
2658	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2659	$layout->set_markup ($_->[4]);
2660	my ($w, $h) = $layout->size;
2661	$_->[0] = $w + $_->[3];
2662	$_->[1] = $h;
2663	}
2664
2665	$height += $_->[1];
2666	}
2667
2668	$self->{height} = $height;
2669
2670	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2671
2672	delete $self->{texture};
2673	}
2674
2675	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3035	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2676	glClearColor 0, 0, 0, 0;	3036	glClearColor 0, 0, 0, 0;
2677	glClear GL_COLOR_BUFFER_BIT;	3037	glClear GL_COLOR_BUFFER_BIT;
2678		3038
		3039	package CFPlus::UI::Base;
		3040	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3041	(0, 0, $self->{w}, $self->{h});
		3042
		3043	my $top = int $self->{children}[1]{range}[0];
		3044
		3045	my $paridx = 0;
		3046	my $top_paragraph;
2679	my $top = int $self->{children}[1]{range}[0];	3047	my $top = int $self->{children}[1]{range}[0];
2680		3048
2681	my $y0 = $top;	3049	my $y0 = $top;
2682	my $y1 = $top + $H;	3050	my $y1 = $top + $H;
2683		3051
2684	my $y = 0;
2685
2686	my $layout = $self->{layout};
2687
2688	$layout->set_font ($self->{font}) if $self->{font};
2689
2690	glEnable GL_BLEND;
2691	#TODO# not correct in windows where rgba is forced off
2692	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2693
2694	for my $par (@{$self->{par}}) {	3052	for my $para (@{$self->{par}}) {
2695	my $h = $par->[1];	3053	my $h = $para->{h};
		3054	my $y = $para->{y};
2696		3055
2697	if ($y0 < $y + $h && $y < $y1) {	3056	if ($y0 < $y + $h && $y < $y1) {
2698	$layout->set_foreground (@{ $par->[2] });	3057	my $layout = $self->get_layout ($para);
2699	$layout->set_width ($W - $par->[3]);
2700	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2701	$layout->set_markup ($par->[4]);
2702		3058
2703	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3059	$layout->render ($para->{indent}, $y - $y0);
2704		3060
2705	glRasterPos $par->[3], $y - $y0;	3061	if (my @w = @{ $para->{widget} }) {
2706	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3062	my @s = $layout->get_shapes;
		3063
		3064	for (@w) {
		3065	my ($dx, $dy) = splice @s, 0, 2, ();
		3066
		3067	$_->{x} = $dx + $para->{indent};
		3068	$_->{y} = $dy + $y - $y0;
		3069
		3070	$_->draw;
		3071	}
		3072	}
2707	}	3073	}
2708		3074
2709	$y += $h;	3075	$paridx++;
		3076	$top_paragraph ||= $paridx if $y >= $top;
2710	}	3077	}
2711		3078
2712	glDisable GL_BLEND;	3079	$self->{top_paragraph} = $top_paragraph;
2713	};	3080	};
2714	});	3081	});
		3082	}
		3083
		3084	sub reconfigure {
		3085	my ($self) = @_;
		3086
		3087	$self->SUPER::reconfigure;
		3088
		3089	$_->{w} = 1e10 for @{ $self->{par} };
		3090	$self->reflow;
2715	}	3091	}
2716		3092
2717	sub _draw {	3093	sub _draw {
2718	my ($self) = @_;	3094	my ($self) = @_;
2719		3095
…		…
2722	glColor 0, 0, 0, 1;	3098	glColor 0, 0, 0, 1;
2723	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3099	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2724	glDisable GL_TEXTURE_2D;	3100	glDisable GL_TEXTURE_2D;
2725		3101
2726	$self->{children}[1]->draw;	3102	$self->{children}[1]->draw;
2727
2728	}	3103	}
2729		3104
2730	#############################################################################	3105	#############################################################################
2731		3106
2732	package CFClient::UI::Animator;	3107	package CFPlus::UI::Animator;
2733		3108
2734	use CFClient::OpenGL;	3109	use CFPlus::OpenGL;
2735		3110
2736	our @ISA = CFClient::UI::Bin::;	3111	our @ISA = CFPlus::UI::Bin::;
2737		3112
2738	sub moveto {	3113	sub moveto {
2739	my ($self, $x, $y) = @_;	3114	my ($self, $x, $y) = @_;
2740		3115
2741	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3116	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2769	glPopMatrix;	3144	glPopMatrix;
2770	}	3145	}
2771		3146
2772	#############################################################################	3147	#############################################################################
2773		3148
2774	package CFClient::UI::Flopper;	3149	package CFPlus::UI::Flopper;
2775		3150
2776	our @ISA = CFClient::UI::Button::;	3151	our @ISA = CFPlus::UI::Button::;
2777		3152
2778	sub new {	3153	sub new {
2779	my $class = shift;	3154	my $class = shift;
2780		3155
2781	my $self = $class->SUPER::new (	3156	my $self = $class->SUPER::new (
…		…
2793	$self->{other}->toggle_visibility;	3168	$self->{other}->toggle_visibility;
2794	}	3169	}
2795		3170
2796	#############################################################################	3171	#############################################################################
2797		3172
2798	package CFClient::UI::Tooltip;	3173	package CFPlus::UI::Tooltip;
2799		3174
2800	our @ISA = CFClient::UI::Bin::;	3175	our @ISA = CFPlus::UI::Bin::;
2801		3176
2802	use CFClient::OpenGL;	3177	use CFPlus::OpenGL;
2803		3178
2804	sub new {	3179	sub new {
2805	my $class = shift;	3180	my $class = shift;
2806		3181
2807	$class->SUPER::new (	3182	$class->SUPER::new (
…		…
2810	)	3185	)
2811	}	3186	}
2812		3187
2813	sub set_tooltip_from {	3188	sub set_tooltip_from {
2814	my ($self, $widget) = @_;	3189	my ($self, $widget) = @_;
		3190
		3191	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3192	if $widget->{tooltip} =~ /^#(.*)$/;
2815		3193
2816	my $tooltip = $widget->{tooltip};	3194	my $tooltip = $widget->{tooltip};
2817		3195
2818	if ($ENV{CFPLUS_DEBUG} & 2) {	3196	if ($ENV{CFPLUS_DEBUG} & 2) {
2819	$tooltip .= "\n\n" . (ref $widget) . "\n"	3197	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2823	}	3201	}
2824		3202
2825	$tooltip =~ s/^\n+//;	3203	$tooltip =~ s/^\n+//;
2826	$tooltip =~ s/\n+$//;	3204	$tooltip =~ s/\n+$//;
2827		3205
2828	$self->add (new CFClient::UI::Label	3206	$self->add (new CFPlus::UI::Label
2829	markup => $tooltip,	3207	markup => $tooltip,
2830	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3208	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2831	fontsize => 0.8,	3209	fontsize => 0.8,
2832	fg => [0, 0, 0, 1],	3210	style => 1, # FLAG_INVERSE
2833	ellipsise => 0,	3211	ellipsise => 0,
2834	font => ($widget->{tooltip_font} || $::FONT_PROP),	3212	font => ($widget->{tooltip_font} || $::FONT_PROP),
2835	);	3213	);
2836	}	3214	}
2837		3215
…		…
2841	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3219	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842		3220
2843	($w + 4, $h + 4)	3221	($w + 4, $h + 4)
2844	}	3222	}
2845		3223
2846	sub size_allocate {	3224	sub invoke_size_allocate {
2847	my ($self, $w, $h) = @_;	3225	my ($self, $w, $h) = @_;
2848		3226
2849	$self->SUPER::size_allocate ($w - 4, $h - 4);	3227	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850	}	3228	}
2851		3229
2852	sub visibility_change {	3230	sub invoke_visibility_change {
2853	my ($self, $visible) = @_;	3231	my ($self, $visible) = @_;
2854		3232
2855	return unless $visible;	3233	return unless $visible;
2856		3234
2857	$self->{root}->on_post_alloc ("move_$self" => sub {	3235	$self->{root}->on_post_alloc ("move_$self" => sub {
2858	my $widget = $self->{owner}	3236	my $widget = $self->{owner}
2859	or return;	3237	or return;
2860		3238
		3239	if ($widget->{visible}) {
2861	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3240	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862		3241
2863	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3242	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864	if $x + $self->{w} > $self->{root}{w};	3243	if $x + $self->{w} > $self->{root}{w};
2865		3244
2866	$self->move_abs ($x, $y);	3245	$self->move_abs ($x, $y);
		3246	} else {
		3247	$self->hide;
		3248	}
2867	});	3249	});
2868	}	3250	}
2869		3251
2870	sub _draw {	3252	sub _draw {
2871	my ($self) = @_;	3253	my ($self) = @_;
…		…
2895	$self->SUPER::_draw;	3277	$self->SUPER::_draw;
2896	}	3278	}
2897		3279
2898	#############################################################################	3280	#############################################################################
2899		3281
2900	package CFClient::UI::Face;	3282	package CFPlus::UI::Face;
2901		3283
2902	our @ISA = CFClient::UI::Base::;	3284	our @ISA = CFPlus::UI::DrawBG::;
2903		3285
2904	use CFClient::OpenGL;	3286	use CFPlus::OpenGL;
2905		3287
2906	sub new {	3288	sub new {
2907	my $class = shift;	3289	my $class = shift;
2908		3290
2909	my $self = $class->SUPER::new (	3291	my $self = $class->SUPER::new (
…		…
2911	can_events => 0,	3293	can_events => 0,
2912	@_,	3294	@_,
2913	);	3295	);
2914		3296
2915	if ($self->{anim} && $self->{animspeed}) {	3297	if ($self->{anim} && $self->{animspeed}) {
2916	Scalar::Util::weaken (my $widget = $self);	3298	CFPlus::weaken (my $widget = $self);
2917		3299
2918	$self->{timer} = Event->timer (	3300	$self->{timer} = Event->timer (
2919	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3301	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2920	hard => 1,	3302	hard => 1,
2921	interval => $self->{animspeed},	3303	interval => $self->{animspeed},
…		…
2944	sub _draw {	3326	sub _draw {
2945	my ($self) = @_;	3327	my ($self) = @_;
2946		3328
2947	return unless $::CONN;	3329	return unless $::CONN;
2948		3330
		3331	$self->SUPER::_draw;
		3332
2949	my $face;	3333	my $face;
2950		3334
2951	if ($self->{frame}) {	3335	if ($self->{frame}) {
2952	my $anim = $::CONN->{anim}[$self->{anim}];	3336	my $anim = $::CONN->{anim}[$self->{anim}];
2953		3337
…		…
2975	$self->SUPER::destroy;	3359	$self->SUPER::destroy;
2976	}	3360	}
2977		3361
2978	#############################################################################	3362	#############################################################################
2979		3363
2980	package CFClient::UI::Buttonbar;	3364	package CFPlus::UI::Buttonbar;
2981		3365
2982	our @ISA = CFClient::UI::HBox::;	3366	our @ISA = CFPlus::UI::HBox::;
2983		3367
2984	# TODO: should actualyl wrap buttons and other goodies.	3368	# TODO: should actually wrap buttons and other goodies.
2985		3369
2986	#############################################################################	3370	#############################################################################
2987		3371
2988	package CFClient::UI::Menu;	3372	package CFPlus::UI::Menu;
2989		3373
2990	our @ISA = CFClient::UI::FancyFrame::;	3374	our @ISA = CFPlus::UI::Toplevel::;
2991		3375
2992	use CFClient::OpenGL;	3376	use CFPlus::OpenGL;
2993		3377
2994	sub new {	3378	sub new {
2995	my $class = shift;	3379	my $class = shift;
2996		3380
2997	my $self = $class->SUPER::new (	3381	my $self = $class->SUPER::new (
2998	items => [],	3382	items => [],
2999	z => 100,	3383	z => 100,
3000	@_,	3384	@_,
3001	);	3385	);
3002		3386
3003	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3387	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3004		3388
3005	for my $item (@{ $self->{items} }) {	3389	for my $item (@{ $self->{items} }) {
3006	my ($widget, $cb, $tooltip) = @$item;	3390	my ($widget, $cb, $tooltip) = @$item;
3007		3391
3008	# handle various types of items, only text for now	3392	# handle various types of items, only text for now
3009	if (!ref $widget) {	3393	if (!ref $widget) {
		3394	if ($widget =~ /\t/) {
		3395	my ($left, $right) = split /\t/, $widget, 2;
		3396
3010	$widget = new CFClient::UI::Label	3397	$widget = new CFPlus::UI::HBox
3011	can_hover => 1,	3398	can_hover => 1,
3012	can_events => 1,	3399	can_events => 1,
		3400	tooltip => $tooltip,
		3401	children => [
		3402	(new CFPlus::UI::Label markup => $left, expand => 1),
		3403	(new CFPlus::UI::Label markup => $right, align => +1),
		3404	],
		3405	;
		3406
		3407	} else {
		3408	$widget = new CFPlus::UI::Label
		3409	can_hover => 1,
		3410	can_events => 1,
3013	markup => $widget,	3411	markup => $widget,
3014	tooltip => $tooltip	3412	tooltip => $tooltip;
		3413	}
3015	}	3414	}
3016		3415
3017	$self->{item}{$widget} = $item;	3416	$self->{item}{$widget} = $item;
3018		3417
3019	$self->{vbox}->add ($widget);	3418	$self->{vbox}->add ($widget);
…		…
3024		3423
3025	# popup given the event (must be a mouse button down event currently)	3424	# popup given the event (must be a mouse button down event currently)
3026	sub popup {	3425	sub popup {
3027	my ($self, $ev) = @_;	3426	my ($self, $ev) = @_;
3028		3427
3029	$self->_emit ("popdown");	3428	$self->emit ("popdown");
3030		3429
3031	# maybe save $GRAB? must be careful about events...	3430	# maybe save $GRAB? must be careful about events...
3032	$GRAB = $self;	3431	$GRAB = $self;
3033	$self->{button} = $ev->{button};	3432	$self->{button} = $ev->{button};
3034		3433
3035	$self->show;	3434	$self->show;
3036	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3435	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3037	}	3436	}
3038		3437
3039	sub mouse_motion {	3438	sub invoke_mouse_motion {
3040	my ($self, $ev, $x, $y) = @_;	3439	my ($self, $ev, $x, $y) = @_;
3041		3440
3042	# TODO: should use vbox->find_widget or so	3441	# TODO: should use vbox->find_widget or so
3043	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3442	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044	$self->{hover} = $self->{item}{$HOVER};	3443	$self->{hover} = $self->{item}{$HOVER};
3045		3444
3046	0	3445	0
3047	}	3446	}
3048		3447
3049	sub button_up {	3448	sub invoke_button_up {
3050	my ($self, $ev, $x, $y) = @_;	3449	my ($self, $ev, $x, $y) = @_;
3051		3450
3052	if ($ev->{button} == $self->{button}) {	3451	if ($ev->{button} == $self->{button}) {
3053	undef $GRAB;	3452	undef $GRAB;
3054	$self->hide;	3453	$self->hide;
3055		3454
3056	$self->_emit ("popdown");	3455	$self->emit ("popdown");
3057	$self->{hover}[1]->() if $self->{hover};	3456	$self->{hover}[1]->() if $self->{hover};
3058	} else {	3457	} else {
3059	return 0	3458	return 0
3060	}	3459	}
3061		3460
3062	1	3461	1
3063	}	3462	}
3064		3463
3065	#############################################################################	3464	#############################################################################
3066		3465
3067	package CFClient::UI::Multiplexer;	3466	package CFPlus::UI::Multiplexer;
3068		3467
3069	our @ISA = CFClient::UI::Container::;	3468	our @ISA = CFPlus::UI::Container::;
3070		3469
3071	sub new {	3470	sub new {
3072	my $class = shift;	3471	my $class = shift;
3073		3472
3074	my $self = $class->SUPER::new (	3473	my $self = $class->SUPER::new (
…		…
3088		3487
3089	$self->{current} = $self->{children}[0]	3488	$self->{current} = $self->{children}[0]
3090	if @{ $self->{children} };	3489	if @{ $self->{children} };
3091	}	3490	}
3092		3491
		3492	sub get_current_page {
		3493	my ($self) = @_;
		3494
		3495	$self->{current}
		3496	}
		3497
3093	sub set_current_page {	3498	sub set_current_page {
3094	my ($self, $page_or_widget) = @_;	3499	my ($self, $page_or_widget) = @_;
3095		3500
3096	my $widget = ref $page_or_widget	3501	my $widget = ref $page_or_widget
3097	? $page_or_widget	3502	? $page_or_widget
3098	: $self->{children}[$page_or_widget];	3503	: $self->{children}[$page_or_widget];
3099		3504
3100	$self->{current} = $widget;	3505	$self->{current} = $widget;
3101	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3506	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102		3507
3103	$self->_emit (page_changed => $self->{current});	3508	$self->emit (page_changed => $self->{current});
3104		3509
3105	$self->realloc;	3510	$self->realloc;
3106	}	3511	}
3107		3512
3108	sub visible_children {	3513	sub visible_children {
…		…
3113	my ($self) = @_;	3518	my ($self) = @_;
3114		3519
3115	$self->{current}->size_request	3520	$self->{current}->size_request
3116	}	3521	}
3117		3522
3118	sub size_allocate {	3523	sub invoke_size_allocate {
3119	my ($self, $w, $h) = @_;	3524	my ($self, $w, $h) = @_;
3120		3525
3121	$self->{current}->configure (0, 0, $w, $h);	3526	$self->{current}->configure (0, 0, $w, $h);
		3527
		3528	1
3122	}	3529	}
3123		3530
3124	sub _draw {	3531	sub _draw {
3125	my ($self) = @_;	3532	my ($self) = @_;
3126		3533
3127	$self->{current}->draw;	3534	$self->{current}->draw;
3128	}	3535	}
3129		3536
3130	#############################################################################	3537	#############################################################################
3131		3538
3132	package CFClient::UI::Notebook;	3539	package CFPlus::UI::Notebook;
3133		3540
3134	our @ISA = CFClient::UI::VBox::;	3541	our @ISA = CFPlus::UI::VBox::;
3135		3542
3136	sub new {	3543	sub new {
3137	my $class = shift;	3544	my $class = shift;
3138		3545
3139	my $self = $class->SUPER::new (	3546	my $self = $class->SUPER::new (
3140	buttonbar => (new CFClient::UI::Buttonbar),	3547	buttonbar => (new CFPlus::UI::Buttonbar),
3141	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3548	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3142	# filter => # will be put between multiplexer and $self	3549	# filter => # will be put between multiplexer and $self
3143	@_,	3550	@_,
3144	);	3551	);
3145		3552
3146	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3553	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3150	}	3557	}
3151		3558
3152	sub add {	3559	sub add {
3153	my ($self, $title, $widget, $tooltip) = @_;	3560	my ($self, $title, $widget, $tooltip) = @_;
3154		3561
3155	Scalar::Util::weaken $self;	3562	CFPlus::weaken $self;
3156		3563
3157	$self->{buttonbar}->add (new CFClient::UI::Button	3564	$self->{buttonbar}->add (new CFPlus::UI::Button
3158	markup => $title,	3565	markup => $title,
3159	tooltip => $tooltip,	3566	tooltip => $tooltip,
3160	on_activate => sub { $self->set_current_page ($widget) },	3567	on_activate => sub { $self->set_current_page ($widget) },
3161	);	3568	);
3162		3569
3163	$self->{multiplexer}->add ($widget);	3570	$self->{multiplexer}->add ($widget);
3164	}	3571	}
3165		3572
		3573	sub get_current_page {
		3574	my ($self) = @_;
		3575
		3576	$self->{multiplexer}->get_current_page
		3577	}
		3578
3166	sub set_current_page {	3579	sub set_current_page {
3167	my ($self, $page) = @_;	3580	my ($self, $page) = @_;
3168		3581
3169	$self->{multiplexer}->set_current_page ($page);	3582	$self->{multiplexer}->set_current_page ($page);
3170	$self->_emit (page_changed => $self->{multiplexer}{current});	3583	$self->emit (page_changed => $self->{multiplexer}{current});
3171	}	3584	}
3172		3585
3173	#############################################################################	3586	#############################################################################
3174		3587
3175	package CFClient::UI::Combobox;	3588	package CFPlus::UI::Selector;
3176		3589
3177	use utf8;	3590	use utf8;
3178		3591
3179	our @ISA = CFClient::UI::Button::;	3592	our @ISA = CFPlus::UI::Button::;
3180		3593
3181	sub new {	3594	sub new {
3182	my $class = shift;	3595	my $class = shift;
3183		3596
3184	my $self = $class->SUPER::new (	3597	my $self = $class->SUPER::new (
…		…
3190	$self->_set_value ($self->{value});	3603	$self->_set_value ($self->{value});
3191		3604
3192	$self	3605	$self
3193	}	3606	}
3194		3607
3195	sub button_down {	3608	sub invoke_button_down {
3196	my ($self, $ev) = @_;	3609	my ($self, $ev) = @_;
3197		3610
3198	my @menu_items;	3611	my @menu_items;
3199		3612
3200	for (@{ $self->{options} }) {	3613	for (@{ $self->{options} }) {
3201	my ($value, $title, $tooltip) = @$_;	3614	my ($value, $title, $tooltip) = @$_;
3202		3615
3203	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3616	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204	}	3617	}
3205		3618
3206	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3619	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207	}	3620	}
3208		3621
3209	sub _set_value {	3622	sub _set_value {
3210	my ($self, $value) = @_;	3623	my ($self, $value) = @_;
3211		3624
…		…
3221	my ($self, $value) = @_;	3634	my ($self, $value) = @_;
3222		3635
3223	return unless $self->{value} ne $value;	3636	return unless $self->{value} ne $value;
3224		3637
3225	$self->_set_value ($value);	3638	$self->_set_value ($value);
3226	$self->_emit (changed => $value);	3639	$self->emit (changed => $value);
3227	}	3640	}
3228		3641
3229	#############################################################################	3642	#############################################################################
3230		3643
3231	package CFClient::UI::Statusbox;	3644	package CFPlus::UI::Statusbox;
3232		3645
3233	our @ISA = CFClient::UI::VBox::;	3646	our @ISA = CFPlus::UI::VBox::;
3234		3647
3235	sub new {	3648	sub new {
3236	my $class = shift;	3649	my $class = shift;
3237		3650
3238	my $self = $class->SUPER::new (	3651	my $self = $class->SUPER::new (
3239	fontsize => 0.8,	3652	fontsize => 0.8,
3240	@_,	3653	@_,
3241	);	3654	);
3242		3655
3243	Scalar::Util::weaken (my $this = $self);	3656	CFPlus::weaken (my $this = $self);
3244		3657
3245	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3658	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3246		3659
3247	$self	3660	$self
3248	}	3661	}
…		…
3250	sub reorder {	3663	sub reorder {
3251	my ($self) = @_;	3664	my ($self) = @_;
3252	my $NOW = Time::HiRes::time;	3665	my $NOW = Time::HiRes::time;
3253		3666
3254	# freeze display when hovering over any label	3667	# freeze display when hovering over any label
3255	return if $CFClient::UI::TOOLTIP->{owner}	3668	return if $CFPlus::UI::TOOLTIP->{owner}
3256	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3669	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3257	values %{ $self->{item} };	3670	values %{ $self->{item} };
3258		3671
3259	while (my ($k, $v) = each %{ $self->{item} }) {	3672	while (my ($k, $v) = each %{ $self->{item} }) {
3260	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3673	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3261	}	3674	}
…		…
3282	for ($short) {	3695	for ($short) {
3283	s/^\s+//;	3696	s/^\s+//;
3284	s/\s+/ /g;	3697	s/\s+/ /g;
3285	}	3698	}
3286		3699
3287	new CFClient::UI::Label	3700	new CFPlus::UI::Label
3288	markup => $short,	3701	markup => $short,
3289	tooltip => $item->{tooltip},	3702	tooltip => $item->{tooltip},
3290	tooltip_font => $::FONT_PROP,	3703	tooltip_font => $::FONT_PROP,
3291	tooltip_width => 0.67,	3704	tooltip_width => 0.67,
3292	fontsize => $item->{fontsize} || $self->{fontsize},	3705	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3346	count => 1,	3759	count => 1,
3347	%arg,	3760	%arg,
3348	};	3761	};
3349	}	3762	}
3350		3763
		3764	$ROOT->on_refresh (reorder => sub {
3351	$self->reorder;	3765	$self->reorder;
		3766	});
3352	}	3767	}
3353		3768
3354	sub reconfigure {	3769	sub reconfigure {
3355	my ($self) = @_;	3770	my ($self) = @_;
3356		3771
…		…
3369	$self->SUPER::destroy;	3784	$self->SUPER::destroy;
3370	}	3785	}
3371		3786
3372	#############################################################################	3787	#############################################################################
3373		3788
3374	package CFClient::UI::Inventory;
3375
3376	our @ISA = CFClient::UI::ScrolledWindow::;
3377
3378	sub new {
3379	my $class = shift;
3380
3381	my $self = $class->SUPER::new (
3382	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3383	@_,
3384	);
3385
3386	$self
3387	}
3388
3389	sub set_items {
3390	my ($self, $items) = @_;
3391
3392	$self->{child}->clear;
3393	return unless $items;
3394
3395	my @items = sort {
3396	($a->{type} <=> $b->{type})
3397	or ($a->{name} cmp $b->{name})
3398	} @$items;
3399
3400	$self->{real_items} = \@items;
3401
3402	my $row = 0;
3403	for my $item (@items) {
3404	CFClient::Item::update_widgets $item;
3405
3406	$self->{child}->add (0, $row, $item->{face_widget});
3407	$self->{child}->add (1, $row, $item->{desc_widget});
3408	$self->{child}->add (2, $row, $item->{weight_widget});
3409
3410	$row++;
3411	}
3412	}
3413
3414	#############################################################################
3415
3416	package CFClient::UI::BindEditor;
3417
3418	our @ISA = CFClient::UI::FancyFrame::;
3419
3420	sub new {
3421	my $class = shift;
3422
3423	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425	$self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429	text => "start recording",
3430	tooltip => "Start/Stops recording of actions."
3431	."All subsequent actions after the recording started will be captured."
3432	."The actions are displayed after the record was stopped."
3433	."To bind the action you have to click on the 'Bind' button",
3434	on_activate => sub {
3435	unless ($self->{recording}) {
3436	$self->start;
3437	} else {
3438	$self->stop;
3439	}
3440	});
3441
3442	$vb->add (new CFClient::UI::Label text => "Actions:");
3443	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3446	$vb->add (my $hb = new CFClient::UI::HBox);
3447	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448	$hb->add (new CFClient::UI::Button
3449	text => "bind",
3450	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451	on_activate => sub {
3452	$self->ask_for_bind;
3453	});
3454
3455	$vb->add (my $hb = new CFClient::UI::HBox);
3456	$hb->add (new CFClient::UI::Button
3457	text => "ok",
3458	expand => 1,
3459	tooltip => "This closes the binding editor and saves the binding",
3460	on_activate => sub {
3461	$self->hide;
3462	$self->commit;
3463	});
3464
3465	$hb->add (new CFClient::UI::Button
3466	text => "cancel",
3467	expand => 1,
3468	tooltip => "This closes the binding editor without saving",
3469	on_activate => sub {
3470	$self->hide;
3471	$self->{binding_cancel}->()
3472	if $self->{binding_cancel};
3473	});
3474
3475	$self->update_binding_widgets;
3476
3477	$self
3478	}
3479
3480	sub commit {
3481	my ($self) = @_;
3482	my ($mod, $sym, $cmds) = $self->get_binding;
3483	if ($sym != 0 && @$cmds > 0) {
3484	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485	."'. Don't forget 'Save Config'!");
3486	$self->{binding_change}->($mod, $sym, $cmds)
3487	if $self->{binding_change};
3488	} else {
3489	$::STATUSBOX->add ("No action bound, no key or action specified!");
3490	$self->{binding_cancel}->()
3491	if $self->{binding_cancel};
3492	}
3493	}
3494
3495	sub start {
3496	my ($self) = @_;
3497
3498	$self->{rec_btn}->set_text ("stop recording");
3499	$self->{recording} = 1;
3500	$self->clear_command_list;
3501	$::CONN->start_record if $::CONN;
3502	}
3503
3504	sub stop {
3505	my ($self) = @_;
3506
3507	$self->{rec_btn}->set_text ("start recording");
3508	$self->{recording} = 0;
3509
3510	my $rec;
3511	$rec = $::CONN->stop_record if $::CONN;
3512	return unless ref $rec eq 'ARRAY';
3513	$self->set_command_list ($rec);
3514	}
3515
3516
3517	sub ask_for_bind_and_commit {
3518	my ($self) = @_;
3519	$self->ask_for_bind (1);
3520	}
3521
3522	sub ask_for_bind {
3523	my ($self, $commit, $end_cb) = @_;
3524
3525	CFClient::Binder::open_binding_dialog (sub {
3526	my ($mod, $sym) = @_;
3527	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528	$self->update_binding_widgets;
3529	$self->commit if $commit;
3530	$end_cb->() if $end_cb;
3531	});
3532	}
3533
3534	# $mod and $sym are the modifiers and key symbol
3535	# $cmds is a array ref of strings (the commands)
3536	# $cb is the callback that is executed on OK
3537	# $ccb is the callback that is executed on CANCEL and
3538	# when the binding was unsuccessful on OK
3539	sub set_binding {
3540	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3541
3542	$self->clear_command_list;
3543	$self->{recording} = 0;
3544	$self->{rec_btn}->set_text ("start recording");
3545
3546	$self->{binding} = [$mod, $sym];
3547	$self->{commands} = $cmds;
3548
3549	$self->{binding_change} = $cb;
3550	$self->{binding_cancel} = $ccb;
3551
3552	$self->update_binding_widgets;
3553	}
3554
3555	# this is a shortcut method that asks for a binding
3556	# and then just binds it.
3557	sub do_quick_binding {
3558	my ($self, $cmds, $end_cb) = @_;
3559	$self->set_binding (undef, undef, $cmds, sub {
3560	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3561	});
3562	$self->ask_for_bind (1, $end_cb);
3563	}
3564
3565	sub update_binding_widgets {
3566	my ($self) = @_;
3567	my ($mod, $sym, $cmds) = $self->get_binding;
3568	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3569	$self->set_command_list ($cmds);
3570	}
3571
3572	sub get_binding {
3573	my ($self) = @_;
3574	return (
3575	$self->{binding}->[0],
3576	$self->{binding}->[1],
3577	[ grep { defined $_ } @{$self->{commands}} ]
3578	);
3579	}
3580
3581	sub clear_command_list {
3582	my ($self) = @_;
3583	$self->{cmdbox}->clear ();
3584	}
3585
3586	sub set_command_list {
3587	my ($self, $cmds) = @_;
3588
3589	$self->{cmdbox}->clear ();
3590	$self->{commands} = $cmds;
3591
3592	my $idx = 0;
3593
3594	for (@$cmds) {
3595	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3596
3597	my $i = $idx;
3598	$hb->add (new CFClient::UI::Label text => $_);
3599	$hb->add (new CFClient::UI::Button
3600	text => "delete",
3601	tooltip => "Deletes the action from the record",
3602	on_activate => sub {
3603	$self->{cmdbox}->remove ($hb);
3604	$cmds->[$i] = undef;
3605	});
3606
3607
3608	$idx++
3609	}
3610	}
3611
3612	#############################################################################
3613
3614	package CFClient::UI::SpellList;
3615
3616	our @ISA = CFClient::UI::Table::;
3617
3618	sub new {
3619	my $class = shift;
3620
3621	my $self = $class->SUPER::new (
3622	binding => [],
3623	commands => [],
3624	@_,
3625	)
3626	}
3627
3628	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3629
3630	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3631	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3632	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3633	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3634	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3636	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3637	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3638	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3639	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3640
3641	sub rebuild_spell_list {
3642	my ($self) = @_;
3643
3644	$CFClient::UI::ROOT->on_refresh ($self => sub {
3645	$self->clear;
3646
3647	return unless $::CONN;
3648
3649	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3650	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3651	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3652	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3653	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3654
3655	my $row = 0;
3656
3657	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3658	my $spell = $self->{spell}{$_};
3659
3660	$row++;
3661
3662	my $spell_cb = sub {
3663	my ($widget, $ev) = @_;
3664
3665	if ($ev->{button} == 1) {
3666	$::CONN->user_send ("cast $spell->{name}");
3667	} elsif ($ev->{button} == 2) {
3668	$::CONN->user_send ("invoke $spell->{name}");
3669	} elsif ($ev->{button} == 3) {
3670	(new CFClient::UI::Menu
3671	items => [
3672	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3673	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3674	],
3675	)->popup ($ev);
3676	} else {
3677	return 0;
3678	}
3679
3680	1
3681	};
3682
3683	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3684
3685	#TODO: add path info to tooltip
3686	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3687
3688	$self->add (0, $row, new CFClient::UI::Face
3689	face => $spell->{face},
3690	can_hover => 1,
3691	can_events => 1,
3692	tooltip => $tooltip,
3693	on_button_down => $spell_cb,
3694	);
3695
3696	$self->add (1, $row, new CFClient::UI::Label
3697	expand => 1,
3698	text => $spell->{name},
3699	can_hover => 1,
3700	can_events => 1,
3701	tooltip => $tooltip,
3702	on_button_down => $spell_cb,
3703	);
3704
3705	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3706	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3707	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3708	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3709	}
3710	});
3711	}
3712
3713	sub add_spell {
3714	my ($self, $spell) = @_;
3715
3716	$self->{spell}->{$spell->{name}} = $spell;
3717	$self->rebuild_spell_list;
3718	}
3719
3720	sub remove_spell {
3721	my ($self, $spell) = @_;
3722
3723	delete $self->{spell}->{$spell->{name}};
3724	$self->rebuild_spell_list;
3725	}
3726
3727	sub clear_spells {
3728	my ($self) = @_;
3729
3730	$self->{spell} = {};
3731	$self->rebuild_spell_list;
3732	}
3733
3734	#############################################################################
3735
3736	package CFClient::UI::Root;	3789	package CFPlus::UI::Root;
3737		3790
3738	our @ISA = CFClient::UI::Container::;	3791	our @ISA = CFPlus::UI::Container::;
3739		3792
3740	use List::Util qw(min max);	3793	use List::Util qw(min max);
3741		3794
3742	use CFClient::OpenGL;	3795	use CFPlus::OpenGL;
3743		3796
3744	sub new {	3797	sub new {
3745	my $class = shift;	3798	my $class = shift;
3746		3799
3747	my $self = $class->SUPER::new (	3800	my $self = $class->SUPER::new (
3748	visible => 1,	3801	visible => 1,
3749	@_,	3802	@_,
3750	);	3803	);
3751		3804
3752	Scalar::Util::weaken ($self->{root} = $self);	3805	CFPlus::weaken ($self->{root} = $self);
3753		3806
3754	$self	3807	$self
3755	}	3808	}
3756		3809
3757	sub size_request {	3810	sub size_request {
…		…
3772	$coord = $max - $size if $coord > $max - $size;	3825	$coord = $max - $size if $coord > $max - $size;
3773		3826
3774	int $coord + 0.5	3827	int $coord + 0.5
3775	}	3828	}
3776		3829
3777	sub size_allocate {	3830	sub invoke_size_allocate {
3778	my ($self, $w, $h) = @_;	3831	my ($self, $w, $h) = @_;
3779		3832
3780	for my $child ($self->children) {	3833	for my $child ($self->children) {
3781	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3834	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3782		3835
…		…
3786	$X = _to_pixel $X, $W, $self->{w};	3839	$X = _to_pixel $X, $W, $self->{w};
3787	$Y = _to_pixel $Y, $H, $self->{h};	3840	$Y = _to_pixel $Y, $H, $self->{h};
3788		3841
3789	$child->configure ($X, $Y, $W, $H);	3842	$child->configure ($X, $Y, $W, $H);
3790	}	3843	}
		3844
		3845	1
3791	}	3846	}
3792		3847
3793	sub coord2local {	3848	sub coord2local {
3794	my ($self, $x, $y) = @_;	3849	my ($self, $x, $y) = @_;
3795		3850
…		…
3921	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3976	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3922		3977
3923	$w = 0 if $w < 0;	3978	$w = 0 if $w < 0;
3924	$h = 0 if $h < 0;	3979	$h = 0 if $h < 0;
3925		3980
		3981	$w = max $widget->{min_w}, $w;
		3982	$h = max $widget->{min_h}, $h;
		3983
		3984	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3985	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3986
		3987	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3988	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3989
3926	$w = int $w + 0.5;	3990	$w = int $w + 0.5;
3927	$h = int $h + 0.5;	3991	$h = int $h + 0.5;
3928		3992
3929	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3993	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3930	$widget->{old_w} = $widget->{w};	3994	$widget->{old_w} = $widget->{w};
…		…
3953	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4017	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3954	glMatrixMode GL_MODELVIEW;	4018	glMatrixMode GL_MODELVIEW;
3955	glLoadIdentity;	4019	glLoadIdentity;
3956		4020
3957	{	4021	{
3958	package CFClient::UI::Base;	4022	package CFPlus::UI::Base;
3959		4023
3960	($draw_x, $draw_y, $draw_w, $draw_h) =	4024	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3961	(0, 0, $self->{w}, $self->{h});	4025	(0, 0, $self->{w}, $self->{h});
3962	}
3963		4026
3964	$self->_draw;	4027	$self->_draw;
		4028	}
3965	}	4029	}
3966		4030
3967	#############################################################################	4031	#############################################################################
3968		4032
3969	package CFClient::UI;	4033	package CFPlus::UI;
3970		4034
3971	$ROOT = new CFClient::UI::Root;	4035	$ROOT = new CFPlus::UI::Root;
3972	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4036	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3973		4037
3974	1	4038	1
3975		4039

Diff Legend

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