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

Diff Legend

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