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.278 by root, Sun Jun 4 23:05:06 2006 UTC vs.
Revision 1.376 by root, Mon Jul 16 20:20:23 2007 UTC

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

Diff Legend

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