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.279 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.439 by root, Sun Sep 16 13:04:36 2007 UTC

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

Diff Legend

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