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.302 by root, Mon Jun 12 13:26:14 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
		1284	if ($self->{has_close_button}) {
		1285	$self->{close_button} =
		1286	new CFPlus::UI::ImageButton
		1287	path => 'x1_close.png',
		1288	on_activate => sub { $self->emit ("delete") };
		1289
		1290	$self->CFPlus::UI::Container::add ($self->{close_button});
		1291	}
		1292
1095	$self	1293	$self
1096	}	1294	}
1097		1295
1098	sub add {	1296	sub add {
1099	my ($self, @widgets) = @_;	1297	my ($self, @widgets) = @_;
1100		1298
1101	$self->SUPER::add (@widgets);	1299	$self->SUPER::add (@widgets);
		1300	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102	$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};
1103	}	1302	}
1104		1303
1105	sub border {	1304	sub border {
1106	int $_[0]{border} * $::FONTSIZE	1305	int $_[0]{border} * $::FONTSIZE
1107	}	1306	}
…		…
1109	sub size_request {	1308	sub size_request {
1110	my ($self) = @_;	1309	my ($self) = @_;
1111		1310
1112	$self->{title_widget}->size_request	1311	$self->{title_widget}->size_request
1113	if $self->{title_widget};	1312	if $self->{title_widget};
		1313
		1314	$self->{close_button}->size_request
		1315	if $self->{close_button};
1114		1316
1115	my ($w, $h) = $self->SUPER::size_request;	1317	my ($w, $h) = $self->SUPER::size_request;
1116		1318
1117	(	1319	(
1118	$w + $self->border * 2,	1320	$w + $self->border * 2,
1119	$h + $self->border * 2,	1321	$h + $self->border * 2,
1120	)	1322	)
1121	}	1323	}
1122		1324
1123	sub size_allocate {	1325	sub invoke_size_allocate {
1124	my ($self, $w, $h) = @_;	1326	my ($self, $w, $h) = @_;
1125		1327
1126	if ($self->{title_widget}) {	1328	if ($self->{title_widget}) {
1127	$self->{title_widget}{w} = $w;	1329	$self->{title_widget}{w} = $w;
1128	$self->{title_widget}{h} = $h;	1330	$self->{title_widget}{h} = $h;
1129	$self->{title_widget}->size_allocate ($w, $h);	1331	$self->{title_widget}->invoke_size_allocate ($w, $h);
1130	}	1332	}
1131		1333
1132	my $border = $self->border;	1334	my $border = $self->border;
1133		1335
1134	$h -= List::Util::max 0, $border * 2;	1336	$h -= List::Util::max 0, $border * 2;
1135	$w -= List::Util::max 0, $border * 2;	1337	$w -= List::Util::max 0, $border * 2;
		1338
		1339	$self->child->configure ($border, $border, $w, $h);
		1340
		1341	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1342	if $self->{close_button};
		1343
		1344	1
		1345	}
		1346
		1347	sub invoke_delete {
		1348	my ($self) = @_;
		1349
		1350	$self->hide;
1136		1351
1137	$self->child->configure ($border, $border, $w, $h);	1352	1
1138	}	1353	}
1139		1354
1140	sub button_down {	1355	sub invoke_button_down {
1141	my ($self, $ev, $x, $y) = @_;	1356	my ($self, $ev, $x, $y) = @_;
1142		1357
1143	my ($w, $h) = @$self{qw(w h)};	1358	my ($w, $h) = @$self{qw(w h)};
1144	my $border = $self->border;	1359	my $border = $self->border;
1145		1360
…		…
1176		1391
1177	($x, $y) = ($ev->{x}, $ev->{y});	1392	($x, $y) = ($ev->{x}, $ev->{y});
1178		1393
1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1394	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180	# HACK: the next line is required to enforce placement	1395	# HACK: the next line is required to enforce placement
1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1396	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182	};	1397	};
1183	} else {	1398	} else {
1184	return 0;	1399	return 0;
1185	}	1400	}
1186		1401
1187	1	1402	1
1188	}	1403	}
1189		1404
1190	sub button_up {	1405	sub invoke_button_up {
1191	my ($self, $ev, $x, $y) = @_;	1406	my ($self, $ev, $x, $y) = @_;
1192		1407
1193	!!delete $self->{motion}	1408	! ! delete $self->{motion}
1194	}	1409	}
1195		1410
1196	sub mouse_motion {	1411	sub invoke_mouse_motion {
1197	my ($self, $ev, $x, $y) = @_;	1412	my ($self, $ev, $x, $y) = @_;
1198		1413
1199	$self->{motion}->($ev, $x, $y) if $self->{motion};	1414	$self->{motion}->($ev, $x, $y) if $self->{motion};
1200		1415
1201	!!$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
1202	}	1425	}
1203		1426
1204	sub _draw {	1427	sub _draw {
1205	my ($self) = @_;	1428	my ($self) = @_;
1206		1429
…		…
1235	$child->draw;	1458	$child->draw;
1236		1459
1237	if ($self->{title_widget}) {	1460	if ($self->{title_widget}) {
1238	glTranslate 0, $border - $self->{h};	1461	glTranslate 0, $border - $self->{h};
1239	$self->{title_widget}->_draw;	1462	$self->{title_widget}->_draw;
		1463
		1464	glTranslate 0, - ($border - $self->{h});
1240	}	1465	}
		1466
		1467	$self->{close_button}->draw
		1468	if $self->{close_button};
1241	}	1469	}
1242		1470
1243	#############################################################################	1471	#############################################################################
1244		1472
1245	package CFClient::UI::Table;	1473	package CFPlus::UI::Table;
1246		1474
1247	our @ISA = CFClient::UI::Base::;	1475	our @ISA = CFPlus::UI::Base::;
1248		1476
1249	use List::Util qw(max sum);	1477	use List::Util qw(max sum);
1250		1478
1251	use CFClient::OpenGL;	1479	use CFPlus::OpenGL;
1252		1480
1253	sub new {	1481	sub new {
1254	my $class = shift;	1482	my $class = shift;
1255		1483
1256	$class->SUPER::new (	1484	$class->SUPER::new (
…		…
1262	sub children {	1490	sub children {
1263	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1491	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264	}	1492	}
1265		1493
1266	sub add {	1494	sub add {
1267	my ($self, $x, $y, $child) = @_;	1495	my ($self) = shift;
1268		1496
		1497	while (@_) {
		1498	my ($x, $y, $child) = splice @_, 0, 3, ();
1269	$child->set_parent ($self);	1499	$child->set_parent ($self);
1270	$self->{children}[$y][$x] = $child;	1500	$self->{children}[$y][$x] = $child;
		1501	}
1271		1502
		1503	$self->{force_realloc} = 1;
		1504	$self->{force_size_alloc} = 1;
1272	$self->realloc;	1505	$self->realloc;
1273	}	1506	}
1274		1507
1275	sub remove {	1508	sub remove {
1276	my ($self, $child) = @_;	1509	my ($self, $child) = @_;
…		…
1324	(sum @$ws),	1557	(sum @$ws),
1325	(sum @$hs),	1558	(sum @$hs),
1326	)	1559	)
1327	}	1560	}
1328		1561
1329	sub size_allocate {	1562	sub invoke_size_allocate {
1330	my ($self, $w, $h) = @_;	1563	my ($self, $w, $h) = @_;
1331		1564
1332	my ($ws, $hs) = $self->get_wh;	1565	my ($ws, $hs) = $self->get_wh;
1333		1566
1334	my $req_w = (sum @$ws) || 1;	1567	my $req_w = (sum @$ws) || 1;
…		…
1341		1574
1342	# linearly scale sizes	1575	# linearly scale sizes
1343	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1576	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1344	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1577	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1345		1578
1346	CFClient::UI::harmonize $ws;	1579	CFPlus::UI::harmonize $ws;
1347	CFClient::UI::harmonize $hs;	1580	CFPlus::UI::harmonize $hs;
1348		1581
1349	my $y;	1582	my $y;
1350		1583
1351	for my $r (0 .. $#{$self->{children}}) {	1584	for my $r (0 .. $#{$self->{children}}) {
1352	my $row = $self->{children}[$r]	1585	my $row = $self->{children}[$r]
…		…
1366	}	1599	}
1367		1600
1368	$y += $row_h;	1601	$y += $row_h;
1369	}	1602	}
1370		1603
		1604	1
1371	}	1605	}
1372		1606
1373	sub find_widget {	1607	sub find_widget {
1374	my ($self, $x, $y) = @_;	1608	my ($self, $x, $y) = @_;
1375		1609
…		…
1394	}	1628	}
1395	}	1629	}
1396		1630
1397	#############################################################################	1631	#############################################################################
1398		1632
1399	package CFClient::UI::Box;	1633	package CFPlus::UI::Box;
1400		1634
1401	our @ISA = CFClient::UI::Container::;	1635	our @ISA = CFPlus::UI::Container::;
1402		1636
1403	sub size_request {	1637	sub size_request {
1404	my ($self) = @_;	1638	my ($self) = @_;
1405		1639
1406	$self->{vertical}	1640	$self->{vertical}
…		…
1412	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1646	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1647	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1414	)	1648	)
1415	}	1649	}
1416		1650
1417	sub size_allocate {	1651	sub invoke_size_allocate {
1418	my ($self, $w, $h) = @_;	1652	my ($self, $w, $h) = @_;
1419		1653
1420	my $space = $self->{vertical} ? $h : $w;	1654	my $space = $self->{vertical} ? $h : $w;
1421	my $children = $self->{children};	1655	my @children = $self->visible_children;
1422		1656
1423	my @req;	1657	my @req;
1424		1658
1425	if ($self->{homogeneous}) {	1659	if ($self->{homogeneous}) {
1426	@req = ($space / (@$children || 1)) x @$children;	1660	@req = ($space / (@children || 1)) x @children;
1427	} else {	1661	} else {
1428	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1662	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429	my $req = List::Util::sum @req;	1663	my $req = List::Util::sum @req;
1430		1664
1431	if ($req > $space) {	1665	if ($req > $space) {
1432	# ah well, not enough space	1666	# ah well, not enough space
1433	$_ *= $space / $req for @req;	1667	$_ *= $space / $req for @req;
1434	} else {	1668	} else {
1435	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1669	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436		1670
1437	$space = ($space - $req) / $expand; # remaining space to give away	1671	$space = ($space - $req) / $expand; # remaining space to give away
1438		1672
1439	$req[$_] += $space * $children->[$_]{expand}	1673	$req[$_] += $space * $children[$_]{expand}
1440	for 0 .. $#$children;	1674	for 0 .. $#children;
1441	}	1675	}
1442	}	1676	}
1443		1677
1444	CFClient::UI::harmonize \@req;	1678	CFPlus::UI::harmonize \@req;
1445		1679
1446	my $pos = 0;	1680	my $pos = 0;
1447	for (0 .. $#$children) {	1681	for (0 .. $#children) {
1448	my $alloc = $req[$_];	1682	my $alloc = $req[$_];
1449	$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));
1450		1684
1451	$pos += $alloc;	1685	$pos += $alloc;
1452	}	1686	}
1453		1687
1454	1	1688	1
1455	}	1689	}
1456		1690
1457	#############################################################################	1691	#############################################################################
1458		1692
1459	package CFClient::UI::HBox;	1693	package CFPlus::UI::HBox;
1460		1694
1461	our @ISA = CFClient::UI::Box::;	1695	our @ISA = CFPlus::UI::Box::;
1462		1696
1463	sub new {	1697	sub new {
1464	my $class = shift;	1698	my $class = shift;
1465		1699
1466	$class->SUPER::new (	1700	$class->SUPER::new (
…		…
1469	)	1703	)
1470	}	1704	}
1471		1705
1472	#############################################################################	1706	#############################################################################
1473		1707
1474	package CFClient::UI::VBox;	1708	package CFPlus::UI::VBox;
1475		1709
1476	our @ISA = CFClient::UI::Box::;	1710	our @ISA = CFPlus::UI::Box::;
1477		1711
1478	sub new {	1712	sub new {
1479	my $class = shift;	1713	my $class = shift;
1480		1714
1481	$class->SUPER::new (	1715	$class->SUPER::new (
…		…
1484	)	1718	)
1485	}	1719	}
1486		1720
1487	#############################################################################	1721	#############################################################################
1488		1722
1489	package CFClient::UI::Label;	1723	package CFPlus::UI::Label;
1490		1724
1491	our @ISA = CFClient::UI::DrawBG::;	1725	our @ISA = CFPlus::UI::DrawBG::;
1492		1726
1493	use CFClient::OpenGL;	1727	use CFPlus::OpenGL;
1494		1728
1495	sub new {	1729	sub new {
1496	my ($class, %arg) = @_;	1730	my ($class, %arg) = @_;
1497		1731
1498	my $self = $class->SUPER::new (	1732	my $self = $class->SUPER::new (
…		…
1501	#active_bg => none	1735	#active_bg => none
1502	#font => default_font	1736	#font => default_font
1503	#text => initial text	1737	#text => initial text
1504	#markup => initial narkup	1738	#markup => initial narkup
1505	#max_w => maximum pixel width	1739	#max_w => maximum pixel width
		1740	#style => 0, # render flags
1506	ellipsise => 3, # end	1741	ellipsise => 3, # end
1507	layout => (new CFClient::Layout),	1742	layout => (new CFPlus::Layout),
1508	fontsize => 1,	1743	fontsize => 1,
1509	align => -1,	1744	align => -1,
1510	valign => -1,	1745	valign => -1,
1511	padding_x => 2,	1746	padding_x => 2,
1512	padding_y => 2,	1747	padding_y => 2,
1513	can_events => 0,	1748	can_events => 0,
1514	%arg	1749	%arg
1515	);	1750	);
1516		1751
1517	if (exists $self->{template}) {	1752	if (exists $self->{template}) {
1518	my $layout = new CFClient::Layout;	1753	my $layout = new CFPlus::Layout;
1519	$layout->set_text (delete $self->{template});	1754	$layout->set_text (delete $self->{template});
1520	$self->{template} = $layout;	1755	$self->{template} = $layout;
1521	}	1756	}
1522		1757
1523	if (exists $self->{markup}) {	1758	if (exists $self->{markup}) {
…		…
1527	}	1762	}
1528		1763
1529	$self	1764	$self
1530	}	1765	}
1531		1766
1532	sub escape($) {
1533	local $_ = $_[0];
1534
1535	s/&/&amp;/g;
1536	s/>/&gt;/g;
1537	s/</&lt;/g;
1538
1539	$_
1540	}
1541
1542	sub update {	1767	sub update {
1543	my ($self) = @_;	1768	my ($self) = @_;
1544		1769
1545	delete $self->{texture};	1770	delete $self->{texture};
1546	$self->SUPER::update;	1771	$self->SUPER::update;
…		…
1557	my ($self, $text) = @_;	1782	my ($self, $text) = @_;
1558		1783
1559	return if $self->{text} eq "T$text";	1784	return if $self->{text} eq "T$text";
1560	$self->{text} = "T$text";	1785	$self->{text} = "T$text";
1561		1786
1562	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563	$self->{layout}->set_text ($text);	1787	$self->{layout}->set_text ($text);
1564		1788
1565	delete $self->{size_req};	1789	delete $self->{size_req};
1566	$self->realloc;	1790	$self->realloc;
1567	$self->update;	1791	$self->update;
…		…
1573	return if $self->{text} eq "M$markup";	1797	return if $self->{text} eq "M$markup";
1574	$self->{text} = "M$markup";	1798	$self->{text} = "M$markup";
1575		1799
1576	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1800	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577		1801
1578	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579	$self->{layout}->set_markup ($markup);	1802	$self->{layout}->set_markup ($markup);
1580		1803
1581	delete $self->{size_req};	1804	delete $self->{size_req};
1582	$self->realloc;	1805	$self->realloc;
1583	$self->update;	1806	$self->update;
…		…
1595		1818
1596	my ($w, $h) = $self->{layout}->size;	1819	my ($w, $h) = $self->{layout}->size;
1597		1820
1598	if (exists $self->{template}) {	1821	if (exists $self->{template}) {
1599	$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);
1600	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1824	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601		1825
1602	my ($w2, $h2) = $self->{template}->size;	1826	my ($w2, $h2) = $self->{template}->size;
1603		1827
1604	$w = List::Util::max $w, $w2;	1828	$w = List::Util::max $w, $w2;
…		…
1609	};	1833	};
1610		1834
1611	@{ $self->{size_req} }	1835	@{ $self->{size_req} }
1612	}	1836	}
1613		1837
		1838	sub baseline_shift {
		1839	$_[0]{layout}->descent
		1840	}
		1841
1614	sub size_allocate {	1842	sub invoke_size_allocate {
1615	my ($self, $w, $h) = @_;	1843	my ($self, $w, $h) = @_;
1616		1844
1617	delete $self->{ox};	1845	delete $self->{ox};
1618		1846
1619	delete $self->{texture}	1847	delete $self->{texture}
1620	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
1621	}	1851	}
1622		1852
1623	sub set_fontsize {	1853	sub set_fontsize {
1624	my ($self, $fontsize) = @_;	1854	my ($self, $fontsize) = @_;
1625		1855
1626	$self->{fontsize} = $fontsize;	1856	$self->{fontsize} = $fontsize;
		1857	delete $self->{size_req};
1627	delete $self->{texture};	1858	delete $self->{texture};
1628		1859
1629	$self->realloc;	1860	$self->realloc;
1630	}	1861	}
1631		1862
1632	sub reconfigure {	1863	sub reconfigure {
1633	my ($self) = @_;	1864	my ($self) = @_;
1634		1865
1635	delete $self->{size_req};	1866	delete $self->{size_req};
		1867	delete $self->{texture};
1636		1868
1637	$self->SUPER::reconfigure;	1869	$self->SUPER::reconfigure;
1638	}	1870	}
1639		1871
1640	sub _draw {	1872	sub _draw {
1641	my ($self) = @_;	1873	my ($self) = @_;
1642		1874
1643	$self->SUPER::_draw; # draw background, if applicable	1875	$self->SUPER::_draw; # draw background, if applicable
1644		1876
1645	my $tex = $self->{texture} ||= do {	1877	my $size = $self->{texture} ||= do {
1646	$self->{layout}->set_foreground (@{$self->{fg}});	1878	$self->{layout}->set_foreground (@{$self->{fg}});
1647	$self->{layout}->set_font ($self->{font}) if $self->{font};	1879	$self->{layout}->set_font ($self->{font}) if $self->{font};
1648	$self->{layout}->set_width ($self->{w});	1880	$self->{layout}->set_width ($self->{w});
1649	$self->{layout}->set_ellipsise ($self->{ellipsise});	1881	$self->{layout}->set_ellipsise ($self->{ellipsise});
1650	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1882	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1883	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652		1884
1653	new_from_layout CFClient::Texture $self->{layout}	1885	[$self->{layout}->size]
1654	};	1886	};
1655		1887
1656	unless (exists $self->{ox}) {	1888	unless (exists $self->{ox}) {
1657	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1889	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1890	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659	: ($self->{w} - $tex->{w}) * 0.5);	1891	: ($self->{w} - $size->[0]) * 0.5);
1660		1892
1661	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1893	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1894	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663	: ($self->{h} - $tex->{h}) * 0.5);	1895	: ($self->{h} - $size->[1]) * 0.5);
1664	};	1896	};
1665		1897
1666	glEnable GL_TEXTURE_2D;
1667
1668	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1898	my $w = List::Util::min $self->{w} + 4, $size->[0];
1669	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1899	my $h = List::Util::min $self->{h} + 2, $size->[1];
1670		1900
1671	if ($tex->{format} == GL_ALPHA) {	1901	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1672	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1673	glColor @{$self->{fg}};
1674	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1675	} else {
1676	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1677	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1678	}
1679
1680	glDisable GL_TEXTURE_2D;
1681	}	1902	}
1682		1903
1683	#############################################################################	1904	#############################################################################
1684		1905
1685	package CFClient::UI::EntryBase;	1906	package CFPlus::UI::EntryBase;
1686		1907
1687	our @ISA = CFClient::UI::Label::;	1908	our @ISA = CFPlus::UI::Label::;
1688		1909
1689	use CFClient::OpenGL;	1910	use CFPlus::OpenGL;
1690		1911
1691	sub new {	1912	sub new {
1692	my $class = shift;	1913	my $class = shift;
1693		1914
1694	$class->SUPER::new (	1915	$class->SUPER::new (
…		…
1698	active_fg => [0, 0, 0],	1919	active_fg => [0, 0, 0],
1699	can_hover => 1,	1920	can_hover => 1,
1700	can_focus => 1,	1921	can_focus => 1,
1701	valign => 0,	1922	valign => 0,
1702	can_events => 1,	1923	can_events => 1,
		1924	ellipsise => 0,
1703	#text => ...	1925	#text => ...
1704	#hidden => "*",	1926	#hidden => "*",
1705	@_	1927	@_
1706	)	1928	)
1707	}	1929	}
…		…
1718		1940
1719	$text =~ s/./*/g if $self->{hidden};	1941	$text =~ s/./*/g if $self->{hidden};
1720	$self->{layout}->set_text ("$text ");	1942	$self->{layout}->set_text ("$text ");
1721	delete $self->{size_req};	1943	delete $self->{size_req};
1722		1944
1723	$self->_emit (changed => $self->{text});	1945	$self->emit (changed => $self->{text});
1724		1946
1725	$self->realloc;	1947	$self->realloc;
1726	$self->update;	1948	$self->update;
1727	}	1949	}
1728		1950
…		…
1743	my ($w, $h) = $self->SUPER::size_request;	1965	my ($w, $h) = $self->SUPER::size_request;
1744		1966
1745	($w + 1, $h) # add 1 for cursor	1967	($w + 1, $h) # add 1 for cursor
1746	}	1968	}
1747		1969
1748	sub key_down {	1970	sub invoke_key_down {
1749	my ($self, $ev) = @_;	1971	my ($self, $ev) = @_;
1750		1972
1751	my $mod = $ev->{mod};	1973	my $mod = $ev->{mod};
1752	my $sym = $ev->{sym};	1974	my $sym = $ev->{sym};
1753	my $uni = $ev->{unicode};	1975	my $uni = $ev->{unicode};
1754		1976
1755	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;
1756		1980
1757	if ($uni == 8) {	1981	if ($uni == 8) {
1758	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1982	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1759	} elsif ($uni == 127) {	1983	} elsif ($uni == 127) {
1760	substr $text, $self->{cursor}, 1, "";	1984	substr $text, $self->{cursor}, 1, "";
1761	} elsif ($sym == CFClient::SDLK_LEFT) {	1985	} elsif ($sym == CFPlus::SDLK_LEFT) {
1762	--$self->{cursor} if $self->{cursor};	1986	--$self->{cursor} if $self->{cursor};
1763	} elsif ($sym == CFClient::SDLK_RIGHT) {	1987	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1764	++$self->{cursor} if $self->{cursor} < length $self->{text};	1988	++$self->{cursor} if $self->{cursor} < length $self->{text};
1765	} 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 = "";
1766	$self->{cursor} = 0;	2003	$self->{cursor} = 0;
1767	} elsif ($sym == CFClient::SDLK_END) {
1768	$self->{cursor} = length $text;
1769	} elsif ($uni == 27) {	2004	} elsif ($uni == 27) {
1770	$self->_emit ('escape');	2005	$self->emit ('escape');
1771	} elsif ($uni) {	2006	} elsif ($uni == 0x0d) {
		2007	substr $text, $self->{cursor}++, 0, "\012";
		2008	} elsif ($uni >= 0x20) {
1772	substr $text, $self->{cursor}++, 0, chr $uni;	2009	substr $text, $self->{cursor}++, 0, chr $uni;
1773	} else {	2010	} else {
1774	return 0;	2011	return 0;
1775	}	2012	}
1776		2013
1777	$self->_set_text ($text);	2014	$self->_set_text ($text);
1778		2015
1779	$self->realloc;	2016	$self->realloc;
		2017	$self->update;
1780		2018
1781	1	2019	1
1782	}	2020	}
1783		2021
1784	sub focus_in {	2022	sub invoke_focus_in {
1785	my ($self) = @_;	2023	my ($self) = @_;
1786		2024
1787	$self->{last_activity} = $::NOW;	2025	$self->{last_activity} = $::NOW;
1788		2026
1789	$self->SUPER::focus_in;	2027	$self->SUPER::invoke_focus_in
1790	}	2028	}
1791		2029
1792	sub button_down {	2030	sub invoke_button_down {
1793	my ($self, $ev, $x, $y) = @_;	2031	my ($self, $ev, $x, $y) = @_;
1794		2032
1795	$self->SUPER::button_down ($ev, $x, $y);	2033	$self->SUPER::invoke_button_down ($ev, $x, $y);
1796		2034
1797	my $idx = $self->{layout}->xy_to_index ($x, $y);	2035	my $idx = $self->{layout}->xy_to_index ($x, $y);
1798		2036
1799	# byte-index to char-index	2037	# byte-index to char-index
1800	my $text = $self->{text};	2038	my $text = $self->{text};
1801	utf8::encode $text;	2039	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1802	$self->{cursor} = length substr $text, 0, $idx;	2040	$self->{cursor} = length $text;
1803		2041
1804	$self->_set_text ($self->{text});	2042	$self->_set_text ($self->{text});
1805	$self->update;	2043	$self->update;
1806		2044
1807	1	2045	1
1808	}	2046	}
1809		2047
1810	sub mouse_motion {	2048	sub invoke_mouse_motion {
1811	my ($self, $ev, $x, $y) = @_;	2049	my ($self, $ev, $x, $y) = @_;
1812	# 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#
1813		2051
1814	0	2052	1
1815	}	2053	}
1816		2054
1817	sub _draw {	2055	sub _draw {
1818	my ($self) = @_;	2056	my ($self) = @_;
1819		2057
…		…
1846	utf8::encode $text;	2084	utf8::encode $text;
1847		2085
1848	@$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)
1849	}	2087	}
1850		2088
1851	glColor @{$self->{fg}};
1852	glBegin GL_LINES;	2089	glBegin GL_LINES;
1853	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};
1854	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};
1855	glEnd;	2092	glEnd;
1856	}	2093	}
1857	}	2094	}
1858		2095
		2096	#############################################################################
		2097
1859	package CFClient::UI::Entry;	2098	package CFPlus::UI::Entry;
1860		2099
1861	our @ISA = CFClient::UI::EntryBase::;	2100	our @ISA = CFPlus::UI::EntryBase::;
1862		2101
1863	use CFClient::OpenGL;	2102	use CFPlus::OpenGL;
1864		2103
1865	sub key_down {	2104	sub invoke_key_down {
1866	my ($self, $ev) = @_;	2105	my ($self, $ev) = @_;
1867		2106
1868	my $sym = $ev->{sym};	2107	my $sym = $ev->{sym};
1869		2108
1870	if ($sym == 13) {	2109	if ($ev->{uni} == 0x0d || $sym == 13) {
1871	unshift @{$self->{history}},	2110	unshift @{$self->{history}},
1872	my $txt = $self->get_text;	2111	my $txt = $self->get_text;
		2112
1873	$self->{history_pointer} = -1;	2113	$self->{history_pointer} = -1;
1874	$self->{history_saveback} = '';	2114	$self->{history_saveback} = '';
1875	$self->_emit (activate => $txt);	2115	$self->emit (activate => $txt);
1876	$self->update;	2116	$self->update;
1877		2117
1878	} elsif ($sym == CFClient::SDLK_UP) {	2118	} elsif ($sym == CFPlus::SDLK_UP) {
1879	if ($self->{history_pointer} < 0) {	2119	if ($self->{history_pointer} < 0) {
1880	$self->{history_saveback} = $self->get_text;	2120	$self->{history_saveback} = $self->get_text;
1881	}	2121	}
1882	if (@{$self->{history} || []} > 0) {	2122	if (@{$self->{history} || []} > 0) {
1883	$self->{history_pointer}++;	2123	$self->{history_pointer}++;
…		…
1885	$self->{history_pointer} = @{$self->{history} || []} - 1;	2125	$self->{history_pointer} = @{$self->{history} || []} - 1;
1886	}	2126	}
1887	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2127	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1888	}	2128	}
1889		2129
1890	} elsif ($sym == CFClient::SDLK_DOWN) {	2130	} elsif ($sym == CFPlus::SDLK_DOWN) {
1891	$self->{history_pointer}--;	2131	$self->{history_pointer}--;
1892	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2132	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1893		2133
1894	if ($self->{history_pointer} >= 0) {	2134	if ($self->{history_pointer} >= 0) {
1895	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2135	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1896	} else {	2136	} else {
1897	$self->set_text ($self->{history_saveback});	2137	$self->set_text ($self->{history_saveback});
1898	}	2138	}
1899		2139
1900	} else {	2140	} else {
1901	return $self->SUPER::key_down ($ev)	2141	return $self->SUPER::invoke_key_down ($ev)
1902	}	2142	}
1903		2143
1904	1	2144	1
1905	}	2145	}
1906		2146
1907	#############################################################################	2147	#############################################################################
1908		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
1909	package CFClient::UI::Button;	2188	package CFPlus::UI::Button;
1910		2189
1911	our @ISA = CFClient::UI::Label::;	2190	our @ISA = CFPlus::UI::Label::;
1912		2191
1913	use CFClient::OpenGL;	2192	use CFPlus::OpenGL;
1914		2193
1915	my @tex =	2194	my @tex =
1916	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2195	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1917	qw(b1_button_active.png);	2196	qw(b1_button_active.png);
1918		2197
1919	sub new {	2198	sub new {
1920	my $class = shift;	2199	my $class = shift;
1921		2200
…		…
1930	can_events => 1,	2209	can_events => 1,
1931	@_	2210	@_
1932	)	2211	)
1933	}	2212	}
1934		2213
1935	sub activate { }
1936
1937	sub button_up {	2214	sub invoke_button_up {
1938	my ($self, $ev, $x, $y) = @_;	2215	my ($self, $ev, $x, $y) = @_;
1939		2216
1940	$self->emit ("activate")	2217	$self->emit ("activate")
1941	if $x >= 0 && $x < $self->{w}	2218	if $x >= 0 && $x < $self->{w}
1942	&& $y >= 0 && $y < $self->{h};	2219	&& $y >= 0 && $y < $self->{h};
…		…
1960	$self->SUPER::_draw;	2237	$self->SUPER::_draw;
1961	}	2238	}
1962		2239
1963	#############################################################################	2240	#############################################################################
1964		2241
1965	package CFClient::UI::CheckBox;	2242	package CFPlus::UI::CheckBox;
1966		2243
1967	our @ISA = CFClient::UI::DrawBG::;	2244	our @ISA = CFPlus::UI::DrawBG::;
1968		2245
1969	my @tex =	2246	my @tex =
1970	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2247	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1971	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2248	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1972		2249
1973	use CFClient::OpenGL;	2250	use CFPlus::OpenGL;
1974		2251
1975	sub new {	2252	sub new {
1976	my $class = shift;	2253	my $class = shift;
1977		2254
1978	$class->SUPER::new (	2255	$class->SUPER::new (
…		…
1992	my ($self) = @_;	2269	my ($self) = @_;
1993		2270
1994	(6) x 2	2271	(6) x 2
1995	}	2272	}
1996		2273
		2274	sub toggle {
		2275	my ($self) = @_;
		2276
		2277	$self->{state} = !$self->{state};
		2278	$self->emit (changed => $self->{state});
		2279	$self->update;
		2280	}
		2281
1997	sub button_down {	2282	sub invoke_button_down {
1998	my ($self, $ev, $x, $y) = @_;	2283	my ($self, $ev, $x, $y) = @_;
1999		2284
2000	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2285	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2286	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002	$self->{state} = !$self->{state};	2287	$self->toggle;
2003	$self->_emit (changed => $self->{state});
2004	} else {	2288	} else {
2005	return 0	2289	return 0
2006	}	2290	}
2007		2291
2008	1	2292	1
…		…
2028	glDisable GL_TEXTURE_2D;	2312	glDisable GL_TEXTURE_2D;
2029	}	2313	}
2030		2314
2031	#############################################################################	2315	#############################################################################
2032		2316
2033	package CFClient::UI::Image;	2317	package CFPlus::UI::Image;
2034		2318
2035	our @ISA = CFClient::UI::Base::;	2319	our @ISA = CFPlus::UI::Base::;
2036		2320
2037	use CFClient::OpenGL;	2321	use CFPlus::OpenGL;
2038	use Carp qw/confess/;
2039		2322
2040	our %loaded_images;	2323	our %texture_cache;
2041		2324
2042	sub new {	2325	sub new {
2043	my $class = shift;	2326	my $class = shift;
2044		2327
2045	my $self = $class->SUPER::new (can_events => 0, @_);	2328	my $self = $class->SUPER::new (
		2329	can_events => 0,
		2330	@_,
		2331	);
2046		2332
2047	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2333	$self->{path} || $self->{tex}
		2334	or Carp::croak "'path' or 'tex' attributes required";
2048		2335
2049	$loaded_images{$self->{image}} ||=	2336	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2050	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2337	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2051		2338
2052	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2339	CFPlus::weaken $texture_cache{$self->{path}};
2053		2340
2054	Scalar::Util::weaken $loaded_images{$self->{image}};	2341	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056	$self->{aspect} = $tex->{w} / $tex->{h};
2057		2342
2058	$self	2343	$self
2059	}	2344	}
2060		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
2061	sub size_request {	2361	sub size_request {
2062	my ($self) = @_;	2362	my ($self) = @_;
2063		2363
2064	($self->{tex}->{w}, $self->{tex}->{h})	2364	($self->{tex}{w}, $self->{tex}{h})
2065	}	2365	}
2066		2366
2067	sub _draw {	2367	sub _draw {
2068	my ($self) = @_;	2368	my ($self) = @_;
2069		2369
…		…
2079	}	2379	}
2080		2380
2081	glEnable GL_TEXTURE_2D;	2381	glEnable GL_TEXTURE_2D;
2082	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2382	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2083		2383
2084	$tex->draw_quad_alpha (0, 0, $w, $h);	2384	$tex->draw_quad (0, 0, $w, $h);
2085		2385
2086	glDisable GL_TEXTURE_2D;	2386	glDisable GL_TEXTURE_2D;
2087	}	2387	}
2088		2388
2089	#############################################################################	2389	#############################################################################
2090		2390
		2391	package CFPlus::UI::ImageButton;
		2392
		2393	our @ISA = CFPlus::UI::Image::;
		2394
		2395	use CFPlus::OpenGL;
		2396
		2397	my %textures;
		2398
		2399	sub new {
		2400	my $class = shift;
		2401
		2402	my $self = $class->SUPER::new (
		2403	padding_x => 4,
		2404	padding_y => 4,
		2405	fg => [1, 1, 1],
		2406	active_fg => [0, 0, 1],
		2407	can_hover => 1,
		2408	align => 0,
		2409	valign => 0,
		2410	can_events => 1,
		2411	@_
		2412	);
		2413	}
		2414
		2415	sub invoke_button_up {
		2416	my ($self, $ev, $x, $y) = @_;
		2417
		2418	$self->emit ("activate")
		2419	if $x >= 0 && $x < $self->{w}
		2420	&& $y >= 0 && $y < $self->{h};
		2421
		2422	1
		2423	}
		2424
		2425	#############################################################################
		2426
2091	package CFClient::UI::VGauge;	2427	package CFPlus::UI::VGauge;
2092		2428
2093	our @ISA = CFClient::UI::Base::;	2429	our @ISA = CFPlus::UI::Base::;
2094		2430
2095	use List::Util qw(min max);	2431	use List::Util qw(min max);
2096		2432
2097	use CFClient::OpenGL;	2433	use CFPlus::OpenGL;
2098		2434
2099	my %tex = (	2435	my %tex = (
2100	food => [	2436	food => [
2101	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2437	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2438	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2103	],	2439	],
2104	grace => [	2440	grace => [
2105	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2441	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106	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/
2107	],	2443	],
2108	hp => [	2444	hp => [
2109	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2445	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2110	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2446	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2111	],	2447	],
2112	mana => [	2448	mana => [
2113	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2449	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2114	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/
2115	],	2451	],
2116	);	2452	);
2117		2453
2118	# eg. VGauge->new (gauge => 'food'), default gauge: food	2454	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2178	my $ycut1 = max 0, min 1, $ycut;	2514	my $ycut1 = max 0, min 1, $ycut;
2179	my $ycut2 = max 0, min 1, $ycut - 1;	2515	my $ycut2 = max 0, min 1, $ycut - 1;
2180		2516
2181	my $h1 = $self->{h} * (1 - $ycut1);	2517	my $h1 = $self->{h} * (1 - $ycut1);
2182	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);
2183		2522
2184	glEnable GL_BLEND;	2523	glEnable GL_BLEND;
2185	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2524	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2525	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187	glEnable GL_TEXTURE_2D;	2526	glEnable GL_TEXTURE_2D;
…		…
2206		2545
2207	if ($t3) {	2546	if ($t3) {
2208	glBindTexture GL_TEXTURE_2D, $t3->{name};	2547	glBindTexture GL_TEXTURE_2D, $t3->{name};
2209	glBegin GL_QUADS;	2548	glBegin GL_QUADS;
2210	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2549	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2550	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2551	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2552	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214	glEnd;	2553	glEnd;
2215	}	2554	}
2216		2555
2217	glDisable GL_BLEND;	2556	glDisable GL_BLEND;
2218	glDisable GL_TEXTURE_2D;	2557	glDisable GL_TEXTURE_2D;
2219	}	2558	}
2220		2559
2221	#############################################################################	2560	#############################################################################
2222		2561
2223	package CFClient::UI::Gauge;	2562	package CFPlus::UI::Gauge;
2224		2563
2225	our @ISA = CFClient::UI::VBox::;	2564	our @ISA = CFPlus::UI::VBox::;
2226		2565
2227	sub new {	2566	sub new {
2228	my ($class, %arg) = @_;	2567	my ($class, %arg) = @_;
2229		2568
2230	my $self = $class->SUPER::new (	2569	my $self = $class->SUPER::new (
…		…
2232	can_hover => 1,	2571	can_hover => 1,
2233	can_events => 1,	2572	can_events => 1,
2234	%arg,	2573	%arg,
2235	);	2574	);
2236		2575
2237	$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");
2238	$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);
2239	$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");
2240		2579
2241	$self	2580	$self
2242	}	2581	}
2243		2582
2244	sub set_fontsize {	2583	sub set_fontsize {
…		…
2265	$self->{value}->set_text ($val);	2604	$self->{value}->set_text ($val);
2266	}	2605	}
2267		2606
2268	#############################################################################	2607	#############################################################################
2269		2608
2270	package CFClient::UI::Slider;	2609	package CFPlus::UI::Slider;
2271		2610
2272	use strict;	2611	use strict;
2273		2612
2274	use CFClient::OpenGL;	2613	use CFPlus::OpenGL;
2275		2614
2276	our @ISA = CFClient::UI::DrawBG::;	2615	our @ISA = CFPlus::UI::DrawBG::;
2277		2616
2278	my @tex =	2617	my @tex =
2279	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2618	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2280	qw(s1_slider.png s1_slider_bg.png);	2619	qw(s1_slider.png s1_slider_bg.png);
2281		2620
2282	sub new {	2621	sub new {
2283	my $class = shift;	2622	my $class = shift;
2284		2623
…		…
2305	$self->update;	2644	$self->update;
2306		2645
2307	$self	2646	$self
2308	}	2647	}
2309		2648
2310	sub changed { }
2311
2312	sub set_range {	2649	sub set_range {
2313	my ($self, $range) = @_;	2650	my ($self, $range) = @_;
2314		2651
2315	($range, $self->{range}) = ($self->{range}, $range);	2652	($range, $self->{range}) = ($self->{range}, $range);
2316		2653
…		…
2336	if $unit;	2673	if $unit;
2337		2674
2338	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2675	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339		2676
2340	if ($value != $old_value) {	2677	if ($value != $old_value) {
2341	$self->_emit (changed => $value);	2678	$self->emit (changed => $value);
2342	$self->update;	2679	$self->update;
2343	}	2680	}
2344	}	2681	}
2345		2682
2346	sub size_request {	2683	sub size_request {
2347	my ($self) = @_;	2684	my ($self) = @_;
2348		2685
2349	($self->{req_w}, $self->{req_h})	2686	($self->{req_w}, $self->{req_h})
2350	}	2687	}
2351		2688
2352	sub button_down {	2689	sub invoke_button_down {
2353	my ($self, $ev, $x, $y) = @_;	2690	my ($self, $ev, $x, $y) = @_;
2354		2691
2355	$self->SUPER::button_down ($ev, $x, $y);	2692	$self->SUPER::invoke_button_down ($ev, $x, $y);
2356		2693
2357	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2694	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358		2695
2359	$self->mouse_motion ($ev, $x, $y)	2696	$self->invoke_mouse_motion ($ev, $x, $y)
2360	}	2697	}
2361		2698
2362	sub mouse_motion {	2699	sub invoke_mouse_motion {
2363	my ($self, $ev, $x, $y) = @_;	2700	my ($self, $ev, $x, $y) = @_;
2364		2701
2365	if ($GRAB == $self) {	2702	if ($GRAB == $self) {
2366	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2703	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367		2704
…		…
2373	} else {	2710	} else {
2374	return 0;	2711	return 0;
2375	}	2712	}
2376		2713
2377	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
2378	}	2727	}
2379		2728
2380	sub update {	2729	sub update {
2381	my ($self) = @_;	2730	my ($self) = @_;
2382		2731
…		…
2431	glDisable GL_TEXTURE_2D;	2780	glDisable GL_TEXTURE_2D;
2432	}	2781	}
2433		2782
2434	#############################################################################	2783	#############################################################################
2435		2784
2436	package CFClient::UI::ValSlider;	2785	package CFPlus::UI::ValSlider;
2437		2786
2438	our @ISA = CFClient::UI::HBox::;	2787	our @ISA = CFPlus::UI::HBox::;
2439		2788
2440	sub new {	2789	sub new {
2441	my ($class, %arg) = @_;	2790	my ($class, %arg) = @_;
2442		2791
2443	my $range = delete $arg{range};	2792	my $range = delete $arg{range};
2444		2793
2445	my $self = $class->SUPER::new (	2794	my $self = $class->SUPER::new (
2446	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2795	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2447	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2796	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2448	to_value => sub { shift },	2797	to_value => sub { shift },
2449	from_value => sub { shift },	2798	from_value => sub { shift },
2450	%arg,	2799	%arg,
2451	);	2800	);
2452		2801
…		…
2472	sub set_range { shift->{slider}->set_range (@_) }	2821	sub set_range { shift->{slider}->set_range (@_) }
2473	sub set_value { shift->{slider}->set_value (@_) }	2822	sub set_value { shift->{slider}->set_value (@_) }
2474		2823
2475	#############################################################################	2824	#############################################################################
2476		2825
2477	package CFClient::UI::TextScroller;	2826	package CFPlus::UI::TextScroller;
2478		2827
2479	our @ISA = CFClient::UI::HBox::;	2828	our @ISA = CFPlus::UI::HBox::;
2480		2829
2481	use CFClient::OpenGL;	2830	use CFPlus::OpenGL;
2482		2831
2483	sub new {	2832	sub new {
2484	my $class = shift;	2833	my $class = shift;
2485		2834
2486	my $self = $class->SUPER::new (	2835	my $self = $class->SUPER::new (
2487	fontsize => 1,	2836	fontsize => 1,
2488	can_events => 0,	2837	can_events => 1,
2489	indent => 0,	2838	indent => 0,
2490	#font => default_font	2839	#font => default_font
2491	@_,	2840	@_,
2492		2841
2493	layout => (new CFClient::Layout 1),	2842	layout => (new CFPlus::Layout),
2494	par => [],	2843	par => [],
		2844	max_par => 0,
2495	height => 0,	2845	height => 0,
2496	children => [	2846	children => [
2497	(new CFClient::UI::Empty expand => 1),	2847	(new CFPlus::UI::Empty expand => 1),
2498	(new CFClient::UI::Slider vertical => 1),	2848	(new CFPlus::UI::Slider vertical => 1),
2499	],	2849	],
2500	);	2850	);
2501		2851
2502	$self->{children}[1]->connect (changed => sub { $self->update });	2852	$self->{children}[1]->connect (changed => sub { $self->update });
2503		2853
…		…
2509		2859
2510	$self->{fontsize} = $fontsize;	2860	$self->{fontsize} = $fontsize;
2511	$self->reflow;	2861	$self->reflow;
2512	}	2862	}
2513		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
2514	sub size_allocate {	2873	sub invoke_size_allocate {
2515	my ($self, $w, $h) = @_;	2874	my ($self, $w, $h) = @_;
2516		2875
2517	$self->SUPER::size_allocate ($w, $h);	2876	my ($empty, $slider, @other) = @{ $self->{children} };
		2877	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518		2878
2519	$self->{layout}->set_font ($self->{font}) if $self->{font};	2879	$self->{layout}->set_font ($self->{font}) if $self->{font};
2520	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2880	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521	$self->{layout}->set_width ($self->{children}[0]{w});	2881	$self->{layout}->set_width ($empty->{w});
2522	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2882	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523		2883
2524	$self->reflow;	2884	$self->reflow;
2525	}
2526		2885
2527	sub text_size {	2886	local $self->{children} = [$empty, $slider];
		2887	$self->SUPER::invoke_size_allocate ($w, $h)
		2888	}
		2889
		2890	sub invoke_mouse_wheel {
2528	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) = @_;
2529		2902
2530	my $layout = $self->{layout};	2903	my $layout = $self->{layout};
2531		2904
		2905	$layout->set_font ($self->{font}) if $self->{font};
		2906	$layout->set_foreground (@{$para->{fg}});
2532	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2907	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533	$layout->set_width ($self->{children}[0]{w} - $indent);	2908	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2909	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535	$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}}
2536		2916	);
		2917
2537	$layout->size	2918	$layout
2538	}	2919	}
2539		2920
2540	sub reflow {	2921	sub reflow {
2541	my ($self) = @_;	2922	my ($self) = @_;
2542		2923
…		…
2549		2930
2550	# todo: base offset on lines or so, not on pixels	2931	# todo: base offset on lines or so, not on pixels
2551	$self->{children}[1]->set_value ($offset);	2932	$self->{children}[1]->set_value ($offset);
2552	}	2933	}
2553		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
2554	sub clear {	2950	sub clear {
2555	my ($self) = @_;	2951	my ($self) = @_;
		2952
		2953	my (undef, undef, @other) = @{ $self->{children} };
		2954	$self->remove ($_) for @other;
2556		2955
2557	$self->{par} = [];	2956	$self->{par} = [];
2558	$self->{height} = 0;	2957	$self->{height} = 0;
2559	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2958	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560	}	2959	}
2561		2960
2562	sub add_paragraph {	2961	sub add_paragraph {
2563	my ($self, $color, $text, $indent) = @_;	2962	my $self = shift;
2564		2963
2565	for my $line (split /\n/, $text) {	2964	for my $para (@_) {
2566	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
2567	$self->{height} += $h;	3016	$self->{height} = $height;
2568	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3017	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2569	}
2570		3018
2571	$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	}
2572	}	3025	}
2573		3026
2574	sub update {	3027	sub update {
2575	my ($self) = @_;	3028	my ($self) = @_;
2576		3029
…		…
2579	return unless $self->{h} > 0;	3032	return unless $self->{h} > 0;
2580		3033
2581	delete $self->{texture};	3034	delete $self->{texture};
2582		3035
2583	$ROOT->on_post_alloc ($self => sub {	3036	$ROOT->on_post_alloc ($self => sub {
		3037	$self->force_uptodate;
		3038
2584	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3039	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585		3040
2586	if (delete $self->{need_reflow}) {
2587	my $height = 0;
2588
2589	my $layout = $self->{layout};
2590
2591	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593	for (@{$self->{par}}) {
2594	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2595	$layout->set_width ($W - $_->[3]);
2596	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597	$layout->set_markup ($_->[4]);
2598	my ($w, $h) = $layout->size;
2599	$_->[0] = $w + $_->[3];
2600	$_->[1] = $h;
2601	}
2602
2603	$height += $_->[1];
2604	}
2605
2606	$self->{height} = $height;
2607
2608	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2609
2610	delete $self->{texture};
2611	}
2612
2613	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3041	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2614	glClearColor 0, 0, 0, 0;	3042	glClearColor 0, 0, 0, 0;
2615	glClear GL_COLOR_BUFFER_BIT;	3043	glClear GL_COLOR_BUFFER_BIT;
2616		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;
2617	my $top = int $self->{children}[1]{range}[0];	3053	my $top = int $self->{children}[1]{range}[0];
2618		3054
2619	my $y0 = $top;	3055	my $y0 = $top;
2620	my $y1 = $top + $H;	3056	my $y1 = $top + $H;
2621		3057
2622	my $y = 0;
2623
2624	my $layout = $self->{layout};
2625
2626	$layout->set_font ($self->{font}) if $self->{font};
2627
2628	glEnable GL_BLEND;
2629	#TODO# not correct in windows where rgba is forced off
2630	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631
2632	for my $par (@{$self->{par}}) {	3058	for my $para (@{$self->{par}}) {
2633	my $h = $par->[1];	3059	my $h = $para->{h};
		3060	my $y = $para->{y};
2634		3061
2635	if ($y0 < $y + $h && $y < $y1) {	3062	if ($y0 < $y + $h && $y < $y1) {
2636	$layout->set_foreground (@{ $par->[2] });	3063	my $layout = $self->get_layout ($para);
2637	$layout->set_width ($W - $par->[3]);
2638	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639	$layout->set_markup ($par->[4]);
2640		3064
2641	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3065	$layout->render ($para->{indent}, $y - $y0);
2642		3066
2643	glRasterPos $par->[3], $y - $y0;	3067	if (my @w = @{ $para->{widget} }) {
2644	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	}
2645	}	3079	}
2646		3080
2647	$y += $h;	3081	$paridx++;
		3082	$top_paragraph ||= $paridx if $y >= $top;
2648	}	3083	}
2649		3084
2650	glDisable GL_BLEND;	3085	$self->{top_paragraph} = $top_paragraph;
2651	};	3086	};
2652	});	3087	});
		3088	}
		3089
		3090	sub reconfigure {
		3091	my ($self) = @_;
		3092
		3093	$self->SUPER::reconfigure;
		3094
		3095	$_->{w} = 1e10 for @{ $self->{par} };
		3096	$self->reflow;
2653	}	3097	}
2654		3098
2655	sub _draw {	3099	sub _draw {
2656	my ($self) = @_;	3100	my ($self) = @_;
2657		3101
…		…
2660	glColor 0, 0, 0, 1;	3104	glColor 0, 0, 0, 1;
2661	$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});
2662	glDisable GL_TEXTURE_2D;	3106	glDisable GL_TEXTURE_2D;
2663		3107
2664	$self->{children}[1]->draw;	3108	$self->{children}[1]->draw;
2665
2666	}	3109	}
2667		3110
2668	#############################################################################	3111	#############################################################################
2669		3112
2670	package CFClient::UI::Animator;	3113	package CFPlus::UI::Animator;
2671		3114
2672	use CFClient::OpenGL;	3115	use CFPlus::OpenGL;
2673		3116
2674	our @ISA = CFClient::UI::Bin::;	3117	our @ISA = CFPlus::UI::Bin::;
2675		3118
2676	sub moveto {	3119	sub moveto {
2677	my ($self, $x, $y) = @_;	3120	my ($self, $x, $y) = @_;
2678		3121
2679	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3122	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2707	glPopMatrix;	3150	glPopMatrix;
2708	}	3151	}
2709		3152
2710	#############################################################################	3153	#############################################################################
2711		3154
2712	package CFClient::UI::Flopper;	3155	package CFPlus::UI::Flopper;
2713		3156
2714	our @ISA = CFClient::UI::Button::;	3157	our @ISA = CFPlus::UI::Button::;
2715		3158
2716	sub new {	3159	sub new {
2717	my $class = shift;	3160	my $class = shift;
2718		3161
2719	my $self = $class->SUPER::new (	3162	my $self = $class->SUPER::new (
…		…
2731	$self->{other}->toggle_visibility;	3174	$self->{other}->toggle_visibility;
2732	}	3175	}
2733		3176
2734	#############################################################################	3177	#############################################################################
2735		3178
2736	package CFClient::UI::Tooltip;	3179	package CFPlus::UI::Tooltip;
2737		3180
2738	our @ISA = CFClient::UI::Bin::;	3181	our @ISA = CFPlus::UI::Bin::;
2739		3182
2740	use CFClient::OpenGL;	3183	use CFPlus::OpenGL;
2741		3184
2742	sub new {	3185	sub new {
2743	my $class = shift;	3186	my $class = shift;
2744		3187
2745	$class->SUPER::new (	3188	$class->SUPER::new (
…		…
2748	)	3191	)
2749	}	3192	}
2750		3193
2751	sub set_tooltip_from {	3194	sub set_tooltip_from {
2752	my ($self, $widget) = @_;	3195	my ($self, $widget) = @_;
		3196
		3197	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3198	if $widget->{tooltip} =~ /^#(.*)$/;
2753		3199
2754	my $tooltip = $widget->{tooltip};	3200	my $tooltip = $widget->{tooltip};
2755		3201
2756	if ($ENV{CFPLUS_DEBUG} & 2) {	3202	if ($ENV{CFPLUS_DEBUG} & 2) {
2757	$tooltip .= "\n\n" . (ref $widget) . "\n"	3203	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2761	}	3207	}
2762		3208
2763	$tooltip =~ s/^\n+//;	3209	$tooltip =~ s/^\n+//;
2764	$tooltip =~ s/\n+$//;	3210	$tooltip =~ s/\n+$//;
2765		3211
2766	$self->add (new CFClient::UI::Label	3212	$self->add (new CFPlus::UI::Label
2767	markup => $tooltip,	3213	markup => $tooltip,
2768	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3214	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2769	fontsize => 0.8,	3215	fontsize => 0.8,
2770	fg => [0, 0, 0, 1],	3216	style => 1, # FLAG_INVERSE
2771	ellipsise => 0,	3217	ellipsise => 0,
2772	font => ($widget->{tooltip_font} || $::FONT_PROP),	3218	font => ($widget->{tooltip_font} || $::FONT_PROP),
2773	);	3219	);
2774	}	3220	}
2775		3221
…		…
2779	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3225	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780		3226
2781	($w + 4, $h + 4)	3227	($w + 4, $h + 4)
2782	}	3228	}
2783		3229
2784	sub size_allocate {	3230	sub invoke_size_allocate {
2785	my ($self, $w, $h) = @_;	3231	my ($self, $w, $h) = @_;
2786		3232
2787	$self->SUPER::size_allocate ($w - 4, $h - 4);	3233	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788	}	3234	}
2789		3235
2790	sub visibility_change {	3236	sub invoke_visibility_change {
2791	my ($self, $visible) = @_;	3237	my ($self, $visible) = @_;
2792		3238
2793	return unless $visible;	3239	return unless $visible;
2794		3240
2795	$self->{root}->on_post_alloc ("move_$self" => sub {	3241	$self->{root}->on_post_alloc ("move_$self" => sub {
2796	my $widget = $self->{owner}	3242	my $widget = $self->{owner}
2797	or return;	3243	or return;
2798		3244
		3245	if ($widget->{visible}) {
2799	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3246	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800		3247
2801	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3248	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802	if $x + $self->{w} > $self->{root}{w};	3249	if $x + $self->{w} > $self->{root}{w};
2803		3250
2804	$self->move_abs ($x, $y);	3251	$self->move_abs ($x, $y);
		3252	} else {
		3253	$self->hide;
		3254	}
2805	});	3255	});
2806	}	3256	}
2807		3257
2808	sub _draw {	3258	sub _draw {
2809	my ($self) = @_;	3259	my ($self) = @_;
…		…
2833	$self->SUPER::_draw;	3283	$self->SUPER::_draw;
2834	}	3284	}
2835		3285
2836	#############################################################################	3286	#############################################################################
2837		3287
2838	package CFClient::UI::Face;	3288	package CFPlus::UI::Face;
2839		3289
2840	our @ISA = CFClient::UI::Base::;	3290	our @ISA = CFPlus::UI::DrawBG::;
2841		3291
2842	use CFClient::OpenGL;	3292	use CFPlus::OpenGL;
2843		3293
2844	sub new {	3294	sub new {
2845	my $class = shift;	3295	my $class = shift;
2846		3296
2847	my $self = $class->SUPER::new (	3297	my $self = $class->SUPER::new (
…		…
2849	can_events => 0,	3299	can_events => 0,
2850	@_,	3300	@_,
2851	);	3301	);
2852		3302
2853	if ($self->{anim} && $self->{animspeed}) {	3303	if ($self->{anim} && $self->{animspeed}) {
2854	Scalar::Util::weaken (my $widget = $self);	3304	CFPlus::weaken (my $widget = $self);
2855		3305
2856	$self->{timer} = Event->timer (	3306	$self->{timer} = Event->timer (
2857	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3307	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2858	hard => 1,	3308	hard => 1,
2859	interval => $self->{animspeed},	3309	interval => $self->{animspeed},
…		…
2882	sub _draw {	3332	sub _draw {
2883	my ($self) = @_;	3333	my ($self) = @_;
2884		3334
2885	return unless $::CONN;	3335	return unless $::CONN;
2886		3336
		3337	$self->SUPER::_draw;
		3338
2887	my $face;	3339	my $face;
2888		3340
2889	if ($self->{frame}) {	3341	if ($self->{frame}) {
2890	my $anim = $::CONN->{anim}[$self->{anim}];	3342	my $anim = $::CONN->{anim}[$self->{anim}];
2891		3343
…		…
2913	$self->SUPER::destroy;	3365	$self->SUPER::destroy;
2914	}	3366	}
2915		3367
2916	#############################################################################	3368	#############################################################################
2917		3369
2918	package CFClient::UI::Buttonbar;	3370	package CFPlus::UI::Buttonbar;
2919		3371
2920	our @ISA = CFClient::UI::HBox::;	3372	our @ISA = CFPlus::UI::HBox::;
2921		3373
2922	# TODO: should actualyl wrap buttons and other goodies.	3374	# TODO: should actually wrap buttons and other goodies.
2923		3375
2924	#############################################################################	3376	#############################################################################
2925		3377
2926	package CFClient::UI::Menu;	3378	package CFPlus::UI::Menu;
2927		3379
2928	our @ISA = CFClient::UI::FancyFrame::;	3380	our @ISA = CFPlus::UI::Toplevel::;
2929		3381
2930	use CFClient::OpenGL;	3382	use CFPlus::OpenGL;
2931		3383
2932	sub new {	3384	sub new {
2933	my $class = shift;	3385	my $class = shift;
2934		3386
2935	my $self = $class->SUPER::new (	3387	my $self = $class->SUPER::new (
2936	items => [],	3388	items => [],
2937	z => 100,	3389	z => 100,
2938	@_,	3390	@_,
2939	);	3391	);
2940		3392
2941	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3393	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2942		3394
2943	for my $item (@{ $self->{items} }) {	3395	for my $item (@{ $self->{items} }) {
2944	my ($widget, $cb, $tooltip) = @$item;	3396	my ($widget, $cb, $tooltip) = @$item;
2945		3397
2946	# handle various types of items, only text for now	3398	# handle various types of items, only text for now
2947	if (!ref $widget) {	3399	if (!ref $widget) {
		3400	if ($widget =~ /\t/) {
		3401	my ($left, $right) = split /\t/, $widget, 2;
		3402
2948	$widget = new CFClient::UI::Label	3403	$widget = new CFPlus::UI::HBox
2949	can_hover => 1,	3404	can_hover => 1,
2950	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,
2951	markup => $widget,	3417	markup => $widget,
2952	tooltip => $tooltip	3418	tooltip => $tooltip;
		3419	}
2953	}	3420	}
2954		3421
2955	$self->{item}{$widget} = $item;	3422	$self->{item}{$widget} = $item;
2956		3423
2957	$self->{vbox}->add ($widget);	3424	$self->{vbox}->add ($widget);
…		…
2962		3429
2963	# 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)
2964	sub popup {	3431	sub popup {
2965	my ($self, $ev) = @_;	3432	my ($self, $ev) = @_;
2966		3433
2967	$self->_emit ("popdown");	3434	$self->emit ("popdown");
2968		3435
2969	# maybe save $GRAB? must be careful about events...	3436	# maybe save $GRAB? must be careful about events...
2970	$GRAB = $self;	3437	$GRAB = $self;
2971	$self->{button} = $ev->{button};	3438	$self->{button} = $ev->{button};
2972		3439
2973	$self->show;	3440	$self->show;
2974	$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);
2975	}	3442	}
2976		3443
2977	sub mouse_motion {	3444	sub invoke_mouse_motion {
2978	my ($self, $ev, $x, $y) = @_;	3445	my ($self, $ev, $x, $y) = @_;
2979		3446
2980	# TODO: should use vbox->find_widget or so	3447	# TODO: should use vbox->find_widget or so
2981	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3448	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982	$self->{hover} = $self->{item}{$HOVER};	3449	$self->{hover} = $self->{item}{$HOVER};
2983		3450
2984	0	3451	0
2985	}	3452	}
2986		3453
2987	sub button_up {	3454	sub invoke_button_up {
2988	my ($self, $ev, $x, $y) = @_;	3455	my ($self, $ev, $x, $y) = @_;
2989		3456
2990	if ($ev->{button} == $self->{button}) {	3457	if ($ev->{button} == $self->{button}) {
2991	undef $GRAB;	3458	undef $GRAB;
2992	$self->hide;	3459	$self->hide;
2993		3460
2994	$self->_emit ("popdown");	3461	$self->emit ("popdown");
2995	$self->{hover}[1]->() if $self->{hover};	3462	$self->{hover}[1]->() if $self->{hover};
2996	} else {	3463	} else {
2997	return 0	3464	return 0
2998	}	3465	}
2999		3466
3000	1	3467	1
3001	}	3468	}
3002		3469
3003	#############################################################################	3470	#############################################################################
3004		3471
3005	package CFClient::UI::Multiplexer;	3472	package CFPlus::UI::Multiplexer;
3006		3473
3007	our @ISA = CFClient::UI::Container::;	3474	our @ISA = CFPlus::UI::Container::;
3008		3475
3009	sub new {	3476	sub new {
3010	my $class = shift;	3477	my $class = shift;
3011		3478
3012	my $self = $class->SUPER::new (	3479	my $self = $class->SUPER::new (
…		…
3026		3493
3027	$self->{current} = $self->{children}[0]	3494	$self->{current} = $self->{children}[0]
3028	if @{ $self->{children} };	3495	if @{ $self->{children} };
3029	}	3496	}
3030		3497
		3498	sub get_current_page {
		3499	my ($self) = @_;
		3500
		3501	$self->{current}
		3502	}
		3503
3031	sub set_current_page {	3504	sub set_current_page {
3032	my ($self, $page_or_widget) = @_;	3505	my ($self, $page_or_widget) = @_;
3033		3506
3034	my $widget = ref $page_or_widget	3507	my $widget = ref $page_or_widget
3035	? $page_or_widget	3508	? $page_or_widget
3036	: $self->{children}[$page_or_widget];	3509	: $self->{children}[$page_or_widget];
3037		3510
3038	$self->{current} = $widget;	3511	$self->{current} = $widget;
3039	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3512	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040		3513
3041	$self->_emit (page_changed => $self->{current});	3514	$self->emit (page_changed => $self->{current});
3042		3515
3043	$self->realloc;	3516	$self->realloc;
3044	}	3517	}
3045		3518
3046	sub visible_children {	3519	sub visible_children {
…		…
3051	my ($self) = @_;	3524	my ($self) = @_;
3052		3525
3053	$self->{current}->size_request	3526	$self->{current}->size_request
3054	}	3527	}
3055		3528
3056	sub size_allocate {	3529	sub invoke_size_allocate {
3057	my ($self, $w, $h) = @_;	3530	my ($self, $w, $h) = @_;
3058		3531
3059	$self->{current}->configure (0, 0, $w, $h);	3532	$self->{current}->configure (0, 0, $w, $h);
		3533
		3534	1
3060	}	3535	}
3061		3536
3062	sub _draw {	3537	sub _draw {
3063	my ($self) = @_;	3538	my ($self) = @_;
3064		3539
3065	$self->{current}->draw;	3540	$self->{current}->draw;
3066	}	3541	}
3067		3542
3068	#############################################################################	3543	#############################################################################
3069		3544
3070	package CFClient::UI::Notebook;	3545	package CFPlus::UI::Notebook;
3071		3546
3072	our @ISA = CFClient::UI::VBox::;	3547	our @ISA = CFPlus::UI::VBox::;
3073		3548
3074	sub new {	3549	sub new {
3075	my $class = shift;	3550	my $class = shift;
3076		3551
3077	my $self = $class->SUPER::new (	3552	my $self = $class->SUPER::new (
3078	buttonbar => (new CFClient::UI::Buttonbar),	3553	buttonbar => (new CFPlus::UI::Buttonbar),
3079	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3554	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3080	# filter => # will be put between multiplexer and $self	3555	# filter => # will be put between multiplexer and $self
3081	@_,	3556	@_,
3082	);	3557	);
3083		3558
3084	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3559	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3088	}	3563	}
3089		3564
3090	sub add {	3565	sub add {
3091	my ($self, $title, $widget, $tooltip) = @_;	3566	my ($self, $title, $widget, $tooltip) = @_;
3092		3567
3093	Scalar::Util::weaken $self;	3568	CFPlus::weaken $self;
3094		3569
3095	$self->{buttonbar}->add (new CFClient::UI::Button	3570	$self->{buttonbar}->add (new CFPlus::UI::Button
3096	markup => $title,	3571	markup => $title,
3097	tooltip => $tooltip,	3572	tooltip => $tooltip,
3098	on_activate => sub { $self->set_current_page ($widget) },	3573	on_activate => sub { $self->set_current_page ($widget) },
3099	);	3574	);
3100		3575
3101	$self->{multiplexer}->add ($widget);	3576	$self->{multiplexer}->add ($widget);
3102	}	3577	}
3103		3578
		3579	sub get_current_page {
		3580	my ($self) = @_;
		3581
		3582	$self->{multiplexer}->get_current_page
		3583	}
		3584
3104	sub set_current_page {	3585	sub set_current_page {
3105	my ($self, $page) = @_;	3586	my ($self, $page) = @_;
3106		3587
3107	$self->{multiplexer}->set_current_page ($page);	3588	$self->{multiplexer}->set_current_page ($page);
3108	$self->_emit (page_changed => $self->{multiplexer}{current});	3589	$self->emit (page_changed => $self->{multiplexer}{current});
3109	}	3590	}
3110		3591
3111	#############################################################################	3592	#############################################################################
3112		3593
3113	package CFClient::UI::Combobox;	3594	package CFPlus::UI::Selector;
3114		3595
3115	use utf8;	3596	use utf8;
3116		3597
3117	our @ISA = CFClient::UI::Button::;	3598	our @ISA = CFPlus::UI::Button::;
3118		3599
3119	sub new {	3600	sub new {
3120	my $class = shift;	3601	my $class = shift;
3121		3602
3122	my $self = $class->SUPER::new (	3603	my $self = $class->SUPER::new (
…		…
3128	$self->_set_value ($self->{value});	3609	$self->_set_value ($self->{value});
3129		3610
3130	$self	3611	$self
3131	}	3612	}
3132		3613
3133	sub button_down {	3614	sub invoke_button_down {
3134	my ($self, $ev) = @_;	3615	my ($self, $ev) = @_;
3135		3616
3136	my @menu_items;	3617	my @menu_items;
3137		3618
3138	for (@{ $self->{options} }) {	3619	for (@{ $self->{options} }) {
3139	my ($value, $title, $tooltip) = @$_;	3620	my ($value, $title, $tooltip) = @$_;
3140		3621
3141	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3622	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142	}	3623	}
3143		3624
3144	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3625	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145	}	3626	}
3146		3627
3147	sub _set_value {	3628	sub _set_value {
3148	my ($self, $value) = @_;	3629	my ($self, $value) = @_;
3149		3630
…		…
3159	my ($self, $value) = @_;	3640	my ($self, $value) = @_;
3160		3641
3161	return unless $self->{value} ne $value;	3642	return unless $self->{value} ne $value;
3162		3643
3163	$self->_set_value ($value);	3644	$self->_set_value ($value);
3164	$self->_emit (changed => $value);	3645	$self->emit (changed => $value);
3165	}	3646	}
3166		3647
3167	#############################################################################	3648	#############################################################################
3168		3649
3169	package CFClient::UI::Statusbox;	3650	package CFPlus::UI::Statusbox;
3170		3651
3171	our @ISA = CFClient::UI::VBox::;	3652	our @ISA = CFPlus::UI::VBox::;
3172		3653
3173	sub new {	3654	sub new {
3174	my $class = shift;	3655	my $class = shift;
3175		3656
3176	my $self = $class->SUPER::new (	3657	my $self = $class->SUPER::new (
3177	fontsize => 0.8,	3658	fontsize => 0.8,
3178	@_,	3659	@_,
3179	);	3660	);
3180		3661
3181	Scalar::Util::weaken (my $this = $self);	3662	CFPlus::weaken (my $this = $self);
3182		3663
3183	$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 });
3184		3665
3185	$self	3666	$self
3186	}	3667	}
…		…
3188	sub reorder {	3669	sub reorder {
3189	my ($self) = @_;	3670	my ($self) = @_;
3190	my $NOW = Time::HiRes::time;	3671	my $NOW = Time::HiRes::time;
3191		3672
3192	# freeze display when hovering over any label	3673	# freeze display when hovering over any label
3193	return if $CFClient::UI::TOOLTIP->{owner}	3674	return if $CFPlus::UI::TOOLTIP->{owner}
3194	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3675	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3195	values %{ $self->{item} };	3676	values %{ $self->{item} };
3196		3677
3197	while (my ($k, $v) = each %{ $self->{item} }) {	3678	while (my ($k, $v) = each %{ $self->{item} }) {
3198	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3679	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3199	}	3680	}
…		…
3220	for ($short) {	3701	for ($short) {
3221	s/^\s+//;	3702	s/^\s+//;
3222	s/\s+/ /g;	3703	s/\s+/ /g;
3223	}	3704	}
3224		3705
3225	new CFClient::UI::Label	3706	new CFPlus::UI::Label
3226	markup => $short,	3707	markup => $short,
3227	tooltip => $item->{tooltip},	3708	tooltip => $item->{tooltip},
3228	tooltip_font => $::FONT_PROP,	3709	tooltip_font => $::FONT_PROP,
3229	tooltip_width => 0.67,	3710	tooltip_width => 0.67,
3230	fontsize => $item->{fontsize} || $self->{fontsize},	3711	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3284	count => 1,	3765	count => 1,
3285	%arg,	3766	%arg,
3286	};	3767	};
3287	}	3768	}
3288		3769
		3770	$ROOT->on_refresh (reorder => sub {
3289	$self->reorder;	3771	$self->reorder;
		3772	});
3290	}	3773	}
3291		3774
3292	sub reconfigure {	3775	sub reconfigure {
3293	my ($self) = @_;	3776	my ($self) = @_;
3294		3777
…		…
3307	$self->SUPER::destroy;	3790	$self->SUPER::destroy;
3308	}	3791	}
3309		3792
3310	#############################################################################	3793	#############################################################################
3311		3794
3312	package CFClient::UI::Inventory;
3313
3314	our @ISA = CFClient::UI::ScrolledWindow::;
3315
3316	sub new {
3317	my $class = shift;
3318
3319	my $self = $class->SUPER::new (
3320	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321	@_,
3322	);
3323
3324	$self
3325	}
3326
3327	sub set_items {
3328	my ($self, $items) = @_;
3329
3330	$self->{child}->clear;
3331	return unless $items;
3332
3333	my @items = sort {
3334	($a->{type} <=> $b->{type})
3335	or ($a->{name} cmp $b->{name})
3336	} @$items;
3337
3338	$self->{real_items} = \@items;
3339
3340	my $row = 0;
3341	for my $item (@items) {
3342	CFClient::Item::update_widgets $item;
3343
3344	$self->{child}->add (0, $row, $item->{face_widget});
3345	$self->{child}->add (1, $row, $item->{desc_widget});
3346	$self->{child}->add (2, $row, $item->{weight_widget});
3347
3348	$row++;
3349	}
3350	}
3351
3352	#############################################################################
3353
3354	package CFClient::UI::BindEditor;
3355
3356	our @ISA = CFClient::UI::FancyFrame::;
3357
3358	sub new {
3359	my $class = shift;
3360
3361	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363	$self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367	text => "start recording",
3368	tooltip => "Start/Stops recording of actions."
3369	."All subsequent actions after the recording started will be captured."
3370	."The actions are displayed after the record was stopped."
3371	."To bind the action you have to click on the 'Bind' button",
3372	on_activate => sub {
3373	unless ($self->{recording}) {
3374	$self->start;
3375	} else {
3376	$self->stop;
3377	}
3378	});
3379
3380	$vb->add (new CFClient::UI::Label text => "Actions:");
3381	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3384	$vb->add (my $hb = new CFClient::UI::HBox);
3385	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386	$hb->add (new CFClient::UI::Button
3387	text => "bind",
3388	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389	on_activate => sub {
3390	$self->ask_for_bind;
3391	});
3392
3393	$vb->add (my $hb = new CFClient::UI::HBox);
3394	$hb->add (new CFClient::UI::Button
3395	text => "ok",
3396	expand => 1,
3397	tooltip => "This closes the binding editor and saves the binding",
3398	on_activate => sub {
3399	$self->hide;
3400	$self->commit;
3401	});
3402
3403	$hb->add (new CFClient::UI::Button
3404	text => "cancel",
3405	expand => 1,
3406	tooltip => "This closes the binding editor without saving",
3407	on_activate => sub {
3408	$self->hide;
3409	$self->{binding_cancel}->()
3410	if $self->{binding_cancel};
3411	});
3412
3413	$self->update_binding_widgets;
3414
3415	$self
3416	}
3417
3418	sub commit {
3419	my ($self) = @_;
3420	my ($mod, $sym, $cmds) = $self->get_binding;
3421	if ($sym != 0 && @$cmds > 0) {
3422	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423	."'. Don't forget 'Save Config'!");
3424	$self->{binding_change}->($mod, $sym, $cmds)
3425	if $self->{binding_change};
3426	} else {
3427	$::STATUSBOX->add ("No action bound, no key or action specified!");
3428	$self->{binding_cancel}->()
3429	if $self->{binding_cancel};
3430	}
3431	}
3432
3433	sub start {
3434	my ($self) = @_;
3435
3436	$self->{rec_btn}->set_text ("stop recording");
3437	$self->{recording} = 1;
3438	$self->clear_command_list;
3439	$::CONN->start_record if $::CONN;
3440	}
3441
3442	sub stop {
3443	my ($self) = @_;
3444
3445	$self->{rec_btn}->set_text ("start recording");
3446	$self->{recording} = 0;
3447
3448	my $rec;
3449	$rec = $::CONN->stop_record if $::CONN;
3450	return unless ref $rec eq 'ARRAY';
3451	$self->set_command_list ($rec);
3452	}
3453
3454
3455	sub ask_for_bind_and_commit {
3456	my ($self) = @_;
3457	$self->ask_for_bind (1);
3458	}
3459
3460	sub ask_for_bind {
3461	my ($self, $commit) = @_;
3462
3463	CFClient::Binder::open_binding_dialog (sub {
3464	my ($mod, $sym) = @_;
3465	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466	$self->update_binding_widgets;
3467	$self->commit if $commit;
3468	});
3469	}
3470
3471	# $mod and $sym are the modifiers and key symbol
3472	# $cmds is a array ref of strings (the commands)
3473	# $cb is the callback that is executed on OK
3474	# $ccb is the callback that is executed on CANCEL and
3475	# when the binding was unsuccessful on OK
3476	sub set_binding {
3477	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479	$self->clear_command_list;
3480	$self->{recording} = 0;
3481	$self->{rec_btn}->set_text ("start recording");
3482
3483	$self->{binding} = [$mod, $sym];
3484	$self->{commands} = $cmds;
3485
3486	$self->{binding_change} = $cb;
3487	$self->{binding_cancel} = $ccb;
3488
3489	$self->update_binding_widgets;
3490	}
3491
3492	# this is a shortcut method that asks for a binding
3493	# and then just binds it.
3494	sub do_quick_binding {
3495	my ($self, $cmds) = @_;
3496	$self->set_binding (undef, undef, $cmds, sub {
3497	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498	});
3499	$self->ask_for_bind (1);
3500	}
3501
3502	sub update_binding_widgets {
3503	my ($self) = @_;
3504	my ($mod, $sym, $cmds) = $self->get_binding;
3505	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506	$self->set_command_list ($cmds);
3507	}
3508
3509	sub get_binding {
3510	my ($self) = @_;
3511	return (
3512	$self->{binding}->[0],
3513	$self->{binding}->[1],
3514	[ grep { defined $_ } @{$self->{commands}} ]
3515	);
3516	}
3517
3518	sub clear_command_list {
3519	my ($self) = @_;
3520	$self->{cmdbox}->clear ();
3521	}
3522
3523	sub set_command_list {
3524	my ($self, $cmds) = @_;
3525
3526	$self->{cmdbox}->clear ();
3527	$self->{commands} = $cmds;
3528
3529	my $idx = 0;
3530
3531	for (@$cmds) {
3532	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534	my $i = $idx;
3535	$hb->add (new CFClient::UI::Label text => $_);
3536	$hb->add (new CFClient::UI::Button
3537	text => "delete",
3538	tooltip => "Deletes the action from the record",
3539	on_activate => sub {
3540	$self->{cmdbox}->remove ($hb);
3541	$cmds->[$i] = undef;
3542	});
3543
3544
3545	$idx++
3546	}
3547	}
3548
3549	#############################################################################
3550
3551	package CFClient::UI::SpellList;
3552
3553	our @ISA = CFClient::UI::Table::;
3554
3555	sub new {
3556	my $class = shift;
3557
3558	my $self = $class->SUPER::new (
3559	binding => [],
3560	commands => [],
3561	@_,
3562	)
3563	}
3564
3565	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578	sub rebuild_spell_list {
3579	my ($self) = @_;
3580
3581	$CFClient::UI::ROOT->on_refresh ($self => sub {
3582	$self->clear;
3583
3584	return unless $::CONN;
3585
3586	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592	my $row = 0;
3593
3594	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595	my $spell = $self->{spell}{$_};
3596
3597	$row++;
3598
3599	my $spell_cb = sub {
3600	my ($widget, $ev) = @_;
3601
3602	if ($ev->{button} == 1) {
3603	$::CONN->user_send ("cast $spell->{name}");
3604	} elsif ($ev->{button} == 2) {
3605	$::CONN->user_send ("invoke $spell->{name}");
3606	} elsif ($ev->{button} == 3) {
3607	(new CFClient::UI::Menu
3608	items => [
3609	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611	],
3612	)->popup ($ev);
3613	} else {
3614	return 0;
3615	}
3616
3617	1
3618	};
3619
3620	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622	#TODO: add path info to tooltip
3623	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625	$self->add (0, $row, new CFClient::UI::Face
3626	face => $spell->{face},
3627	can_hover => 1,
3628	can_events => 1,
3629	tooltip => $tooltip,
3630	on_button_down => $spell_cb,
3631	);
3632
3633	$self->add (1, $row, new CFClient::UI::Label
3634	expand => 1,
3635	text => $spell->{name},
3636	can_hover => 1,
3637	can_events => 1,
3638	tooltip => $tooltip,
3639	on_button_down => $spell_cb,
3640	);
3641
3642	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646	}
3647	});
3648	}
3649
3650	sub add_spell {
3651	my ($self, $spell) = @_;
3652
3653	$self->{spell}->{$spell->{name}} = $spell;
3654	$self->rebuild_spell_list;
3655	}
3656
3657	sub remove_spell {
3658	my ($self, $spell) = @_;
3659
3660	delete $self->{spell}->{$spell->{name}};
3661	$self->rebuild_spell_list;
3662	}
3663
3664	sub clear_spells {
3665	my ($self) = @_;
3666
3667	$self->{spell} = {};
3668	$self->rebuild_spell_list;
3669	}
3670
3671	#############################################################################
3672
3673	package CFClient::UI::Root;	3795	package CFPlus::UI::Root;
3674		3796
3675	our @ISA = CFClient::UI::Container::;	3797	our @ISA = CFPlus::UI::Container::;
3676		3798
3677	use List::Util qw(min max);	3799	use List::Util qw(min max);
3678		3800
3679	use CFClient::OpenGL;	3801	use CFPlus::OpenGL;
3680		3802
3681	sub new {	3803	sub new {
3682	my $class = shift;	3804	my $class = shift;
3683		3805
3684	my $self = $class->SUPER::new (	3806	my $self = $class->SUPER::new (
3685	visible => 1,	3807	visible => 1,
3686	@_,	3808	@_,
3687	);	3809	);
3688		3810
3689	Scalar::Util::weaken ($self->{root} = $self);	3811	CFPlus::weaken ($self->{root} = $self);
3690		3812
3691	$self	3813	$self
3692	}	3814	}
3693		3815
3694	sub size_request {	3816	sub size_request {
…		…
3709	$coord = $max - $size if $coord > $max - $size;	3831	$coord = $max - $size if $coord > $max - $size;
3710		3832
3711	int $coord + 0.5	3833	int $coord + 0.5
3712	}	3834	}
3713		3835
3714	sub size_allocate {	3836	sub invoke_size_allocate {
3715	my ($self, $w, $h) = @_;	3837	my ($self, $w, $h) = @_;
3716		3838
3717	for my $child ($self->children) {	3839	for my $child ($self->children) {
3718	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)};
3719		3841
…		…
3723	$X = _to_pixel $X, $W, $self->{w};	3845	$X = _to_pixel $X, $W, $self->{w};
3724	$Y = _to_pixel $Y, $H, $self->{h};	3846	$Y = _to_pixel $Y, $H, $self->{h};
3725		3847
3726	$child->configure ($X, $Y, $W, $H);	3848	$child->configure ($X, $Y, $W, $H);
3727	}	3849	}
		3850
		3851	1
3728	}	3852	}
3729		3853
3730	sub coord2local {	3854	sub coord2local {
3731	my ($self, $x, $y) = @_;	3855	my ($self, $x, $y) = @_;
3732		3856
…		…
3858	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3982	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3859		3983
3860	$w = 0 if $w < 0;	3984	$w = 0 if $w < 0;
3861	$h = 0 if $h < 0;	3985	$h = 0 if $h < 0;
3862		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
3863	$w = int $w + 0.5;	3996	$w = int $w + 0.5;
3864	$h = int $h + 0.5;	3997	$h = int $h + 0.5;
3865		3998
3866	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}) {
3867	$widget->{old_w} = $widget->{w};	4000	$widget->{old_w} = $widget->{w};
…		…
3890	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4023	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3891	glMatrixMode GL_MODELVIEW;	4024	glMatrixMode GL_MODELVIEW;
3892	glLoadIdentity;	4025	glLoadIdentity;
3893		4026
3894	{	4027	{
3895	package CFClient::UI::Base;	4028	package CFPlus::UI::Base;
3896		4029
3897	($draw_x, $draw_y, $draw_w, $draw_h) =	4030	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3898	(0, 0, $self->{w}, $self->{h});	4031	(0, 0, $self->{w}, $self->{h});
3899	}
3900		4032
3901	$self->_draw;	4033	$self->_draw;
		4034	}
3902	}	4035	}
3903		4036
3904	#############################################################################	4037	#############################################################################
3905		4038
3906	package CFClient::UI;	4039	package CFPlus::UI;
3907		4040
3908	$ROOT = new CFClient::UI::Root;	4041	$ROOT = new CFPlus::UI::Root;
3909	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4042	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3910		4043
3911	1	4044	1
3912		4045

Diff Legend

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