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

Diff Legend

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