ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.150 by elmex, Sun Apr 23 00:08:29 2006 UTC vs.
Revision 1.343 by root, Sun Aug 13 15:14:17 2006 UTC

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

Diff Legend

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