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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines