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

Diff Legend

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