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

Diff Legend

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