ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.312 by root, Fri Jun 23 23:54:30 2006 UTC vs.
Revision 1.406 by root, Sat Jul 21 23:17:35 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 { __widget_ref__ => $_[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
594 eval { $self->destroy }; 612 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614
615 delete $WIDGET{$self+0};
596} 616}
597 617
598############################################################################# 618#############################################################################
599 619
600package CFClient::UI::DrawBG; 620package CFPlus::UI::DrawBG;
601 621
602our @ISA = CFClient::UI::Base::; 622our @ISA = CFPlus::UI::Base::;
603 623
604use strict; 624use strict;
605use CFClient::OpenGL; 625use CFPlus::OpenGL;
606 626
607sub new { 627sub new {
608 my $class = shift; 628 my $class = shift;
609 629
610 # range [value, low, high, page] 630 # range [value, low, high, page]
… …
641 } 661 }
642} 662}
643 663
644############################################################################# 664#############################################################################
645 665
646package CFClient::UI::Empty; 666package CFPlus::UI::Empty;
647 667
648our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
649 669
650sub new { 670sub new {
651 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 672 $class->SUPER::new (can_events => 0, %arg);
653} 673}
… …
660 680
661sub draw { } 681sub draw { }
662 682
663############################################################################# 683#############################################################################
664 684
665package CFClient::UI::Container; 685package CFPlus::UI::Container;
666 686
667our @ISA = CFClient::UI::Base::; 687our @ISA = CFPlus::UI::Base::;
668 688
669sub new { 689sub new {
670 my ($class, %arg) = @_; 690 my ($class, %arg) = @_;
671 691
672 my $children = delete $arg{children}; 692 my $children = delete $arg{children};
… …
676 can_events => 0, 696 can_events => 0,
677 %arg, 697 %arg,
678 ); 698 );
679 699
680 $self->add (@$children) 700 $self->add (@$children)
681 if $children; 701 if $children && @$children;
682 702
683 $self 703 $self
704}
705
706sub realloc {
707 my ($self) = @_;
708
709 $self->{force_realloc} = 1;
710 $self->{force_size_alloc} = 1;
711 $self->SUPER::realloc;
684} 712}
685 713
686sub add { 714sub add {
687 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
688 716
689 $_->set_parent ($self) 717 $_->set_parent ($self)
690 for @widgets; 718 for @widgets;
691 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
692 use sort 'stable'; 721 use sort 'stable';
693 722
694 $self->{children} = [ 723 $self->{children} = [
695 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
696 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
697 ]; 726 ];
698 727
699 $self->realloc; 728 $self->realloc;
729
730 map $_+0, @widgets
700} 731}
701 732
702sub children { 733sub children {
703 @{ $_[0]{children} } 734 @{ $_[0]{children} }
704} 735}
… …
715} 746}
716 747
717sub clear { 748sub clear {
718 my ($self) = @_; 749 my ($self) = @_;
719 750
720 my $children = delete $self->{children}; 751 my $children = $self->{children};
721 $self->{children} = []; 752 $self->{children} = [];
722 753
723 for (@$children) { 754 for (@$children) {
724 delete $_->{parent}; 755 delete $_->{parent};
725 $_->hide; 756 $_->hide;
… …
750 $_->draw for @{$self->{children}}; 781 $_->draw for @{$self->{children}};
751} 782}
752 783
753############################################################################# 784#############################################################################
754 785
755package CFClient::UI::Bin; 786package CFPlus::UI::Bin;
756 787
757our @ISA = CFClient::UI::Container::; 788our @ISA = CFPlus::UI::Container::;
758 789
759sub new { 790sub new {
760 my ($class, %arg) = @_; 791 my ($class, %arg) = @_;
761 792
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 793 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 794
764 $class->SUPER::new (children => [$child], %arg) 795 $class->SUPER::new (children => [$child], %arg)
765} 796}
766 797
767sub add { 798sub add {
… …
774sub remove { 805sub remove {
775 my ($self, $widget) = @_; 806 my ($self, $widget) = @_;
776 807
777 $self->SUPER::remove ($widget); 808 $self->SUPER::remove ($widget);
778 809
779 $self->{children} = [new CFClient::UI::Empty] 810 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 811 unless @{$self->{children}};
781} 812}
782 813
783sub child { $_[0]->{children}[0] } 814sub child { $_[0]->{children}[0] }
784 815
… …
796 827
797############################################################################# 828#############################################################################
798 829
799# back-buffered drawing area 830# back-buffered drawing area
800 831
801package CFClient::UI::Window; 832package CFPlus::UI::Window;
802 833
803our @ISA = CFClient::UI::Bin::; 834our @ISA = CFPlus::UI::Bin::;
804 835
805use CFClient::OpenGL; 836use CFPlus::OpenGL;
806 837
807sub new { 838sub new {
808 my ($class, %arg) = @_; 839 my ($class, %arg) = @_;
809 840
810 my $self = $class->SUPER::new (%arg); 841 my $self = $class->SUPER::new (%arg);
… …
832} 863}
833 864
834sub render_child { 865sub render_child {
835 my ($self) = @_; 866 my ($self) = @_;
836 867
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 868 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 869 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 870 glClear GL_COLOR_BUFFER_BIT;
840 871
841 { 872 {
842 package CFClient::UI::Base; 873 package CFPlus::UI::Base;
843 874
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 875 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 876 (0, 0, $self->{w}, $self->{h});
877
878 $self->_render;
846 } 879 }
847
848 $self->_render;
849 }; 880 };
850} 881}
851 882
852sub _draw { 883sub _draw {
853 my ($self) = @_; 884 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 885
857 my $tex = $self->{texture} 886 my $tex = $self->{texture}
858 or return; 887 or return;
859 888
860 glEnable GL_TEXTURE_2D; 889 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 890 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 891 glColor 0, 0, 0, 1;
863 892
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 893 $tex->draw_quad_alpha_premultiplied (0, 0);
865 894
866 glDisable GL_TEXTURE_2D; 895 glDisable GL_TEXTURE_2D;
867} 896}
868 897
869############################################################################# 898#############################################################################
870 899
871package CFClient::UI::ViewPort; 900package CFPlus::UI::ViewPort;
872 901
902use List::Util qw(min max);
903
873our @ISA = CFClient::UI::Window::; 904our @ISA = CFPlus::UI::Window::;
874 905
875sub new { 906sub new {
876 my $class = shift; 907 my $class = shift;
877 908
878 $class->SUPER::new ( 909 $class->SUPER::new (
… …
885sub size_request { 916sub size_request {
886 my ($self) = @_; 917 my ($self) = @_;
887 918
888 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 919 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
889 920
890 $w = 10 if $self->{scroll_x}; 921 $w = 1 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y}; 922 $h = 1 if $self->{scroll_y};
892 923
893 ($w, $h) 924 ($w, $h)
894} 925}
895 926
896sub invoke_size_allocate { 927sub invoke_size_allocate {
… …
908} 939}
909 940
910sub set_offset { 941sub set_offset {
911 my ($self, $x, $y) = @_; 942 my ($self, $x, $y) = @_;
912 943
944 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
945 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
946
947 if ($x != $self->{view_x} or $y != $self->{view_y}) {
913 $self->{view_x} = int $x; 948 $self->{view_x} = $x;
914 $self->{view_y} = int $y; 949 $self->{view_y} = $y;
915 950
951 $self->emit (changed => $x, $y);
916 $self->update; 952 $self->update;
953 }
917} 954}
918 955
919# hmm, this does not work for topleft of $self... but we should not ask for that 956# hmm, this does not work for topleft of $self... but we should not ask for that
920sub coord2local { 957sub coord2local {
921 my ($self, $x, $y) = @_; 958 my ($self, $x, $y) = @_;
… …
936 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
937 974
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 976 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 977 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 978 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 979 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 980 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 981 }
945} 982}
946 983
947sub _render { 984sub _render {
948 my ($self) = @_; 985 my ($self) = @_;
949 986
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 987 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}; 988 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 989
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 990 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 991
955 $self->SUPER::_render; 992 $self->SUPER::_render;
956} 993}
957 994
958############################################################################# 995#############################################################################
959 996
960package CFClient::UI::ScrolledWindow; 997package CFPlus::UI::ScrolledWindow;
961 998
962our @ISA = CFClient::UI::HBox::; 999our @ISA = CFPlus::UI::Table::;
963 1000
964sub new { 1001sub new {
965 my ($class, %arg) = @_; 1002 my ($class, %arg) = @_;
966 1003
967 my $child = delete $arg{child}; 1004 my $child = delete $arg{child};
968 1005
969 my $self; 1006 my $self;
970 1007
971 my $slider = new CFClient::UI::Slider 1008 my $hslider = new CFPlus::UI::Slider
1009 col => 0,
1010 row => 1,
1011 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub {
1014 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 },
1017 ;
1018
1019 my $vslider = new CFPlus::UI::Slider
1020 col => 1,
1021 row => 0,
972 vertical => 1, 1022 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1024 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1025 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1027 },
977 ; 1028 ;
978 1029
979 $self = $class->SUPER::new ( 1030 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1031 scroll_x => 0,
1032 scroll_y => 1,
1033 can_events => 1,
981 slider => $slider, 1034 hslider => $hslider,
1035 vslider => $vslider,
1036 col_expand => [1, 0],
1037 row_expand => [1, 0],
982 %arg, 1038 %arg,
983 ); 1039 );
984 1040
1041 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0,
1043 row => 0,
1044 expand => 1,
1045 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y},
1047 on_changed => sub {
1048 my ($vp, $x, $y) = @_;
1049
1050 $vp->{parent}{hslider}->set_value ($x);
1051 $vp->{parent}{vslider}->set_value ($y);
1052
1053 0
1054 },
1055 on_size_allocate => sub {
1056 my ($vp, $w, $h) = @_;
1057 $vp->{parent}->update_slider;
1058 0
1059 },
1060 ;
1061
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1062 $self->SUPER::add ($self->{vp});
1063
986 $self->add ($child) if $child; 1064 $self->add ($child) if $child;
987 1065
988 $self 1066 $self
989} 1067}
990 1068
… …
992 my ($self, $widget) = @_; 1070 my ($self, $widget) = @_;
993 1071
994 $self->{vp}->add ($self->{child} = $widget); 1072 $self->{vp}->add ($self->{child} = $widget);
995} 1073}
996 1074
997sub update { 1075sub update_slider {
1076 my ($self) = @_;
1077
1078 my $child = ($self->{vp} or return)->child;
1079
1080 if ($self->{scroll_x}) {
1081 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1082 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1083
1084 my $visible = $w1 > $w2;
1085 if ($visible != $self->{hslider_visible}) {
1086 $self->{hslider_visible} = $visible;
1087 $visible ? $self->SUPER::add ($self->{hslider})
1088 : $self->SUPER::remove ($self->{hslider});
1089 }
1090 }
1091
1092 if ($self->{scroll_y}) {
1093 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1094 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1095
1096 my $visible = $h1 > $h2;
1097 if ($visible != $self->{vslider_visible}) {
1098 $self->{vslider_visible} = $visible;
1099 $visible ? $self->SUPER::add ($self->{vslider})
1100 : $self->SUPER::remove ($self->{vslider});
1101 }
1102 }
1103}
1104
1105sub start_dragging {
998 my ($self) = @_; 1106 my ($self, $ev) = @_;
999 1107
1000 $self->SUPER::update; 1108 $self->grab_focus;
1001 1109
1002 # todo: overwrite size_allocate of child 1110 my $ox = $self->{vp}{view_x};
1003 my $child = $self->{vp}->child; 1111 my $oy = $self->{vp}{view_y};
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1112
1113 $self->{motion} = sub {
1114 my ($ev, $x, $y) = @_;
1115
1116 $ox -= $ev->{xrel};
1117 $oy -= $ev->{yrel};
1118
1119 $self->{vp}->set_offset ($ox, $oy);
1120 };
1121}
1122
1123sub invoke_mouse_wheel {
1124 my ($self, $ev) = @_;
1125
1126 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1127 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1128
1129 1
1130}
1131
1132sub invoke_button_down {
1133 my ($self, $ev, $x, $y) = @_;
1134
1135 if ($ev->{button} == 2) {
1136 $self->start_dragging ($ev);
1137 return 1;
1138 }
1139
1140 0
1141}
1142
1143sub invoke_button_up {
1144 my ($self, $ev, $x, $y) = @_;
1145
1146 if (delete $self->{motion}) {
1147 return 1;
1148 }
1149
1150 0
1151}
1152
1153sub invoke_mouse_motion {
1154 my ($self, $ev, $x, $y) = @_;
1155
1156 if ($self->{motion}) {
1157 $self->{motion}->($ev, $x, $y);
1158 return 1;
1159 }
1160
1161 0
1005} 1162}
1006 1163
1007sub invoke_size_allocate { 1164sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1165 my ($self, $w, $h) = @_;
1009 1166
1010 my $child = $self->{vp}->child; 1167 $self->update_slider;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013 $self->SUPER::invoke_size_allocate ($w, $h) 1168 $self->SUPER::invoke_size_allocate ($w, $h)
1014} 1169}
1015 1170
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018
1019############################################################################# 1171#############################################################################
1020 1172
1021package CFClient::UI::Frame; 1173package CFPlus::UI::Frame;
1022 1174
1023our @ISA = CFClient::UI::Bin::; 1175our @ISA = CFPlus::UI::Bin::;
1024 1176
1025use CFClient::OpenGL; 1177use CFPlus::OpenGL;
1026 1178
1027sub new { 1179sub new {
1028 my $class = shift; 1180 my $class = shift;
1029 1181
1030 $class->SUPER::new ( 1182 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1208 $self->SUPER::_draw;
1057} 1209}
1058 1210
1059############################################################################# 1211#############################################################################
1060 1212
1061package CFClient::UI::FancyFrame; 1213package CFPlus::UI::FancyFrame;
1062 1214
1063our @ISA = CFClient::UI::Bin::; 1215our @ISA = CFPlus::UI::Bin::;
1064 1216
1065use CFClient::OpenGL; 1217use CFPlus::OpenGL;
1218
1219sub new {
1220 my ($class, %arg) = @_;
1221
1222 if ((exists $arg{label}) && !ref $arg{label}) {
1223 $arg{label} = new CFPlus::UI::Label
1224 align => 1,
1225 valign => 0,
1226 text => $arg{label},
1227 fontsize => ($arg{border} || 0.8) * 0.75;
1228 }
1229
1230 my $self = $class->SUPER::new (
1231 # label => "",
1232 fg => [0.6, 0.3, 0.1],
1233 border => 0.8,
1234 style => 'single',
1235 %arg,
1236 );
1237
1238 $self
1239}
1240
1241sub add {
1242 my ($self, @widgets) = @_;
1243
1244 $self->SUPER::add (@widgets);
1245 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1246}
1247
1248sub border {
1249 int $_[0]{border} * $::FONTSIZE
1250}
1251
1252sub size_request {
1253 my ($self) = @_;
1254
1255 ($self->{label_w}, undef) = $self->{label}->size_request
1256 if $self->{label};
1257
1258 my ($w, $h) = $self->SUPER::size_request;
1259
1260 (
1261 $w + $self->border * 2,
1262 $h + $self->border * 2,
1263 )
1264}
1265
1266sub invoke_size_allocate {
1267 my ($self, $w, $h) = @_;
1268
1269 my $border = $self->border;
1270
1271 $w -= List::Util::max 0, $border * 2;
1272 $h -= List::Util::max 0, $border * 2;
1273
1274 if (my $label = $self->{label}) {
1275 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1276 $label->{h} = List::Util::min $h, $border;
1277 $label->invoke_size_allocate ($label->{w}, $label->{h});
1278 }
1279
1280 $self->child->configure ($border, $border, $w, $h);
1281
1282 1
1283}
1284
1285sub _draw {
1286 my ($self) = @_;
1287
1288 my $child = $self->{children}[0];
1289
1290 my $border = $self->border;
1291 my ($w, $h) = ($self->{w}, $self->{h});
1292
1293 $child->draw;
1294
1295 glColor @{$self->{fg}};
1296 glBegin GL_LINE_STRIP;
1297 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1298 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1299 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1300 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1301 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1302 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1303 glEnd;
1304
1305 if ($self->{label}) {
1306 glTranslate $border * 2, 0;
1307 $self->{label}->_draw;
1308 }
1309}
1310
1311#############################################################################
1312
1313package CFPlus::UI::Toplevel;
1314
1315our @ISA = CFPlus::UI::Bin::;
1316
1317use CFPlus::OpenGL;
1066 1318
1067my $bg = 1319my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1320 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1321 mipmap => 1, wrap => 1;
1070 1322
1071my @border = 1323my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1324 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1325 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1326
1327my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png);
1074 1330
1075sub new { 1331sub new {
1076 my ($class, %arg) = @_; 1332 my ($class, %arg) = @_;
1077 1333
1078 my $self = $class->SUPER::new ( 1334 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1335 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1336 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1337 border => 0.6,
1082 can_events => 1, 1338 can_events => 1,
1083 min_w => 16, 1339 min_w => 64,
1084 min_h => 16, 1340 min_h => 32,
1085 %arg, 1341 %arg,
1086 ); 1342 );
1087 1343
1088 $self->{title_widget} = new CFClient::UI::Label 1344 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1345 align => 0,
1090 valign => 1, 1346 valign => 1,
1091 text => $self->{title}, 1347 text => $self->{title},
1092 fontsize => $self->{border}, 1348 fontsize => $self->{border},
1093 if exists $self->{title}; 1349 if exists $self->{title};
1094 1350
1095 if ($self->{has_close_button}) { 1351 if ($self->{has_close_button}) {
1096 $self->{close_button} = 1352 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1353 new CFPlus::UI::ImageButton
1098 path => 'x1_close.png', 1354 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1355 on_activate => sub { $self->emit ("delete") };
1100 1356
1101 $self->CFClient::UI::Container::add ($self->{close_button}); 1357 $self->CFPlus::UI::Container::add ($self->{close_button});
1102 } 1358 }
1103 1359
1104 $self 1360 $self
1105} 1361}
1106 1362
1107sub add { 1363sub add {
1108 my ($self, @widgets) = @_; 1364 my ($self, @widgets) = @_;
1109 1365
1110 $self->SUPER::add (@widgets); 1366 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1367 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1368 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1369}
1114 1370
1115sub border { 1371sub border {
1116 int $_[0]{border} * $::FONTSIZE 1372 int $_[0]{border} * $::FONTSIZE
1117} 1373}
… …
1150 $self->child->configure ($border, $border, $w, $h); 1406 $self->child->configure ($border, $border, $w, $h);
1151 1407
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1408 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button}; 1409 if $self->{close_button};
1154 1410
1411 1
1412}
1413
1414sub invoke_delete {
1415 my ($self) = @_;
1416
1417 $self->hide;
1418
1155 1 1419 1
1156} 1420}
1157 1421
1158sub invoke_button_down { 1422sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1423 my ($self, $ev, $x, $y) = @_;
… …
1217 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1481 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218 1482
1219 ! ! $self->{motion} 1483 ! ! $self->{motion}
1220} 1484}
1221 1485
1486sub invoke_visibility_change {
1487 my ($self, $visible) = @_;
1488
1489 delete $self->{motion} unless $visible;
1490
1491 0
1492}
1493
1222sub _draw { 1494sub _draw {
1223 my ($self) = @_; 1495 my ($self) = @_;
1224 1496
1225 my $child = $self->{children}[0]; 1497 my $child = $self->{children}[0];
1226 1498
… …
1231 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1232 1504
1233 my $border = $self->border; 1505 my $border = $self->border;
1234 1506
1235 glColor @{ $self->{border_bg} }; 1507 glColor @{ $self->{border_bg} };
1236 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1237 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1238 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1239 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1511 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1512
1513 # move
1514 my $w2 = ($w - $border) * .5;
1515 my $h2 = ($h - $border) * .5;
1516 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1517 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1518 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1519
1520 # resize
1521 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1522 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1523 unless $self->{has_close_button};
1524 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1525 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1240 1526
1241 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1242 glColor @{ $self->{bg} }; 1528 glColor @{ $self->{bg} };
1243 1529
1244 # TODO: repeat texture not scale 1530 # TODO: repeat texture not scale
… …
1263 if $self->{close_button}; 1549 if $self->{close_button};
1264} 1550}
1265 1551
1266############################################################################# 1552#############################################################################
1267 1553
1268package CFClient::UI::Table; 1554package CFPlus::UI::Table;
1269 1555
1270our @ISA = CFClient::UI::Base::; 1556our @ISA = CFPlus::UI::Container::;
1271 1557
1272use List::Util qw(max sum); 1558use List::Util qw(max sum);
1273 1559
1274use CFClient::OpenGL; 1560use CFPlus::OpenGL;
1275 1561
1276sub new { 1562sub new {
1277 my $class = shift; 1563 my $class = shift;
1278 1564
1279 $class->SUPER::new ( 1565 $class->SUPER::new (
1280 col_expand => [], 1566 col_expand => [],
1567 row_expand => [],
1281 @_, 1568 @_,
1282 ) 1569 )
1283} 1570}
1284 1571
1285sub children {
1286 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1287}
1288
1289sub add { 1572sub add {
1290 my ($self, $x, $y, $child) = @_; 1573 my ($self, @widgets) = @_;
1291 1574
1292 $child->set_parent ($self); 1575 for my $child (@widgets) {
1293 $self->{children}[$y][$x] = $child; 1576 $child->{rowspan} ||= 1;
1577 $child->{colspan} ||= 1;
1578 }
1294 1579
1295 $self->realloc; 1580 $self->SUPER::add (@widgets);
1296} 1581}
1297 1582
1298sub remove { 1583sub add_at {
1584 my $self = shift;
1585
1586 my @widgets;
1587
1588 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, ();
1590
1591 $child->{row} = $row;
1592 $child->{col} = $col;
1593
1594 push @widgets, $child;
1595 }
1596
1597 $self->add (@widgets);
1598}
1599
1600sub get_wh {
1299 my ($self, $child) = @_; 1601 my ($self) = @_;
1300 1602
1301 # TODO: not yet implemented 1603 my (@w, @h);
1302}
1303
1304# TODO: move to container class maybe? send children a signal on removal?
1305sub clear {
1306 my ($self) = @_;
1307 1604
1308 my @children = $self->children; 1605 my @children = $self->children;
1309 delete $self->{children}; 1606
1607 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1610
1611 my $sw = sum @w[$c .. $c + $cs - 1];
1612
1613 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 }
1310 1616 }
1311 for (@children) {
1312 delete $_->{parent};
1313 $_->hide;
1314 }
1315 1617
1316 $self->realloc; 1618 # second pass, rows
1317} 1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1318
1319sub get_wh {
1320 my ($self) = @_;
1321
1322 my (@w, @h);
1323
1324 for my $y (0 .. $#{$self->{children}}) {
1325 my $row = $self->{children}[$y]
1326 or next;
1327
1328 for my $x (0 .. $#$row) {
1329 my $widget = $row->[$x]
1330 or next;
1331 my ($w, $h) = @$widget{qw(req_w req_h)}; 1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1332 1621
1333 $w[$x] = max $w[$x], $w; 1622 my $sh = sum @h[$r .. $r + $rs - 1];
1334 $h[$y] = max $h[$y], $h; 1623
1624 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1335 } 1626 }
1336 } 1627 }
1337 1628
1338 (\@w, \@h) 1629 (\@w, \@h)
1339} 1630}
… …
1355 my ($ws, $hs) = $self->get_wh; 1646 my ($ws, $hs) = $self->get_wh;
1356 1647
1357 my $req_w = (sum @$ws) || 1; 1648 my $req_w = (sum @$ws) || 1;
1358 my $req_h = (sum @$hs) || 1; 1649 my $req_h = (sum @$hs) || 1;
1359 1650
1360 # TODO: nicer code && do row_expand 1651 # now linearly scale the rows/columns to the allocated size
1361 my @col_expand = @{$self->{col_expand}}; 1652 my @col_expand = @{$self->{col_expand}};
1362 @col_expand = (1) x @$ws unless @col_expand; 1653 @col_expand = (1) x @$ws unless @col_expand;
1363 my $col_expand = (sum @col_expand) || 1; 1654 my $col_expand = (sum @col_expand) || 1;
1364 1655
1365 # linearly scale sizes
1366 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1367 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1368 1657
1369 CFClient::UI::harmonize $ws; 1658 CFPlus::UI::harmonize $ws;
1659
1660 my @row_expand = @{$self->{row_expand}};
1661 @row_expand = (1) x @$ws unless @row_expand;
1662 my $row_expand = (sum @row_expand) || 1;
1663
1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665
1370 CFClient::UI::harmonize $hs; 1666 CFPlus::UI::harmonize $hs;
1371 1667
1372 my $y; 1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1373 1670
1374 for my $r (0 .. $#{$self->{children}}) { 1671 for my $widget ($self->children) {
1375 my $row = $self->{children}[$r] 1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1376 or next;
1377 1673
1378 my $x = 0; 1674 $widget->configure (
1379 my $row_h = $hs->[$r]; 1675 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1380 1677 );
1381 for my $c (0 .. $#$row) { 1678 }
1382 my $col_w = $ws->[$c];
1383 1679
1384 if (my $widget = $row->[$c]) { 1680 1
1385 $widget->configure ($x, $y, $col_w, $row_h); 1681}
1386 }
1387 1682
1388 $x += $col_w; 1683#############################################################################
1684
1685package CFPlus::UI::Fixed;
1686
1687use List::Util qw(min max);
1688
1689our @ISA = CFPlus::UI::Container::;
1690
1691sub add_fixed {
1692 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1693
1694 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1695 $self->SUPER::add ($child);
1696}
1697
1698sub _scale($$$) {
1699 my ($mode, $val, $max) = @_;
1700
1701 $mode eq "abs" ? $val
1702 : $mode eq "rel" ? $val * $max
1703 : 0
1704}
1705
1706sub size_request {
1707 my ($self) = @_;
1708
1709 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1710
1711 # determine overall size by querying abs widgets
1712 for my $child ($self->visible_children) {
1713 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1714
1715 if ($pos eq "abs") {
1716 $w = _scale $size, $w, $child->{req_w};
1717 $h = _scale $size, $h, $child->{req_h};
1718
1719 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1720 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1389 } 1721 }
1722 }
1390 1723
1391 $y += $row_h; 1724 my $W = $x2 - $x1;
1725 my $H = $y2 - $y1;
1726
1727 # now layout remaining widgets
1728 for my $child ($self->visible_children) {
1729 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1730
1731 if ($pos ne "abs") {
1732 $x = _scale $pos, $x, $W;
1733 $y = _scale $pos, $x, $H;
1734 $w = _scale $size, $w, $child->{req_w};
1735 $h = _scale $size, $h, $child->{req_h};
1736
1737 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1738 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1739 }
1740 }
1741
1742 my $W = $x2 - $x1;
1743 my $H = $y2 - $y1;
1744
1745 ($W, $H)
1746}
1747
1748sub invoke_size_allocate {
1749 my ($self, $W, $H) = @_;
1750
1751 for my $child ($self->visible_children) {
1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1753
1754 $x = _scale $pos, $x, $W;
1755 $y = _scale $pos, $x, $H;
1756 $w = _scale $size, $w, $W;
1757 $h = _scale $size, $h, $H;
1758
1759 $child->configure ($x, $y, $w, $h);
1392 } 1760 }
1393 1761
1394 1 1762 1
1395} 1763}
1396 1764
1397sub find_widget {
1398 my ($self, $x, $y) = @_;
1399
1400 $x -= $self->{x};
1401 $y -= $self->{y};
1402
1403 my $res;
1404
1405 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1406 $res = $_->find_widget ($x, $y)
1407 and return $res;
1408 }
1409
1410 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1411}
1412
1413sub _draw {
1414 my ($self) = @_;
1415
1416 for (grep $_, @{$self->{children}}) {
1417 $_->draw for grep $_, @$_;
1418 }
1419}
1420
1421############################################################################# 1765#############################################################################
1422 1766
1423package CFClient::UI::Box; 1767package CFPlus::UI::Box;
1424 1768
1425our @ISA = CFClient::UI::Container::; 1769our @ISA = CFPlus::UI::Container::;
1426 1770
1427sub size_request { 1771sub size_request {
1428 my ($self) = @_; 1772 my ($self) = @_;
1429 1773
1430 $self->{vertical} 1774 $self->{vertical}
… …
1463 $req[$_] += $space * $children[$_]{expand} 1807 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#children; 1808 for 0 .. $#children;
1465 } 1809 }
1466 } 1810 }
1467 1811
1468 CFClient::UI::harmonize \@req; 1812 CFPlus::UI::harmonize \@req;
1469 1813
1470 my $pos = 0; 1814 my $pos = 0;
1471 for (0 .. $#children) { 1815 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1816 my $alloc = $req[$_];
1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1817 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1478 1 1822 1
1479} 1823}
1480 1824
1481############################################################################# 1825#############################################################################
1482 1826
1483package CFClient::UI::HBox; 1827package CFPlus::UI::HBox;
1484 1828
1485our @ISA = CFClient::UI::Box::; 1829our @ISA = CFPlus::UI::Box::;
1486 1830
1487sub new { 1831sub new {
1488 my $class = shift; 1832 my $class = shift;
1489 1833
1490 $class->SUPER::new ( 1834 $class->SUPER::new (
… …
1493 ) 1837 )
1494} 1838}
1495 1839
1496############################################################################# 1840#############################################################################
1497 1841
1498package CFClient::UI::VBox; 1842package CFPlus::UI::VBox;
1499 1843
1500our @ISA = CFClient::UI::Box::; 1844our @ISA = CFPlus::UI::Box::;
1501 1845
1502sub new { 1846sub new {
1503 my $class = shift; 1847 my $class = shift;
1504 1848
1505 $class->SUPER::new ( 1849 $class->SUPER::new (
… …
1508 ) 1852 )
1509} 1853}
1510 1854
1511############################################################################# 1855#############################################################################
1512 1856
1513package CFClient::UI::Label; 1857package CFPlus::UI::Label;
1514 1858
1515our @ISA = CFClient::UI::DrawBG::; 1859our @ISA = CFPlus::UI::DrawBG::;
1516 1860
1517use CFClient::OpenGL; 1861use CFPlus::OpenGL;
1518 1862
1519sub new { 1863sub new {
1520 my ($class, %arg) = @_; 1864 my ($class, %arg) = @_;
1521 1865
1522 my $self = $class->SUPER::new ( 1866 my $self = $class->SUPER::new (
… …
1525 #active_bg => none 1869 #active_bg => none
1526 #font => default_font 1870 #font => default_font
1527 #text => initial text 1871 #text => initial text
1528 #markup => initial narkup 1872 #markup => initial narkup
1529 #max_w => maximum pixel width 1873 #max_w => maximum pixel width
1874 #style => 0, # render flags
1530 ellipsise => 3, # end 1875 ellipsise => 3, # end
1531 layout => (new CFClient::Layout), 1876 layout => (new CFPlus::Layout),
1532 fontsize => 1, 1877 fontsize => 1,
1533 align => -1, 1878 align => -1,
1534 valign => -1, 1879 valign => -1,
1535 padding_x => 2, 1880 padding_x => 2,
1536 padding_y => 2, 1881 padding_y => 2,
1537 can_events => 0, 1882 can_events => 0,
1538 %arg 1883 %arg
1539 ); 1884 );
1540 1885
1541 if (exists $self->{template}) { 1886 if (exists $self->{template}) {
1542 my $layout = new CFClient::Layout; 1887 my $layout = new CFPlus::Layout;
1543 $layout->set_text (delete $self->{template}); 1888 $layout->set_text (delete $self->{template});
1544 $self->{template} = $layout; 1889 $self->{template} = $layout;
1545 } 1890 }
1546 1891
1547 if (exists $self->{markup}) { 1892 if (exists $self->{markup}) {
… …
1551 } 1896 }
1552 1897
1553 $self 1898 $self
1554} 1899}
1555 1900
1556sub escape($) {
1557 local $_ = $_[0];
1558
1559 s/&/&amp;/g;
1560 s/>/&gt;/g;
1561 s/</&lt;/g;
1562
1563 $_
1564}
1565
1566sub update { 1901sub update {
1567 my ($self) = @_; 1902 my ($self) = @_;
1568 1903
1569 delete $self->{texture}; 1904 delete $self->{texture};
1570 $self->SUPER::update; 1905 $self->SUPER::update;
… …
1581 my ($self, $text) = @_; 1916 my ($self, $text) = @_;
1582 1917
1583 return if $self->{text} eq "T$text"; 1918 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1919 $self->{text} = "T$text";
1585 1920
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1921 $self->{layout}->set_text ($text);
1588 1922
1589 delete $self->{size_req}; 1923 delete $self->{size_req};
1590 $self->realloc; 1924 $self->realloc;
1591 $self->update; 1925 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1931 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1932 $self->{text} = "M$markup";
1599 1933
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1934 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1935
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1936 $self->{layout}->set_markup ($markup);
1604 1937
1605 delete $self->{size_req}; 1938 delete $self->{size_req};
1606 $self->realloc; 1939 $self->realloc;
1607 $self->update; 1940 $self->update;
… …
1619 1952
1620 my ($w, $h) = $self->{layout}->size; 1953 my ($w, $h) = $self->{layout}->size;
1621 1954
1622 if (exists $self->{template}) { 1955 if (exists $self->{template}) {
1623 $self->{template}->set_font ($self->{font}) if $self->{font}; 1956 $self->{template}->set_font ($self->{font}) if $self->{font};
1957 $self->{template}->set_width ($self->{max_w} || -1);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1958 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1959
1626 my ($w2, $h2) = $self->{template}->size; 1960 my ($w2, $h2) = $self->{template}->size;
1627 1961
1628 $w = List::Util::max $w, $w2; 1962 $w = List::Util::max $w, $w2;
… …
1652 1986
1653sub set_fontsize { 1987sub set_fontsize {
1654 my ($self, $fontsize) = @_; 1988 my ($self, $fontsize) = @_;
1655 1989
1656 $self->{fontsize} = $fontsize; 1990 $self->{fontsize} = $fontsize;
1991 delete $self->{size_req};
1657 delete $self->{texture}; 1992 delete $self->{texture};
1658 1993
1659 $self->realloc; 1994 $self->realloc;
1660} 1995}
1661 1996
1662sub reconfigure { 1997sub reconfigure {
1663 my ($self) = @_; 1998 my ($self) = @_;
1664 1999
1665 delete $self->{size_req}; 2000 delete $self->{size_req};
2001 delete $self->{texture};
1666 2002
1667 $self->SUPER::reconfigure; 2003 $self->SUPER::reconfigure;
1668} 2004}
1669 2005
1670sub _draw { 2006sub _draw {
1671 my ($self) = @_; 2007 my ($self) = @_;
1672 2008
1673 $self->SUPER::_draw; # draw background, if applicable 2009 $self->SUPER::_draw; # draw background, if applicable
1674 2010
1675 my $tex = $self->{texture} ||= do { 2011 my $size = $self->{texture} ||= do {
1676 $self->{layout}->set_foreground (@{$self->{fg}}); 2012 $self->{layout}->set_foreground (@{$self->{fg}});
1677 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2013 $self->{layout}->set_font ($self->{font}) if $self->{font};
1678 $self->{layout}->set_width ($self->{w}); 2014 $self->{layout}->set_width ($self->{w});
1679 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2015 $self->{layout}->set_ellipsise ($self->{ellipsise});
1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2016 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2017 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682 2018
1683 new_from_layout CFClient::Texture $self->{layout} 2019 [$self->{layout}->size]
1684 }; 2020 };
1685 2021
1686 unless (exists $self->{ox}) { 2022 unless (exists $self->{ox}) {
1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2023 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2024 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689 : ($self->{w} - $tex->{w}) * 0.5); 2025 : ($self->{w} - $size->[0]) * 0.5);
1690 2026
1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693 : ($self->{h} - $tex->{h}) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
1694 }; 2030 };
1695 2031
1696 glEnable GL_TEXTURE_2D; 2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1700
1701 if ($tex->{format} == GL_ALPHA) {
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1703 glColor @{$self->{fg}};
1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1708 }
1709
1710 glDisable GL_TEXTURE_2D;
1711} 2033}
1712 2034
1713############################################################################# 2035#############################################################################
1714 2036
1715package CFClient::UI::EntryBase; 2037package CFPlus::UI::EntryBase;
1716 2038
1717our @ISA = CFClient::UI::Label::; 2039our @ISA = CFPlus::UI::Label::;
1718 2040
1719use CFClient::OpenGL; 2041use CFPlus::OpenGL;
1720 2042
1721sub new { 2043sub new {
1722 my $class = shift; 2044 my $class = shift;
1723 2045
1724 $class->SUPER::new ( 2046 $class->SUPER::new (
… …
1728 active_fg => [0, 0, 0], 2050 active_fg => [0, 0, 0],
1729 can_hover => 1, 2051 can_hover => 1,
1730 can_focus => 1, 2052 can_focus => 1,
1731 valign => 0, 2053 valign => 0,
1732 can_events => 1, 2054 can_events => 1,
2055 ellipsise => 0,
1733 #text => ... 2056 #text => ...
1734 #hidden => "*", 2057 #hidden => "*",
1735 @_ 2058 @_
1736 ) 2059 )
1737} 2060}
… …
1782 my $sym = $ev->{sym}; 2105 my $sym = $ev->{sym};
1783 my $uni = $ev->{unicode}; 2106 my $uni = $ev->{unicode};
1784 2107
1785 my $text = $self->get_text; 2108 my $text = $self->get_text;
1786 2109
2110 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2111
1787 if ($uni == 8) { 2112 if ($uni == 8) {
1788 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2113 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789 } elsif ($uni == 127) { 2114 } elsif ($uni == 127) {
1790 substr $text, $self->{cursor}, 1, ""; 2115 substr $text, $self->{cursor}, 1, "";
1791 } elsif ($sym == CFClient::SDLK_LEFT) { 2116 } elsif ($sym == CFPlus::SDLK_LEFT) {
1792 --$self->{cursor} if $self->{cursor}; 2117 --$self->{cursor} if $self->{cursor};
1793 } elsif ($sym == CFClient::SDLK_RIGHT) { 2118 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1794 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2119 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1795 } elsif ($sym == CFClient::SDLK_HOME) { 2120 } elsif ($sym == CFPlus::SDLK_HOME) {
2121 # what a hack
2122 $self->{cursor} =
2123 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2124 ? length $1
2125 : 0;
2126 } elsif ($sym == CFPlus::SDLK_END) {
2127 # uh, again
2128 $self->{cursor} =
2129 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2130 ? $self->{cursor} + length $1
2131 : length $self->{text};
2132 } elsif ($uni == 21) { # ctrl-u
2133 $text = "";
1796 $self->{cursor} = 0; 2134 $self->{cursor} = 0;
1797 } elsif ($sym == CFClient::SDLK_END) {
1798 $self->{cursor} = length $text;
1799 } elsif ($uni == 27) { 2135 } elsif ($uni == 27) {
1800 $self->emit ('escape'); 2136 $self->emit ('escape');
1801 } elsif ($uni) { 2137 } elsif ($uni == 0x0d) {
2138 substr $text, $self->{cursor}++, 0, "\012";
2139 } elsif ($uni >= 0x20) {
1802 substr $text, $self->{cursor}++, 0, chr $uni; 2140 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else { 2141 } else {
1804 return 0; 2142 return 0;
1805 } 2143 }
1806 2144
1807 $self->_set_text ($text); 2145 $self->_set_text ($text);
1808 2146
1809 $self->realloc; 2147 $self->realloc;
2148 $self->update;
1810 2149
1811 1 2150 1
1812} 2151}
1813 2152
1814sub invoke_focus_in { 2153sub invoke_focus_in {
… …
1826 2165
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 2166 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 2167
1829 # byte-index to char-index 2168 # byte-index to char-index
1830 my $text = $self->{text}; 2169 my $text = $self->{text};
1831 utf8::encode $text; 2170 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 2171 $self->{cursor} = length $text;
1833 2172
1834 $self->_set_text ($self->{text}); 2173 $self->_set_text ($self->{text});
1835 $self->update; 2174 $self->update;
1836 2175
1837 1 2176 1
… …
1876 utf8::encode $text; 2215 utf8::encode $text;
1877 2216
1878 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2217 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879 } 2218 }
1880 2219
1881 glColor @{$self->{fg}};
1882 glBegin GL_LINES; 2220 glBegin GL_LINES;
1883 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2221 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1884 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885 glEnd; 2223 glEnd;
1886 } 2224 }
1887} 2225}
1888 2226
2227#############################################################################
2228
1889package CFClient::UI::Entry; 2229package CFPlus::UI::Entry;
1890 2230
1891our @ISA = CFClient::UI::EntryBase::; 2231our @ISA = CFPlus::UI::EntryBase::;
1892 2232
1893use CFClient::OpenGL; 2233use CFPlus::OpenGL;
1894 2234
1895sub invoke_key_down { 2235sub invoke_key_down {
1896 my ($self, $ev) = @_; 2236 my ($self, $ev) = @_;
1897 2237
1898 my $sym = $ev->{sym}; 2238 my $sym = $ev->{sym};
1899 2239
1900 if ($sym == 13) { 2240 if ($ev->{uni} == 0x0d || $sym == 13) {
1901 unshift @{$self->{history}}, 2241 unshift @{$self->{history}},
1902 my $txt = $self->get_text; 2242 my $txt = $self->get_text;
1903 2243
1904 $self->{history_pointer} = -1; 2244 $self->{history_pointer} = -1;
1905 $self->{history_saveback} = ''; 2245 $self->{history_saveback} = '';
1906 $self->emit (activate => $txt); 2246 $self->emit (activate => $txt);
1907 $self->update; 2247 $self->update;
1908 2248
1909 } elsif ($sym == CFClient::SDLK_UP) { 2249 } elsif ($sym == CFPlus::SDLK_UP) {
1910 if ($self->{history_pointer} < 0) { 2250 if ($self->{history_pointer} < 0) {
1911 $self->{history_saveback} = $self->get_text; 2251 $self->{history_saveback} = $self->get_text;
1912 } 2252 }
1913 if (@{$self->{history} || []} > 0) { 2253 if (@{$self->{history} || []} > 0) {
1914 $self->{history_pointer}++; 2254 $self->{history_pointer}++;
… …
1916 $self->{history_pointer} = @{$self->{history} || []} - 1; 2256 $self->{history_pointer} = @{$self->{history} || []} - 1;
1917 } 2257 }
1918 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2258 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1919 } 2259 }
1920 2260
1921 } elsif ($sym == CFClient::SDLK_DOWN) { 2261 } elsif ($sym == CFPlus::SDLK_DOWN) {
1922 $self->{history_pointer}--; 2262 $self->{history_pointer}--;
1923 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2263 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924 2264
1925 if ($self->{history_pointer} >= 0) { 2265 if ($self->{history_pointer} >= 0) {
1926 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2266 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1935 1 2275 1
1936} 2276}
1937 2277
1938############################################################################# 2278#############################################################################
1939 2279
2280package CFPlus::UI::TextEdit;
2281
2282our @ISA = CFPlus::UI::EntryBase::;
2283
2284use CFPlus::OpenGL;
2285
2286sub move_cursor_ver {
2287 my ($self, $dy) = @_;
2288
2289 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2290
2291 $y += $dy;
2292
2293 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2294 $self->{cursor} = $index;
2295 delete $self->{cur_h};
2296 $self->update;
2297 return;
2298 }
2299}
2300
2301sub invoke_key_down {
2302 my ($self, $ev) = @_;
2303
2304 my $sym = $ev->{sym};
2305
2306 if ($sym == CFPlus::SDLK_UP) {
2307 $self->move_cursor_ver (-1);
2308 } elsif ($sym == CFPlus::SDLK_DOWN) {
2309 $self->move_cursor_ver (+1);
2310 } else {
2311 return $self->SUPER::invoke_key_down ($ev)
2312 }
2313
2314 1
2315}
2316
2317#############################################################################
2318
1940package CFClient::UI::Button; 2319package CFPlus::UI::Button;
1941 2320
1942our @ISA = CFClient::UI::Label::; 2321our @ISA = CFPlus::UI::Label::;
1943 2322
1944use CFClient::OpenGL; 2323use CFPlus::OpenGL;
1945 2324
1946my @tex = 2325my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2326 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948 qw(b1_button_active.png); 2327 qw(b1_button_inactive.png b1_button_active.png);
1949 2328
1950sub new { 2329sub new {
1951 my $class = shift; 2330 my $class = shift;
1952 2331
1953 $class->SUPER::new ( 2332 $class->SUPER::new (
1954 padding_x => 4, 2333 padding_x => 4,
1955 padding_y => 4, 2334 padding_y => 4,
1956 fg => [1, 1, 1], 2335 fg => [1.0, 1.0, 1.0],
1957 active_fg => [0, 0, 1], 2336 active_fg => [0.8, 0.8, 0.8],
1958 can_hover => 1, 2337 can_hover => 1,
1959 align => 0, 2338 align => 0,
1960 valign => 0, 2339 valign => 0,
1961 can_events => 1, 2340 can_events => 1,
1962 @_ 2341 @_
… …
1980 2359
1981 glEnable GL_TEXTURE_2D; 2360 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2361 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983 glColor 0, 0, 0, 1; 2362 glColor 0, 0, 0, 1;
1984 2363
2364 my $tex = $tex[$GRAB == $self];
1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2365 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1986 2366
1987 glDisable GL_TEXTURE_2D; 2367 glDisable GL_TEXTURE_2D;
1988 2368
1989 $self->SUPER::_draw; 2369 $self->SUPER::_draw;
1990} 2370}
1991 2371
1992############################################################################# 2372#############################################################################
1993 2373
2374package CFPlus::UI::CheckBox;
2375
2376our @ISA = CFPlus::UI::DrawBG::;
2377
2378my @tex =
2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2380 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2381
2382use CFPlus::OpenGL;
2383
2384sub new {
2385 my $class = shift;
2386
2387 $class->SUPER::new (
2388 padding_x => 2,
2389 padding_y => 2,
2390 fg => [1, 1, 1],
2391 active_fg => [1, 1, 0],
2392 bg => [0, 0, 0, 0.2],
2393 active_bg => [1, 1, 1, 0.5],
2394 state => 0,
2395 can_hover => 1,
2396 @_
2397 )
2398}
2399
2400sub size_request {
2401 my ($self) = @_;
2402
2403 (6) x 2
2404}
2405
2406sub toggle {
2407 my ($self) = @_;
2408
2409 $self->{state} = !$self->{state};
2410 $self->emit (changed => $self->{state});
2411 $self->update;
2412}
2413
2414sub invoke_button_down {
2415 my ($self, $ev, $x, $y) = @_;
2416
2417 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2418 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2419 $self->toggle;
2420 } else {
2421 return 0
2422 }
2423
2424 1
2425}
2426
2427sub _draw {
2428 my ($self) = @_;
2429
2430 $self->SUPER::_draw;
2431
2432 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2433
2434 my ($w, $h) = @$self{qw(w h)};
2435
2436 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2437
2438 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2439
2440 my $tex = $self->{state} ? $tex[1] : $tex[0];
2441
2442 glEnable GL_TEXTURE_2D;
2443 $tex->draw_quad_alpha (0, 0, $s, $s);
2444 glDisable GL_TEXTURE_2D;
2445}
2446
2447#############################################################################
2448
2449package CFPlus::UI::Image;
2450
2451our @ISA = CFPlus::UI::Base::;
2452
2453use CFPlus::OpenGL;
2454
2455our %texture_cache;
2456
2457sub new {
2458 my $class = shift;
2459
2460 my $self = $class->SUPER::new (
2461 can_events => 0,
2462 @_,
2463 );
2464
2465 $self->{path} || $self->{tex}
2466 or Carp::croak "'path' or 'tex' attributes required";
2467
2468 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2469 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2470
2471 CFPlus::weaken $texture_cache{$self->{path}};
2472
2473 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2474
2475 $self
2476}
2477
2478sub STORABLE_freeze {
2479 my ($self, $cloning) = @_;
2480
2481 $self->{path}
2482 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2483
2484 $self->{path}
2485}
2486
2487sub STORABLE_attach {
2488 my ($self, $cloning, $path) = @_;
2489
2490 $self->new (path => $path)
2491}
2492
2493sub size_request {
2494 my ($self) = @_;
2495
2496 ($self->{tex}{w}, $self->{tex}{h})
2497}
2498
2499sub _draw {
2500 my ($self) = @_;
2501
2502 my $tex = $self->{tex};
2503
2504 my ($w, $h) = ($self->{w}, $self->{h});
2505
2506 if ($self->{rot90}) {
2507 glRotate 90, 0, 0, 1;
2508 glTranslate 0, -$self->{w}, 0;
2509
2510 ($w, $h) = ($h, $w);
2511 }
2512
2513 glEnable GL_TEXTURE_2D;
2514 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2515
2516 $tex->draw_quad (0, 0, $w, $h);
2517
2518 glDisable GL_TEXTURE_2D;
2519}
2520
2521#############################################################################
2522
1994package CFClient::UI::ImageButton; 2523package CFPlus::UI::ImageButton;
1995 2524
1996our @ISA = CFClient::UI::Image::; 2525our @ISA = CFPlus::UI::Image::;
1997 2526
1998use CFClient::OpenGL; 2527use CFPlus::OpenGL;
1999 2528
2000my %textures; 2529my %textures;
2001 2530
2002sub new { 2531sub new {
2003 my $class = shift; 2532 my $class = shift;
… …
2025 1 2554 1
2026} 2555}
2027 2556
2028############################################################################# 2557#############################################################################
2029 2558
2030package CFClient::UI::CheckBox;
2031
2032our @ISA = CFClient::UI::DrawBG::;
2033
2034my @tex =
2035 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2036 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2037
2038use CFClient::OpenGL;
2039
2040sub new {
2041 my $class = shift;
2042
2043 $class->SUPER::new (
2044 padding_x => 2,
2045 padding_y => 2,
2046 fg => [1, 1, 1],
2047 active_fg => [1, 1, 0],
2048 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5],
2050 state => 0,
2051 can_hover => 1,
2052 @_
2053 )
2054}
2055
2056sub size_request {
2057 my ($self) = @_;
2058
2059 (6) x 2
2060}
2061
2062sub invoke_button_down {
2063 my ($self, $ev, $x, $y) = @_;
2064
2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 } else {
2070 return 0
2071 }
2072
2073 1
2074}
2075
2076sub _draw {
2077 my ($self) = @_;
2078
2079 $self->SUPER::_draw;
2080
2081 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2082
2083 my ($w, $h) = @$self{qw(w h)};
2084
2085 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2086
2087 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2088
2089 my $tex = $self->{state} ? $tex[1] : $tex[0];
2090
2091 glEnable GL_TEXTURE_2D;
2092 $tex->draw_quad_alpha (0, 0, $s, $s);
2093 glDisable GL_TEXTURE_2D;
2094}
2095
2096#############################################################################
2097
2098package CFClient::UI::Image; 2559package CFPlus::UI::VGauge;
2099 2560
2100our @ISA = CFClient::UI::Base::; 2561our @ISA = CFPlus::UI::Base::;
2101
2102use CFClient::OpenGL;
2103
2104our %texture_cache;
2105
2106sub new {
2107 my $class = shift;
2108
2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
2113
2114 $self->{path}
2115 or Carp::croak "required attribute 'path' not set";
2116
2117 $self->{tex} = $texture_cache{$self->{path}} ||=
2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2119
2120 Scalar::Util::weaken $texture_cache{$self->{path}};
2121
2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2123
2124 $self
2125}
2126
2127sub size_request {
2128 my ($self) = @_;
2129
2130 ($self->{tex}{w}, $self->{tex}{h})
2131}
2132
2133sub _draw {
2134 my ($self) = @_;
2135
2136 my $tex = $self->{tex};
2137
2138 my ($w, $h) = ($self->{w}, $self->{h});
2139
2140 if ($self->{rot90}) {
2141 glRotate 90, 0, 0, 1;
2142 glTranslate 0, -$self->{w}, 0;
2143
2144 ($w, $h) = ($h, $w);
2145 }
2146
2147 glEnable GL_TEXTURE_2D;
2148 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2149
2150 $tex->draw_quad_alpha (0, 0, $w, $h);
2151
2152 glDisable GL_TEXTURE_2D;
2153}
2154
2155#############################################################################
2156
2157package CFClient::UI::VGauge;
2158
2159our @ISA = CFClient::UI::Base::;
2160 2562
2161use List::Util qw(min max); 2563use List::Util qw(min max);
2162 2564
2163use CFClient::OpenGL; 2565use CFPlus::OpenGL;
2164 2566
2165my %tex = ( 2567my %tex = (
2166 food => [ 2568 food => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2569 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2570 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169 ], 2571 ],
2170 grace => [ 2572 grace => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2573 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2574 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2173 ], 2575 ],
2174 hp => [ 2576 hp => [
2175 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2577 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2578 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177 ], 2579 ],
2178 mana => [ 2580 mana => [
2179 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2581 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2180 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2582 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2181 ], 2583 ],
2182); 2584);
2183 2585
2184# eg. VGauge->new (gauge => 'food'), default gauge: food 2586# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2244 my $ycut1 = max 0, min 1, $ycut; 2646 my $ycut1 = max 0, min 1, $ycut;
2245 my $ycut2 = max 0, min 1, $ycut - 1; 2647 my $ycut2 = max 0, min 1, $ycut - 1;
2246 2648
2247 my $h1 = $self->{h} * (1 - $ycut1); 2649 my $h1 = $self->{h} * (1 - $ycut1);
2248 my $h2 = $self->{h} * (1 - $ycut2); 2650 my $h2 = $self->{h} * (1 - $ycut2);
2651 my $h3 = $self->{h};
2652
2653 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249 2654
2250 glEnable GL_BLEND; 2655 glEnable GL_BLEND;
2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2656 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2657 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
… …
2272 2677
2273 if ($t3) { 2678 if ($t3) {
2274 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2679 glBindTexture GL_TEXTURE_2D, $t3->{name};
2275 glBegin GL_QUADS; 2680 glBegin GL_QUADS;
2276 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2681 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2682 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2683 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2684 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280 glEnd; 2685 glEnd;
2281 } 2686 }
2282 2687
2283 glDisable GL_BLEND; 2688 glDisable GL_BLEND;
2284 glDisable GL_TEXTURE_2D; 2689 glDisable GL_TEXTURE_2D;
2285} 2690}
2286 2691
2287############################################################################# 2692#############################################################################
2288 2693
2289package CFClient::UI::Gauge; 2694package CFPlus::UI::Gauge;
2290 2695
2291our @ISA = CFClient::UI::VBox::; 2696our @ISA = CFPlus::UI::VBox::;
2292 2697
2293sub new { 2698sub new {
2294 my ($class, %arg) = @_; 2699 my ($class, %arg) = @_;
2295 2700
2296 my $self = $class->SUPER::new ( 2701 my $self = $class->SUPER::new (
… …
2298 can_hover => 1, 2703 can_hover => 1,
2299 can_events => 1, 2704 can_events => 1,
2300 %arg, 2705 %arg,
2301 ); 2706 );
2302 2707
2303 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2708 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2304 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2709 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2305 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2710 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2306 2711
2307 $self 2712 $self
2308} 2713}
2309 2714
2310sub set_fontsize { 2715sub set_fontsize {
… …
2331 $self->{value}->set_text ($val); 2736 $self->{value}->set_text ($val);
2332} 2737}
2333 2738
2334############################################################################# 2739#############################################################################
2335 2740
2336package CFClient::UI::Slider; 2741package CFPlus::UI::Slider;
2337 2742
2338use strict; 2743use strict;
2339 2744
2340use CFClient::OpenGL; 2745use CFPlus::OpenGL;
2341 2746
2342our @ISA = CFClient::UI::DrawBG::; 2747our @ISA = CFPlus::UI::DrawBG::;
2343 2748
2344my @tex = 2749my @tex =
2345 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2750 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2346 qw(s1_slider.png s1_slider_bg.png); 2751 qw(s1_slider.png s1_slider_bg.png);
2347 2752
2348sub new { 2753sub new {
2349 my $class = shift; 2754 my $class = shift;
2350 2755
… …
2439 } 2844 }
2440 2845
2441 1 2846 1
2442} 2847}
2443 2848
2849sub invoke_mouse_wheel {
2850 my ($self, $ev) = @_;
2851
2852 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2853
2854 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2855
2856 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2857
2858 ! ! $delta
2859}
2860
2444sub update { 2861sub update {
2445 my ($self) = @_; 2862 my ($self) = @_;
2446 2863
2447 delete $self->{knob_w}; 2864 delete $self->{knob_w};
2448 $self->SUPER::update; 2865 $self->SUPER::update;
… …
2495 glDisable GL_TEXTURE_2D; 2912 glDisable GL_TEXTURE_2D;
2496} 2913}
2497 2914
2498############################################################################# 2915#############################################################################
2499 2916
2500package CFClient::UI::ValSlider; 2917package CFPlus::UI::ValSlider;
2501 2918
2502our @ISA = CFClient::UI::HBox::; 2919our @ISA = CFPlus::UI::HBox::;
2503 2920
2504sub new { 2921sub new {
2505 my ($class, %arg) = @_; 2922 my ($class, %arg) = @_;
2506 2923
2507 my $range = delete $arg{range}; 2924 my $range = delete $arg{range};
2508 2925
2509 my $self = $class->SUPER::new ( 2926 my $self = $class->SUPER::new (
2510 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2927 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2511 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2928 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2512 to_value => sub { shift }, 2929 to_value => sub { shift },
2513 from_value => sub { shift }, 2930 from_value => sub { shift },
2514 %arg, 2931 %arg,
2515 ); 2932 );
2516 2933
… …
2536sub set_range { shift->{slider}->set_range (@_) } 2953sub set_range { shift->{slider}->set_range (@_) }
2537sub set_value { shift->{slider}->set_value (@_) } 2954sub set_value { shift->{slider}->set_value (@_) }
2538 2955
2539############################################################################# 2956#############################################################################
2540 2957
2541package CFClient::UI::TextScroller; 2958package CFPlus::UI::TextScroller;
2542 2959
2543our @ISA = CFClient::UI::HBox::; 2960our @ISA = CFPlus::UI::HBox::;
2544 2961
2545use CFClient::OpenGL; 2962use CFPlus::OpenGL;
2546 2963
2547sub new { 2964sub new {
2548 my $class = shift; 2965 my $class = shift;
2549 2966
2550 my $self = $class->SUPER::new ( 2967 my $self = $class->SUPER::new (
2551 fontsize => 1, 2968 fontsize => 1,
2552 can_events => 0, 2969 can_events => 1,
2553 indent => 0, 2970 indent => 0,
2554 #font => default_font 2971 #font => default_font
2555 @_, 2972 @_,
2556 2973
2557 layout => (new CFClient::Layout 1), 2974 layout => (new CFPlus::Layout),
2558 par => [], 2975 par => [],
2976 max_par => 0,
2559 height => 0, 2977 height => 0,
2560 children => [ 2978 children => [
2561 (new CFClient::UI::Empty expand => 1), 2979 (new CFPlus::UI::Empty expand => 1),
2562 (new CFClient::UI::Slider vertical => 1), 2980 (new CFPlus::UI::Slider vertical => 1),
2563 ], 2981 ],
2564 ); 2982 );
2565 2983
2566 $self->{children}[1]->connect (changed => sub { $self->update }); 2984 $self->{children}[1]->connect (changed => sub { $self->update });
2567 2985
… …
2597 3015
2598 $self->reflow; 3016 $self->reflow;
2599 3017
2600 local $self->{children} = [$empty, $slider]; 3018 local $self->{children} = [$empty, $slider];
2601 $self->SUPER::invoke_size_allocate ($w, $h) 3019 $self->SUPER::invoke_size_allocate ($w, $h)
3020}
3021
3022sub invoke_mouse_wheel {
3023 my ($self, $ev) = @_;
3024
3025 return 0 unless $ev->{dy}; # only vertical movements
3026
3027 $self->{children}[1]->emit (mouse_wheel => $ev);
3028
3029 1
2602} 3030}
2603 3031
2604sub get_layout { 3032sub get_layout {
2605 my ($self, $para) = @_; 3033 my ($self, $para) = @_;
2606 3034
… …
2634 3062
2635 # todo: base offset on lines or so, not on pixels 3063 # todo: base offset on lines or so, not on pixels
2636 $self->{children}[1]->set_value ($offset); 3064 $self->{children}[1]->set_value ($offset);
2637} 3065}
2638 3066
3067sub current_paragraph {
3068 my ($self) = @_;
3069
3070 $self->{top_paragraph} - 1
3071}
3072
3073sub scroll_to {
3074 my ($self, $para) = @_;
3075
3076 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3077
3078 $self->{scroll_to} = $para;
3079 $self->update;
3080}
3081
2639sub clear { 3082sub clear {
2640 my ($self) = @_; 3083 my ($self) = @_;
2641 3084
2642 my (undef, undef, @other) = @{ $self->{children} }; 3085 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other; 3086 $self->remove ($_) for @other;
… …
2646 $self->{height} = 0; 3089 $self->{height} = 0;
2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3090 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648} 3091}
2649 3092
2650sub add_paragraph { 3093sub add_paragraph {
2651 my ($self, $color, $para, $indent) = @_; 3094 my $self = shift;
2652 3095
2653 my ($text, @w) = ref $para ? @$para : $para; 3096 for my $para (@_) {
2654
2655 $para = { 3097 $para = {
3098 fg => [1, 1, 1, 1],
3099 indent => 0,
3100 markup => "",
3101 widget => [],
3102 ref $para ? %$para : (markup => $para),
2656 w => 1e10, 3103 w => 1e10,
2657 wrapped => 1, 3104 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2662 }; 3105 };
2663 3106
2664 $self->add (@w) if @w; 3107 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665 push @{$self->{par}}, $para; 3108 push @{$self->{par}}, $para;
3109 }
3110
3111 if (my $max = $self->{max_par}) {
3112 shift @{$self->{par}} while @{$self->{par}} > $max;
3113 }
2666 3114
2667 $self->{need_reflow}++; 3115 $self->{need_reflow}++;
2668 $self->update; 3116 $self->update;
2669} 3117}
2670 3118
2671sub scroll_to_bottom { 3119sub scroll_to_bottom {
2672 my ($self) = @_; 3120 my ($self) = @_;
2673 3121
2674 $self->{scroll_to_bottom} = 1; 3122 $self->{scroll_to} = $#{$self->{par}};
2675 $self->update; 3123 $self->update;
2676} 3124}
2677 3125
3126sub force_uptodate {
3127 my ($self) = @_;
3128
3129 if (delete $self->{need_reflow}) {
3130 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3131
3132 my $height = 0;
3133
3134 for my $para (@{$self->{par}}) {
3135 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3136 my $layout = $self->get_layout ($para);
3137 my ($w, $h) = $layout->size;
3138
3139 $para->{w} = $w + $para->{indent};
3140 $para->{h} = $h;
3141 $para->{wrapped} = $layout->has_wrapped;
3142 }
3143
3144 $para->{y} = $height;
3145 $height += $para->{h};
3146 }
3147
3148 $self->{height} = $height;
3149 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3150
3151 delete $self->{texture};
3152 }
3153
3154 if (my $paridx = delete $self->{scroll_to}) {
3155 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3156 }
3157}
3158
2678sub update { 3159sub update {
2679 my ($self) = @_; 3160 my ($self) = @_;
2680 3161
2681 $self->SUPER::update; 3162 $self->SUPER::update;
2682 3163
2683 return unless $self->{h} > 0; 3164 return unless $self->{h} > 0;
2684 3165
2685 delete $self->{texture}; 3166 delete $self->{texture};
2686 3167
2687 $ROOT->on_post_alloc ($self => sub { 3168 $ROOT->on_post_alloc ($self => sub {
3169 $self->force_uptodate;
3170
2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3171 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689 3172
2690 if (delete $self->{need_reflow}) {
2691 my $height = 0;
2692
2693 for my $para (@{$self->{par}}) {
2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2695 my $layout = $self->get_layout ($para);
2696 my ($w, $h) = $layout->size;
2697
2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2701 }
2702
2703 $height += $para->{h};
2704 }
2705
2706 $self->{height} = $height;
2707
2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2709
2710 delete $self->{texture};
2711 }
2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3173 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2718 glClearColor 0, 0, 0, 0; 3174 glClearColor 0, 0, 0, 0;
2719 glClear GL_COLOR_BUFFER_BIT; 3175 glClear GL_COLOR_BUFFER_BIT;
2720 3176
3177 package CFPlus::UI::Base;
3178 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3179 (0, 0, $self->{w}, $self->{h});
3180
3181 my $top = int $self->{children}[1]{range}[0];
3182
3183 my $paridx = 0;
3184 my $top_paragraph;
2721 my $top = int $self->{children}[1]{range}[0]; 3185 my $top = int $self->{children}[1]{range}[0];
2722 3186
2723 my $y0 = $top; 3187 my $y0 = $top;
2724 my $y1 = $top + $H; 3188 my $y1 = $top + $H;
2725 3189
2726 my $y = 0;
2727
2728 glEnable GL_BLEND;
2729 #TODO# not correct in windows where rgba is forced off
2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2731
2732 for my $para (@{$self->{par}}) { 3190 for my $para (@{$self->{par}}) {
2733 my $h = $para->{h}; 3191 my $h = $para->{h};
3192 my $y = $para->{y};
2734 3193
2735 if ($y0 < $y + $h && $y < $y1) { 3194 if ($y0 < $y + $h && $y < $y1) {
2736
2737 my $layout = $self->get_layout ($para); 3195 my $layout = $self->get_layout ($para);
2738 3196
2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741 glRasterPos $para->{indent}, $y - $y0; 3197 $layout->render ($para->{indent}, $y - $y0);
2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743 3198
2744 if (my @w = @{ $para->{widget} }) { 3199 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes; 3200 my @s = $layout->get_shapes;
2746 3201
2747 for (@w) { 3202 for (@w) {
… …
2753 $_->draw; 3208 $_->draw;
2754 } 3209 }
2755 } 3210 }
2756 } 3211 }
2757 3212
2758 $y += $h; 3213 $paridx++;
3214 $top_paragraph ||= $paridx if $y >= $top;
2759 } 3215 }
2760 3216
2761 glDisable GL_BLEND; 3217 $self->{top_paragraph} = $top_paragraph;
2762 }; 3218 };
2763 }); 3219 });
2764} 3220}
2765 3221
2766sub reconfigure { 3222sub reconfigure {
… …
2784 $self->{children}[1]->draw; 3240 $self->{children}[1]->draw;
2785} 3241}
2786 3242
2787############################################################################# 3243#############################################################################
2788 3244
2789package CFClient::UI::Animator; 3245package CFPlus::UI::Animator;
2790 3246
2791use CFClient::OpenGL; 3247use CFPlus::OpenGL;
2792 3248
2793our @ISA = CFClient::UI::Bin::; 3249our @ISA = CFPlus::UI::Bin::;
2794 3250
2795sub moveto { 3251sub moveto {
2796 my ($self, $x, $y) = @_; 3252 my ($self, $x, $y) = @_;
2797 3253
2798 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3254 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2826 glPopMatrix; 3282 glPopMatrix;
2827} 3283}
2828 3284
2829############################################################################# 3285#############################################################################
2830 3286
2831package CFClient::UI::Flopper; 3287package CFPlus::UI::Flopper;
2832 3288
2833our @ISA = CFClient::UI::Button::; 3289our @ISA = CFPlus::UI::Button::;
2834 3290
2835sub new { 3291sub new {
2836 my $class = shift; 3292 my $class = shift;
2837 3293
2838 my $self = $class->SUPER::new ( 3294 my $self = $class->SUPER::new (
… …
2850 $self->{other}->toggle_visibility; 3306 $self->{other}->toggle_visibility;
2851} 3307}
2852 3308
2853############################################################################# 3309#############################################################################
2854 3310
2855package CFClient::UI::Tooltip; 3311package CFPlus::UI::Tooltip;
2856 3312
2857our @ISA = CFClient::UI::Bin::; 3313our @ISA = CFPlus::UI::Bin::;
2858 3314
2859use CFClient::OpenGL; 3315use CFPlus::OpenGL;
2860 3316
2861sub new { 3317sub new {
2862 my $class = shift; 3318 my $class = shift;
2863 3319
2864 $class->SUPER::new ( 3320 $class->SUPER::new (
… …
2867 ) 3323 )
2868} 3324}
2869 3325
2870sub set_tooltip_from { 3326sub set_tooltip_from {
2871 my ($self, $widget) = @_; 3327 my ($self, $widget) = @_;
3328
3329 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3330 if $widget->{tooltip} =~ /^#(.*)$/;
2872 3331
2873 my $tooltip = $widget->{tooltip}; 3332 my $tooltip = $widget->{tooltip};
2874 3333
2875 if ($ENV{CFPLUS_DEBUG} & 2) { 3334 if ($ENV{CFPLUS_DEBUG} & 2) {
2876 $tooltip .= "\n\n" . (ref $widget) . "\n" 3335 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2880 } 3339 }
2881 3340
2882 $tooltip =~ s/^\n+//; 3341 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//; 3342 $tooltip =~ s/\n+$//;
2884 3343
2885 $self->add (new CFClient::UI::Label 3344 $self->add (new CFPlus::UI::Label
2886 markup => $tooltip, 3345 markup => $tooltip,
2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3346 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2888 fontsize => 0.8, 3347 fontsize => 0.8,
2889 fg => [0, 0, 0, 1], 3348 style => 1, # FLAG_INVERSE
2890 ellipsise => 0, 3349 ellipsise => 0,
2891 font => ($widget->{tooltip_font} || $::FONT_PROP), 3350 font => ($widget->{tooltip_font} || $::FONT_PROP),
2892 ); 3351 );
2893} 3352}
2894 3353
… …
2913 3372
2914 $self->{root}->on_post_alloc ("move_$self" => sub { 3373 $self->{root}->on_post_alloc ("move_$self" => sub {
2915 my $widget = $self->{owner} 3374 my $widget = $self->{owner}
2916 or return; 3375 or return;
2917 3376
3377 if ($widget->{visible}) {
2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3378 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919 3379
2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3380 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921 if $x + $self->{w} > $self->{root}{w}; 3381 if $x + $self->{w} > $self->{root}{w};
2922 3382
2923 $self->move_abs ($x, $y); 3383 $self->move_abs ($x, $y);
3384 } else {
3385 $self->hide;
3386 }
2924 }); 3387 });
2925} 3388}
2926 3389
2927sub _draw { 3390sub _draw {
2928 my ($self) = @_; 3391 my ($self) = @_;
… …
2952 $self->SUPER::_draw; 3415 $self->SUPER::_draw;
2953} 3416}
2954 3417
2955############################################################################# 3418#############################################################################
2956 3419
2957package CFClient::UI::Face; 3420package CFPlus::UI::Face;
2958 3421
2959our @ISA = CFClient::UI::Base::; 3422our @ISA = CFPlus::UI::DrawBG::;
2960 3423
2961use CFClient::OpenGL; 3424use CFPlus::OpenGL;
2962 3425
2963sub new { 3426sub new {
2964 my $class = shift; 3427 my $class = shift;
2965 3428
2966 my $self = $class->SUPER::new ( 3429 my $self = $class->SUPER::new (
3430 size_w => 32,
3431 size_h => 8,
2967 aspect => 1, 3432 aspect => 1,
2968 can_events => 0, 3433 can_events => 0,
2969 @_, 3434 @_,
2970 ); 3435 );
2971 3436
2972 if ($self->{anim} && $self->{animspeed}) { 3437 if ($self->{anim} && $self->{animspeed}) {
2973 Scalar::Util::weaken (my $widget = $self); 3438 CFPlus::weaken (my $widget = $self);
2974 3439
3440 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3441 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2975 $self->{timer} = Event->timer ( 3442 $self->{timer} = Event->timer (
2976 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2977 hard => 1, 3443 parked => 1,
2978 interval => $self->{animspeed},
2979 cb => sub { 3444 cb => sub {
3445 return unless $::CONN && $widget;
3446
2980 ++$widget->{frame}; 3447 ++$widget->{frame};
3448 $widget->update_face;
2981 $widget->update; 3449 $widget->update;
3450
3451 $widget->update_timer;
2982 }, 3452 },
2983 ); 3453 );
3454
3455 $self->update_face;
3456 $self->update_timer;
2984 } 3457 }
2985 3458
2986 $self 3459 $self
2987} 3460}
2988 3461
3462sub update_timer {
3463 my ($self) = @_;
3464
3465 return unless $self->{timer};
3466
3467 if ($self->{visible}) {
3468 $self->{timer}->at (
3469 $self->{anim_start}
3470 + $self->{animspeed}
3471 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3472 );
3473 $self->{timer}->start;
3474 } else {
3475 $self->{timer}->stop;
3476 }
3477}
3478
3479sub update_face {
3480 my ($self) = @_;
3481
3482 return unless $::CONN;
3483
3484 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3485 if ($anim && @$anim) {
3486 delete $self->{wait_face};
3487 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3488 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3489 }
3490 }
3491}
3492
2989sub size_request { 3493sub size_request {
2990 (32, 8) 3494 my ($self) = @_;
3495
3496 if ($::CONN) {
3497 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3498 if (my $tex = $::CONN->{texture}[$faceid]) {
3499 $self->{tex} = $tex;
3500 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3501 } else {
3502 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3503 $self->realloc;
3504 });
3505 }
3506 }
3507 }
3508
3509 ($self->{size_w} || 8, $self->{size_h} || 8)
2991} 3510}
2992 3511
2993sub update { 3512sub update {
2994 my ($self) = @_; 3513 my ($self) = @_;
2995 3514
2996 return unless $self->{visible}; 3515 return unless $self->{visible};
2997 3516
2998 $self->SUPER::update; 3517 $self->SUPER::update;
2999} 3518}
3000 3519
3520sub invoke_visibility_change {
3521 my ($self) = @_;
3522
3523 $self->update_timer;
3524
3525 0
3526}
3527
3001sub _draw { 3528sub _draw {
3002 my ($self) = @_; 3529 my ($self) = @_;
3003 3530
3004 return unless $::CONN; 3531 $self->SUPER::_draw;
3005 3532
3006 my $face; 3533 if (my $tex = $self->{tex}) {
3007
3008 if ($self->{frame}) {
3009 my $anim = $::CONN->{anim}[$self->{anim}];
3010
3011 $face = $anim->[ $self->{frame} % @$anim ]
3012 if $anim && @$anim;
3013 }
3014
3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3016
3017 if ($tex) {
3018 glEnable GL_TEXTURE_2D; 3534 glEnable GL_TEXTURE_2D;
3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3535 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3020 glColor 0, 0, 0, 1; 3536 glColor 0, 0, 0, 1;
3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3537 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3022 glDisable GL_TEXTURE_2D; 3538 glDisable GL_TEXTURE_2D;
… …
3024} 3540}
3025 3541
3026sub destroy { 3542sub destroy {
3027 my ($self) = @_; 3543 my ($self) = @_;
3028 3544
3029 $self->{timer}->cancel 3545 (delete $self->{timer})->cancel
3030 if $self->{timer}; 3546 if $self->{timer};
3031 3547
3032 $self->SUPER::destroy; 3548 $self->SUPER::destroy;
3033} 3549}
3034 3550
3035############################################################################# 3551#############################################################################
3036 3552
3037package CFClient::UI::Buttonbar; 3553package CFPlus::UI::Buttonbar;
3038 3554
3039our @ISA = CFClient::UI::HBox::; 3555our @ISA = CFPlus::UI::HBox::;
3040 3556
3041# TODO: should actualyl wrap buttons and other goodies. 3557# TODO: should actually wrap buttons and other goodies.
3042 3558
3043############################################################################# 3559#############################################################################
3044 3560
3045package CFClient::UI::Menu; 3561package CFPlus::UI::Menu;
3046 3562
3047our @ISA = CFClient::UI::FancyFrame::; 3563our @ISA = CFPlus::UI::Toplevel::;
3048 3564
3049use CFClient::OpenGL; 3565use CFPlus::OpenGL;
3050 3566
3051sub new { 3567sub new {
3052 my $class = shift; 3568 my $class = shift;
3053 3569
3054 my $self = $class->SUPER::new ( 3570 my $self = $class->SUPER::new (
3055 items => [], 3571 items => [],
3056 z => 100, 3572 z => 100,
3057 @_, 3573 @_,
3058 ); 3574 );
3059 3575
3060 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3576 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3061 3577
3062 for my $item (@{ $self->{items} }) { 3578 for my $item (@{ $self->{items} }) {
3063 my ($widget, $cb, $tooltip) = @$item; 3579 my ($widget, $cb, $tooltip) = @$item;
3064 3580
3065 # handle various types of items, only text for now 3581 # handle various types of items, only text for now
3066 if (!ref $widget) { 3582 if (!ref $widget) {
3583 if ($widget =~ /\t/) {
3584 my ($left, $right) = split /\t/, $widget, 2;
3585
3067 $widget = new CFClient::UI::Label 3586 $widget = new CFPlus::UI::HBox
3068 can_hover => 1, 3587 can_hover => 1,
3069 can_events => 1, 3588 can_events => 1,
3589 tooltip => $tooltip,
3590 children => [
3591 (new CFPlus::UI::Label markup => $left, expand => 1),
3592 (new CFPlus::UI::Label markup => $right, align => +1),
3593 ],
3594 ;
3595
3596 } else {
3597 $widget = new CFPlus::UI::Label
3598 can_hover => 1,
3599 can_events => 1,
3070 markup => $widget, 3600 markup => $widget,
3071 tooltip => $tooltip 3601 tooltip => $tooltip;
3602 }
3072 } 3603 }
3073 3604
3074 $self->{item}{$widget} = $item; 3605 $self->{item}{$widget} = $item;
3075 3606
3076 $self->{vbox}->add ($widget); 3607 $self->{vbox}->add ($widget);
… …
3119 1 3650 1
3120} 3651}
3121 3652
3122############################################################################# 3653#############################################################################
3123 3654
3124package CFClient::UI::Multiplexer; 3655package CFPlus::UI::Multiplexer;
3125 3656
3126our @ISA = CFClient::UI::Container::; 3657our @ISA = CFPlus::UI::Container::;
3127 3658
3128sub new { 3659sub new {
3129 my $class = shift; 3660 my $class = shift;
3130 3661
3131 my $self = $class->SUPER::new ( 3662 my $self = $class->SUPER::new (
… …
3145 3676
3146 $self->{current} = $self->{children}[0] 3677 $self->{current} = $self->{children}[0]
3147 if @{ $self->{children} }; 3678 if @{ $self->{children} };
3148} 3679}
3149 3680
3681sub get_current_page {
3682 my ($self) = @_;
3683
3684 $self->{current}
3685}
3686
3150sub set_current_page { 3687sub set_current_page {
3151 my ($self, $page_or_widget) = @_; 3688 my ($self, $page_or_widget) = @_;
3152 3689
3153 my $widget = ref $page_or_widget 3690 my $widget = ref $page_or_widget
3154 ? $page_or_widget 3691 ? $page_or_widget
… …
3186 $self->{current}->draw; 3723 $self->{current}->draw;
3187} 3724}
3188 3725
3189############################################################################# 3726#############################################################################
3190 3727
3191package CFClient::UI::Notebook; 3728package CFPlus::UI::Notebook;
3192 3729
3193our @ISA = CFClient::UI::VBox::; 3730our @ISA = CFPlus::UI::VBox::;
3194 3731
3195sub new { 3732sub new {
3196 my $class = shift; 3733 my $class = shift;
3197 3734
3198 my $self = $class->SUPER::new ( 3735 my $self = $class->SUPER::new (
3199 buttonbar => (new CFClient::UI::Buttonbar), 3736 buttonbar => (new CFPlus::UI::Buttonbar),
3200 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3737 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3201 # filter => # will be put between multiplexer and $self 3738 # filter => # will be put between multiplexer and $self
3202 @_, 3739 @_,
3203 ); 3740 );
3204 3741
3205 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3742 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3209} 3746}
3210 3747
3211sub add { 3748sub add {
3212 my ($self, $title, $widget, $tooltip) = @_; 3749 my ($self, $title, $widget, $tooltip) = @_;
3213 3750
3214 Scalar::Util::weaken $self; 3751 CFPlus::weaken $self;
3215 3752
3216 $self->{buttonbar}->add (new CFClient::UI::Button 3753 $self->{buttonbar}->add (new CFPlus::UI::Button
3217 markup => $title, 3754 markup => $title,
3218 tooltip => $tooltip, 3755 tooltip => $tooltip,
3219 on_activate => sub { $self->set_current_page ($widget) }, 3756 on_activate => sub { $self->set_current_page ($widget) },
3220 ); 3757 );
3221 3758
3222 $self->{multiplexer}->add ($widget); 3759 $self->{multiplexer}->add ($widget);
3223} 3760}
3224 3761
3762sub get_current_page {
3763 my ($self) = @_;
3764
3765 $self->{multiplexer}->get_current_page
3766}
3767
3225sub set_current_page { 3768sub set_current_page {
3226 my ($self, $page) = @_; 3769 my ($self, $page) = @_;
3227 3770
3228 $self->{multiplexer}->set_current_page ($page); 3771 $self->{multiplexer}->set_current_page ($page);
3229 $self->emit (page_changed => $self->{multiplexer}{current}); 3772 $self->emit (page_changed => $self->{multiplexer}{current});
3230} 3773}
3231 3774
3232############################################################################# 3775#############################################################################
3233 3776
3234package CFClient::UI::Combobox; 3777package CFPlus::UI::Selector;
3235 3778
3236use utf8; 3779use utf8;
3237 3780
3238our @ISA = CFClient::UI::Button::; 3781our @ISA = CFPlus::UI::Button::;
3239 3782
3240sub new { 3783sub new {
3241 my $class = shift; 3784 my $class = shift;
3242 3785
3243 my $self = $class->SUPER::new ( 3786 my $self = $class->SUPER::new (
… …
3260 my ($value, $title, $tooltip) = @$_; 3803 my ($value, $title, $tooltip) = @$_;
3261 3804
3262 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3805 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263 } 3806 }
3264 3807
3265 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3808 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266} 3809}
3267 3810
3268sub _set_value { 3811sub _set_value {
3269 my ($self, $value) = @_; 3812 my ($self, $value) = @_;
3270 3813
… …
3285 $self->emit (changed => $value); 3828 $self->emit (changed => $value);
3286} 3829}
3287 3830
3288############################################################################# 3831#############################################################################
3289 3832
3290package CFClient::UI::Statusbox; 3833package CFPlus::UI::Statusbox;
3291 3834
3292our @ISA = CFClient::UI::VBox::; 3835our @ISA = CFPlus::UI::VBox::;
3293 3836
3294sub new { 3837sub new {
3295 my $class = shift; 3838 my $class = shift;
3296 3839
3297 my $self = $class->SUPER::new ( 3840 my $self = $class->SUPER::new (
3298 fontsize => 0.8, 3841 fontsize => 0.8,
3299 @_, 3842 @_,
3300 ); 3843 );
3301 3844
3302 Scalar::Util::weaken (my $this = $self); 3845 CFPlus::weaken (my $this = $self);
3303 3846
3304 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3847 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3305 3848
3306 $self 3849 $self
3307} 3850}
… …
3309sub reorder { 3852sub reorder {
3310 my ($self) = @_; 3853 my ($self) = @_;
3311 my $NOW = Time::HiRes::time; 3854 my $NOW = Time::HiRes::time;
3312 3855
3313 # freeze display when hovering over any label 3856 # freeze display when hovering over any label
3314 return if $CFClient::UI::TOOLTIP->{owner} 3857 return if $CFPlus::UI::TOOLTIP->{owner}
3315 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3858 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3316 values %{ $self->{item} }; 3859 values %{ $self->{item} };
3317 3860
3318 while (my ($k, $v) = each %{ $self->{item} }) { 3861 while (my ($k, $v) = each %{ $self->{item} }) {
3319 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3862 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3320 } 3863 }
… …
3341 for ($short) { 3884 for ($short) {
3342 s/^\s+//; 3885 s/^\s+//;
3343 s/\s+/ /g; 3886 s/\s+/ /g;
3344 } 3887 }
3345 3888
3346 new CFClient::UI::Label 3889 new CFPlus::UI::Label
3347 markup => $short, 3890 markup => $short,
3348 tooltip => $item->{tooltip}, 3891 tooltip => $item->{tooltip},
3349 tooltip_font => $::FONT_PROP, 3892 tooltip_font => $::FONT_PROP,
3350 tooltip_width => 0.67, 3893 tooltip_width => 0.67,
3351 fontsize => $item->{fontsize} || $self->{fontsize}, 3894 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3405 count => 1, 3948 count => 1,
3406 %arg, 3949 %arg,
3407 }; 3950 };
3408 } 3951 }
3409 3952
3953 $ROOT->on_refresh (reorder => sub {
3410 $self->reorder; 3954 $self->reorder;
3955 });
3411} 3956}
3412 3957
3413sub reconfigure { 3958sub reconfigure {
3414 my ($self) = @_; 3959 my ($self) = @_;
3415 3960
… …
3428 $self->SUPER::destroy; 3973 $self->SUPER::destroy;
3429} 3974}
3430 3975
3431############################################################################# 3976#############################################################################
3432 3977
3433package CFClient::UI::Inventory;
3434
3435our @ISA = CFClient::UI::ScrolledWindow::;
3436
3437sub new {
3438 my $class = shift;
3439
3440 my $self = $class->SUPER::new (
3441 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3442 @_,
3443 );
3444
3445 $self
3446}
3447
3448sub set_items {
3449 my ($self, $items) = @_;
3450
3451 $self->{child}->clear;
3452 return unless $items;
3453
3454 my @items = sort {
3455 ($a->{type} <=> $b->{type})
3456 or ($a->{name} cmp $b->{name})
3457 } @$items;
3458
3459 $self->{real_items} = \@items;
3460
3461 my $row = 0;
3462 for my $item (@items) {
3463 CFClient::Item::update_widgets $item;
3464
3465 $self->{child}->add (0, $row, $item->{face_widget});
3466 $self->{child}->add (1, $row, $item->{desc_widget});
3467 $self->{child}->add (2, $row, $item->{weight_widget});
3468
3469 $row++;
3470 }
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::BindEditor;
3476
3477our @ISA = CFClient::UI::FancyFrame::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3483
3484 $self->add (my $vb = new CFClient::UI::VBox);
3485
3486
3487 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3488 text => "start recording",
3489 tooltip => "Start/Stops recording of actions."
3490 ."All subsequent actions after the recording started will be captured."
3491 ."The actions are displayed after the record was stopped."
3492 ."To bind the action you have to click on the 'Bind' button",
3493 on_activate => sub {
3494 unless ($self->{recording}) {
3495 $self->start;
3496 } else {
3497 $self->stop;
3498 }
3499 });
3500
3501 $vb->add (new CFClient::UI::Label text => "Actions:");
3502 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3503
3504 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3505 $vb->add (my $hb = new CFClient::UI::HBox);
3506 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3507 $hb->add (new CFClient::UI::Button
3508 text => "bind",
3509 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3510 on_activate => sub {
3511 $self->ask_for_bind;
3512 });
3513
3514 $vb->add (my $hb = new CFClient::UI::HBox);
3515 $hb->add (new CFClient::UI::Button
3516 text => "ok",
3517 expand => 1,
3518 tooltip => "This closes the binding editor and saves the binding",
3519 on_activate => sub {
3520 $self->hide;
3521 $self->commit;
3522 });
3523
3524 $hb->add (new CFClient::UI::Button
3525 text => "cancel",
3526 expand => 1,
3527 tooltip => "This closes the binding editor without saving",
3528 on_activate => sub {
3529 $self->hide;
3530 $self->{binding_cancel}->()
3531 if $self->{binding_cancel};
3532 });
3533
3534 $self->update_binding_widgets;
3535
3536 $self
3537}
3538
3539sub cfg_bind {
3540 my ($self, $mod, $sym, $cmds) = @_;
3541 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542 ::update_bindings ();
3543}
3544
3545sub cfg_unbind {
3546 my ($self, $mod, $sym, $cmds) = @_;
3547 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548 ::update_bindings ();
3549}
3550
3551sub commit {
3552 my ($self) = @_;
3553 my ($mod, $sym, $cmds) = $self->get_binding;
3554 if ($sym != 0 && @$cmds > 0) {
3555 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3556 ."'. Don't forget 'Save Config'!");
3557 $self->{binding_change}->($mod, $sym, $cmds)
3558 if $self->{binding_change};
3559 } else {
3560 $::STATUSBOX->add ("No action bound, no key or action specified!");
3561 $self->{binding_cancel}->()
3562 if $self->{binding_cancel};
3563 }
3564}
3565
3566sub start {
3567 my ($self) = @_;
3568
3569 $self->{rec_btn}->set_text ("stop recording");
3570 $self->{recording} = 1;
3571 $self->clear_command_list;
3572 $::CONN->start_record if $::CONN;
3573}
3574
3575sub stop {
3576 my ($self) = @_;
3577
3578 $self->{rec_btn}->set_text ("start recording");
3579 $self->{recording} = 0;
3580
3581 my $rec;
3582 $rec = $::CONN->stop_record if $::CONN;
3583 return unless ref $rec eq 'ARRAY';
3584 $self->set_command_list ($rec);
3585}
3586
3587
3588sub ask_for_bind_and_commit {
3589 my ($self) = @_;
3590 $self->ask_for_bind (1);
3591}
3592
3593sub ask_for_bind {
3594 my ($self, $commit, $end_cb) = @_;
3595
3596 CFClient::Binder::open_binding_dialog (sub {
3597 my ($mod, $sym) = @_;
3598 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3599 $self->update_binding_widgets;
3600 $self->commit if $commit;
3601 $end_cb->() if $end_cb;
3602 });
3603}
3604
3605# $mod and $sym are the modifiers and key symbol
3606# $cmds is a array ref of strings (the commands)
3607# $cb is the callback that is executed on OK
3608# $ccb is the callback that is executed on CANCEL and
3609# when the binding was unsuccessful on OK
3610sub set_binding {
3611 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3612
3613 $self->clear_command_list;
3614 $self->{recording} = 0;
3615 $self->{rec_btn}->set_text ("start recording");
3616
3617 $self->{binding} = [$mod, $sym];
3618 $self->{commands} = $cmds;
3619
3620 $self->{binding_change} = $cb;
3621 $self->{binding_cancel} = $ccb;
3622
3623 $self->update_binding_widgets;
3624}
3625
3626# this is a shortcut method that asks for a binding
3627# and then just binds it.
3628sub do_quick_binding {
3629 my ($self, $cmds, $end_cb) = @_;
3630 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3631 $self->ask_for_bind (1, $end_cb);
3632}
3633
3634sub update_binding_widgets {
3635 my ($self) = @_;
3636 my ($mod, $sym, $cmds) = $self->get_binding;
3637 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3638 $self->set_command_list ($cmds);
3639}
3640
3641sub get_binding {
3642 my ($self) = @_;
3643 return (
3644 $self->{binding}->[0],
3645 $self->{binding}->[1],
3646 [ grep { defined $_ } @{$self->{commands}} ]
3647 );
3648}
3649
3650sub clear_command_list {
3651 my ($self) = @_;
3652 $self->{cmdbox}->clear ();
3653}
3654
3655sub set_command_list {
3656 my ($self, $cmds) = @_;
3657
3658 $self->{cmdbox}->clear ();
3659 $self->{commands} = $cmds;
3660
3661 my $idx = 0;
3662
3663 for (@$cmds) {
3664 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3665
3666 my $i = $idx;
3667 $hb->add (new CFClient::UI::Label text => $_);
3668 $hb->add (new CFClient::UI::Button
3669 text => "delete",
3670 tooltip => "Deletes the action from the record",
3671 on_activate => sub {
3672 $self->{cmdbox}->remove ($hb);
3673 $cmds->[$i] = undef;
3674 });
3675
3676
3677 $idx++
3678 }
3679}
3680
3681#############################################################################
3682
3683package CFClient::UI::SpellList;
3684
3685our @ISA = CFClient::UI::Table::;
3686
3687sub new {
3688 my $class = shift;
3689
3690 my $self = $class->SUPER::new (
3691 binding => [],
3692 commands => [],
3693 @_,
3694 )
3695}
3696
3697my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3698
3699my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3701my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3705my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3707my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3708 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3709
3710sub rebuild_spell_list {
3711 my ($self) = @_;
3712
3713 $CFClient::UI::ROOT->on_refresh ($self => sub {
3714 $self->clear;
3715
3716 return unless $::CONN;
3717
3718 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3719 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3720 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3721 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3722 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3723
3724 my $row = 0;
3725
3726 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3727 my $spell = $self->{spell}{$_};
3728
3729 $row++;
3730
3731 my $spell_cb = sub {
3732 my ($widget, $ev) = @_;
3733
3734 if ($ev->{button} == 1) {
3735 $::CONN->user_send ("cast $spell->{name}");
3736 } elsif ($ev->{button} == 2) {
3737 $::CONN->user_send ("invoke $spell->{name}");
3738 } elsif ($ev->{button} == 3) {
3739 (new CFClient::UI::Menu
3740 items => [
3741 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3742 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3743 ],
3744 )->popup ($ev);
3745 } else {
3746 return 0;
3747 }
3748
3749 1
3750 };
3751
3752 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3753
3754 #TODO: add path info to tooltip
3755 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3756
3757 $self->add (0, $row, new CFClient::UI::Face
3758 face => $spell->{face},
3759 can_hover => 1,
3760 can_events => 1,
3761 tooltip => $tooltip,
3762 on_button_down => $spell_cb,
3763 );
3764
3765 $self->add (1, $row, new CFClient::UI::Label
3766 expand => 1,
3767 text => $spell->{name},
3768 can_hover => 1,
3769 can_events => 1,
3770 tooltip => $tooltip,
3771 on_button_down => $spell_cb,
3772 );
3773
3774 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3775 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3776 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3777 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3778 }
3779 });
3780}
3781
3782sub add_spell {
3783 my ($self, $spell) = @_;
3784
3785 $self->{spell}->{$spell->{name}} = $spell;
3786 $self->rebuild_spell_list;
3787}
3788
3789sub remove_spell {
3790 my ($self, $spell) = @_;
3791
3792 delete $self->{spell}->{$spell->{name}};
3793 $self->rebuild_spell_list;
3794}
3795
3796sub clear_spells {
3797 my ($self) = @_;
3798
3799 $self->{spell} = {};
3800 $self->rebuild_spell_list;
3801}
3802
3803#############################################################################
3804
3805package CFClient::UI::Root; 3978package CFPlus::UI::Root;
3806 3979
3807our @ISA = CFClient::UI::Container::; 3980our @ISA = CFPlus::UI::Container::;
3808 3981
3809use List::Util qw(min max); 3982use List::Util qw(min max);
3810 3983
3811use CFClient::OpenGL; 3984use CFPlus::OpenGL;
3812 3985
3813sub new { 3986sub new {
3814 my $class = shift; 3987 my $class = shift;
3815 3988
3816 my $self = $class->SUPER::new ( 3989 my $self = $class->SUPER::new (
3817 visible => 1, 3990 visible => 1,
3818 @_, 3991 @_,
3819 ); 3992 );
3820 3993
3821 Scalar::Util::weaken ($self->{root} = $self); 3994 CFPlus::weaken ($self->{root} = $self);
3822 3995
3823 $self 3996 $self
3824} 3997}
3825 3998
3826sub size_request { 3999sub size_request {
… …
3921 while ($self->{refresh_hook}) { 4094 while ($self->{refresh_hook}) {
3922 $_->() 4095 $_->()
3923 for values %{delete $self->{refresh_hook}}; 4096 for values %{delete $self->{refresh_hook}};
3924 } 4097 }
3925 4098
3926 if ($self->{realloc}) { 4099 while ($self->{realloc}) {
3927 my %queue; 4100 my %queue;
3928 my @queue; 4101 my @queue;
3929 my $widget; 4102 my $widget;
3930 4103
3931 outer: 4104 outer:
… …
3978 } 4151 }
3979 } 4152 }
3980 4153
3981 delete $self->{realloc}{$widget+0}; 4154 delete $self->{realloc}{$widget+0};
3982 } 4155 }
3983 }
3984 4156
3985 while (my $size_alloc = delete $self->{size_alloc}) { 4157 while (my $size_alloc = delete $self->{size_alloc}) {
3986 my @queue = sort { $b->{visible} <=> $a->{visible} } 4158 my @queue = sort { $a->{visible} <=> $b->{visible} }
3987 values %$size_alloc; 4159 values %$size_alloc;
3988 4160
3989 while () { 4161 while () {
3990 my $widget = pop @queue || last; 4162 my $widget = pop @queue || last;
3991 4163
3992 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4164 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3993 4165
3994 $w = 0 if $w < 0; 4166 $w = max $widget->{min_w}, $w;
3995 $h = 0 if $h < 0; 4167 $h = max $widget->{min_h}, $h;
3996 4168
4169# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4170# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4171
4172 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4173 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4174
3997 $w = int $w + 0.5; 4175 $w = int $w + 0.5;
3998 $h = int $h + 0.5; 4176 $h = int $h + 0.5;
3999 4177
4000 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4178 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4001 $widget->{old_w} = $widget->{w}; 4179 $widget->{old_w} = $widget->{w};
4002 $widget->{old_h} = $widget->{h}; 4180 $widget->{old_h} = $widget->{h};
4003 4181
4004 $widget->{w} = $w; 4182 $widget->{w} = $w;
4005 $widget->{h} = $h; 4183 $widget->{h} = $h;
4006 4184
4007 $widget->emit (size_allocate => $w, $h); 4185 $widget->emit (size_allocate => $w, $h);
4186 }
4008 } 4187 }
4009 } 4188 }
4010 } 4189 }
4011 4190
4012 while ($self->{post_alloc_hook}) { 4191 while ($self->{post_alloc_hook}) {
4013 $_->() 4192 $_->()
4014 for values %{delete $self->{post_alloc_hook}}; 4193 for values %{delete $self->{post_alloc_hook}};
4015 } 4194 }
4016
4017 4195
4018 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4196 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4019 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4197 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4020 glClear GL_COLOR_BUFFER_BIT; 4198 glClear GL_COLOR_BUFFER_BIT;
4021 4199
… …
4024 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4202 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4025 glMatrixMode GL_MODELVIEW; 4203 glMatrixMode GL_MODELVIEW;
4026 glLoadIdentity; 4204 glLoadIdentity;
4027 4205
4028 { 4206 {
4029 package CFClient::UI::Base; 4207 package CFPlus::UI::Base;
4030 4208
4031 ($draw_x, $draw_y, $draw_w, $draw_h) = 4209 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4032 (0, 0, $self->{w}, $self->{h}); 4210 (0, 0, $self->{w}, $self->{h});
4033 }
4034 4211
4035 $self->_draw; 4212 $self->_draw;
4213 }
4036} 4214}
4037 4215
4038############################################################################# 4216#############################################################################
4039 4217
4040package CFClient::UI; 4218package CFPlus::UI;
4041 4219
4042$ROOT = new CFClient::UI::Root; 4220$ROOT = new CFPlus::UI::Root;
4043$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4221$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4044 4222
40451 42231
4046 4224

Diff Legend

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