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.284 by root, Mon Jun 5 03:06:04 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;
…		…
18	our $BUTTON_STATE;	18	our $BUTTON_STATE;
19		19
20	our %WIDGET; # all widgets, weak-referenced	20	our %WIDGET; # all widgets, weak-referenced
21		21
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	return if $ENV{CFPLUS_DEBUG} & 8;
24
25	if (!$GRAB) {	23	if (!$GRAB) {
26	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
27	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
28	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
29	$TOOLTIP->hide;	28	$TOOLTIP->hide;
30		29
31	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
		32
		33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
35	$tip = $tip->($widget) if CODE:: eq ref $tip;	37	$tip = $tip->($widget) if CODE:: eq ref $tip;
36		38
…		…
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
…		…
272		302
273	return unless $self->{visible};	303	return unless $self->{visible};
274		304
275	$_->set_invisible for $self->children;	305	$_->set_invisible for $self->children;
276		306
		307	delete $self->{visible};
277	delete $self->{root};	308	delete $self->{root};
278	delete $self->{visible};
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
…		…
315	}	344	}
316		345
317	sub move_abs {	346	sub move_abs {
318	my ($self, $x, $y, $z) = @_;	347	my ($self, $x, $y, $z) = @_;
319		348
320	$self->{x} = List::Util::max 0, int $x;	349	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
321	$self->{y} = List::Util::max 0, int $y;	350	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322	$self->{z} = $z if defined $z;	351	$self->{z} = $z if defined $z;
323		352
324	$self->update;	353	$self->update;
325	}	354	}
326		355
…		…
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
		660	return if CFPlus::in_destruct;
		661
		662	eval { $self->destroy };
		663	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		664
597	delete $WIDGET{$self+0};	665	delete $WIDGET{$self+0};
598	#$self->deactivate;
599	}	666	}
600		667
601	#############################################################################	668	#############################################################################
602		669
603	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
604		671
605	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
606		673
607	use strict;	674	use strict;
608	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
609		676
610	sub new {	677	sub new {
611	my $class = shift;	678	my $class = shift;
612		679
613	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
644	}	711	}
645	}	712	}
646		713
647	#############################################################################	714	#############################################################################
648		715
649	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
650		717
651	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
652		719
653	sub new {	720	sub new {
654	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
655	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
656	}	723	}
…		…
663		730
664	sub draw { }	731	sub draw { }
665		732
666	#############################################################################	733	#############################################################################
667		734
668	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
669		736
670	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
671		738
672	sub new {	739	sub new {
673	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
674		741
675	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
684	if $children;	751	if $children;
685		752
686	$self	753	$self
687	}	754	}
688		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
689	sub add {	764	sub add {
690	my ($self, @widgets) = @_;	765	my ($self, @widgets) = @_;
691		766
692	$_->set_parent ($self)	767	$_->set_parent ($self)
693	for @widgets;	768	for @widgets;
…		…
753	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
754	}	829	}
755		830
756	#############################################################################	831	#############################################################################
757		832
758	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
759		834
760	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
761		836
762	sub new {	837	sub new {
763	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
764		839
765	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
766		841
767	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
768	}	843	}
769		844
770	sub add {	845	sub add {
771	my ($self, $child) = @_;	846	my ($self, $child) = @_;
772		847
773	$self->{children} = [];	848	$self->SUPER::remove ($_) for @{ $self->{children} };
774
775	$self->SUPER::add ($child);	849	$self->SUPER::add ($child);
776	}	850	}
777		851
778	sub remove {	852	sub remove {
779	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
780		854
781	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
782		856
783	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
784	unless @{$self->{children}};	858	unless @{$self->{children}};
785	}	859	}
786		860
787	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
788		862
789	sub size_request {	863	sub size_request {
790	$_[0]{children}[0]->size_request	864	$_[0]{children}[0]->size_request
791	}	865	}
792		866
793	sub size_allocate {	867	sub invoke_size_allocate {
794	my ($self, $w, $h) = @_;	868	my ($self, $w, $h) = @_;
795		869
796	$self->{children}[0]->configure (0, 0, $w, $h);	870	$self->{children}[0]->configure (0, 0, $w, $h);
		871
		872	1
797	}	873	}
798		874
799	#############################################################################	875	#############################################################################
800		876
801	# back-buffered drawing area	877	# back-buffered drawing area
802		878
803	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
804		880
805	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
806		882
807	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
808		884
809	sub new {	885	sub new {
810	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
811		887
812	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
817		893
818	$ROOT->on_post_alloc ($self => sub { $self->render_child });	894	$ROOT->on_post_alloc ($self => sub { $self->render_child });
819	$self->SUPER::update;	895	$self->SUPER::update;
820	}	896	}
821		897
822	sub size_allocate {	898	sub invoke_size_allocate {
823	my ($self, $w, $h) = @_;	899	my ($self, $w, $h) = @_;
824		900
825	$self->SUPER::size_allocate ($w, $h);
826	$self->update;	901	$self->update;
		902
		903	$self->SUPER::invoke_size_allocate ($w, $h)
827	}	904	}
828		905
829	sub _render {	906	sub _render {
830	my ($self) = @_;	907	my ($self) = @_;
831		908
…		…
833	}	910	}
834		911
835	sub render_child {	912	sub render_child {
836	my ($self) = @_;	913	my ($self) = @_;
837		914
838	$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 {
839	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
840	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
841		918
842	{	919	{
843	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
844		921
845	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
846	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
847	}	926	}
848
849	$self->_render;
850	};	927	};
851	}	928	}
852		929
853	sub _draw {	930	sub _draw {
854	my ($self) = @_;	931	my ($self) = @_;
855
856	my ($w, $h) = @$self{qw(w h)};
857		932
858	my $tex = $self->{texture}	933	my $tex = $self->{texture}
859	or return;	934	or return;
860		935
861	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
864		939
865	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
866		941
867	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
868	}	943	}
869		944
870	#############################################################################	945	#############################################################################
871		946
872	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
873		948
874	our @ISA = CFClient::UI::Window::;	949	our @ISA = CFPlus::UI::Window::;
875		950
876	sub new {	951	sub new {
877	my $class = shift;	952	my $class = shift;
878		953
879	$class->SUPER::new (	954	$class->SUPER::new (
…		…
892	$h = 10 if $self->{scroll_y};	967	$h = 10 if $self->{scroll_y};
893		968
894	($w, $h)	969	($w, $h)
895	}	970	}
896		971
897	sub size_allocate {	972	sub invoke_size_allocate {
898	my ($self, $w, $h) = @_;	973	my ($self, $w, $h) = @_;
899		974
900	my $child = $self->child;	975	my $child = $self->child;
901		976
902	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	977	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	978	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904		979
905	$self->child->configure (0, 0, $w, $h);	980	$self->child->configure (0, 0, $w, $h);
906	$self->update;	981	$self->update;
		982
		983	1
907	}	984	}
908		985
909	sub set_offset {	986	sub set_offset {
910	my ($self, $x, $y) = @_;	987	my ($self, $x, $y) = @_;
911		988
…		…
937	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
939	) {	1016	) {
940	$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})
941	} else {	1018	} else {
942	$self->CFClient::UI::Base::find_widget ($x, $y)	1019	$self->CFPlus::UI::Base::find_widget ($x, $y)
943	}	1020	}
944	}	1021	}
945		1022
946	sub _render {	1023	sub _render {
947	my ($self) = @_;	1024	my ($self) = @_;
948		1025
949	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};
950	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};
951		1028
952	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1029	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953		1030
954	$self->SUPER::_render;	1031	$self->SUPER::_render;
955	}	1032	}
956		1033
957	#############################################################################	1034	#############################################################################
958		1035
959	package CFClient::UI::ScrolledWindow;	1036	package CFPlus::UI::ScrolledWindow;
960		1037
961	our @ISA = CFClient::UI::HBox::;	1038	our @ISA = CFPlus::UI::Table::;
962		1039
963	sub new {	1040	sub new {
964	my ($class, %arg) = @_;	1041	my ($class, %arg) = @_;
965		1042
966	my $child = delete $arg{child};	1043	my $child = delete $arg{child};
967		1044
968	my $self;	1045	my $self;
969		1046
970	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
971	vertical => 1,	1057	vertical => 1,
972	range => [0, 0, 1, 0.01], # HACK fix	1058	range => [0, 0, 1, 0.01], # HACK fix
973	on_changed => sub {	1059	on_changed => sub {
974	$self->{vp}->set_offset (0, $_[1]);	1060	$self->{vpos} = $_[1];
		1061	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
975	},	1062	},
976	;	1063	;
977		1064
978	$self = $class->SUPER::new (	1065	$self = $class->SUPER::new (
979	vp => (new CFClient::UI::ViewPort expand => 1),	1066	vp => (new CFPlus::UI::ViewPort expand => 1),
		1067	can_events => 1,
980	slider => $slider,	1068	hslider => $hslider,
		1069	vslider => $vslider,
		1070	col_expand => [1, 0],
		1071	row_expand => [1, 0],
981	%arg,	1072	%arg,
982	);	1073	);
983		1074
		1075	$self->SUPER::add (0, 0, $self->{vp});
984	$self->SUPER::add ($self->{vp}, $self->{slider});	1076	$self->SUPER::add (1, 0, $self->{vslider});
		1077	$self->SUPER::add (0, 1, $self->{hslider});
		1078
985	$self->add ($child) if $child;	1079	$self->add ($child) if $child;
986		1080
987	$self	1081	$self
988	}	1082	}
		1083
		1084	#TODO# update range on size_allocate depending on child
989		1085
990	sub add {	1086	sub add {
991	my ($self, $widget) = @_;	1087	my ($self, $widget) = @_;
992		1088
993	$self->{vp}->add ($self->{child} = $widget);	1089	$self->{vp}->add ($self->{child} = $widget);
994	}	1090	}
995		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
996	sub update {	1116	sub update {
997	my ($self) = @_;	1117	my ($self) = @_;
998		1118
999	$self->SUPER::update;	1119	$self->SUPER::update;
1000		1120	$self->update_slider;
1001	# todo: overwrite size_allocate of child
1002	my $child = $self->{vp}->child;
1003	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004	}	1121	}
1005		1122
1006	sub size_allocate {	1123	sub invoke_size_allocate {
1007	my ($self, $w, $h) = @_;	1124	my ($self, $w, $h) = @_;
1008		1125
		1126	$self->update_slider;
1009	$self->SUPER::size_allocate ($w, $h);	1127	$self->SUPER::invoke_size_allocate ($w, $h)
1010
1011	my $child = $self->{vp}->child;
1012	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013	}	1128	}
1014
1015	#TODO# update range on size_allocate depending on child
1016	# update viewport offset on scroll
1017		1129
1018	#############################################################################	1130	#############################################################################
1019		1131
1020	package CFClient::UI::Frame;	1132	package CFPlus::UI::Frame;
1021		1133
1022	our @ISA = CFClient::UI::Bin::;	1134	our @ISA = CFPlus::UI::Bin::;
1023		1135
1024	use CFClient::OpenGL;	1136	use CFPlus::OpenGL;
1025		1137
1026	sub new {	1138	sub new {
1027	my $class = shift;	1139	my $class = shift;
1028		1140
1029	$class->SUPER::new (	1141	$class->SUPER::new (
…		…
1055	$self->SUPER::_draw;	1167	$self->SUPER::_draw;
1056	}	1168	}
1057		1169
1058	#############################################################################	1170	#############################################################################
1059		1171
1060	package CFClient::UI::FancyFrame;	1172	package CFPlus::UI::FancyFrame;
1061		1173
1062	our @ISA = CFClient::UI::Bin::;	1174	our @ISA = CFPlus::UI::Bin::;
1063		1175
1064	use CFClient::OpenGL;	1176	use CFPlus::OpenGL;
1065
1066	my $bg =
1067	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068	mipmap => 1, wrap => 1;
1069
1070	my @border =
1071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073		1177
1074	sub new {	1178	sub new {
1075	my ($class, %arg) = @_;	1179	my ($class, %arg) = @_;
1076		1180
1077	my $title = delete $arg{title};	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;
		1277
		1278	my $bg =
		1279	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
		1280	mipmap => 1, wrap => 1;
		1281
		1282	my @border =
		1283	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1284	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1285
		1286	sub new {
		1287	my ($class, %arg) = @_;
1078		1288
1079	my $self = $class->SUPER::new (	1289	my $self = $class->SUPER::new (
1080	bg => [1, 1, 1, 1],	1290	bg => [1, 1, 1, 1],
1081	border_bg => [1, 1, 1, 1],	1291	border_bg => [1, 1, 1, 1],
1082	border => 0.6,	1292	border => 0.6,
1083	can_events => 1,	1293	can_events => 1,
1084	min_w => 16,	1294	min_w => 64,
1085	min_h => 16,	1295	min_h => 32,
1086	%arg,	1296	%arg,
1087	);	1297	);
1088		1298
1089	$self->{title} = new CFClient::UI::Label	1299	$self->{title_widget} = new CFPlus::UI::Label
1090	align => 0,	1300	align => 0,
1091	valign => 1,	1301	valign => 1,
1092	text => $title,	1302	text => $self->{title},
1093	fontsize => $self->{border}	1303	fontsize => $self->{border},
1094	if defined $title;	1304	if exists $self->{title};
		1305
		1306	if ($self->{has_close_button}) {
		1307	$self->{close_button} =
		1308	new CFPlus::UI::ImageButton
		1309	path => 'x1_close.png',
		1310	on_activate => sub { $self->emit ("delete") };
		1311
		1312	$self->CFPlus::UI::Container::add ($self->{close_button});
		1313	}
1095		1314
1096	$self	1315	$self
1097	}	1316	}
1098		1317
1099	sub add {	1318	sub add {
1100	my ($self, @widgets) = @_;	1319	my ($self, @widgets) = @_;
1101		1320
1102	$self->SUPER::add (@widgets);	1321	$self->SUPER::add (@widgets);
		1322	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1323	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104	}	1324	}
1105		1325
1106	sub border {	1326	sub border {
1107	int $_[0]{border} * $::FONTSIZE	1327	int $_[0]{border} * $::FONTSIZE
1108	}	1328	}
1109		1329
1110	sub size_request {	1330	sub size_request {
1111	my ($self) = @_;	1331	my ($self) = @_;
1112		1332
1113	$self->{title}->size_request	1333	$self->{title_widget}->size_request
1114	if $self->{title};	1334	if $self->{title_widget};
		1335
		1336	$self->{close_button}->size_request
		1337	if $self->{close_button};
1115		1338
1116	my ($w, $h) = $self->SUPER::size_request;	1339	my ($w, $h) = $self->SUPER::size_request;
1117		1340
1118	(	1341	(
1119	$w + $self->border * 2,	1342	$w + $self->border * 2,
1120	$h + $self->border * 2,	1343	$h + $self->border * 2,
1121	)	1344	)
1122	}	1345	}
1123		1346
1124	sub size_allocate {	1347	sub invoke_size_allocate {
1125	my ($self, $w, $h) = @_;	1348	my ($self, $w, $h) = @_;
1126		1349
1127	if ($self->{title}) {	1350	if ($self->{title_widget}) {
1128	$self->{title}{w} = $w;	1351	$self->{title_widget}{w} = $w;
1129	$self->{title}{h} = $h;	1352	$self->{title_widget}{h} = $h;
1130	$self->{title}->size_allocate ($w, $h);	1353	$self->{title_widget}->invoke_size_allocate ($w, $h);
1131	}	1354	}
1132		1355
1133	my $border = $self->border;	1356	my $border = $self->border;
1134		1357
1135	$h -= List::Util::max 0, $border * 2;	1358	$h -= List::Util::max 0, $border * 2;
1136	$w -= List::Util::max 0, $border * 2;	1359	$w -= List::Util::max 0, $border * 2;
		1360
		1361	$self->child->configure ($border, $border, $w, $h);
		1362
		1363	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1364	if $self->{close_button};
		1365
		1366	1
		1367	}
		1368
		1369	sub invoke_delete {
		1370	my ($self) = @_;
		1371
		1372	$self->hide;
1137		1373
1138	$self->child->configure ($border, $border, $w, $h);	1374	1
1139	}	1375	}
1140		1376
1141	sub button_down {	1377	sub invoke_button_down {
1142	my ($self, $ev, $x, $y) = @_;	1378	my ($self, $ev, $x, $y) = @_;
1143		1379
1144	my ($w, $h) = @$self{qw(w h)};	1380	my ($w, $h) = @$self{qw(w h)};
1145	my $border = $self->border;	1381	my $border = $self->border;
1146		1382
…		…
1177		1413
1178	($x, $y) = ($ev->{x}, $ev->{y});	1414	($x, $y) = ($ev->{x}, $ev->{y});
1179		1415
1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1416	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181	# HACK: the next line is required to enforce placement	1417	# HACK: the next line is required to enforce placement
1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1418	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183	};	1419	};
1184	} else {	1420	} else {
1185	return 0;	1421	return 0;
1186	}	1422	}
1187		1423
1188	1	1424	1
1189	}	1425	}
1190		1426
1191	sub button_up {	1427	sub invoke_button_up {
1192	my ($self, $ev, $x, $y) = @_;	1428	my ($self, $ev, $x, $y) = @_;
1193		1429
1194	!!delete $self->{motion}	1430	! ! delete $self->{motion}
1195	}	1431	}
1196		1432
1197	sub mouse_motion {	1433	sub invoke_mouse_motion {
1198	my ($self, $ev, $x, $y) = @_;	1434	my ($self, $ev, $x, $y) = @_;
1199		1435
1200	$self->{motion}->($ev, $x, $y) if $self->{motion};	1436	$self->{motion}->($ev, $x, $y) if $self->{motion};
1201		1437
1202	!!$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
1203	}	1447	}
1204		1448
1205	sub _draw {	1449	sub _draw {
1206	my ($self) = @_;	1450	my ($self) = @_;
1207		1451
…		…
1233		1477
1234	glDisable GL_TEXTURE_2D;	1478	glDisable GL_TEXTURE_2D;
1235		1479
1236	$child->draw;	1480	$child->draw;
1237		1481
1238	if ($self->{title}) {	1482	if ($self->{title_widget}) {
1239	glTranslate 0, $border - $self->{h};	1483	glTranslate 0, $border - $self->{h};
1240	$self->{title}->_draw;	1484	$self->{title_widget}->_draw;
		1485
		1486	glTranslate 0, - ($border - $self->{h});
1241	}	1487	}
		1488
		1489	$self->{close_button}->draw
		1490	if $self->{close_button};
1242	}	1491	}
1243		1492
1244	#############################################################################	1493	#############################################################################
1245		1494
1246	package CFClient::UI::Table;	1495	package CFPlus::UI::Table;
1247		1496
1248	our @ISA = CFClient::UI::Base::;	1497	our @ISA = CFPlus::UI::Base::;
1249		1498
1250	use List::Util qw(max sum);	1499	use List::Util qw(max sum);
1251		1500
1252	use CFClient::OpenGL;	1501	use CFPlus::OpenGL;
1253		1502
1254	sub new {	1503	sub new {
1255	my $class = shift;	1504	my $class = shift;
1256		1505
1257	$class->SUPER::new (	1506	$class->SUPER::new (
1258	col_expand => [],	1507	col_expand => [],
		1508	row_expand => [],
1259	@_,	1509	@_,
1260	)	1510	)
1261	}	1511	}
1262		1512
1263	sub children {	1513	sub children {
1264	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1514	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265	}	1515	}
1266		1516
1267	sub add {	1517	sub add {
1268	my ($self, $x, $y, $child) = @_;	1518	my ($self) = shift;
1269		1519
		1520	while (@_) {
		1521	my ($x, $y, $child) = splice @_, 0, 3, ();
1270	$child->set_parent ($self);	1522	$child->set_parent ($self);
1271	$self->{children}[$y][$x] = $child;	1523	$self->{children}[$y][$x] = $child;
		1524	}
1272		1525
		1526	$self->{force_realloc} = 1;
		1527	$self->{force_size_alloc} = 1;
1273	$self->realloc;	1528	$self->realloc;
		1529	}
		1530
		1531	sub remove {
		1532	my ($self, $child) = @_;
		1533
		1534	# TODO: not yet implemented
1274	}	1535	}
1275		1536
1276	# TODO: move to container class maybe? send children a signal on removal?	1537	# TODO: move to container class maybe? send children a signal on removal?
1277	sub clear {	1538	sub clear {
1278	my ($self) = @_;	1539	my ($self) = @_;
…		…
1319	(sum @$ws),	1580	(sum @$ws),
1320	(sum @$hs),	1581	(sum @$hs),
1321	)	1582	)
1322	}	1583	}
1323		1584
1324	sub size_allocate {	1585	sub invoke_size_allocate {
1325	my ($self, $w, $h) = @_;	1586	my ($self, $w, $h) = @_;
1326		1587
1327	my ($ws, $hs) = $self->get_wh;	1588	my ($ws, $hs) = $self->get_wh;
1328		1589
1329	my $req_w = (sum @$ws) || 1;	1590	my $req_w = (sum @$ws) || 1;
1330	my $req_h = (sum @$hs) || 1;	1591	my $req_h = (sum @$hs) || 1;
1331		1592
1332	# TODO: nicer code && do row_expand	1593	# TODO: nicer code
1333	my @col_expand = @{$self->{col_expand}};	1594	my @col_expand = @{$self->{col_expand}};
1334	@col_expand = (1) x @$ws unless @col_expand;	1595	@col_expand = (1) x @$ws unless @col_expand;
1335	my $col_expand = (sum @col_expand) || 1;	1596	my $col_expand = (sum @col_expand) || 1;
1336		1597
1337	# linearly scale sizes
1338	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1598	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340		1599
1341	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
1342	CFClient::UI::harmonize $hs;	1608	CFPlus::UI::harmonize $hs;
1343		1609
1344	my $y;	1610	my $y;
1345		1611
1346	for my $r (0 .. $#{$self->{children}}) {	1612	for my $r (0 .. $#{$self->{children}}) {
1347	my $row = $self->{children}[$r]	1613	my $row = $self->{children}[$r]
…		…
1361	}	1627	}
1362		1628
1363	$y += $row_h;	1629	$y += $row_h;
1364	}	1630	}
1365		1631
		1632	1
1366	}	1633	}
1367		1634
1368	sub find_widget {	1635	sub find_widget {
1369	my ($self, $x, $y) = @_;	1636	my ($self, $x, $y) = @_;
1370		1637
…		…
1389	}	1656	}
1390	}	1657	}
1391		1658
1392	#############################################################################	1659	#############################################################################
1393		1660
1394	package CFClient::UI::Box;	1661	package CFPlus::UI::Box;
1395		1662
1396	our @ISA = CFClient::UI::Container::;	1663	our @ISA = CFPlus::UI::Container::;
1397		1664
1398	sub size_request {	1665	sub size_request {
1399	my ($self) = @_;	1666	my ($self) = @_;
1400		1667
1401	$self->{vertical}	1668	$self->{vertical}
…		…
1407	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1674	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1675	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1409	)	1676	)
1410	}	1677	}
1411		1678
1412	sub size_allocate {	1679	sub invoke_size_allocate {
1413	my ($self, $w, $h) = @_;	1680	my ($self, $w, $h) = @_;
1414		1681
1415	my $space = $self->{vertical} ? $h : $w;	1682	my $space = $self->{vertical} ? $h : $w;
1416	my $children = $self->{children};	1683	my @children = $self->visible_children;
1417		1684
1418	my @req;	1685	my @req;
1419		1686
1420	if ($self->{homogeneous}) {	1687	if ($self->{homogeneous}) {
1421	@req = ($space / (@$children || 1)) x @$children;	1688	@req = ($space / (@children || 1)) x @children;
1422	} else {	1689	} else {
1423	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1690	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424	my $req = List::Util::sum @req;	1691	my $req = List::Util::sum @req;
1425		1692
1426	if ($req > $space) {	1693	if ($req > $space) {
1427	# ah well, not enough space	1694	# ah well, not enough space
1428	$_ *= $space / $req for @req;	1695	$_ *= $space / $req for @req;
1429	} else {	1696	} else {
1430	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1697	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431		1698
1432	$space = ($space - $req) / $expand; # remaining space to give away	1699	$space = ($space - $req) / $expand; # remaining space to give away
1433		1700
1434	$req[$_] += $space * $children->[$_]{expand}	1701	$req[$_] += $space * $children[$_]{expand}
1435	for 0 .. $#$children;	1702	for 0 .. $#children;
1436	}	1703	}
1437	}	1704	}
1438		1705
1439	CFClient::UI::harmonize \@req;	1706	CFPlus::UI::harmonize \@req;
1440		1707
1441	my $pos = 0;	1708	my $pos = 0;
1442	for (0 .. $#$children) {	1709	for (0 .. $#children) {
1443	my $alloc = $req[$_];	1710	my $alloc = $req[$_];
1444	$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));
1445		1712
1446	$pos += $alloc;	1713	$pos += $alloc;
1447	}	1714	}
1448		1715
1449	1	1716	1
1450	}	1717	}
1451		1718
1452	#############################################################################	1719	#############################################################################
1453		1720
1454	package CFClient::UI::HBox;	1721	package CFPlus::UI::HBox;
1455		1722
1456	our @ISA = CFClient::UI::Box::;	1723	our @ISA = CFPlus::UI::Box::;
1457		1724
1458	sub new {	1725	sub new {
1459	my $class = shift;	1726	my $class = shift;
1460		1727
1461	$class->SUPER::new (	1728	$class->SUPER::new (
…		…
1464	)	1731	)
1465	}	1732	}
1466		1733
1467	#############################################################################	1734	#############################################################################
1468		1735
1469	package CFClient::UI::VBox;	1736	package CFPlus::UI::VBox;
1470		1737
1471	our @ISA = CFClient::UI::Box::;	1738	our @ISA = CFPlus::UI::Box::;
1472		1739
1473	sub new {	1740	sub new {
1474	my $class = shift;	1741	my $class = shift;
1475		1742
1476	$class->SUPER::new (	1743	$class->SUPER::new (
…		…
1479	)	1746	)
1480	}	1747	}
1481		1748
1482	#############################################################################	1749	#############################################################################
1483		1750
1484	package CFClient::UI::Label;	1751	package CFPlus::UI::Label;
1485		1752
1486	our @ISA = CFClient::UI::DrawBG::;	1753	our @ISA = CFPlus::UI::DrawBG::;
1487		1754
1488	use CFClient::OpenGL;	1755	use CFPlus::OpenGL;
1489		1756
1490	sub new {	1757	sub new {
1491	my ($class, %arg) = @_;	1758	my ($class, %arg) = @_;
1492		1759
1493	my $self = $class->SUPER::new (	1760	my $self = $class->SUPER::new (
…		…
1496	#active_bg => none	1763	#active_bg => none
1497	#font => default_font	1764	#font => default_font
1498	#text => initial text	1765	#text => initial text
1499	#markup => initial narkup	1766	#markup => initial narkup
1500	#max_w => maximum pixel width	1767	#max_w => maximum pixel width
		1768	#style => 0, # render flags
1501	ellipsise => 3, # end	1769	ellipsise => 3, # end
1502	layout => (new CFClient::Layout),	1770	layout => (new CFPlus::Layout),
1503	fontsize => 1,	1771	fontsize => 1,
1504	align => -1,	1772	align => -1,
1505	valign => -1,	1773	valign => -1,
1506	padding_x => 2,	1774	padding_x => 2,
1507	padding_y => 2,	1775	padding_y => 2,
1508	can_events => 0,	1776	can_events => 0,
1509	%arg	1777	%arg
1510	);	1778	);
1511		1779
1512	if (exists $self->{template}) {	1780	if (exists $self->{template}) {
1513	my $layout = new CFClient::Layout;	1781	my $layout = new CFPlus::Layout;
1514	$layout->set_text (delete $self->{template});	1782	$layout->set_text (delete $self->{template});
1515	$self->{template} = $layout;	1783	$self->{template} = $layout;
1516	}	1784	}
1517		1785
1518	if (exists $self->{markup}) {	1786	if (exists $self->{markup}) {
…		…
1522	}	1790	}
1523		1791
1524	$self	1792	$self
1525	}	1793	}
1526		1794
1527	sub escape($) {
1528	local $_ = $_[0];
1529
1530	s/&/&amp;/g;
1531	s/>/&gt;/g;
1532	s/</&lt;/g;
1533
1534	$_
1535	}
1536
1537	sub update {	1795	sub update {
1538	my ($self) = @_;	1796	my ($self) = @_;
1539		1797
1540	delete $self->{texture};	1798	delete $self->{texture};
1541	$self->SUPER::update;	1799	$self->SUPER::update;
…		…
1552	my ($self, $text) = @_;	1810	my ($self, $text) = @_;
1553		1811
1554	return if $self->{text} eq "T$text";	1812	return if $self->{text} eq "T$text";
1555	$self->{text} = "T$text";	1813	$self->{text} = "T$text";
1556		1814
1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558	$self->{layout}->set_text ($text);	1815	$self->{layout}->set_text ($text);
		1816
1559	delete $self->{req_h};	1817	delete $self->{size_req};
1560
1561	$self->realloc;	1818	$self->realloc;
1562	$self->update;	1819	$self->update;
1563	}	1820	}
1564		1821
1565	sub set_markup {	1822	sub set_markup {
…		…
1568	return if $self->{text} eq "M$markup";	1825	return if $self->{text} eq "M$markup";
1569	$self->{text} = "M$markup";	1826	$self->{text} = "M$markup";
1570		1827
1571	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1828	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572		1829
1573	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574	$self->{layout}->set_markup ($markup);	1830	$self->{layout}->set_markup ($markup);
		1831
1575	delete $self->{req_h};	1832	delete $self->{size_req};
1576
1577	$self->realloc;	1833	$self->realloc;
1578	$self->update;	1834	$self->update;
1579	}	1835	}
1580		1836
1581	sub size_request {	1837	sub size_request {
1582	my ($self) = @_;	1838	my ($self) = @_;
1583		1839
1584	if (exists $self->{req_h}) {	1840	$self->{size_req} ||= do {
1585	@$self{qw(req_w req_h)}
1586	} else {
1587	$self->{layout}->set_font ($self->{font}) if $self->{font};	1841	$self->{layout}->set_font ($self->{font}) if $self->{font};
1588	$self->{layout}->set_width ($self->{max_w} || -1);	1842	$self->{layout}->set_width ($self->{max_w} || -1);
1589	$self->{layout}->set_ellipsise ($self->{ellipsise});	1843	$self->{layout}->set_ellipsise ($self->{ellipsise});
1590	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1844	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1845	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592		1846
1593	my ($w, $h) = $self->{layout}->size;	1847	my ($w, $h) = $self->{layout}->size;
1594		1848
1595	if (exists $self->{template}) {	1849	if (exists $self->{template}) {
1596	$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);
1597	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1852	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1598		1853
1599	my ($w2, $h2) = $self->{template}->size;	1854	my ($w2, $h2) = $self->{template}->size;
1600		1855
1601	$w = List::Util::max $w, $w2;	1856	$w = List::Util::max $w, $w2;
1602	$h = List::Util::max $h, $h2;	1857	$h = List::Util::max $h, $h2;
1603	}	1858	}
1604		1859
1605	($w, $h)	1860	[$w, $h]
1606	}	1861	};
1607	}
1608		1862
		1863	@{ $self->{size_req} }
		1864	}
		1865
		1866	sub baseline_shift {
		1867	$_[0]{layout}->descent
		1868	}
		1869
1609	sub size_allocate {	1870	sub invoke_size_allocate {
1610	my ($self, $w, $h) = @_;	1871	my ($self, $w, $h) = @_;
1611		1872
1612	delete $self->{ox};	1873	delete $self->{ox};
1613		1874
1614	delete $self->{texture}	1875	delete $self->{texture}
1615	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
1616	}	1879	}
1617		1880
1618	sub set_fontsize {	1881	sub set_fontsize {
1619	my ($self, $fontsize) = @_;	1882	my ($self, $fontsize) = @_;
1620		1883
1621	$self->{fontsize} = $fontsize;	1884	$self->{fontsize} = $fontsize;
		1885	delete $self->{size_req};
1622	delete $self->{texture};	1886	delete $self->{texture};
1623		1887
1624	$self->realloc;	1888	$self->realloc;
1625	}	1889	}
1626		1890
		1891	sub reconfigure {
		1892	my ($self) = @_;
		1893
		1894	delete $self->{size_req};
		1895	delete $self->{texture};
		1896
		1897	$self->SUPER::reconfigure;
		1898	}
		1899
1627	sub _draw {	1900	sub _draw {
1628	my ($self) = @_;	1901	my ($self) = @_;
1629		1902
1630	$self->SUPER::_draw; # draw background, if applicable	1903	$self->SUPER::_draw; # draw background, if applicable
1631		1904
1632	my $tex = $self->{texture} ||= do {	1905	my $size = $self->{texture} ||= do {
1633	$self->{layout}->set_foreground (@{$self->{fg}});	1906	$self->{layout}->set_foreground (@{$self->{fg}});
1634	$self->{layout}->set_font ($self->{font}) if $self->{font};	1907	$self->{layout}->set_font ($self->{font}) if $self->{font};
1635	$self->{layout}->set_width ($self->{w});	1908	$self->{layout}->set_width ($self->{w});
1636	$self->{layout}->set_ellipsise ($self->{ellipsise});	1909	$self->{layout}->set_ellipsise ($self->{ellipsise});
1637	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1910	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1911	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639		1912
1640	new_from_layout CFClient::Texture $self->{layout}	1913	[$self->{layout}->size]
1641	};	1914	};
1642		1915
1643	unless (exists $self->{ox}) {	1916	unless (exists $self->{ox}) {
1644	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1917	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1918	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1646	: ($self->{w} - $tex->{w}) * 0.5);	1919	: ($self->{w} - $size->[0]) * 0.5);
1647		1920
1648	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1921	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1922	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1650	: ($self->{h} - $tex->{h}) * 0.5);	1923	: ($self->{h} - $size->[1]) * 0.5);
1651	};	1924	};
1652		1925
1653	glEnable GL_TEXTURE_2D;	1926	my $w = List::Util::min $self->{w} + 4, $size->[0];
1654	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1927	my $h = List::Util::min $self->{h} + 2, $size->[1];
1655		1928
1656	glColor_premultiply @{$self->{fg}}	1929	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1657	if $tex->{format} == GL_ALPHA;
1658
1659	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1660
1661	glDisable GL_TEXTURE_2D;
1662	}	1930	}
1663		1931
1664	#############################################################################	1932	#############################################################################
1665		1933
1666	package CFClient::UI::EntryBase;	1934	package CFPlus::UI::EntryBase;
1667		1935
1668	our @ISA = CFClient::UI::Label::;	1936	our @ISA = CFPlus::UI::Label::;
1669		1937
1670	use CFClient::OpenGL;	1938	use CFPlus::OpenGL;
1671		1939
1672	sub new {	1940	sub new {
1673	my $class = shift;	1941	my $class = shift;
1674		1942
1675	$class->SUPER::new (	1943	$class->SUPER::new (
…		…
1679	active_fg => [0, 0, 0],	1947	active_fg => [0, 0, 0],
1680	can_hover => 1,	1948	can_hover => 1,
1681	can_focus => 1,	1949	can_focus => 1,
1682	valign => 0,	1950	valign => 0,
1683	can_events => 1,	1951	can_events => 1,
		1952	ellipsise => 0,
1684	#text => ...	1953	#text => ...
		1954	#hidden => "*",
1685	@_	1955	@_
1686	)	1956	)
1687	}	1957	}
1688		1958
1689	sub _set_text {	1959	sub _set_text {
…		…
1696	$self->{last_activity} = $::NOW;	1966	$self->{last_activity} = $::NOW;
1697	$self->{text} = $text;	1967	$self->{text} = $text;
1698		1968
1699	$text =~ s/./*/g if $self->{hidden};	1969	$text =~ s/./*/g if $self->{hidden};
1700	$self->{layout}->set_text ("$text ");	1970	$self->{layout}->set_text ("$text ");
1701	delete $self->{req_h};	1971	delete $self->{size_req};
1702		1972
1703	$self->_emit (changed => $self->{text});	1973	$self->emit (changed => $self->{text});
1704		1974
1705	$self->realloc;	1975	$self->realloc;
1706	$self->update;	1976	$self->update;
1707	}	1977	}
1708		1978
…		…
1723	my ($w, $h) = $self->SUPER::size_request;	1993	my ($w, $h) = $self->SUPER::size_request;
1724		1994
1725	($w + 1, $h) # add 1 for cursor	1995	($w + 1, $h) # add 1 for cursor
1726	}	1996	}
1727		1997
1728	sub key_down {	1998	sub invoke_key_down {
1729	my ($self, $ev) = @_;	1999	my ($self, $ev) = @_;
1730		2000
1731	my $mod = $ev->{mod};	2001	my $mod = $ev->{mod};
1732	my $sym = $ev->{sym};	2002	my $sym = $ev->{sym};
1733	my $uni = $ev->{unicode};	2003	my $uni = $ev->{unicode};
1734		2004
1735	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;
1736		2008
1737	if ($uni == 8) {	2009	if ($uni == 8) {
1738	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2010	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1739	} elsif ($uni == 127) {	2011	} elsif ($uni == 127) {
1740	substr $text, $self->{cursor}, 1, "";	2012	substr $text, $self->{cursor}, 1, "";
1741	} elsif ($sym == CFClient::SDLK_LEFT) {	2013	} elsif ($sym == CFPlus::SDLK_LEFT) {
1742	--$self->{cursor} if $self->{cursor};	2014	--$self->{cursor} if $self->{cursor};
1743	} elsif ($sym == CFClient::SDLK_RIGHT) {	2015	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1744	++$self->{cursor} if $self->{cursor} < length $self->{text};	2016	++$self->{cursor} if $self->{cursor} < length $self->{text};
1745	} 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 = "";
1746	$self->{cursor} = 0;	2031	$self->{cursor} = 0;
1747	} elsif ($sym == CFClient::SDLK_END) {
1748	$self->{cursor} = length $text;
1749	} elsif ($uni == 27) {	2032	} elsif ($uni == 27) {
1750	$self->_emit ('escape');	2033	$self->emit ('escape');
1751	} elsif ($uni) {	2034	} elsif ($uni == 0x0d) {
		2035	substr $text, $self->{cursor}++, 0, "\012";
		2036	} elsif ($uni >= 0x20) {
1752	substr $text, $self->{cursor}++, 0, chr $uni;	2037	substr $text, $self->{cursor}++, 0, chr $uni;
1753	} else {	2038	} else {
1754	return 0;	2039	return 0;
1755	}	2040	}
1756		2041
1757	$self->_set_text ($text);	2042	$self->_set_text ($text);
1758		2043
1759	$self->realloc;	2044	$self->realloc;
		2045	$self->update;
1760		2046
1761	1	2047	1
1762	}	2048	}
1763		2049
1764	sub focus_in {	2050	sub invoke_focus_in {
1765	my ($self) = @_;	2051	my ($self) = @_;
1766		2052
1767	$self->{last_activity} = $::NOW;	2053	$self->{last_activity} = $::NOW;
1768		2054
1769	$self->SUPER::focus_in;	2055	$self->SUPER::invoke_focus_in
1770	}	2056	}
1771		2057
1772	sub button_down {	2058	sub invoke_button_down {
1773	my ($self, $ev, $x, $y) = @_;	2059	my ($self, $ev, $x, $y) = @_;
1774		2060
1775	$self->SUPER::button_down ($ev, $x, $y);	2061	$self->SUPER::invoke_button_down ($ev, $x, $y);
1776		2062
1777	my $idx = $self->{layout}->xy_to_index ($x, $y);	2063	my $idx = $self->{layout}->xy_to_index ($x, $y);
1778		2064
1779	# byte-index to char-index	2065	# byte-index to char-index
1780	my $text = $self->{text};	2066	my $text = $self->{text};
1781	utf8::encode $text;	2067	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1782	$self->{cursor} = length substr $text, 0, $idx;	2068	$self->{cursor} = length $text;
1783		2069
1784	$self->_set_text ($self->{text});	2070	$self->_set_text ($self->{text});
1785	$self->update;	2071	$self->update;
1786		2072
1787	1	2073	1
1788	}	2074	}
1789		2075
1790	sub mouse_motion {	2076	sub invoke_mouse_motion {
1791	my ($self, $ev, $x, $y) = @_;	2077	my ($self, $ev, $x, $y) = @_;
1792	# 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#
1793		2079
1794	0	2080	1
1795	}	2081	}
1796		2082
1797	sub _draw {	2083	sub _draw {
1798	my ($self) = @_;	2084	my ($self) = @_;
1799		2085
…		…
1826	utf8::encode $text;	2112	utf8::encode $text;
1827		2113
1828	@$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)
1829	}	2115	}
1830		2116
1831	glColor @{$self->{fg}};
1832	glBegin GL_LINES;	2117	glBegin GL_LINES;
1833	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};
1834	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};
1835	glEnd;	2120	glEnd;
1836	}	2121	}
1837	}	2122	}
1838		2123
		2124	#############################################################################
		2125
1839	package CFClient::UI::Entry;	2126	package CFPlus::UI::Entry;
1840		2127
1841	our @ISA = CFClient::UI::EntryBase::;	2128	our @ISA = CFPlus::UI::EntryBase::;
1842		2129
1843	use CFClient::OpenGL;	2130	use CFPlus::OpenGL;
1844		2131
1845	sub key_down {	2132	sub invoke_key_down {
1846	my ($self, $ev) = @_;	2133	my ($self, $ev) = @_;
1847		2134
1848	my $sym = $ev->{sym};	2135	my $sym = $ev->{sym};
1849		2136
1850	if ($sym == 13) {	2137	if ($ev->{uni} == 0x0d || $sym == 13) {
1851	unshift @{$self->{history}},	2138	unshift @{$self->{history}},
1852	my $txt = $self->get_text;	2139	my $txt = $self->get_text;
		2140
1853	$self->{history_pointer} = -1;	2141	$self->{history_pointer} = -1;
1854	$self->{history_saveback} = '';	2142	$self->{history_saveback} = '';
1855	$self->_emit (activate => $txt);	2143	$self->emit (activate => $txt);
1856	$self->update;	2144	$self->update;
1857		2145
1858	} elsif ($sym == CFClient::SDLK_UP) {	2146	} elsif ($sym == CFPlus::SDLK_UP) {
1859	if ($self->{history_pointer} < 0) {	2147	if ($self->{history_pointer} < 0) {
1860	$self->{history_saveback} = $self->get_text;	2148	$self->{history_saveback} = $self->get_text;
1861	}	2149	}
1862	if (@{$self->{history} || []} > 0) {	2150	if (@{$self->{history} || []} > 0) {
1863	$self->{history_pointer}++;	2151	$self->{history_pointer}++;
…		…
1865	$self->{history_pointer} = @{$self->{history} || []} - 1;	2153	$self->{history_pointer} = @{$self->{history} || []} - 1;
1866	}	2154	}
1867	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2155	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1868	}	2156	}
1869		2157
1870	} elsif ($sym == CFClient::SDLK_DOWN) {	2158	} elsif ($sym == CFPlus::SDLK_DOWN) {
1871	$self->{history_pointer}--;	2159	$self->{history_pointer}--;
1872	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2160	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1873		2161
1874	if ($self->{history_pointer} >= 0) {	2162	if ($self->{history_pointer} >= 0) {
1875	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2163	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1876	} else {	2164	} else {
1877	$self->set_text ($self->{history_saveback});	2165	$self->set_text ($self->{history_saveback});
1878	}	2166	}
1879		2167
1880	} else {	2168	} else {
1881	return $self->SUPER::key_down ($ev)	2169	return $self->SUPER::invoke_key_down ($ev)
1882	}	2170	}
1883		2171
1884	1	2172	1
1885	}	2173	}
1886		2174
1887	#############################################################################	2175	#############################################################################
1888		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
1889	package CFClient::UI::Button;	2216	package CFPlus::UI::Button;
1890		2217
1891	our @ISA = CFClient::UI::Label::;	2218	our @ISA = CFPlus::UI::Label::;
1892		2219
1893	use CFClient::OpenGL;	2220	use CFPlus::OpenGL;
1894		2221
1895	my @tex =	2222	my @tex =
1896	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2223	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1897	qw(b1_button_active.png);	2224	qw(b1_button_active.png);
1898		2225
1899	sub new {	2226	sub new {
1900	my $class = shift;	2227	my $class = shift;
1901		2228
…		…
1910	can_events => 1,	2237	can_events => 1,
1911	@_	2238	@_
1912	)	2239	)
1913	}	2240	}
1914		2241
1915	sub activate { }
1916
1917	sub button_up {	2242	sub invoke_button_up {
1918	my ($self, $ev, $x, $y) = @_;	2243	my ($self, $ev, $x, $y) = @_;
1919		2244
1920	$self->emit ("activate")	2245	$self->emit ("activate")
1921	if $x >= 0 && $x < $self->{w}	2246	if $x >= 0 && $x < $self->{w}
1922	&& $y >= 0 && $y < $self->{h};	2247	&& $y >= 0 && $y < $self->{h};
…		…
1940	$self->SUPER::_draw;	2265	$self->SUPER::_draw;
1941	}	2266	}
1942		2267
1943	#############################################################################	2268	#############################################################################
1944		2269
1945	package CFClient::UI::CheckBox;	2270	package CFPlus::UI::CheckBox;
1946		2271
1947	our @ISA = CFClient::UI::DrawBG::;	2272	our @ISA = CFPlus::UI::DrawBG::;
1948		2273
1949	my @tex =	2274	my @tex =
1950	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2275	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1951	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2276	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1952		2277
1953	use CFClient::OpenGL;	2278	use CFPlus::OpenGL;
1954		2279
1955	sub new {	2280	sub new {
1956	my $class = shift;	2281	my $class = shift;
1957		2282
1958	$class->SUPER::new (	2283	$class->SUPER::new (
…		…
1972	my ($self) = @_;	2297	my ($self) = @_;
1973		2298
1974	(6) x 2	2299	(6) x 2
1975	}	2300	}
1976		2301
		2302	sub toggle {
		2303	my ($self) = @_;
		2304
		2305	$self->{state} = !$self->{state};
		2306	$self->emit (changed => $self->{state});
		2307	$self->update;
		2308	}
		2309
1977	sub button_down {	2310	sub invoke_button_down {
1978	my ($self, $ev, $x, $y) = @_;	2311	my ($self, $ev, $x, $y) = @_;
1979		2312
1980	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2313	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1981	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2314	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1982	$self->{state} = !$self->{state};	2315	$self->toggle;
1983	$self->_emit (changed => $self->{state});
1984	} else {	2316	} else {
1985	return 0	2317	return 0
1986	}	2318	}
1987		2319
1988	1	2320	1
…		…
2008	glDisable GL_TEXTURE_2D;	2340	glDisable GL_TEXTURE_2D;
2009	}	2341	}
2010		2342
2011	#############################################################################	2343	#############################################################################
2012		2344
2013	package CFClient::UI::Image;	2345	package CFPlus::UI::Image;
2014		2346
2015	our @ISA = CFClient::UI::Base::;	2347	our @ISA = CFPlus::UI::Base::;
2016		2348
2017	use CFClient::OpenGL;	2349	use CFPlus::OpenGL;
2018	use Carp qw/confess/;
2019		2350
2020	our %loaded_images;	2351	our %texture_cache;
2021		2352
2022	sub new {	2353	sub new {
2023	my $class = shift;	2354	my $class = shift;
2024		2355
2025	my $self = $class->SUPER::new (can_events => 0, @_);	2356	my $self = $class->SUPER::new (
		2357	can_events => 0,
		2358	@_,
		2359	);
2026		2360
2027	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2361	$self->{path} || $self->{tex}
		2362	or Carp::croak "'path' or 'tex' attributes required";
2028		2363
2029	$loaded_images{$self->{image}} ||=	2364	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2030	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2365	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2031		2366
2032	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2367	CFPlus::weaken $texture_cache{$self->{path}};
2033		2368
2034	Scalar::Util::weaken $loaded_images{$self->{image}};	2369	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2035
2036	$self->{aspect} = $tex->{w} / $tex->{h};
2037		2370
2038	$self	2371	$self
2039	}	2372	}
2040		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
2041	sub size_request {	2389	sub size_request {
2042	my ($self) = @_;	2390	my ($self) = @_;
2043		2391
2044	($self->{tex}->{w}, $self->{tex}->{h})	2392	($self->{tex}{w}, $self->{tex}{h})
2045	}	2393	}
2046		2394
2047	sub _draw {	2395	sub _draw {
2048	my ($self) = @_;	2396	my ($self) = @_;
2049		2397
…		…
2059	}	2407	}
2060		2408
2061	glEnable GL_TEXTURE_2D;	2409	glEnable GL_TEXTURE_2D;
2062	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2410	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2063		2411
2064	$tex->draw_quad_alpha (0, 0, $w, $h);	2412	$tex->draw_quad (0, 0, $w, $h);
2065		2413
2066	glDisable GL_TEXTURE_2D;	2414	glDisable GL_TEXTURE_2D;
2067	}	2415	}
2068		2416
2069	#############################################################################	2417	#############################################################################
2070		2418
		2419	package CFPlus::UI::ImageButton;
		2420
		2421	our @ISA = CFPlus::UI::Image::;
		2422
		2423	use CFPlus::OpenGL;
		2424
		2425	my %textures;
		2426
		2427	sub new {
		2428	my $class = shift;
		2429
		2430	my $self = $class->SUPER::new (
		2431	padding_x => 4,
		2432	padding_y => 4,
		2433	fg => [1, 1, 1],
		2434	active_fg => [0, 0, 1],
		2435	can_hover => 1,
		2436	align => 0,
		2437	valign => 0,
		2438	can_events => 1,
		2439	@_
		2440	);
		2441	}
		2442
		2443	sub invoke_button_up {
		2444	my ($self, $ev, $x, $y) = @_;
		2445
		2446	$self->emit ("activate")
		2447	if $x >= 0 && $x < $self->{w}
		2448	&& $y >= 0 && $y < $self->{h};
		2449
		2450	1
		2451	}
		2452
		2453	#############################################################################
		2454
2071	package CFClient::UI::VGauge;	2455	package CFPlus::UI::VGauge;
2072		2456
2073	our @ISA = CFClient::UI::Base::;	2457	our @ISA = CFPlus::UI::Base::;
2074		2458
2075	use List::Util qw(min max);	2459	use List::Util qw(min max);
2076		2460
2077	use CFClient::OpenGL;	2461	use CFPlus::OpenGL;
2078		2462
2079	my %tex = (	2463	my %tex = (
2080	food => [	2464	food => [
2081	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2465	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2082	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2466	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2083	],	2467	],
2084	grace => [	2468	grace => [
2085	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2469	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2086	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/
2087	],	2471	],
2088	hp => [	2472	hp => [
2089	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2473	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2090	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2474	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2091	],	2475	],
2092	mana => [	2476	mana => [
2093	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2477	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2094	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/
2095	],	2479	],
2096	);	2480	);
2097		2481
2098	# eg. VGauge->new (gauge => 'food'), default gauge: food	2482	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2158	my $ycut1 = max 0, min 1, $ycut;	2542	my $ycut1 = max 0, min 1, $ycut;
2159	my $ycut2 = max 0, min 1, $ycut - 1;	2543	my $ycut2 = max 0, min 1, $ycut - 1;
2160		2544
2161	my $h1 = $self->{h} * (1 - $ycut1);	2545	my $h1 = $self->{h} * (1 - $ycut1);
2162	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);
2163		2550
2164	glEnable GL_BLEND;	2551	glEnable GL_BLEND;
2165	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2552	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2166	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2553	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2167	glEnable GL_TEXTURE_2D;	2554	glEnable GL_TEXTURE_2D;
…		…
2186		2573
2187	if ($t3) {	2574	if ($t3) {
2188	glBindTexture GL_TEXTURE_2D, $t3->{name};	2575	glBindTexture GL_TEXTURE_2D, $t3->{name};
2189	glBegin GL_QUADS;	2576	glBegin GL_QUADS;
2190	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2577	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2191	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2578	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2192	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2579	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2193	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2580	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2194	glEnd;	2581	glEnd;
2195	}	2582	}
2196		2583
2197	glDisable GL_BLEND;	2584	glDisable GL_BLEND;
2198	glDisable GL_TEXTURE_2D;	2585	glDisable GL_TEXTURE_2D;
2199	}	2586	}
2200		2587
2201	#############################################################################	2588	#############################################################################
2202		2589
2203	package CFClient::UI::Gauge;	2590	package CFPlus::UI::Gauge;
2204		2591
2205	our @ISA = CFClient::UI::VBox::;	2592	our @ISA = CFPlus::UI::VBox::;
2206		2593
2207	sub new {	2594	sub new {
2208	my ($class, %arg) = @_;	2595	my ($class, %arg) = @_;
2209		2596
2210	my $self = $class->SUPER::new (	2597	my $self = $class->SUPER::new (
…		…
2212	can_hover => 1,	2599	can_hover => 1,
2213	can_events => 1,	2600	can_events => 1,
2214	%arg,	2601	%arg,
2215	);	2602	);
2216		2603
2217	$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");
2218	$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);
2219	$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");
2220		2607
2221	$self	2608	$self
2222	}	2609	}
2223		2610
2224	sub set_fontsize {	2611	sub set_fontsize {
…		…
2245	$self->{value}->set_text ($val);	2632	$self->{value}->set_text ($val);
2246	}	2633	}
2247		2634
2248	#############################################################################	2635	#############################################################################
2249		2636
2250	package CFClient::UI::Slider;	2637	package CFPlus::UI::Slider;
2251		2638
2252	use strict;	2639	use strict;
2253		2640
2254	use CFClient::OpenGL;	2641	use CFPlus::OpenGL;
2255		2642
2256	our @ISA = CFClient::UI::DrawBG::;	2643	our @ISA = CFPlus::UI::DrawBG::;
2257		2644
2258	my @tex =	2645	my @tex =
2259	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2646	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2260	qw(s1_slider.png s1_slider_bg.png);	2647	qw(s1_slider.png s1_slider_bg.png);
2261		2648
2262	sub new {	2649	sub new {
2263	my $class = shift;	2650	my $class = shift;
2264		2651
…		…
2285	$self->update;	2672	$self->update;
2286		2673
2287	$self	2674	$self
2288	}	2675	}
2289		2676
2290	sub changed { }
2291
2292	sub set_range {	2677	sub set_range {
2293	my ($self, $range) = @_;	2678	my ($self, $range) = @_;
2294		2679
2295	($range, $self->{range}) = ($self->{range}, $range);	2680	($range, $self->{range}) = ($self->{range}, $range);
2296		2681
2297	$self->update
2298	if "@$range" ne "@{$self->{range}}";	2682	if ("@$range" ne "@{$self->{range}}") {
		2683	$self->update;
		2684	$self->set_value ($self->{range}[0]);
		2685	}
2299	}	2686	}
2300		2687
2301	sub set_value {	2688	sub set_value {
2302	my ($self, $value) = @_;	2689	my ($self, $value) = @_;
2303		2690
…		…
2314	if $unit;	2701	if $unit;
2315		2702
2316	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2703	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2317		2704
2318	if ($value != $old_value) {	2705	if ($value != $old_value) {
2319	$self->_emit (changed => $value);	2706	$self->emit (changed => $value);
2320	$self->update;	2707	$self->update;
2321	}	2708	}
2322	}	2709	}
2323		2710
2324	sub size_request {	2711	sub size_request {
2325	my ($self) = @_;	2712	my ($self) = @_;
2326		2713
2327	($self->{req_w}, $self->{req_h})	2714	($self->{req_w}, $self->{req_h})
2328	}	2715	}
2329		2716
2330	sub button_down {	2717	sub invoke_button_down {
2331	my ($self, $ev, $x, $y) = @_;	2718	my ($self, $ev, $x, $y) = @_;
2332		2719
2333	$self->SUPER::button_down ($ev, $x, $y);	2720	$self->SUPER::invoke_button_down ($ev, $x, $y);
2334		2721
2335	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2722	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2336		2723
2337	$self->mouse_motion ($ev, $x, $y)	2724	$self->invoke_mouse_motion ($ev, $x, $y)
2338	}	2725	}
2339		2726
2340	sub mouse_motion {	2727	sub invoke_mouse_motion {
2341	my ($self, $ev, $x, $y) = @_;	2728	my ($self, $ev, $x, $y) = @_;
2342		2729
2343	if ($GRAB == $self) {	2730	if ($GRAB == $self) {
2344	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2731	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2345		2732
…		…
2351	} else {	2738	} else {
2352	return 0;	2739	return 0;
2353	}	2740	}
2354		2741
2355	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
2356	}	2755	}
2357		2756
2358	sub update {	2757	sub update {
2359	my ($self) = @_;	2758	my ($self) = @_;
2360		2759
…		…
2409	glDisable GL_TEXTURE_2D;	2808	glDisable GL_TEXTURE_2D;
2410	}	2809	}
2411		2810
2412	#############################################################################	2811	#############################################################################
2413		2812
2414	package CFClient::UI::ValSlider;	2813	package CFPlus::UI::ValSlider;
2415		2814
2416	our @ISA = CFClient::UI::HBox::;	2815	our @ISA = CFPlus::UI::HBox::;
2417		2816
2418	sub new {	2817	sub new {
2419	my ($class, %arg) = @_;	2818	my ($class, %arg) = @_;
2420		2819
2421	my $range = delete $arg{range};	2820	my $range = delete $arg{range};
2422		2821
2423	my $self = $class->SUPER::new (	2822	my $self = $class->SUPER::new (
2424	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2823	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2425	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2824	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2426	to_value => sub { shift },	2825	to_value => sub { shift },
2427	from_value => sub { shift },	2826	from_value => sub { shift },
2428	%arg,	2827	%arg,
2429	);	2828	);
2430		2829
…		…
2450	sub set_range { shift->{slider}->set_range (@_) }	2849	sub set_range { shift->{slider}->set_range (@_) }
2451	sub set_value { shift->{slider}->set_value (@_) }	2850	sub set_value { shift->{slider}->set_value (@_) }
2452		2851
2453	#############################################################################	2852	#############################################################################
2454		2853
2455	package CFClient::UI::TextView;	2854	package CFPlus::UI::TextScroller;
2456		2855
2457	our @ISA = CFClient::UI::HBox::;	2856	our @ISA = CFPlus::UI::HBox::;
2458		2857
2459	use CFClient::OpenGL;	2858	use CFPlus::OpenGL;
2460		2859
2461	sub new {	2860	sub new {
2462	my $class = shift;	2861	my $class = shift;
2463		2862
2464	my $self = $class->SUPER::new (	2863	my $self = $class->SUPER::new (
2465	fontsize => 1,	2864	fontsize => 1,
2466	can_events => 0,	2865	can_events => 1,
		2866	indent => 0,
2467	#font => default_font	2867	#font => default_font
2468	@_,	2868	@_,
2469		2869
2470	layout => (new CFClient::Layout 1),	2870	layout => (new CFPlus::Layout),
2471	par => [],	2871	par => [],
		2872	max_par => 0,
2472	height => 0,	2873	height => 0,
2473	children => [	2874	children => [
2474	(new CFClient::UI::Empty expand => 1),	2875	(new CFPlus::UI::Empty expand => 1),
2475	(new CFClient::UI::Slider vertical => 1),	2876	(new CFPlus::UI::Slider vertical => 1),
2476	],	2877	],
2477	);	2878	);
2478		2879
2479	$self->{children}[1]->connect (changed => sub { $self->update });	2880	$self->{children}[1]->connect (changed => sub { $self->update });
2480		2881
…		…
2486		2887
2487	$self->{fontsize} = $fontsize;	2888	$self->{fontsize} = $fontsize;
2488	$self->reflow;	2889	$self->reflow;
2489	}	2890	}
2490		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
2491	sub size_allocate {	2901	sub invoke_size_allocate {
2492	my ($self, $w, $h) = @_;	2902	my ($self, $w, $h) = @_;
2493		2903
2494	$self->SUPER::size_allocate ($w, $h);	2904	my ($empty, $slider, @other) = @{ $self->{children} };
		2905	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2495		2906
2496	$self->{layout}->set_font ($self->{font}) if $self->{font};	2907	$self->{layout}->set_font ($self->{font}) if $self->{font};
2497	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2908	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2498	$self->{layout}->set_width ($self->{children}[0]{w});	2909	$self->{layout}->set_width ($empty->{w});
		2910	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2499		2911
2500	$self->reflow;	2912	$self->reflow;
2501	}
2502		2913
2503	sub text_size {	2914	local $self->{children} = [$empty, $slider];
		2915	$self->SUPER::invoke_size_allocate ($w, $h)
		2916	}
		2917
		2918	sub invoke_mouse_wheel {
2504	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) = @_;
2505		2930
2506	my $layout = $self->{layout};	2931	my $layout = $self->{layout};
2507		2932
		2933	$layout->set_font ($self->{font}) if $self->{font};
		2934	$layout->set_foreground (@{$para->{fg}});
2508	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2935	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2509	$layout->set_width ($self->{children}[0]{w} - $indent);	2936	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		2937	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2510	$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}}
2511		2944	);
		2945
2512	$layout->size	2946	$layout
2513	}	2947	}
2514		2948
2515	sub reflow {	2949	sub reflow {
2516	my ($self) = @_;	2950	my ($self) = @_;
2517		2951
…		…
2524		2958
2525	# todo: base offset on lines or so, not on pixels	2959	# todo: base offset on lines or so, not on pixels
2526	$self->{children}[1]->set_value ($offset);	2960	$self->{children}[1]->set_value ($offset);
2527	}	2961	}
2528		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
2529	sub clear {	2978	sub clear {
2530	my ($self) = @_;	2979	my ($self) = @_;
		2980
		2981	my (undef, undef, @other) = @{ $self->{children} };
		2982	$self->remove ($_) for @other;
2531		2983
2532	$self->{par} = [];	2984	$self->{par} = [];
2533	$self->{height} = 0;	2985	$self->{height} = 0;
2534	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2986	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2535	}	2987	}
2536		2988
2537	sub add_paragraph {	2989	sub add_paragraph {
2538	my ($self, $color, $text, $indent) = @_;	2990	my $self = shift;
2539		2991
2540	for my $line (split /\n/, $text) {	2992	for my $para (@_) {
2541	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
2542	$self->{height} += $h;	3044	$self->{height} = $height;
2543	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3045	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2544	}
2545		3046
2546	$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	}
2547	}	3053	}
2548		3054
2549	sub update {	3055	sub update {
2550	my ($self) = @_;	3056	my ($self) = @_;
2551		3057
…		…
2553		3059
2554	return unless $self->{h} > 0;	3060	return unless $self->{h} > 0;
2555		3061
2556	delete $self->{texture};	3062	delete $self->{texture};
2557		3063
2558	$ROOT->on_post_alloc ($self, sub {	3064	$ROOT->on_post_alloc ($self => sub {
		3065	$self->force_uptodate;
		3066
2559	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3067	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2560		3068
2561	if (delete $self->{need_reflow}) {
2562	my $height = 0;
2563
2564	my $layout = $self->{layout};
2565
2566	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2567
2568	for (@{$self->{par}}) {
2569	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2570	$layout->set_width ($W - $_->[3]);
2571	$layout->set_markup ($_->[4]);
2572	my ($w, $h) = $layout->size;
2573	$_->[0] = $w + $_->[3];
2574	$_->[1] = $h;
2575	}
2576
2577	$height += $_->[1];
2578	}
2579
2580	$self->{height} = $height;
2581
2582	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2583
2584	delete $self->{texture};
2585	}
2586
2587	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3069	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2588	glClearColor 0, 0, 0, 0;	3070	glClearColor 0, 0, 0, 0;
2589	glClear GL_COLOR_BUFFER_BIT;	3071	glClear GL_COLOR_BUFFER_BIT;
2590		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;
2591	my $top = int $self->{children}[1]{range}[0];	3081	my $top = int $self->{children}[1]{range}[0];
2592		3082
2593	my $y0 = $top;	3083	my $y0 = $top;
2594	my $y1 = $top + $H;	3084	my $y1 = $top + $H;
2595		3085
2596	my $y = 0;
2597
2598	my $layout = $self->{layout};
2599
2600	$layout->set_font ($self->{font}) if $self->{font};
2601
2602	glEnable GL_BLEND;
2603	#TODO# not correct in windows where rgba is forced off
2604	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2605
2606	for my $par (@{$self->{par}}) {	3086	for my $para (@{$self->{par}}) {
2607	my $h = $par->[1];	3087	my $h = $para->{h};
		3088	my $y = $para->{y};
2608		3089
2609	if ($y0 < $y + $h && $y < $y1) {	3090	if ($y0 < $y + $h && $y < $y1) {
2610	$layout->set_foreground (@{ $par->[2] });	3091	my $layout = $self->get_layout ($para);
2611	$layout->set_width ($W - $par->[3]);
2612	$layout->set_markup ($par->[4]);
2613		3092
2614	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3093	$layout->render ($para->{indent}, $y - $y0);
2615		3094
2616	glRasterPos $par->[3], $y - $y0;	3095	if (my @w = @{ $para->{widget} }) {
2617	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	}
2618	}	3107	}
2619		3108
2620	$y += $h;	3109	$paridx++;
		3110	$top_paragraph ||= $paridx if $y >= $top;
2621	}	3111	}
2622		3112
2623	glDisable GL_BLEND;	3113	$self->{top_paragraph} = $top_paragraph;
2624	};	3114	};
2625	});	3115	});
		3116	}
		3117
		3118	sub reconfigure {
		3119	my ($self) = @_;
		3120
		3121	$self->SUPER::reconfigure;
		3122
		3123	$_->{w} = 1e10 for @{ $self->{par} };
		3124	$self->reflow;
2626	}	3125	}
2627		3126
2628	sub _draw {	3127	sub _draw {
2629	my ($self) = @_;	3128	my ($self) = @_;
2630		3129
…		…
2633	glColor 0, 0, 0, 1;	3132	glColor 0, 0, 0, 1;
2634	$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});
2635	glDisable GL_TEXTURE_2D;	3134	glDisable GL_TEXTURE_2D;
2636		3135
2637	$self->{children}[1]->draw;	3136	$self->{children}[1]->draw;
2638
2639	}	3137	}
2640		3138
2641	#############################################################################	3139	#############################################################################
2642		3140
2643	package CFClient::UI::Animator;	3141	package CFPlus::UI::Animator;
2644		3142
2645	use CFClient::OpenGL;	3143	use CFPlus::OpenGL;
2646		3144
2647	our @ISA = CFClient::UI::Bin::;	3145	our @ISA = CFPlus::UI::Bin::;
2648		3146
2649	sub moveto {	3147	sub moveto {
2650	my ($self, $x, $y) = @_;	3148	my ($self, $x, $y) = @_;
2651		3149
2652	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3150	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2680	glPopMatrix;	3178	glPopMatrix;
2681	}	3179	}
2682		3180
2683	#############################################################################	3181	#############################################################################
2684		3182
2685	package CFClient::UI::Flopper;	3183	package CFPlus::UI::Flopper;
2686		3184
2687	our @ISA = CFClient::UI::Button::;	3185	our @ISA = CFPlus::UI::Button::;
2688		3186
2689	sub new {	3187	sub new {
2690	my $class = shift;	3188	my $class = shift;
2691		3189
2692	my $self = $class->SUPER::new (	3190	my $self = $class->SUPER::new (
…		…
2704	$self->{other}->toggle_visibility;	3202	$self->{other}->toggle_visibility;
2705	}	3203	}
2706		3204
2707	#############################################################################	3205	#############################################################################
2708		3206
2709	package CFClient::UI::Tooltip;	3207	package CFPlus::UI::Tooltip;
2710		3208
2711	our @ISA = CFClient::UI::Bin::;	3209	our @ISA = CFPlus::UI::Bin::;
2712		3210
2713	use CFClient::OpenGL;	3211	use CFPlus::OpenGL;
2714		3212
2715	sub new {	3213	sub new {
2716	my $class = shift;	3214	my $class = shift;
2717		3215
2718	$class->SUPER::new (	3216	$class->SUPER::new (
…		…
2721	)	3219	)
2722	}	3220	}
2723		3221
2724	sub set_tooltip_from {	3222	sub set_tooltip_from {
2725	my ($self, $widget) = @_;	3223	my ($self, $widget) = @_;
		3224
		3225	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3226	if $widget->{tooltip} =~ /^#(.*)$/;
2726		3227
2727	my $tooltip = $widget->{tooltip};	3228	my $tooltip = $widget->{tooltip};
2728		3229
2729	if ($ENV{CFPLUS_DEBUG} & 2) {	3230	if ($ENV{CFPLUS_DEBUG} & 2) {
2730	$tooltip .= "\n\n" . (ref $widget) . "\n"	3231	$tooltip .= "\n\n" . (ref $widget) . "\n"
2731	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3232	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2732	. "req $widget->{req_w} $widget->{req_h}\n"	3233	. "req $widget->{req_w} $widget->{req_h}\n"
2733	. "visible $widget->{visible}";	3234	. "visible $widget->{visible}";
2734	}	3235	}
2735		3236
		3237	$tooltip =~ s/^\n+//;
		3238	$tooltip =~ s/\n+$//;
		3239
2736	$self->add (new CFClient::UI::Label	3240	$self->add (new CFPlus::UI::Label
2737	markup => $tooltip,	3241	markup => $tooltip,
2738	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3242	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2739	fontsize => 0.8,	3243	fontsize => 0.8,
2740	fg => [0, 0, 0, 1],	3244	style => 1, # FLAG_INVERSE
2741	ellipsise => 0,	3245	ellipsise => 0,
2742	font => ($widget->{tooltip_font} || $::FONT_PROP),	3246	font => ($widget->{tooltip_font} || $::FONT_PROP),
2743	);	3247	);
2744	}	3248	}
2745		3249
…		…
2749	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3253	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2750		3254
2751	($w + 4, $h + 4)	3255	($w + 4, $h + 4)
2752	}	3256	}
2753		3257
2754	sub size_allocate {	3258	sub invoke_size_allocate {
2755	my ($self, $w, $h) = @_;	3259	my ($self, $w, $h) = @_;
2756		3260
2757	$self->SUPER::size_allocate ($w - 4, $h - 4);	3261	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2758	}	3262	}
2759		3263
2760	sub visibility_change {	3264	sub invoke_visibility_change {
2761	my ($self, $visible) = @_;	3265	my ($self, $visible) = @_;
2762		3266
2763	return unless $visible;	3267	return unless $visible;
2764		3268
2765	$self->{root}->on_post_alloc ("move_$self" => sub {	3269	$self->{root}->on_post_alloc ("move_$self" => sub {
2766	my $widget = $self->{owner}	3270	my $widget = $self->{owner}
2767	or return;	3271	or return;
2768		3272
		3273	if ($widget->{visible}) {
2769	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3274	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2770		3275
2771	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3276	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2772	if $x + $self->{w} > $::WIDTH;	3277	if $x + $self->{w} > $self->{root}{w};
2773		3278
2774	$self->move_abs ($x, $y);	3279	$self->move_abs ($x, $y);
		3280	} else {
		3281	$self->hide;
		3282	}
2775	});	3283	});
2776	}	3284	}
2777		3285
2778	sub _draw {	3286	sub _draw {
2779	my ($self) = @_;	3287	my ($self) = @_;
…		…
2803	$self->SUPER::_draw;	3311	$self->SUPER::_draw;
2804	}	3312	}
2805		3313
2806	#############################################################################	3314	#############################################################################
2807		3315
2808	package CFClient::UI::Face;	3316	package CFPlus::UI::Face;
2809		3317
2810	our @ISA = CFClient::UI::Base::;	3318	our @ISA = CFPlus::UI::DrawBG::;
2811		3319
2812	use CFClient::OpenGL;	3320	use CFPlus::OpenGL;
2813		3321
2814	sub new {	3322	sub new {
2815	my $class = shift;	3323	my $class = shift;
2816		3324
2817	my $self = $class->SUPER::new (	3325	my $self = $class->SUPER::new (
…		…
2819	can_events => 0,	3327	can_events => 0,
2820	@_,	3328	@_,
2821	);	3329	);
2822		3330
2823	if ($self->{anim} && $self->{animspeed}) {	3331	if ($self->{anim} && $self->{animspeed}) {
2824	Scalar::Util::weaken (my $widget = $self);	3332	CFPlus::weaken (my $widget = $self);
2825		3333
2826	$self->{timer} = Event->timer (	3334	$self->{timer} = Event->timer (
2827	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3335	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2828	hard => 1,	3336	hard => 1,
2829	interval => $self->{animspeed},	3337	interval => $self->{animspeed},
2830	cb => sub {	3338	cb => sub {
		3339	delete $self->{wait_face};
2831	++$widget->{frame};	3340	++$widget->{frame};
2832	$widget->update;	3341	$widget->update;
2833	},	3342	},
2834	);	3343	);
2835	}	3344	}
…		…
2852	sub _draw {	3361	sub _draw {
2853	my ($self) = @_;	3362	my ($self) = @_;
2854		3363
2855	return unless $::CONN;	3364	return unless $::CONN;
2856		3365
		3366	$self->SUPER::_draw;
		3367
2857	my $face;	3368	my $face;
2858		3369
2859	if ($self->{frame}) {	3370	if ($self->{frame}) {
2860	my $anim = $::CONN->{anim}[$self->{anim}];	3371	my $anim = $::CONN->{anim}[$self->{anim}];
2861		3372
2862	$face = $anim->[ $self->{frame} % @$anim ]	3373	$face = $anim->[ $self->{frame} % @$anim ]
2863	if $anim && @$anim;	3374	if $anim && @$anim;
2864	}	3375	}
		3376
		3377	my $faceid = $::CONN->{faceid}[$face || $self->{face}]
		3378	or return;
2865		3379
2866	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3380	my $tex = $::CONN->{texture}[$faceid];
2867		3381
2868	if ($tex) {	3382	if ($tex) {
2869	glEnable GL_TEXTURE_2D;	3383	glEnable GL_TEXTURE_2D;
2870	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3384	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2871	glColor 0, 0, 0, 1;	3385	glColor 0, 0, 0, 1;
2872	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3386	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2873	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	});
2874	}	3392	}
2875	}	3393	}
2876		3394
2877	sub DESTROY {	3395	sub destroy {
2878	my ($self) = @_;	3396	my ($self) = @_;
2879		3397
2880	$self->{timer}->cancel	3398	$self->{timer}->cancel
2881	if $self->{timer};	3399	if $self->{timer};
2882		3400
2883	$self->SUPER::DESTROY;	3401	$self->SUPER::destroy;
2884	}	3402	}
2885		3403
2886	#############################################################################	3404	#############################################################################
2887		3405
2888	package CFClient::UI::Buttonbar;	3406	package CFPlus::UI::Buttonbar;
2889		3407
2890	our @ISA = CFClient::UI::HBox::;	3408	our @ISA = CFPlus::UI::HBox::;
2891		3409
2892	# TODO: should actualyl wrap buttons and other goodies.	3410	# TODO: should actually wrap buttons and other goodies.
2893		3411
2894	#############################################################################	3412	#############################################################################
2895		3413
2896	package CFClient::UI::Menu;	3414	package CFPlus::UI::Menu;
2897		3415
2898	our @ISA = CFClient::UI::FancyFrame::;	3416	our @ISA = CFPlus::UI::Toplevel::;
2899		3417
2900	use CFClient::OpenGL;	3418	use CFPlus::OpenGL;
2901		3419
2902	sub new {	3420	sub new {
2903	my $class = shift;	3421	my $class = shift;
2904		3422
2905	my $self = $class->SUPER::new (	3423	my $self = $class->SUPER::new (
2906	items => [],	3424	items => [],
2907	z => 100,	3425	z => 100,
2908	@_,	3426	@_,
2909	);	3427	);
2910		3428
2911	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3429	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2912		3430
2913	for my $item (@{ $self->{items} }) {	3431	for my $item (@{ $self->{items} }) {
2914	my ($widget, $cb) = @$item;	3432	my ($widget, $cb, $tooltip) = @$item;
2915		3433
2916	# handle various types of items, only text for now	3434	# handle various types of items, only text for now
2917	if (!ref $widget) {	3435	if (!ref $widget) {
		3436	if ($widget =~ /\t/) {
		3437	my ($left, $right) = split /\t/, $widget, 2;
		3438
2918	$widget = new CFClient::UI::Label	3439	$widget = new CFPlus::UI::HBox
2919	can_hover => 1,	3440	can_hover => 1,
2920	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,
2921	text => $widget;	3453	markup => $widget,
		3454	tooltip => $tooltip;
		3455	}
2922	}	3456	}
2923		3457
2924	$self->{item}{$widget} = $item;	3458	$self->{item}{$widget} = $item;
2925		3459
2926	$self->{vbox}->add ($widget);	3460	$self->{vbox}->add ($widget);
…		…
2931		3465
2932	# 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)
2933	sub popup {	3467	sub popup {
2934	my ($self, $ev) = @_;	3468	my ($self, $ev) = @_;
2935		3469
2936	$self->_emit ("popdown");	3470	$self->emit ("popdown");
2937		3471
2938	# maybe save $GRAB? must be careful about events...	3472	# maybe save $GRAB? must be careful about events...
2939	$GRAB = $self;	3473	$GRAB = $self;
2940	$self->{button} = $ev->{button};	3474	$self->{button} = $ev->{button};
2941		3475
2942	$self->show;	3476	$self->show;
2943	$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);
2944	}	3478	}
2945		3479
2946	sub mouse_motion {	3480	sub invoke_mouse_motion {
2947	my ($self, $ev, $x, $y) = @_;	3481	my ($self, $ev, $x, $y) = @_;
2948		3482
2949	# TODO: should use vbox->find_widget or so	3483	# TODO: should use vbox->find_widget or so
2950	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3484	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2951	$self->{hover} = $self->{item}{$HOVER};	3485	$self->{hover} = $self->{item}{$HOVER};
2952		3486
2953	0	3487	0
2954	}	3488	}
2955		3489
2956	sub button_up {	3490	sub invoke_button_up {
2957	my ($self, $ev, $x, $y) = @_;	3491	my ($self, $ev, $x, $y) = @_;
2958		3492
2959	if ($ev->{button} == $self->{button}) {	3493	if ($ev->{button} == $self->{button}) {
2960	undef $GRAB;	3494	undef $GRAB;
2961	$self->hide;	3495	$self->hide;
2962		3496
2963	$self->_emit ("popdown");	3497	$self->emit ("popdown");
2964	$self->{hover}[1]->() if $self->{hover};	3498	$self->{hover}[1]->() if $self->{hover};
2965	} else {	3499	} else {
2966	return 0	3500	return 0
2967	}	3501	}
2968		3502
2969	1	3503	1
2970	}	3504	}
2971		3505
2972	#############################################################################	3506	#############################################################################
2973		3507
2974	package CFClient::UI::Multiplexer;	3508	package CFPlus::UI::Multiplexer;
2975		3509
2976	our @ISA = CFClient::UI::Container::;	3510	our @ISA = CFPlus::UI::Container::;
2977		3511
2978	sub new {	3512	sub new {
2979	my $class = shift;	3513	my $class = shift;
2980		3514
2981	my $self = $class->SUPER::new (	3515	my $self = $class->SUPER::new (
…		…
2995		3529
2996	$self->{current} = $self->{children}[0]	3530	$self->{current} = $self->{children}[0]
2997	if @{ $self->{children} };	3531	if @{ $self->{children} };
2998	}	3532	}
2999		3533
		3534	sub get_current_page {
		3535	my ($self) = @_;
		3536
		3537	$self->{current}
		3538	}
		3539
3000	sub set_current_page {	3540	sub set_current_page {
3001	my ($self, $page_or_widget) = @_;	3541	my ($self, $page_or_widget) = @_;
3002		3542
3003	my $widget = ref $page_or_widget	3543	my $widget = ref $page_or_widget
3004	? $page_or_widget	3544	? $page_or_widget
3005	: $self->{children}[$page_or_widget];	3545	: $self->{children}[$page_or_widget];
3006		3546
3007	$self->{current} = $widget;	3547	$self->{current} = $widget;
3008	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3548	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3009		3549
3010	$self->_emit (page_changed => $self->{current});	3550	$self->emit (page_changed => $self->{current});
3011		3551
3012	$self->realloc;	3552	$self->realloc;
3013	}	3553	}
3014		3554
3015	sub visible_children {	3555	sub visible_children {
…		…
3020	my ($self) = @_;	3560	my ($self) = @_;
3021		3561
3022	$self->{current}->size_request	3562	$self->{current}->size_request
3023	}	3563	}
3024		3564
3025	sub size_allocate {	3565	sub invoke_size_allocate {
3026	my ($self, $w, $h) = @_;	3566	my ($self, $w, $h) = @_;
3027		3567
3028	$self->{current}->configure (0, 0, $w, $h);	3568	$self->{current}->configure (0, 0, $w, $h);
		3569
		3570	1
3029	}	3571	}
3030		3572
3031	sub _draw {	3573	sub _draw {
3032	my ($self) = @_;	3574	my ($self) = @_;
3033		3575
3034	$self->{current}->draw;	3576	$self->{current}->draw;
3035	}	3577	}
3036		3578
3037	#############################################################################	3579	#############################################################################
3038		3580
3039	package CFClient::UI::Notebook;	3581	package CFPlus::UI::Notebook;
3040		3582
3041	our @ISA = CFClient::UI::VBox::;	3583	our @ISA = CFPlus::UI::VBox::;
3042		3584
3043	sub new {	3585	sub new {
3044	my $class = shift;	3586	my $class = shift;
3045		3587
3046	my $self = $class->SUPER::new (	3588	my $self = $class->SUPER::new (
3047	buttonbar => (new CFClient::UI::Buttonbar),	3589	buttonbar => (new CFPlus::UI::Buttonbar),
3048	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3590	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3049	# filter => # will be put between multiplexer and $self	3591	# filter => # will be put between multiplexer and $self
3050	@_,	3592	@_,
3051	);	3593	);
3052		3594
3053	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3595	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3057	}	3599	}
3058		3600
3059	sub add {	3601	sub add {
3060	my ($self, $title, $widget, $tooltip) = @_;	3602	my ($self, $title, $widget, $tooltip) = @_;
3061		3603
3062	Scalar::Util::weaken $self;	3604	CFPlus::weaken $self;
3063		3605
3064	$self->{buttonbar}->add (new CFClient::UI::Button	3606	$self->{buttonbar}->add (new CFPlus::UI::Button
3065	markup => $title,	3607	markup => $title,
3066	tooltip => $tooltip,	3608	tooltip => $tooltip,
3067	on_activate => sub { $self->set_current_page ($widget) },	3609	on_activate => sub { $self->set_current_page ($widget) },
3068	);	3610	);
3069		3611
3070	$self->{multiplexer}->add ($widget);	3612	$self->{multiplexer}->add ($widget);
3071	}	3613	}
3072		3614
		3615	sub get_current_page {
		3616	my ($self) = @_;
		3617
		3618	$self->{multiplexer}->get_current_page
		3619	}
		3620
3073	sub set_current_page {	3621	sub set_current_page {
3074	my ($self, $page) = @_;	3622	my ($self, $page) = @_;
3075		3623
3076	$self->{multiplexer}->set_current_page ($page);	3624	$self->{multiplexer}->set_current_page ($page);
3077	$self->_emit (page_changed => $self->{multiplexer}{current});	3625	$self->emit (page_changed => $self->{multiplexer}{current});
3078	}	3626	}
3079		3627
3080	#############################################################################	3628	#############################################################################
3081		3629
		3630	package CFPlus::UI::Selector;
		3631
		3632	use utf8;
		3633
		3634	our @ISA = CFPlus::UI::Button::;
		3635
		3636	sub new {
		3637	my $class = shift;
		3638
		3639	my $self = $class->SUPER::new (
		3640	options => [], # [value, title, longdesc], ...
		3641	value => undef,
		3642	@_,
		3643	);
		3644
		3645	$self->_set_value ($self->{value});
		3646
		3647	$self
		3648	}
		3649
		3650	sub invoke_button_down {
		3651	my ($self, $ev) = @_;
		3652
		3653	my @menu_items;
		3654
		3655	for (@{ $self->{options} }) {
		3656	my ($value, $title, $tooltip) = @$_;
		3657
		3658	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3659	}
		3660
		3661	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3662	}
		3663
		3664	sub _set_value {
		3665	my ($self, $value) = @_;
		3666
		3667	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3668	or return;
		3669
		3670	$self->{value} = $item->[0];
		3671	$self->set_markup ("$item->[1] ⇓");
		3672	$self->set_tooltip ($item->[2]);
		3673	}
		3674
		3675	sub set_value {
		3676	my ($self, $value) = @_;
		3677
		3678	return unless $self->{value} ne $value;
		3679
		3680	$self->_set_value ($value);
		3681	$self->emit (changed => $value);
		3682	}
		3683
		3684	#############################################################################
		3685
3082	package CFClient::UI::Statusbox;	3686	package CFPlus::UI::Statusbox;
3083		3687
3084	our @ISA = CFClient::UI::VBox::;	3688	our @ISA = CFPlus::UI::VBox::;
3085		3689
3086	sub new {	3690	sub new {
3087	my $class = shift;	3691	my $class = shift;
3088		3692
3089	my $self = $class->SUPER::new (	3693	my $self = $class->SUPER::new (
3090	fontsize => 0.8,	3694	fontsize => 0.8,
3091	@_,	3695	@_,
3092	);	3696	);
3093		3697
3094	Scalar::Util::weaken (my $this = $self);	3698	CFPlus::weaken (my $this = $self);
3095		3699
3096	$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 });
3097		3701
3098	$self	3702	$self
3099	}	3703	}
…		…
3101	sub reorder {	3705	sub reorder {
3102	my ($self) = @_;	3706	my ($self) = @_;
3103	my $NOW = Time::HiRes::time;	3707	my $NOW = Time::HiRes::time;
3104		3708
3105	# freeze display when hovering over any label	3709	# freeze display when hovering over any label
3106	return if $CFClient::UI::TOOLTIP->{owner}	3710	return if $CFPlus::UI::TOOLTIP->{owner}
3107	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3711	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3108	values %{ $self->{item} };	3712	values %{ $self->{item} };
3109		3713
3110	while (my ($k, $v) = each %{ $self->{item} }) {	3714	while (my ($k, $v) = each %{ $self->{item} }) {
3111	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3715	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3112	}	3716	}
…		…
3133	for ($short) {	3737	for ($short) {
3134	s/^\s+//;	3738	s/^\s+//;
3135	s/\s+/ /g;	3739	s/\s+/ /g;
3136	}	3740	}
3137		3741
3138	new CFClient::UI::Label	3742	new CFPlus::UI::Label
3139	markup => $short,	3743	markup => $short,
3140	tooltip => $item->{tooltip},	3744	tooltip => $item->{tooltip},
3141	tooltip_font => $::FONT_PROP,	3745	tooltip_font => $::FONT_PROP,
3142	tooltip_width => 0.67,	3746	tooltip_width => 0.67,
3143	fontsize => $item->{fontsize} || $self->{fontsize},	3747	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3181	$item->{count}++;	3785	$item->{count}++;
3182	} else {	3786	} else {
3183	$item->{count} = 1;	3787	$item->{count} = 1;
3184	$item->{text} = $item->{tooltip} = $text;	3788	$item->{text} = $item->{tooltip} = $text;
3185	}	3789	}
3186	$item->{id} = ++$self->{id};	3790	$item->{id} += 0.2;#d#
3187	$item->{timeout} = $timeout;	3791	$item->{timeout} = $timeout;
3188	delete $item->{label};	3792	delete $item->{label};
3189	} else {	3793	} else {
3190	$self->{item}{$group} = {	3794	$self->{item}{$group} = {
3191	id => ++$self->{id},	3795	id => ++$self->{id},
…		…
3197	count => 1,	3801	count => 1,
3198	%arg,	3802	%arg,
3199	};	3803	};
3200	}	3804	}
3201		3805
		3806	$ROOT->on_refresh (reorder => sub {
3202	$self->reorder;	3807	$self->reorder;
		3808	});
3203	}	3809	}
3204		3810
3205	sub reconfigure {	3811	sub reconfigure {
3206	my ($self) = @_;	3812	my ($self) = @_;
3207		3813
…		…
3210		3816
3211	$self->reorder;	3817	$self->reorder;
3212	$self->SUPER::reconfigure;	3818	$self->SUPER::reconfigure;
3213	}	3819	}
3214		3820
3215	sub DESTROY {	3821	sub destroy {
3216	my ($self) = @_;	3822	my ($self) = @_;
3217		3823
3218	$self->{timer}->cancel;	3824	$self->{timer}->cancel;
3219		3825
3220	$self->SUPER::DESTROY;	3826	$self->SUPER::destroy;
3221	}	3827	}
3222		3828
3223	#############################################################################	3829	#############################################################################
3224		3830
3225	package CFClient::UI::Inventory;
3226
3227	our @ISA = CFClient::UI::ScrolledWindow::;
3228
3229	sub new {
3230	my $class = shift;
3231
3232	my $self = $class->SUPER::new (
3233	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3234	@_,
3235	);
3236
3237	$self
3238	}
3239
3240	sub set_items {
3241	my ($self, $items) = @_;
3242
3243	$self->{child}->clear;
3244	return unless $items;
3245
3246	my @items = sort {
3247	($a->{type} <=> $b->{type})
3248	or ($a->{name} cmp $b->{name})
3249	} @$items;
3250
3251	$self->{real_items} = \@items;
3252
3253	my $row = 0;
3254	for my $item (@items) {
3255	CFClient::Item::update_widgets $item;
3256
3257	$self->{child}->add (0, $row, $item->{face_widget});
3258	$self->{child}->add (1, $row, $item->{desc_widget});
3259	$self->{child}->add (2, $row, $item->{weight_widget});
3260
3261	$row++;
3262	}
3263	}
3264
3265	#############################################################################
3266
3267	package CFClient::UI::BindEditor;
3268
3269	our @ISA = CFClient::UI::FancyFrame::;
3270
3271	sub new {
3272	my $class = shift;
3273
3274	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3275
3276	$self->add (my $vb = new CFClient::UI::VBox);
3277
3278
3279	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3280	text => "start recording",
3281	tooltip => "Start/Stops recording of actions."
3282	."All subsequent actions after the recording started will be captured."
3283	."The actions are displayed after the record was stopped."
3284	."To bind the action you have to click on the 'Bind' button",
3285	on_activate => sub {
3286	unless ($self->{recording}) {
3287	$self->start;
3288	} else {
3289	$self->stop;
3290	}
3291	});
3292
3293	$vb->add (new CFClient::UI::Label text => "Actions:");
3294	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3295
3296	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3297	$vb->add (my $hb = new CFClient::UI::HBox);
3298	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3299	$hb->add (new CFClient::UI::Button
3300	text => "bind",
3301	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3302	on_activate => sub {
3303	$self->ask_for_bind;
3304	});
3305
3306	$vb->add (my $hb = new CFClient::UI::HBox);
3307	$hb->add (new CFClient::UI::Button
3308	text => "ok",
3309	expand => 1,
3310	tooltip => "This closes the binding editor and saves the binding",
3311	on_activate => sub {
3312	$self->hide;
3313	$self->commit;
3314	});
3315
3316	$hb->add (new CFClient::UI::Button
3317	text => "cancel",
3318	expand => 1,
3319	tooltip => "This closes the binding editor without saving",
3320	on_activate => sub {
3321	$self->hide;
3322	$self->{binding_cancel}->()
3323	if $self->{binding_cancel};
3324	});
3325
3326	$self->update_binding_widgets;
3327
3328	$self
3329	}
3330
3331	sub commit {
3332	my ($self) = @_;
3333	my ($mod, $sym, $cmds) = $self->get_binding;
3334	if ($sym != 0 && @$cmds > 0) {
3335	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3336	."'. Don't forget 'Save Config'!");
3337	$self->{binding_change}->($mod, $sym, $cmds)
3338	if $self->{binding_change};
3339	} else {
3340	$::STATUSBOX->add ("No action bound, no key or action specified!");
3341	$self->{binding_cancel}->()
3342	if $self->{binding_cancel};
3343	}
3344	}
3345
3346	sub start {
3347	my ($self) = @_;
3348
3349	$self->{rec_btn}->set_text ("stop recording");
3350	$self->{recording} = 1;
3351	$self->clear_command_list;
3352	$::CONN->start_record if $::CONN;
3353	}
3354
3355	sub stop {
3356	my ($self) = @_;
3357
3358	$self->{rec_btn}->set_text ("start recording");
3359	$self->{recording} = 0;
3360
3361	my $rec;
3362	$rec = $::CONN->stop_record if $::CONN;
3363	return unless ref $rec eq 'ARRAY';
3364	$self->set_command_list ($rec);
3365	}
3366
3367
3368	sub ask_for_bind_and_commit {
3369	my ($self) = @_;
3370	$self->ask_for_bind (1);
3371	}
3372
3373	sub ask_for_bind {
3374	my ($self, $commit) = @_;
3375
3376	CFClient::Binder::open_binding_dialog (sub {
3377	my ($mod, $sym) = @_;
3378	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3379	$self->update_binding_widgets;
3380	$self->commit if $commit;
3381	});
3382	}
3383
3384	# $mod and $sym are the modifiers and key symbol
3385	# $cmds is a array ref of strings (the commands)
3386	# $cb is the callback that is executed on OK
3387	# $ccb is the callback that is executed on CANCEL and
3388	# when the binding was unsuccessful on OK
3389	sub set_binding {
3390	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3391
3392	$self->clear_command_list;
3393	$self->{recording} = 0;
3394	$self->{rec_btn}->set_text ("start recording");
3395
3396	$self->{binding} = [$mod, $sym];
3397	$self->{commands} = $cmds;
3398
3399	$self->{binding_change} = $cb;
3400	$self->{binding_cancel} = $ccb;
3401
3402	$self->update_binding_widgets;
3403	}
3404
3405	# this is a shortcut method that asks for a binding
3406	# and then just binds it.
3407	sub do_quick_binding {
3408	my ($self, $cmds) = @_;
3409	$self->set_binding (undef, undef, $cmds, sub {
3410	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3411	});
3412	$self->ask_for_bind (1);
3413	}
3414
3415	sub update_binding_widgets {
3416	my ($self) = @_;
3417	my ($mod, $sym, $cmds) = $self->get_binding;
3418	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3419	$self->set_command_list ($cmds);
3420	}
3421
3422	sub get_binding {
3423	my ($self) = @_;
3424	return (
3425	$self->{binding}->[0],
3426	$self->{binding}->[1],
3427	[ grep { defined $_ } @{$self->{commands}} ]
3428	);
3429	}
3430
3431	sub clear_command_list {
3432	my ($self) = @_;
3433	$self->{cmdbox}->clear ();
3434	}
3435
3436	sub set_command_list {
3437	my ($self, $cmds) = @_;
3438
3439	$self->{cmdbox}->clear ();
3440	$self->{commands} = $cmds;
3441
3442	my $idx = 0;
3443
3444	for (@$cmds) {
3445	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3446
3447	my $i = $idx;
3448	$hb->add (new CFClient::UI::Label text => $_);
3449	$hb->add (new CFClient::UI::Button
3450	text => "delete",
3451	tooltip => "Deletes the action from the record",
3452	on_activate => sub {
3453	$self->{cmdbox}->remove ($hb);
3454	$cmds->[$i] = undef;
3455	});
3456
3457
3458	$idx++
3459	}
3460	}
3461
3462	#############################################################################
3463
3464	package CFClient::UI::SpellList;
3465
3466	our @ISA = CFClient::UI::Table::;
3467
3468	sub new {
3469	my $class = shift;
3470
3471	my $self = $class->SUPER::new (
3472	binding => [],
3473	commands => [],
3474	@_,
3475	)
3476	}
3477
3478	# XXX: Do sorting? Argl...
3479	sub add_spell {
3480	my ($self, $spell) = @_;
3481	$self->{spells}->{$spell->{name}} = $spell;
3482
3483	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3484	face => $spell->{face},
3485	can_hover => 1,
3486	can_events => 1,
3487	tooltip => $spell->{message});
3488
3489	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3490	text => $spell->{name},
3491	can_hover => 1,
3492	can_events => 1,
3493	tooltip => $spell->{message},
3494	expand => 1);
3495
3496	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3497	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3498	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3499	expand => 1);
3500
3501	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3502	text => "bind to key",
3503	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3504	}
3505
3506	sub rebuild_spell_list {
3507	my ($self) = @_;
3508	$self->{tbl_idx} = 0;
3509	$self->add_spell ($_) for values %{$self->{spells}};
3510	}
3511
3512	sub remove_spell {
3513	my ($self, $spell) = @_;
3514	delete $self->{spells}->{$spell->{name}};
3515	$self->rebuild_spell_list;
3516	}
3517
3518	#############################################################################
3519
3520	package CFClient::UI::Root;	3831	package CFPlus::UI::Root;
3521		3832
3522	our @ISA = CFClient::UI::Container::;	3833	our @ISA = CFPlus::UI::Container::;
3523		3834
3524	use List::Util qw(min max);	3835	use List::Util qw(min max);
3525		3836
3526	use CFClient::OpenGL;	3837	use CFPlus::OpenGL;
3527		3838
3528	sub new {	3839	sub new {
3529	my $class = shift;	3840	my $class = shift;
3530		3841
3531	my $self = $class->SUPER::new (	3842	my $self = $class->SUPER::new (
3532	visible => 1,	3843	visible => 1,
3533	@_,	3844	@_,
3534	);	3845	);
3535		3846
3536	Scalar::Util::weaken ($self->{root} = $self);	3847	CFPlus::weaken ($self->{root} = $self);
3537		3848
3538	$self	3849	$self
3539	}	3850	}
3540		3851
3541	sub size_request {	3852	sub size_request {
…		…
3556	$coord = $max - $size if $coord > $max - $size;	3867	$coord = $max - $size if $coord > $max - $size;
3557		3868
3558	int $coord + 0.5	3869	int $coord + 0.5
3559	}	3870	}
3560		3871
3561	sub size_allocate {	3872	sub invoke_size_allocate {
3562	my ($self, $w, $h) = @_;	3873	my ($self, $w, $h) = @_;
3563		3874
3564	for my $child ($self->children) {	3875	for my $child ($self->children) {
3565	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)};
3566		3877
…		…
3570	$X = _to_pixel $X, $W, $self->{w};	3881	$X = _to_pixel $X, $W, $self->{w};
3571	$Y = _to_pixel $Y, $H, $self->{h};	3882	$Y = _to_pixel $Y, $H, $self->{h};
3572		3883
3573	$child->configure ($X, $Y, $W, $H);	3884	$child->configure ($X, $Y, $W, $H);
3574	}	3885	}
		3886
		3887	1
3575	}	3888	}
3576		3889
3577	sub coord2local {	3890	sub coord2local {
3578	my ($self, $x, $y) = @_;	3891	my ($self, $x, $y) = @_;
3579		3892
…		…
3705	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4018	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3706		4019
3707	$w = 0 if $w < 0;	4020	$w = 0 if $w < 0;
3708	$h = 0 if $h < 0;	4021	$h = 0 if $h < 0;
3709		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
3710	$w = int $w + 0.5;	4032	$w = int $w + 0.5;
3711	$h = int $h + 0.5;	4033	$h = int $h + 0.5;
3712		4034
3713	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}) {
3714	$widget->{old_w} = $widget->{w};	4036	$widget->{old_w} = $widget->{w};
…		…
3737	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4059	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3738	glMatrixMode GL_MODELVIEW;	4060	glMatrixMode GL_MODELVIEW;
3739	glLoadIdentity;	4061	glLoadIdentity;
3740		4062
3741	{	4063	{
3742	package CFClient::UI::Base;	4064	package CFPlus::UI::Base;
3743		4065
3744	($draw_x, $draw_y, $draw_w, $draw_h) =	4066	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3745	(0, 0, $self->{w}, $self->{h});	4067	(0, 0, $self->{w}, $self->{h});
3746	}
3747		4068
3748	$self->_draw;	4069	$self->_draw;
		4070	}
3749	}	4071	}
3750		4072
3751	#############################################################################	4073	#############################################################################
3752		4074
3753	package CFClient::UI;	4075	package CFPlus::UI;
3754		4076
3755	$ROOT = new CFClient::UI::Root;	4077	$ROOT = new CFPlus::UI::Root;
3756	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4078	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3757		4079
3758	1	4080	1
3759		4081

Diff Legend

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