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.387 by root, Fri Jul 20 18:19: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
463	}	503	}
464		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)
		550	}
		551
465	sub find_widget {	552	#sub find_widget {
466	my ($self, $x, $y) = @_;	553	# in .xs
467
468	return () unless $self->{can_events};
469
470	return $self
471	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474	()
475	}
476		554
477	sub set_parent {	555	sub set_parent {
478	my ($self, $parent) = @_;	556	my ($self, $parent) = @_;
479		557
480	Scalar::Util::weaken ($self->{parent} = $parent);	558	CFPlus::weaken ($self->{parent} = $parent);
481	$self->set_visible if $parent->{visible};	559	$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	}	560	}
506		561
507	sub realloc {	562	sub realloc {
508	my ($self) = @_;	563	my ($self) = @_;
509		564
…		…
542	return unless $self->{h} && $self->{w};	597	return unless $self->{h} && $self->{w};
543		598
544	# update screen rectangle	599	# update screen rectangle
545	local $draw_x = $draw_x + $self->{x};	600	local $draw_x = $draw_x + $self->{x};
546	local $draw_y = $draw_y + $self->{y};	601	local $draw_y = $draw_y + $self->{y};
547	local $draw_w = $draw_x + $self->{w};
548	local $draw_h = $draw_y + $self->{h};
549		602
550	# skip widgets that are entirely outside the drawing area	603	# skip widgets that are entirely outside the drawing area
551	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	604	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	605	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553		606
…		…
576	glVertex $self->{w} - 1, 0;	629	glVertex $self->{w} - 1, 0;
577	glVertex $self->{w} - 1, $self->{h} - 1;	630	glVertex $self->{w} - 1, $self->{h} - 1;
578	glVertex 0 , $self->{h} - 1;	631	glVertex 0 , $self->{h} - 1;
579	glEnd;	632	glEnd;
580	glPopMatrix;	633	glPopMatrix;
581	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	634	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582	}	635	}
583		636
584	$self->_draw;	637	$self->_draw;
585	glPopMatrix;	638	glPopMatrix;
586	}	639	}
…		…
589	my ($self) = @_;	642	my ($self) = @_;
590		643
591	warn "no draw defined for $self\n";	644	warn "no draw defined for $self\n";
592	}	645	}
593		646
		647	my $cntx;#d#
594	sub DESTROY {	648	sub DESTROY {
595	my ($self) = @_;	649	my ($self) = @_;
596		650
597	delete $WIDGET{$self+0};	651	return if CFPlus::in_destruct;
598		652
599	eval { $self->destroy };	653	eval { $self->destroy };
600	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	654	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		655
		656	delete $WIDGET{$self+0};
601	}	657	}
602		658
603	#############################################################################	659	#############################################################################
604		660
605	package CFClient::UI::DrawBG;	661	package CFPlus::UI::DrawBG;
606		662
607	our @ISA = CFClient::UI::Base::;	663	our @ISA = CFPlus::UI::Base::;
608		664
609	use strict;	665	use strict;
610	use CFClient::OpenGL;	666	use CFPlus::OpenGL;
611		667
612	sub new {	668	sub new {
613	my $class = shift;	669	my $class = shift;
614		670
615	# range [value, low, high, page]	671	# range [value, low, high, page]
…		…
646	}	702	}
647	}	703	}
648		704
649	#############################################################################	705	#############################################################################
650		706
651	package CFClient::UI::Empty;	707	package CFPlus::UI::Empty;
652		708
653	our @ISA = CFClient::UI::Base::;	709	our @ISA = CFPlus::UI::Base::;
654		710
655	sub new {	711	sub new {
656	my ($class, %arg) = @_;	712	my ($class, %arg) = @_;
657	$class->SUPER::new (can_events => 0, %arg);	713	$class->SUPER::new (can_events => 0, %arg);
658	}	714	}
…		…
665		721
666	sub draw { }	722	sub draw { }
667		723
668	#############################################################################	724	#############################################################################
669		725
670	package CFClient::UI::Container;	726	package CFPlus::UI::Container;
671		727
672	our @ISA = CFClient::UI::Base::;	728	our @ISA = CFPlus::UI::Base::;
673		729
674	sub new {	730	sub new {
675	my ($class, %arg) = @_;	731	my ($class, %arg) = @_;
676		732
677	my $children = delete $arg{children};	733	my $children = delete $arg{children};
…		…
686	if $children;	742	if $children;
687		743
688	$self	744	$self
689	}	745	}
690		746
		747	sub realloc {
		748	my ($self) = @_;
		749
		750	$self->{force_realloc} = 1;
		751	$self->{force_size_alloc} = 1;
		752	$self->SUPER::realloc;
		753	}
		754
691	sub add {	755	sub add {
692	my ($self, @widgets) = @_;	756	my ($self, @widgets) = @_;
693		757
694	$_->set_parent ($self)	758	$_->set_parent ($self)
695	for @widgets;	759	for @widgets;
…		…
755	$_->draw for @{$self->{children}};	819	$_->draw for @{$self->{children}};
756	}	820	}
757		821
758	#############################################################################	822	#############################################################################
759		823
760	package CFClient::UI::Bin;	824	package CFPlus::UI::Bin;
761		825
762	our @ISA = CFClient::UI::Container::;	826	our @ISA = CFPlus::UI::Container::;
763		827
764	sub new {	828	sub new {
765	my ($class, %arg) = @_;	829	my ($class, %arg) = @_;
766		830
767	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	831	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
768		832
769	$class->SUPER::new (children => [$child], %arg)	833	$class->SUPER::new (children => [$child], %arg)
770	}	834	}
771		835
772	sub add {	836	sub add {
…		…
779	sub remove {	843	sub remove {
780	my ($self, $widget) = @_;	844	my ($self, $widget) = @_;
781		845
782	$self->SUPER::remove ($widget);	846	$self->SUPER::remove ($widget);
783		847
784	$self->{children} = [new CFClient::UI::Empty]	848	$self->{children} = [new CFPlus::UI::Empty]
785	unless @{$self->{children}};	849	unless @{$self->{children}};
786	}	850	}
787		851
788	sub child { $_[0]->{children}[0] }	852	sub child { $_[0]->{children}[0] }
789		853
790	sub size_request {	854	sub size_request {
791	$_[0]{children}[0]->size_request	855	$_[0]{children}[0]->size_request
792	}	856	}
793		857
794	sub size_allocate {	858	sub invoke_size_allocate {
795	my ($self, $w, $h) = @_;	859	my ($self, $w, $h) = @_;
796		860
797	$self->{children}[0]->configure (0, 0, $w, $h);	861	$self->{children}[0]->configure (0, 0, $w, $h);
		862
		863	1
798	}	864	}
799		865
800	#############################################################################	866	#############################################################################
801		867
802	# back-buffered drawing area	868	# back-buffered drawing area
803		869
804	package CFClient::UI::Window;	870	package CFPlus::UI::Window;
805		871
806	our @ISA = CFClient::UI::Bin::;	872	our @ISA = CFPlus::UI::Bin::;
807		873
808	use CFClient::OpenGL;	874	use CFPlus::OpenGL;
809		875
810	sub new {	876	sub new {
811	my ($class, %arg) = @_;	877	my ($class, %arg) = @_;
812		878
813	my $self = $class->SUPER::new (%arg);	879	my $self = $class->SUPER::new (%arg);
…		…
818		884
819	$ROOT->on_post_alloc ($self => sub { $self->render_child });	885	$ROOT->on_post_alloc ($self => sub { $self->render_child });
820	$self->SUPER::update;	886	$self->SUPER::update;
821	}	887	}
822		888
823	sub size_allocate {	889	sub invoke_size_allocate {
824	my ($self, $w, $h) = @_;	890	my ($self, $w, $h) = @_;
825		891
826	$self->SUPER::size_allocate ($w, $h);
827	$self->update;	892	$self->update;
		893
		894	$self->SUPER::invoke_size_allocate ($w, $h)
828	}	895	}
829		896
830	sub _render {	897	sub _render {
831	my ($self) = @_;	898	my ($self) = @_;
832		899
…		…
834	}	901	}
835		902
836	sub render_child {	903	sub render_child {
837	my ($self) = @_;	904	my ($self) = @_;
838		905
839	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	906	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840	glClearColor 0, 0, 0, 0;	907	glClearColor 0, 0, 0, 0;
841	glClear GL_COLOR_BUFFER_BIT;	908	glClear GL_COLOR_BUFFER_BIT;
842		909
843	{	910	{
844	package CFClient::UI::Base;	911	package CFPlus::UI::Base;
845		912
846	($draw_x, $draw_y, $draw_w, $draw_h) =	913	local ($draw_x, $draw_y, $draw_w, $draw_h) =
847	(0, 0, $self->{w}, $self->{h});	914	(0, 0, $self->{w}, $self->{h});
		915
		916	$self->_render;
848	}	917	}
849
850	$self->_render;
851	};	918	};
852	}	919	}
853		920
854	sub _draw {	921	sub _draw {
855	my ($self) = @_;	922	my ($self) = @_;
856
857	my ($w, $h) = @$self{qw(w h)};
858		923
859	my $tex = $self->{texture}	924	my $tex = $self->{texture}
860	or return;	925	or return;
861		926
862	glEnable GL_TEXTURE_2D;	927	glEnable GL_TEXTURE_2D;
863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	928	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864	glColor 0, 0, 0, 1;	929	glColor 0, 0, 0, 1;
865		930
866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	931	$tex->draw_quad_alpha_premultiplied (0, 0);
867		932
868	glDisable GL_TEXTURE_2D;	933	glDisable GL_TEXTURE_2D;
869	}	934	}
870		935
871	#############################################################################	936	#############################################################################
872		937
873	package CFClient::UI::ViewPort;	938	package CFPlus::UI::ViewPort;
874		939
		940	use List::Util qw(min max);
		941
875	our @ISA = CFClient::UI::Window::;	942	our @ISA = CFPlus::UI::Window::;
876		943
877	sub new {	944	sub new {
878	my $class = shift;	945	my $class = shift;
879		946
880	$class->SUPER::new (	947	$class->SUPER::new (
…		…
893	$h = 10 if $self->{scroll_y};	960	$h = 10 if $self->{scroll_y};
894		961
895	($w, $h)	962	($w, $h)
896	}	963	}
897		964
898	sub size_allocate {	965	sub invoke_size_allocate {
899	my ($self, $w, $h) = @_;	966	my ($self, $w, $h) = @_;
900		967
901	my $child = $self->child;	968	my $child = $self->child;
902		969
903	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	970	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	971	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905		972
906	$self->child->configure (0, 0, $w, $h);	973	$self->child->configure (0, 0, $w, $h);
907	$self->update;	974	$self->update;
		975
		976	1
908	}	977	}
909		978
910	sub set_offset {	979	sub set_offset {
911	my ($self, $x, $y) = @_;	980	my ($self, $x, $y) = @_;
912		981
		982	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		983	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		984
		985	if ($x != $self->{view_x} or $y != $self->{view_y}) {
913	$self->{view_x} = int $x;	986	$self->{view_x} = $x;
914	$self->{view_y} = int $y;	987	$self->{view_y} = $y;
915		988
		989	$self->emit (changed => $x, $y);
916	$self->update;	990	$self->update;
		991	}
917	}	992	}
918		993
919	# hmm, this does not work for topleft of $self... but we should not ask for that	994	# hmm, this does not work for topleft of $self... but we should not ask for that
920	sub coord2local {	995	sub coord2local {
921	my ($self, $x, $y) = @_;	996	my ($self, $x, $y) = @_;
…		…
936	my ($self, $x, $y) = @_;	1011	my ($self, $x, $y) = @_;
937		1012
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1013	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1014	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	1015	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1016	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	1017	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1018	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1019	}
945	}	1020	}
946		1021
947	sub _render {	1022	sub _render {
948	my ($self) = @_;	1023	my ($self) = @_;
949		1024
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1025	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};	1026	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		1027
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1028	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1029
955	$self->SUPER::_render;	1030	$self->SUPER::_render;
956	}	1031	}
957		1032
958	#############################################################################	1033	#############################################################################
959		1034
960	package CFClient::UI::ScrolledWindow;	1035	package CFPlus::UI::ScrolledWindow;
961		1036
962	our @ISA = CFClient::UI::HBox::;	1037	our @ISA = CFPlus::UI::Table::;
963		1038
964	sub new {	1039	sub new {
965	my ($class, %arg) = @_;	1040	my ($class, %arg) = @_;
966		1041
967	my $child = delete $arg{child};	1042	my $child = delete $arg{child};
968		1043
969	my $self;	1044	my $self;
970		1045
971	my $slider = new CFClient::UI::Slider	1046	my $hslider = new CFPlus::UI::Slider
		1047	vertical => 0,
		1048	range => [0, 0, 1, 0.01], # HACK fix
		1049	on_changed => sub {
		1050	$self->{hpos} = $_[1];
		1051	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1052	},
		1053	;
		1054
		1055	my $vslider = new CFPlus::UI::Slider
972	vertical => 1,	1056	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1057	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1058	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1059	$self->{vpos} = $_[1];
		1060	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976	},	1061	},
977	;	1062	;
978		1063
979	$self = $class->SUPER::new (	1064	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1065	scroll_x => 0,
		1066	scroll_y => 1,
		1067	can_events => 1,
981	slider => $slider,	1068	hslider => $hslider,
		1069	vslider => $vslider,
		1070	col_expand => [1, 0],
		1071	row_expand => [1, 0],
982	%arg,	1072	%arg,
983	);	1073	);
984		1074
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1075	$self->{vp} = new CFPlus::UI::ViewPort
		1076	expand => 1,
		1077	scroll_x => $self->{scroll_x},
		1078	scroll_y => $self->{scroll_y},
		1079	on_changed => sub {
		1080	my ($vp, $x, $y) = @_;
		1081
		1082	$vp->{parent}{hslider}->set_value ($x);
		1083	$vp->{parent}{vslider}->set_value ($y);
		1084
		1085	0
		1086	},
		1087	;
		1088
		1089	$self->SUPER::add_at (0, 0, $self->{vp});
		1090
986	$self->add ($child) if $child;	1091	$self->add ($child) if $child;
987		1092
988	$self	1093	$self
989	}	1094	}
		1095
		1096	#TODO# update range on size_allocate depending on child
990		1097
991	sub add {	1098	sub add {
992	my ($self, $widget) = @_;	1099	my ($self, $widget) = @_;
993		1100
994	$self->{vp}->add ($self->{child} = $widget);	1101	$self->{vp}->add ($self->{child} = $widget);
995	}	1102	}
996		1103
		1104	sub update_slider {
		1105	my ($self) = @_;
		1106
		1107	my $child = ($self->{vp} or return)->child;
		1108
		1109	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1110	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1111
		1112	my $visible = $w1 > $w2;
		1113	if ($visible != $self->{hslider}{visible}) {
		1114	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
		1115	: $self->{hslider}->hide;
		1116	}
		1117
		1118	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1119	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1120
		1121	my $visible = $h1 > $h2;
		1122	if ($visible != $self->{vslider}{visible}) {
		1123	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
		1124	: $self->{vslider}->hide;
		1125	}
		1126	}
		1127
997	sub update {	1128	sub update {
998	my ($self) = @_;	1129	my ($self) = @_;
999		1130
		1131	$self->update_slider;
1000	$self->SUPER::update;	1132	$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	}	1133	}
1006		1134
		1135	sub invoke_mouse_wheel {
		1136	my ($self, $ev) = @_;
		1137
		1138	return 0 unless $ev->{dy}; # only vertical movements for now
		1139
		1140	$self->{vslider}->emit (mouse_wheel => $ev);
		1141
		1142	1
		1143	}
		1144
		1145	sub invoke_button_down {
		1146	my ($self, $ev, $x, $y) = @_;
		1147
		1148	if ($ev->{button} == 2) {
		1149	$self->grab_focus;
		1150
		1151	my $ox = $self->{vp}{view_x} + $ev->{x};
		1152	my $oy = $self->{vp}{view_y} + $ev->{y};
		1153
		1154	$self->{motion} = sub {
		1155	my ($ev, $x, $y) = @_;
		1156
		1157	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1158	$self->update;
		1159	};
		1160
		1161	return 1;
		1162	}
		1163
		1164	0
		1165	}
		1166
		1167	sub invoke_button_up {
		1168	my ($self, $ev, $x, $y) = @_;
		1169
		1170	if (delete $self->{motion}) {
		1171	return 1;
		1172	}
		1173
		1174	0
		1175	}
		1176
		1177	sub invoke_mouse_motion {
		1178	my ($self, $ev, $x, $y) = @_;
		1179
		1180	if ($self->{motion}) {
		1181	$self->{motion}->($ev, $x, $y);
		1182	return 1;
		1183	}
		1184
		1185	0
		1186	}
		1187
1007	sub size_allocate {	1188	sub invoke_size_allocate {
1008	my ($self, $w, $h) = @_;	1189	my ($self, $w, $h) = @_;
1009		1190
		1191	$self->update_slider;
1010	$self->SUPER::size_allocate ($w, $h);	1192	$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	}	1193	}
1015
1016	#TODO# update range on size_allocate depending on child
1017	# update viewport offset on scroll
1018		1194
1019	#############################################################################	1195	#############################################################################
1020		1196
1021	package CFClient::UI::Frame;	1197	package CFPlus::UI::Frame;
1022		1198
1023	our @ISA = CFClient::UI::Bin::;	1199	our @ISA = CFPlus::UI::Bin::;
1024		1200
1025	use CFClient::OpenGL;	1201	use CFPlus::OpenGL;
1026		1202
1027	sub new {	1203	sub new {
1028	my $class = shift;	1204	my $class = shift;
1029		1205
1030	$class->SUPER::new (	1206	$class->SUPER::new (
…		…
1056	$self->SUPER::_draw;	1232	$self->SUPER::_draw;
1057	}	1233	}
1058		1234
1059	#############################################################################	1235	#############################################################################
1060		1236
1061	package CFClient::UI::FancyFrame;	1237	package CFPlus::UI::FancyFrame;
1062		1238
1063	our @ISA = CFClient::UI::Bin::;	1239	our @ISA = CFPlus::UI::Bin::;
1064		1240
1065	use CFClient::OpenGL;	1241	use CFPlus::OpenGL;
		1242
		1243	sub new {
		1244	my ($class, %arg) = @_;
		1245
		1246	if ((exists $arg{label}) && !ref $arg{label}) {
		1247	$arg{label} = new CFPlus::UI::Label
		1248	align => 1,
		1249	valign => 0,
		1250	text => $arg{label},
		1251	fontsize => ($arg{border} || 0.8) * 0.75;
		1252	}
		1253
		1254	my $self = $class->SUPER::new (
		1255	# label => "",
		1256	fg => [0.6, 0.3, 0.1],
		1257	border => 0.8,
		1258	style => 'single',
		1259	%arg,
		1260	);
		1261
		1262	$self
		1263	}
		1264
		1265	sub add {
		1266	my ($self, @widgets) = @_;
		1267
		1268	$self->SUPER::add (@widgets);
		1269	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1270	}
		1271
		1272	sub border {
		1273	int $_[0]{border} * $::FONTSIZE
		1274	}
		1275
		1276	sub size_request {
		1277	my ($self) = @_;
		1278
		1279	($self->{label_w}, undef) = $self->{label}->size_request
		1280	if $self->{label};
		1281
		1282	my ($w, $h) = $self->SUPER::size_request;
		1283
		1284	(
		1285	$w + $self->border * 2,
		1286	$h + $self->border * 2,
		1287	)
		1288	}
		1289
		1290	sub invoke_size_allocate {
		1291	my ($self, $w, $h) = @_;
		1292
		1293	my $border = $self->border;
		1294
		1295	$w -= List::Util::max 0, $border * 2;
		1296	$h -= List::Util::max 0, $border * 2;
		1297
		1298	if (my $label = $self->{label}) {
		1299	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1300	$label->{h} = List::Util::min $h, $border;
		1301	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1302	}
		1303
		1304	$self->child->configure ($border, $border, $w, $h);
		1305
		1306	1
		1307	}
		1308
		1309	sub _draw {
		1310	my ($self) = @_;
		1311
		1312	my $child = $self->{children}[0];
		1313
		1314	my $border = $self->border;
		1315	my ($w, $h) = ($self->{w}, $self->{h});
		1316
		1317	$child->draw;
		1318
		1319	glColor @{$self->{fg}};
		1320	glBegin GL_LINE_STRIP;
		1321	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1322	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1323	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1324	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1325	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1326	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1327	glEnd;
		1328
		1329	if ($self->{label}) {
		1330	glTranslate $border * 2, 0;
		1331	$self->{label}->_draw;
		1332	}
		1333	}
		1334
		1335	#############################################################################
		1336
		1337	package CFPlus::UI::Toplevel;
		1338
		1339	our @ISA = CFPlus::UI::Bin::;
		1340
		1341	use CFPlus::OpenGL;
1066		1342
1067	my $bg =	1343	my $bg =
1068	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1344	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069	mipmap => 1, wrap => 1;	1345	mipmap => 1, wrap => 1;
1070		1346
1071	my @border =	1347	my @border =
1072	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1348	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);	1349	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1350
		1351	my @icon =
		1352	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1353	qw(x1_move.png x1_resize.png);
1074		1354
1075	sub new {	1355	sub new {
1076	my ($class, %arg) = @_;	1356	my ($class, %arg) = @_;
1077		1357
1078	my $self = $class->SUPER::new (	1358	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1359	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1360	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1361	border => 0.6,
1082	can_events => 1,	1362	can_events => 1,
1083	min_w => 16,	1363	min_w => 64,
1084	min_h => 16,	1364	min_h => 32,
1085	%arg,	1365	%arg,
1086	);	1366	);
1087		1367
1088	$self->{title_widget} = new CFClient::UI::Label	1368	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1369	align => 0,
1090	valign => 1,	1370	valign => 1,
1091	text => $self->{title},	1371	text => $self->{title},
1092	fontsize => $self->{border},	1372	fontsize => $self->{border},
1093	if exists $self->{title};	1373	if exists $self->{title};
1094		1374
1095	unless ($self->{no_close_button}) {	1375	if ($self->{has_close_button}) {
1096	$self->{close_btn} =	1376	$self->{close_button} =
1097	new CFClient::UI::ImageButton	1377	new CFPlus::UI::ImageButton
1098	image => 'x1_close.png',	1378	path => 'x1_close.png',
1099	on_activate => sub { $self->hide };	1379	on_activate => sub { $self->emit ("delete") };
1100		1380
1101	$self->CFClient::UI::Container::add ($self->{close_btn});	1381	$self->CFPlus::UI::Container::add ($self->{close_button});
1102	}	1382	}
1103		1383
1104	$self	1384	$self
1105	}	1385	}
1106		1386
1107	sub add {	1387	sub add {
1108	my ($self, @widgets) = @_;	1388	my ($self, @widgets) = @_;
1109		1389
1110	$self->SUPER::add (@widgets);	1390	$self->SUPER::add (@widgets);
1111	$self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};	1391	$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};	1392	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113	}	1393	}
1114		1394
1115	sub border {	1395	sub border {
1116	int $_[0]{border} * $::FONTSIZE	1396	int $_[0]{border} * $::FONTSIZE
1117	}	1397	}
…		…
1120	my ($self) = @_;	1400	my ($self) = @_;
1121		1401
1122	$self->{title_widget}->size_request	1402	$self->{title_widget}->size_request
1123	if $self->{title_widget};	1403	if $self->{title_widget};
1124		1404
1125	$self->{close_btn}->size_request	1405	$self->{close_button}->size_request
1126	if $self->{close_btn};	1406	if $self->{close_button};
1127		1407
1128	my ($w, $h) = $self->SUPER::size_request;	1408	my ($w, $h) = $self->SUPER::size_request;
1129		1409
1130	(	1410	(
1131	$w + $self->border * 2,	1411	$w + $self->border * 2,
1132	$h + $self->border * 2,	1412	$h + $self->border * 2,
1133	)	1413	)
1134	}	1414	}
1135		1415
1136	sub size_allocate {	1416	sub invoke_size_allocate {
1137	my ($self, $w, $h) = @_;	1417	my ($self, $w, $h) = @_;
1138		1418
1139	if ($self->{title_widget}) {	1419	if ($self->{title_widget}) {
1140	$self->{title_widget}{w} = $w;	1420	$self->{title_widget}{w} = $w;
1141	$self->{title_widget}{h} = $h;	1421	$self->{title_widget}{h} = $h;
1142	$self->{title_widget}->size_allocate ($w, $h);	1422	$self->{title_widget}->invoke_size_allocate ($w, $h);
1143	}	1423	}
1144		1424
1145	my $border = $self->border;	1425	my $border = $self->border;
1146		1426
1147	$h -= List::Util::max 0, $border * 2;	1427	$h -= List::Util::max 0, $border * 2;
1148	$w -= List::Util::max 0, $border * 2;	1428	$w -= List::Util::max 0, $border * 2;
1149		1429
1150	$self->child->configure ($border, $border, $w, $h);	1430	$self->child->configure ($border, $border, $w, $h);
1151		1431
1152	$self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border)	1432	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153	if $self->{close_btn};	1433	if $self->{close_button};
1154	}
1155		1434
		1435	1
		1436	}
		1437
		1438	sub invoke_delete {
		1439	my ($self) = @_;
		1440
		1441	$self->hide;
		1442
		1443	1
		1444	}
		1445
1156	sub button_down {	1446	sub invoke_button_down {
1157	my ($self, $ev, $x, $y) = @_;	1447	my ($self, $ev, $x, $y) = @_;
1158		1448
1159	my ($w, $h) = @$self{qw(w h)};	1449	my ($w, $h) = @$self{qw(w h)};
1160	my $border = $self->border;	1450	my $border = $self->border;
1161		1451
…		…
1192		1482
1193	($x, $y) = ($ev->{x}, $ev->{y});	1483	($x, $y) = ($ev->{x}, $ev->{y});
1194		1484
1195	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1485	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196	# HACK: the next line is required to enforce placement	1486	# HACK: the next line is required to enforce placement
1197	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1487	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1198	};	1488	};
1199	} else {	1489	} else {
1200	return 0;	1490	return 0;
1201	}	1491	}
1202		1492
1203	1	1493	1
1204	}	1494	}
1205		1495
1206	sub button_up {	1496	sub invoke_button_up {
1207	my ($self, $ev, $x, $y) = @_;	1497	my ($self, $ev, $x, $y) = @_;
1208		1498
1209	$self->{close_btn}->button_up ($ev, $x, $y)
1210	if $self->{close_btn};
1211
1212	!!delete $self->{motion}	1499	! ! delete $self->{motion}
1213	}	1500	}
1214		1501
1215	sub mouse_motion {	1502	sub invoke_mouse_motion {
1216	my ($self, $ev, $x, $y) = @_;	1503	my ($self, $ev, $x, $y) = @_;
1217		1504
1218	$self->{motion}->($ev, $x, $y) if $self->{motion};	1505	$self->{motion}->($ev, $x, $y) if $self->{motion};
1219		1506
1220	!!$self->{motion}	1507	! ! $self->{motion}
		1508	}
		1509
		1510	sub invoke_visibility_change {
		1511	my ($self, $visible) = @_;
		1512
		1513	delete $self->{motion} unless $visible;
		1514
		1515	0
1221	}	1516	}
1222		1517
1223	sub _draw {	1518	sub _draw {
1224	my ($self) = @_;	1519	my ($self) = @_;
1225		1520
…		…
1232	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1527	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1233		1528
1234	my $border = $self->border;	1529	my $border = $self->border;
1235		1530
1236	glColor @{ $self->{border_bg} };	1531	glColor @{ $self->{border_bg} };
1237	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1532	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1238	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1533	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1239	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1534	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1240	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1535	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1536
		1537	# move
		1538	my $w2 = ($w - $border) * .5;
		1539	my $h2 = ($h - $border) * .5;
		1540	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1541	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1542	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1543
		1544	# resize
		1545	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1546	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1547	unless $self->{has_close_button};
		1548	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1549	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1241		1550
1242	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1551	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1243	glColor @{ $self->{bg} };	1552	glColor @{ $self->{bg} };
1244		1553
1245	# TODO: repeat texture not scale	1554	# TODO: repeat texture not scale
…		…
1258	$self->{title_widget}->_draw;	1567	$self->{title_widget}->_draw;
1259		1568
1260	glTranslate 0, - ($border - $self->{h});	1569	glTranslate 0, - ($border - $self->{h});
1261	}	1570	}
1262		1571
1263	$self->{close_btn}->draw	1572	$self->{close_button}->draw
1264	if $self->{close_btn};	1573	if $self->{close_button};
1265	}	1574	}
1266		1575
1267	#############################################################################	1576	#############################################################################
1268		1577
1269	package CFClient::UI::Table;	1578	package CFPlus::UI::Table;
1270		1579
1271	our @ISA = CFClient::UI::Base::;	1580	our @ISA = CFPlus::UI::Base::;
1272		1581
1273	use List::Util qw(max sum);	1582	use List::Util qw(max sum);
1274		1583
1275	use CFClient::OpenGL;	1584	use CFPlus::OpenGL;
1276		1585
1277	sub new {	1586	sub new {
1278	my $class = shift;	1587	my $class = shift;
1279		1588
1280	$class->SUPER::new (	1589	$class->SUPER::new (
		1590	children => [],
1281	col_expand => [],	1591	col_expand => [],
		1592	row_expand => [],
1282	@_,	1593	@_,
1283	)	1594	)
1284	}	1595	}
1285		1596
1286	sub children {	1597	sub children {
1287	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1598	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1288	}	1599	}
1289		1600
		1601	# TODO: store row/col info in child widget and use standard add/del
1290	sub add {	1602	sub add {
1291	my ($self, $x, $y, $child) = @_;	1603	my $self = shift;
1292		1604
		1605	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
		1606	$self->add_at (@_);
		1607	}
		1608
		1609	sub add_at {
		1610	my $self = shift;
		1611
		1612	while (@_) {
		1613	my ($col, $row, $child) = splice @_, 0, 3, ();
		1614
1293	$child->set_parent ($self);	1615	$child->set_parent ($self);
1294	$self->{children}[$y][$x] = $child;	1616	$self->{children}[$row][$col] = $child;
		1617	}
1295		1618
		1619	$self->{force_realloc} = 1;
		1620	$self->{force_size_alloc} = 1;
1296	$self->realloc;	1621	$self->realloc;
1297	}	1622	}
1298		1623
1299	sub remove {	1624	sub remove {
1300	my ($self, $child) = @_;	1625	my ($self, $child) = @_;
1301		1626
1302	# TODO: not yet implemented	1627	for (@{ $self->{children} }) {
		1628	for (@{ $_ || [] }) {
		1629	$_ = undef if $_ == $child;
		1630	}
		1631	}
1303	}	1632	}
1304		1633
1305	# TODO: move to container class maybe? send children a signal on removal?	1634	# TODO: move to container class maybe? send children a signal on removal?
1306	sub clear {	1635	sub clear {
1307	my ($self) = @_;	1636	my ($self) = @_;
…		…
1348	(sum @$ws),	1677	(sum @$ws),
1349	(sum @$hs),	1678	(sum @$hs),
1350	)	1679	)
1351	}	1680	}
1352		1681
1353	sub size_allocate {	1682	sub invoke_size_allocate {
1354	my ($self, $w, $h) = @_;	1683	my ($self, $w, $h) = @_;
1355		1684
1356	my ($ws, $hs) = $self->get_wh;	1685	my ($ws, $hs) = $self->get_wh;
1357		1686
1358	my $req_w = (sum @$ws) || 1;	1687	my $req_w = (sum @$ws) || 1;
1359	my $req_h = (sum @$hs) || 1;	1688	my $req_h = (sum @$hs) || 1;
1360		1689
1361	# TODO: nicer code && do row_expand	1690	# TODO: nicer code
1362	my @col_expand = @{$self->{col_expand}};	1691	my @col_expand = @{$self->{col_expand}};
1363	@col_expand = (1) x @$ws unless @col_expand;	1692	@col_expand = (1) x @$ws unless @col_expand;
1364	my $col_expand = (sum @col_expand) || 1;	1693	my $col_expand = (sum @col_expand) || 1;
1365		1694
1366	# linearly scale sizes
1367	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1695	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1368	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1369		1696
1370	CFClient::UI::harmonize $ws;	1697	CFPlus::UI::harmonize $ws;
		1698
		1699	my @row_expand = @{$self->{row_expand}};
		1700	@row_expand = (1) x @$ws unless @row_expand;
		1701	my $row_expand = (sum @row_expand) || 1;
		1702
		1703	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1704
1371	CFClient::UI::harmonize $hs;	1705	CFPlus::UI::harmonize $hs;
1372		1706
1373	my $y;	1707	my $y;
1374		1708
1375	for my $r (0 .. $#{$self->{children}}) {	1709	for my $r (0 .. $#{$self->{children}}) {
1376	my $row = $self->{children}[$r]	1710	my $row = $self->{children}[$r]
…		…
1390	}	1724	}
1391		1725
1392	$y += $row_h;	1726	$y += $row_h;
1393	}	1727	}
1394		1728
		1729	1
1395	}	1730	}
1396		1731
1397	sub find_widget {	1732	sub find_widget {
1398	my ($self, $x, $y) = @_;	1733	my ($self, $x, $y) = @_;
1399		1734
…		…
1418	}	1753	}
1419	}	1754	}
1420		1755
1421	#############################################################################	1756	#############################################################################
1422		1757
1423	package CFClient::UI::Box;	1758	package CFPlus::UI::Fixed;
1424		1759
		1760	use List::Util qw(min max);
		1761
1425	our @ISA = CFClient::UI::Container::;	1762	our @ISA = CFPlus::UI::Container::;
		1763
		1764	sub add {
		1765	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1766
		1767	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1768	$self->SUPER::add ($child);
		1769	}
		1770
		1771	sub _scale($$$) {
		1772	my ($mode, $val, $max) = @_;
		1773
		1774	$mode eq "abs" ? $val
		1775	: $mode eq "rel" ? $val * $max
		1776	: 0
		1777	}
		1778
		1779	sub size_request {
		1780	my ($self) = @_;
		1781
		1782	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1783
		1784	# determine overall size by querying abs widgets
		1785	for my $child ($self->visible_children) {
		1786	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1787
		1788	if ($pos eq "abs") {
		1789	$w = _scale $size, $w, $child->{req_w};
		1790	$h = _scale $size, $h, $child->{req_h};
		1791
		1792	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1793	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1794	}
		1795	}
		1796
		1797	my $W = $x2 - $x1;
		1798	my $H = $y2 - $y1;
		1799
		1800	# now layout remaining widgets
		1801	for my $child ($self->visible_children) {
		1802	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1803
		1804	if ($pos ne "abs") {
		1805	$x = _scale $pos, $x, $W;
		1806	$y = _scale $pos, $x, $H;
		1807	$w = _scale $size, $w, $child->{req_w};
		1808	$h = _scale $size, $h, $child->{req_h};
		1809
		1810	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1811	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1812	}
		1813	}
		1814
		1815	my $W = $x2 - $x1;
		1816	my $H = $y2 - $y1;
		1817
		1818	($W, $H)
		1819	}
		1820
		1821	sub invoke_size_allocate {
		1822	my ($self, $W, $H) = @_;
		1823
		1824	for my $child ($self->visible_children) {
		1825	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1826
		1827	$x = _scale $pos, $x, $W;
		1828	$y = _scale $pos, $x, $H;
		1829	$w = _scale $size, $w, $child->{req_w};
		1830	$h = _scale $size, $h, $child->{req_h};
		1831
		1832	$child->configure ($x, $y, $w, $h);
		1833	}
		1834
		1835	1
		1836	}
		1837
		1838	#############################################################################
		1839
		1840	package CFPlus::UI::Box;
		1841
		1842	our @ISA = CFPlus::UI::Container::;
1426		1843
1427	sub size_request {	1844	sub size_request {
1428	my ($self) = @_;	1845	my ($self) = @_;
1429		1846
1430	$self->{vertical}	1847	$self->{vertical}
…		…
1436	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1853	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1854	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1438	)	1855	)
1439	}	1856	}
1440		1857
1441	sub size_allocate {	1858	sub invoke_size_allocate {
1442	my ($self, $w, $h) = @_;	1859	my ($self, $w, $h) = @_;
1443		1860
1444	my $space = $self->{vertical} ? $h : $w;	1861	my $space = $self->{vertical} ? $h : $w;
1445	my $children = $self->{children};	1862	my @children = $self->visible_children;
1446		1863
1447	my @req;	1864	my @req;
1448		1865
1449	if ($self->{homogeneous}) {	1866	if ($self->{homogeneous}) {
1450	@req = ($space / (@$children || 1)) x @$children;	1867	@req = ($space / (@children || 1)) x @children;
1451	} else {	1868	} else {
1452	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1869	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453	my $req = List::Util::sum @req;	1870	my $req = List::Util::sum @req;
1454		1871
1455	if ($req > $space) {	1872	if ($req > $space) {
1456	# ah well, not enough space	1873	# ah well, not enough space
1457	$_ *= $space / $req for @req;	1874	$_ *= $space / $req for @req;
1458	} else {	1875	} else {
1459	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1876	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460		1877
1461	$space = ($space - $req) / $expand; # remaining space to give away	1878	$space = ($space - $req) / $expand; # remaining space to give away
1462		1879
1463	$req[$_] += $space * $children->[$_]{expand}	1880	$req[$_] += $space * $children[$_]{expand}
1464	for 0 .. $#$children;	1881	for 0 .. $#children;
1465	}	1882	}
1466	}	1883	}
1467		1884
1468	CFClient::UI::harmonize \@req;	1885	CFPlus::UI::harmonize \@req;
1469		1886
1470	my $pos = 0;	1887	my $pos = 0;
1471	for (0 .. $#$children) {	1888	for (0 .. $#children) {
1472	my $alloc = $req[$_];	1889	my $alloc = $req[$_];
1473	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1890	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1474		1891
1475	$pos += $alloc;	1892	$pos += $alloc;
1476	}	1893	}
1477		1894
1478	1	1895	1
1479	}	1896	}
1480		1897
1481	#############################################################################	1898	#############################################################################
1482		1899
1483	package CFClient::UI::HBox;	1900	package CFPlus::UI::HBox;
1484		1901
1485	our @ISA = CFClient::UI::Box::;	1902	our @ISA = CFPlus::UI::Box::;
1486		1903
1487	sub new {	1904	sub new {
1488	my $class = shift;	1905	my $class = shift;
1489		1906
1490	$class->SUPER::new (	1907	$class->SUPER::new (
…		…
1493	)	1910	)
1494	}	1911	}
1495		1912
1496	#############################################################################	1913	#############################################################################
1497		1914
1498	package CFClient::UI::VBox;	1915	package CFPlus::UI::VBox;
1499		1916
1500	our @ISA = CFClient::UI::Box::;	1917	our @ISA = CFPlus::UI::Box::;
1501		1918
1502	sub new {	1919	sub new {
1503	my $class = shift;	1920	my $class = shift;
1504		1921
1505	$class->SUPER::new (	1922	$class->SUPER::new (
…		…
1508	)	1925	)
1509	}	1926	}
1510		1927
1511	#############################################################################	1928	#############################################################################
1512		1929
1513	package CFClient::UI::Label;	1930	package CFPlus::UI::Label;
1514		1931
1515	our @ISA = CFClient::UI::DrawBG::;	1932	our @ISA = CFPlus::UI::DrawBG::;
1516		1933
1517	use CFClient::OpenGL;	1934	use CFPlus::OpenGL;
1518		1935
1519	sub new {	1936	sub new {
1520	my ($class, %arg) = @_;	1937	my ($class, %arg) = @_;
1521		1938
1522	my $self = $class->SUPER::new (	1939	my $self = $class->SUPER::new (
…		…
1525	#active_bg => none	1942	#active_bg => none
1526	#font => default_font	1943	#font => default_font
1527	#text => initial text	1944	#text => initial text
1528	#markup => initial narkup	1945	#markup => initial narkup
1529	#max_w => maximum pixel width	1946	#max_w => maximum pixel width
		1947	#style => 0, # render flags
1530	ellipsise => 3, # end	1948	ellipsise => 3, # end
1531	layout => (new CFClient::Layout),	1949	layout => (new CFPlus::Layout),
1532	fontsize => 1,	1950	fontsize => 1,
1533	align => -1,	1951	align => -1,
1534	valign => -1,	1952	valign => -1,
1535	padding_x => 2,	1953	padding_x => 2,
1536	padding_y => 2,	1954	padding_y => 2,
1537	can_events => 0,	1955	can_events => 0,
1538	%arg	1956	%arg
1539	);	1957	);
1540		1958
1541	if (exists $self->{template}) {	1959	if (exists $self->{template}) {
1542	my $layout = new CFClient::Layout;	1960	my $layout = new CFPlus::Layout;
1543	$layout->set_text (delete $self->{template});	1961	$layout->set_text (delete $self->{template});
1544	$self->{template} = $layout;	1962	$self->{template} = $layout;
1545	}	1963	}
1546		1964
1547	if (exists $self->{markup}) {	1965	if (exists $self->{markup}) {
…		…
1551	}	1969	}
1552		1970
1553	$self	1971	$self
1554	}	1972	}
1555		1973
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 {	1974	sub update {
1567	my ($self) = @_;	1975	my ($self) = @_;
1568		1976
1569	delete $self->{texture};	1977	delete $self->{texture};
1570	$self->SUPER::update;	1978	$self->SUPER::update;
…		…
1581	my ($self, $text) = @_;	1989	my ($self, $text) = @_;
1582		1990
1583	return if $self->{text} eq "T$text";	1991	return if $self->{text} eq "T$text";
1584	$self->{text} = "T$text";	1992	$self->{text} = "T$text";
1585		1993
1586	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587	$self->{layout}->set_text ($text);	1994	$self->{layout}->set_text ($text);
1588		1995
1589	delete $self->{size_req};	1996	delete $self->{size_req};
1590	$self->realloc;	1997	$self->realloc;
1591	$self->update;	1998	$self->update;
…		…
1597	return if $self->{text} eq "M$markup";	2004	return if $self->{text} eq "M$markup";
1598	$self->{text} = "M$markup";	2005	$self->{text} = "M$markup";
1599		2006
1600	my $rgba = $markup =~ /span.*(?:foreground|background)/;	2007	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601		2008
1602	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603	$self->{layout}->set_markup ($markup);	2009	$self->{layout}->set_markup ($markup);
1604		2010
1605	delete $self->{size_req};	2011	delete $self->{size_req};
1606	$self->realloc;	2012	$self->realloc;
1607	$self->update;	2013	$self->update;
…		…
1619		2025
1620	my ($w, $h) = $self->{layout}->size;	2026	my ($w, $h) = $self->{layout}->size;
1621		2027
1622	if (exists $self->{template}) {	2028	if (exists $self->{template}) {
1623	$self->{template}->set_font ($self->{font}) if $self->{font};	2029	$self->{template}->set_font ($self->{font}) if $self->{font};
		2030	$self->{template}->set_width ($self->{max_w} || -1);
1624	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2031	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625		2032
1626	my ($w2, $h2) = $self->{template}->size;	2033	my ($w2, $h2) = $self->{template}->size;
1627		2034
1628	$w = List::Util::max $w, $w2;	2035	$w = List::Util::max $w, $w2;
…		…
1633	};	2040	};
1634		2041
1635	@{ $self->{size_req} }	2042	@{ $self->{size_req} }
1636	}	2043	}
1637		2044
		2045	sub baseline_shift {
		2046	$_[0]{layout}->descent
		2047	}
		2048
1638	sub size_allocate {	2049	sub invoke_size_allocate {
1639	my ($self, $w, $h) = @_;	2050	my ($self, $w, $h) = @_;
1640		2051
1641	delete $self->{ox};	2052	delete $self->{ox};
1642		2053
1643	delete $self->{texture}	2054	delete $self->{texture}
1644	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	2055	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		2056
		2057	1
1645	}	2058	}
1646		2059
1647	sub set_fontsize {	2060	sub set_fontsize {
1648	my ($self, $fontsize) = @_;	2061	my ($self, $fontsize) = @_;
1649		2062
1650	$self->{fontsize} = $fontsize;	2063	$self->{fontsize} = $fontsize;
		2064	delete $self->{size_req};
1651	delete $self->{texture};	2065	delete $self->{texture};
1652		2066
1653	$self->realloc;	2067	$self->realloc;
1654	}	2068	}
1655		2069
1656	sub reconfigure {	2070	sub reconfigure {
1657	my ($self) = @_;	2071	my ($self) = @_;
1658		2072
1659	delete $self->{size_req};	2073	delete $self->{size_req};
		2074	delete $self->{texture};
1660		2075
1661	$self->SUPER::reconfigure;	2076	$self->SUPER::reconfigure;
1662	}	2077	}
1663		2078
1664	sub _draw {	2079	sub _draw {
1665	my ($self) = @_;	2080	my ($self) = @_;
1666		2081
1667	$self->SUPER::_draw; # draw background, if applicable	2082	$self->SUPER::_draw; # draw background, if applicable
1668		2083
1669	my $tex = $self->{texture} ||= do {	2084	my $size = $self->{texture} ||= do {
1670	$self->{layout}->set_foreground (@{$self->{fg}});	2085	$self->{layout}->set_foreground (@{$self->{fg}});
1671	$self->{layout}->set_font ($self->{font}) if $self->{font};	2086	$self->{layout}->set_font ($self->{font}) if $self->{font};
1672	$self->{layout}->set_width ($self->{w});	2087	$self->{layout}->set_width ($self->{w});
1673	$self->{layout}->set_ellipsise ($self->{ellipsise});	2088	$self->{layout}->set_ellipsise ($self->{ellipsise});
1674	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2089	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2090	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676		2091
1677	new_from_layout CFClient::Texture $self->{layout}	2092	[$self->{layout}->size]
1678	};	2093	};
1679		2094
1680	unless (exists $self->{ox}) {	2095	unless (exists $self->{ox}) {
1681	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2096	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2097	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683	: ($self->{w} - $tex->{w}) * 0.5);	2098	: ($self->{w} - $size->[0]) * 0.5);
1684		2099
1685	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2100	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2101	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687	: ($self->{h} - $tex->{h}) * 0.5);	2102	: ($self->{h} - $size->[1]) * 0.5);
1688	};	2103	};
1689		2104
1690	glEnable GL_TEXTURE_2D;
1691
1692	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2105	my $w = List::Util::min $self->{w} + 4, $size->[0];
1693	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2106	my $h = List::Util::min $self->{h} + 2, $size->[1];
1694		2107
1695	if ($tex->{format} == GL_ALPHA) {	2108	$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	}	2109	}
1706		2110
1707	#############################################################################	2111	#############################################################################
1708		2112
1709	package CFClient::UI::EntryBase;	2113	package CFPlus::UI::EntryBase;
1710		2114
1711	our @ISA = CFClient::UI::Label::;	2115	our @ISA = CFPlus::UI::Label::;
1712		2116
1713	use CFClient::OpenGL;	2117	use CFPlus::OpenGL;
1714		2118
1715	sub new {	2119	sub new {
1716	my $class = shift;	2120	my $class = shift;
1717		2121
1718	$class->SUPER::new (	2122	$class->SUPER::new (
…		…
1722	active_fg => [0, 0, 0],	2126	active_fg => [0, 0, 0],
1723	can_hover => 1,	2127	can_hover => 1,
1724	can_focus => 1,	2128	can_focus => 1,
1725	valign => 0,	2129	valign => 0,
1726	can_events => 1,	2130	can_events => 1,
		2131	ellipsise => 0,
1727	#text => ...	2132	#text => ...
1728	#hidden => "*",	2133	#hidden => "*",
1729	@_	2134	@_
1730	)	2135	)
1731	}	2136	}
…		…
1742		2147
1743	$text =~ s/./*/g if $self->{hidden};	2148	$text =~ s/./*/g if $self->{hidden};
1744	$self->{layout}->set_text ("$text ");	2149	$self->{layout}->set_text ("$text ");
1745	delete $self->{size_req};	2150	delete $self->{size_req};
1746		2151
1747	$self->_emit (changed => $self->{text});	2152	$self->emit (changed => $self->{text});
1748		2153
1749	$self->realloc;	2154	$self->realloc;
1750	$self->update;	2155	$self->update;
1751	}	2156	}
1752		2157
…		…
1767	my ($w, $h) = $self->SUPER::size_request;	2172	my ($w, $h) = $self->SUPER::size_request;
1768		2173
1769	($w + 1, $h) # add 1 for cursor	2174	($w + 1, $h) # add 1 for cursor
1770	}	2175	}
1771		2176
1772	sub key_down {	2177	sub invoke_key_down {
1773	my ($self, $ev) = @_;	2178	my ($self, $ev) = @_;
1774		2179
1775	my $mod = $ev->{mod};	2180	my $mod = $ev->{mod};
1776	my $sym = $ev->{sym};	2181	my $sym = $ev->{sym};
1777	my $uni = $ev->{unicode};	2182	my $uni = $ev->{unicode};
1778		2183
1779	my $text = $self->get_text;	2184	my $text = $self->get_text;
		2185
		2186	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1780		2187
1781	if ($uni == 8) {	2188	if ($uni == 8) {
1782	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2189	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783	} elsif ($uni == 127) {	2190	} elsif ($uni == 127) {
1784	substr $text, $self->{cursor}, 1, "";	2191	substr $text, $self->{cursor}, 1, "";
1785	} elsif ($sym == CFClient::SDLK_LEFT) {	2192	} elsif ($sym == CFPlus::SDLK_LEFT) {
1786	--$self->{cursor} if $self->{cursor};	2193	--$self->{cursor} if $self->{cursor};
1787	} elsif ($sym == CFClient::SDLK_RIGHT) {	2194	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1788	++$self->{cursor} if $self->{cursor} < length $self->{text};	2195	++$self->{cursor} if $self->{cursor} < length $self->{text};
1789	} elsif ($sym == CFClient::SDLK_HOME) {	2196	} elsif ($sym == CFPlus::SDLK_HOME) {
		2197	# what a hack
		2198	$self->{cursor} =
		2199	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2200	? length $1
		2201	: 0;
		2202	} elsif ($sym == CFPlus::SDLK_END) {
		2203	# uh, again
		2204	$self->{cursor} =
		2205	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2206	? $self->{cursor} + length $1
		2207	: length $self->{text};
		2208	} elsif ($uni == 21) { # ctrl-u
		2209	$text = "";
1790	$self->{cursor} = 0;	2210	$self->{cursor} = 0;
1791	} elsif ($sym == CFClient::SDLK_END) {
1792	$self->{cursor} = length $text;
1793	} elsif ($uni == 27) {	2211	} elsif ($uni == 27) {
1794	$self->_emit ('escape');	2212	$self->emit ('escape');
1795	} elsif ($uni) {	2213	} elsif ($uni == 0x0d) {
		2214	substr $text, $self->{cursor}++, 0, "\012";
		2215	} elsif ($uni >= 0x20) {
1796	substr $text, $self->{cursor}++, 0, chr $uni;	2216	substr $text, $self->{cursor}++, 0, chr $uni;
1797	} else {	2217	} else {
1798	return 0;	2218	return 0;
1799	}	2219	}
1800		2220
1801	$self->_set_text ($text);	2221	$self->_set_text ($text);
1802		2222
1803	$self->realloc;	2223	$self->realloc;
		2224	$self->update;
1804		2225
1805	1	2226	1
1806	}	2227	}
1807		2228
1808	sub focus_in {	2229	sub invoke_focus_in {
1809	my ($self) = @_;	2230	my ($self) = @_;
1810		2231
1811	$self->{last_activity} = $::NOW;	2232	$self->{last_activity} = $::NOW;
1812		2233
1813	$self->SUPER::focus_in;	2234	$self->SUPER::invoke_focus_in
1814	}	2235	}
1815		2236
1816	sub button_down {	2237	sub invoke_button_down {
1817	my ($self, $ev, $x, $y) = @_;	2238	my ($self, $ev, $x, $y) = @_;
1818		2239
1819	$self->SUPER::button_down ($ev, $x, $y);	2240	$self->SUPER::invoke_button_down ($ev, $x, $y);
1820		2241
1821	my $idx = $self->{layout}->xy_to_index ($x, $y);	2242	my $idx = $self->{layout}->xy_to_index ($x, $y);
1822		2243
1823	# byte-index to char-index	2244	# byte-index to char-index
1824	my $text = $self->{text};	2245	my $text = $self->{text};
1825	utf8::encode $text;	2246	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826	$self->{cursor} = length substr $text, 0, $idx;	2247	$self->{cursor} = length $text;
1827		2248
1828	$self->_set_text ($self->{text});	2249	$self->_set_text ($self->{text});
1829	$self->update;	2250	$self->update;
1830		2251
1831	1	2252	1
1832	}	2253	}
1833		2254
1834	sub mouse_motion {	2255	sub invoke_mouse_motion {
1835	my ($self, $ev, $x, $y) = @_;	2256	my ($self, $ev, $x, $y) = @_;
1836	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2257	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837		2258
1838	0	2259	1
1839	}	2260	}
1840		2261
1841	sub _draw {	2262	sub _draw {
1842	my ($self) = @_;	2263	my ($self) = @_;
1843		2264
…		…
1870	utf8::encode $text;	2291	utf8::encode $text;
1871		2292
1872	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2293	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873	}	2294	}
1874		2295
1875	glColor @{$self->{fg}};
1876	glBegin GL_LINES;	2296	glBegin GL_LINES;
1877	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2297	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};	2298	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879	glEnd;	2299	glEnd;
1880	}	2300	}
1881	}	2301	}
1882		2302
		2303	#############################################################################
		2304
1883	package CFClient::UI::Entry;	2305	package CFPlus::UI::Entry;
1884		2306
1885	our @ISA = CFClient::UI::EntryBase::;	2307	our @ISA = CFPlus::UI::EntryBase::;
1886		2308
1887	use CFClient::OpenGL;	2309	use CFPlus::OpenGL;
1888		2310
1889	sub key_down {	2311	sub invoke_key_down {
1890	my ($self, $ev) = @_;	2312	my ($self, $ev) = @_;
1891		2313
1892	my $sym = $ev->{sym};	2314	my $sym = $ev->{sym};
1893		2315
1894	if ($sym == 13) {	2316	if ($ev->{uni} == 0x0d || $sym == 13) {
1895	unshift @{$self->{history}},	2317	unshift @{$self->{history}},
1896	my $txt = $self->get_text;	2318	my $txt = $self->get_text;
		2319
1897	$self->{history_pointer} = -1;	2320	$self->{history_pointer} = -1;
1898	$self->{history_saveback} = '';	2321	$self->{history_saveback} = '';
1899	$self->_emit (activate => $txt);	2322	$self->emit (activate => $txt);
1900	$self->update;	2323	$self->update;
1901		2324
1902	} elsif ($sym == CFClient::SDLK_UP) {	2325	} elsif ($sym == CFPlus::SDLK_UP) {
1903	if ($self->{history_pointer} < 0) {	2326	if ($self->{history_pointer} < 0) {
1904	$self->{history_saveback} = $self->get_text;	2327	$self->{history_saveback} = $self->get_text;
1905	}	2328	}
1906	if (@{$self->{history} || []} > 0) {	2329	if (@{$self->{history} || []} > 0) {
1907	$self->{history_pointer}++;	2330	$self->{history_pointer}++;
…		…
1909	$self->{history_pointer} = @{$self->{history} || []} - 1;	2332	$self->{history_pointer} = @{$self->{history} || []} - 1;
1910	}	2333	}
1911	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2334	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1912	}	2335	}
1913		2336
1914	} elsif ($sym == CFClient::SDLK_DOWN) {	2337	} elsif ($sym == CFPlus::SDLK_DOWN) {
1915	$self->{history_pointer}--;	2338	$self->{history_pointer}--;
1916	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2339	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1917		2340
1918	if ($self->{history_pointer} >= 0) {	2341	if ($self->{history_pointer} >= 0) {
1919	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2342	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1920	} else {	2343	} else {
1921	$self->set_text ($self->{history_saveback});	2344	$self->set_text ($self->{history_saveback});
1922	}	2345	}
1923		2346
1924	} else {	2347	} else {
1925	return $self->SUPER::key_down ($ev)	2348	return $self->SUPER::invoke_key_down ($ev)
1926	}	2349	}
1927		2350
1928	1	2351	1
1929	}	2352	}
1930		2353
1931	#############################################################################	2354	#############################################################################
1932		2355
		2356	package CFPlus::UI::TextEdit;
		2357
		2358	our @ISA = CFPlus::UI::EntryBase::;
		2359
		2360	use CFPlus::OpenGL;
		2361
		2362	sub move_cursor_ver {
		2363	my ($self, $dy) = @_;
		2364
		2365	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2366
		2367	$y += $dy;
		2368
		2369	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2370	$self->{cursor} = $index;
		2371	delete $self->{cur_h};
		2372	$self->update;
		2373	return;
		2374	}
		2375	}
		2376
		2377	sub invoke_key_down {
		2378	my ($self, $ev) = @_;
		2379
		2380	my $sym = $ev->{sym};
		2381
		2382	if ($sym == CFPlus::SDLK_UP) {
		2383	$self->move_cursor_ver (-1);
		2384	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2385	$self->move_cursor_ver (+1);
		2386	} else {
		2387	return $self->SUPER::invoke_key_down ($ev)
		2388	}
		2389
		2390	1
		2391	}
		2392
		2393	#############################################################################
		2394
1933	package CFClient::UI::Button;	2395	package CFPlus::UI::Button;
1934		2396
1935	our @ISA = CFClient::UI::Label::;	2397	our @ISA = CFPlus::UI::Label::;
1936		2398
1937	use CFClient::OpenGL;	2399	use CFPlus::OpenGL;
1938		2400
1939	my @tex =	2401	my @tex =
1940	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2402	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1941	qw(b1_button_active.png);	2403	qw(b1_button_inactive.png b1_button_active.png);
1942		2404
1943	sub new {	2405	sub new {
1944	my $class = shift;	2406	my $class = shift;
1945		2407
1946	$class->SUPER::new (	2408	$class->SUPER::new (
1947	padding_x => 4,	2409	padding_x => 4,
1948	padding_y => 4,	2410	padding_y => 4,
1949	fg => [1, 1, 1],	2411	fg => [1.0, 1.0, 1.0],
1950	active_fg => [0, 0, 1],	2412	active_fg => [0.8, 0.8, 0.8],
1951	can_hover => 1,	2413	can_hover => 1,
1952	align => 0,	2414	align => 0,
1953	valign => 0,	2415	valign => 0,
1954	can_events => 1,	2416	can_events => 1,
1955	@_	2417	@_
1956	)	2418	)
1957	}	2419	}
1958		2420
1959	sub activate { }
1960
1961	sub button_up {	2421	sub invoke_button_up {
1962	my ($self, $ev, $x, $y) = @_;	2422	my ($self, $ev, $x, $y) = @_;
1963		2423
1964	$self->emit ("activate")	2424	$self->emit ("activate")
1965	if $x >= 0 && $x < $self->{w}	2425	if $x >= 0 && $x < $self->{w}
1966	&& $y >= 0 && $y < $self->{h};	2426	&& $y >= 0 && $y < $self->{h};
…		…
1975		2435
1976	glEnable GL_TEXTURE_2D;	2436	glEnable GL_TEXTURE_2D;
1977	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2437	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1978	glColor 0, 0, 0, 1;	2438	glColor 0, 0, 0, 1;
1979		2439
		2440	my $tex = $tex[$GRAB == $self];
1980	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2441	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1981		2442
1982	glDisable GL_TEXTURE_2D;	2443	glDisable GL_TEXTURE_2D;
1983		2444
1984	$self->SUPER::_draw;	2445	$self->SUPER::_draw;
1985	}	2446	}
1986		2447
1987	#############################################################################	2448	#############################################################################
1988		2449
		2450	package CFPlus::UI::CheckBox;
		2451
		2452	our @ISA = CFPlus::UI::DrawBG::;
		2453
		2454	my @tex =
		2455	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2456	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2457
		2458	use CFPlus::OpenGL;
		2459
		2460	sub new {
		2461	my $class = shift;
		2462
		2463	$class->SUPER::new (
		2464	padding_x => 2,
		2465	padding_y => 2,
		2466	fg => [1, 1, 1],
		2467	active_fg => [1, 1, 0],
		2468	bg => [0, 0, 0, 0.2],
		2469	active_bg => [1, 1, 1, 0.5],
		2470	state => 0,
		2471	can_hover => 1,
		2472	@_
		2473	)
		2474	}
		2475
		2476	sub size_request {
		2477	my ($self) = @_;
		2478
		2479	(6) x 2
		2480	}
		2481
		2482	sub toggle {
		2483	my ($self) = @_;
		2484
		2485	$self->{state} = !$self->{state};
		2486	$self->emit (changed => $self->{state});
		2487	$self->update;
		2488	}
		2489
		2490	sub invoke_button_down {
		2491	my ($self, $ev, $x, $y) = @_;
		2492
		2493	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2494	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2495	$self->toggle;
		2496	} else {
		2497	return 0
		2498	}
		2499
		2500	1
		2501	}
		2502
		2503	sub _draw {
		2504	my ($self) = @_;
		2505
		2506	$self->SUPER::_draw;
		2507
		2508	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2509
		2510	my ($w, $h) = @$self{qw(w h)};
		2511
		2512	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2513
		2514	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2515
		2516	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2517
		2518	glEnable GL_TEXTURE_2D;
		2519	$tex->draw_quad_alpha (0, 0, $s, $s);
		2520	glDisable GL_TEXTURE_2D;
		2521	}
		2522
		2523	#############################################################################
		2524
		2525	package CFPlus::UI::Image;
		2526
		2527	our @ISA = CFPlus::UI::Base::;
		2528
		2529	use CFPlus::OpenGL;
		2530
		2531	our %texture_cache;
		2532
		2533	sub new {
		2534	my $class = shift;
		2535
		2536	my $self = $class->SUPER::new (
		2537	can_events => 0,
		2538	@_,
		2539	);
		2540
		2541	$self->{path} || $self->{tex}
		2542	or Carp::croak "'path' or 'tex' attributes required";
		2543
		2544	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2545	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2546
		2547	CFPlus::weaken $texture_cache{$self->{path}};
		2548
		2549	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2550
		2551	$self
		2552	}
		2553
		2554	sub STORABLE_freeze {
		2555	my ($self, $cloning) = @_;
		2556
		2557	$self->{path}
		2558	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2559
		2560	$self->{path}
		2561	}
		2562
		2563	sub STORABLE_attach {
		2564	my ($self, $cloning, $path) = @_;
		2565
		2566	$self->new (path => $path)
		2567	}
		2568
		2569	sub size_request {
		2570	my ($self) = @_;
		2571
		2572	($self->{tex}{w}, $self->{tex}{h})
		2573	}
		2574
		2575	sub _draw {
		2576	my ($self) = @_;
		2577
		2578	my $tex = $self->{tex};
		2579
		2580	my ($w, $h) = ($self->{w}, $self->{h});
		2581
		2582	if ($self->{rot90}) {
		2583	glRotate 90, 0, 0, 1;
		2584	glTranslate 0, -$self->{w}, 0;
		2585
		2586	($w, $h) = ($h, $w);
		2587	}
		2588
		2589	glEnable GL_TEXTURE_2D;
		2590	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2591
		2592	$tex->draw_quad (0, 0, $w, $h);
		2593
		2594	glDisable GL_TEXTURE_2D;
		2595	}
		2596
		2597	#############################################################################
		2598
1989	package CFClient::UI::ImageButton;	2599	package CFPlus::UI::ImageButton;
1990		2600
1991	our @ISA = CFClient::UI::Image::;	2601	our @ISA = CFPlus::UI::Image::;
1992		2602
1993	use CFClient::OpenGL;	2603	use CFPlus::OpenGL;
1994		2604
1995	my %textures;	2605	my %textures;
1996		2606
1997	sub new {	2607	sub new {
1998	my $class = shift;	2608	my $class = shift;
…		…
2008	can_events => 1,	2618	can_events => 1,
2009	@_	2619	@_
2010	);	2620	);
2011	}	2621	}
2012		2622
2013	sub activate { }
2014
2015	sub button_up {	2623	sub invoke_button_up {
2016	my ($self, $ev, $x, $y) = @_;	2624	my ($self, $ev, $x, $y) = @_;
2017		2625
2018	$self->emit ("activate")	2626	$self->emit ("activate")
2019	if $x >= 0 && $x < $self->{w}	2627	if $x >= 0 && $x < $self->{w}
2020	&& $y >= 0 && $y < $self->{h};	2628	&& $y >= 0 && $y < $self->{h};
…		…
2022	1	2630	1
2023	}	2631	}
2024		2632
2025	#############################################################################	2633	#############################################################################
2026		2634
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;	2635	package CFPlus::UI::VGauge;
2096		2636
2097	our @ISA = CFClient::UI::Base::;	2637	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		2638
2157	use List::Util qw(min max);	2639	use List::Util qw(min max);
2158		2640
2159	use CFClient::OpenGL;	2641	use CFPlus::OpenGL;
2160		2642
2161	my %tex = (	2643	my %tex = (
2162	food => [	2644	food => [
2163	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2645	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2164	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2646	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2165	],	2647	],
2166	grace => [	2648	grace => [
2167	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2649	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/	2650	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2169	],	2651	],
2170	hp => [	2652	hp => [
2171	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2653	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2654	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2173	],	2655	],
2174	mana => [	2656	mana => [
2175	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2657	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/	2658	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2177	],	2659	],
2178	);	2660	);
2179		2661
2180	# eg. VGauge->new (gauge => 'food'), default gauge: food	2662	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2240	my $ycut1 = max 0, min 1, $ycut;	2722	my $ycut1 = max 0, min 1, $ycut;
2241	my $ycut2 = max 0, min 1, $ycut - 1;	2723	my $ycut2 = max 0, min 1, $ycut - 1;
2242		2724
2243	my $h1 = $self->{h} * (1 - $ycut1);	2725	my $h1 = $self->{h} * (1 - $ycut1);
2244	my $h2 = $self->{h} * (1 - $ycut2);	2726	my $h2 = $self->{h} * (1 - $ycut2);
		2727	my $h3 = $self->{h};
		2728
		2729	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2245		2730
2246	glEnable GL_BLEND;	2731	glEnable GL_BLEND;
2247	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2732	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2733	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2249	glEnable GL_TEXTURE_2D;	2734	glEnable GL_TEXTURE_2D;
…		…
2268		2753
2269	if ($t3) {	2754	if ($t3) {
2270	glBindTexture GL_TEXTURE_2D, $t3->{name};	2755	glBindTexture GL_TEXTURE_2D, $t3->{name};
2271	glBegin GL_QUADS;	2756	glBegin GL_QUADS;
2272	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2757	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2273	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2758	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2274	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2759	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2275	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2760	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2276	glEnd;	2761	glEnd;
2277	}	2762	}
2278		2763
2279	glDisable GL_BLEND;	2764	glDisable GL_BLEND;
2280	glDisable GL_TEXTURE_2D;	2765	glDisable GL_TEXTURE_2D;
2281	}	2766	}
2282		2767
2283	#############################################################################	2768	#############################################################################
2284		2769
2285	package CFClient::UI::Gauge;	2770	package CFPlus::UI::Gauge;
2286		2771
2287	our @ISA = CFClient::UI::VBox::;	2772	our @ISA = CFPlus::UI::VBox::;
2288		2773
2289	sub new {	2774	sub new {
2290	my ($class, %arg) = @_;	2775	my ($class, %arg) = @_;
2291		2776
2292	my $self = $class->SUPER::new (	2777	my $self = $class->SUPER::new (
…		…
2294	can_hover => 1,	2779	can_hover => 1,
2295	can_events => 1,	2780	can_events => 1,
2296	%arg,	2781	%arg,
2297	);	2782	);
2298		2783
2299	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2784	$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);	2785	$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");	2786	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2302		2787
2303	$self	2788	$self
2304	}	2789	}
2305		2790
2306	sub set_fontsize {	2791	sub set_fontsize {
…		…
2327	$self->{value}->set_text ($val);	2812	$self->{value}->set_text ($val);
2328	}	2813	}
2329		2814
2330	#############################################################################	2815	#############################################################################
2331		2816
2332	package CFClient::UI::Slider;	2817	package CFPlus::UI::Slider;
2333		2818
2334	use strict;	2819	use strict;
2335		2820
2336	use CFClient::OpenGL;	2821	use CFPlus::OpenGL;
2337		2822
2338	our @ISA = CFClient::UI::DrawBG::;	2823	our @ISA = CFPlus::UI::DrawBG::;
2339		2824
2340	my @tex =	2825	my @tex =
2341	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2826	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2342	qw(s1_slider.png s1_slider_bg.png);	2827	qw(s1_slider.png s1_slider_bg.png);
2343		2828
2344	sub new {	2829	sub new {
2345	my $class = shift;	2830	my $class = shift;
2346		2831
…		…
2367	$self->update;	2852	$self->update;
2368		2853
2369	$self	2854	$self
2370	}	2855	}
2371		2856
2372	sub changed { }
2373
2374	sub set_range {	2857	sub set_range {
2375	my ($self, $range) = @_;	2858	my ($self, $range) = @_;
2376		2859
2377	($range, $self->{range}) = ($self->{range}, $range);	2860	($range, $self->{range}) = ($self->{range}, $range);
2378		2861
…		…
2398	if $unit;	2881	if $unit;
2399		2882
2400	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2883	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401		2884
2402	if ($value != $old_value) {	2885	if ($value != $old_value) {
2403	$self->_emit (changed => $value);	2886	$self->emit (changed => $value);
2404	$self->update;	2887	$self->update;
2405	}	2888	}
2406	}	2889	}
2407		2890
2408	sub size_request {	2891	sub size_request {
2409	my ($self) = @_;	2892	my ($self) = @_;
2410		2893
2411	($self->{req_w}, $self->{req_h})	2894	($self->{req_w}, $self->{req_h})
2412	}	2895	}
2413		2896
2414	sub button_down {	2897	sub invoke_button_down {
2415	my ($self, $ev, $x, $y) = @_;	2898	my ($self, $ev, $x, $y) = @_;
2416		2899
2417	$self->SUPER::button_down ($ev, $x, $y);	2900	$self->SUPER::invoke_button_down ($ev, $x, $y);
2418		2901
2419	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2902	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420		2903
2421	$self->mouse_motion ($ev, $x, $y)	2904	$self->invoke_mouse_motion ($ev, $x, $y)
2422	}	2905	}
2423		2906
2424	sub mouse_motion {	2907	sub invoke_mouse_motion {
2425	my ($self, $ev, $x, $y) = @_;	2908	my ($self, $ev, $x, $y) = @_;
2426		2909
2427	if ($GRAB == $self) {	2910	if ($GRAB == $self) {
2428	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2911	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429		2912
…		…
2435	} else {	2918	} else {
2436	return 0;	2919	return 0;
2437	}	2920	}
2438		2921
2439	1	2922	1
		2923	}
		2924
		2925	sub invoke_mouse_wheel {
		2926	my ($self, $ev) = @_;
		2927
		2928	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2929
		2930	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2931
		2932	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2933
		2934	! ! $delta
2440	}	2935	}
2441		2936
2442	sub update {	2937	sub update {
2443	my ($self) = @_;	2938	my ($self) = @_;
2444		2939
…		…
2493	glDisable GL_TEXTURE_2D;	2988	glDisable GL_TEXTURE_2D;
2494	}	2989	}
2495		2990
2496	#############################################################################	2991	#############################################################################
2497		2992
2498	package CFClient::UI::ValSlider;	2993	package CFPlus::UI::ValSlider;
2499		2994
2500	our @ISA = CFClient::UI::HBox::;	2995	our @ISA = CFPlus::UI::HBox::;
2501		2996
2502	sub new {	2997	sub new {
2503	my ($class, %arg) = @_;	2998	my ($class, %arg) = @_;
2504		2999
2505	my $range = delete $arg{range};	3000	my $range = delete $arg{range};
2506		3001
2507	my $self = $class->SUPER::new (	3002	my $self = $class->SUPER::new (
2508	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3003	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2509	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3004	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2510	to_value => sub { shift },	3005	to_value => sub { shift },
2511	from_value => sub { shift },	3006	from_value => sub { shift },
2512	%arg,	3007	%arg,
2513	);	3008	);
2514		3009
…		…
2534	sub set_range { shift->{slider}->set_range (@_) }	3029	sub set_range { shift->{slider}->set_range (@_) }
2535	sub set_value { shift->{slider}->set_value (@_) }	3030	sub set_value { shift->{slider}->set_value (@_) }
2536		3031
2537	#############################################################################	3032	#############################################################################
2538		3033
2539	package CFClient::UI::TextScroller;	3034	package CFPlus::UI::TextScroller;
2540		3035
2541	our @ISA = CFClient::UI::HBox::;	3036	our @ISA = CFPlus::UI::HBox::;
2542		3037
2543	use CFClient::OpenGL;	3038	use CFPlus::OpenGL;
2544		3039
2545	sub new {	3040	sub new {
2546	my $class = shift;	3041	my $class = shift;
2547		3042
2548	my $self = $class->SUPER::new (	3043	my $self = $class->SUPER::new (
2549	fontsize => 1,	3044	fontsize => 1,
2550	can_events => 0,	3045	can_events => 1,
2551	indent => 0,	3046	indent => 0,
2552	#font => default_font	3047	#font => default_font
2553	@_,	3048	@_,
2554		3049
2555	layout => (new CFClient::Layout 1),	3050	layout => (new CFPlus::Layout),
2556	par => [],	3051	par => [],
		3052	max_par => 0,
2557	height => 0,	3053	height => 0,
2558	children => [	3054	children => [
2559	(new CFClient::UI::Empty expand => 1),	3055	(new CFPlus::UI::Empty expand => 1),
2560	(new CFClient::UI::Slider vertical => 1),	3056	(new CFPlus::UI::Slider vertical => 1),
2561	],	3057	],
2562	);	3058	);
2563		3059
2564	$self->{children}[1]->connect (changed => sub { $self->update });	3060	$self->{children}[1]->connect (changed => sub { $self->update });
2565		3061
…		…
2571		3067
2572	$self->{fontsize} = $fontsize;	3068	$self->{fontsize} = $fontsize;
2573	$self->reflow;	3069	$self->reflow;
2574	}	3070	}
2575		3071
		3072	sub size_request {
		3073	my ($self) = @_;
		3074
		3075	my ($empty, $slider) = @{ $self->{children} };
		3076
		3077	local $self->{children} = [$empty, $slider];
		3078	$self->SUPER::size_request
		3079	}
		3080
2576	sub size_allocate {	3081	sub invoke_size_allocate {
2577	my ($self, $w, $h) = @_;	3082	my ($self, $w, $h) = @_;
2578		3083
2579	$self->SUPER::size_allocate ($w, $h);	3084	my ($empty, $slider, @other) = @{ $self->{children} };
		3085	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580		3086
2581	$self->{layout}->set_font ($self->{font}) if $self->{font};	3087	$self->{layout}->set_font ($self->{font}) if $self->{font};
2582	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3088	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583	$self->{layout}->set_width ($self->{children}[0]{w});	3089	$self->{layout}->set_width ($empty->{w});
2584	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3090	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585		3091
2586	$self->reflow;	3092	$self->reflow;
2587	}
2588		3093
2589	sub text_size {	3094	local $self->{children} = [$empty, $slider];
		3095	$self->SUPER::invoke_size_allocate ($w, $h)
		3096	}
		3097
		3098	sub invoke_mouse_wheel {
2590	my ($self, $text, $indent) = @_;	3099	my ($self, $ev) = @_;
		3100
		3101	return 0 unless $ev->{dy}; # only vertical movements
		3102
		3103	$self->{children}[1]->emit (mouse_wheel => $ev);
		3104
		3105	1
		3106	}
		3107
		3108	sub get_layout {
		3109	my ($self, $para) = @_;
2591		3110
2592	my $layout = $self->{layout};	3111	my $layout = $self->{layout};
2593		3112
		3113	$layout->set_font ($self->{font}) if $self->{font};
		3114	$layout->set_foreground (@{$para->{fg}});
2594	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3115	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595	$layout->set_width ($self->{children}[0]{w} - $indent);	3116	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3117	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597	$layout->set_markup ($text);	3118	$layout->set_markup ($para->{markup});
		3119
		3120	$layout->set_shapes (
		3121	map
		3122	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3123	@{$para->{widget}}
2598		3124	);
		3125
2599	$layout->size	3126	$layout
2600	}	3127	}
2601		3128
2602	sub reflow {	3129	sub reflow {
2603	my ($self) = @_;	3130	my ($self) = @_;
2604		3131
…		…
2611		3138
2612	# todo: base offset on lines or so, not on pixels	3139	# todo: base offset on lines or so, not on pixels
2613	$self->{children}[1]->set_value ($offset);	3140	$self->{children}[1]->set_value ($offset);
2614	}	3141	}
2615		3142
		3143	sub current_paragraph {
		3144	my ($self) = @_;
		3145
		3146	$self->{top_paragraph} - 1
		3147	}
		3148
		3149	sub scroll_to {
		3150	my ($self, $para) = @_;
		3151
		3152	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3153
		3154	$self->{scroll_to} = $para;
		3155	$self->update;
		3156	}
		3157
2616	sub clear {	3158	sub clear {
2617	my ($self) = @_;	3159	my ($self) = @_;
		3160
		3161	my (undef, undef, @other) = @{ $self->{children} };
		3162	$self->remove ($_) for @other;
2618		3163
2619	$self->{par} = [];	3164	$self->{par} = [];
2620	$self->{height} = 0;	3165	$self->{height} = 0;
2621	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3166	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622	}	3167	}
2623		3168
2624	sub add_paragraph {	3169	sub add_paragraph {
2625	my ($self, $color, $text, $indent) = @_;	3170	my $self = shift;
2626		3171
2627	for my $line (split /\n/, $text) {	3172	for my $para (@_) {
2628	my ($w, $h) = $self->text_size ($line);	3173	$para = {
		3174	fg => [1, 1, 1, 1],
		3175	indent => 0,
		3176	markup => "",
		3177	widget => [],
		3178	ref $para ? %$para : (markup => $para),
		3179	w => 1e10,
		3180	wrapped => 1,
		3181	};
		3182
		3183	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3184	push @{$self->{par}}, $para;
		3185	}
		3186
		3187	if (my $max = $self->{max_par}) {
		3188	shift @{$self->{par}} while @{$self->{par}} > $max;
		3189	}
		3190
		3191	$self->{need_reflow}++;
		3192	$self->update;
		3193	}
		3194
		3195	sub scroll_to_bottom {
		3196	my ($self) = @_;
		3197
		3198	$self->{scroll_to} = $#{$self->{par}};
		3199	$self->update;
		3200	}
		3201
		3202	sub force_uptodate {
		3203	my ($self) = @_;
		3204
		3205	if (delete $self->{need_reflow}) {
		3206	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3207
		3208	my $height = 0;
		3209
		3210	for my $para (@{$self->{par}}) {
		3211	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3212	my $layout = $self->get_layout ($para);
		3213	my ($w, $h) = $layout->size;
		3214
		3215	$para->{w} = $w + $para->{indent};
		3216	$para->{h} = $h;
		3217	$para->{wrapped} = $layout->has_wrapped;
		3218	}
		3219
		3220	$para->{y} = $height;
		3221	$height += $para->{h};
		3222	}
		3223
2629	$self->{height} += $h;	3224	$self->{height} = $height;
2630	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3225	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2631	}
2632		3226
2633	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3227	delete $self->{texture};
		3228	}
		3229
		3230	if (my $paridx = delete $self->{scroll_to}) {
		3231	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3232	}
2634	}	3233	}
2635		3234
2636	sub update {	3235	sub update {
2637	my ($self) = @_;	3236	my ($self) = @_;
2638		3237
…		…
2641	return unless $self->{h} > 0;	3240	return unless $self->{h} > 0;
2642		3241
2643	delete $self->{texture};	3242	delete $self->{texture};
2644		3243
2645	$ROOT->on_post_alloc ($self => sub {	3244	$ROOT->on_post_alloc ($self => sub {
		3245	$self->force_uptodate;
		3246
2646	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3247	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647		3248
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 {	3249	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2676	glClearColor 0, 0, 0, 0;	3250	glClearColor 0, 0, 0, 0;
2677	glClear GL_COLOR_BUFFER_BIT;	3251	glClear GL_COLOR_BUFFER_BIT;
2678		3252
		3253	package CFPlus::UI::Base;
		3254	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3255	(0, 0, $self->{w}, $self->{h});
		3256
		3257	my $top = int $self->{children}[1]{range}[0];
		3258
		3259	my $paridx = 0;
		3260	my $top_paragraph;
2679	my $top = int $self->{children}[1]{range}[0];	3261	my $top = int $self->{children}[1]{range}[0];
2680		3262
2681	my $y0 = $top;	3263	my $y0 = $top;
2682	my $y1 = $top + $H;	3264	my $y1 = $top + $H;
2683		3265
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}}) {	3266	for my $para (@{$self->{par}}) {
2695	my $h = $par->[1];	3267	my $h = $para->{h};
		3268	my $y = $para->{y};
2696		3269
2697	if ($y0 < $y + $h && $y < $y1) {	3270	if ($y0 < $y + $h && $y < $y1) {
2698	$layout->set_foreground (@{ $par->[2] });	3271	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		3272
2703	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3273	$layout->render ($para->{indent}, $y - $y0);
2704		3274
2705	glRasterPos $par->[3], $y - $y0;	3275	if (my @w = @{ $para->{widget} }) {
2706	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3276	my @s = $layout->get_shapes;
		3277
		3278	for (@w) {
		3279	my ($dx, $dy) = splice @s, 0, 2, ();
		3280
		3281	$_->{x} = $dx + $para->{indent};
		3282	$_->{y} = $dy + $y - $y0;
		3283
		3284	$_->draw;
		3285	}
		3286	}
2707	}	3287	}
2708		3288
2709	$y += $h;	3289	$paridx++;
		3290	$top_paragraph ||= $paridx if $y >= $top;
2710	}	3291	}
2711		3292
2712	glDisable GL_BLEND;	3293	$self->{top_paragraph} = $top_paragraph;
2713	};	3294	};
2714	});	3295	});
		3296	}
		3297
		3298	sub reconfigure {
		3299	my ($self) = @_;
		3300
		3301	$self->SUPER::reconfigure;
		3302
		3303	$_->{w} = 1e10 for @{ $self->{par} };
		3304	$self->reflow;
2715	}	3305	}
2716		3306
2717	sub _draw {	3307	sub _draw {
2718	my ($self) = @_;	3308	my ($self) = @_;
2719		3309
…		…
2722	glColor 0, 0, 0, 1;	3312	glColor 0, 0, 0, 1;
2723	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3313	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2724	glDisable GL_TEXTURE_2D;	3314	glDisable GL_TEXTURE_2D;
2725		3315
2726	$self->{children}[1]->draw;	3316	$self->{children}[1]->draw;
2727
2728	}	3317	}
2729		3318
2730	#############################################################################	3319	#############################################################################
2731		3320
2732	package CFClient::UI::Animator;	3321	package CFPlus::UI::Animator;
2733		3322
2734	use CFClient::OpenGL;	3323	use CFPlus::OpenGL;
2735		3324
2736	our @ISA = CFClient::UI::Bin::;	3325	our @ISA = CFPlus::UI::Bin::;
2737		3326
2738	sub moveto {	3327	sub moveto {
2739	my ($self, $x, $y) = @_;	3328	my ($self, $x, $y) = @_;
2740		3329
2741	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3330	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2769	glPopMatrix;	3358	glPopMatrix;
2770	}	3359	}
2771		3360
2772	#############################################################################	3361	#############################################################################
2773		3362
2774	package CFClient::UI::Flopper;	3363	package CFPlus::UI::Flopper;
2775		3364
2776	our @ISA = CFClient::UI::Button::;	3365	our @ISA = CFPlus::UI::Button::;
2777		3366
2778	sub new {	3367	sub new {
2779	my $class = shift;	3368	my $class = shift;
2780		3369
2781	my $self = $class->SUPER::new (	3370	my $self = $class->SUPER::new (
…		…
2793	$self->{other}->toggle_visibility;	3382	$self->{other}->toggle_visibility;
2794	}	3383	}
2795		3384
2796	#############################################################################	3385	#############################################################################
2797		3386
2798	package CFClient::UI::Tooltip;	3387	package CFPlus::UI::Tooltip;
2799		3388
2800	our @ISA = CFClient::UI::Bin::;	3389	our @ISA = CFPlus::UI::Bin::;
2801		3390
2802	use CFClient::OpenGL;	3391	use CFPlus::OpenGL;
2803		3392
2804	sub new {	3393	sub new {
2805	my $class = shift;	3394	my $class = shift;
2806		3395
2807	$class->SUPER::new (	3396	$class->SUPER::new (
…		…
2810	)	3399	)
2811	}	3400	}
2812		3401
2813	sub set_tooltip_from {	3402	sub set_tooltip_from {
2814	my ($self, $widget) = @_;	3403	my ($self, $widget) = @_;
		3404
		3405	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3406	if $widget->{tooltip} =~ /^#(.*)$/;
2815		3407
2816	my $tooltip = $widget->{tooltip};	3408	my $tooltip = $widget->{tooltip};
2817		3409
2818	if ($ENV{CFPLUS_DEBUG} & 2) {	3410	if ($ENV{CFPLUS_DEBUG} & 2) {
2819	$tooltip .= "\n\n" . (ref $widget) . "\n"	3411	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2823	}	3415	}
2824		3416
2825	$tooltip =~ s/^\n+//;	3417	$tooltip =~ s/^\n+//;
2826	$tooltip =~ s/\n+$//;	3418	$tooltip =~ s/\n+$//;
2827		3419
2828	$self->add (new CFClient::UI::Label	3420	$self->add (new CFPlus::UI::Label
2829	markup => $tooltip,	3421	markup => $tooltip,
2830	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3422	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2831	fontsize => 0.8,	3423	fontsize => 0.8,
2832	fg => [0, 0, 0, 1],	3424	style => 1, # FLAG_INVERSE
2833	ellipsise => 0,	3425	ellipsise => 0,
2834	font => ($widget->{tooltip_font} || $::FONT_PROP),	3426	font => ($widget->{tooltip_font} || $::FONT_PROP),
2835	);	3427	);
2836	}	3428	}
2837		3429
…		…
2841	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3433	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842		3434
2843	($w + 4, $h + 4)	3435	($w + 4, $h + 4)
2844	}	3436	}
2845		3437
2846	sub size_allocate {	3438	sub invoke_size_allocate {
2847	my ($self, $w, $h) = @_;	3439	my ($self, $w, $h) = @_;
2848		3440
2849	$self->SUPER::size_allocate ($w - 4, $h - 4);	3441	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850	}	3442	}
2851		3443
2852	sub visibility_change {	3444	sub invoke_visibility_change {
2853	my ($self, $visible) = @_;	3445	my ($self, $visible) = @_;
2854		3446
2855	return unless $visible;	3447	return unless $visible;
2856		3448
2857	$self->{root}->on_post_alloc ("move_$self" => sub {	3449	$self->{root}->on_post_alloc ("move_$self" => sub {
2858	my $widget = $self->{owner}	3450	my $widget = $self->{owner}
2859	or return;	3451	or return;
2860		3452
		3453	if ($widget->{visible}) {
2861	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3454	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862		3455
2863	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3456	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864	if $x + $self->{w} > $self->{root}{w};	3457	if $x + $self->{w} > $self->{root}{w};
2865		3458
2866	$self->move_abs ($x, $y);	3459	$self->move_abs ($x, $y);
		3460	} else {
		3461	$self->hide;
		3462	}
2867	});	3463	});
2868	}	3464	}
2869		3465
2870	sub _draw {	3466	sub _draw {
2871	my ($self) = @_;	3467	my ($self) = @_;
…		…
2895	$self->SUPER::_draw;	3491	$self->SUPER::_draw;
2896	}	3492	}
2897		3493
2898	#############################################################################	3494	#############################################################################
2899		3495
2900	package CFClient::UI::Face;	3496	package CFPlus::UI::Face;
2901		3497
2902	our @ISA = CFClient::UI::Base::;	3498	our @ISA = CFPlus::UI::DrawBG::;
2903		3499
2904	use CFClient::OpenGL;	3500	use CFPlus::OpenGL;
2905		3501
2906	sub new {	3502	sub new {
2907	my $class = shift;	3503	my $class = shift;
2908		3504
2909	my $self = $class->SUPER::new (	3505	my $self = $class->SUPER::new (
		3506	size_w => 32,
		3507	size_h => 8,
2910	aspect => 1,	3508	aspect => 1,
2911	can_events => 0,	3509	can_events => 0,
2912	@_,	3510	@_,
2913	);	3511	);
2914		3512
2915	if ($self->{anim} && $self->{animspeed}) {	3513	if ($self->{anim} && $self->{animspeed}) {
2916	Scalar::Util::weaken (my $widget = $self);	3514	CFPlus::weaken (my $widget = $self);
2917		3515
		3516	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3517	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2918	$self->{timer} = Event->timer (	3518	$self->{timer} = Event->timer (
2919	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2920	hard => 1,	3519	parked => 1,
2921	interval => $self->{animspeed},
2922	cb => sub {	3520	cb => sub {
		3521	return unless $::CONN && $widget;
		3522
2923	++$widget->{frame};	3523	++$widget->{frame};
		3524	$widget->update_face;
2924	$widget->update;	3525	$widget->update;
		3526
		3527	$widget->update_timer;
2925	},	3528	},
2926	);	3529	);
		3530
		3531	$self->update_face;
		3532	$self->update_timer;
2927	}	3533	}
2928		3534
2929	$self	3535	$self
2930	}	3536	}
2931		3537
		3538	sub update_timer {
		3539	my ($self) = @_;
		3540
		3541	return unless $self->{timer};
		3542
		3543	if ($self->{visible}) {
		3544	$self->{timer}->at (
		3545	$self->{anim_start}
		3546	+ $self->{animspeed}
		3547	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3548	);
		3549	$self->{timer}->start;
		3550	} else {
		3551	$self->{timer}->stop;
		3552	}
		3553	}
		3554
		3555	sub update_face {
		3556	my ($self) = @_;
		3557
		3558	return unless $::CONN;
		3559
		3560	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3561	if ($anim && @$anim) {
		3562	delete $self->{wait_face};
		3563	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3564	}
		3565	}
		3566	}
		3567
2932	sub size_request {	3568	sub size_request {
2933	(32, 8)	3569	my ($self) = @_;
		3570
		3571	if ($::CONN) {
		3572	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3573	if (my $tex = $::CONN->{texture}[$faceid]) {
		3574	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3575	} else {
		3576	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3577	$self->realloc;
		3578	});
		3579	}
		3580	}
		3581	}
		3582
		3583	($self->{size_w} || 8, $self->{size_h} || 8)
2934	}	3584	}
2935		3585
2936	sub update {	3586	sub update {
2937	my ($self) = @_;	3587	my ($self) = @_;
2938		3588
2939	return unless $self->{visible};	3589	return unless $self->{visible};
2940		3590
2941	$self->SUPER::update;	3591	$self->SUPER::update;
2942	}	3592	}
2943		3593
		3594	sub invoke_visibility_change {
		3595	my ($self) = @_;
		3596
		3597	$self->update_timer;
		3598
		3599	0
		3600	}
		3601
2944	sub _draw {	3602	sub _draw {
2945	my ($self) = @_;	3603	my ($self) = @_;
2946		3604
2947	return unless $::CONN;	3605	return unless $::CONN;
2948		3606
2949	my $face;	3607	$self->SUPER::_draw;
2950		3608
2951	if ($self->{frame}) {
2952	my $anim = $::CONN->{anim}[$self->{anim}];	3609	my $faceid = $::CONN->{faceid}[$self->{face}]
2953		3610	or return;
2954	$face = $anim->[ $self->{frame} % @$anim ]
2955	if $anim && @$anim;
2956	}
2957		3611
2958	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3612	my $tex = $::CONN->{texture}[$faceid];
2959		3613
2960	if ($tex) {	3614	if ($tex) {
2961	glEnable GL_TEXTURE_2D;	3615	glEnable GL_TEXTURE_2D;
2962	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3616	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2963	glColor 0, 0, 0, 1;	3617	glColor 0, 0, 0, 1;
…		…
2967	}	3621	}
2968		3622
2969	sub destroy {	3623	sub destroy {
2970	my ($self) = @_;	3624	my ($self) = @_;
2971		3625
2972	$self->{timer}->cancel	3626	(delete $self->{timer})->cancel
2973	if $self->{timer};	3627	if $self->{timer};
2974		3628
2975	$self->SUPER::destroy;	3629	$self->SUPER::destroy;
2976	}	3630	}
2977		3631
2978	#############################################################################	3632	#############################################################################
2979		3633
2980	package CFClient::UI::Buttonbar;	3634	package CFPlus::UI::Buttonbar;
2981		3635
2982	our @ISA = CFClient::UI::HBox::;	3636	our @ISA = CFPlus::UI::HBox::;
2983		3637
2984	# TODO: should actualyl wrap buttons and other goodies.	3638	# TODO: should actually wrap buttons and other goodies.
2985		3639
2986	#############################################################################	3640	#############################################################################
2987		3641
2988	package CFClient::UI::Menu;	3642	package CFPlus::UI::Menu;
2989		3643
2990	our @ISA = CFClient::UI::FancyFrame::;	3644	our @ISA = CFPlus::UI::Toplevel::;
2991		3645
2992	use CFClient::OpenGL;	3646	use CFPlus::OpenGL;
2993		3647
2994	sub new {	3648	sub new {
2995	my $class = shift;	3649	my $class = shift;
2996		3650
2997	my $self = $class->SUPER::new (	3651	my $self = $class->SUPER::new (
2998	items => [],	3652	items => [],
2999	z => 100,	3653	z => 100,
3000	@_,	3654	@_,
3001	);	3655	);
3002		3656
3003	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3657	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3004		3658
3005	for my $item (@{ $self->{items} }) {	3659	for my $item (@{ $self->{items} }) {
3006	my ($widget, $cb, $tooltip) = @$item;	3660	my ($widget, $cb, $tooltip) = @$item;
3007		3661
3008	# handle various types of items, only text for now	3662	# handle various types of items, only text for now
3009	if (!ref $widget) {	3663	if (!ref $widget) {
		3664	if ($widget =~ /\t/) {
		3665	my ($left, $right) = split /\t/, $widget, 2;
		3666
3010	$widget = new CFClient::UI::Label	3667	$widget = new CFPlus::UI::HBox
3011	can_hover => 1,	3668	can_hover => 1,
3012	can_events => 1,	3669	can_events => 1,
		3670	tooltip => $tooltip,
		3671	children => [
		3672	(new CFPlus::UI::Label markup => $left, expand => 1),
		3673	(new CFPlus::UI::Label markup => $right, align => +1),
		3674	],
		3675	;
		3676
		3677	} else {
		3678	$widget = new CFPlus::UI::Label
		3679	can_hover => 1,
		3680	can_events => 1,
3013	markup => $widget,	3681	markup => $widget,
3014	tooltip => $tooltip	3682	tooltip => $tooltip;
		3683	}
3015	}	3684	}
3016		3685
3017	$self->{item}{$widget} = $item;	3686	$self->{item}{$widget} = $item;
3018		3687
3019	$self->{vbox}->add ($widget);	3688	$self->{vbox}->add ($widget);
…		…
3024		3693
3025	# popup given the event (must be a mouse button down event currently)	3694	# popup given the event (must be a mouse button down event currently)
3026	sub popup {	3695	sub popup {
3027	my ($self, $ev) = @_;	3696	my ($self, $ev) = @_;
3028		3697
3029	$self->_emit ("popdown");	3698	$self->emit ("popdown");
3030		3699
3031	# maybe save $GRAB? must be careful about events...	3700	# maybe save $GRAB? must be careful about events...
3032	$GRAB = $self;	3701	$GRAB = $self;
3033	$self->{button} = $ev->{button};	3702	$self->{button} = $ev->{button};
3034		3703
3035	$self->show;	3704	$self->show;
3036	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3705	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3037	}	3706	}
3038		3707
3039	sub mouse_motion {	3708	sub invoke_mouse_motion {
3040	my ($self, $ev, $x, $y) = @_;	3709	my ($self, $ev, $x, $y) = @_;
3041		3710
3042	# TODO: should use vbox->find_widget or so	3711	# TODO: should use vbox->find_widget or so
3043	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3712	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044	$self->{hover} = $self->{item}{$HOVER};	3713	$self->{hover} = $self->{item}{$HOVER};
3045		3714
3046	0	3715	0
3047	}	3716	}
3048		3717
3049	sub button_up {	3718	sub invoke_button_up {
3050	my ($self, $ev, $x, $y) = @_;	3719	my ($self, $ev, $x, $y) = @_;
3051		3720
3052	if ($ev->{button} == $self->{button}) {	3721	if ($ev->{button} == $self->{button}) {
3053	undef $GRAB;	3722	undef $GRAB;
3054	$self->hide;	3723	$self->hide;
3055		3724
3056	$self->_emit ("popdown");	3725	$self->emit ("popdown");
3057	$self->{hover}[1]->() if $self->{hover};	3726	$self->{hover}[1]->() if $self->{hover};
3058	} else {	3727	} else {
3059	return 0	3728	return 0
3060	}	3729	}
3061		3730
3062	1	3731	1
3063	}	3732	}
3064		3733
3065	#############################################################################	3734	#############################################################################
3066		3735
3067	package CFClient::UI::Multiplexer;	3736	package CFPlus::UI::Multiplexer;
3068		3737
3069	our @ISA = CFClient::UI::Container::;	3738	our @ISA = CFPlus::UI::Container::;
3070		3739
3071	sub new {	3740	sub new {
3072	my $class = shift;	3741	my $class = shift;
3073		3742
3074	my $self = $class->SUPER::new (	3743	my $self = $class->SUPER::new (
…		…
3088		3757
3089	$self->{current} = $self->{children}[0]	3758	$self->{current} = $self->{children}[0]
3090	if @{ $self->{children} };	3759	if @{ $self->{children} };
3091	}	3760	}
3092		3761
		3762	sub get_current_page {
		3763	my ($self) = @_;
		3764
		3765	$self->{current}
		3766	}
		3767
3093	sub set_current_page {	3768	sub set_current_page {
3094	my ($self, $page_or_widget) = @_;	3769	my ($self, $page_or_widget) = @_;
3095		3770
3096	my $widget = ref $page_or_widget	3771	my $widget = ref $page_or_widget
3097	? $page_or_widget	3772	? $page_or_widget
3098	: $self->{children}[$page_or_widget];	3773	: $self->{children}[$page_or_widget];
3099		3774
3100	$self->{current} = $widget;	3775	$self->{current} = $widget;
3101	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3776	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102		3777
3103	$self->_emit (page_changed => $self->{current});	3778	$self->emit (page_changed => $self->{current});
3104		3779
3105	$self->realloc;	3780	$self->realloc;
3106	}	3781	}
3107		3782
3108	sub visible_children {	3783	sub visible_children {
…		…
3113	my ($self) = @_;	3788	my ($self) = @_;
3114		3789
3115	$self->{current}->size_request	3790	$self->{current}->size_request
3116	}	3791	}
3117		3792
3118	sub size_allocate {	3793	sub invoke_size_allocate {
3119	my ($self, $w, $h) = @_;	3794	my ($self, $w, $h) = @_;
3120		3795
3121	$self->{current}->configure (0, 0, $w, $h);	3796	$self->{current}->configure (0, 0, $w, $h);
		3797
		3798	1
3122	}	3799	}
3123		3800
3124	sub _draw {	3801	sub _draw {
3125	my ($self) = @_;	3802	my ($self) = @_;
3126		3803
3127	$self->{current}->draw;	3804	$self->{current}->draw;
3128	}	3805	}
3129		3806
3130	#############################################################################	3807	#############################################################################
3131		3808
3132	package CFClient::UI::Notebook;	3809	package CFPlus::UI::Notebook;
3133		3810
3134	our @ISA = CFClient::UI::VBox::;	3811	our @ISA = CFPlus::UI::VBox::;
3135		3812
3136	sub new {	3813	sub new {
3137	my $class = shift;	3814	my $class = shift;
3138		3815
3139	my $self = $class->SUPER::new (	3816	my $self = $class->SUPER::new (
3140	buttonbar => (new CFClient::UI::Buttonbar),	3817	buttonbar => (new CFPlus::UI::Buttonbar),
3141	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3818	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3142	# filter => # will be put between multiplexer and $self	3819	# filter => # will be put between multiplexer and $self
3143	@_,	3820	@_,
3144	);	3821	);
3145		3822
3146	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3823	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3150	}	3827	}
3151		3828
3152	sub add {	3829	sub add {
3153	my ($self, $title, $widget, $tooltip) = @_;	3830	my ($self, $title, $widget, $tooltip) = @_;
3154		3831
3155	Scalar::Util::weaken $self;	3832	CFPlus::weaken $self;
3156		3833
3157	$self->{buttonbar}->add (new CFClient::UI::Button	3834	$self->{buttonbar}->add (new CFPlus::UI::Button
3158	markup => $title,	3835	markup => $title,
3159	tooltip => $tooltip,	3836	tooltip => $tooltip,
3160	on_activate => sub { $self->set_current_page ($widget) },	3837	on_activate => sub { $self->set_current_page ($widget) },
3161	);	3838	);
3162		3839
3163	$self->{multiplexer}->add ($widget);	3840	$self->{multiplexer}->add ($widget);
3164	}	3841	}
3165		3842
		3843	sub get_current_page {
		3844	my ($self) = @_;
		3845
		3846	$self->{multiplexer}->get_current_page
		3847	}
		3848
3166	sub set_current_page {	3849	sub set_current_page {
3167	my ($self, $page) = @_;	3850	my ($self, $page) = @_;
3168		3851
3169	$self->{multiplexer}->set_current_page ($page);	3852	$self->{multiplexer}->set_current_page ($page);
3170	$self->_emit (page_changed => $self->{multiplexer}{current});	3853	$self->emit (page_changed => $self->{multiplexer}{current});
3171	}	3854	}
3172		3855
3173	#############################################################################	3856	#############################################################################
3174		3857
3175	package CFClient::UI::Combobox;	3858	package CFPlus::UI::Selector;
3176		3859
3177	use utf8;	3860	use utf8;
3178		3861
3179	our @ISA = CFClient::UI::Button::;	3862	our @ISA = CFPlus::UI::Button::;
3180		3863
3181	sub new {	3864	sub new {
3182	my $class = shift;	3865	my $class = shift;
3183		3866
3184	my $self = $class->SUPER::new (	3867	my $self = $class->SUPER::new (
…		…
3190	$self->_set_value ($self->{value});	3873	$self->_set_value ($self->{value});
3191		3874
3192	$self	3875	$self
3193	}	3876	}
3194		3877
3195	sub button_down {	3878	sub invoke_button_down {
3196	my ($self, $ev) = @_;	3879	my ($self, $ev) = @_;
3197		3880
3198	my @menu_items;	3881	my @menu_items;
3199		3882
3200	for (@{ $self->{options} }) {	3883	for (@{ $self->{options} }) {
3201	my ($value, $title, $tooltip) = @$_;	3884	my ($value, $title, $tooltip) = @$_;
3202		3885
3203	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3886	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204	}	3887	}
3205		3888
3206	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3889	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207	}	3890	}
3208		3891
3209	sub _set_value {	3892	sub _set_value {
3210	my ($self, $value) = @_;	3893	my ($self, $value) = @_;
3211		3894
…		…
3221	my ($self, $value) = @_;	3904	my ($self, $value) = @_;
3222		3905
3223	return unless $self->{value} ne $value;	3906	return unless $self->{value} ne $value;
3224		3907
3225	$self->_set_value ($value);	3908	$self->_set_value ($value);
3226	$self->_emit (changed => $value);	3909	$self->emit (changed => $value);
3227	}	3910	}
3228		3911
3229	#############################################################################	3912	#############################################################################
3230		3913
3231	package CFClient::UI::Statusbox;	3914	package CFPlus::UI::Statusbox;
3232		3915
3233	our @ISA = CFClient::UI::VBox::;	3916	our @ISA = CFPlus::UI::VBox::;
3234		3917
3235	sub new {	3918	sub new {
3236	my $class = shift;	3919	my $class = shift;
3237		3920
3238	my $self = $class->SUPER::new (	3921	my $self = $class->SUPER::new (
3239	fontsize => 0.8,	3922	fontsize => 0.8,
3240	@_,	3923	@_,
3241	);	3924	);
3242		3925
3243	Scalar::Util::weaken (my $this = $self);	3926	CFPlus::weaken (my $this = $self);
3244		3927
3245	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3928	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3246		3929
3247	$self	3930	$self
3248	}	3931	}
…		…
3250	sub reorder {	3933	sub reorder {
3251	my ($self) = @_;	3934	my ($self) = @_;
3252	my $NOW = Time::HiRes::time;	3935	my $NOW = Time::HiRes::time;
3253		3936
3254	# freeze display when hovering over any label	3937	# freeze display when hovering over any label
3255	return if $CFClient::UI::TOOLTIP->{owner}	3938	return if $CFPlus::UI::TOOLTIP->{owner}
3256	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3939	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3257	values %{ $self->{item} };	3940	values %{ $self->{item} };
3258		3941
3259	while (my ($k, $v) = each %{ $self->{item} }) {	3942	while (my ($k, $v) = each %{ $self->{item} }) {
3260	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3943	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3261	}	3944	}
…		…
3282	for ($short) {	3965	for ($short) {
3283	s/^\s+//;	3966	s/^\s+//;
3284	s/\s+/ /g;	3967	s/\s+/ /g;
3285	}	3968	}
3286		3969
3287	new CFClient::UI::Label	3970	new CFPlus::UI::Label
3288	markup => $short,	3971	markup => $short,
3289	tooltip => $item->{tooltip},	3972	tooltip => $item->{tooltip},
3290	tooltip_font => $::FONT_PROP,	3973	tooltip_font => $::FONT_PROP,
3291	tooltip_width => 0.67,	3974	tooltip_width => 0.67,
3292	fontsize => $item->{fontsize} || $self->{fontsize},	3975	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3346	count => 1,	4029	count => 1,
3347	%arg,	4030	%arg,
3348	};	4031	};
3349	}	4032	}
3350		4033
		4034	$ROOT->on_refresh (reorder => sub {
3351	$self->reorder;	4035	$self->reorder;
		4036	});
3352	}	4037	}
3353		4038
3354	sub reconfigure {	4039	sub reconfigure {
3355	my ($self) = @_;	4040	my ($self) = @_;
3356		4041
…		…
3369	$self->SUPER::destroy;	4054	$self->SUPER::destroy;
3370	}	4055	}
3371		4056
3372	#############################################################################	4057	#############################################################################
3373		4058
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;	4059	package CFPlus::UI::Root;
3737		4060
3738	our @ISA = CFClient::UI::Container::;	4061	our @ISA = CFPlus::UI::Container::;
3739		4062
3740	use List::Util qw(min max);	4063	use List::Util qw(min max);
3741		4064
3742	use CFClient::OpenGL;	4065	use CFPlus::OpenGL;
3743		4066
3744	sub new {	4067	sub new {
3745	my $class = shift;	4068	my $class = shift;
3746		4069
3747	my $self = $class->SUPER::new (	4070	my $self = $class->SUPER::new (
3748	visible => 1,	4071	visible => 1,
3749	@_,	4072	@_,
3750	);	4073	);
3751		4074
3752	Scalar::Util::weaken ($self->{root} = $self);	4075	CFPlus::weaken ($self->{root} = $self);
3753		4076
3754	$self	4077	$self
3755	}	4078	}
3756		4079
3757	sub size_request {	4080	sub size_request {
…		…
3772	$coord = $max - $size if $coord > $max - $size;	4095	$coord = $max - $size if $coord > $max - $size;
3773		4096
3774	int $coord + 0.5	4097	int $coord + 0.5
3775	}	4098	}
3776		4099
3777	sub size_allocate {	4100	sub invoke_size_allocate {
3778	my ($self, $w, $h) = @_;	4101	my ($self, $w, $h) = @_;
3779		4102
3780	for my $child ($self->children) {	4103	for my $child ($self->children) {
3781	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	4104	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3782		4105
…		…
3786	$X = _to_pixel $X, $W, $self->{w};	4109	$X = _to_pixel $X, $W, $self->{w};
3787	$Y = _to_pixel $Y, $H, $self->{h};	4110	$Y = _to_pixel $Y, $H, $self->{h};
3788		4111
3789	$child->configure ($X, $Y, $W, $H);	4112	$child->configure ($X, $Y, $W, $H);
3790	}	4113	}
		4114
		4115	1
3791	}	4116	}
3792		4117
3793	sub coord2local {	4118	sub coord2local {
3794	my ($self, $x, $y) = @_;	4119	my ($self, $x, $y) = @_;
3795		4120
…		…
3921	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4246	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3922		4247
3923	$w = 0 if $w < 0;	4248	$w = 0 if $w < 0;
3924	$h = 0 if $h < 0;	4249	$h = 0 if $h < 0;
3925		4250
		4251	$w = max $widget->{min_w}, $w;
		4252	$h = max $widget->{min_h}, $h;
		4253
		4254	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4255	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4256
		4257	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4258	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4259
3926	$w = int $w + 0.5;	4260	$w = int $w + 0.5;
3927	$h = int $h + 0.5;	4261	$h = int $h + 0.5;
3928		4262
3929	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4263	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3930	$widget->{old_w} = $widget->{w};	4264	$widget->{old_w} = $widget->{w};
…		…
3940		4274
3941	while ($self->{post_alloc_hook}) {	4275	while ($self->{post_alloc_hook}) {
3942	$_->()	4276	$_->()
3943	for values %{delete $self->{post_alloc_hook}};	4277	for values %{delete $self->{post_alloc_hook}};
3944	}	4278	}
3945
3946		4279
3947	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4280	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3948	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4281	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3949	glClear GL_COLOR_BUFFER_BIT;	4282	glClear GL_COLOR_BUFFER_BIT;
3950		4283
…		…
3953	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4286	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3954	glMatrixMode GL_MODELVIEW;	4287	glMatrixMode GL_MODELVIEW;
3955	glLoadIdentity;	4288	glLoadIdentity;
3956		4289
3957	{	4290	{
3958	package CFClient::UI::Base;	4291	package CFPlus::UI::Base;
3959		4292
3960	($draw_x, $draw_y, $draw_w, $draw_h) =	4293	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3961	(0, 0, $self->{w}, $self->{h});	4294	(0, 0, $self->{w}, $self->{h});
3962	}
3963		4295
3964	$self->_draw;	4296	$self->_draw;
		4297	}
3965	}	4298	}
3966		4299
3967	#############################################################################	4300	#############################################################################
3968		4301
3969	package CFClient::UI;	4302	package CFPlus::UI;
3970		4303
3971	$ROOT = new CFClient::UI::Root;	4304	$ROOT = new CFPlus::UI::Root;
3972	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4305	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3973		4306
3974	1	4307	1
3975		4308

Diff Legend

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