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.303 by elmex, Tue Jun 13 10:28:38 2006 UTC vs.
Revision 1.371 by root, Sun Jul 15 22:07:48 2007 UTC

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

Diff Legend

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