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.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.434 by root, Wed Aug 22 21:32:09 2007 UTC

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

Diff Legend

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