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

Diff Legend

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