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.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.376 by root, Mon Jul 16 20:20:23 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->emit ("focus_out");	316	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	317	$self->emit (visibility_change => 0);
288	}	318	}
…		…
290	sub set_visibility {	320	sub set_visibility {
291	my ($self, $visible) = @_;	321	my ($self, $visible) = @_;
292		322
293	return if $self->{visible} == $visible;	323	return if $self->{visible} == $visible;
294		324
295	$visible ? $self->hide	325	$visible ? $self->show
296	: $self->show;	326	: $self->hide;
297	}	327	}
298		328
299	sub toggle_visibility {	329	sub toggle_visibility {
300	my ($self) = @_;	330	my ($self) = @_;
301		331
…		…
335	sub size_request {	365	sub size_request {
336	require Carp;	366	require Carp;
337	Carp::confess "size_request is abstract";	367	Carp::confess "size_request is abstract";
338	}	368	}
339		369
		370	sub baseline_shift {
		371	0
		372	}
		373
340	sub configure {	374	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	375	my ($self, $x, $y, $w, $h) = @_;
342		376
343	if ($self->{aspect}) {	377	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	378	my ($ow, $oh) = ($w, $h);
345		379
346	$w = List::Util::min $w, int $h * $self->{aspect};	380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347	$h = List::Util::min $h, int $w / $self->{aspect};	381	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348		382
349	# use alignment to adjust x, y	383	# use alignment to adjust x, y
350		384
351	$x += int 0.5 * ($ow - $w);	385	$x += int 0.5 * ($ow - $w);
352	$y += int 0.5 * ($oh - $h);	386	$y += int 0.5 * ($oh - $h);
…		…
393		427
394	return if $self->{tooltip} eq $tooltip;	428	return if $self->{tooltip} eq $tooltip;
395		429
396	$self->{tooltip} = $tooltip;	430	$self->{tooltip} = $tooltip;
397		431
398	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399	delete $CFClient::UI::TOOLTIP->{owner};	433	delete $CFPlus::UI::TOOLTIP->{owner};
400	$CFClient::UI::TOOLTIP_WATCHER->cb->();	434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
401	}	435	}
402	}	436	}
403		437
404	# translate global coordinates to local coordinate system	438	# translate global coordinates to local coordinate system
405	sub coord2local {	439	sub coord2local {
406	my ($self, $x, $y) = @_;	440	my ($self, $x, $y) = @_;
407		441
		442	Carp::confess unless $self->{parent};#d#
		443
408	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	444	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409	}	445	}
410		446
411	# translate local coordinates to global coordinate system	447	# translate local coordinates to global coordinate system
412	sub coord2global {	448	sub coord2global {
413	my ($self, $x, $y) = @_;	449	my ($self, $x, $y) = @_;
414		450
		451	Carp::confess unless $self->{parent};#d#
		452
415	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416	}	454	}
417		455
418	sub invoke_focus_in {	456	sub invoke_focus_in {
419	my ($self) = @_;	457	my ($self) = @_;
420		458
421	return if $FOCUS == $self;	459	return if $FOCUS == $self;
422	return unless $self->{can_focus};	460	return unless $self->{can_focus};
423		461
424	my $focus = $FOCUS; $FOCUS = $self;	462	$FOCUS = $self;
425		463
426	$focus->update if $focus;	464	$self->update;
427	$FOCUS->update;
428		465
429	0	466	0
430	}	467	}
431		468
432	sub invoke_focus_out {	469	sub invoke_focus_out {
433	my ($self) = @_;	470	my ($self) = @_;
434		471
435	return unless $FOCUS == $self;	472	return unless $FOCUS == $self;
436		473
437	my $focus = $FOCUS; undef $FOCUS;	474	undef $FOCUS;
438		475
439	$focus->update if $focus; #?	476	$self->update;
440		477
441	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	478	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442	unless $FOCUS;	479	unless $FOCUS;
443		480
444	0	481	0
445	}	482	}
446		483
447	sub grab_focus {	484	sub grab_focus {
448	my ($self) = @_;	485	my ($self) = @_;
449		486
		487	$FOCUS->emit ("focus_out") if $FOCUS;
450	$self->emit ("focus_in");	488	$self->emit ("focus_in");
451	}	489	}
452		490
453	sub invoke_mouse_motion { 1 }	491	sub invoke_mouse_motion { 0 }
454	sub invoke_button_up { 1 }	492	sub invoke_button_up { 0 }
455	sub invoke_key_down { 1 }	493	sub invoke_key_down { 0 }
456	sub invoke_key_up { 1 }	494	sub invoke_key_up { 0 }
		495	sub invoke_mouse_wheel { 0 }
457		496
458	sub invoke_button_down {	497	sub invoke_button_down {
459	my ($self, $ev, $x, $y) = @_;	498	my ($self, $ev, $x, $y) = @_;
460		499
461	$self->grab_focus;	500	$self->grab_focus;
462		501
463	1	502	0
464	}	503	}
465		504
466	sub connect {	505	sub connect {
467	my ($self, $signal, $cb) = @_;	506	my ($self, $signal, $cb) = @_;
468		507
469	push @{ $self->{signal_cb}{$signal} }, $cb;	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	}
470	}	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	);
471		528
472	sub emit {	529	sub emit {
473	my ($self, $signal, @args) = @_;	530	my ($self, $signal, @args) = @_;
474		531
475	#d##TODO# stop propagating at first true, do not use sum	532	# I do not really like this solution, but I do not like duplication
476	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	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
477	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	543	($self->can ("invoke_$signal") || sub { 1 }), # closure
		544	) {
		545	return $cb->($self, @args, @append) || next;
		546	}
		547
		548	# parent
478	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
479	}	550	}
480		551
481	sub find_widget {	552	sub find_widget {
482	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
483		554
…		…
491	}	562	}
492		563
493	sub set_parent {	564	sub set_parent {
494	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
495		566
496	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
497	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
498	}	569	}
499		570
500	sub realloc {	571	sub realloc {
501	my ($self) = @_;	572	my ($self) = @_;
…		…
535	return unless $self->{h} && $self->{w};	606	return unless $self->{h} && $self->{w};
536		607
537	# update screen rectangle	608	# update screen rectangle
538	local $draw_x = $draw_x + $self->{x};	609	local $draw_x = $draw_x + $self->{x};
539	local $draw_y = $draw_y + $self->{y};	610	local $draw_y = $draw_y + $self->{y};
540	local $draw_w = $draw_x + $self->{w};
541	local $draw_h = $draw_y + $self->{h};
542		611
543	# skip widgets that are entirely outside the drawing area	612	# skip widgets that are entirely outside the drawing area
544	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	613	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	614	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546		615
…		…
569	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
570	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
571	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
572	glEnd;	641	glEnd;
573	glPopMatrix;	642	glPopMatrix;
574	#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;
575	}	644	}
576		645
577	$self->_draw;	646	$self->_draw;
578	glPopMatrix;	647	glPopMatrix;
579	}	648	}
…		…
582	my ($self) = @_;	651	my ($self) = @_;
583		652
584	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
585	}	654	}
586		655
		656	my $cntx;#d#
587	sub DESTROY {	657	sub DESTROY {
588	my ($self) = @_;	658	my ($self) = @_;
589		659
590	delete $WIDGET{$self+0};	660	return if CFPlus::in_destruct;
591		661
592	eval { $self->destroy };	662	eval { $self->destroy };
593	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};
594	}	666	}
595		667
596	#############################################################################	668	#############################################################################
597		669
598	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
599		671
600	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
601		673
602	use strict;	674	use strict;
603	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
604		676
605	sub new {	677	sub new {
606	my $class = shift;	678	my $class = shift;
607		679
608	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
639	}	711	}
640	}	712	}
641		713
642	#############################################################################	714	#############################################################################
643		715
644	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
645		717
646	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
647		719
648	sub new {	720	sub new {
649	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
650	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
651	}	723	}
…		…
658		730
659	sub draw { }	731	sub draw { }
660		732
661	#############################################################################	733	#############################################################################
662		734
663	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
664		736
665	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
666		738
667	sub new {	739	sub new {
668	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
669		741
670	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
679	if $children;	751	if $children;
680		752
681	$self	753	$self
682	}	754	}
683		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
684	sub add {	764	sub add {
685	my ($self, @widgets) = @_;	765	my ($self, @widgets) = @_;
686		766
687	$_->set_parent ($self)	767	$_->set_parent ($self)
688	for @widgets;	768	for @widgets;
…		…
748	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
749	}	829	}
750		830
751	#############################################################################	831	#############################################################################
752		832
753	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
754		834
755	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
756		836
757	sub new {	837	sub new {
758	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
759		839
760	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
761		841
762	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
763	}	843	}
764		844
765	sub add {	845	sub add {
…		…
772	sub remove {	852	sub remove {
773	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
774		854
775	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
776		856
777	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
778	unless @{$self->{children}};	858	unless @{$self->{children}};
779	}	859	}
780		860
781	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
782		862
…		…
794		874
795	#############################################################################	875	#############################################################################
796		876
797	# back-buffered drawing area	877	# back-buffered drawing area
798		878
799	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
800		880
801	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
802		882
803	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
804		884
805	sub new {	885	sub new {
806	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
807		887
808	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
830	}	910	}
831		911
832	sub render_child {	912	sub render_child {
833	my ($self) = @_;	913	my ($self) = @_;
834		914
835	$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 {
836	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
837	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
838		918
839	{	919	{
840	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
841		921
842	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
843	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
844	}	926	}
845
846	$self->_render;
847	};	927	};
848	}	928	}
849		929
850	sub _draw {	930	sub _draw {
851	my ($self) = @_;	931	my ($self) = @_;
852
853	my ($w, $h) = @$self{qw(w h)};
854		932
855	my $tex = $self->{texture}	933	my $tex = $self->{texture}
856	or return;	934	or return;
857		935
858	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
861		939
862	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
863		941
864	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
865	}	943	}
866		944
867	#############################################################################	945	#############################################################################
868		946
869	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
870		948
		949	use List::Util qw(min max);
		950
871	our @ISA = CFClient::UI::Window::;	951	our @ISA = CFPlus::UI::Window::;
872		952
873	sub new {	953	sub new {
874	my $class = shift;	954	my $class = shift;
875		955
876	$class->SUPER::new (	956	$class->SUPER::new (
…		…
906	}	986	}
907		987
908	sub set_offset {	988	sub set_offset {
909	my ($self, $x, $y) = @_;	989	my ($self, $x, $y) = @_;
910		990
911	$self->{view_x} = int $x;	991	$self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
912	$self->{view_y} = int $y;	992	$self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
913		993
		994	$self->emit (changed => $self->{view_x}, $self->{view_y});
914	$self->update;	995	$self->update;
915	}	996	}
916		997
917	# hmm, this does not work for topleft of $self... but we should not ask for that	998	# hmm, this does not work for topleft of $self... but we should not ask for that
918	sub coord2local {	999	sub coord2local {
…		…
936	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1017	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1018	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
938	) {	1019	) {
939	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1020	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940	} else {	1021	} else {
941	$self->CFClient::UI::Base::find_widget ($x, $y)	1022	$self->CFPlus::UI::Base::find_widget ($x, $y)
942	}	1023	}
943	}	1024	}
944		1025
945	sub _render {	1026	sub _render {
946	my ($self) = @_;	1027	my ($self) = @_;
947		1028
948	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1029	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
949	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1030	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950		1031
951	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1032	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952		1033
953	$self->SUPER::_render;	1034	$self->SUPER::_render;
954	}	1035	}
955		1036
956	#############################################################################	1037	#############################################################################
957		1038
958	package CFClient::UI::ScrolledWindow;	1039	package CFPlus::UI::ScrolledWindow;
959		1040
960	our @ISA = CFClient::UI::HBox::;	1041	our @ISA = CFPlus::UI::Table::;
961		1042
962	sub new {	1043	sub new {
963	my ($class, %arg) = @_;	1044	my ($class, %arg) = @_;
964		1045
965	my $child = delete $arg{child};	1046	my $child = delete $arg{child};
966		1047
967	my $self;	1048	my $self;
968		1049
969	my $slider = new CFClient::UI::Slider	1050	my $hslider = new CFPlus::UI::Slider
		1051	vertical => 0,
		1052	range => [0, 0, 1, 0.01], # HACK fix
		1053	on_changed => sub {
		1054	$self->{hpos} = $_[1];
		1055	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1056	},
		1057	;
		1058
		1059	my $vslider = new CFPlus::UI::Slider
970	vertical => 1,	1060	vertical => 1,
971	range => [0, 0, 1, 0.01], # HACK fix	1061	range => [0, 0, 1, 0.01], # HACK fix
972	on_changed => sub {	1062	on_changed => sub {
973	$self->{vp}->set_offset (0, $_[1]);	1063	$self->{vpos} = $_[1];
		1064	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
974	},	1065	},
975	;	1066	;
976		1067
977	$self = $class->SUPER::new (	1068	$self = $class->SUPER::new (
978	vp => (new CFClient::UI::ViewPort expand => 1),	1069	scroll_x => 0,
		1070	scroll_y => 1,
		1071	can_events => 1,
979	slider => $slider,	1072	hslider => $hslider,
		1073	vslider => $vslider,
		1074	col_expand => [1, 0],
		1075	row_expand => [1, 0],
980	%arg,	1076	%arg,
981	);	1077	);
982		1078
		1079	$self->{vp} = new CFPlus::UI::ViewPort
		1080	expand => 1,
		1081	scroll_x => $self->{scroll_x},
		1082	scroll_y => $self->{scroll_y},
		1083	on_changed => sub {
		1084	my ($vp, $x, $y) = @_;
		1085	$vp->{parent}{hslider}->set_value ($x);
		1086	$vp->{parent}{vslider}->set_value ($y);
		1087
		1088	0
		1089	},
		1090	;
		1091
983	$self->SUPER::add ($self->{vp}, $self->{slider});	1092	$self->SUPER::add (0, 0, $self->{vp});
		1093
984	$self->add ($child) if $child;	1094	$self->add ($child) if $child;
985		1095
986	$self	1096	$self
987	}	1097	}
		1098
		1099	#TODO# update range on size_allocate depending on child
988		1100
989	sub add {	1101	sub add {
990	my ($self, $widget) = @_;	1102	my ($self, $widget) = @_;
991		1103
992	$self->{vp}->add ($self->{child} = $widget);	1104	$self->{vp}->add ($self->{child} = $widget);
993	}	1105	}
994		1106
		1107	sub update_slider {
		1108	my ($self) = @_;
		1109
		1110	my $child = ($self->{vp} or return)->child;
		1111
		1112	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1113	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1114
		1115	my $visible = $w1 > $w2;
		1116	if ($visible != $self->{hslider}{visible}) {
		1117	$visible ? $self->SUPER::add (0, 1, $self->{hslider})
		1118	: $self->{hslider}->hide;
		1119	}
		1120
		1121	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1122	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1123
		1124	my $visible = $h1 > $h2;
		1125	if ($visible != $self->{vslider}{visible}) {
		1126	$visible ? $self->SUPER::add (1, 0, $self->{vslider})
		1127	: $self->{vslider}->hide;
		1128	}
		1129	}
		1130
995	sub update {	1131	sub update {
996	my ($self) = @_;	1132	my ($self) = @_;
997		1133
998	$self->SUPER::update;	1134	$self->SUPER::update;
		1135	$self->update_slider;
		1136	}
999		1137
1000	# todo: overwrite size_allocate of child	1138	sub invoke_mouse_wheel {
1001	my $child = $self->{vp}->child;	1139	my ($self, $ev) = @_;
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1140
		1141	return 0 unless $ev->{dy}; # only vertical movements for now
		1142
		1143	$self->{vslider}->emit (mouse_wheel => $ev);
		1144
		1145	1
		1146	}
		1147
		1148	sub invoke_button_down {
		1149	my ($self, $ev, $x, $y) = @_;
		1150
		1151	if ($ev->{button} == 2) {
		1152	$self->grab_focus;
		1153
		1154	my $ox = $self->{vp}{view_x} + $ev->{x};
		1155	my $oy = $self->{vp}{view_y} + $ev->{y};
		1156
		1157	$self->{motion} = sub {
		1158	my ($ev, $x, $y) = @_;
		1159
		1160	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1161	$self->update;
		1162	};
		1163
		1164	return 1;
		1165	}
		1166
		1167	0
		1168	}
		1169
		1170	sub invoke_button_up {
		1171	my ($self, $ev, $x, $y) = @_;
		1172
		1173	if (delete $self->{motion}) {
		1174	return 1;
		1175	}
		1176
		1177	0
		1178	}
		1179
		1180	sub invoke_mouse_motion {
		1181	my ($self, $ev, $x, $y) = @_;
		1182
		1183	if ($self->{motion}) {
		1184	$self->{motion}->($ev, $x, $y);
		1185	return 1;
		1186	}
		1187
		1188	0
1003	}	1189	}
1004		1190
1005	sub invoke_size_allocate {	1191	sub invoke_size_allocate {
1006	my ($self, $w, $h) = @_;	1192	my ($self, $w, $h) = @_;
1007		1193
1008	my $child = $self->{vp}->child;	1194	$self->update_slider;
1009	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011	$self->SUPER::invoke_size_allocate ($w, $h)	1195	$self->SUPER::invoke_size_allocate ($w, $h)
1012	}	1196	}
1013		1197
1014	#TODO# update range on size_allocate depending on child
1015	# update viewport offset on scroll
1016
1017	#############################################################################	1198	#############################################################################
1018		1199
1019	package CFClient::UI::Frame;	1200	package CFPlus::UI::Frame;
1020		1201
1021	our @ISA = CFClient::UI::Bin::;	1202	our @ISA = CFPlus::UI::Bin::;
1022		1203
1023	use CFClient::OpenGL;	1204	use CFPlus::OpenGL;
1024		1205
1025	sub new {	1206	sub new {
1026	my $class = shift;	1207	my $class = shift;
1027		1208
1028	$class->SUPER::new (	1209	$class->SUPER::new (
…		…
1054	$self->SUPER::_draw;	1235	$self->SUPER::_draw;
1055	}	1236	}
1056		1237
1057	#############################################################################	1238	#############################################################################
1058		1239
1059	package CFClient::UI::FancyFrame;	1240	package CFPlus::UI::FancyFrame;
1060		1241
1061	our @ISA = CFClient::UI::Bin::;	1242	our @ISA = CFPlus::UI::Bin::;
1062		1243
1063	use CFClient::OpenGL;	1244	use CFPlus::OpenGL;
		1245
		1246	sub new {
		1247	my ($class, %arg) = @_;
		1248
		1249	if ((exists $arg{label}) && !ref $arg{label}) {
		1250	$arg{label} = new CFPlus::UI::Label
		1251	align => 1,
		1252	valign => 0,
		1253	text => $arg{label},
		1254	fontsize => ($arg{border} || 0.8) * 0.75;
		1255	}
		1256
		1257	my $self = $class->SUPER::new (
		1258	# label => "",
		1259	fg => [0.6, 0.3, 0.1],
		1260	border => 0.8,
		1261	style => 'single',
		1262	%arg,
		1263	);
		1264
		1265	$self
		1266	}
		1267
		1268	sub add {
		1269	my ($self, @widgets) = @_;
		1270
		1271	$self->SUPER::add (@widgets);
		1272	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1273	}
		1274
		1275	sub border {
		1276	int $_[0]{border} * $::FONTSIZE
		1277	}
		1278
		1279	sub size_request {
		1280	my ($self) = @_;
		1281
		1282	($self->{label_w}, undef) = $self->{label}->size_request
		1283	if $self->{label};
		1284
		1285	my ($w, $h) = $self->SUPER::size_request;
		1286
		1287	(
		1288	$w + $self->border * 2,
		1289	$h + $self->border * 2,
		1290	)
		1291	}
		1292
		1293	sub invoke_size_allocate {
		1294	my ($self, $w, $h) = @_;
		1295
		1296	my $border = $self->border;
		1297
		1298	$w -= List::Util::max 0, $border * 2;
		1299	$h -= List::Util::max 0, $border * 2;
		1300
		1301	if (my $label = $self->{label}) {
		1302	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1303	$label->{h} = List::Util::min $h, $border;
		1304	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1305	}
		1306
		1307	$self->child->configure ($border, $border, $w, $h);
		1308
		1309	1
		1310	}
		1311
		1312	sub _draw {
		1313	my ($self) = @_;
		1314
		1315	my $child = $self->{children}[0];
		1316
		1317	my $border = $self->border;
		1318	my ($w, $h) = ($self->{w}, $self->{h});
		1319
		1320	$child->draw;
		1321
		1322	glColor @{$self->{fg}};
		1323	glBegin GL_LINE_STRIP;
		1324	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1325	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1326	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1327	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1328	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1329	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1330	glEnd;
		1331
		1332	if ($self->{label}) {
		1333	glTranslate $border * 2, 0;
		1334	$self->{label}->_draw;
		1335	}
		1336	}
		1337
		1338	#############################################################################
		1339
		1340	package CFPlus::UI::Toplevel;
		1341
		1342	our @ISA = CFPlus::UI::Bin::;
		1343
		1344	use CFPlus::OpenGL;
1064		1345
1065	my $bg =	1346	my $bg =
1066	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1347	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067	mipmap => 1, wrap => 1;	1348	mipmap => 1, wrap => 1;
1068		1349
1069	my @border =	1350	my @border =
1070	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1351	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1071	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1352	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072		1353
1073	sub new {	1354	sub new {
1074	my ($class, %arg) = @_;	1355	my ($class, %arg) = @_;
1075		1356
1076	my $self = $class->SUPER::new (	1357	my $self = $class->SUPER::new (
1077	bg => [1, 1, 1, 1],	1358	bg => [1, 1, 1, 1],
1078	border_bg => [1, 1, 1, 1],	1359	border_bg => [1, 1, 1, 1],
1079	border => 0.6,	1360	border => 0.6,
1080	can_events => 1,	1361	can_events => 1,
1081	min_w => 16,	1362	min_w => 64,
1082	min_h => 16,	1363	min_h => 32,
1083	%arg,	1364	%arg,
1084	);	1365	);
1085		1366
1086	$self->{title_widget} = new CFClient::UI::Label	1367	$self->{title_widget} = new CFPlus::UI::Label
1087	align => 0,	1368	align => 0,
1088	valign => 1,	1369	valign => 1,
1089	text => $self->{title},	1370	text => $self->{title},
1090	fontsize => $self->{border},	1371	fontsize => $self->{border},
1091	if exists $self->{title};	1372	if exists $self->{title};
1092		1373
1093	if ($self->{has_close_button}) {	1374	if ($self->{has_close_button}) {
1094	$self->{close_button} =	1375	$self->{close_button} =
1095	new CFClient::UI::ImageButton	1376	new CFPlus::UI::ImageButton
1096	image => 'x1_close.png',	1377	path => 'x1_close.png',
1097	on_activate => sub { $self->hide };	1378	on_activate => sub { $self->emit ("delete") };
1098		1379
1099	$self->CFClient::UI::Container::add ($self->{close_button});	1380	$self->CFPlus::UI::Container::add ($self->{close_button});
1100	}	1381	}
1101		1382
1102	$self	1383	$self
1103	}	1384	}
1104		1385
1105	sub add {	1386	sub add {
1106	my ($self, @widgets) = @_;	1387	my ($self, @widgets) = @_;
1107		1388
1108	$self->SUPER::add (@widgets);	1389	$self->SUPER::add (@widgets);
1109	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1390	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1110	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1391	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1111	}	1392	}
1112		1393
1113	sub border {	1394	sub border {
1114	int $_[0]{border} * $::FONTSIZE	1395	int $_[0]{border} * $::FONTSIZE
1115	}	1396	}
…		…
1148	$self->child->configure ($border, $border, $w, $h);	1429	$self->child->configure ($border, $border, $w, $h);
1149		1430
1150	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1431	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151	if $self->{close_button};	1432	if $self->{close_button};
1152		1433
		1434	1
		1435	}
		1436
		1437	sub invoke_delete {
		1438	my ($self) = @_;
		1439
		1440	$self->hide;
		1441
1153	1	1442	1
1154	}	1443	}
1155		1444
1156	sub invoke_button_down {	1445	sub invoke_button_down {
1157	my ($self, $ev, $x, $y) = @_;	1446	my ($self, $ev, $x, $y) = @_;
…		…
1215	$self->{motion}->($ev, $x, $y) if $self->{motion};	1504	$self->{motion}->($ev, $x, $y) if $self->{motion};
1216		1505
1217	! ! $self->{motion}	1506	! ! $self->{motion}
1218	}	1507	}
1219		1508
		1509	sub invoke_visibility_change {
		1510	my ($self, $visible) = @_;
		1511
		1512	delete $self->{motion} unless $visible;
		1513
		1514	0
		1515	}
		1516
1220	sub _draw {	1517	sub _draw {
1221	my ($self) = @_;	1518	my ($self) = @_;
1222		1519
1223	my $child = $self->{children}[0];	1520	my $child = $self->{children}[0];
1224		1521
…		…
1261	if $self->{close_button};	1558	if $self->{close_button};
1262	}	1559	}
1263		1560
1264	#############################################################################	1561	#############################################################################
1265		1562
1266	package CFClient::UI::Table;	1563	package CFPlus::UI::Table;
1267		1564
1268	our @ISA = CFClient::UI::Base::;	1565	our @ISA = CFPlus::UI::Base::;
1269		1566
1270	use List::Util qw(max sum);	1567	use List::Util qw(max sum);
1271		1568
1272	use CFClient::OpenGL;	1569	use CFPlus::OpenGL;
1273		1570
1274	sub new {	1571	sub new {
1275	my $class = shift;	1572	my $class = shift;
1276		1573
1277	$class->SUPER::new (	1574	$class->SUPER::new (
		1575	children => [],
1278	col_expand => [],	1576	col_expand => [],
		1577	row_expand => [],
1279	@_,	1578	@_,
1280	)	1579	)
1281	}	1580	}
1282		1581
1283	sub children {	1582	sub children {
1284	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1583	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285	}	1584	}
1286		1585
		1586	# TODO: store row/col info in child widget and use standard add/del
1287	sub add {	1587	sub add {
1288	my ($self, $x, $y, $child) = @_;	1588	my ($self) = shift;
1289		1589
		1590	while (@_) {
		1591	my ($x, $y, $child) = splice @_, 0, 3, ();
1290	$child->set_parent ($self);	1592	$child->set_parent ($self);
1291	$self->{children}[$y][$x] = $child;	1593	$self->{children}[$y][$x] = $child;
		1594	}
1292		1595
		1596	$self->{force_realloc} = 1;
		1597	$self->{force_size_alloc} = 1;
1293	$self->realloc;	1598	$self->realloc;
1294	}	1599	}
1295		1600
1296	sub remove {	1601	sub remove {
1297	my ($self, $child) = @_;	1602	my ($self, $child) = @_;
1298		1603
1299	# TODO: not yet implemented	1604	for (@{ $self->{children} }) {
		1605	for (@{ $_ || [] }) {
		1606	$_ = undef if $_ == $child;
		1607	}
		1608	}
1300	}	1609	}
1301		1610
1302	# TODO: move to container class maybe? send children a signal on removal?	1611	# TODO: move to container class maybe? send children a signal on removal?
1303	sub clear {	1612	sub clear {
1304	my ($self) = @_;	1613	my ($self) = @_;
…		…
1353	my ($ws, $hs) = $self->get_wh;	1662	my ($ws, $hs) = $self->get_wh;
1354		1663
1355	my $req_w = (sum @$ws) || 1;	1664	my $req_w = (sum @$ws) || 1;
1356	my $req_h = (sum @$hs) || 1;	1665	my $req_h = (sum @$hs) || 1;
1357		1666
1358	# TODO: nicer code && do row_expand	1667	# TODO: nicer code
1359	my @col_expand = @{$self->{col_expand}};	1668	my @col_expand = @{$self->{col_expand}};
1360	@col_expand = (1) x @$ws unless @col_expand;	1669	@col_expand = (1) x @$ws unless @col_expand;
1361	my $col_expand = (sum @col_expand) || 1;	1670	my $col_expand = (sum @col_expand) || 1;
1362		1671
1363	# linearly scale sizes
1364	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1672	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1365	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1366		1673
1367	CFClient::UI::harmonize $ws;	1674	CFPlus::UI::harmonize $ws;
		1675
		1676	my @row_expand = @{$self->{row_expand}};
		1677	@row_expand = (1) x @$ws unless @row_expand;
		1678	my $row_expand = (sum @row_expand) || 1;
		1679
		1680	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1681
1368	CFClient::UI::harmonize $hs;	1682	CFPlus::UI::harmonize $hs;
1369		1683
1370	my $y;	1684	my $y;
1371		1685
1372	for my $r (0 .. $#{$self->{children}}) {	1686	for my $r (0 .. $#{$self->{children}}) {
1373	my $row = $self->{children}[$r]	1687	my $row = $self->{children}[$r]
…		…
1416	}	1730	}
1417	}	1731	}
1418		1732
1419	#############################################################################	1733	#############################################################################
1420		1734
1421	package CFClient::UI::Box;	1735	package CFPlus::UI::Fixed;
1422		1736
		1737	use List::Util qw(min max);
		1738
1423	our @ISA = CFClient::UI::Container::;	1739	our @ISA = CFPlus::UI::Container::;
		1740
		1741	sub add {
		1742	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1743
		1744	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1745	$self->SUPER::add ($child);
		1746	}
		1747
		1748	sub _scale($$$) {
		1749	my ($mode, $val, $max) = @_;
		1750
		1751	$mode eq "abs" ? $val
		1752	: $mode eq "rel" ? $val * $max
		1753	: 0
		1754	}
		1755
		1756	sub size_request {
		1757	my ($self) = @_;
		1758
		1759	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1760
		1761	# determine overall size by querying abs widgets
		1762	for my $child ($self->visible_children) {
		1763	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1764
		1765	if ($pos eq "abs") {
		1766	$w = _scale $size, $w, $child->{req_w};
		1767	$h = _scale $size, $h, $child->{req_h};
		1768
		1769	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1770	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1771	}
		1772	}
		1773
		1774	my $W = $x2 - $x1;
		1775	my $H = $y2 - $y1;
		1776
		1777	# now layout remaining widgets
		1778	for my $child ($self->visible_children) {
		1779	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1780
		1781	if ($pos ne "abs") {
		1782	$x = _scale $pos, $x, $W;
		1783	$y = _scale $pos, $x, $H;
		1784	$w = _scale $size, $w, $child->{req_w};
		1785	$h = _scale $size, $h, $child->{req_h};
		1786
		1787	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1788	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1789	}
		1790	}
		1791
		1792	my $W = $x2 - $x1;
		1793	my $H = $y2 - $y1;
		1794
		1795	($W, $H)
		1796	}
		1797
		1798	sub invoke_size_allocate {
		1799	my ($self, $W, $H) = @_;
		1800
		1801	for my $child ($self->visible_children) {
		1802	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1803
		1804	$x = _scale $pos, $x, $W;
		1805	$y = _scale $pos, $x, $H;
		1806	$w = _scale $size, $w, $child->{req_w};
		1807	$h = _scale $size, $h, $child->{req_h};
		1808
		1809	$child->configure ($x, $y, $w, $h);
		1810	}
		1811
		1812	1
		1813	}
		1814
		1815	#############################################################################
		1816
		1817	package CFPlus::UI::Box;
		1818
		1819	our @ISA = CFPlus::UI::Container::;
1424		1820
1425	sub size_request {	1821	sub size_request {
1426	my ($self) = @_;	1822	my ($self) = @_;
1427		1823
1428	$self->{vertical}	1824	$self->{vertical}
…		…
1438		1834
1439	sub invoke_size_allocate {	1835	sub invoke_size_allocate {
1440	my ($self, $w, $h) = @_;	1836	my ($self, $w, $h) = @_;
1441		1837
1442	my $space = $self->{vertical} ? $h : $w;	1838	my $space = $self->{vertical} ? $h : $w;
1443	my $children = $self->{children};	1839	my @children = $self->visible_children;
1444		1840
1445	my @req;	1841	my @req;
1446		1842
1447	if ($self->{homogeneous}) {	1843	if ($self->{homogeneous}) {
1448	@req = ($space / (@$children || 1)) x @$children;	1844	@req = ($space / (@children || 1)) x @children;
1449	} else {	1845	} else {
1450	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1846	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1451	my $req = List::Util::sum @req;	1847	my $req = List::Util::sum @req;
1452		1848
1453	if ($req > $space) {	1849	if ($req > $space) {
1454	# ah well, not enough space	1850	# ah well, not enough space
1455	$_ *= $space / $req for @req;	1851	$_ *= $space / $req for @req;
1456	} else {	1852	} else {
1457	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1853	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1458		1854
1459	$space = ($space - $req) / $expand; # remaining space to give away	1855	$space = ($space - $req) / $expand; # remaining space to give away
1460		1856
1461	$req[$_] += $space * $children->[$_]{expand}	1857	$req[$_] += $space * $children[$_]{expand}
1462	for 0 .. $#$children;	1858	for 0 .. $#children;
1463	}	1859	}
1464	}	1860	}
1465		1861
1466	CFClient::UI::harmonize \@req;	1862	CFPlus::UI::harmonize \@req;
1467		1863
1468	my $pos = 0;	1864	my $pos = 0;
1469	for (0 .. $#$children) {	1865	for (0 .. $#children) {
1470	my $alloc = $req[$_];	1866	my $alloc = $req[$_];
1471	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1867	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1472		1868
1473	$pos += $alloc;	1869	$pos += $alloc;
1474	}	1870	}
1475		1871
1476	1	1872	1
1477	}	1873	}
1478		1874
1479	#############################################################################	1875	#############################################################################
1480		1876
1481	package CFClient::UI::HBox;	1877	package CFPlus::UI::HBox;
1482		1878
1483	our @ISA = CFClient::UI::Box::;	1879	our @ISA = CFPlus::UI::Box::;
1484		1880
1485	sub new {	1881	sub new {
1486	my $class = shift;	1882	my $class = shift;
1487		1883
1488	$class->SUPER::new (	1884	$class->SUPER::new (
…		…
1491	)	1887	)
1492	}	1888	}
1493		1889
1494	#############################################################################	1890	#############################################################################
1495		1891
1496	package CFClient::UI::VBox;	1892	package CFPlus::UI::VBox;
1497		1893
1498	our @ISA = CFClient::UI::Box::;	1894	our @ISA = CFPlus::UI::Box::;
1499		1895
1500	sub new {	1896	sub new {
1501	my $class = shift;	1897	my $class = shift;
1502		1898
1503	$class->SUPER::new (	1899	$class->SUPER::new (
…		…
1506	)	1902	)
1507	}	1903	}
1508		1904
1509	#############################################################################	1905	#############################################################################
1510		1906
1511	package CFClient::UI::Label;	1907	package CFPlus::UI::Label;
1512		1908
1513	our @ISA = CFClient::UI::DrawBG::;	1909	our @ISA = CFPlus::UI::DrawBG::;
1514		1910
1515	use CFClient::OpenGL;	1911	use CFPlus::OpenGL;
1516		1912
1517	sub new {	1913	sub new {
1518	my ($class, %arg) = @_;	1914	my ($class, %arg) = @_;
1519		1915
1520	my $self = $class->SUPER::new (	1916	my $self = $class->SUPER::new (
…		…
1523	#active_bg => none	1919	#active_bg => none
1524	#font => default_font	1920	#font => default_font
1525	#text => initial text	1921	#text => initial text
1526	#markup => initial narkup	1922	#markup => initial narkup
1527	#max_w => maximum pixel width	1923	#max_w => maximum pixel width
		1924	#style => 0, # render flags
1528	ellipsise => 3, # end	1925	ellipsise => 3, # end
1529	layout => (new CFClient::Layout),	1926	layout => (new CFPlus::Layout),
1530	fontsize => 1,	1927	fontsize => 1,
1531	align => -1,	1928	align => -1,
1532	valign => -1,	1929	valign => -1,
1533	padding_x => 2,	1930	padding_x => 2,
1534	padding_y => 2,	1931	padding_y => 2,
1535	can_events => 0,	1932	can_events => 0,
1536	%arg	1933	%arg
1537	);	1934	);
1538		1935
1539	if (exists $self->{template}) {	1936	if (exists $self->{template}) {
1540	my $layout = new CFClient::Layout;	1937	my $layout = new CFPlus::Layout;
1541	$layout->set_text (delete $self->{template});	1938	$layout->set_text (delete $self->{template});
1542	$self->{template} = $layout;	1939	$self->{template} = $layout;
1543	}	1940	}
1544		1941
1545	if (exists $self->{markup}) {	1942	if (exists $self->{markup}) {
…		…
1549	}	1946	}
1550		1947
1551	$self	1948	$self
1552	}	1949	}
1553		1950
1554	sub escape($) {
1555	local $_ = $_[0];
1556
1557	s/&/&amp;/g;
1558	s/>/&gt;/g;
1559	s/</&lt;/g;
1560
1561	$_
1562	}
1563
1564	sub update {	1951	sub update {
1565	my ($self) = @_;	1952	my ($self) = @_;
1566		1953
1567	delete $self->{texture};	1954	delete $self->{texture};
1568	$self->SUPER::update;	1955	$self->SUPER::update;
…		…
1579	my ($self, $text) = @_;	1966	my ($self, $text) = @_;
1580		1967
1581	return if $self->{text} eq "T$text";	1968	return if $self->{text} eq "T$text";
1582	$self->{text} = "T$text";	1969	$self->{text} = "T$text";
1583		1970
1584	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585	$self->{layout}->set_text ($text);	1971	$self->{layout}->set_text ($text);
1586		1972
1587	delete $self->{size_req};	1973	delete $self->{size_req};
1588	$self->realloc;	1974	$self->realloc;
1589	$self->update;	1975	$self->update;
…		…
1595	return if $self->{text} eq "M$markup";	1981	return if $self->{text} eq "M$markup";
1596	$self->{text} = "M$markup";	1982	$self->{text} = "M$markup";
1597		1983
1598	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1984	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599		1985
1600	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601	$self->{layout}->set_markup ($markup);	1986	$self->{layout}->set_markup ($markup);
1602		1987
1603	delete $self->{size_req};	1988	delete $self->{size_req};
1604	$self->realloc;	1989	$self->realloc;
1605	$self->update;	1990	$self->update;
…		…
1617		2002
1618	my ($w, $h) = $self->{layout}->size;	2003	my ($w, $h) = $self->{layout}->size;
1619		2004
1620	if (exists $self->{template}) {	2005	if (exists $self->{template}) {
1621	$self->{template}->set_font ($self->{font}) if $self->{font};	2006	$self->{template}->set_font ($self->{font}) if $self->{font};
		2007	$self->{template}->set_width ($self->{max_w} || -1);
1622	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2008	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623		2009
1624	my ($w2, $h2) = $self->{template}->size;	2010	my ($w2, $h2) = $self->{template}->size;
1625		2011
1626	$w = List::Util::max $w, $w2;	2012	$w = List::Util::max $w, $w2;
…		…
1631	};	2017	};
1632		2018
1633	@{ $self->{size_req} }	2019	@{ $self->{size_req} }
1634	}	2020	}
1635		2021
		2022	sub baseline_shift {
		2023	$_[0]{layout}->descent
		2024	}
		2025
1636	sub invoke_size_allocate {	2026	sub invoke_size_allocate {
1637	my ($self, $w, $h) = @_;	2027	my ($self, $w, $h) = @_;
1638		2028
1639	delete $self->{ox};	2029	delete $self->{ox};
1640		2030
…		…
1646		2036
1647	sub set_fontsize {	2037	sub set_fontsize {
1648	my ($self, $fontsize) = @_;	2038	my ($self, $fontsize) = @_;
1649		2039
1650	$self->{fontsize} = $fontsize;	2040	$self->{fontsize} = $fontsize;
		2041	delete $self->{size_req};
1651	delete $self->{texture};	2042	delete $self->{texture};
1652		2043
1653	$self->realloc;	2044	$self->realloc;
1654	}	2045	}
1655		2046
1656	sub reconfigure {	2047	sub reconfigure {
1657	my ($self) = @_;	2048	my ($self) = @_;
1658		2049
1659	delete $self->{size_req};	2050	delete $self->{size_req};
		2051	delete $self->{texture};
1660		2052
1661	$self->SUPER::reconfigure;	2053	$self->SUPER::reconfigure;
1662	}	2054	}
1663		2055
1664	sub _draw {	2056	sub _draw {
1665	my ($self) = @_;	2057	my ($self) = @_;
1666		2058
1667	$self->SUPER::_draw; # draw background, if applicable	2059	$self->SUPER::_draw; # draw background, if applicable
1668		2060
1669	my $tex = $self->{texture} ||= do {	2061	my $size = $self->{texture} ||= do {
1670	$self->{layout}->set_foreground (@{$self->{fg}});	2062	$self->{layout}->set_foreground (@{$self->{fg}});
1671	$self->{layout}->set_font ($self->{font}) if $self->{font};	2063	$self->{layout}->set_font ($self->{font}) if $self->{font};
1672	$self->{layout}->set_width ($self->{w});	2064	$self->{layout}->set_width ($self->{w});
1673	$self->{layout}->set_ellipsise ($self->{ellipsise});	2065	$self->{layout}->set_ellipsise ($self->{ellipsise});
1674	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2066	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2067	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676		2068
1677	new_from_layout CFClient::Texture $self->{layout}	2069	[$self->{layout}->size]
1678	};	2070	};
1679		2071
1680	unless (exists $self->{ox}) {	2072	unless (exists $self->{ox}) {
1681	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2073	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2074	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683	: ($self->{w} - $tex->{w}) * 0.5);	2075	: ($self->{w} - $size->[0]) * 0.5);
1684		2076
1685	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2077	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2078	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687	: ($self->{h} - $tex->{h}) * 0.5);	2079	: ($self->{h} - $size->[1]) * 0.5);
1688	};	2080	};
1689		2081
1690	glEnable GL_TEXTURE_2D;
1691
1692	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2082	my $w = List::Util::min $self->{w} + 4, $size->[0];
1693	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2083	my $h = List::Util::min $self->{h} + 2, $size->[1];
1694		2084
1695	if ($tex->{format} == GL_ALPHA) {	2085	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697	glColor @{$self->{fg}};
1698	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699	} else {
1700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702	}
1703
1704	glDisable GL_TEXTURE_2D;
1705	}	2086	}
1706		2087
1707	#############################################################################	2088	#############################################################################
1708		2089
1709	package CFClient::UI::EntryBase;	2090	package CFPlus::UI::EntryBase;
1710		2091
1711	our @ISA = CFClient::UI::Label::;	2092	our @ISA = CFPlus::UI::Label::;
1712		2093
1713	use CFClient::OpenGL;	2094	use CFPlus::OpenGL;
1714		2095
1715	sub new {	2096	sub new {
1716	my $class = shift;	2097	my $class = shift;
1717		2098
1718	$class->SUPER::new (	2099	$class->SUPER::new (
…		…
1722	active_fg => [0, 0, 0],	2103	active_fg => [0, 0, 0],
1723	can_hover => 1,	2104	can_hover => 1,
1724	can_focus => 1,	2105	can_focus => 1,
1725	valign => 0,	2106	valign => 0,
1726	can_events => 1,	2107	can_events => 1,
		2108	ellipsise => 0,
1727	#text => ...	2109	#text => ...
1728	#hidden => "*",	2110	#hidden => "*",
1729	@_	2111	@_
1730	)	2112	)
1731	}	2113	}
…		…
1776	my $sym = $ev->{sym};	2158	my $sym = $ev->{sym};
1777	my $uni = $ev->{unicode};	2159	my $uni = $ev->{unicode};
1778		2160
1779	my $text = $self->get_text;	2161	my $text = $self->get_text;
1780		2162
		2163	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2164
1781	if ($uni == 8) {	2165	if ($uni == 8) {
1782	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2166	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783	} elsif ($uni == 127) {	2167	} elsif ($uni == 127) {
1784	substr $text, $self->{cursor}, 1, "";	2168	substr $text, $self->{cursor}, 1, "";
1785	} elsif ($sym == CFClient::SDLK_LEFT) {	2169	} elsif ($sym == CFPlus::SDLK_LEFT) {
1786	--$self->{cursor} if $self->{cursor};	2170	--$self->{cursor} if $self->{cursor};
1787	} elsif ($sym == CFClient::SDLK_RIGHT) {	2171	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1788	++$self->{cursor} if $self->{cursor} < length $self->{text};	2172	++$self->{cursor} if $self->{cursor} < length $self->{text};
1789	} elsif ($sym == CFClient::SDLK_HOME) {	2173	} elsif ($sym == CFPlus::SDLK_HOME) {
		2174	# what a hack
		2175	$self->{cursor} =
		2176	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2177	? length $1
		2178	: 0;
		2179	} elsif ($sym == CFPlus::SDLK_END) {
		2180	# uh, again
		2181	$self->{cursor} =
		2182	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2183	? $self->{cursor} + length $1
		2184	: length $self->{text};
		2185	} elsif ($uni == 21) { # ctrl-u
		2186	$text = "";
1790	$self->{cursor} = 0;	2187	$self->{cursor} = 0;
1791	} elsif ($sym == CFClient::SDLK_END) {
1792	$self->{cursor} = length $text;
1793	} elsif ($uni == 27) {	2188	} elsif ($uni == 27) {
1794	$self->emit ('escape');	2189	$self->emit ('escape');
1795	} elsif ($uni) {	2190	} elsif ($uni == 0x0d) {
		2191	substr $text, $self->{cursor}++, 0, "\012";
		2192	} elsif ($uni >= 0x20) {
1796	substr $text, $self->{cursor}++, 0, chr $uni;	2193	substr $text, $self->{cursor}++, 0, chr $uni;
1797	} else {	2194	} else {
1798	return 0;	2195	return 0;
1799	}	2196	}
1800		2197
1801	$self->_set_text ($text);	2198	$self->_set_text ($text);
1802		2199
1803	$self->realloc;	2200	$self->realloc;
		2201	$self->update;
1804		2202
1805	1	2203	1
1806	}	2204	}
1807		2205
1808	sub invoke_focus_in {	2206	sub invoke_focus_in {
…		…
1820		2218
1821	my $idx = $self->{layout}->xy_to_index ($x, $y);	2219	my $idx = $self->{layout}->xy_to_index ($x, $y);
1822		2220
1823	# byte-index to char-index	2221	# byte-index to char-index
1824	my $text = $self->{text};	2222	my $text = $self->{text};
1825	utf8::encode $text;	2223	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826	$self->{cursor} = length substr $text, 0, $idx;	2224	$self->{cursor} = length $text;
1827		2225
1828	$self->_set_text ($self->{text});	2226	$self->_set_text ($self->{text});
1829	$self->update;	2227	$self->update;
1830		2228
1831	1	2229	1
…		…
1870	utf8::encode $text;	2268	utf8::encode $text;
1871		2269
1872	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2270	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873	}	2271	}
1874		2272
1875	glColor @{$self->{fg}};
1876	glBegin GL_LINES;	2273	glBegin GL_LINES;
1877	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2274	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1878	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2275	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879	glEnd;	2276	glEnd;
1880	}	2277	}
1881	}	2278	}
1882		2279
		2280	#############################################################################
		2281
1883	package CFClient::UI::Entry;	2282	package CFPlus::UI::Entry;
1884		2283
1885	our @ISA = CFClient::UI::EntryBase::;	2284	our @ISA = CFPlus::UI::EntryBase::;
1886		2285
1887	use CFClient::OpenGL;	2286	use CFPlus::OpenGL;
1888		2287
1889	sub invoke_key_down {	2288	sub invoke_key_down {
1890	my ($self, $ev) = @_;	2289	my ($self, $ev) = @_;
1891		2290
1892	my $sym = $ev->{sym};	2291	my $sym = $ev->{sym};
1893		2292
1894	if ($sym == 13) {	2293	if ($ev->{uni} == 0x0d || $sym == 13) {
1895	unshift @{$self->{history}},	2294	unshift @{$self->{history}},
1896	my $txt = $self->get_text;	2295	my $txt = $self->get_text;
1897		2296
1898	$self->{history_pointer} = -1;	2297	$self->{history_pointer} = -1;
1899	$self->{history_saveback} = '';	2298	$self->{history_saveback} = '';
1900	$self->emit (activate => $txt);	2299	$self->emit (activate => $txt);
1901	$self->update;	2300	$self->update;
1902		2301
1903	} elsif ($sym == CFClient::SDLK_UP) {	2302	} elsif ($sym == CFPlus::SDLK_UP) {
1904	if ($self->{history_pointer} < 0) {	2303	if ($self->{history_pointer} < 0) {
1905	$self->{history_saveback} = $self->get_text;	2304	$self->{history_saveback} = $self->get_text;
1906	}	2305	}
1907	if (@{$self->{history} || []} > 0) {	2306	if (@{$self->{history} || []} > 0) {
1908	$self->{history_pointer}++;	2307	$self->{history_pointer}++;
…		…
1910	$self->{history_pointer} = @{$self->{history} || []} - 1;	2309	$self->{history_pointer} = @{$self->{history} || []} - 1;
1911	}	2310	}
1912	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2311	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1913	}	2312	}
1914		2313
1915	} elsif ($sym == CFClient::SDLK_DOWN) {	2314	} elsif ($sym == CFPlus::SDLK_DOWN) {
1916	$self->{history_pointer}--;	2315	$self->{history_pointer}--;
1917	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2316	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918		2317
1919	if ($self->{history_pointer} >= 0) {	2318	if ($self->{history_pointer} >= 0) {
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2319	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1929	1	2328	1
1930	}	2329	}
1931		2330
1932	#############################################################################	2331	#############################################################################
1933		2332
		2333	package CFPlus::UI::TextEdit;
		2334
		2335	our @ISA = CFPlus::UI::EntryBase::;
		2336
		2337	use CFPlus::OpenGL;
		2338
		2339	sub move_cursor_ver {
		2340	my ($self, $dy) = @_;
		2341
		2342	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2343
		2344	$y += $dy;
		2345
		2346	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2347	$self->{cursor} = $index;
		2348	delete $self->{cur_h};
		2349	$self->update;
		2350	return;
		2351	}
		2352	}
		2353
		2354	sub invoke_key_down {
		2355	my ($self, $ev) = @_;
		2356
		2357	my $sym = $ev->{sym};
		2358
		2359	if ($sym == CFPlus::SDLK_UP) {
		2360	$self->move_cursor_ver (-1);
		2361	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2362	$self->move_cursor_ver (+1);
		2363	} else {
		2364	return $self->SUPER::invoke_key_down ($ev)
		2365	}
		2366
		2367	1
		2368	}
		2369
		2370	#############################################################################
		2371
1934	package CFClient::UI::Button;	2372	package CFPlus::UI::Button;
1935		2373
1936	our @ISA = CFClient::UI::Label::;	2374	our @ISA = CFPlus::UI::Label::;
1937		2375
1938	use CFClient::OpenGL;	2376	use CFPlus::OpenGL;
1939		2377
1940	my @tex =	2378	my @tex =
1941	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2379	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942	qw(b1_button_active.png);	2380	qw(b1_button_active.png);
1943		2381
1944	sub new {	2382	sub new {
1945	my $class = shift;	2383	my $class = shift;
1946		2384
…		…
1983	$self->SUPER::_draw;	2421	$self->SUPER::_draw;
1984	}	2422	}
1985		2423
1986	#############################################################################	2424	#############################################################################
1987		2425
		2426	package CFPlus::UI::CheckBox;
		2427
		2428	our @ISA = CFPlus::UI::DrawBG::;
		2429
		2430	my @tex =
		2431	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2432	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2433
		2434	use CFPlus::OpenGL;
		2435
		2436	sub new {
		2437	my $class = shift;
		2438
		2439	$class->SUPER::new (
		2440	padding_x => 2,
		2441	padding_y => 2,
		2442	fg => [1, 1, 1],
		2443	active_fg => [1, 1, 0],
		2444	bg => [0, 0, 0, 0.2],
		2445	active_bg => [1, 1, 1, 0.5],
		2446	state => 0,
		2447	can_hover => 1,
		2448	@_
		2449	)
		2450	}
		2451
		2452	sub size_request {
		2453	my ($self) = @_;
		2454
		2455	(6) x 2
		2456	}
		2457
		2458	sub toggle {
		2459	my ($self) = @_;
		2460
		2461	$self->{state} = !$self->{state};
		2462	$self->emit (changed => $self->{state});
		2463	$self->update;
		2464	}
		2465
		2466	sub invoke_button_down {
		2467	my ($self, $ev, $x, $y) = @_;
		2468
		2469	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2470	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2471	$self->toggle;
		2472	} else {
		2473	return 0
		2474	}
		2475
		2476	1
		2477	}
		2478
		2479	sub _draw {
		2480	my ($self) = @_;
		2481
		2482	$self->SUPER::_draw;
		2483
		2484	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2485
		2486	my ($w, $h) = @$self{qw(w h)};
		2487
		2488	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2489
		2490	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2491
		2492	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2493
		2494	glEnable GL_TEXTURE_2D;
		2495	$tex->draw_quad_alpha (0, 0, $s, $s);
		2496	glDisable GL_TEXTURE_2D;
		2497	}
		2498
		2499	#############################################################################
		2500
		2501	package CFPlus::UI::Image;
		2502
		2503	our @ISA = CFPlus::UI::Base::;
		2504
		2505	use CFPlus::OpenGL;
		2506
		2507	our %texture_cache;
		2508
		2509	sub new {
		2510	my $class = shift;
		2511
		2512	my $self = $class->SUPER::new (
		2513	can_events => 0,
		2514	@_,
		2515	);
		2516
		2517	$self->{path} || $self->{tex}
		2518	or Carp::croak "'path' or 'tex' attributes required";
		2519
		2520	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2521	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2522
		2523	CFPlus::weaken $texture_cache{$self->{path}};
		2524
		2525	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2526
		2527	$self
		2528	}
		2529
		2530	sub STORABLE_freeze {
		2531	my ($self, $cloning) = @_;
		2532
		2533	$self->{path}
		2534	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2535
		2536	$self->{path}
		2537	}
		2538
		2539	sub STORABLE_attach {
		2540	my ($self, $cloning, $path) = @_;
		2541
		2542	$self->new (path => $path)
		2543	}
		2544
		2545	sub size_request {
		2546	my ($self) = @_;
		2547
		2548	($self->{tex}{w}, $self->{tex}{h})
		2549	}
		2550
		2551	sub _draw {
		2552	my ($self) = @_;
		2553
		2554	my $tex = $self->{tex};
		2555
		2556	my ($w, $h) = ($self->{w}, $self->{h});
		2557
		2558	if ($self->{rot90}) {
		2559	glRotate 90, 0, 0, 1;
		2560	glTranslate 0, -$self->{w}, 0;
		2561
		2562	($w, $h) = ($h, $w);
		2563	}
		2564
		2565	glEnable GL_TEXTURE_2D;
		2566	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2567
		2568	$tex->draw_quad (0, 0, $w, $h);
		2569
		2570	glDisable GL_TEXTURE_2D;
		2571	}
		2572
		2573	#############################################################################
		2574
1988	package CFClient::UI::ImageButton;	2575	package CFPlus::UI::ImageButton;
1989		2576
1990	our @ISA = CFClient::UI::Image::;	2577	our @ISA = CFPlus::UI::Image::;
1991		2578
1992	use CFClient::OpenGL;	2579	use CFPlus::OpenGL;
1993		2580
1994	my %textures;	2581	my %textures;
1995		2582
1996	sub new {	2583	sub new {
1997	my $class = shift;	2584	my $class = shift;
…		…
2019	1	2606	1
2020	}	2607	}
2021		2608
2022	#############################################################################	2609	#############################################################################
2023		2610
2024	package CFClient::UI::CheckBox;
2025
2026	our @ISA = CFClient::UI::DrawBG::;
2027
2028	my @tex =
2029	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2030	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2031
2032	use CFClient::OpenGL;
2033
2034	sub new {
2035	my $class = shift;
2036
2037	$class->SUPER::new (
2038	padding_x => 2,
2039	padding_y => 2,
2040	fg => [1, 1, 1],
2041	active_fg => [1, 1, 0],
2042	bg => [0, 0, 0, 0.2],
2043	active_bg => [1, 1, 1, 0.5],
2044	state => 0,
2045	can_hover => 1,
2046	@_
2047	)
2048	}
2049
2050	sub size_request {
2051	my ($self) = @_;
2052
2053	(6) x 2
2054	}
2055
2056	sub invoke_button_down {
2057	my ($self, $ev, $x, $y) = @_;
2058
2059	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061	$self->{state} = !$self->{state};
2062	$self->emit (changed => $self->{state});
2063	} else {
2064	return 0
2065	}
2066
2067	1
2068	}
2069
2070	sub _draw {
2071	my ($self) = @_;
2072
2073	$self->SUPER::_draw;
2074
2075	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2076
2077	my ($w, $h) = @$self{qw(w h)};
2078
2079	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2080
2081	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2082
2083	my $tex = $self->{state} ? $tex[1] : $tex[0];
2084
2085	glEnable GL_TEXTURE_2D;
2086	$tex->draw_quad_alpha (0, 0, $s, $s);
2087	glDisable GL_TEXTURE_2D;
2088	}
2089
2090	#############################################################################
2091
2092	package CFClient::UI::Image;	2611	package CFPlus::UI::VGauge;
2093		2612
2094	our @ISA = CFClient::UI::Base::;	2613	our @ISA = CFPlus::UI::Base::;
2095
2096	use CFClient::OpenGL;
2097	use Carp qw/confess/;
2098
2099	our %loaded_images;
2100
2101	sub new {
2102	my $class = shift;
2103
2104	my $self = $class->SUPER::new (can_events => 0, @_);
2105
2106	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2107
2108	$loaded_images{$self->{image}} ||=
2109	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2110
2111	my $tex = $self->{tex} = $loaded_images{$self->{image}};
2112
2113	Scalar::Util::weaken $loaded_images{$self->{image}};
2114
2115	$self->{aspect} = $tex->{w} / $tex->{h};
2116
2117	$self
2118	}
2119
2120	sub size_request {
2121	my ($self) = @_;
2122
2123	($self->{tex}->{w}, $self->{tex}->{h})
2124	}
2125
2126	sub _draw {
2127	my ($self) = @_;
2128
2129	my $tex = $self->{tex};
2130
2131	my ($w, $h) = ($self->{w}, $self->{h});
2132
2133	if ($self->{rot90}) {
2134	glRotate 90, 0, 0, 1;
2135	glTranslate 0, -$self->{w}, 0;
2136
2137	($w, $h) = ($h, $w);
2138	}
2139
2140	glEnable GL_TEXTURE_2D;
2141	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2142
2143	$tex->draw_quad_alpha (0, 0, $w, $h);
2144
2145	glDisable GL_TEXTURE_2D;
2146	}
2147
2148	#############################################################################
2149
2150	package CFClient::UI::VGauge;
2151
2152	our @ISA = CFClient::UI::Base::;
2153		2614
2154	use List::Util qw(min max);	2615	use List::Util qw(min max);
2155		2616
2156	use CFClient::OpenGL;	2617	use CFPlus::OpenGL;
2157		2618
2158	my %tex = (	2619	my %tex = (
2159	food => [	2620	food => [
2160	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2621	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2161	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2622	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2162	],	2623	],
2163	grace => [	2624	grace => [
2164	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2625	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2165	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2626	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2166	],	2627	],
2167	hp => [	2628	hp => [
2168	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2629	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2169	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2630	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2170	],	2631	],
2171	mana => [	2632	mana => [
2172	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2633	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2173	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2634	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2174	],	2635	],
2175	);	2636	);
2176		2637
2177	# eg. VGauge->new (gauge => 'food'), default gauge: food	2638	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2237	my $ycut1 = max 0, min 1, $ycut;	2698	my $ycut1 = max 0, min 1, $ycut;
2238	my $ycut2 = max 0, min 1, $ycut - 1;	2699	my $ycut2 = max 0, min 1, $ycut - 1;
2239		2700
2240	my $h1 = $self->{h} * (1 - $ycut1);	2701	my $h1 = $self->{h} * (1 - $ycut1);
2241	my $h2 = $self->{h} * (1 - $ycut2);	2702	my $h2 = $self->{h} * (1 - $ycut2);
		2703	my $h3 = $self->{h};
		2704
		2705	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2242		2706
2243	glEnable GL_BLEND;	2707	glEnable GL_BLEND;
2244	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2708	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2709	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2246	glEnable GL_TEXTURE_2D;	2710	glEnable GL_TEXTURE_2D;
…		…
2265		2729
2266	if ($t3) {	2730	if ($t3) {
2267	glBindTexture GL_TEXTURE_2D, $t3->{name};	2731	glBindTexture GL_TEXTURE_2D, $t3->{name};
2268	glBegin GL_QUADS;	2732	glBegin GL_QUADS;
2269	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2733	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2270	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2734	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2271	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2735	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2272	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2736	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2273	glEnd;	2737	glEnd;
2274	}	2738	}
2275		2739
2276	glDisable GL_BLEND;	2740	glDisable GL_BLEND;
2277	glDisable GL_TEXTURE_2D;	2741	glDisable GL_TEXTURE_2D;
2278	}	2742	}
2279		2743
2280	#############################################################################	2744	#############################################################################
2281		2745
2282	package CFClient::UI::Gauge;	2746	package CFPlus::UI::Gauge;
2283		2747
2284	our @ISA = CFClient::UI::VBox::;	2748	our @ISA = CFPlus::UI::VBox::;
2285		2749
2286	sub new {	2750	sub new {
2287	my ($class, %arg) = @_;	2751	my ($class, %arg) = @_;
2288		2752
2289	my $self = $class->SUPER::new (	2753	my $self = $class->SUPER::new (
…		…
2291	can_hover => 1,	2755	can_hover => 1,
2292	can_events => 1,	2756	can_events => 1,
2293	%arg,	2757	%arg,
2294	);	2758	);
2295		2759
2296	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2760	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2297	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2761	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2298	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2762	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2299		2763
2300	$self	2764	$self
2301	}	2765	}
2302		2766
2303	sub set_fontsize {	2767	sub set_fontsize {
…		…
2324	$self->{value}->set_text ($val);	2788	$self->{value}->set_text ($val);
2325	}	2789	}
2326		2790
2327	#############################################################################	2791	#############################################################################
2328		2792
2329	package CFClient::UI::Slider;	2793	package CFPlus::UI::Slider;
2330		2794
2331	use strict;	2795	use strict;
2332		2796
2333	use CFClient::OpenGL;	2797	use CFPlus::OpenGL;
2334		2798
2335	our @ISA = CFClient::UI::DrawBG::;	2799	our @ISA = CFPlus::UI::DrawBG::;
2336		2800
2337	my @tex =	2801	my @tex =
2338	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2802	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2339	qw(s1_slider.png s1_slider_bg.png);	2803	qw(s1_slider.png s1_slider_bg.png);
2340		2804
2341	sub new {	2805	sub new {
2342	my $class = shift;	2806	my $class = shift;
2343		2807
…		…
2432	}	2896	}
2433		2897
2434	1	2898	1
2435	}	2899	}
2436		2900
		2901	sub invoke_mouse_wheel {
		2902	my ($self, $ev) = @_;
		2903
		2904	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2905
		2906	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2907
		2908	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2909
		2910	! ! $delta
		2911	}
		2912
2437	sub update {	2913	sub update {
2438	my ($self) = @_;	2914	my ($self) = @_;
2439		2915
2440	delete $self->{knob_w};	2916	delete $self->{knob_w};
2441	$self->SUPER::update;	2917	$self->SUPER::update;
…		…
2488	glDisable GL_TEXTURE_2D;	2964	glDisable GL_TEXTURE_2D;
2489	}	2965	}
2490		2966
2491	#############################################################################	2967	#############################################################################
2492		2968
2493	package CFClient::UI::ValSlider;	2969	package CFPlus::UI::ValSlider;
2494		2970
2495	our @ISA = CFClient::UI::HBox::;	2971	our @ISA = CFPlus::UI::HBox::;
2496		2972
2497	sub new {	2973	sub new {
2498	my ($class, %arg) = @_;	2974	my ($class, %arg) = @_;
2499		2975
2500	my $range = delete $arg{range};	2976	my $range = delete $arg{range};
2501		2977
2502	my $self = $class->SUPER::new (	2978	my $self = $class->SUPER::new (
2503	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2979	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2504	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2980	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2505	to_value => sub { shift },	2981	to_value => sub { shift },
2506	from_value => sub { shift },	2982	from_value => sub { shift },
2507	%arg,	2983	%arg,
2508	);	2984	);
2509		2985
…		…
2529	sub set_range { shift->{slider}->set_range (@_) }	3005	sub set_range { shift->{slider}->set_range (@_) }
2530	sub set_value { shift->{slider}->set_value (@_) }	3006	sub set_value { shift->{slider}->set_value (@_) }
2531		3007
2532	#############################################################################	3008	#############################################################################
2533		3009
2534	package CFClient::UI::TextScroller;	3010	package CFPlus::UI::TextScroller;
2535		3011
2536	our @ISA = CFClient::UI::HBox::;	3012	our @ISA = CFPlus::UI::HBox::;
2537		3013
2538	use CFClient::OpenGL;	3014	use CFPlus::OpenGL;
2539		3015
2540	sub new {	3016	sub new {
2541	my $class = shift;	3017	my $class = shift;
2542		3018
2543	my $self = $class->SUPER::new (	3019	my $self = $class->SUPER::new (
2544	fontsize => 1,	3020	fontsize => 1,
2545	can_events => 0,	3021	can_events => 1,
2546	indent => 0,	3022	indent => 0,
2547	#font => default_font	3023	#font => default_font
2548	@_,	3024	@_,
2549		3025
2550	layout => (new CFClient::Layout 1),	3026	layout => (new CFPlus::Layout),
2551	par => [],	3027	par => [],
		3028	max_par => 0,
2552	height => 0,	3029	height => 0,
2553	children => [	3030	children => [
2554	(new CFClient::UI::Empty expand => 1),	3031	(new CFPlus::UI::Empty expand => 1),
2555	(new CFClient::UI::Slider vertical => 1),	3032	(new CFPlus::UI::Slider vertical => 1),
2556	],	3033	],
2557	);	3034	);
2558		3035
2559	$self->{children}[1]->connect (changed => sub { $self->update });	3036	$self->{children}[1]->connect (changed => sub { $self->update });
2560		3037
…		…
2566		3043
2567	$self->{fontsize} = $fontsize;	3044	$self->{fontsize} = $fontsize;
2568	$self->reflow;	3045	$self->reflow;
2569	}	3046	}
2570		3047
		3048	sub size_request {
		3049	my ($self) = @_;
		3050
		3051	my ($empty, $slider) = @{ $self->{children} };
		3052
		3053	local $self->{children} = [$empty, $slider];
		3054	$self->SUPER::size_request
		3055	}
		3056
2571	sub invoke_size_allocate {	3057	sub invoke_size_allocate {
2572	my ($self, $w, $h) = @_;	3058	my ($self, $w, $h) = @_;
2573		3059
		3060	my ($empty, $slider, @other) = @{ $self->{children} };
		3061	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		3062
2574	$self->{layout}->set_font ($self->{font}) if $self->{font};	3063	$self->{layout}->set_font ($self->{font}) if $self->{font};
2575	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3064	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2576	$self->{layout}->set_width ($self->{children}[0]{w});	3065	$self->{layout}->set_width ($empty->{w});
2577	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3066	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2578		3067
2579	$self->reflow;	3068	$self->reflow;
2580		3069
		3070	local $self->{children} = [$empty, $slider];
2581	$self->SUPER::invoke_size_allocate ($w, $h)	3071	$self->SUPER::invoke_size_allocate ($w, $h)
2582	}	3072	}
2583		3073
2584	sub text_size {	3074	sub invoke_mouse_wheel {
2585	my ($self, $text, $indent) = @_;	3075	my ($self, $ev) = @_;
		3076
		3077	return 0 unless $ev->{dy}; # only vertical movements
		3078
		3079	$self->{children}[1]->emit (mouse_wheel => $ev);
		3080
		3081	1
		3082	}
		3083
		3084	sub get_layout {
		3085	my ($self, $para) = @_;
2586		3086
2587	my $layout = $self->{layout};	3087	my $layout = $self->{layout};
2588		3088
		3089	$layout->set_font ($self->{font}) if $self->{font};
		3090	$layout->set_foreground (@{$para->{fg}});
2589	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3091	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2590	$layout->set_width ($self->{children}[0]{w} - $indent);	3092	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2591	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3093	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592	$layout->set_markup ($text);	3094	$layout->set_markup ($para->{markup});
		3095
		3096	$layout->set_shapes (
		3097	map
		3098	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3099	@{$para->{widget}}
2593		3100	);
		3101
2594	$layout->size	3102	$layout
2595	}	3103	}
2596		3104
2597	sub reflow {	3105	sub reflow {
2598	my ($self) = @_;	3106	my ($self) = @_;
2599		3107
…		…
2606		3114
2607	# todo: base offset on lines or so, not on pixels	3115	# todo: base offset on lines or so, not on pixels
2608	$self->{children}[1]->set_value ($offset);	3116	$self->{children}[1]->set_value ($offset);
2609	}	3117	}
2610		3118
		3119	sub current_paragraph {
		3120	my ($self) = @_;
		3121
		3122	$self->{top_paragraph} - 1
		3123	}
		3124
		3125	sub scroll_to {
		3126	my ($self, $para) = @_;
		3127
		3128	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3129
		3130	$self->{scroll_to} = $para;
		3131	$self->update;
		3132	}
		3133
2611	sub clear {	3134	sub clear {
2612	my ($self) = @_;	3135	my ($self) = @_;
		3136
		3137	my (undef, undef, @other) = @{ $self->{children} };
		3138	$self->remove ($_) for @other;
2613		3139
2614	$self->{par} = [];	3140	$self->{par} = [];
2615	$self->{height} = 0;	3141	$self->{height} = 0;
2616	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3142	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2617	}	3143	}
2618		3144
2619	sub add_paragraph {	3145	sub add_paragraph {
2620	my ($self, $color, $text, $indent) = @_;	3146	my $self = shift;
2621		3147
2622	for my $line (split /\n/, $text) {	3148	for my $para (@_) {
2623	my ($w, $h) = $self->text_size ($line);	3149	$para = {
		3150	fg => [1, 1, 1, 1],
		3151	indent => 0,
		3152	markup => "",
		3153	widget => [],
		3154	ref $para ? %$para : (markup => $para),
		3155	w => 1e10,
		3156	wrapped => 1,
		3157	};
		3158
		3159	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3160	push @{$self->{par}}, $para;
		3161	}
		3162
		3163	if (my $max = $self->{max_par}) {
		3164	shift @{$self->{par}} while @{$self->{par}} > $max;
		3165	}
		3166
		3167	$self->{need_reflow}++;
		3168	$self->update;
		3169	}
		3170
		3171	sub scroll_to_bottom {
		3172	my ($self) = @_;
		3173
		3174	$self->{scroll_to} = $#{$self->{par}};
		3175	$self->update;
		3176	}
		3177
		3178	sub force_uptodate {
		3179	my ($self) = @_;
		3180
		3181	if (delete $self->{need_reflow}) {
		3182	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3183
		3184	my $height = 0;
		3185
		3186	for my $para (@{$self->{par}}) {
		3187	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3188	my $layout = $self->get_layout ($para);
		3189	my ($w, $h) = $layout->size;
		3190
		3191	$para->{w} = $w + $para->{indent};
		3192	$para->{h} = $h;
		3193	$para->{wrapped} = $layout->has_wrapped;
		3194	}
		3195
		3196	$para->{y} = $height;
		3197	$height += $para->{h};
		3198	}
		3199
2624	$self->{height} += $h;	3200	$self->{height} = $height;
2625	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3201	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2626	}
2627		3202
2628	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3203	delete $self->{texture};
		3204	}
		3205
		3206	if (my $paridx = delete $self->{scroll_to}) {
		3207	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3208	}
2629	}	3209	}
2630		3210
2631	sub update {	3211	sub update {
2632	my ($self) = @_;	3212	my ($self) = @_;
2633		3213
…		…
2636	return unless $self->{h} > 0;	3216	return unless $self->{h} > 0;
2637		3217
2638	delete $self->{texture};	3218	delete $self->{texture};
2639		3219
2640	$ROOT->on_post_alloc ($self => sub {	3220	$ROOT->on_post_alloc ($self => sub {
		3221	$self->force_uptodate;
		3222
2641	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3223	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2642		3224
2643	if (delete $self->{need_reflow}) {
2644	my $height = 0;
2645
2646	my $layout = $self->{layout};
2647
2648	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2649
2650	for (@{$self->{par}}) {
2651	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2652	$layout->set_width ($W - $_->[3]);
2653	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2654	$layout->set_markup ($_->[4]);
2655	my ($w, $h) = $layout->size;
2656	$_->[0] = $w + $_->[3];
2657	$_->[1] = $h;
2658	}
2659
2660	$height += $_->[1];
2661	}
2662
2663	$self->{height} = $height;
2664
2665	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2666
2667	delete $self->{texture};
2668	}
2669
2670	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3225	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2671	glClearColor 0, 0, 0, 0;	3226	glClearColor 0, 0, 0, 0;
2672	glClear GL_COLOR_BUFFER_BIT;	3227	glClear GL_COLOR_BUFFER_BIT;
2673		3228
		3229	package CFPlus::UI::Base;
		3230	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3231	(0, 0, $self->{w}, $self->{h});
		3232
		3233	my $top = int $self->{children}[1]{range}[0];
		3234
		3235	my $paridx = 0;
		3236	my $top_paragraph;
2674	my $top = int $self->{children}[1]{range}[0];	3237	my $top = int $self->{children}[1]{range}[0];
2675		3238
2676	my $y0 = $top;	3239	my $y0 = $top;
2677	my $y1 = $top + $H;	3240	my $y1 = $top + $H;
2678		3241
2679	my $y = 0;
2680
2681	my $layout = $self->{layout};
2682
2683	$layout->set_font ($self->{font}) if $self->{font};
2684
2685	glEnable GL_BLEND;
2686	#TODO# not correct in windows where rgba is forced off
2687	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2688
2689	for my $par (@{$self->{par}}) {	3242	for my $para (@{$self->{par}}) {
2690	my $h = $par->[1];	3243	my $h = $para->{h};
		3244	my $y = $para->{y};
2691		3245
2692	if ($y0 < $y + $h && $y < $y1) {	3246	if ($y0 < $y + $h && $y < $y1) {
2693	$layout->set_foreground (@{ $par->[2] });	3247	my $layout = $self->get_layout ($para);
2694	$layout->set_width ($W - $par->[3]);
2695	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2696	$layout->set_markup ($par->[4]);
2697		3248
2698	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3249	$layout->render ($para->{indent}, $y - $y0);
2699		3250
2700	glRasterPos $par->[3], $y - $y0;	3251	if (my @w = @{ $para->{widget} }) {
2701	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3252	my @s = $layout->get_shapes;
		3253
		3254	for (@w) {
		3255	my ($dx, $dy) = splice @s, 0, 2, ();
		3256
		3257	$_->{x} = $dx + $para->{indent};
		3258	$_->{y} = $dy + $y - $y0;
		3259
		3260	$_->draw;
		3261	}
		3262	}
2702	}	3263	}
2703		3264
2704	$y += $h;	3265	$paridx++;
		3266	$top_paragraph ||= $paridx if $y >= $top;
2705	}	3267	}
2706		3268
2707	glDisable GL_BLEND;	3269	$self->{top_paragraph} = $top_paragraph;
2708	};	3270	};
2709	});	3271	});
		3272	}
		3273
		3274	sub reconfigure {
		3275	my ($self) = @_;
		3276
		3277	$self->SUPER::reconfigure;
		3278
		3279	$_->{w} = 1e10 for @{ $self->{par} };
		3280	$self->reflow;
2710	}	3281	}
2711		3282
2712	sub _draw {	3283	sub _draw {
2713	my ($self) = @_;	3284	my ($self) = @_;
2714		3285
…		…
2717	glColor 0, 0, 0, 1;	3288	glColor 0, 0, 0, 1;
2718	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3289	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2719	glDisable GL_TEXTURE_2D;	3290	glDisable GL_TEXTURE_2D;
2720		3291
2721	$self->{children}[1]->draw;	3292	$self->{children}[1]->draw;
2722
2723	}	3293	}
2724		3294
2725	#############################################################################	3295	#############################################################################
2726		3296
2727	package CFClient::UI::Animator;	3297	package CFPlus::UI::Animator;
2728		3298
2729	use CFClient::OpenGL;	3299	use CFPlus::OpenGL;
2730		3300
2731	our @ISA = CFClient::UI::Bin::;	3301	our @ISA = CFPlus::UI::Bin::;
2732		3302
2733	sub moveto {	3303	sub moveto {
2734	my ($self, $x, $y) = @_;	3304	my ($self, $x, $y) = @_;
2735		3305
2736	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3306	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2764	glPopMatrix;	3334	glPopMatrix;
2765	}	3335	}
2766		3336
2767	#############################################################################	3337	#############################################################################
2768		3338
2769	package CFClient::UI::Flopper;	3339	package CFPlus::UI::Flopper;
2770		3340
2771	our @ISA = CFClient::UI::Button::;	3341	our @ISA = CFPlus::UI::Button::;
2772		3342
2773	sub new {	3343	sub new {
2774	my $class = shift;	3344	my $class = shift;
2775		3345
2776	my $self = $class->SUPER::new (	3346	my $self = $class->SUPER::new (
…		…
2788	$self->{other}->toggle_visibility;	3358	$self->{other}->toggle_visibility;
2789	}	3359	}
2790		3360
2791	#############################################################################	3361	#############################################################################
2792		3362
2793	package CFClient::UI::Tooltip;	3363	package CFPlus::UI::Tooltip;
2794		3364
2795	our @ISA = CFClient::UI::Bin::;	3365	our @ISA = CFPlus::UI::Bin::;
2796		3366
2797	use CFClient::OpenGL;	3367	use CFPlus::OpenGL;
2798		3368
2799	sub new {	3369	sub new {
2800	my $class = shift;	3370	my $class = shift;
2801		3371
2802	$class->SUPER::new (	3372	$class->SUPER::new (
…		…
2805	)	3375	)
2806	}	3376	}
2807		3377
2808	sub set_tooltip_from {	3378	sub set_tooltip_from {
2809	my ($self, $widget) = @_;	3379	my ($self, $widget) = @_;
		3380
		3381	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3382	if $widget->{tooltip} =~ /^#(.*)$/;
2810		3383
2811	my $tooltip = $widget->{tooltip};	3384	my $tooltip = $widget->{tooltip};
2812		3385
2813	if ($ENV{CFPLUS_DEBUG} & 2) {	3386	if ($ENV{CFPLUS_DEBUG} & 2) {
2814	$tooltip .= "\n\n" . (ref $widget) . "\n"	3387	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2818	}	3391	}
2819		3392
2820	$tooltip =~ s/^\n+//;	3393	$tooltip =~ s/^\n+//;
2821	$tooltip =~ s/\n+$//;	3394	$tooltip =~ s/\n+$//;
2822		3395
2823	$self->add (new CFClient::UI::Label	3396	$self->add (new CFPlus::UI::Label
2824	markup => $tooltip,	3397	markup => $tooltip,
2825	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3398	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2826	fontsize => 0.8,	3399	fontsize => 0.8,
2827	fg => [0, 0, 0, 1],	3400	style => 1, # FLAG_INVERSE
2828	ellipsise => 0,	3401	ellipsise => 0,
2829	font => ($widget->{tooltip_font} || $::FONT_PROP),	3402	font => ($widget->{tooltip_font} || $::FONT_PROP),
2830	);	3403	);
2831	}	3404	}
2832		3405
…		…
2851		3424
2852	$self->{root}->on_post_alloc ("move_$self" => sub {	3425	$self->{root}->on_post_alloc ("move_$self" => sub {
2853	my $widget = $self->{owner}	3426	my $widget = $self->{owner}
2854	or return;	3427	or return;
2855		3428
		3429	if ($widget->{visible}) {
2856	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3430	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2857		3431
2858	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3432	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2859	if $x + $self->{w} > $self->{root}{w};	3433	if $x + $self->{w} > $self->{root}{w};
2860		3434
2861	$self->move_abs ($x, $y);	3435	$self->move_abs ($x, $y);
		3436	} else {
		3437	$self->hide;
		3438	}
2862	});	3439	});
2863	}	3440	}
2864		3441
2865	sub _draw {	3442	sub _draw {
2866	my ($self) = @_;	3443	my ($self) = @_;
…		…
2890	$self->SUPER::_draw;	3467	$self->SUPER::_draw;
2891	}	3468	}
2892		3469
2893	#############################################################################	3470	#############################################################################
2894		3471
2895	package CFClient::UI::Face;	3472	package CFPlus::UI::Face;
2896		3473
2897	our @ISA = CFClient::UI::Base::;	3474	our @ISA = CFPlus::UI::DrawBG::;
2898		3475
2899	use CFClient::OpenGL;	3476	use CFPlus::OpenGL;
2900		3477
2901	sub new {	3478	sub new {
2902	my $class = shift;	3479	my $class = shift;
2903		3480
2904	my $self = $class->SUPER::new (	3481	my $self = $class->SUPER::new (
		3482	size_w => 32,
		3483	size_h => 8,
2905	aspect => 1,	3484	aspect => 1,
2906	can_events => 0,	3485	can_events => 0,
2907	@_,	3486	@_,
2908	);	3487	);
2909		3488
2910	if ($self->{anim} && $self->{animspeed}) {	3489	if ($self->{anim} && $self->{animspeed}) {
2911	Scalar::Util::weaken (my $widget = $self);	3490	CFPlus::weaken (my $widget = $self);
2912		3491
2913	$self->{timer} = Event->timer (	3492	$self->{timer} = Event->timer (
2914	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3493	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2915	hard => 1,	3494	hard => 1,
2916	interval => $self->{animspeed},	3495	interval => $self->{animspeed},
2917	cb => sub {	3496	cb => sub {
		3497	return unless $::CONN;
		3498
2918	++$widget->{frame};	3499	++$widget->{frame};
		3500	$self->update_face;
2919	$widget->update;	3501	$self->update;
2920	},	3502	},
2921	);	3503	);
		3504
		3505	$self->update_face;
2922	}	3506	}
2923		3507
2924	$self	3508	$self
2925	}	3509	}
2926		3510
		3511	sub update_face {
		3512	my ($self) = @_;
		3513
		3514	return unless $::CONN;
		3515
		3516	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3517	if ($anim && @$anim) {
		3518	delete $self->{wait_face};
		3519	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3520	}
		3521	}
		3522	}
		3523
2927	sub size_request {	3524	sub size_request {
2928	(32, 8)	3525	my ($self) = @_;
		3526
		3527	if ($::CONN) {
		3528	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3529	if (my $tex = $::CONN->{texture}[$faceid]) {
		3530	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3531	} else {
		3532	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3533	$self->realloc;
		3534	});
		3535	}
		3536	}
		3537	}
		3538
		3539	($self->{size_w} || 8, $self->{size_h} || 8)
2929	}	3540	}
2930		3541
2931	sub update {	3542	sub update {
2932	my ($self) = @_;	3543	my ($self) = @_;
2933		3544
…		…
2939	sub _draw {	3550	sub _draw {
2940	my ($self) = @_;	3551	my ($self) = @_;
2941		3552
2942	return unless $::CONN;	3553	return unless $::CONN;
2943		3554
2944	my $face;	3555	$self->SUPER::_draw;
2945		3556
2946	if ($self->{frame}) {
2947	my $anim = $::CONN->{anim}[$self->{anim}];	3557	my $faceid = $::CONN->{faceid}[$self->{face}]
2948		3558	or return;
2949	$face = $anim->[ $self->{frame} % @$anim ]
2950	if $anim && @$anim;
2951	}
2952		3559
2953	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3560	my $tex = $::CONN->{texture}[$faceid];
2954		3561
2955	if ($tex) {	3562	if ($tex) {
2956	glEnable GL_TEXTURE_2D;	3563	glEnable GL_TEXTURE_2D;
2957	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3564	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2958	glColor 0, 0, 0, 1;	3565	glColor 0, 0, 0, 1;
…		…
2970	$self->SUPER::destroy;	3577	$self->SUPER::destroy;
2971	}	3578	}
2972		3579
2973	#############################################################################	3580	#############################################################################
2974		3581
2975	package CFClient::UI::Buttonbar;	3582	package CFPlus::UI::Buttonbar;
2976		3583
2977	our @ISA = CFClient::UI::HBox::;	3584	our @ISA = CFPlus::UI::HBox::;
2978		3585
2979	# TODO: should actualyl wrap buttons and other goodies.	3586	# TODO: should actually wrap buttons and other goodies.
2980		3587
2981	#############################################################################	3588	#############################################################################
2982		3589
2983	package CFClient::UI::Menu;	3590	package CFPlus::UI::Menu;
2984		3591
2985	our @ISA = CFClient::UI::FancyFrame::;	3592	our @ISA = CFPlus::UI::Toplevel::;
2986		3593
2987	use CFClient::OpenGL;	3594	use CFPlus::OpenGL;
2988		3595
2989	sub new {	3596	sub new {
2990	my $class = shift;	3597	my $class = shift;
2991		3598
2992	my $self = $class->SUPER::new (	3599	my $self = $class->SUPER::new (
2993	items => [],	3600	items => [],
2994	z => 100,	3601	z => 100,
2995	@_,	3602	@_,
2996	);	3603	);
2997		3604
2998	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3605	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2999		3606
3000	for my $item (@{ $self->{items} }) {	3607	for my $item (@{ $self->{items} }) {
3001	my ($widget, $cb, $tooltip) = @$item;	3608	my ($widget, $cb, $tooltip) = @$item;
3002		3609
3003	# handle various types of items, only text for now	3610	# handle various types of items, only text for now
3004	if (!ref $widget) {	3611	if (!ref $widget) {
		3612	if ($widget =~ /\t/) {
		3613	my ($left, $right) = split /\t/, $widget, 2;
		3614
3005	$widget = new CFClient::UI::Label	3615	$widget = new CFPlus::UI::HBox
3006	can_hover => 1,	3616	can_hover => 1,
3007	can_events => 1,	3617	can_events => 1,
		3618	tooltip => $tooltip,
		3619	children => [
		3620	(new CFPlus::UI::Label markup => $left, expand => 1),
		3621	(new CFPlus::UI::Label markup => $right, align => +1),
		3622	],
		3623	;
		3624
		3625	} else {
		3626	$widget = new CFPlus::UI::Label
		3627	can_hover => 1,
		3628	can_events => 1,
3008	markup => $widget,	3629	markup => $widget,
3009	tooltip => $tooltip	3630	tooltip => $tooltip;
		3631	}
3010	}	3632	}
3011		3633
3012	$self->{item}{$widget} = $item;	3634	$self->{item}{$widget} = $item;
3013		3635
3014	$self->{vbox}->add ($widget);	3636	$self->{vbox}->add ($widget);
…		…
3057	1	3679	1
3058	}	3680	}
3059		3681
3060	#############################################################################	3682	#############################################################################
3061		3683
3062	package CFClient::UI::Multiplexer;	3684	package CFPlus::UI::Multiplexer;
3063		3685
3064	our @ISA = CFClient::UI::Container::;	3686	our @ISA = CFPlus::UI::Container::;
3065		3687
3066	sub new {	3688	sub new {
3067	my $class = shift;	3689	my $class = shift;
3068		3690
3069	my $self = $class->SUPER::new (	3691	my $self = $class->SUPER::new (
…		…
3083		3705
3084	$self->{current} = $self->{children}[0]	3706	$self->{current} = $self->{children}[0]
3085	if @{ $self->{children} };	3707	if @{ $self->{children} };
3086	}	3708	}
3087		3709
		3710	sub get_current_page {
		3711	my ($self) = @_;
		3712
		3713	$self->{current}
		3714	}
		3715
3088	sub set_current_page {	3716	sub set_current_page {
3089	my ($self, $page_or_widget) = @_;	3717	my ($self, $page_or_widget) = @_;
3090		3718
3091	my $widget = ref $page_or_widget	3719	my $widget = ref $page_or_widget
3092	? $page_or_widget	3720	? $page_or_widget
…		…
3124	$self->{current}->draw;	3752	$self->{current}->draw;
3125	}	3753	}
3126		3754
3127	#############################################################################	3755	#############################################################################
3128		3756
3129	package CFClient::UI::Notebook;	3757	package CFPlus::UI::Notebook;
3130		3758
3131	our @ISA = CFClient::UI::VBox::;	3759	our @ISA = CFPlus::UI::VBox::;
3132		3760
3133	sub new {	3761	sub new {
3134	my $class = shift;	3762	my $class = shift;
3135		3763
3136	my $self = $class->SUPER::new (	3764	my $self = $class->SUPER::new (
3137	buttonbar => (new CFClient::UI::Buttonbar),	3765	buttonbar => (new CFPlus::UI::Buttonbar),
3138	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3766	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3139	# filter => # will be put between multiplexer and $self	3767	# filter => # will be put between multiplexer and $self
3140	@_,	3768	@_,
3141	);	3769	);
3142		3770
3143	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3771	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3147	}	3775	}
3148		3776
3149	sub add {	3777	sub add {
3150	my ($self, $title, $widget, $tooltip) = @_;	3778	my ($self, $title, $widget, $tooltip) = @_;
3151		3779
3152	Scalar::Util::weaken $self;	3780	CFPlus::weaken $self;
3153		3781
3154	$self->{buttonbar}->add (new CFClient::UI::Button	3782	$self->{buttonbar}->add (new CFPlus::UI::Button
3155	markup => $title,	3783	markup => $title,
3156	tooltip => $tooltip,	3784	tooltip => $tooltip,
3157	on_activate => sub { $self->set_current_page ($widget) },	3785	on_activate => sub { $self->set_current_page ($widget) },
3158	);	3786	);
3159		3787
3160	$self->{multiplexer}->add ($widget);	3788	$self->{multiplexer}->add ($widget);
3161	}	3789	}
3162		3790
		3791	sub get_current_page {
		3792	my ($self) = @_;
		3793
		3794	$self->{multiplexer}->get_current_page
		3795	}
		3796
3163	sub set_current_page {	3797	sub set_current_page {
3164	my ($self, $page) = @_;	3798	my ($self, $page) = @_;
3165		3799
3166	$self->{multiplexer}->set_current_page ($page);	3800	$self->{multiplexer}->set_current_page ($page);
3167	$self->emit (page_changed => $self->{multiplexer}{current});	3801	$self->emit (page_changed => $self->{multiplexer}{current});
3168	}	3802	}
3169		3803
3170	#############################################################################	3804	#############################################################################
3171		3805
3172	package CFClient::UI::Combobox;	3806	package CFPlus::UI::Selector;
3173		3807
3174	use utf8;	3808	use utf8;
3175		3809
3176	our @ISA = CFClient::UI::Button::;	3810	our @ISA = CFPlus::UI::Button::;
3177		3811
3178	sub new {	3812	sub new {
3179	my $class = shift;	3813	my $class = shift;
3180		3814
3181	my $self = $class->SUPER::new (	3815	my $self = $class->SUPER::new (
…		…
3198	my ($value, $title, $tooltip) = @$_;	3832	my ($value, $title, $tooltip) = @$_;
3199		3833
3200	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3834	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3201	}	3835	}
3202		3836
3203	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3837	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3204	}	3838	}
3205		3839
3206	sub _set_value {	3840	sub _set_value {
3207	my ($self, $value) = @_;	3841	my ($self, $value) = @_;
3208		3842
…		…
3223	$self->emit (changed => $value);	3857	$self->emit (changed => $value);
3224	}	3858	}
3225		3859
3226	#############################################################################	3860	#############################################################################
3227		3861
3228	package CFClient::UI::Statusbox;	3862	package CFPlus::UI::Statusbox;
3229		3863
3230	our @ISA = CFClient::UI::VBox::;	3864	our @ISA = CFPlus::UI::VBox::;
3231		3865
3232	sub new {	3866	sub new {
3233	my $class = shift;	3867	my $class = shift;
3234		3868
3235	my $self = $class->SUPER::new (	3869	my $self = $class->SUPER::new (
3236	fontsize => 0.8,	3870	fontsize => 0.8,
3237	@_,	3871	@_,
3238	);	3872	);
3239		3873
3240	Scalar::Util::weaken (my $this = $self);	3874	CFPlus::weaken (my $this = $self);
3241		3875
3242	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3876	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3243		3877
3244	$self	3878	$self
3245	}	3879	}
…		…
3247	sub reorder {	3881	sub reorder {
3248	my ($self) = @_;	3882	my ($self) = @_;
3249	my $NOW = Time::HiRes::time;	3883	my $NOW = Time::HiRes::time;
3250		3884
3251	# freeze display when hovering over any label	3885	# freeze display when hovering over any label
3252	return if $CFClient::UI::TOOLTIP->{owner}	3886	return if $CFPlus::UI::TOOLTIP->{owner}
3253	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3887	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3254	values %{ $self->{item} };	3888	values %{ $self->{item} };
3255		3889
3256	while (my ($k, $v) = each %{ $self->{item} }) {	3890	while (my ($k, $v) = each %{ $self->{item} }) {
3257	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3891	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3258	}	3892	}
…		…
3279	for ($short) {	3913	for ($short) {
3280	s/^\s+//;	3914	s/^\s+//;
3281	s/\s+/ /g;	3915	s/\s+/ /g;
3282	}	3916	}
3283		3917
3284	new CFClient::UI::Label	3918	new CFPlus::UI::Label
3285	markup => $short,	3919	markup => $short,
3286	tooltip => $item->{tooltip},	3920	tooltip => $item->{tooltip},
3287	tooltip_font => $::FONT_PROP,	3921	tooltip_font => $::FONT_PROP,
3288	tooltip_width => 0.67,	3922	tooltip_width => 0.67,
3289	fontsize => $item->{fontsize} || $self->{fontsize},	3923	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3343	count => 1,	3977	count => 1,
3344	%arg,	3978	%arg,
3345	};	3979	};
3346	}	3980	}
3347		3981
		3982	$ROOT->on_refresh (reorder => sub {
3348	$self->reorder;	3983	$self->reorder;
		3984	});
3349	}	3985	}
3350		3986
3351	sub reconfigure {	3987	sub reconfigure {
3352	my ($self) = @_;	3988	my ($self) = @_;
3353		3989
…		…
3366	$self->SUPER::destroy;	4002	$self->SUPER::destroy;
3367	}	4003	}
3368		4004
3369	#############################################################################	4005	#############################################################################
3370		4006
3371	package CFClient::UI::Inventory;
3372
3373	our @ISA = CFClient::UI::ScrolledWindow::;
3374
3375	sub new {
3376	my $class = shift;
3377
3378	my $self = $class->SUPER::new (
3379	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3380	@_,
3381	);
3382
3383	$self
3384	}
3385
3386	sub set_items {
3387	my ($self, $items) = @_;
3388
3389	$self->{child}->clear;
3390	return unless $items;
3391
3392	my @items = sort {
3393	($a->{type} <=> $b->{type})
3394	or ($a->{name} cmp $b->{name})
3395	} @$items;
3396
3397	$self->{real_items} = \@items;
3398
3399	my $row = 0;
3400	for my $item (@items) {
3401	CFClient::Item::update_widgets $item;
3402
3403	$self->{child}->add (0, $row, $item->{face_widget});
3404	$self->{child}->add (1, $row, $item->{desc_widget});
3405	$self->{child}->add (2, $row, $item->{weight_widget});
3406
3407	$row++;
3408	}
3409	}
3410
3411	#############################################################################
3412
3413	package CFClient::UI::BindEditor;
3414
3415	our @ISA = CFClient::UI::FancyFrame::;
3416
3417	sub new {
3418	my $class = shift;
3419
3420	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3421
3422	$self->add (my $vb = new CFClient::UI::VBox);
3423
3424
3425	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3426	text => "start recording",
3427	tooltip => "Start/Stops recording of actions."
3428	."All subsequent actions after the recording started will be captured."
3429	."The actions are displayed after the record was stopped."
3430	."To bind the action you have to click on the 'Bind' button",
3431	on_activate => sub {
3432	unless ($self->{recording}) {
3433	$self->start;
3434	} else {
3435	$self->stop;
3436	}
3437	});
3438
3439	$vb->add (new CFClient::UI::Label text => "Actions:");
3440	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3441
3442	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3443	$vb->add (my $hb = new CFClient::UI::HBox);
3444	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3445	$hb->add (new CFClient::UI::Button
3446	text => "bind",
3447	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3448	on_activate => sub {
3449	$self->ask_for_bind;
3450	});
3451
3452	$vb->add (my $hb = new CFClient::UI::HBox);
3453	$hb->add (new CFClient::UI::Button
3454	text => "ok",
3455	expand => 1,
3456	tooltip => "This closes the binding editor and saves the binding",
3457	on_activate => sub {
3458	$self->hide;
3459	$self->commit;
3460	});
3461
3462	$hb->add (new CFClient::UI::Button
3463	text => "cancel",
3464	expand => 1,
3465	tooltip => "This closes the binding editor without saving",
3466	on_activate => sub {
3467	$self->hide;
3468	$self->{binding_cancel}->()
3469	if $self->{binding_cancel};
3470	});
3471
3472	$self->update_binding_widgets;
3473
3474	$self
3475	}
3476
3477	sub commit {
3478	my ($self) = @_;
3479	my ($mod, $sym, $cmds) = $self->get_binding;
3480	if ($sym != 0 && @$cmds > 0) {
3481	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3482	."'. Don't forget 'Save Config'!");
3483	$self->{binding_change}->($mod, $sym, $cmds)
3484	if $self->{binding_change};
3485	} else {
3486	$::STATUSBOX->add ("No action bound, no key or action specified!");
3487	$self->{binding_cancel}->()
3488	if $self->{binding_cancel};
3489	}
3490	}
3491
3492	sub start {
3493	my ($self) = @_;
3494
3495	$self->{rec_btn}->set_text ("stop recording");
3496	$self->{recording} = 1;
3497	$self->clear_command_list;
3498	$::CONN->start_record if $::CONN;
3499	}
3500
3501	sub stop {
3502	my ($self) = @_;
3503
3504	$self->{rec_btn}->set_text ("start recording");
3505	$self->{recording} = 0;
3506
3507	my $rec;
3508	$rec = $::CONN->stop_record if $::CONN;
3509	return unless ref $rec eq 'ARRAY';
3510	$self->set_command_list ($rec);
3511	}
3512
3513
3514	sub ask_for_bind_and_commit {
3515	my ($self) = @_;
3516	$self->ask_for_bind (1);
3517	}
3518
3519	sub ask_for_bind {
3520	my ($self, $commit, $end_cb) = @_;
3521
3522	CFClient::Binder::open_binding_dialog (sub {
3523	my ($mod, $sym) = @_;
3524	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3525	$self->update_binding_widgets;
3526	$self->commit if $commit;
3527	$end_cb->() if $end_cb;
3528	});
3529	}
3530
3531	# $mod and $sym are the modifiers and key symbol
3532	# $cmds is a array ref of strings (the commands)
3533	# $cb is the callback that is executed on OK
3534	# $ccb is the callback that is executed on CANCEL and
3535	# when the binding was unsuccessful on OK
3536	sub set_binding {
3537	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3538
3539	$self->clear_command_list;
3540	$self->{recording} = 0;
3541	$self->{rec_btn}->set_text ("start recording");
3542
3543	$self->{binding} = [$mod, $sym];
3544	$self->{commands} = $cmds;
3545
3546	$self->{binding_change} = $cb;
3547	$self->{binding_cancel} = $ccb;
3548
3549	$self->update_binding_widgets;
3550	}
3551
3552	# this is a shortcut method that asks for a binding
3553	# and then just binds it.
3554	sub do_quick_binding {
3555	my ($self, $cmds, $end_cb) = @_;
3556	$self->set_binding (undef, undef, $cmds, sub {
3557	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3558	});
3559	$self->ask_for_bind (1, $end_cb);
3560	}
3561
3562	sub update_binding_widgets {
3563	my ($self) = @_;
3564	my ($mod, $sym, $cmds) = $self->get_binding;
3565	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3566	$self->set_command_list ($cmds);
3567	}
3568
3569	sub get_binding {
3570	my ($self) = @_;
3571	return (
3572	$self->{binding}->[0],
3573	$self->{binding}->[1],
3574	[ grep { defined $_ } @{$self->{commands}} ]
3575	);
3576	}
3577
3578	sub clear_command_list {
3579	my ($self) = @_;
3580	$self->{cmdbox}->clear ();
3581	}
3582
3583	sub set_command_list {
3584	my ($self, $cmds) = @_;
3585
3586	$self->{cmdbox}->clear ();
3587	$self->{commands} = $cmds;
3588
3589	my $idx = 0;
3590
3591	for (@$cmds) {
3592	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3593
3594	my $i = $idx;
3595	$hb->add (new CFClient::UI::Label text => $_);
3596	$hb->add (new CFClient::UI::Button
3597	text => "delete",
3598	tooltip => "Deletes the action from the record",
3599	on_activate => sub {
3600	$self->{cmdbox}->remove ($hb);
3601	$cmds->[$i] = undef;
3602	});
3603
3604
3605	$idx++
3606	}
3607	}
3608
3609	#############################################################################
3610
3611	package CFClient::UI::SpellList;
3612
3613	our @ISA = CFClient::UI::Table::;
3614
3615	sub new {
3616	my $class = shift;
3617
3618	my $self = $class->SUPER::new (
3619	binding => [],
3620	commands => [],
3621	@_,
3622	)
3623	}
3624
3625	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3626
3627	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3629	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3630	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3631	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3633	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3635	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3637
3638	sub rebuild_spell_list {
3639	my ($self) = @_;
3640
3641	$CFClient::UI::ROOT->on_refresh ($self => sub {
3642	$self->clear;
3643
3644	return unless $::CONN;
3645
3646	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3647	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3648	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3649	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3650	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3651
3652	my $row = 0;
3653
3654	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3655	my $spell = $self->{spell}{$_};
3656
3657	$row++;
3658
3659	my $spell_cb = sub {
3660	my ($widget, $ev) = @_;
3661
3662	if ($ev->{button} == 1) {
3663	$::CONN->user_send ("cast $spell->{name}");
3664	} elsif ($ev->{button} == 2) {
3665	$::CONN->user_send ("invoke $spell->{name}");
3666	} elsif ($ev->{button} == 3) {
3667	(new CFClient::UI::Menu
3668	items => [
3669	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3670	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3671	],
3672	)->popup ($ev);
3673	} else {
3674	return 0;
3675	}
3676
3677	1
3678	};
3679
3680	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3681
3682	#TODO: add path info to tooltip
3683	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3684
3685	$self->add (0, $row, new CFClient::UI::Face
3686	face => $spell->{face},
3687	can_hover => 1,
3688	can_events => 1,
3689	tooltip => $tooltip,
3690	on_button_down => $spell_cb,
3691	);
3692
3693	$self->add (1, $row, new CFClient::UI::Label
3694	expand => 1,
3695	text => $spell->{name},
3696	can_hover => 1,
3697	can_events => 1,
3698	tooltip => $tooltip,
3699	on_button_down => $spell_cb,
3700	);
3701
3702	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3703	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3704	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3705	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3706	}
3707	});
3708	}
3709
3710	sub add_spell {
3711	my ($self, $spell) = @_;
3712
3713	$self->{spell}->{$spell->{name}} = $spell;
3714	$self->rebuild_spell_list;
3715	}
3716
3717	sub remove_spell {
3718	my ($self, $spell) = @_;
3719
3720	delete $self->{spell}->{$spell->{name}};
3721	$self->rebuild_spell_list;
3722	}
3723
3724	sub clear_spells {
3725	my ($self) = @_;
3726
3727	$self->{spell} = {};
3728	$self->rebuild_spell_list;
3729	}
3730
3731	#############################################################################
3732
3733	package CFClient::UI::Root;	4007	package CFPlus::UI::Root;
3734		4008
3735	our @ISA = CFClient::UI::Container::;	4009	our @ISA = CFPlus::UI::Container::;
3736		4010
3737	use List::Util qw(min max);	4011	use List::Util qw(min max);
3738		4012
3739	use CFClient::OpenGL;	4013	use CFPlus::OpenGL;
3740		4014
3741	sub new {	4015	sub new {
3742	my $class = shift;	4016	my $class = shift;
3743		4017
3744	my $self = $class->SUPER::new (	4018	my $self = $class->SUPER::new (
3745	visible => 1,	4019	visible => 1,
3746	@_,	4020	@_,
3747	);	4021	);
3748		4022
3749	Scalar::Util::weaken ($self->{root} = $self);	4023	CFPlus::weaken ($self->{root} = $self);
3750		4024
3751	$self	4025	$self
3752	}	4026	}
3753		4027
3754	sub size_request {	4028	sub size_request {
…		…
3920	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4194	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3921		4195
3922	$w = 0 if $w < 0;	4196	$w = 0 if $w < 0;
3923	$h = 0 if $h < 0;	4197	$h = 0 if $h < 0;
3924		4198
		4199	$w = max $widget->{min_w}, $w;
		4200	$h = max $widget->{min_h}, $h;
		4201
		4202	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4203	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4204
		4205	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4206	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4207
3925	$w = int $w + 0.5;	4208	$w = int $w + 0.5;
3926	$h = int $h + 0.5;	4209	$h = int $h + 0.5;
3927		4210
3928	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4211	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929	$widget->{old_w} = $widget->{w};	4212	$widget->{old_w} = $widget->{w};
…		…
3952	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4235	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3953	glMatrixMode GL_MODELVIEW;	4236	glMatrixMode GL_MODELVIEW;
3954	glLoadIdentity;	4237	glLoadIdentity;
3955		4238
3956	{	4239	{
3957	package CFClient::UI::Base;	4240	package CFPlus::UI::Base;
3958		4241
3959	($draw_x, $draw_y, $draw_w, $draw_h) =	4242	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3960	(0, 0, $self->{w}, $self->{h});	4243	(0, 0, $self->{w}, $self->{h});
3961	}
3962		4244
3963	$self->_draw;	4245	$self->_draw;
		4246	}
3964	}	4247	}
3965		4248
3966	#############################################################################	4249	#############################################################################
3967		4250
3968	package CFClient::UI;	4251	package CFPlus::UI;
3969		4252
3970	$ROOT = new CFClient::UI::Root;	4253	$ROOT = new CFPlus::UI::Root;
3971	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4254	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3972		4255
3973	1	4256	1
3974		4257

Diff Legend

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