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

Diff Legend

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