ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.304 by elmex, Tue Jun 13 11:01:04 2006 UTC vs.
Revision 1.386 by root, Fri Jul 20 16:33:45 2007 UTC

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

Diff Legend

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