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

Diff Legend

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