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.441 by root, Mon Oct 8 16:10:14 2007 UTC

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

Diff Legend

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