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

Diff Legend

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