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

Diff Legend

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