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.283 by root, Mon Jun 5 02:28:30 2006 UTC vs.
Revision 1.386 by root, Fri Jul 20 16:33:45 2007 UTC

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

Diff Legend

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