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.312 by root, Fri Jun 23 23:54:30 2006 UTC vs.
Revision 1.437 by root, Wed Aug 22 22:36:26 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->emit ("focus_out"); 316 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
288} 318}
… …
290sub set_visibility { 320sub set_visibility {
291 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
292 322
293 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
294 324
295 $visible ? $self->hide 325 $visible ? $self->show
296 : $self->show; 326 : $self->hide;
297} 327}
298 328
299sub toggle_visibility { 329sub toggle_visibility {
300 my ($self) = @_; 330 my ($self) = @_;
301 331
… …
345 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
346 376
347 if ($self->{aspect}) { 377 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
349 379
350 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 382
353 # use alignment to adjust x, y 383 # use alignment to adjust x, y
354 384
355 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
397 427
398 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
399 429
400 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
401 431
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 435 }
406} 436}
407 437
408# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
409sub coord2local { 439sub coord2local {
410 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
411 441
442 Carp::confess unless $self->{parent};#d#
443
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 445}
414 446
415# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
416sub coord2global { 448sub coord2global {
417 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
418 450
451 Carp::confess unless $self->{parent};#d#
452
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 454}
421 455
422sub invoke_focus_in { 456sub invoke_focus_in {
423 my ($self) = @_; 457 my ($self) = @_;
424 458
425 return if $FOCUS == $self; 459 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
427 461
428 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
429 463
430 $focus->update if $focus; 464 $self->update;
431 $FOCUS->update;
432 465
433 0 466 0
434} 467}
435 468
436sub invoke_focus_out { 469sub invoke_focus_out {
437 my ($self) = @_; 470 my ($self) = @_;
438 471
439 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
440 473
441 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
442 475
443 $focus->update if $focus; #? 476 $self->update;
444 477
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 479 unless $FOCUS;
447 480
448 0 481 0
449} 482}
450 483
451sub grab_focus { 484sub grab_focus {
452 my ($self) = @_; 485 my ($self) = @_;
453 486
487 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 488 $self->emit ("focus_in");
455} 489}
456 490
457sub invoke_mouse_motion { 1 } 491sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 492sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 493sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
461 496
462sub invoke_button_down { 497sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
464 499
465 $self->grab_focus; 500 $self->grab_focus;
466 501
467 1 502 0
468} 503}
469 504
470sub connect { 505sub connect {
471 my ($self, $signal, $cb) = @_; 506 my ($self, $signal, $cb) = @_;
472 507
473 push @{ $self->{signal_cb}{$signal} }, $cb; 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 }
474} 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);
475 528
476sub emit { 529sub emit {
477 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
478 531
479 #d##TODO# stop propagating at first true, do not use sum 532 # I do not really like this solution, but I do not like duplication
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 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
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 550}
484 551
485sub find_widget { 552#sub find_widget {
486 my ($self, $x, $y) = @_; 553# in .xs
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496 554
497sub set_parent { 555sub set_parent {
498 my ($self, $parent) = @_; 556 my ($self, $parent) = @_;
499 557
500 Scalar::Util::weaken ($self->{parent} = $parent); 558 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 559 $self->set_visible if $parent->{visible};
502} 560}
503 561
504sub realloc { 562sub realloc {
505 my ($self) = @_; 563 my ($self) = @_;
… …
531 589
532# 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
533# functions seems pointless. 591# functions seems pointless.
534our ($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
535 593
536sub draw { 594#sub draw {
537 my ($self) = @_; 595#CFPlus.xs
538
539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
548
549 glPushMatrix;
550 glTranslate $self->{x}, $self->{y}, 0;
551
552 if ($self == $HOVER && $self->{can_hover}) {
553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
554 glEnable GL_BLEND;
555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
556 glBegin GL_QUADS;
557 glVertex 0 , 0;
558 glVertex $self->{w}, 0;
559 glVertex $self->{w}, $self->{h};
560 glVertex 0 , $self->{h};
561 glEnd;
562 glDisable GL_BLEND;
563 }
564
565 if ($ENV{CFPLUS_DEBUG} & 1) {
566 glPushMatrix;
567 glColor 1, 1, 0, 1;
568 glTranslate 0.375, 0.375;
569 glBegin GL_LINE_LOOP;
570 glVertex 0 , 0;
571 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1;
574 glEnd;
575 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 }
578
579 $self->_draw;
580 glPopMatrix;
581}
582 596
583sub _draw { 597sub _draw {
584 my ($self) = @_; 598 my ($self) = @_;
585 599
586 warn "no draw defined for $self\n"; 600 warn "no draw defined for $self\n";
587} 601}
588 602
589sub DESTROY { 603sub DESTROY {
590 my ($self) = @_; 604 my ($self) = @_;
591 605
592 delete $WIDGET{$self+0}; 606 return if CFPlus::in_destruct;
593 607
608 local $@;
594 eval { $self->destroy }; 609 eval { $self->destroy };
595 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};
596} 613}
597 614
598############################################################################# 615#############################################################################
599 616
600package CFClient::UI::DrawBG; 617package CFPlus::UI::DrawBG;
601 618
602our @ISA = CFClient::UI::Base::; 619our @ISA = CFPlus::UI::Base::;
603 620
604use strict; 621use strict;
605use CFClient::OpenGL; 622use CFPlus::OpenGL;
606 623
607sub new { 624sub new {
608 my $class = shift; 625 my $class = shift;
609
610 # range [value, low, high, page]
611 626
612 $class->SUPER::new ( 627 $class->SUPER::new (
613 #bg => [0, 0, 0, 0.2], 628 #bg => [0, 0, 0, 0.2],
614 #active_bg => [1, 1, 1, 0.5], 629 #active_bg => [1, 1, 1, 0.5],
615 @_ 630 @_
… …
627 my ($w, $h) = @$self{qw(w h)}; 642 my ($w, $h) = @$self{qw(w h)};
628 643
629 glEnable GL_BLEND; 644 glEnable GL_BLEND;
630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 645 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
631 glColor_premultiply @$color; 646 glColor_premultiply @$color;
632
633 glBegin GL_QUADS;
634 glVertex 0 , 0;
635 glVertex 0 , $h;
636 glVertex $w, $h; 647 glRect 0, 0, $w, $h;
637 glVertex $w, 0;
638 glEnd;
639
640 glDisable GL_BLEND; 648 glDisable GL_BLEND;
641 } 649 }
642} 650}
643 651
644############################################################################# 652#############################################################################
645 653
646package CFClient::UI::Empty; 654package CFPlus::UI::Empty;
647 655
648our @ISA = CFClient::UI::Base::; 656our @ISA = CFPlus::UI::Base::;
649 657
650sub new { 658sub new {
651 my ($class, %arg) = @_; 659 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 660 $class->SUPER::new (can_events => 0, %arg);
653} 661}
… …
660 668
661sub draw { } 669sub draw { }
662 670
663############################################################################# 671#############################################################################
664 672
665package CFClient::UI::Container; 673package CFPlus::UI::Container;
666 674
667our @ISA = CFClient::UI::Base::; 675our @ISA = CFPlus::UI::Base::;
668 676
669sub new { 677sub new {
670 my ($class, %arg) = @_; 678 my ($class, %arg) = @_;
671 679
672 my $children = delete $arg{children}; 680 my $children = delete $arg{children};
… …
676 can_events => 0, 684 can_events => 0,
677 %arg, 685 %arg,
678 ); 686 );
679 687
680 $self->add (@$children) 688 $self->add (@$children)
681 if $children; 689 if $children && @$children;
682 690
683 $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;
684} 700}
685 701
686sub add { 702sub add {
687 my ($self, @widgets) = @_; 703 my ($self, @widgets) = @_;
688 704
689 $_->set_parent ($self) 705 $_->set_parent ($self)
690 for @widgets; 706 for @widgets;
691 707
708 # TODO: only do this in widgets that need it, e.g. root, fixed
692 use sort 'stable'; 709 use sort 'stable';
693 710
694 $self->{children} = [ 711 $self->{children} = [
695 sort { $a->{z} <=> $b->{z} } 712 sort { $a->{z} <=> $b->{z} }
696 @{$self->{children}}, @widgets 713 @{$self->{children}}, @widgets
697 ]; 714 ];
698 715
699 $self->realloc; 716 $self->realloc;
717
718 $self->emit (c_add => \@widgets);
719
720 map $_+0, @widgets
700} 721}
701 722
702sub children { 723sub children {
703 @{ $_[0]{children} } 724 @{ $_[0]{children} }
704} 725}
705 726
706sub remove { 727sub remove {
707 my ($self, $child) = @_; 728 my ($self, @widgets) = @_;
708 729
730 $self->emit (c_remove => \@widgets);
731
732 for my $child (@widgets) {
709 delete $child->{parent}; 733 delete $child->{parent};
710 $child->hide; 734 $child->hide;
711
712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 735 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
736 }
713 737
714 $self->realloc; 738 $self->realloc;
715} 739}
716 740
717sub clear { 741sub clear {
718 my ($self) = @_; 742 my ($self) = @_;
719 743
720 my $children = delete $self->{children}; 744 my $children = $self->{children};
721 $self->{children} = []; 745 $self->{children} = [];
722 746
723 for (@$children) { 747 for (@$children) {
724 delete $_->{parent}; 748 delete $_->{parent};
725 $_->hide; 749 $_->hide;
… …
745} 769}
746 770
747sub _draw { 771sub _draw {
748 my ($self) = @_; 772 my ($self) = @_;
749 773
750 $_->draw for @{$self->{children}}; 774 $_->draw for $self->visible_children;
751} 775}
752 776
753############################################################################# 777#############################################################################
754 778
755package CFClient::UI::Bin; 779package CFPlus::UI::Bin;
756 780
757our @ISA = CFClient::UI::Container::; 781our @ISA = CFPlus::UI::Container::;
758 782
759sub new { 783sub new {
760 my ($class, %arg) = @_; 784 my ($class, %arg) = @_;
761 785
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 786 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 787
764 $class->SUPER::new (children => [$child], %arg) 788 $class->SUPER::new (children => [$child], %arg)
765} 789}
766 790
767sub add { 791sub add {
768 my ($self, $child) = @_; 792 my ($self, $child) = @_;
769 793
770 $self->SUPER::remove ($_) for @{ $self->{children} }; 794 $self->clear;
771 $self->SUPER::add ($child); 795 $self->SUPER::add ($child);
772} 796}
773 797
774sub remove { 798sub remove {
775 my ($self, $widget) = @_; 799 my ($self, $widget) = @_;
776 800
777 $self->SUPER::remove ($widget); 801 $self->SUPER::remove ($widget);
778 802
779 $self->{children} = [new CFClient::UI::Empty] 803 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 804 unless @{$self->{children}};
781} 805}
782 806
783sub child { $_[0]->{children}[0] } 807sub child { $_[0]->{children}[0] }
784 808
… …
796 820
797############################################################################# 821#############################################################################
798 822
799# back-buffered drawing area 823# back-buffered drawing area
800 824
801package CFClient::UI::Window; 825package CFPlus::UI::Window;
802 826
803our @ISA = CFClient::UI::Bin::; 827our @ISA = CFPlus::UI::Bin::;
804 828
805use CFClient::OpenGL; 829use CFPlus::OpenGL;
806 830
807sub new { 831sub new {
808 my ($class, %arg) = @_; 832 my ($class, %arg) = @_;
809 833
810 my $self = $class->SUPER::new (%arg); 834 my $self = $class->SUPER::new (%arg);
… …
832} 856}
833 857
834sub render_child { 858sub render_child {
835 my ($self) = @_; 859 my ($self) = @_;
836 860
837 $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 {
838 glClearColor 0, 0, 0, 0; 862 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 863 glClear GL_COLOR_BUFFER_BIT;
840 864
841 { 865 {
842 package CFClient::UI::Base; 866 package CFPlus::UI::Base;
843 867
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 868 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 869 (0, 0, $self->{w}, $self->{h});
870
871 $self->_render;
846 } 872 }
847
848 $self->_render;
849 }; 873 };
850} 874}
851 875
852sub _draw { 876sub _draw {
853 my ($self) = @_; 877 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 878
857 my $tex = $self->{texture} 879 my $tex = $self->{texture}
858 or return; 880 or return;
859 881
860 glEnable GL_TEXTURE_2D; 882 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 883 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 884 glColor 0, 0, 0, 1;
863 885
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 886 $tex->draw_quad_alpha_premultiplied (0, 0);
865 887
866 glDisable GL_TEXTURE_2D; 888 glDisable GL_TEXTURE_2D;
867} 889}
868 890
869############################################################################# 891#############################################################################
870 892
871package CFClient::UI::ViewPort; 893package CFPlus::UI::ViewPort;
872 894
895use List::Util qw(min max);
896
873our @ISA = CFClient::UI::Window::; 897our @ISA = CFPlus::UI::Window::;
874 898
875sub new { 899sub new {
876 my $class = shift; 900 my $class = shift;
877 901
878 $class->SUPER::new ( 902 $class->SUPER::new (
… …
885sub size_request { 909sub size_request {
886 my ($self) = @_; 910 my ($self) = @_;
887 911
888 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 912 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
889 913
890 $w = 10 if $self->{scroll_x}; 914 $w = 1 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y}; 915 $h = 1 if $self->{scroll_y};
892 916
893 ($w, $h) 917 ($w, $h)
894} 918}
895 919
896sub invoke_size_allocate { 920sub invoke_size_allocate {
… …
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
1128 $self->{motion} = sub {
1129 my ($ev, $x, $y) = @_;
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
1005} 1177}
1006 1178
1007sub invoke_size_allocate { 1179sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1180 my ($self, $w, $h) = @_;
1009 1181
1010 my $child = $self->{vp}->child; 1182 $self->update_slider;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013 $self->SUPER::invoke_size_allocate ($w, $h) 1183 $self->SUPER::invoke_size_allocate ($w, $h)
1014} 1184}
1015 1185
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018
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 if ($self->{has_close_button}) { 1359 if ($self->{has_close_button}) {
1096 $self->{close_button} = 1360 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1361 new CFPlus::UI::ImageButton
1098 path => '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_button}); 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_button}) if $self->{close_button}; 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}
… …
1150 $self->child->configure ($border, $border, $w, $h); 1414 $self->child->configure ($border, $border, $w, $h);
1151 1415
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1416 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button}; 1417 if $self->{close_button};
1154 1418
1419 1
1420}
1421
1422sub invoke_delete {
1423 my ($self) = @_;
1424
1425 $self->hide;
1426
1155 1 1427 1
1156} 1428}
1157 1429
1158sub invoke_button_down { 1430sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1431 my ($self, $ev, $x, $y) = @_;
… …
1217 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1489 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218 1490
1219 ! ! $self->{motion} 1491 ! ! $self->{motion}
1220} 1492}
1221 1493
1494sub invoke_visibility_change {
1495 my ($self, $visible) = @_;
1496
1497 delete $self->{motion} unless $visible;
1498
1499 0
1500}
1501
1222sub _draw { 1502sub _draw {
1223 my ($self) = @_; 1503 my ($self) = @_;
1224 1504
1225 my $child = $self->{children}[0]; 1505 my $child = $self->{children}[0];
1226 1506
… …
1231 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1232 1512
1233 my $border = $self->border; 1513 my $border = $self->border;
1234 1514
1235 glColor @{ $self->{border_bg} }; 1515 glColor @{ $self->{border_bg} };
1236 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1516 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1237 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1517 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1238 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1518 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1239 $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);
1240 1534
1241 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1535 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1242 glColor @{ $self->{bg} }; 1536 glColor @{ $self->{bg} };
1243 1537
1244 # TODO: repeat texture not scale 1538 # TODO: repeat texture not scale
… …
1263 if $self->{close_button}; 1557 if $self->{close_button};
1264} 1558}
1265 1559
1266############################################################################# 1560#############################################################################
1267 1561
1268package CFClient::UI::Table; 1562package CFPlus::UI::Table;
1269 1563
1270our @ISA = CFClient::UI::Base::; 1564our @ISA = CFPlus::UI::Container::;
1271 1565
1272use List::Util qw(max sum); 1566use List::Util qw(max sum);
1273 1567
1274use CFClient::OpenGL; 1568use CFPlus::OpenGL;
1275 1569
1276sub new { 1570sub new {
1277 my $class = shift; 1571 my $class = shift;
1278 1572
1279 $class->SUPER::new ( 1573 $class->SUPER::new (
1280 col_expand => [], 1574 col_expand => [],
1575 row_expand => [],
1281 @_, 1576 @_,
1282 ) 1577 )
1283} 1578}
1284 1579
1285sub children {
1286 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1287}
1288
1289sub add { 1580sub add {
1290 my ($self, $x, $y, $child) = @_; 1581 my ($self, @widgets) = @_;
1291 1582
1292 $child->set_parent ($self); 1583 for my $child (@widgets) {
1293 $self->{children}[$y][$x] = $child; 1584 $child->{c_rowspan} ||= 1;
1585 $child->{c_colspan} ||= 1;
1586 }
1294 1587
1295 $self->realloc; 1588 $self->SUPER::add (@widgets);
1296} 1589}
1297 1590
1298sub 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 {
1299 my ($self, $child) = @_; 1609 my ($self) = @_;
1300 1610
1301 # TODO: not yet implemented 1611 my (@w, @h);
1302}
1303
1304# TODO: move to container class maybe? send children a signal on removal?
1305sub clear {
1306 my ($self) = @_;
1307 1612
1308 my @children = $self->children; 1613 my @children = $self->children;
1309 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 }
1310 1624 }
1311 for (@children) {
1312 delete $_->{parent};
1313 $_->hide;
1314 }
1315 1625
1316 $self->realloc; 1626 # second pass, rows
1317} 1627 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1318
1319sub get_wh {
1320 my ($self) = @_;
1321
1322 my (@w, @h);
1323
1324 for my $y (0 .. $#{$self->{children}}) {
1325 my $row = $self->{children}[$y]
1326 or next;
1327
1328 for my $x (0 .. $#$row) {
1329 my $widget = $row->[$x]
1330 or next;
1331 my ($w, $h) = @$widget{qw(req_w req_h)}; 1628 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1332 1629
1333 $w[$x] = max $w[$x], $w; 1630 my $sh = sum @h[$r .. $r + $rs - 1];
1334 $h[$y] = max $h[$y], $h; 1631
1632 if ($h > $sh) {
1633 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1335 } 1634 }
1336 } 1635 }
1337 1636
1338 (\@w, \@h) 1637 (\@w, \@h)
1339} 1638}
… …
1355 my ($ws, $hs) = $self->get_wh; 1654 my ($ws, $hs) = $self->get_wh;
1356 1655
1357 my $req_w = (sum @$ws) || 1; 1656 my $req_w = (sum @$ws) || 1;
1358 my $req_h = (sum @$hs) || 1; 1657 my $req_h = (sum @$hs) || 1;
1359 1658
1360 # TODO: nicer code && do row_expand 1659 # now linearly scale the rows/columns to the allocated size
1361 my @col_expand = @{$self->{col_expand}}; 1660 my @col_expand = @{$self->{col_expand}};
1362 @col_expand = (1) x @$ws unless @col_expand; 1661 @col_expand = (1) x @$ws unless @col_expand;
1363 my $col_expand = (sum @col_expand) || 1; 1662 my $col_expand = (sum @col_expand) || 1;
1364 1663
1365 # linearly scale sizes
1366 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1664 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1367 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1368 1665
1369 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
1370 CFClient::UI::harmonize $hs; 1674 CFPlus::UI::harmonize $hs;
1371 1675
1372 my $y; 1676 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1677 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1373 1678
1374 for my $r (0 .. $#{$self->{children}}) { 1679 for my $widget ($self->children) {
1375 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)};
1376 or next;
1377 1681
1378 my $x = 0; 1682 $widget->configure (
1379 my $row_h = $hs->[$r]; 1683 $x[$c], $y[$r],
1684 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1380 1685 );
1381 for my $c (0 .. $#$row) { 1686 }
1382 my $col_w = $ws->[$c];
1383 1687
1384 if (my $widget = $row->[$c]) { 1688 1
1385 $widget->configure ($x, $y, $col_w, $row_h); 1689}
1386 }
1387 1690
1388 $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};
1389 } 1718 }
1719 }
1390 1720
1391 $y += $row_h; 1721 my $W = $x2 - $x1;
1722 my $H = $y2 - $y1;
1723
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 {
1742 my ($self, $W, $H) = @_;
1743
1744 for my $child ($self->visible_children) {
1745 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1746 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1747
1748 $x += $child->{c_halign} * $child->{req_w};
1749 $y += $child->{c_valign} * $child->{req_h};
1750
1751 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1392 } 1752 }
1393 1753
1394 1 1754 1
1395} 1755}
1396 1756
1397sub find_widget {
1398 my ($self, $x, $y) = @_;
1399
1400 $x -= $self->{x};
1401 $y -= $self->{y};
1402
1403 my $res;
1404
1405 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1406 $res = $_->find_widget ($x, $y)
1407 and return $res;
1408 }
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}
1420
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 invoke_size_allocate { 1779sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_; 1780 my ($self, $w, $h) = @_;
… …
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));
… …
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;
… …
1652 1986
1653sub set_fontsize { 1987sub set_fontsize {
1654 my ($self, $fontsize) = @_; 1988 my ($self, $fontsize) = @_;
1655 1989
1656 $self->{fontsize} = $fontsize; 1990 $self->{fontsize} = $fontsize;
1991 delete $self->{size_req};
1657 delete $self->{texture}; 1992 delete $self->{texture};
1658 1993
1659 $self->realloc; 1994 $self->realloc;
1660} 1995}
1661 1996
1662sub reconfigure { 1997sub reconfigure {
1663 my ($self) = @_; 1998 my ($self) = @_;
1664 1999
1665 delete $self->{size_req}; 2000 delete $self->{size_req};
2001 delete $self->{texture};
1666 2002
1667 $self->SUPER::reconfigure; 2003 $self->SUPER::reconfigure;
1668} 2004}
1669 2005
1670sub _draw { 2006sub _draw {
1671 my ($self) = @_; 2007 my ($self) = @_;
1672 2008
1673 $self->SUPER::_draw; # draw background, if applicable 2009 $self->SUPER::_draw; # draw background, if applicable
1674 2010
1675 my $tex = $self->{texture} ||= do { 2011 my $size = $self->{texture} ||= do {
1676 $self->{layout}->set_foreground (@{$self->{fg}}); 2012 $self->{layout}->set_foreground (@{$self->{fg}});
1677 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2013 $self->{layout}->set_font ($self->{font}) if $self->{font};
1678 $self->{layout}->set_width ($self->{w}); 2014 $self->{layout}->set_width ($self->{w});
1679 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2015 $self->{layout}->set_ellipsise ($self->{ellipsise});
1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2016 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2017 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682 2018
1683 new_from_layout CFClient::Texture $self->{layout} 2019 [$self->{layout}->size]
1684 }; 2020 };
1685 2021
1686 unless (exists $self->{ox}) { 2022 unless (exists $self->{ox}) {
1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2023 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2024 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689 : ($self->{w} - $tex->{w}) * 0.5); 2025 : ($self->{w} - $size->[0]) * 0.5);
1690 2026
1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693 : ($self->{h} - $tex->{h}) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
2030
2031 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1694 }; 2032 };
1695 2033
1696 glEnable GL_TEXTURE_2D; 2034# unless ($self->{list}) {
1697 2035# $self->{list} = CFPlus::OpenGL::glGenList;
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2036# CFPlus::OpenGL::glNewList $self->{list};
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2037# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1700 2038# CFPlus::OpenGL::glEndList;
1701 if ($tex->{format} == GL_ALPHA) {
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1703 glColor @{$self->{fg}};
1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1708 } 2039# }
2040#
2041# CFPlus::OpenGL::glCallList $self->{list};
1709 2042
1710 glDisable GL_TEXTURE_2D; 2043 $self->{layout}->draw;
1711} 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#}
1712 2053
1713############################################################################# 2054#############################################################################
1714 2055
1715package CFClient::UI::EntryBase; 2056package CFPlus::UI::EntryBase;
1716 2057
1717our @ISA = CFClient::UI::Label::; 2058our @ISA = CFPlus::UI::Label::;
1718 2059
1719use CFClient::OpenGL; 2060use CFPlus::OpenGL;
1720 2061
1721sub new { 2062sub new {
1722 my $class = shift; 2063 my $class = shift;
1723 2064
1724 $class->SUPER::new ( 2065 $class->SUPER::new (
1725 fg => [1, 1, 1], 2066 fg => [1, 1, 1],
1726 bg => [0, 0, 0, 0.2], 2067 bg => [0, 0, 0, 0.2],
2068 outline => [0.6, 0.3, 0.1],
1727 active_bg => [1, 1, 1, 0.5], 2069 active_bg => [0, 0, 1, .2],
1728 active_fg => [0, 0, 0], 2070 active_fg => [1, 1, 1],
2071 active_outline => [1, 1, 0],
1729 can_hover => 1, 2072 can_hover => 1,
1730 can_focus => 1, 2073 can_focus => 1,
1731 valign => 0, 2074 valign => 0,
1732 can_events => 1, 2075 can_events => 1,
2076 ellipsise => 0,
1733 #text => ... 2077 #text => ...
1734 #hidden => "*", 2078 #hidden => "*",
1735 @_ 2079 @_
1736 ) 2080 )
1737} 2081}
… …
1782 my $sym = $ev->{sym}; 2126 my $sym = $ev->{sym};
1783 my $uni = $ev->{unicode}; 2127 my $uni = $ev->{unicode};
1784 2128
1785 my $text = $self->get_text; 2129 my $text = $self->get_text;
1786 2130
2131 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2132
1787 if ($uni == 8) { 2133 if ($uni == 8) {
1788 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2134 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789 } elsif ($uni == 127) { 2135 } elsif ($uni == 127) {
1790 substr $text, $self->{cursor}, 1, ""; 2136 substr $text, $self->{cursor}, 1, "";
1791 } elsif ($sym == CFClient::SDLK_LEFT) { 2137 } elsif ($sym == CFPlus::SDLK_LEFT) {
1792 --$self->{cursor} if $self->{cursor}; 2138 --$self->{cursor} if $self->{cursor};
1793 } elsif ($sym == CFClient::SDLK_RIGHT) { 2139 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1794 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2140 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1795 } 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 = "";
1796 $self->{cursor} = 0; 2155 $self->{cursor} = 0;
1797 } elsif ($sym == CFClient::SDLK_END) {
1798 $self->{cursor} = length $text;
1799 } elsif ($uni == 27) { 2156 } elsif ($uni == 27) {
1800 $self->emit ('escape'); 2157 $self->emit ('escape');
1801 } elsif ($uni) { 2158 } elsif ($uni == 0x0d) {
2159 substr $text, $self->{cursor}++, 0, "\012";
2160 } elsif ($uni >= 0x20) {
1802 substr $text, $self->{cursor}++, 0, chr $uni; 2161 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else { 2162 } else {
1804 return 0; 2163 return 0;
1805 } 2164 }
1806 2165
1807 $self->_set_text ($text); 2166 $self->_set_text ($text);
1808 2167
1809 $self->realloc; 2168 $self->realloc;
2169 $self->update;
1810 2170
1811 1 2171 1
1812} 2172}
1813 2173
1814sub invoke_focus_in { 2174sub invoke_focus_in {
… …
1826 2186
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 2187 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 2188
1829 # byte-index to char-index 2189 # byte-index to char-index
1830 my $text = $self->{text}; 2190 my $text = $self->{text};
1831 utf8::encode $text; 2191 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 2192 $self->{cursor} = length $text;
1833 2193
1834 $self->_set_text ($self->{text}); 2194 $self->_set_text ($self->{text});
1835 $self->update; 2195 $self->update;
1836 2196
1837 1 2197 1
… …
1856 glColor_premultiply @{$self->{bg}}; 2216 glColor_premultiply @{$self->{bg}};
1857 } 2217 }
1858 2218
1859 glEnable GL_BLEND; 2219 glEnable GL_BLEND;
1860 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1861 glBegin GL_QUADS;
1862 glVertex 0 , 0;
1863 glVertex 0 , $self->{h};
1864 glVertex $self->{w}, $self->{h}; 2221 glRect 0, 0, $self->{w}, $self->{h};
1865 glVertex $self->{w}, 0;
1866 glEnd;
1867 glDisable GL_BLEND; 2222 glDisable GL_BLEND;
1868 2223
1869 $self->SUPER::_draw; 2224 $self->SUPER::_draw;
1870 2225
1871 #TODO: force update every cursor change :( 2226 #TODO: force update every cursor change :(
… …
1873 2228
1874 unless (exists $self->{cur_h}) { 2229 unless (exists $self->{cur_h}) {
1875 my $text = substr $self->{text}, 0, $self->{cursor}; 2230 my $text = substr $self->{text}, 0, $self->{cursor};
1876 utf8::encode $text; 2231 utf8::encode $text;
1877 2232
1878 @$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);
1879 } 2234 }
1880 2235
1881 glColor @{$self->{fg}}; 2236 glColor_premultiply @{$self->{active_fg}};
1882 glBegin GL_LINES; 2237 glBegin GL_LINES;
1883 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2238 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1884 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2239 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885 glEnd; 2240 glEnd;
1886 }
1887}
1888 2241
2242 glLineWidth 3;
2243 glColor @{$self->{active_outline}};
2244 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2245 glLineWidth 1;
2246
2247 } else {
2248 glColor @{$self->{outline}};
2249 glBegin GL_LINE_STRIP;
2250 glVertex .5, $self->{h} * .5;
2251 glVertex .5, $self->{h} - 2.5;
2252 glVertex $self->{w} - .5, $self->{h} - 2.5;
2253 glVertex $self->{w} - .5, $self->{h} * .5;
2254 glEnd;
2255 }
2256}
2257
2258#############################################################################
2259
1889package CFClient::UI::Entry; 2260package CFPlus::UI::Entry;
1890 2261
1891our @ISA = CFClient::UI::EntryBase::; 2262our @ISA = CFPlus::UI::EntryBase::;
1892 2263
1893use CFClient::OpenGL; 2264use CFPlus::OpenGL;
1894 2265
1895sub invoke_key_down { 2266sub invoke_key_down {
1896 my ($self, $ev) = @_; 2267 my ($self, $ev) = @_;
1897 2268
1898 my $sym = $ev->{sym}; 2269 my $sym = $ev->{sym};
1899 2270
1900 if ($sym == 13) { 2271 if ($ev->{uni} == 0x0d || $sym == 13) {
1901 unshift @{$self->{history}}, 2272 unshift @{$self->{history}},
1902 my $txt = $self->get_text; 2273 my $txt = $self->get_text;
1903 2274
1904 $self->{history_pointer} = -1; 2275 $self->{history_pointer} = -1;
1905 $self->{history_saveback} = ''; 2276 $self->{history_saveback} = '';
1906 $self->emit (activate => $txt); 2277 $self->emit (activate => $txt);
1907 $self->update; 2278 $self->update;
1908 2279
1909 } elsif ($sym == CFClient::SDLK_UP) { 2280 } elsif ($sym == CFPlus::SDLK_UP) {
1910 if ($self->{history_pointer} < 0) { 2281 if ($self->{history_pointer} < 0) {
1911 $self->{history_saveback} = $self->get_text; 2282 $self->{history_saveback} = $self->get_text;
1912 } 2283 }
1913 if (@{$self->{history} || []} > 0) { 2284 if (@{$self->{history} || []} > 0) {
1914 $self->{history_pointer}++; 2285 $self->{history_pointer}++;
… …
1916 $self->{history_pointer} = @{$self->{history} || []} - 1; 2287 $self->{history_pointer} = @{$self->{history} || []} - 1;
1917 } 2288 }
1918 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2289 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1919 } 2290 }
1920 2291
1921 } elsif ($sym == CFClient::SDLK_DOWN) { 2292 } elsif ($sym == CFPlus::SDLK_DOWN) {
1922 $self->{history_pointer}--; 2293 $self->{history_pointer}--;
1923 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2294 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924 2295
1925 if ($self->{history_pointer} >= 0) { 2296 if ($self->{history_pointer} >= 0) {
1926 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2297 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1935 1 2306 1
1936} 2307}
1937 2308
1938############################################################################# 2309#############################################################################
1939 2310
2311package CFPlus::UI::TextEdit;
2312
2313our @ISA = CFPlus::UI::EntryBase::;
2314
2315use CFPlus::OpenGL;
2316
2317sub move_cursor_ver {
2318 my ($self, $dy) = @_;
2319
2320 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2321
2322 $y += $dy;
2323
2324 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2325 $self->{cursor} = $index;
2326 delete $self->{cur_h};
2327 $self->update;
2328 return;
2329 }
2330}
2331
2332sub invoke_key_down {
2333 my ($self, $ev) = @_;
2334
2335 my $sym = $ev->{sym};
2336
2337 if ($sym == CFPlus::SDLK_UP) {
2338 $self->move_cursor_ver (-1);
2339 } elsif ($sym == CFPlus::SDLK_DOWN) {
2340 $self->move_cursor_ver (+1);
2341 } else {
2342 return $self->SUPER::invoke_key_down ($ev)
2343 }
2344
2345 1
2346}
2347
2348#############################################################################
2349
1940package CFClient::UI::Button; 2350package CFPlus::UI::ButtonBin;
1941 2351
1942our @ISA = CFClient::UI::Label::; 2352our @ISA = CFPlus::UI::Bin::;
1943 2353
1944use CFClient::OpenGL; 2354use CFPlus::OpenGL;
1945 2355
1946my @tex = 2356my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948 qw(b1_button_active.png); 2358 qw(b1_button_inactive.png b1_button_active.png);
1949 2359
1950sub new { 2360sub new {
1951 my $class = shift; 2361 my $class = shift;
1952 2362
1953 $class->SUPER::new ( 2363 $class->SUPER::new (
1954 padding_x => 4,
1955 padding_y => 4,
1956 fg => [1, 1, 1],
1957 active_fg => [0, 0, 1],
1958 can_hover => 1, 2364 can_hover => 1,
1959 align => 0, 2365 align => 0,
1960 valign => 0, 2366 valign => 0,
1961 can_events => 1, 2367 can_events => 1,
1962 @_ 2368 @_
… …
1974} 2380}
1975 2381
1976sub _draw { 2382sub _draw {
1977 my ($self) = @_; 2383 my ($self) = @_;
1978 2384
1979 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1980
1981 glEnable GL_TEXTURE_2D; 2385 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2386 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983 glColor 0, 0, 0, 1; 2387 glColor 0, 0, 0, 1;
1984 2388
2389 my $tex = $tex[$GRAB == $self];
1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2390 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1986 2391
1987 glDisable GL_TEXTURE_2D; 2392 glDisable GL_TEXTURE_2D;
1988 2393
1989 $self->SUPER::_draw; 2394 $self->SUPER::_draw;
1990} 2395}
1991 2396
1992############################################################################# 2397#############################################################################
1993 2398
2399package CFPlus::UI::Button;
2400
2401our @ISA = CFPlus::UI::Label::;
2402
2403use CFPlus::OpenGL;
2404
2405my @tex =
2406 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2407 qw(b1_button_inactive.png b1_button_active.png);
2408
2409sub new {
2410 my $class = shift;
2411
2412 $class->SUPER::new (
2413 padding_x => 4,
2414 padding_y => 4,
2415 fg => [1.0, 1.0, 1.0],
2416 active_fg => [0.8, 0.8, 0.8],
2417 can_hover => 1,
2418 align => 0,
2419 valign => 0,
2420 can_events => 1,
2421 @_
2422 )
2423}
2424
2425sub invoke_button_up {
2426 my ($self, $ev, $x, $y) = @_;
2427
2428 $self->emit ("activate")
2429 if $x >= 0 && $x < $self->{w}
2430 && $y >= 0 && $y < $self->{h};
2431
2432 1
2433}
2434
2435sub _draw {
2436 my ($self) = @_;
2437
2438 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2439
2440 glEnable GL_TEXTURE_2D;
2441 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2442 glColor 0, 0, 0, 1;
2443
2444 my $tex = $tex[$GRAB == $self];
2445 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2446
2447 glDisable GL_TEXTURE_2D;
2448
2449 $self->SUPER::_draw;
2450}
2451
2452#############################################################################
2453
2454package CFPlus::UI::CheckBox;
2455
2456our @ISA = CFPlus::UI::DrawBG::;
2457
2458my @tex =
2459 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2460 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2461
2462use CFPlus::OpenGL;
2463
2464sub new {
2465 my $class = shift;
2466
2467 $class->SUPER::new (
2468 padding_x => 2,
2469 padding_y => 2,
2470 fg => [1, 1, 1],
2471 active_fg => [1, 1, 0],
2472 bg => [0, 0, 0, 0.2],
2473 active_bg => [1, 1, 1, 0.5],
2474 state => 0,
2475 can_hover => 1,
2476 @_
2477 )
2478}
2479
2480sub size_request {
2481 my ($self) = @_;
2482
2483 (6) x 2
2484}
2485
2486sub toggle {
2487 my ($self) = @_;
2488
2489 $self->{state} = !$self->{state};
2490 $self->emit (changed => $self->{state});
2491 $self->update;
2492}
2493
2494sub invoke_button_down {
2495 my ($self, $ev, $x, $y) = @_;
2496
2497 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2498 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2499 $self->toggle;
2500 } else {
2501 return 0
2502 }
2503
2504 1
2505}
2506
2507sub _draw {
2508 my ($self) = @_;
2509
2510 $self->SUPER::_draw;
2511
2512 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2513
2514 my ($w, $h) = @$self{qw(w h)};
2515
2516 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2517
2518 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2519
2520 my $tex = $self->{state} ? $tex[1] : $tex[0];
2521
2522 glEnable GL_TEXTURE_2D;
2523 $tex->draw_quad_alpha (0, 0, $s, $s);
2524 glDisable GL_TEXTURE_2D;
2525}
2526
2527#############################################################################
2528
2529package CFPlus::UI::Image;
2530
2531our @ISA = CFPlus::UI::Base::;
2532
2533use CFPlus::OpenGL;
2534
2535our %texture_cache;
2536
2537sub new {
2538 my $class = shift;
2539
2540 my $self = $class->SUPER::new (
2541 can_events => 0,
2542 scale => 1,
2543 @_,
2544 );
2545
2546 $self->{path} || $self->{tex}
2547 or Carp::croak "'path' or 'tex' attributes required";
2548
2549 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2550 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2551
2552 CFPlus::weaken $texture_cache{$self->{path}};
2553
2554 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2555
2556 $self
2557}
2558
2559sub STORABLE_freeze {
2560 my ($self, $cloning) = @_;
2561
2562 $self->{path}
2563 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2564
2565 $self->{path}
2566}
2567
2568sub STORABLE_attach {
2569 my ($self, $cloning, $path) = @_;
2570
2571 $self->new (path => $path)
2572}
2573
2574sub size_request {
2575 my ($self) = @_;
2576
2577 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2578}
2579
2580sub _draw {
2581 my ($self) = @_;
2582
2583 my $tex = $self->{tex};
2584
2585 my ($w, $h) = ($self->{w}, $self->{h});
2586
2587 if ($self->{rot90}) {
2588 glRotate 90, 0, 0, 1;
2589 glTranslate 0, -$self->{w}, 0;
2590
2591 ($w, $h) = ($h, $w);
2592 }
2593
2594 glEnable GL_TEXTURE_2D;
2595 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2596
2597 $tex->draw_quad_alpha (0, 0, $w, $h);
2598
2599 glDisable GL_TEXTURE_2D;
2600}
2601
2602#############################################################################
2603
1994package CFClient::UI::ImageButton; 2604package CFPlus::UI::ImageButton;
1995 2605
1996our @ISA = CFClient::UI::Image::; 2606our @ISA = CFPlus::UI::Image::;
1997 2607
1998use CFClient::OpenGL; 2608use CFPlus::OpenGL;
1999 2609
2000my %textures; 2610my %textures;
2001 2611
2002sub new { 2612sub new {
2003 my $class = shift; 2613 my $class = shift;
… …
2013 can_events => 1, 2623 can_events => 1,
2014 @_ 2624 @_
2015 ); 2625 );
2016} 2626}
2017 2627
2628sub invoke_button_down {
2629 my ($self, $ev, $x, $y) = @_;
2630
2631 1
2632}
2633
2018sub invoke_button_up { 2634sub invoke_button_up {
2019 my ($self, $ev, $x, $y) = @_; 2635 my ($self, $ev, $x, $y) = @_;
2020 2636
2021 $self->emit ("activate") 2637 $self->emit ("activate")
2022 if $x >= 0 && $x < $self->{w} 2638 if $x >= 0 && $x < $self->{w}
… …
2025 1 2641 1
2026} 2642}
2027 2643
2028############################################################################# 2644#############################################################################
2029 2645
2030package CFClient::UI::CheckBox;
2031
2032our @ISA = CFClient::UI::DrawBG::;
2033
2034my @tex =
2035 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2036 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2037
2038use CFClient::OpenGL;
2039
2040sub new {
2041 my $class = shift;
2042
2043 $class->SUPER::new (
2044 padding_x => 2,
2045 padding_y => 2,
2046 fg => [1, 1, 1],
2047 active_fg => [1, 1, 0],
2048 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5],
2050 state => 0,
2051 can_hover => 1,
2052 @_
2053 )
2054}
2055
2056sub size_request {
2057 my ($self) = @_;
2058
2059 (6) x 2
2060}
2061
2062sub invoke_button_down {
2063 my ($self, $ev, $x, $y) = @_;
2064
2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 } else {
2070 return 0
2071 }
2072
2073 1
2074}
2075
2076sub _draw {
2077 my ($self) = @_;
2078
2079 $self->SUPER::_draw;
2080
2081 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2082
2083 my ($w, $h) = @$self{qw(w h)};
2084
2085 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2086
2087 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2088
2089 my $tex = $self->{state} ? $tex[1] : $tex[0];
2090
2091 glEnable GL_TEXTURE_2D;
2092 $tex->draw_quad_alpha (0, 0, $s, $s);
2093 glDisable GL_TEXTURE_2D;
2094}
2095
2096#############################################################################
2097
2098package CFClient::UI::Image; 2646package CFPlus::UI::VGauge;
2099 2647
2100our @ISA = CFClient::UI::Base::; 2648our @ISA = CFPlus::UI::Base::;
2101
2102use CFClient::OpenGL;
2103
2104our %texture_cache;
2105
2106sub new {
2107 my $class = shift;
2108
2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
2113
2114 $self->{path}
2115 or Carp::croak "required attribute 'path' not set";
2116
2117 $self->{tex} = $texture_cache{$self->{path}} ||=
2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2119
2120 Scalar::Util::weaken $texture_cache{$self->{path}};
2121
2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2123
2124 $self
2125}
2126
2127sub size_request {
2128 my ($self) = @_;
2129
2130 ($self->{tex}{w}, $self->{tex}{h})
2131}
2132
2133sub _draw {
2134 my ($self) = @_;
2135
2136 my $tex = $self->{tex};
2137
2138 my ($w, $h) = ($self->{w}, $self->{h});
2139
2140 if ($self->{rot90}) {
2141 glRotate 90, 0, 0, 1;
2142 glTranslate 0, -$self->{w}, 0;
2143
2144 ($w, $h) = ($h, $w);
2145 }
2146
2147 glEnable GL_TEXTURE_2D;
2148 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2149
2150 $tex->draw_quad_alpha (0, 0, $w, $h);
2151
2152 glDisable GL_TEXTURE_2D;
2153}
2154
2155#############################################################################
2156
2157package CFClient::UI::VGauge;
2158
2159our @ISA = CFClient::UI::Base::;
2160 2649
2161use List::Util qw(min max); 2650use List::Util qw(min max);
2162 2651
2163use CFClient::OpenGL; 2652use CFPlus::OpenGL;
2164 2653
2165my %tex = ( 2654my %tex = (
2166 food => [ 2655 food => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2656 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2657 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169 ], 2658 ],
2170 grace => [ 2659 grace => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2660 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2661 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2173 ], 2662 ],
2174 hp => [ 2663 hp => [
2175 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2664 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2665 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177 ], 2666 ],
2178 mana => [ 2667 mana => [
2179 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2668 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2180 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2669 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2181 ], 2670 ],
2182); 2671);
2183 2672
2184# eg. VGauge->new (gauge => 'food'), default gauge: food 2673# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2244 my $ycut1 = max 0, min 1, $ycut; 2733 my $ycut1 = max 0, min 1, $ycut;
2245 my $ycut2 = max 0, min 1, $ycut - 1; 2734 my $ycut2 = max 0, min 1, $ycut - 1;
2246 2735
2247 my $h1 = $self->{h} * (1 - $ycut1); 2736 my $h1 = $self->{h} * (1 - $ycut1);
2248 my $h2 = $self->{h} * (1 - $ycut2); 2737 my $h2 = $self->{h} * (1 - $ycut2);
2738 my $h3 = $self->{h};
2739
2740 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249 2741
2250 glEnable GL_BLEND; 2742 glEnable GL_BLEND;
2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2743 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2744 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253 glEnable GL_TEXTURE_2D; 2745 glEnable GL_TEXTURE_2D;
… …
2272 2764
2273 if ($t3) { 2765 if ($t3) {
2274 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2766 glBindTexture GL_TEXTURE_2D, $t3->{name};
2275 glBegin GL_QUADS; 2767 glBegin GL_QUADS;
2276 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2768 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2769 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2770 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2771 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280 glEnd; 2772 glEnd;
2281 } 2773 }
2282 2774
2283 glDisable GL_BLEND; 2775 glDisable GL_BLEND;
2284 glDisable GL_TEXTURE_2D; 2776 glDisable GL_TEXTURE_2D;
2285} 2777}
2286 2778
2287############################################################################# 2779#############################################################################
2288 2780
2781package CFPlus::UI::Progress;
2782
2783our @ISA = CFPlus::UI::Label::;
2784
2785use CFPlus::OpenGL;
2786
2787sub new {
2788 my ($class, %arg) = @_;
2789
2790 my $self = $class->SUPER::new (
2791 fg => [1, 1, 1],
2792 bg => [0, 0, 1, 0.2],
2793 bar => [0.7, 0.5, 0.1, 0.8],
2794 outline => [0.4, 0.3, 0],
2795 fontsize => 0.9,
2796 valign => 0,
2797 align => 0,
2798 can_events => 1,
2799 ellipsise => 1,
2800 label => "%d%%",
2801 %arg,
2802 );
2803
2804 $self->set_value ($arg{value} || -1);
2805
2806 $self
2807}
2808
2809sub set_label {
2810 my ($self, $label) = @_;
2811
2812 return if $self->{label} eq $label;
2813 $self->{label} = $label;
2814
2815 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2816}
2817
2818sub set_value {
2819 my ($self, $value) = @_;
2820
2821 if ($self->{value} ne $value) {
2822 $self->{value} = $value;
2823
2824 if ($value < 0) {
2825 $self->set_text ("-");
2826 } else {
2827 $self->set_text (sprintf $self->{label}, $value * 100);
2828 }
2829
2830 $self->update;
2831 }
2832}
2833
2834sub _draw {
2835 my ($self) = @_;
2836
2837 glEnable GL_BLEND;
2838 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2839
2840 if ($self->{value} >= 0) {
2841 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2842
2843 glColor_premultiply @{$self->{bar}};
2844 glRect 2, 2, $s, $self->{h} - 2;
2845 glColor_premultiply @{$self->{bg}};
2846 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2847 }
2848
2849 glColor_premultiply @{$self->{outline}};
2850 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2851
2852 glDisable GL_BLEND;
2853
2854 {
2855 local $self->{bg}; # do not draw background
2856 $self->SUPER::_draw;
2857 }
2858}
2859
2860#############################################################################
2861
2862package CFPlus::UI::ExperienceProgress;
2863
2864our @ISA = CFPlus::UI::Progress::;
2865
2866sub new {
2867 my ($class, %arg) = @_;
2868
2869 my $self = $class->SUPER::new (
2870 tooltip => sub {
2871 my ($self) = @_;
2872
2873 sprintf "level %d\n%s points\n%s next level\n%s to go",
2874 $self->{lvl},
2875 ::formsep ($self->{exp}),
2876 ::formsep ($self->{nxt}),
2877 ::formsep ($self->{nxt} - $self->{exp}),
2878 },
2879 %arg
2880 );
2881
2882 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2883 if $::CONN;
2884
2885 $self
2886}
2887
2888sub DESTROY {
2889 my ($self) = @_;
2890
2891 delete $::CONN->{on_exp_update}{$self+0}
2892 if $::CONN;
2893
2894 $self->SUPER::DESTROY;
2895}
2896
2897sub set_value {
2898 my ($self, $lvl, $exp) = @_;
2899
2900 $self->{lvl} = $lvl;
2901 $self->{exp} = $exp;
2902
2903 my $v = -1;
2904
2905 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2906 my $l0 = $table->[$lvl - 1];
2907 my $l1 = $table->[$lvl];
2908
2909 $self->{nxt} = $l1;
2910
2911 $v = ($exp - $l0) / ($l1 - $l0);
2912 }
2913
2914 $self->SUPER::set_value ($v);
2915}
2916
2917#############################################################################
2918
2289package CFClient::UI::Gauge; 2919package CFPlus::UI::Gauge;
2290 2920
2291our @ISA = CFClient::UI::VBox::; 2921our @ISA = CFPlus::UI::VBox::;
2292 2922
2293sub new { 2923sub new {
2294 my ($class, %arg) = @_; 2924 my ($class, %arg) = @_;
2295 2925
2296 my $self = $class->SUPER::new ( 2926 my $self = $class->SUPER::new (
… …
2298 can_hover => 1, 2928 can_hover => 1,
2299 can_events => 1, 2929 can_events => 1,
2300 %arg, 2930 %arg,
2301 ); 2931 );
2302 2932
2303 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2933 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2304 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2934 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2305 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2935 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2306 2936
2307 $self 2937 $self
2308} 2938}
2309 2939
2310sub set_fontsize { 2940sub set_fontsize {
… …
2331 $self->{value}->set_text ($val); 2961 $self->{value}->set_text ($val);
2332} 2962}
2333 2963
2334############################################################################# 2964#############################################################################
2335 2965
2336package CFClient::UI::Slider; 2966package CFPlus::UI::Slider;
2337 2967
2338use strict; 2968use strict;
2339 2969
2340use CFClient::OpenGL; 2970use CFPlus::OpenGL;
2341 2971
2342our @ISA = CFClient::UI::DrawBG::; 2972our @ISA = CFPlus::UI::DrawBG::;
2343 2973
2344my @tex = 2974my @tex =
2345 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2975 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2346 qw(s1_slider.png s1_slider_bg.png); 2976 qw(s1_slider.png s1_slider_bg.png);
2347 2977
2348sub new { 2978sub new {
2349 my $class = shift; 2979 my $class = shift;
2350 2980
… …
2418 3048
2419 $self->SUPER::invoke_button_down ($ev, $x, $y); 3049 $self->SUPER::invoke_button_down ($ev, $x, $y);
2420 3050
2421 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3051 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2422 3052
2423 $self->invoke_mouse_motion ($ev, $x, $y) 3053 $self->invoke_mouse_motion ($ev, $x, $y);
3054
3055 1
2424} 3056}
2425 3057
2426sub invoke_mouse_motion { 3058sub invoke_mouse_motion {
2427 my ($self, $ev, $x, $y) = @_; 3059 my ($self, $ev, $x, $y) = @_;
2428 3060
… …
2435 3067
2436 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3068 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2437 } else { 3069 } else {
2438 return 0; 3070 return 0;
2439 } 3071 }
3072
3073 1
3074}
3075
3076sub invoke_mouse_wheel {
3077 my ($self, $ev) = @_;
3078
3079 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3080
3081 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
3082
3083 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2440 3084
2441 1 3085 1
2442} 3086}
2443 3087
2444sub update { 3088sub update {
… …
2495 glDisable GL_TEXTURE_2D; 3139 glDisable GL_TEXTURE_2D;
2496} 3140}
2497 3141
2498############################################################################# 3142#############################################################################
2499 3143
2500package CFClient::UI::ValSlider; 3144package CFPlus::UI::ValSlider;
2501 3145
2502our @ISA = CFClient::UI::HBox::; 3146our @ISA = CFPlus::UI::HBox::;
2503 3147
2504sub new { 3148sub new {
2505 my ($class, %arg) = @_; 3149 my ($class, %arg) = @_;
2506 3150
2507 my $range = delete $arg{range}; 3151 my $range = delete $arg{range};
2508 3152
2509 my $self = $class->SUPER::new ( 3153 my $self = $class->SUPER::new (
2510 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3154 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2511 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3155 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2512 to_value => sub { shift }, 3156 to_value => sub { shift },
2513 from_value => sub { shift }, 3157 from_value => sub { shift },
2514 %arg, 3158 %arg,
2515 ); 3159 );
2516 3160
… …
2536sub set_range { shift->{slider}->set_range (@_) } 3180sub set_range { shift->{slider}->set_range (@_) }
2537sub set_value { shift->{slider}->set_value (@_) } 3181sub set_value { shift->{slider}->set_value (@_) }
2538 3182
2539############################################################################# 3183#############################################################################
2540 3184
2541package CFClient::UI::TextScroller; 3185package CFPlus::UI::TextScroller;
2542 3186
2543our @ISA = CFClient::UI::HBox::; 3187our @ISA = CFPlus::UI::HBox::;
2544 3188
2545use CFClient::OpenGL; 3189use CFPlus::OpenGL;
2546 3190
2547sub new { 3191sub new {
2548 my $class = shift; 3192 my $class = shift;
2549 3193
2550 my $self = $class->SUPER::new ( 3194 my $self = $class->SUPER::new (
2551 fontsize => 1, 3195 fontsize => 1,
2552 can_events => 0, 3196 can_events => 1,
2553 indent => 0, 3197 indent => 0,
2554 #font => default_font 3198 #font => default_font
2555 @_, 3199 @_,
2556 3200
2557 layout => (new CFClient::Layout 1), 3201 layout => (new CFPlus::Layout),
2558 par => [], 3202 par => [],
3203 max_par => 0,
2559 height => 0, 3204 height => 0,
2560 children => [ 3205 children => [
2561 (new CFClient::UI::Empty expand => 1), 3206 (new CFPlus::UI::Empty expand => 1),
2562 (new CFClient::UI::Slider vertical => 1), 3207 (new CFPlus::UI::Slider vertical => 1),
2563 ], 3208 ],
2564 ); 3209 );
2565 3210
2566 $self->{children}[1]->connect (changed => sub { $self->update }); 3211 $self->{children}[1]->connect (changed => sub { $self->update });
2567 3212
… …
2576} 3221}
2577 3222
2578sub size_request { 3223sub size_request {
2579 my ($self) = @_; 3224 my ($self) = @_;
2580 3225
2581 my ($empty, $slider) = @{ $self->{children} }; 3226 my ($empty, $slider) = $self->visible_children;
2582 3227
2583 local $self->{children} = [$empty, $slider]; 3228 local $self->{children} = [$empty, $slider];
2584 $self->SUPER::size_request 3229 $self->SUPER::size_request
2585} 3230}
2586 3231
… …
2597 3242
2598 $self->reflow; 3243 $self->reflow;
2599 3244
2600 local $self->{children} = [$empty, $slider]; 3245 local $self->{children} = [$empty, $slider];
2601 $self->SUPER::invoke_size_allocate ($w, $h) 3246 $self->SUPER::invoke_size_allocate ($w, $h)
3247}
3248
3249sub invoke_mouse_wheel {
3250 my ($self, $ev) = @_;
3251
3252 return 0 unless $ev->{dy}; # only vertical movements
3253
3254 $self->{children}[1]->emit (mouse_wheel => $ev);
3255
3256 1
2602} 3257}
2603 3258
2604sub get_layout { 3259sub get_layout {
2605 my ($self, $para) = @_; 3260 my ($self, $para) = @_;
2606 3261
… …
2634 3289
2635 # todo: base offset on lines or so, not on pixels 3290 # todo: base offset on lines or so, not on pixels
2636 $self->{children}[1]->set_value ($offset); 3291 $self->{children}[1]->set_value ($offset);
2637} 3292}
2638 3293
3294sub current_paragraph {
3295 my ($self) = @_;
3296
3297 $self->{top_paragraph} - 1
3298}
3299
3300sub scroll_to {
3301 my ($self, $para) = @_;
3302
3303 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3304
3305 $self->{scroll_to} = $para;
3306 $self->update;
3307}
3308
2639sub clear { 3309sub clear {
2640 my ($self) = @_; 3310 my ($self) = @_;
2641 3311
2642 my (undef, undef, @other) = @{ $self->{children} }; 3312 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other; 3313 $self->remove ($_) for @other;
… …
2646 $self->{height} = 0; 3316 $self->{height} = 0;
2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3317 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648} 3318}
2649 3319
2650sub add_paragraph { 3320sub add_paragraph {
2651 my ($self, $color, $para, $indent) = @_; 3321 my $self = shift;
2652 3322
2653 my ($text, @w) = ref $para ? @$para : $para; 3323 for my $para (@_) {
2654
2655 $para = { 3324 $para = {
3325 fg => [1, 1, 1, 1],
3326 indent => 0,
3327 markup => "",
3328 widget => [],
3329 ref $para ? %$para : (markup => $para),
2656 w => 1e10, 3330 w => 1e10,
2657 wrapped => 1, 3331 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2662 }; 3332 };
2663 3333
2664 $self->add (@w) if @w; 3334 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665 push @{$self->{par}}, $para; 3335 push @{$self->{par}}, $para;
3336 }
3337
3338 if (my $max = $self->{max_par}) {
3339 shift @{$self->{par}} while @{$self->{par}} > $max;
3340 }
2666 3341
2667 $self->{need_reflow}++; 3342 $self->{need_reflow}++;
2668 $self->update; 3343 $self->update;
2669} 3344}
2670 3345
2671sub scroll_to_bottom { 3346sub scroll_to_bottom {
2672 my ($self) = @_; 3347 my ($self) = @_;
2673 3348
2674 $self->{scroll_to_bottom} = 1; 3349 $self->{scroll_to} = $#{$self->{par}};
2675 $self->update; 3350 $self->update;
2676} 3351}
2677 3352
3353sub force_uptodate {
3354 my ($self) = @_;
3355
3356 if (delete $self->{need_reflow}) {
3357 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3358
3359 my $height = 0;
3360
3361 for my $para (@{$self->{par}}) {
3362 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3363 my $layout = $self->get_layout ($para);
3364 my ($w, $h) = $layout->size;
3365
3366 $para->{w} = $w + $para->{indent};
3367 $para->{h} = $h;
3368 $para->{wrapped} = $layout->has_wrapped;
3369 }
3370
3371 $para->{y} = $height;
3372 $height += $para->{h};
3373 }
3374
3375 $self->{height} = $height;
3376 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3377
3378 delete $self->{texture};
3379 }
3380
3381 if (my $paridx = delete $self->{scroll_to}) {
3382 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3383 }
3384}
3385
2678sub update { 3386sub update {
2679 my ($self) = @_; 3387 my ($self) = @_;
2680 3388
2681 $self->SUPER::update; 3389 $self->SUPER::update;
2682 3390
2683 return unless $self->{h} > 0; 3391 return unless $self->{h} > 0;
2684 3392
2685 delete $self->{texture}; 3393 delete $self->{texture};
2686 3394
2687 $ROOT->on_post_alloc ($self => sub { 3395 $ROOT->on_post_alloc ($self => sub {
3396 $self->force_uptodate;
3397
2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3398 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689 3399
2690 if (delete $self->{need_reflow}) {
2691 my $height = 0;
2692
2693 for my $para (@{$self->{par}}) {
2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2695 my $layout = $self->get_layout ($para);
2696 my ($w, $h) = $layout->size;
2697
2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2701 }
2702
2703 $height += $para->{h};
2704 }
2705
2706 $self->{height} = $height;
2707
2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2709
2710 delete $self->{texture};
2711 }
2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3400 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2718 glClearColor 0, 0, 0, 0; 3401 glClearColor 0, 0, 0, 0;
2719 glClear GL_COLOR_BUFFER_BIT; 3402 glClear GL_COLOR_BUFFER_BIT;
2720 3403
3404 package CFPlus::UI::Base;
3405 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3406 (0, 0, $self->{w}, $self->{h});
3407
3408 my $top = int $self->{children}[1]{range}[0];
3409
3410 my $paridx = 0;
3411 my $top_paragraph;
2721 my $top = int $self->{children}[1]{range}[0]; 3412 my $top = int $self->{children}[1]{range}[0];
2722 3413
2723 my $y0 = $top; 3414 my $y0 = $top;
2724 my $y1 = $top + $H; 3415 my $y1 = $top + $H;
2725 3416
2726 my $y = 0;
2727
2728 glEnable GL_BLEND;
2729 #TODO# not correct in windows where rgba is forced off
2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2731
2732 for my $para (@{$self->{par}}) { 3417 for my $para (@{$self->{par}}) {
2733 my $h = $para->{h}; 3418 my $h = $para->{h};
3419 my $y = $para->{y};
2734 3420
2735 if ($y0 < $y + $h && $y < $y1) { 3421 if ($y0 < $y + $h && $y < $y1) {
2736
2737 my $layout = $self->get_layout ($para); 3422 my $layout = $self->get_layout ($para);
2738 3423
2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741 glRasterPos $para->{indent}, $y - $y0; 3424 $layout->render ($para->{indent}, $y - $y0);
2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3425 $layout->draw;
2743 3426
2744 if (my @w = @{ $para->{widget} }) { 3427 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes; 3428 my @s = $layout->get_shapes;
2746 3429
2747 for (@w) { 3430 for (@w) {
… …
2753 $_->draw; 3436 $_->draw;
2754 } 3437 }
2755 } 3438 }
2756 } 3439 }
2757 3440
2758 $y += $h; 3441 $paridx++;
3442 $top_paragraph ||= $paridx if $y >= $top;
2759 } 3443 }
2760 3444
2761 glDisable GL_BLEND; 3445 $self->{top_paragraph} = $top_paragraph;
2762 }; 3446 };
2763 }); 3447 });
2764} 3448}
2765 3449
2766sub reconfigure { 3450sub reconfigure {
… …
2784 $self->{children}[1]->draw; 3468 $self->{children}[1]->draw;
2785} 3469}
2786 3470
2787############################################################################# 3471#############################################################################
2788 3472
2789package CFClient::UI::Animator; 3473package CFPlus::UI::Animator;
2790 3474
2791use CFClient::OpenGL; 3475use CFPlus::OpenGL;
2792 3476
2793our @ISA = CFClient::UI::Bin::; 3477our @ISA = CFPlus::UI::Bin::;
2794 3478
2795sub moveto { 3479sub moveto {
2796 my ($self, $x, $y) = @_; 3480 my ($self, $x, $y) = @_;
2797 3481
2798 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3482 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2826 glPopMatrix; 3510 glPopMatrix;
2827} 3511}
2828 3512
2829############################################################################# 3513#############################################################################
2830 3514
2831package CFClient::UI::Flopper; 3515package CFPlus::UI::Flopper;
2832 3516
2833our @ISA = CFClient::UI::Button::; 3517our @ISA = CFPlus::UI::Button::;
2834 3518
2835sub new { 3519sub new {
2836 my $class = shift; 3520 my $class = shift;
2837 3521
2838 my $self = $class->SUPER::new ( 3522 my $self = $class->SUPER::new (
… …
2850 $self->{other}->toggle_visibility; 3534 $self->{other}->toggle_visibility;
2851} 3535}
2852 3536
2853############################################################################# 3537#############################################################################
2854 3538
2855package CFClient::UI::Tooltip; 3539package CFPlus::UI::Tooltip;
2856 3540
2857our @ISA = CFClient::UI::Bin::; 3541our @ISA = CFPlus::UI::Bin::;
2858 3542
2859use CFClient::OpenGL; 3543use CFPlus::OpenGL;
2860 3544
2861sub new { 3545sub new {
2862 my $class = shift; 3546 my $class = shift;
2863 3547
2864 $class->SUPER::new ( 3548 $class->SUPER::new (
… …
2868} 3552}
2869 3553
2870sub set_tooltip_from { 3554sub set_tooltip_from {
2871 my ($self, $widget) = @_; 3555 my ($self, $widget) = @_;
2872 3556
2873 my $tooltip = $widget->{tooltip}; 3557 my $tip = $widget->{tooltip};
3558 $tip = $tip->($widget) if "CODE" eq ref $tip;
3559
3560 $tip = CFPlus::Pod::section_label tooltip => $1
3561 if $tip =~ /^#(.*)$/;
2874 3562
2875 if ($ENV{CFPLUS_DEBUG} & 2) { 3563 if ($ENV{CFPLUS_DEBUG} & 2) {
2876 $tooltip .= "\n\n" . (ref $widget) . "\n" 3564 $tip .= "\n\n" . (ref $widget) . "\n"
2877 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3565 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2878 . "req $widget->{req_w} $widget->{req_h}\n" 3566 . "req $widget->{req_w} $widget->{req_h}\n"
2879 . "visible $widget->{visible}"; 3567 . "visible $widget->{visible}";
2880 } 3568 }
2881 3569
2882 $tooltip =~ s/^\n+//; 3570 $tip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//; 3571 $tip =~ s/\n+$//;
2884 3572
2885 $self->add (new CFClient::UI::Label 3573 $self->add (new CFPlus::UI::Label
2886 markup => $tooltip, 3574 markup => $tip,
2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3575 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2888 fontsize => 0.8, 3576 fontsize => 0.8,
2889 fg => [0, 0, 0, 1], 3577 style => 1, # FLAG_INVERSE
2890 ellipsise => 0, 3578 ellipsise => 0,
2891 font => ($widget->{tooltip_font} || $::FONT_PROP), 3579 font => ($widget->{tooltip_font} || $::FONT_PROP),
2892 ); 3580 );
2893} 3581}
2894 3582
… …
2913 3601
2914 $self->{root}->on_post_alloc ("move_$self" => sub { 3602 $self->{root}->on_post_alloc ("move_$self" => sub {
2915 my $widget = $self->{owner} 3603 my $widget = $self->{owner}
2916 or return; 3604 or return;
2917 3605
3606 if ($widget->{visible}) {
2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3607 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919 3608
2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3609 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921 if $x + $self->{w} > $self->{root}{w}; 3610 if $x + $self->{w} > $self->{root}{w};
2922 3611
2923 $self->move_abs ($x, $y); 3612 $self->move_abs ($x, $y);
3613 } else {
3614 $self->hide;
3615 }
2924 }); 3616 });
2925} 3617}
2926 3618
2927sub _draw { 3619sub _draw {
2928 my ($self) = @_; 3620 my ($self) = @_;
2929 3621
2930 glTranslate 0.375, 0.375;
2931
2932 my ($w, $h) = @$self{qw(w h)}; 3622 my ($w, $h) = @$self{qw(w h)};
2933 3623
2934 glColor 1, 0.8, 0.4; 3624 glColor 1, 0.8, 0.4;
2935 glBegin GL_QUADS; 3625 glRect 0, 0, $w, $h;
2936 glVertex 0 , 0;
2937 glVertex 0 , $h;
2938 glVertex $w, $h;
2939 glVertex $w, 0;
2940 glEnd;
2941 3626
2942 glColor 0, 0, 0; 3627 glColor 0, 0, 0;
2943 glBegin GL_LINE_LOOP; 3628 glRect_lineloop .5, .5, $w + .5, $h + .5;
2944 glVertex 0 , 0;
2945 glVertex 0 , $h;
2946 glVertex $w, $h;
2947 glVertex $w, 0;
2948 glEnd;
2949 3629
2950 glTranslate 2 - 0.375, 2 - 0.375; 3630 glTranslate 2, 2;
2951 3631
2952 $self->SUPER::_draw; 3632 $self->SUPER::_draw;
2953} 3633}
2954 3634
2955############################################################################# 3635#############################################################################
2956 3636
2957package CFClient::UI::Face; 3637package CFPlus::UI::Face;
2958 3638
2959our @ISA = CFClient::UI::Base::; 3639our @ISA = CFPlus::UI::DrawBG::;
2960 3640
2961use CFClient::OpenGL; 3641use CFPlus::OpenGL;
2962 3642
2963sub new { 3643sub new {
2964 my $class = shift; 3644 my $class = shift;
2965 3645
2966 my $self = $class->SUPER::new ( 3646 my $self = $class->SUPER::new (
3647 size_w => 32,
3648 size_h => 8,
2967 aspect => 1, 3649 aspect => 1,
2968 can_events => 0, 3650 can_events => 0,
2969 @_, 3651 @_,
2970 ); 3652 );
2971 3653
2972 if ($self->{anim} && $self->{animspeed}) { 3654 if ($self->{anim} && $self->{animspeed}) {
2973 Scalar::Util::weaken (my $widget = $self); 3655 CFPlus::weaken (my $widget = $self);
2974 3656
3657 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3658 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2975 $self->{timer} = Event->timer ( 3659 $self->{timer} = Event->timer (
2976 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2977 hard => 1, 3660 parked => 1,
2978 interval => $self->{animspeed},
2979 cb => sub { 3661 cb => sub {
3662 return unless $::CONN;
3663
3664 my $w = $widget
3665 or return;
3666
2980 ++$widget->{frame}; 3667 ++$w->{frame};
3668 $w->update_face;
3669
3670 # somehow, $widget can go away
2981 $widget->update; 3671 $w->update;
3672 $w->update_timer;
2982 }, 3673 },
2983 ); 3674 );
3675
3676 $self->update_face;
3677 $self->update_timer;
2984 } 3678 }
2985 3679
2986 $self 3680 $self
2987} 3681}
2988 3682
3683sub update_timer {
3684 my ($self) = @_;
3685
3686 return unless $self->{timer};
3687
3688 if ($self->{visible}) {
3689 $self->{timer}->at (
3690 $self->{anim_start}
3691 + $self->{animspeed}
3692 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3693 );
3694 $self->{timer}->start;
3695 } else {
3696 $self->{timer}->stop;
3697 }
3698}
3699
3700sub update_face {
3701 my ($self) = @_;
3702
3703 if ($::CONN) {
3704 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3705 if ($anim && @$anim) {
3706 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3707 delete $self->{face_change_cb};
3708
3709 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3710 unless ($tex->{name} || $tex->{loading}) {
3711 $tex->upload (sub { $self->reconfigure });
3712 }
3713 }
3714 }
3715 }
3716 }
3717}
3718
2989sub size_request { 3719sub size_request {
2990 (32, 8) 3720 my ($self) = @_;
3721
3722 if ($::CONN) {
3723 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3724 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3725 if ($tex->{name}) {
3726 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3727 } elsif (!$tex->{loading}) {
3728 $tex->upload (sub { $self->reconfigure });
3729 }
3730 }
3731
3732 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3733 }
3734 }
3735
3736 ($self->{size_w} || 8, $self->{size_h} || 8)
2991} 3737}
2992 3738
2993sub update { 3739sub update {
2994 my ($self) = @_; 3740 my ($self) = @_;
2995 3741
2996 return unless $self->{visible}; 3742 return unless $self->{visible};
2997 3743
2998 $self->SUPER::update; 3744 $self->SUPER::update;
2999} 3745}
3000 3746
3747sub invoke_visibility_change {
3748 my ($self) = @_;
3749
3750 $self->update_timer;
3751
3752 0
3753}
3754
3001sub _draw { 3755sub _draw {
3002 my ($self) = @_; 3756 my ($self) = @_;
3003 3757
3004 return unless $::CONN; 3758 $self->SUPER::_draw;
3005 3759
3006 my $face; 3760 if (my $tex = $self->{tex}) {
3007
3008 if ($self->{frame}) {
3009 my $anim = $::CONN->{anim}[$self->{anim}];
3010
3011 $face = $anim->[ $self->{frame} % @$anim ]
3012 if $anim && @$anim;
3013 }
3014
3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3016
3017 if ($tex) {
3018 glEnable GL_TEXTURE_2D; 3761 glEnable GL_TEXTURE_2D;
3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3762 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3020 glColor 0, 0, 0, 1; 3763 glColor 0, 0, 0, 1;
3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3764 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3022 glDisable GL_TEXTURE_2D; 3765 glDisable GL_TEXTURE_2D;
… …
3024} 3767}
3025 3768
3026sub destroy { 3769sub destroy {
3027 my ($self) = @_; 3770 my ($self) = @_;
3028 3771
3029 $self->{timer}->cancel 3772 (delete $self->{timer})->cancel
3030 if $self->{timer}; 3773 if $self->{timer};
3031 3774
3032 $self->SUPER::destroy; 3775 $self->SUPER::destroy;
3033} 3776}
3034 3777
3035############################################################################# 3778#############################################################################
3036 3779
3037package CFClient::UI::Buttonbar; 3780package CFPlus::UI::Buttonbar;
3038 3781
3039our @ISA = CFClient::UI::HBox::; 3782our @ISA = CFPlus::UI::HBox::;
3040 3783
3041# TODO: should actualyl wrap buttons and other goodies. 3784# TODO: should actually wrap buttons and other goodies.
3042 3785
3043############################################################################# 3786#############################################################################
3044 3787
3045package CFClient::UI::Menu; 3788package CFPlus::UI::Menu;
3046 3789
3047our @ISA = CFClient::UI::FancyFrame::; 3790our @ISA = CFPlus::UI::Toplevel::;
3048 3791
3049use CFClient::OpenGL; 3792use CFPlus::OpenGL;
3050 3793
3051sub new { 3794sub new {
3052 my $class = shift; 3795 my $class = shift;
3053 3796
3054 my $self = $class->SUPER::new ( 3797 my $self = $class->SUPER::new (
3055 items => [], 3798 items => [],
3056 z => 100, 3799 z => 100,
3057 @_, 3800 @_,
3058 ); 3801 );
3059 3802
3060 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3803 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3061 3804
3062 for my $item (@{ $self->{items} }) { 3805 for my $item (@{ $self->{items} }) {
3063 my ($widget, $cb, $tooltip) = @$item; 3806 my ($widget, $cb, $tooltip) = @$item;
3064 3807
3065 # handle various types of items, only text for now 3808 # handle various types of items, only text for now
3066 if (!ref $widget) { 3809 if (!ref $widget) {
3810 if ($widget =~ /\t/) {
3811 my ($left, $right) = split /\t/, $widget, 2;
3812
3067 $widget = new CFClient::UI::Label 3813 $widget = new CFPlus::UI::HBox
3068 can_hover => 1, 3814 can_hover => 1,
3069 can_events => 1, 3815 can_events => 1,
3816 tooltip => $tooltip,
3817 children => [
3818 (new CFPlus::UI::Label markup => $left, expand => 1),
3819 (new CFPlus::UI::Label markup => $right, align => +1),
3820 ],
3821 ;
3822
3823 } else {
3824 $widget = new CFPlus::UI::Label
3825 can_hover => 1,
3826 can_events => 1,
3070 markup => $widget, 3827 markup => $widget,
3071 tooltip => $tooltip 3828 tooltip => $tooltip;
3829 }
3072 } 3830 }
3073 3831
3074 $self->{item}{$widget} = $item; 3832 $self->{item}{$widget} = $item;
3075 3833
3076 $self->{vbox}->add ($widget); 3834 $self->{vbox}->add ($widget);
… …
3119 1 3877 1
3120} 3878}
3121 3879
3122############################################################################# 3880#############################################################################
3123 3881
3124package CFClient::UI::Multiplexer; 3882package CFPlus::UI::Multiplexer;
3125 3883
3126our @ISA = CFClient::UI::Container::; 3884our @ISA = CFPlus::UI::Container::;
3127 3885
3128sub new { 3886sub new {
3129 my $class = shift; 3887 my $class = shift;
3130 3888
3131 my $self = $class->SUPER::new ( 3889 my $self = $class->SUPER::new (
… …
3145 3903
3146 $self->{current} = $self->{children}[0] 3904 $self->{current} = $self->{children}[0]
3147 if @{ $self->{children} }; 3905 if @{ $self->{children} };
3148} 3906}
3149 3907
3908sub get_current_page {
3909 my ($self) = @_;
3910
3911 $self->{current}
3912}
3913
3150sub set_current_page { 3914sub set_current_page {
3151 my ($self, $page_or_widget) = @_; 3915 my ($self, $page_or_widget) = @_;
3152 3916
3153 my $widget = ref $page_or_widget 3917 my $widget = ref $page_or_widget
3154 ? $page_or_widget 3918 ? $page_or_widget
… …
3186 $self->{current}->draw; 3950 $self->{current}->draw;
3187} 3951}
3188 3952
3189############################################################################# 3953#############################################################################
3190 3954
3191package CFClient::UI::Notebook; 3955package CFPlus::UI::Notebook;
3192 3956
3957use CFPlus::OpenGL;
3958
3193our @ISA = CFClient::UI::VBox::; 3959our @ISA = CFPlus::UI::VBox::;
3194 3960
3195sub new { 3961sub new {
3196 my $class = shift; 3962 my $class = shift;
3197 3963
3198 my $self = $class->SUPER::new ( 3964 my $self = $class->SUPER::new (
3199 buttonbar => (new CFClient::UI::Buttonbar), 3965 buttonbar => (new CFPlus::UI::Buttonbar),
3200 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3966 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3967 active_outline => [.7, .7, 0.2],
3201 # filter => # will be put between multiplexer and $self 3968 # filter => # will be put between multiplexer and $self
3202 @_, 3969 @_,
3203 ); 3970 );
3204 3971
3205 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3972 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3206 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3973 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3207 3974
3975 {
3976 Scalar::Util::weaken (my $wself = $self);
3977
3978 $self->{multiplexer}->connect (c_add => sub {
3979 my ($mplex, $widgets) = @_;
3980
3981 for my $child (@$widgets) {
3982 Scalar::Util::weaken $child;
3983 $child->{c_tab_} ||= do {
3984 my $tab =
3985 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3986 ? $child->{c_tab}
3987 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3988
3989 $tab->connect (activate => sub {
3990 $wself->set_current_page ($child);
3991 });
3992
3993 $tab
3994 };
3995
3996 $self->{buttonbar}->add ($child->{c_tab_});
3997 }
3998 });
3999
4000 $self->{multiplexer}->connect (c_remove => sub {
4001 my ($mplex, $widgets) = @_;
4002
4003 for my $child (@$widgets) {
4004 $wself->{buttonbar}->remove ($child->{c_tab_});
4005 }
4006 });
4007 }
4008
3208 $self 4009 $self
3209} 4010}
3210 4011
3211sub add { 4012sub add {
4013 my ($self, @widgets) = @_;
4014
4015 $self->{multiplexer}->add (@widgets)
4016}
4017
4018sub remove {
4019 my ($self, @widgets) = @_;
4020
4021 $self->{multiplexer}->remove (@widgets)
4022}
4023
4024sub pages {
4025 my ($self) = @_;
4026 $self->{multiplexer}->children
4027}
4028
4029sub add_tab {
3212 my ($self, $title, $widget, $tooltip) = @_; 4030 my ($self, $title, $widget, $tooltip) = @_;
3213 4031
3214 Scalar::Util::weaken $self; 4032 $title = [$title, $tooltip] unless ref $title;
4033 $widget->{c_tab} = $title;
3215 4034
3216 $self->{buttonbar}->add (new CFClient::UI::Button
3217 markup => $title,
3218 tooltip => $tooltip,
3219 on_activate => sub { $self->set_current_page ($widget) },
3220 );
3221
3222 $self->{multiplexer}->add ($widget); 4035 $self->add ($widget);
4036}
4037
4038sub get_current_page {
4039 my ($self) = @_;
4040
4041 $self->{multiplexer}->get_current_page
3223} 4042}
3224 4043
3225sub set_current_page { 4044sub set_current_page {
3226 my ($self, $page) = @_; 4045 my ($self, $page) = @_;
3227 4046
3228 $self->{multiplexer}->set_current_page ($page); 4047 $self->{multiplexer}->set_current_page ($page);
3229 $self->emit (page_changed => $self->{multiplexer}{current}); 4048 $self->emit (page_changed => $self->{multiplexer}{current});
3230} 4049}
3231 4050
4051sub _draw {
4052 my ($self) = @_;
4053
4054 $self->SUPER::_draw ();
4055
4056 if (my $cur = $self->{multiplexer}{current}) {
4057 if ($cur = $cur->{c_tab_}) {
4058 glTranslate $self->{buttonbar}{x} + $cur->{x},
4059 $self->{buttonbar}{y} + $cur->{y};
4060 glLineWidth 3;
4061 #glEnable GL_BLEND;
4062 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4063 glColor @{$self->{active_outline}};
4064 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4065 glLineWidth 1;
4066 #glDisable GL_BLEND;
4067 }
4068 }
4069}
4070
3232############################################################################# 4071#############################################################################
3233 4072
3234package CFClient::UI::Combobox; 4073package CFPlus::UI::Selector;
3235 4074
3236use utf8; 4075use utf8;
3237 4076
3238our @ISA = CFClient::UI::Button::; 4077our @ISA = CFPlus::UI::Button::;
3239 4078
3240sub new { 4079sub new {
3241 my $class = shift; 4080 my $class = shift;
3242 4081
3243 my $self = $class->SUPER::new ( 4082 my $self = $class->SUPER::new (
… …
3260 my ($value, $title, $tooltip) = @$_; 4099 my ($value, $title, $tooltip) = @$_;
3261 4100
3262 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4101 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263 } 4102 }
3264 4103
3265 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 4104 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266} 4105}
3267 4106
3268sub _set_value { 4107sub _set_value {
3269 my ($self, $value) = @_; 4108 my ($self, $value) = @_;
3270 4109
… …
3285 $self->emit (changed => $value); 4124 $self->emit (changed => $value);
3286} 4125}
3287 4126
3288############################################################################# 4127#############################################################################
3289 4128
3290package CFClient::UI::Statusbox; 4129package CFPlus::UI::Statusbox;
3291 4130
3292our @ISA = CFClient::UI::VBox::; 4131our @ISA = CFPlus::UI::VBox::;
3293 4132
3294sub new { 4133sub new {
3295 my $class = shift; 4134 my $class = shift;
3296 4135
3297 my $self = $class->SUPER::new ( 4136 my $self = $class->SUPER::new (
3298 fontsize => 0.8, 4137 fontsize => 0.8,
3299 @_, 4138 @_,
3300 ); 4139 );
3301 4140
3302 Scalar::Util::weaken (my $this = $self); 4141 CFPlus::weaken (my $this = $self);
3303 4142
3304 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4143 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3305 4144
3306 $self 4145 $self
3307} 4146}
… …
3309sub reorder { 4148sub reorder {
3310 my ($self) = @_; 4149 my ($self) = @_;
3311 my $NOW = Time::HiRes::time; 4150 my $NOW = Time::HiRes::time;
3312 4151
3313 # freeze display when hovering over any label 4152 # freeze display when hovering over any label
3314 return if $CFClient::UI::TOOLTIP->{owner} 4153 return if $CFPlus::UI::TOOLTIP->{owner}
3315 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4154 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3316 values %{ $self->{item} }; 4155 values %{ $self->{item} };
3317 4156
3318 while (my ($k, $v) = each %{ $self->{item} }) { 4157 while (my ($k, $v) = each %{ $self->{item} }) {
3319 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4158 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3320 } 4159 }
… …
3341 for ($short) { 4180 for ($short) {
3342 s/^\s+//; 4181 s/^\s+//;
3343 s/\s+/ /g; 4182 s/\s+/ /g;
3344 } 4183 }
3345 4184
3346 new CFClient::UI::Label 4185 new CFPlus::UI::Label
3347 markup => $short, 4186 markup => $short,
3348 tooltip => $item->{tooltip}, 4187 tooltip => $item->{tooltip},
3349 tooltip_font => $::FONT_PROP, 4188 tooltip_font => $::FONT_PROP,
3350 tooltip_width => 0.67, 4189 tooltip_width => 0.67,
3351 fontsize => $item->{fontsize} || $self->{fontsize}, 4190 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3405 count => 1, 4244 count => 1,
3406 %arg, 4245 %arg,
3407 }; 4246 };
3408 } 4247 }
3409 4248
4249 $ROOT->on_refresh (reorder => sub {
3410 $self->reorder; 4250 $self->reorder;
4251 });
3411} 4252}
3412 4253
3413sub reconfigure { 4254sub reconfigure {
3414 my ($self) = @_; 4255 my ($self) = @_;
3415 4256
… …
3428 $self->SUPER::destroy; 4269 $self->SUPER::destroy;
3429} 4270}
3430 4271
3431############################################################################# 4272#############################################################################
3432 4273
3433package CFClient::UI::Inventory;
3434
3435our @ISA = CFClient::UI::ScrolledWindow::;
3436
3437sub new {
3438 my $class = shift;
3439
3440 my $self = $class->SUPER::new (
3441 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3442 @_,
3443 );
3444
3445 $self
3446}
3447
3448sub set_items {
3449 my ($self, $items) = @_;
3450
3451 $self->{child}->clear;
3452 return unless $items;
3453
3454 my @items = sort {
3455 ($a->{type} <=> $b->{type})
3456 or ($a->{name} cmp $b->{name})
3457 } @$items;
3458
3459 $self->{real_items} = \@items;
3460
3461 my $row = 0;
3462 for my $item (@items) {
3463 CFClient::Item::update_widgets $item;
3464
3465 $self->{child}->add (0, $row, $item->{face_widget});
3466 $self->{child}->add (1, $row, $item->{desc_widget});
3467 $self->{child}->add (2, $row, $item->{weight_widget});
3468
3469 $row++;
3470 }
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::BindEditor;
3476
3477our @ISA = CFClient::UI::FancyFrame::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3483
3484 $self->add (my $vb = new CFClient::UI::VBox);
3485
3486
3487 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3488 text => "start recording",
3489 tooltip => "Start/Stops recording of actions."
3490 ."All subsequent actions after the recording started will be captured."
3491 ."The actions are displayed after the record was stopped."
3492 ."To bind the action you have to click on the 'Bind' button",
3493 on_activate => sub {
3494 unless ($self->{recording}) {
3495 $self->start;
3496 } else {
3497 $self->stop;
3498 }
3499 });
3500
3501 $vb->add (new CFClient::UI::Label text => "Actions:");
3502 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3503
3504 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3505 $vb->add (my $hb = new CFClient::UI::HBox);
3506 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3507 $hb->add (new CFClient::UI::Button
3508 text => "bind",
3509 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3510 on_activate => sub {
3511 $self->ask_for_bind;
3512 });
3513
3514 $vb->add (my $hb = new CFClient::UI::HBox);
3515 $hb->add (new CFClient::UI::Button
3516 text => "ok",
3517 expand => 1,
3518 tooltip => "This closes the binding editor and saves the binding",
3519 on_activate => sub {
3520 $self->hide;
3521 $self->commit;
3522 });
3523
3524 $hb->add (new CFClient::UI::Button
3525 text => "cancel",
3526 expand => 1,
3527 tooltip => "This closes the binding editor without saving",
3528 on_activate => sub {
3529 $self->hide;
3530 $self->{binding_cancel}->()
3531 if $self->{binding_cancel};
3532 });
3533
3534 $self->update_binding_widgets;
3535
3536 $self
3537}
3538
3539sub cfg_bind {
3540 my ($self, $mod, $sym, $cmds) = @_;
3541 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542 ::update_bindings ();
3543}
3544
3545sub cfg_unbind {
3546 my ($self, $mod, $sym, $cmds) = @_;
3547 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548 ::update_bindings ();
3549}
3550
3551sub commit {
3552 my ($self) = @_;
3553 my ($mod, $sym, $cmds) = $self->get_binding;
3554 if ($sym != 0 && @$cmds > 0) {
3555 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3556 ."'. Don't forget 'Save Config'!");
3557 $self->{binding_change}->($mod, $sym, $cmds)
3558 if $self->{binding_change};
3559 } else {
3560 $::STATUSBOX->add ("No action bound, no key or action specified!");
3561 $self->{binding_cancel}->()
3562 if $self->{binding_cancel};
3563 }
3564}
3565
3566sub start {
3567 my ($self) = @_;
3568
3569 $self->{rec_btn}->set_text ("stop recording");
3570 $self->{recording} = 1;
3571 $self->clear_command_list;
3572 $::CONN->start_record if $::CONN;
3573}
3574
3575sub stop {
3576 my ($self) = @_;
3577
3578 $self->{rec_btn}->set_text ("start recording");
3579 $self->{recording} = 0;
3580
3581 my $rec;
3582 $rec = $::CONN->stop_record if $::CONN;
3583 return unless ref $rec eq 'ARRAY';
3584 $self->set_command_list ($rec);
3585}
3586
3587
3588sub ask_for_bind_and_commit {
3589 my ($self) = @_;
3590 $self->ask_for_bind (1);
3591}
3592
3593sub ask_for_bind {
3594 my ($self, $commit, $end_cb) = @_;
3595
3596 CFClient::Binder::open_binding_dialog (sub {
3597 my ($mod, $sym) = @_;
3598 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3599 $self->update_binding_widgets;
3600 $self->commit if $commit;
3601 $end_cb->() if $end_cb;
3602 });
3603}
3604
3605# $mod and $sym are the modifiers and key symbol
3606# $cmds is a array ref of strings (the commands)
3607# $cb is the callback that is executed on OK
3608# $ccb is the callback that is executed on CANCEL and
3609# when the binding was unsuccessful on OK
3610sub set_binding {
3611 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3612
3613 $self->clear_command_list;
3614 $self->{recording} = 0;
3615 $self->{rec_btn}->set_text ("start recording");
3616
3617 $self->{binding} = [$mod, $sym];
3618 $self->{commands} = $cmds;
3619
3620 $self->{binding_change} = $cb;
3621 $self->{binding_cancel} = $ccb;
3622
3623 $self->update_binding_widgets;
3624}
3625
3626# this is a shortcut method that asks for a binding
3627# and then just binds it.
3628sub do_quick_binding {
3629 my ($self, $cmds, $end_cb) = @_;
3630 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3631 $self->ask_for_bind (1, $end_cb);
3632}
3633
3634sub update_binding_widgets {
3635 my ($self) = @_;
3636 my ($mod, $sym, $cmds) = $self->get_binding;
3637 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3638 $self->set_command_list ($cmds);
3639}
3640
3641sub get_binding {
3642 my ($self) = @_;
3643 return (
3644 $self->{binding}->[0],
3645 $self->{binding}->[1],
3646 [ grep { defined $_ } @{$self->{commands}} ]
3647 );
3648}
3649
3650sub clear_command_list {
3651 my ($self) = @_;
3652 $self->{cmdbox}->clear ();
3653}
3654
3655sub set_command_list {
3656 my ($self, $cmds) = @_;
3657
3658 $self->{cmdbox}->clear ();
3659 $self->{commands} = $cmds;
3660
3661 my $idx = 0;
3662
3663 for (@$cmds) {
3664 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3665
3666 my $i = $idx;
3667 $hb->add (new CFClient::UI::Label text => $_);
3668 $hb->add (new CFClient::UI::Button
3669 text => "delete",
3670 tooltip => "Deletes the action from the record",
3671 on_activate => sub {
3672 $self->{cmdbox}->remove ($hb);
3673 $cmds->[$i] = undef;
3674 });
3675
3676
3677 $idx++
3678 }
3679}
3680
3681#############################################################################
3682
3683package CFClient::UI::SpellList;
3684
3685our @ISA = CFClient::UI::Table::;
3686
3687sub new {
3688 my $class = shift;
3689
3690 my $self = $class->SUPER::new (
3691 binding => [],
3692 commands => [],
3693 @_,
3694 )
3695}
3696
3697my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3698
3699my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3701my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3705my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3707my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3708 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3709
3710sub rebuild_spell_list {
3711 my ($self) = @_;
3712
3713 $CFClient::UI::ROOT->on_refresh ($self => sub {
3714 $self->clear;
3715
3716 return unless $::CONN;
3717
3718 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3719 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3720 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3721 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3722 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3723
3724 my $row = 0;
3725
3726 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3727 my $spell = $self->{spell}{$_};
3728
3729 $row++;
3730
3731 my $spell_cb = sub {
3732 my ($widget, $ev) = @_;
3733
3734 if ($ev->{button} == 1) {
3735 $::CONN->user_send ("cast $spell->{name}");
3736 } elsif ($ev->{button} == 2) {
3737 $::CONN->user_send ("invoke $spell->{name}");
3738 } elsif ($ev->{button} == 3) {
3739 (new CFClient::UI::Menu
3740 items => [
3741 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3742 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3743 ],
3744 )->popup ($ev);
3745 } else {
3746 return 0;
3747 }
3748
3749 1
3750 };
3751
3752 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3753
3754 #TODO: add path info to tooltip
3755 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3756
3757 $self->add (0, $row, new CFClient::UI::Face
3758 face => $spell->{face},
3759 can_hover => 1,
3760 can_events => 1,
3761 tooltip => $tooltip,
3762 on_button_down => $spell_cb,
3763 );
3764
3765 $self->add (1, $row, new CFClient::UI::Label
3766 expand => 1,
3767 text => $spell->{name},
3768 can_hover => 1,
3769 can_events => 1,
3770 tooltip => $tooltip,
3771 on_button_down => $spell_cb,
3772 );
3773
3774 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3775 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3776 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3777 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3778 }
3779 });
3780}
3781
3782sub add_spell {
3783 my ($self, $spell) = @_;
3784
3785 $self->{spell}->{$spell->{name}} = $spell;
3786 $self->rebuild_spell_list;
3787}
3788
3789sub remove_spell {
3790 my ($self, $spell) = @_;
3791
3792 delete $self->{spell}->{$spell->{name}};
3793 $self->rebuild_spell_list;
3794}
3795
3796sub clear_spells {
3797 my ($self) = @_;
3798
3799 $self->{spell} = {};
3800 $self->rebuild_spell_list;
3801}
3802
3803#############################################################################
3804
3805package CFClient::UI::Root; 4274package CFPlus::UI::Root;
3806 4275
3807our @ISA = CFClient::UI::Container::; 4276our @ISA = CFPlus::UI::Container::;
3808 4277
3809use List::Util qw(min max); 4278use List::Util qw(min max);
3810 4279
3811use CFClient::OpenGL; 4280use CFPlus::OpenGL;
3812 4281
3813sub new { 4282sub new {
3814 my $class = shift; 4283 my $class = shift;
3815 4284
3816 my $self = $class->SUPER::new ( 4285 my $self = $class->SUPER::new (
3817 visible => 1, 4286 visible => 1,
3818 @_, 4287 @_,
3819 ); 4288 );
3820 4289
3821 Scalar::Util::weaken ($self->{root} = $self); 4290 CFPlus::weaken ($self->{root} = $self);
3822 4291
3823 $self 4292 $self
3824} 4293}
3825 4294
3826sub size_request { 4295sub size_request {
… …
3874} 4343}
3875 4344
3876sub update { 4345sub update {
3877 my ($self) = @_; 4346 my ($self) = @_;
3878 4347
3879 $::WANT_REFRESH++; 4348 $::WANT_REFRESH->start;
3880} 4349}
3881 4350
3882sub add { 4351sub add {
3883 my ($self, @children) = @_; 4352 my ($self, @children) = @_;
3884 4353
… …
3921 while ($self->{refresh_hook}) { 4390 while ($self->{refresh_hook}) {
3922 $_->() 4391 $_->()
3923 for values %{delete $self->{refresh_hook}}; 4392 for values %{delete $self->{refresh_hook}};
3924 } 4393 }
3925 4394
3926 if ($self->{realloc}) { 4395 while ($self->{realloc}) {
3927 my %queue; 4396 my %queue;
3928 my @queue; 4397 my @queue;
3929 my $widget; 4398 my $widget;
3930 4399
3931 outer: 4400 outer:
… …
3978 } 4447 }
3979 } 4448 }
3980 4449
3981 delete $self->{realloc}{$widget+0}; 4450 delete $self->{realloc}{$widget+0};
3982 } 4451 }
3983 }
3984 4452
3985 while (my $size_alloc = delete $self->{size_alloc}) { 4453 while (my $size_alloc = delete $self->{size_alloc}) {
3986 my @queue = sort { $b->{visible} <=> $a->{visible} } 4454 my @queue = sort { $a->{visible} <=> $b->{visible} }
3987 values %$size_alloc; 4455 values %$size_alloc;
3988 4456
3989 while () { 4457 while () {
3990 my $widget = pop @queue || last; 4458 my $widget = pop @queue || last;
3991 4459
3992 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4460 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3993 4461
3994 $w = 0 if $w < 0; 4462 $w = max $widget->{min_w}, $w;
3995 $h = 0 if $h < 0; 4463 $h = max $widget->{min_h}, $h;
3996 4464
4465# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4466# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4467
4468 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4469 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4470
3997 $w = int $w + 0.5; 4471 $w = int $w + 0.5;
3998 $h = int $h + 0.5; 4472 $h = int $h + 0.5;
3999 4473
4000 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4474 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4001 $widget->{old_w} = $widget->{w}; 4475 $widget->{old_w} = $widget->{w};
4002 $widget->{old_h} = $widget->{h}; 4476 $widget->{old_h} = $widget->{h};
4003 4477
4004 $widget->{w} = $w; 4478 $widget->{w} = $w;
4005 $widget->{h} = $h; 4479 $widget->{h} = $h;
4006 4480
4007 $widget->emit (size_allocate => $w, $h); 4481 $widget->emit (size_allocate => $w, $h);
4482 }
4008 } 4483 }
4009 } 4484 }
4010 } 4485 }
4011 4486
4012 while ($self->{post_alloc_hook}) { 4487 while ($self->{post_alloc_hook}) {
4013 $_->() 4488 $_->()
4014 for values %{delete $self->{post_alloc_hook}}; 4489 for values %{delete $self->{post_alloc_hook}};
4015 } 4490 }
4016
4017 4491
4018 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4492 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4019 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4493 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4020 glClear GL_COLOR_BUFFER_BIT; 4494 glClear GL_COLOR_BUFFER_BIT;
4021 4495
… …
4024 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4498 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4025 glMatrixMode GL_MODELVIEW; 4499 glMatrixMode GL_MODELVIEW;
4026 glLoadIdentity; 4500 glLoadIdentity;
4027 4501
4028 { 4502 {
4029 package CFClient::UI::Base; 4503 package CFPlus::UI::Base;
4030 4504
4031 ($draw_x, $draw_y, $draw_w, $draw_h) = 4505 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4032 (0, 0, $self->{w}, $self->{h}); 4506 (0, 0, $self->{w}, $self->{h});
4033 }
4034 4507
4035 $self->_draw; 4508 $self->_draw;
4509 }
4036} 4510}
4037 4511
4038############################################################################# 4512#############################################################################
4039 4513
4040package CFClient::UI; 4514package CFPlus::UI;
4041 4515
4042$ROOT = new CFClient::UI::Root; 4516$ROOT = new CFPlus::UI::Root;
4043$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4517$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4044 4518
40451 45191
4046 4520

Diff Legend

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