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.329 by root, Sun Jul 23 02:44:06 2006 UTC vs.
Revision 1.467 by root, Wed Sep 3 06:07:39 2008 UTC

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

Diff Legend

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