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.293 by root, Tue Jun 6 03:05:16 2006 UTC vs.
Revision 1.457 by root, Fri Dec 28 15:05:20 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
320 $self->{x} = List::Util::max 0, int $x; 353 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
321 $self->{y} = List::Util::max 0, int $y; 354 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322 $self->{z} = $z if defined $z; 355 $self->{z} = $z if defined $z;
323 356
324 $self->update; 357 $self->update;
325} 358}
326 359
… …
329 362
330 $self->{force_w} = $w; 363 $self->{force_w} = $w;
331 $self->{force_h} = $h; 364 $self->{force_h} = $h;
332 365
333 $self->realloc; 366 $self->realloc;
367}
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)
334} 377}
335 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 if ($tex->{format} == GL_ALPHA) { 2060# DC::OpenGL::glNewList $self->{list};
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 2061# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1665 glColor @{$self->{fg}}; 2062# DC::OpenGL::glEndList;
1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1670 } 2063# }
2064#
2065# DC::OpenGL::glCallList $self->{list};
1671 2066
1672 glDisable GL_TEXTURE_2D; 2067 $self->{layout}->draw;
1673} 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#}
1674 2077
1675############################################################################# 2078#############################################################################
1676 2079
1677package CFClient::UI::EntryBase; 2080package DC::UI::EntryBase;
1678 2081
1679our @ISA = CFClient::UI::Label::; 2082our @ISA = DC::UI::Label::;
1680 2083
1681use CFClient::OpenGL; 2084use DC::OpenGL;
1682 2085
1683sub new { 2086sub new {
1684 my $class = shift; 2087 my $class = shift;
1685 2088
1686 $class->SUPER::new ( 2089 $class->SUPER::new (
1687 fg => [1, 1, 1], 2090 fg => [1, 1, 1],
1688 bg => [0, 0, 0, 0.2], 2091 bg => [0, 0, 0, 0.2],
2092 outline => [0.6, 0.3, 0.1],
1689 active_bg => [1, 1, 1, 0.5], 2093 active_bg => [0, 0, 1, .2],
1690 active_fg => [0, 0, 0], 2094 active_fg => [1, 1, 1],
2095 active_outline => [1, 1, 0],
1691 can_hover => 1, 2096 can_hover => 1,
1692 can_focus => 1, 2097 can_focus => 1,
1693 valign => 0, 2098 valign => 0,
1694 can_events => 1, 2099 can_events => 1,
2100 ellipsise => 0,
2101 padding_x => 4,
2102 padding_y => 2,
1695 #text => ... 2103 #text => ...
1696 #hidden => "*", 2104 #hidden => "*",
1697 @_ 2105 @_
1698 ) 2106 )
1699} 2107}
… …
1710 2118
1711 $text =~ s/./*/g if $self->{hidden}; 2119 $text =~ s/./*/g if $self->{hidden};
1712 $self->{layout}->set_text ("$text "); 2120 $self->{layout}->set_text ("$text ");
1713 delete $self->{size_req}; 2121 delete $self->{size_req};
1714 2122
1715 $self->_emit (changed => $self->{text}); 2123 $self->emit (changed => $self->{text});
1716 2124
1717 $self->realloc; 2125 $self->realloc;
1718 $self->update; 2126 $self->update;
1719} 2127}
1720 2128
… …
1735 my ($w, $h) = $self->SUPER::size_request; 2143 my ($w, $h) = $self->SUPER::size_request;
1736 2144
1737 ($w + 1, $h) # add 1 for cursor 2145 ($w + 1, $h) # add 1 for cursor
1738} 2146}
1739 2147
1740sub key_down { 2148sub invoke_key_down {
1741 my ($self, $ev) = @_; 2149 my ($self, $ev) = @_;
1742 2150
1743 my $mod = $ev->{mod}; 2151 my $mod = $ev->{mod};
1744 my $sym = $ev->{sym}; 2152 my $sym = $ev->{sym};
1745 my $uni = $ev->{unicode}; 2153 my $uni = $ev->{unicode};
1746 2154
1747 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;
1748 2158
1749 if ($uni == 8) { 2159 if ($uni == 8) {
1750 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2160 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1751 } elsif ($uni == 127) { 2161 } elsif ($uni == 127) {
1752 substr $text, $self->{cursor}, 1, ""; 2162 substr $text, $self->{cursor}, 1, "";
1753 } elsif ($sym == CFClient::SDLK_LEFT) { 2163 } elsif ($sym == DC::SDLK_LEFT) {
1754 --$self->{cursor} if $self->{cursor}; 2164 --$self->{cursor} if $self->{cursor};
1755 } elsif ($sym == CFClient::SDLK_RIGHT) { 2165 } elsif ($sym == DC::SDLK_RIGHT) {
1756 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2166 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1757 } 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 = "";
1758 $self->{cursor} = 0; 2181 $self->{cursor} = 0;
1759 } elsif ($sym == CFClient::SDLK_END) {
1760 $self->{cursor} = length $text;
1761 } elsif ($uni == 27) { 2182 } elsif ($uni == 27) {
1762 $self->_emit ('escape'); 2183 $self->emit ('escape');
1763 } elsif ($uni) { 2184 } elsif ($uni == 0x0d) {
2185 substr $text, $self->{cursor}++, 0, "\012";
2186 } elsif ($uni >= 0x20) {
1764 substr $text, $self->{cursor}++, 0, chr $uni; 2187 substr $text, $self->{cursor}++, 0, chr $uni;
1765 } else { 2188 } else {
1766 return 0; 2189 return 0;
1767 } 2190 }
1768 2191
1769 $self->_set_text ($text); 2192 $self->_set_text ($text);
1770 2193
1771 $self->realloc; 2194 $self->realloc;
2195 $self->update;
1772 2196
1773 1 2197 1
1774} 2198}
1775 2199
1776sub focus_in { 2200sub invoke_focus_in {
1777 my ($self) = @_; 2201 my ($self) = @_;
1778 2202
1779 $self->{last_activity} = $::NOW; 2203 $self->{last_activity} = $::NOW;
1780 2204
1781 $self->SUPER::focus_in; 2205 $self->SUPER::invoke_focus_in
1782} 2206}
1783 2207
1784sub button_down { 2208sub invoke_button_down {
1785 my ($self, $ev, $x, $y) = @_; 2209 my ($self, $ev, $x, $y) = @_;
1786 2210
1787 $self->SUPER::button_down ($ev, $x, $y); 2211 $self->SUPER::invoke_button_down ($ev, $x, $y);
1788 2212
1789 my $idx = $self->{layout}->xy_to_index ($x, $y); 2213 my $idx = $self->{layout}->xy_to_index ($x, $y);
1790 2214
1791 # byte-index to char-index 2215 # byte-index to char-index
1792 my $text = $self->{text}; 2216 my $text = $self->{text};
1793 utf8::encode $text; 2217 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1794 $self->{cursor} = length substr $text, 0, $idx; 2218 $self->{cursor} = length $text;
1795 2219
1796 $self->_set_text ($self->{text}); 2220 $self->_set_text ($self->{text});
1797 $self->update; 2221 $self->update;
1798 2222
1799 1 2223 1
1800} 2224}
1801 2225
1802sub mouse_motion { 2226sub invoke_mouse_motion {
1803 my ($self, $ev, $x, $y) = @_; 2227 my ($self, $ev, $x, $y) = @_;
1804# 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#
1805 2229
1806 0 2230 1
1807} 2231}
1808 2232
1809sub _draw { 2233sub _draw {
1810 my ($self) = @_; 2234 my ($self) = @_;
1811 2235
… …
1818 glColor_premultiply @{$self->{bg}}; 2242 glColor_premultiply @{$self->{bg}};
1819 } 2243 }
1820 2244
1821 glEnable GL_BLEND; 2245 glEnable GL_BLEND;
1822 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2246 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1823 glBegin GL_QUADS;
1824 glVertex 0 , 0;
1825 glVertex 0 , $self->{h};
1826 glVertex $self->{w}, $self->{h}; 2247 glRect 0, 0, $self->{w}, $self->{h};
1827 glVertex $self->{w}, 0;
1828 glEnd;
1829 glDisable GL_BLEND; 2248 glDisable GL_BLEND;
1830 2249
1831 $self->SUPER::_draw; 2250 $self->SUPER::_draw;
1832 2251
1833 #TODO: force update every cursor change :( 2252 #TODO: force update every cursor change :(
… …
1835 2254
1836 unless (exists $self->{cur_h}) { 2255 unless (exists $self->{cur_h}) {
1837 my $text = substr $self->{text}, 0, $self->{cursor}; 2256 my $text = substr $self->{text}, 0, $self->{cursor};
1838 utf8::encode $text; 2257 utf8::encode $text;
1839 2258
1840 @$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);
1841 } 2260 }
1842 2261
1843 glColor @{$self->{fg}}; 2262 glColor_premultiply @{$self->{active_fg}};
1844 glBegin GL_LINES; 2263 glBegin GL_LINES;
1845 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2264 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1846 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};
1847 glEnd; 2266 glEnd;
1848 }
1849}
1850 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
1851package CFClient::UI::Entry; 2286package DC::UI::Entry;
1852 2287
1853our @ISA = CFClient::UI::EntryBase::; 2288our @ISA = DC::UI::EntryBase::;
1854 2289
1855use CFClient::OpenGL; 2290use DC::OpenGL;
1856 2291
1857sub key_down { 2292sub invoke_key_down {
1858 my ($self, $ev) = @_; 2293 my ($self, $ev) = @_;
1859 2294
1860 my $sym = $ev->{sym}; 2295 my $sym = $ev->{sym};
1861 2296
1862 if ($sym == 13) { 2297 if ($ev->{uni} == 0x0d || $sym == 13) {
1863 unshift @{$self->{history}}, 2298 unshift @{$self->{history}},
1864 my $txt = $self->get_text; 2299 my $txt = $self->get_text;
2300
1865 $self->{history_pointer} = -1; 2301 $self->{history_pointer} = -1;
1866 $self->{history_saveback} = ''; 2302 $self->{history_saveback} = '';
1867 $self->_emit (activate => $txt); 2303 $self->emit (activate => $txt);
1868 $self->update; 2304 $self->update;
1869 2305
1870 } elsif ($sym == CFClient::SDLK_UP) { 2306 } elsif ($sym == DC::SDLK_UP) {
1871 if ($self->{history_pointer} < 0) { 2307 if ($self->{history_pointer} < 0) {
1872 $self->{history_saveback} = $self->get_text; 2308 $self->{history_saveback} = $self->get_text;
1873 } 2309 }
1874 if (@{$self->{history} || []} > 0) { 2310 if (@{$self->{history} || []} > 0) {
1875 $self->{history_pointer}++; 2311 $self->{history_pointer}++;
… …
1877 $self->{history_pointer} = @{$self->{history} || []} - 1; 2313 $self->{history_pointer} = @{$self->{history} || []} - 1;
1878 } 2314 }
1879 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2315 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1880 } 2316 }
1881 2317
1882 } elsif ($sym == CFClient::SDLK_DOWN) { 2318 } elsif ($sym == DC::SDLK_DOWN) {
1883 $self->{history_pointer}--; 2319 $self->{history_pointer}--;
1884 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2320 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1885 2321
1886 if ($self->{history_pointer} >= 0) { 2322 if ($self->{history_pointer} >= 0) {
1887 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2323 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1888 } else { 2324 } else {
1889 $self->set_text ($self->{history_saveback}); 2325 $self->set_text ($self->{history_saveback});
1890 } 2326 }
1891 2327
1892 } else { 2328 } else {
1893 return $self->SUPER::key_down ($ev) 2329 return $self->SUPER::invoke_key_down ($ev)
1894 } 2330 }
1895 2331
1896 1 2332 1
1897} 2333}
1898 2334
1899############################################################################# 2335#############################################################################
1900 2336
1901package CFClient::UI::Button; 2337package DC::UI::TextEdit;
1902 2338
1903our @ISA = CFClient::UI::Label::; 2339our @ISA = DC::UI::EntryBase::;
1904 2340
1905use CFClient::OpenGL; 2341use DC::OpenGL;
1906
1907my @tex =
1908 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1909 qw(b1_button_active.png);
1910 2342
1911sub new { 2343sub new {
1912 my $class = shift; 2344 my $class = shift;
1913 2345
1914 $class->SUPER::new ( 2346 $class->SUPER::new (
1915 padding_x => 4,
1916 padding_y => 4, 2347 padding_y => 4,
1917 fg => [1, 1, 1], 2348
1918 active_fg => [0, 0, 1], 2349 @_
2350 )
2351}
2352
2353sub move_cursor_ver {
2354 my ($self, $dy) = @_;
2355
2356 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2357 warn "cursor $self->{cursor} => $x $line\n";#d#
2358
2359 $line += $dy;
2360
2361 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2362 warn "index $x $line => $index\n";#d#
2363 $self->{cursor} = $index;
2364 delete $self->{cur_h};
2365 $self->update;
2366 return;
2367 }
2368}
2369
2370sub invoke_key_down {
2371 my ($self, $ev) = @_;
2372
2373 my $sym = $ev->{sym};
2374
2375 if ($sym == DC::SDLK_UP) {
2376 $self->move_cursor_ver (-1);
2377 } elsif ($sym == DC::SDLK_DOWN) {
2378 $self->move_cursor_ver (+1);
2379 } else {
2380 return $self->SUPER::invoke_key_down ($ev)
2381 }
2382
2383 1
2384}
2385
2386#############################################################################
2387
2388package DC::UI::ButtonBin;
2389
2390our @ISA = DC::UI::Bin::;
2391
2392use DC::OpenGL;
2393
2394my @tex =
2395 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2396 qw(b1_button_inactive.png b1_button_active.png);
2397
2398sub new {
2399 my $class = shift;
2400
2401 $class->SUPER::new (
1919 can_hover => 1, 2402 can_hover => 1,
1920 align => 0, 2403 align => 0,
1921 valign => 0, 2404 valign => 0,
1922 can_events => 1, 2405 can_events => 1,
1923 @_ 2406 @_
1924 ) 2407 )
1925} 2408}
1926 2409
1927sub activate { }
1928
1929sub button_up { 2410sub invoke_button_up {
1930 my ($self, $ev, $x, $y) = @_; 2411 my ($self, $ev, $x, $y) = @_;
1931 2412
1932 $self->emit ("activate") 2413 $self->emit ("activate")
1933 if $x >= 0 && $x < $self->{w} 2414 if $x >= 0 && $x < $self->{w}
1934 && $y >= 0 && $y < $self->{h}; 2415 && $y >= 0 && $y < $self->{h};
… …
1937} 2418}
1938 2419
1939sub _draw { 2420sub _draw {
1940 my ($self) = @_; 2421 my ($self) = @_;
1941 2422
1942 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1943
1944 glEnable GL_TEXTURE_2D; 2423 glEnable GL_TEXTURE_2D;
1945 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2424 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1946 glColor 0, 0, 0, 1; 2425 glColor 0, 0, 0, 1;
1947 2426
2427 my $tex = $tex[$GRAB == $self];
1948 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2428 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1949 2429
1950 glDisable GL_TEXTURE_2D; 2430 glDisable GL_TEXTURE_2D;
1951 2431
1952 $self->SUPER::_draw; 2432 $self->SUPER::_draw;
1953} 2433}
1954 2434
1955############################################################################# 2435#############################################################################
1956 2436
1957package CFClient::UI::CheckBox; 2437package DC::UI::Button;
1958 2438
1959our @ISA = CFClient::UI::DrawBG::; 2439our @ISA = DC::UI::Label::;
2440
2441use DC::OpenGL;
1960 2442
1961my @tex = 2443my @tex =
1962 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2444 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2445 qw(b1_button_inactive.png b1_button_active.png);
2446
2447sub new {
2448 my $class = shift;
2449
2450 $class->SUPER::new (
2451 padding_x => 8,
2452 padding_y => 4,
2453 fg => [1.0, 1.0, 1.0],
2454 active_fg => [0.8, 0.8, 0.8],
2455 can_hover => 1,
2456 align => 0,
2457 valign => 0,
2458 can_events => 1,
2459 @_
2460 )
2461}
2462
2463sub invoke_button_up {
2464 my ($self, $ev, $x, $y) = @_;
2465
2466 $self->emit ("activate")
2467 if $x >= 0 && $x < $self->{w}
2468 && $y >= 0 && $y < $self->{h};
2469
2470 1
2471}
2472
2473sub _draw {
2474 my ($self) = @_;
2475
2476 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2477
2478 glEnable GL_TEXTURE_2D;
2479 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2480 glColor 0, 0, 0, 1;
2481
2482 my $tex = $tex[$GRAB == $self];
2483 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2484
2485 glDisable GL_TEXTURE_2D;
2486
2487 $self->SUPER::_draw;
2488}
2489
2490#############################################################################
2491
2492package DC::UI::CheckBox;
2493
2494our @ISA = DC::UI::DrawBG::;
2495
2496my @tex =
2497 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1963 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2498 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1964 2499
1965use CFClient::OpenGL; 2500use DC::OpenGL;
1966 2501
1967sub new { 2502sub new {
1968 my $class = shift; 2503 my $class = shift;
1969 2504
1970 $class->SUPER::new ( 2505 $class->SUPER::new (
… …
1984 my ($self) = @_; 2519 my ($self) = @_;
1985 2520
1986 (6) x 2 2521 (6) x 2
1987} 2522}
1988 2523
2524sub toggle {
2525 my ($self) = @_;
2526
2527 $self->{state} = !$self->{state};
2528 $self->emit (changed => $self->{state});
2529 $self->update;
2530}
2531
1989sub button_down { 2532sub invoke_button_down {
1990 my ($self, $ev, $x, $y) = @_; 2533 my ($self, $ev, $x, $y) = @_;
1991 2534
1992 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2535 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1993 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2536 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1994 $self->{state} = !$self->{state}; 2537 $self->toggle;
1995 $self->_emit (changed => $self->{state});
1996 } else { 2538 } else {
1997 return 0 2539 return 0
1998 } 2540 }
1999 2541
2000 1 2542 1
… …
2003sub _draw { 2545sub _draw {
2004 my ($self) = @_; 2546 my ($self) = @_;
2005 2547
2006 $self->SUPER::_draw; 2548 $self->SUPER::_draw;
2007 2549
2008 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2550 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2009 2551
2010 my ($w, $h) = @$self{qw(w h)}; 2552 my ($w, $h) = @$self{qw(w h)};
2011 2553
2012 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2554 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2013 2555
… …
2020 glDisable GL_TEXTURE_2D; 2562 glDisable GL_TEXTURE_2D;
2021} 2563}
2022 2564
2023############################################################################# 2565#############################################################################
2024 2566
2025package CFClient::UI::Image; 2567package DC::UI::Image;
2026 2568
2027our @ISA = CFClient::UI::Base::; 2569our @ISA = DC::UI::Base::;
2028 2570
2029use CFClient::OpenGL; 2571use DC::OpenGL;
2030use Carp qw/confess/;
2031 2572
2032our %loaded_images; 2573our %texture_cache;
2033 2574
2034sub new { 2575sub new {
2035 my $class = shift; 2576 my $class = shift;
2036 2577
2037 my $self = $class->SUPER::new (can_events => 0, @_); 2578 my $self = $class->SUPER::new (
2579 can_events => 0,
2580 scale => 1,
2581 @_,
2582 );
2038 2583
2039 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2584 $self->{path} || $self->{tex}
2585 or Carp::croak "'path' or 'tex' attributes required";
2040 2586
2041 $loaded_images{$self->{image}} ||= 2587 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2042 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2588 new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1;
2043 2589
2044 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2590 DC::weaken $texture_cache{$self->{path}};
2045 2591
2046 Scalar::Util::weaken $loaded_images{$self->{image}}; 2592 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2047
2048 $self->{aspect} = $tex->{w} / $tex->{h};
2049 2593
2050 $self 2594 $self
2051} 2595}
2052 2596
2597sub STORABLE_freeze {
2598 my ($self, $cloning) = @_;
2599
2600 $self->{path}
2601 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2602
2603 $self->{path}
2604}
2605
2606sub STORABLE_attach {
2607 my ($self, $cloning, $path) = @_;
2608
2609 $self->new (path => $path)
2610}
2611
2053sub size_request { 2612sub size_request {
2054 my ($self) = @_; 2613 my ($self) = @_;
2055 2614
2056 ($self->{tex}->{w}, $self->{tex}->{h}) 2615 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2057} 2616}
2058 2617
2059sub _draw { 2618sub _draw {
2060 my ($self) = @_; 2619 my ($self) = @_;
2061 2620
… …
2078 glDisable GL_TEXTURE_2D; 2637 glDisable GL_TEXTURE_2D;
2079} 2638}
2080 2639
2081############################################################################# 2640#############################################################################
2082 2641
2642package DC::UI::ImageButton;
2643
2644our @ISA = DC::UI::Image::;
2645
2646use DC::OpenGL;
2647
2648my %textures;
2649
2650sub new {
2651 my $class = shift;
2652
2653 my $self = $class->SUPER::new (
2654 padding_x => 4,
2655 padding_y => 4,
2656 fg => [1, 1, 1],
2657 active_fg => [0, 0, 1],
2658 can_hover => 1,
2659 align => 0,
2660 valign => 0,
2661 can_events => 1,
2662 @_
2663 );
2664}
2665
2666sub invoke_button_down {
2667 my ($self, $ev, $x, $y) = @_;
2668
2669 1
2670}
2671
2672sub invoke_button_up {
2673 my ($self, $ev, $x, $y) = @_;
2674
2675 $self->emit ("activate")
2676 if $x >= 0 && $x < $self->{w}
2677 && $y >= 0 && $y < $self->{h};
2678
2679 1
2680}
2681
2682#############################################################################
2683
2083package CFClient::UI::VGauge; 2684package DC::UI::VGauge;
2084 2685
2085our @ISA = CFClient::UI::Base::; 2686our @ISA = DC::UI::Base::;
2086 2687
2087use List::Util qw(min max); 2688use List::Util qw(min max);
2088 2689
2089use CFClient::OpenGL; 2690use DC::OpenGL;
2090 2691
2091my %tex = ( 2692my %tex = (
2092 food => [ 2693 food => [
2093 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2694 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2094 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2695 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2095 ], 2696 ],
2096 grace => [ 2697 grace => [
2097 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2698 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2098 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2699 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2099 ], 2700 ],
2100 hp => [ 2701 hp => [
2101 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2702 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2102 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2703 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2103 ], 2704 ],
2104 mana => [ 2705 mana => [
2105 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2706 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2106 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2707 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2107 ], 2708 ],
2108); 2709);
2109 2710
2110# eg. VGauge->new (gauge => 'food'), default gauge: food 2711# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2170 my $ycut1 = max 0, min 1, $ycut; 2771 my $ycut1 = max 0, min 1, $ycut;
2171 my $ycut2 = max 0, min 1, $ycut - 1; 2772 my $ycut2 = max 0, min 1, $ycut - 1;
2172 2773
2173 my $h1 = $self->{h} * (1 - $ycut1); 2774 my $h1 = $self->{h} * (1 - $ycut1);
2174 my $h2 = $self->{h} * (1 - $ycut2); 2775 my $h2 = $self->{h} * (1 - $ycut2);
2776 my $h3 = $self->{h};
2777
2778 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2175 2779
2176 glEnable GL_BLEND; 2780 glEnable GL_BLEND;
2177 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2781 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2178 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2782 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2179 glEnable GL_TEXTURE_2D; 2783 glEnable GL_TEXTURE_2D;
… …
2198 2802
2199 if ($t3) { 2803 if ($t3) {
2200 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2804 glBindTexture GL_TEXTURE_2D, $t3->{name};
2201 glBegin GL_QUADS; 2805 glBegin GL_QUADS;
2202 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2806 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2203 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2807 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2204 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2808 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2205 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2809 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2206 glEnd; 2810 glEnd;
2207 } 2811 }
2208 2812
2209 glDisable GL_BLEND; 2813 glDisable GL_BLEND;
2210 glDisable GL_TEXTURE_2D; 2814 glDisable GL_TEXTURE_2D;
2211} 2815}
2212 2816
2213############################################################################# 2817#############################################################################
2214 2818
2819package DC::UI::Progress;
2820
2821our @ISA = DC::UI::Label::;
2822
2823use DC::OpenGL;
2824
2825sub new {
2826 my ($class, %arg) = @_;
2827
2828 my $self = $class->SUPER::new (
2829 fg => [1, 1, 1],
2830 bg => [0, 0, 1, 0.2],
2831 bar => [0.7, 0.5, 0.1, 0.8],
2832 outline => [0.4, 0.3, 0],
2833 fontsize => 0.9,
2834 valign => 0,
2835 align => 0,
2836 can_events => 1,
2837 ellipsise => 1,
2838 label => "%d%%",
2839 %arg,
2840 );
2841
2842 $self->set_value ($arg{value} || -1);
2843
2844 $self
2845}
2846
2847sub set_label {
2848 my ($self, $label) = @_;
2849
2850 return if $self->{label} eq $label;
2851 $self->{label} = $label;
2852
2853 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2854}
2855
2856sub set_value {
2857 my ($self, $value) = @_;
2858
2859 if ($self->{value} ne $value) {
2860 $self->{value} = $value;
2861
2862 if ($value < 0) {
2863 $self->set_text ("-");
2864 } else {
2865 $self->set_text (sprintf $self->{label}, $value * 100);
2866 }
2867
2868 $self->update;
2869 }
2870}
2871
2872sub _draw {
2873 my ($self) = @_;
2874
2875 glEnable GL_BLEND;
2876 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2877
2878 if ($self->{value} >= 0) {
2879 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2880
2881 glColor_premultiply @{$self->{bar}};
2882 glRect 2, 2, $s, $self->{h} - 2;
2883 glColor_premultiply @{$self->{bg}};
2884 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2885 }
2886
2887 glColor_premultiply @{$self->{outline}};
2888 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2889
2890 glDisable GL_BLEND;
2891
2892 {
2893 local $self->{bg}; # do not draw background
2894 $self->SUPER::_draw;
2895 }
2896}
2897
2898#############################################################################
2899
2900package DC::UI::ExperienceProgress;
2901
2902our @ISA = DC::UI::Progress::;
2903
2904sub new {
2905 my ($class, %arg) = @_;
2906
2907 my $self = $class->SUPER::new (
2908 tooltip => sub {
2909 my ($self) = @_;
2910
2911 sprintf "level %d\n%s points\n%s next level\n%s to go",
2912 $self->{lvl},
2913 ::formsep ($self->{exp}),
2914 ::formsep ($self->{nxt}),
2915 ::formsep ($self->{nxt} - $self->{exp}),
2916 },
2917 %arg
2918 );
2919
2920 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2921 if $::CONN;
2922
2923 $self
2924}
2925
2926sub DESTROY {
2927 my ($self) = @_;
2928
2929 delete $::CONN->{on_exp_update}{$self+0}
2930 if $::CONN;
2931
2932 $self->SUPER::DESTROY;
2933}
2934
2935sub set_value {
2936 my ($self, $lvl, $exp) = @_;
2937
2938 $self->{lvl} = $lvl;
2939 $self->{exp} = $exp;
2940
2941 my $v = -1;
2942
2943 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2944 my $l0 = $table->[$lvl - 1];
2945 my $l1 = $table->[$lvl];
2946
2947 $self->{nxt} = $l1;
2948
2949 $v = ($exp - $l0) / ($l1 - $l0);
2950 }
2951
2952 $self->SUPER::set_value ($v);
2953}
2954
2955#############################################################################
2956
2215package CFClient::UI::Gauge; 2957package DC::UI::Gauge;
2216 2958
2217our @ISA = CFClient::UI::VBox::; 2959our @ISA = DC::UI::VBox::;
2218 2960
2219sub new { 2961sub new {
2220 my ($class, %arg) = @_; 2962 my ($class, %arg) = @_;
2221 2963
2222 my $self = $class->SUPER::new ( 2964 my $self = $class->SUPER::new (
… …
2224 can_hover => 1, 2966 can_hover => 1,
2225 can_events => 1, 2967 can_events => 1,
2226 %arg, 2968 %arg,
2227 ); 2969 );
2228 2970
2229 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2971 $self->add ($self->{value} = new DC::UI::Label valign => +1, align => 0, template => "999");
2230 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2972 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2231 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2973 $self->add ($self->{max} = new DC::UI::Label valign => -1, align => 0, template => "999");
2232 2974
2233 $self 2975 $self
2234} 2976}
2235 2977
2236sub set_fontsize { 2978sub set_fontsize {
… …
2257 $self->{value}->set_text ($val); 2999 $self->{value}->set_text ($val);
2258} 3000}
2259 3001
2260############################################################################# 3002#############################################################################
2261 3003
2262package CFClient::UI::Slider; 3004package DC::UI::Slider;
2263 3005
2264use strict; 3006use strict;
2265 3007
2266use CFClient::OpenGL; 3008use DC::OpenGL;
2267 3009
2268our @ISA = CFClient::UI::DrawBG::; 3010our @ISA = DC::UI::DrawBG::;
2269 3011
2270my @tex = 3012my @tex =
2271 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 3013 map { new_from_file DC::Texture DC::find_rcfile $_ }
2272 qw(s1_slider.png s1_slider_bg.png); 3014 qw(s1_slider.png s1_slider_bg.png);
2273 3015
2274sub new { 3016sub new {
2275 my $class = shift; 3017 my $class = shift;
2276 3018
… …
2297 $self->update; 3039 $self->update;
2298 3040
2299 $self 3041 $self
2300} 3042}
2301 3043
2302sub changed { }
2303
2304sub set_range { 3044sub set_range {
2305 my ($self, $range) = @_; 3045 my ($self, $range) = @_;
2306 3046
2307 ($range, $self->{range}) = ($self->{range}, $range); 3047 ($range, $self->{range}) = ($self->{range}, $range);
2308 3048
2309 $self->update
2310 if "@$range" ne "@{$self->{range}}"; 3049 if ("@$range" ne "@{$self->{range}}") {
3050 $self->update;
3051 $self->set_value ($self->{range}[0]);
3052 }
2311} 3053}
2312 3054
2313sub set_value { 3055sub set_value {
2314 my ($self, $value) = @_; 3056 my ($self, $value) = @_;
2315 3057
… …
2326 if $unit; 3068 if $unit;
2327 3069
2328 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3070 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2329 3071
2330 if ($value != $old_value) { 3072 if ($value != $old_value) {
2331 $self->_emit (changed => $value); 3073 $self->emit (changed => $value);
2332 $self->update; 3074 $self->update;
2333 } 3075 }
2334} 3076}
2335 3077
2336sub size_request { 3078sub size_request {
2337 my ($self) = @_; 3079 my ($self) = @_;
2338 3080
2339 ($self->{req_w}, $self->{req_h}) 3081 ($self->{req_w}, $self->{req_h})
2340} 3082}
2341 3083
2342sub button_down { 3084sub invoke_button_down {
2343 my ($self, $ev, $x, $y) = @_; 3085 my ($self, $ev, $x, $y) = @_;
2344 3086
2345 $self->SUPER::button_down ($ev, $x, $y); 3087 $self->SUPER::invoke_button_down ($ev, $x, $y);
2346 3088
2347 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3089 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2348 3090
2349 $self->mouse_motion ($ev, $x, $y) 3091 $self->invoke_mouse_motion ($ev, $x, $y);
2350}
2351 3092
3093 1
3094}
3095
2352sub mouse_motion { 3096sub invoke_mouse_motion {
2353 my ($self, $ev, $x, $y) = @_; 3097 my ($self, $ev, $x, $y) = @_;
2354 3098
2355 if ($GRAB == $self) { 3099 if ($GRAB == $self) {
2356 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3100 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2357 3101
… …
2361 3105
2362 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3106 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2363 } else { 3107 } else {
2364 return 0; 3108 return 0;
2365 } 3109 }
3110
3111 1
3112}
3113
3114sub invoke_mouse_wheel {
3115 my ($self, $ev) = @_;
3116
3117 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3118
3119 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3120
3121 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2366 3122
2367 1 3123 1
2368} 3124}
2369 3125
2370sub update { 3126sub update {
… …
2421 glDisable GL_TEXTURE_2D; 3177 glDisable GL_TEXTURE_2D;
2422} 3178}
2423 3179
2424############################################################################# 3180#############################################################################
2425 3181
2426package CFClient::UI::ValSlider; 3182package DC::UI::ValSlider;
2427 3183
2428our @ISA = CFClient::UI::HBox::; 3184our @ISA = DC::UI::HBox::;
2429 3185
2430sub new { 3186sub new {
2431 my ($class, %arg) = @_; 3187 my ($class, %arg) = @_;
2432 3188
2433 my $range = delete $arg{range}; 3189 my $range = delete $arg{range};
2434 3190
2435 my $self = $class->SUPER::new ( 3191 my $self = $class->SUPER::new (
2436 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3192 slider => (new DC::UI::Slider expand => 1, range => $range),
2437 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3193 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2438 to_value => sub { shift }, 3194 to_value => sub { shift },
2439 from_value => sub { shift }, 3195 from_value => sub { shift },
2440 %arg, 3196 %arg,
2441 ); 3197 );
2442 3198
… …
2462sub set_range { shift->{slider}->set_range (@_) } 3218sub set_range { shift->{slider}->set_range (@_) }
2463sub set_value { shift->{slider}->set_value (@_) } 3219sub set_value { shift->{slider}->set_value (@_) }
2464 3220
2465############################################################################# 3221#############################################################################
2466 3222
2467package CFClient::UI::TextView; 3223package DC::UI::TextScroller;
2468 3224
2469our @ISA = CFClient::UI::HBox::; 3225our @ISA = DC::UI::HBox::;
2470 3226
2471use CFClient::OpenGL; 3227use DC::OpenGL;
2472 3228
2473sub new { 3229sub new {
2474 my $class = shift; 3230 my $class = shift;
2475 3231
2476 my $self = $class->SUPER::new ( 3232 my $self = $class->SUPER::new (
2477 fontsize => 1, 3233 fontsize => 1,
2478 can_events => 0, 3234 can_events => 1,
2479 indent => 0, 3235 indent => 0,
2480 #font => default_font 3236 #font => default_font
2481 @_, 3237 @_,
2482 3238
2483 layout => (new CFClient::Layout 1), 3239 layout => (new DC::Layout),
2484 par => [], 3240 par => [],
3241 max_par => 0,
2485 height => 0, 3242 height => 0,
2486 children => [ 3243 children => [
2487 (new CFClient::UI::Empty expand => 1), 3244 (new DC::UI::Empty expand => 1),
2488 (new CFClient::UI::Slider vertical => 1), 3245 (new DC::UI::Slider vertical => 1),
2489 ], 3246 ],
2490 ); 3247 );
2491 3248
2492 $self->{children}[1]->connect (changed => sub { $self->update }); 3249 $self->{children}[1]->connect (changed => sub { $self->update });
2493 3250
… …
2499 3256
2500 $self->{fontsize} = $fontsize; 3257 $self->{fontsize} = $fontsize;
2501 $self->reflow; 3258 $self->reflow;
2502} 3259}
2503 3260
3261sub size_request {
3262 my ($self) = @_;
3263
3264 my ($empty, $slider) = $self->visible_children;
3265
3266 local $self->{children} = [$empty, $slider];
3267 $self->SUPER::size_request
3268}
3269
2504sub size_allocate { 3270sub invoke_size_allocate {
2505 my ($self, $w, $h) = @_; 3271 my ($self, $w, $h) = @_;
2506 3272
2507 $self->SUPER::size_allocate ($w, $h); 3273 my ($empty, $slider, @other) = @{ $self->{children} };
3274 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2508 3275
2509 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3276 $self->{layout}->set_font ($self->{font}) if $self->{font};
2510 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3277 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2511 $self->{layout}->set_width ($self->{children}[0]{w}); 3278 $self->{layout}->set_width ($empty->{w});
2512 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3279 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2513 3280
2514 $self->reflow; 3281 $self->reflow;
2515}
2516 3282
2517sub text_size { 3283 local $self->{children} = [$empty, $slider];
3284 $self->SUPER::invoke_size_allocate ($w, $h)
3285}
3286
3287sub invoke_mouse_wheel {
2518 my ($self, $text, $indent) = @_; 3288 my ($self, $ev) = @_;
3289
3290 return 0 unless $ev->{dy}; # only vertical movements
3291
3292 $self->{children}[1]->emit (mouse_wheel => $ev);
3293
3294 1
3295}
3296
3297sub get_layout {
3298 my ($self, $para) = @_;
2519 3299
2520 my $layout = $self->{layout}; 3300 my $layout = $self->{layout};
2521 3301
3302 $layout->set_font ($self->{font}) if $self->{font};
3303 $layout->set_foreground (@{$para->{fg}});
2522 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3304 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2523 $layout->set_width ($self->{children}[0]{w} - $indent); 3305 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2524 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3306 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2525 $layout->set_markup ($text); 3307 $layout->set_markup ($para->{markup});
3308
3309 $layout->set_shapes (
3310 map
3311 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3312 @{$para->{widget}}
2526 3313 );
3314
2527 $layout->size 3315 $layout
2528} 3316}
2529 3317
2530sub reflow { 3318sub reflow {
2531 my ($self) = @_; 3319 my ($self) = @_;
2532 3320
… …
2539 3327
2540 # todo: base offset on lines or so, not on pixels 3328 # todo: base offset on lines or so, not on pixels
2541 $self->{children}[1]->set_value ($offset); 3329 $self->{children}[1]->set_value ($offset);
2542} 3330}
2543 3331
3332sub current_paragraph {
3333 my ($self) = @_;
3334
3335 $self->{top_paragraph} - 1
3336}
3337
3338sub scroll_to {
3339 my ($self, $para) = @_;
3340
3341 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3342
3343 $self->{scroll_to} = $para;
3344 $self->update;
3345}
3346
2544sub clear { 3347sub clear {
2545 my ($self) = @_; 3348 my ($self) = @_;
3349
3350 my (undef, undef, @other) = @{ $self->{children} };
3351 $self->remove ($_) for @other;
2546 3352
2547 $self->{par} = []; 3353 $self->{par} = [];
2548 $self->{height} = 0; 3354 $self->{height} = 0;
2549 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3355 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2550} 3356}
2551 3357
2552sub add_paragraph { 3358sub add_paragraph {
2553 my ($self, $color, $text, $indent) = @_; 3359 my $self = shift;
2554 3360
2555 for my $line (split /\n/, $text) { 3361 for my $para (@_) {
2556 my ($w, $h) = $self->text_size ($line); 3362 $para = {
3363 fg => [1, 1, 1, 1],
3364 indent => 0,
3365 markup => "",
3366 widget => [],
3367 ref $para ? %$para : (markup => $para),
3368 w => 1e10,
3369 wrapped => 1,
3370 };
3371
3372 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3373 push @{$self->{par}}, $para;
3374 }
3375
3376 if (my $max = $self->{max_par}) {
3377 shift @{$self->{par}} while @{$self->{par}} > $max;
3378 }
3379
3380 $self->{need_reflow}++;
3381 $self->update;
3382}
3383
3384sub scroll_to_bottom {
3385 my ($self) = @_;
3386
3387 $self->{scroll_to} = $#{$self->{par}};
3388 $self->update;
3389}
3390
3391sub force_uptodate {
3392 my ($self) = @_;
3393
3394 if (delete $self->{need_reflow}) {
3395 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3396
3397 my $height = 0;
3398
3399 for my $para (@{$self->{par}}) {
3400 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3401 my $layout = $self->get_layout ($para);
3402 my ($w, $h) = $layout->size;
3403
3404 $para->{w} = $w + $para->{indent};
3405 $para->{h} = $h;
3406 $para->{wrapped} = $layout->has_wrapped;
3407 }
3408
3409 $para->{y} = $height;
3410 $height += $para->{h};
3411 }
3412
2557 $self->{height} += $h; 3413 $self->{height} = $height;
2558 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3414 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2559 }
2560 3415
2561 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3416 delete $self->{texture};
3417 }
3418
3419 if (my $paridx = delete $self->{scroll_to}) {
3420 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3421 }
2562} 3422}
2563 3423
2564sub update { 3424sub update {
2565 my ($self) = @_; 3425 my ($self) = @_;
2566 3426
… …
2568 3428
2569 return unless $self->{h} > 0; 3429 return unless $self->{h} > 0;
2570 3430
2571 delete $self->{texture}; 3431 delete $self->{texture};
2572 3432
2573 $ROOT->on_post_alloc ($self, sub { 3433 $ROOT->on_post_alloc ($self => sub {
3434 $self->force_uptodate;
3435
2574 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3436 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2575 3437
2576 if (delete $self->{need_reflow}) {
2577 my $height = 0;
2578
2579 my $layout = $self->{layout};
2580
2581 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2582
2583 for (@{$self->{par}}) {
2584 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2585 $layout->set_width ($W - $_->[3]);
2586 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2587 $layout->set_markup ($_->[4]);
2588 my ($w, $h) = $layout->size;
2589 $_->[0] = $w + $_->[3];
2590 $_->[1] = $h;
2591 }
2592
2593 $height += $_->[1];
2594 }
2595
2596 $self->{height} = $height;
2597
2598 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2599
2600 delete $self->{texture};
2601 }
2602
2603 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3438 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2604 glClearColor 0, 0, 0, 0; 3439 glClearColor 0, 0, 0, 0;
2605 glClear GL_COLOR_BUFFER_BIT; 3440 glClear GL_COLOR_BUFFER_BIT;
2606 3441
3442 package DC::UI::Base;
3443 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3444 (0, 0, $self->{w}, $self->{h});
3445
3446 my $top = int $self->{children}[1]{range}[0];
3447
3448 my $paridx = 0;
3449 my $top_paragraph;
2607 my $top = int $self->{children}[1]{range}[0]; 3450 my $top = int $self->{children}[1]{range}[0];
2608 3451
2609 my $y0 = $top; 3452 my $y0 = $top;
2610 my $y1 = $top + $H; 3453 my $y1 = $top + $H;
2611 3454
2612 my $y = 0;
2613
2614 my $layout = $self->{layout};
2615
2616 $layout->set_font ($self->{font}) if $self->{font};
2617
2618 glEnable GL_BLEND;
2619 #TODO# not correct in windows where rgba is forced off
2620 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2621
2622 for my $par (@{$self->{par}}) { 3455 for my $para (@{$self->{par}}) {
2623 my $h = $par->[1]; 3456 my $h = $para->{h};
3457 my $y = $para->{y};
2624 3458
2625 if ($y0 < $y + $h && $y < $y1) { 3459 if ($y0 < $y + $h && $y < $y1) {
2626 $layout->set_foreground (@{ $par->[2] }); 3460 my $layout = $self->get_layout ($para);
2627 $layout->set_width ($W - $par->[3]);
2628 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2629 $layout->set_markup ($par->[4]);
2630 3461
2631 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3462 $layout->render ($para->{indent}, $y - $y0);
3463 $layout->draw;
2632 3464
2633 glRasterPos $par->[3], $y - $y0; 3465 if (my @w = @{ $para->{widget} }) {
2634 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3466 my @s = $layout->get_shapes;
3467
3468 for (@w) {
3469 my ($dx, $dy) = splice @s, 0, 2, ();
3470
3471 $_->{x} = $dx + $para->{indent};
3472 $_->{y} = $dy + $y - $y0;
3473
3474 $_->draw;
3475 }
3476 }
2635 } 3477 }
2636 3478
2637 $y += $h; 3479 $paridx++;
3480 $top_paragraph ||= $paridx if $y >= $top;
2638 } 3481 }
2639 3482
2640 glDisable GL_BLEND; 3483 $self->{top_paragraph} = $top_paragraph;
2641 }; 3484 };
2642 }); 3485 });
3486}
3487
3488sub reconfigure {
3489 my ($self) = @_;
3490
3491 $self->SUPER::reconfigure;
3492
3493 $_->{w} = 1e10 for @{ $self->{par} };
3494 $self->reflow;
2643} 3495}
2644 3496
2645sub _draw { 3497sub _draw {
2646 my ($self) = @_; 3498 my ($self) = @_;
2647 3499
… …
2650 glColor 0, 0, 0, 1; 3502 glColor 0, 0, 0, 1;
2651 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3503 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2652 glDisable GL_TEXTURE_2D; 3504 glDisable GL_TEXTURE_2D;
2653 3505
2654 $self->{children}[1]->draw; 3506 $self->{children}[1]->draw;
2655
2656} 3507}
2657 3508
2658############################################################################# 3509#############################################################################
2659 3510
2660package CFClient::UI::Animator; 3511package DC::UI::Animator;
2661 3512
2662use CFClient::OpenGL; 3513use DC::OpenGL;
2663 3514
2664our @ISA = CFClient::UI::Bin::; 3515our @ISA = DC::UI::Bin::;
2665 3516
2666sub moveto { 3517sub moveto {
2667 my ($self, $x, $y) = @_; 3518 my ($self, $x, $y) = @_;
2668 3519
2669 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3520 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2697 glPopMatrix; 3548 glPopMatrix;
2698} 3549}
2699 3550
2700############################################################################# 3551#############################################################################
2701 3552
2702package CFClient::UI::Flopper; 3553package DC::UI::Flopper;
2703 3554
2704our @ISA = CFClient::UI::Button::; 3555our @ISA = DC::UI::Button::;
2705 3556
2706sub new { 3557sub new {
2707 my $class = shift; 3558 my $class = shift;
2708 3559
2709 my $self = $class->SUPER::new ( 3560 my $self = $class->SUPER::new (
… …
2721 $self->{other}->toggle_visibility; 3572 $self->{other}->toggle_visibility;
2722} 3573}
2723 3574
2724############################################################################# 3575#############################################################################
2725 3576
2726package CFClient::UI::Tooltip; 3577package DC::UI::Tooltip;
2727 3578
2728our @ISA = CFClient::UI::Bin::; 3579our @ISA = DC::UI::Bin::;
2729 3580
2730use CFClient::OpenGL; 3581use DC::OpenGL;
2731 3582
2732sub new { 3583sub new {
2733 my $class = shift; 3584 my $class = shift;
2734 3585
2735 $class->SUPER::new ( 3586 $class->SUPER::new (
… …
2739} 3590}
2740 3591
2741sub set_tooltip_from { 3592sub set_tooltip_from {
2742 my ($self, $widget) = @_; 3593 my ($self, $widget) = @_;
2743 3594
2744 my $tooltip = $widget->{tooltip}; 3595 my $tip = $widget->{tooltip};
3596 $tip = $tip->($widget) if "CODE" eq ref $tip;
3597
3598 $tip = DC::Pod::section_label tooltip => $1
3599 if $tip =~ /^#(.*)$/;
2745 3600
2746 if ($ENV{CFPLUS_DEBUG} & 2) { 3601 if ($ENV{CFPLUS_DEBUG} & 2) {
2747 $tooltip .= "\n\n" . (ref $widget) . "\n" 3602 $tip .= "\n\n" . (ref $widget) . "\n"
2748 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3603 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2749 . "req $widget->{req_w} $widget->{req_h}\n" 3604 . "req $widget->{req_w} $widget->{req_h}\n"
2750 . "visible $widget->{visible}"; 3605 . "visible $widget->{visible}";
2751 } 3606 }
2752 3607
3608 $tip =~ s/^\n+//;
3609 $tip =~ s/\n+$//;
3610
2753 $self->add (new CFClient::UI::Label 3611 $self->add (new DC::UI::Label
2754 markup => $tooltip, 3612 markup => $tip,
2755 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3613 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2756 fontsize => 0.8, 3614 fontsize => 0.8,
2757 fg => [0, 0, 0, 1], 3615 style => 1, # FLAG_INVERSE
2758 ellipsise => 0, 3616 ellipsise => 0,
2759 font => ($widget->{tooltip_font} || $::FONT_PROP), 3617 font => ($widget->{tooltip_font} || $::FONT_PROP),
2760 ); 3618 );
2761} 3619}
2762 3620
… …
2766 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3624 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2767 3625
2768 ($w + 4, $h + 4) 3626 ($w + 4, $h + 4)
2769} 3627}
2770 3628
2771sub size_allocate { 3629sub invoke_size_allocate {
2772 my ($self, $w, $h) = @_; 3630 my ($self, $w, $h) = @_;
2773 3631
2774 $self->SUPER::size_allocate ($w - 4, $h - 4); 3632 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2775} 3633}
2776 3634
2777sub visibility_change { 3635sub invoke_visibility_change {
2778 my ($self, $visible) = @_; 3636 my ($self, $visible) = @_;
2779 3637
2780 return unless $visible; 3638 return unless $visible;
2781 3639
2782 $self->{root}->on_post_alloc ("move_$self" => sub { 3640 $self->{root}->on_post_alloc ("move_$self" => sub {
2783 my $widget = $self->{owner} 3641 my $widget = $self->{owner}
2784 or return; 3642 or return;
2785 3643
3644 if ($widget->{visible}) {
2786 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3645 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2787 3646
2788 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3647 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2789 if $x + $self->{w} > $::WIDTH; 3648 if $x + $self->{w} > $self->{root}{w};
2790 3649
2791 $self->move_abs ($x, $y); 3650 $self->move_abs ($x, $y);
3651 } else {
3652 $self->hide;
3653 }
2792 }); 3654 });
2793} 3655}
2794 3656
2795sub _draw { 3657sub _draw {
2796 my ($self) = @_; 3658 my ($self) = @_;
2797 3659
2798 glTranslate 0.375, 0.375;
2799
2800 my ($w, $h) = @$self{qw(w h)}; 3660 my ($w, $h) = @$self{qw(w h)};
2801 3661
2802 glColor 1, 0.8, 0.4; 3662 glColor 1, 0.8, 0.4;
2803 glBegin GL_QUADS; 3663 glRect 0, 0, $w, $h;
2804 glVertex 0 , 0;
2805 glVertex 0 , $h;
2806 glVertex $w, $h;
2807 glVertex $w, 0;
2808 glEnd;
2809 3664
2810 glColor 0, 0, 0; 3665 glColor 0, 0, 0;
2811 glBegin GL_LINE_LOOP; 3666 glRect_lineloop .5, .5, $w + .5, $h + .5;
2812 glVertex 0 , 0;
2813 glVertex 0 , $h;
2814 glVertex $w, $h;
2815 glVertex $w, 0;
2816 glEnd;
2817 3667
2818 glTranslate 2 - 0.375, 2 - 0.375; 3668 glTranslate 2, 2;
2819 3669
2820 $self->SUPER::_draw; 3670 $self->SUPER::_draw;
2821} 3671}
2822 3672
2823############################################################################# 3673#############################################################################
2824 3674
2825package CFClient::UI::Face; 3675package DC::UI::Face;
2826 3676
2827our @ISA = CFClient::UI::Base::; 3677our @ISA = DC::UI::DrawBG::;
2828 3678
2829use CFClient::OpenGL; 3679use DC::OpenGL;
2830 3680
2831sub new { 3681sub new {
2832 my $class = shift; 3682 my $class = shift;
2833 3683
2834 my $self = $class->SUPER::new ( 3684 my $self = $class->SUPER::new (
3685 size_w => 32,
3686 size_h => 8,
2835 aspect => 1, 3687 aspect => 1,
2836 can_events => 0, 3688 can_events => 0,
2837 @_, 3689 @_,
2838 ); 3690 );
2839 3691
2840 if ($self->{anim} && $self->{animspeed}) { 3692 if ($self->{anim} && $self->{animspeed}) {
2841 Scalar::Util::weaken (my $widget = $self); 3693 DC::weaken (my $widget = $self);
2842 3694
2843 $self->{timer} = Event->timer ( 3695 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
2844 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3696 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
2845 hard => 1, 3697 return unless $::CONN;
2846 interval => $self->{animspeed}, 3698
2847 cb => sub { 3699 my $w = $widget
3700 or return;
3701
2848 ++$widget->{frame}; 3702 ++$w->{frame};
3703 $w->update_face;
3704
3705 # somehow, $widget can go away
2849 $widget->update; 3706 $w->update;
2850 }, 3707 $w->update_timer;
2851 ); 3708 };
3709
3710 $self->update_face;
3711 $self->update_timer;
2852 } 3712 }
2853 3713
2854 $self 3714 $self
2855} 3715}
2856 3716
3717sub update_timer {
3718 my ($self) = @_;
3719
3720 return unless $self->{timer};
3721
3722 if ($self->{visible}) {
3723 $self->{timer}->start;
3724 } else {
3725 $self->{timer}->stop;
3726 }
3727}
3728
3729sub update_face {
3730 my ($self) = @_;
3731
3732 if ($::CONN) {
3733 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3734 if ($anim && @$anim) {
3735 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3736 delete $self->{face_change_cb};
3737
3738 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3739 unless ($tex->{name} || $tex->{loading}) {
3740 $tex->upload (sub { $self->reconfigure });
3741 }
3742 }
3743 }
3744 }
3745 }
3746}
3747
2857sub size_request { 3748sub size_request {
2858 (32, 8) 3749 my ($self) = @_;
3750
3751 if ($::CONN) {
3752 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3753 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3754 if ($tex->{name}) {
3755 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3756 } elsif (!$tex->{loading}) {
3757 $tex->upload (sub { $self->reconfigure });
3758 }
3759 }
3760
3761 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3762 }
3763 }
3764
3765 ($self->{size_w} || 8, $self->{size_h} || 8)
2859} 3766}
2860 3767
2861sub update { 3768sub update {
2862 my ($self) = @_; 3769 my ($self) = @_;
2863 3770
2864 return unless $self->{visible}; 3771 return unless $self->{visible};
2865 3772
2866 $self->SUPER::update; 3773 $self->SUPER::update;
2867} 3774}
2868 3775
3776sub invoke_visibility_change {
3777 my ($self) = @_;
3778
3779 $self->update_timer;
3780
3781 0
3782}
3783
2869sub _draw { 3784sub _draw {
2870 my ($self) = @_; 3785 my ($self) = @_;
2871 3786
2872 return unless $::CONN; 3787 $self->SUPER::_draw;
2873 3788
2874 my $face; 3789 if (my $tex = $self->{tex}) {
2875
2876 if ($self->{frame}) {
2877 my $anim = $::CONN->{anim}[$self->{anim}];
2878
2879 $face = $anim->[ $self->{frame} % @$anim ]
2880 if $anim && @$anim;
2881 }
2882
2883 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2884
2885 if ($tex) {
2886 glEnable GL_TEXTURE_2D; 3790 glEnable GL_TEXTURE_2D;
2887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3791 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2888 glColor 0, 0, 0, 1; 3792 glColor 0, 0, 0, 1;
2889 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3793 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2890 glDisable GL_TEXTURE_2D; 3794 glDisable GL_TEXTURE_2D;
2891 } 3795 }
2892} 3796}
2893 3797
2894sub DESTROY { 3798sub destroy {
2895 my ($self) = @_; 3799 my ($self) = @_;
2896 3800
2897 $self->{timer}->cancel 3801 (delete $self->{timer})->cancel
2898 if $self->{timer}; 3802 if $self->{timer};
2899 3803
2900 $self->SUPER::DESTROY; 3804 $self->SUPER::destroy;
2901} 3805}
2902 3806
2903############################################################################# 3807#############################################################################
2904 3808
2905package CFClient::UI::Buttonbar; 3809package DC::UI::Buttonbar;
2906 3810
2907our @ISA = CFClient::UI::HBox::; 3811our @ISA = DC::UI::HBox::;
2908 3812
2909# TODO: should actualyl wrap buttons and other goodies. 3813# TODO: should actually wrap buttons and other goodies.
2910 3814
2911############################################################################# 3815#############################################################################
2912 3816
2913package CFClient::UI::Menu; 3817package DC::UI::Menu;
2914 3818
2915our @ISA = CFClient::UI::FancyFrame::; 3819our @ISA = DC::UI::Toplevel::;
2916 3820
2917use CFClient::OpenGL; 3821use DC::OpenGL;
2918 3822
2919sub new { 3823sub new {
2920 my $class = shift; 3824 my $class = shift;
2921 3825
2922 my $self = $class->SUPER::new ( 3826 my $self = $class->SUPER::new (
2923 items => [], 3827 items => [],
2924 z => 100, 3828 z => 100,
2925 @_, 3829 @_,
2926 ); 3830 );
2927 3831
2928 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3832 $self->add ($self->{vbox} = new DC::UI::VBox);
2929 3833
2930 for my $item (@{ $self->{items} }) { 3834 for my $item (@{ $self->{items} }) {
2931 my ($widget, $cb, $tooltip) = @$item; 3835 my ($widget, $cb, $tooltip) = @$item;
2932 3836
2933 # handle various types of items, only text for now 3837 # handle various types of items, only text for now
2934 if (!ref $widget) { 3838 if (!ref $widget) {
3839 if ($widget =~ /\t/) {
3840 my ($left, $right) = split /\t/, $widget, 2;
3841
2935 $widget = new CFClient::UI::Label 3842 $widget = new DC::UI::HBox
2936 can_hover => 1, 3843 can_hover => 1,
2937 can_events => 1, 3844 can_events => 1,
2938 text => $widget,
2939 tooltip => $tooltip 3845 tooltip => $tooltip,
3846 children => [
3847 (new DC::UI::Label markup => $left, expand => 1),
3848 (new DC::UI::Label markup => $right, align => +1),
3849 ],
3850 ;
3851
3852 } else {
3853 $widget = new DC::UI::Label
3854 can_hover => 1,
3855 can_events => 1,
3856 markup => $widget,
3857 tooltip => $tooltip;
3858 }
2940 } 3859 }
2941 3860
2942 $self->{item}{$widget} = $item; 3861 $self->{item}{$widget} = $item;
2943 3862
2944 $self->{vbox}->add ($widget); 3863 $self->{vbox}->add ($widget);
… …
2949 3868
2950# popup given the event (must be a mouse button down event currently) 3869# popup given the event (must be a mouse button down event currently)
2951sub popup { 3870sub popup {
2952 my ($self, $ev) = @_; 3871 my ($self, $ev) = @_;
2953 3872
2954 $self->_emit ("popdown"); 3873 $self->emit ("popdown");
2955 3874
2956 # maybe save $GRAB? must be careful about events... 3875 # maybe save $GRAB? must be careful about events...
2957 $GRAB = $self; 3876 $GRAB = $self;
2958 $self->{button} = $ev->{button}; 3877 $self->{button} = $ev->{button};
2959 3878
2960 $self->show; 3879 $self->show;
2961 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3880 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2962} 3881}
2963 3882
2964sub mouse_motion { 3883sub invoke_mouse_motion {
2965 my ($self, $ev, $x, $y) = @_; 3884 my ($self, $ev, $x, $y) = @_;
2966 3885
2967 # TODO: should use vbox->find_widget or so 3886 # TODO: should use vbox->find_widget or so
2968 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3887 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2969 $self->{hover} = $self->{item}{$HOVER}; 3888 $self->{hover} = $self->{item}{$HOVER};
2970 3889
2971 0 3890 0
2972} 3891}
2973 3892
2974sub button_up { 3893sub invoke_button_up {
2975 my ($self, $ev, $x, $y) = @_; 3894 my ($self, $ev, $x, $y) = @_;
2976 3895
2977 if ($ev->{button} == $self->{button}) { 3896 if ($ev->{button} == $self->{button}) {
2978 undef $GRAB; 3897 undef $GRAB;
2979 $self->hide; 3898 $self->hide;
2980 3899
2981 $self->_emit ("popdown"); 3900 $self->emit ("popdown");
2982 $self->{hover}[1]->() if $self->{hover}; 3901 $self->{hover}[1]->() if $self->{hover};
2983 } else { 3902 } else {
2984 return 0 3903 return 0
2985 } 3904 }
2986 3905
2987 1 3906 1
2988} 3907}
2989 3908
2990############################################################################# 3909#############################################################################
2991 3910
2992package CFClient::UI::Multiplexer; 3911package DC::UI::Multiplexer;
2993 3912
2994our @ISA = CFClient::UI::Container::; 3913our @ISA = DC::UI::Container::;
2995 3914
2996sub new { 3915sub new {
2997 my $class = shift; 3916 my $class = shift;
2998 3917
2999 my $self = $class->SUPER::new ( 3918 my $self = $class->SUPER::new (
… …
3013 3932
3014 $self->{current} = $self->{children}[0] 3933 $self->{current} = $self->{children}[0]
3015 if @{ $self->{children} }; 3934 if @{ $self->{children} };
3016} 3935}
3017 3936
3937sub get_current_page {
3938 my ($self) = @_;
3939
3940 $self->{current}
3941}
3942
3018sub set_current_page { 3943sub set_current_page {
3019 my ($self, $page_or_widget) = @_; 3944 my ($self, $page_or_widget) = @_;
3020 3945
3021 my $widget = ref $page_or_widget 3946 my $widget = ref $page_or_widget
3022 ? $page_or_widget 3947 ? $page_or_widget
3023 : $self->{children}[$page_or_widget]; 3948 : $self->{children}[$page_or_widget];
3024 3949
3025 $self->{current} = $widget; 3950 $self->{current} = $widget;
3026 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3951 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3027 3952
3028 $self->_emit (page_changed => $self->{current}); 3953 $self->emit (page_changed => $self->{current});
3029 3954
3030 $self->realloc; 3955 $self->realloc;
3031} 3956}
3032 3957
3033sub visible_children { 3958sub visible_children {
… …
3038 my ($self) = @_; 3963 my ($self) = @_;
3039 3964
3040 $self->{current}->size_request 3965 $self->{current}->size_request
3041} 3966}
3042 3967
3043sub size_allocate { 3968sub invoke_size_allocate {
3044 my ($self, $w, $h) = @_; 3969 my ($self, $w, $h) = @_;
3045 3970
3046 $self->{current}->configure (0, 0, $w, $h); 3971 $self->{current}->configure (0, 0, $w, $h);
3972
3973 1
3047} 3974}
3048 3975
3049sub _draw { 3976sub _draw {
3050 my ($self) = @_; 3977 my ($self) = @_;
3051 3978
3052 $self->{current}->draw; 3979 $self->{current}->draw;
3053} 3980}
3054 3981
3055############################################################################# 3982#############################################################################
3056 3983
3057package CFClient::UI::Notebook; 3984package DC::UI::Notebook;
3058 3985
3986use DC::OpenGL;
3987
3059our @ISA = CFClient::UI::VBox::; 3988our @ISA = DC::UI::VBox::;
3060 3989
3061sub new { 3990sub new {
3062 my $class = shift; 3991 my $class = shift;
3063 3992
3064 my $self = $class->SUPER::new ( 3993 my $self = $class->SUPER::new (
3065 buttonbar => (new CFClient::UI::Buttonbar), 3994 buttonbar => (new DC::UI::Buttonbar),
3066 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3995 multiplexer => (new DC::UI::Multiplexer expand => 1),
3996 active_outline => [.7, .7, 0.2],
3067 # filter => # will be put between multiplexer and $self 3997 # filter => # will be put between multiplexer and $self
3068 @_, 3998 @_,
3069 ); 3999 );
3070 4000
3071 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4001 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3072 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4002 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3073 4003
4004 {
4005 Scalar::Util::weaken (my $wself = $self);
4006
4007 $self->{multiplexer}->connect (c_add => sub {
4008 my ($mplex, $widgets) = @_;
4009
4010 for my $child (@$widgets) {
4011 Scalar::Util::weaken $child;
4012 $child->{c_tab_} ||= do {
4013 my $tab =
4014 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4015 ? $child->{c_tab}
4016 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4017
4018 $tab->connect (activate => sub {
4019 $wself->set_current_page ($child);
4020 });
4021
4022 $tab
4023 };
4024
4025 $self->{buttonbar}->add ($child->{c_tab_});
4026 }
4027 });
4028
4029 $self->{multiplexer}->connect (c_remove => sub {
4030 my ($mplex, $widgets) = @_;
4031
4032 for my $child (@$widgets) {
4033 $wself->{buttonbar}->remove ($child->{c_tab_});
4034 }
4035 });
4036 }
4037
3074 $self 4038 $self
3075} 4039}
3076 4040
3077sub add { 4041sub add {
4042 my ($self, @widgets) = @_;
4043
4044 $self->{multiplexer}->add (@widgets)
4045}
4046
4047sub remove {
4048 my ($self, @widgets) = @_;
4049
4050 $self->{multiplexer}->remove (@widgets)
4051}
4052
4053sub pages {
4054 my ($self) = @_;
4055 $self->{multiplexer}->children
4056}
4057
4058sub add_tab {
3078 my ($self, $title, $widget, $tooltip) = @_; 4059 my ($self, $title, $widget, $tooltip) = @_;
3079 4060
3080 Scalar::Util::weaken $self; 4061 $title = [$title, $tooltip] unless ref $title;
4062 $widget->{c_tab} = $title;
3081 4063
3082 $self->{buttonbar}->add (new CFClient::UI::Button
3083 markup => $title,
3084 tooltip => $tooltip,
3085 on_activate => sub { $self->set_current_page ($widget) },
3086 );
3087
3088 $self->{multiplexer}->add ($widget); 4064 $self->add ($widget);
4065}
4066
4067sub get_current_page {
4068 my ($self) = @_;
4069
4070 $self->{multiplexer}->get_current_page
3089} 4071}
3090 4072
3091sub set_current_page { 4073sub set_current_page {
3092 my ($self, $page) = @_; 4074 my ($self, $page) = @_;
3093 4075
3094 $self->{multiplexer}->set_current_page ($page); 4076 $self->{multiplexer}->set_current_page ($page);
3095 $self->_emit (page_changed => $self->{multiplexer}{current}); 4077 $self->emit (page_changed => $self->{multiplexer}{current});
4078}
4079
4080sub _draw {
4081 my ($self) = @_;
4082
4083 $self->SUPER::_draw ();
4084
4085 if (my $cur = $self->{multiplexer}{current}) {
4086 if ($cur = $cur->{c_tab_}) {
4087 glTranslate $self->{buttonbar}{x} + $cur->{x},
4088 $self->{buttonbar}{y} + $cur->{y};
4089 glLineWidth 3;
4090 #glEnable GL_BLEND;
4091 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4092 glColor @{$self->{active_outline}};
4093 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4094 glLineWidth 1;
4095 #glDisable GL_BLEND;
4096 }
4097 }
3096} 4098}
3097 4099
3098############################################################################# 4100#############################################################################
3099 4101
3100package CFClient::UI::Combobox; 4102package DC::UI::Selector;
3101 4103
3102use utf8; 4104use utf8;
3103 4105
3104our @ISA = CFClient::UI::Button::; 4106our @ISA = DC::UI::Button::;
3105 4107
3106sub new { 4108sub new {
3107 my $class = shift; 4109 my $class = shift;
3108 4110
3109 my $self = $class->SUPER::new ( 4111 my $self = $class->SUPER::new (
3110 options => [], # [title, value, tooltip], ... 4112 options => [], # [value, title, longdesc], ...
3111 value => undef, 4113 value => undef,
3112 @_, 4114 @_,
3113 ); 4115 );
3114 4116
3115 $self->_set_value ($self->{value}); 4117 $self->_set_value ($self->{value});
3116 4118
3117 $self 4119 $self
3118} 4120}
3119 4121
3120sub button_down { 4122sub invoke_button_down {
3121 my ($self, $ev) = @_; 4123 my ($self, $ev) = @_;
3122 4124
3123 my @menu_items; 4125 my @menu_items;
3124 4126
3125 for (@{ $self->{options} }) { 4127 for (@{ $self->{options} }) {
3126 my ($title, $value, $tooltip) = @$_; 4128 my ($value, $title, $tooltip) = @$_;
3127 4129
3128 push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; 4130 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3129 } 4131 }
3130 4132
3131 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 4133 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3132} 4134}
3133 4135
3134sub _set_value { 4136sub _set_value {
3135 my ($self, $value) = @_; 4137 my ($self, $value) = @_;
3136 4138
3137 my ($item) = grep $_->[1] eq $value, @{ $self->{options} } 4139 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4140 $item ||= $self->{options}[0]
3138 or return; 4141 or return;
3139 4142
3140 $self->{value} = $item->[1]; 4143 $self->{value} = $item->[0];
3141 $self->set_markup ("$item->[0] ⇓"); 4144 $self->set_markup ("$item->[1] ⇓");
3142 $self->set_tooltip ($item->[2]); 4145# $self->set_tooltip ($item->[2]);
3143} 4146}
3144 4147
3145sub set_value { 4148sub set_value {
3146 my ($self, $value) = @_; 4149 my ($self, $value) = @_;
3147 4150
3148 return unless $self->{value} ne $value; 4151 return unless $self->{value} ne $value;
3149 4152
3150 $self->_set_value ($value); 4153 $self->_set_value ($value);
3151 $self->_emit (changed => $value); 4154 $self->emit (changed => $value);
4155}
4156
4157sub set_options {
4158 my ($self, $options) = @_;
4159
4160 $self->{options} = $options;
4161 $self->_set_value ($self->{value});
3152} 4162}
3153 4163
3154############################################################################# 4164#############################################################################
3155 4165
3156package CFClient::UI::Statusbox; 4166package DC::UI::Statusbox;
3157 4167
3158our @ISA = CFClient::UI::VBox::; 4168our @ISA = DC::UI::VBox::;
3159 4169
3160sub new { 4170sub new {
3161 my $class = shift; 4171 my $class = shift;
3162 4172
3163 my $self = $class->SUPER::new ( 4173 my $self = $class->SUPER::new (
3164 fontsize => 0.8, 4174 fontsize => 0.8,
3165 @_, 4175 @_,
3166 ); 4176 );
3167 4177
3168 Scalar::Util::weaken (my $this = $self); 4178 DC::weaken (my $this = $self);
3169 4179
3170 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4180 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3171 4181
3172 $self 4182 $self
3173} 4183}
3174 4184
3175sub reorder { 4185sub reorder {
3176 my ($self) = @_; 4186 my ($self) = @_;
3177 my $NOW = Time::HiRes::time; 4187 my $NOW = Time::HiRes::time;
3178 4188
3179 # freeze display when hovering over any label 4189 # freeze display when hovering over any label
3180 return if $CFClient::UI::TOOLTIP->{owner} 4190 return if $DC::UI::TOOLTIP->{owner}
3181 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4191 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3182 values %{ $self->{item} }; 4192 values %{ $self->{item} };
3183 4193
3184 while (my ($k, $v) = each %{ $self->{item} }) { 4194 while (my ($k, $v) = each %{ $self->{item} }) {
3185 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4195 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3186 } 4196 }
4197
4198 $self->{timer}->set (1, 1);
3187 4199
3188 my @widgets; 4200 my @widgets;
3189 4201
3190 my @items = sort { 4202 my @items = sort {
3191 $a->{pri} <=> $b->{pri} 4203 $a->{pri} <=> $b->{pri}
3192 or $b->{id} <=> $a->{id} 4204 or $b->{id} <=> $a->{id}
3193 } values %{ $self->{item} }; 4205 } values %{ $self->{item} };
3194
3195 $self->{timer}->interval (1);
3196 4206
3197 my $count = 10 + 1; 4207 my $count = 10 + 1;
3198 for my $item (@items) { 4208 for my $item (@items) {
3199 last unless --$count; 4209 last unless --$count;
3200 4210
… …
3207 for ($short) { 4217 for ($short) {
3208 s/^\s+//; 4218 s/^\s+//;
3209 s/\s+/ /g; 4219 s/\s+/ /g;
3210 } 4220 }
3211 4221
3212 new CFClient::UI::Label 4222 new DC::UI::Label
3213 markup => $short, 4223 markup => $short,
3214 tooltip => $item->{tooltip}, 4224 tooltip => $item->{tooltip},
3215 tooltip_font => $::FONT_PROP, 4225 tooltip_font => $::FONT_PROP,
3216 tooltip_width => 0.67, 4226 tooltip_width => 0.67,
3217 fontsize => $item->{fontsize} || $self->{fontsize}, 4227 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3224 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4234 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3225 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4235 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3226 $label->update; 4236 $label->update;
3227 $label->set_max_size (undef, $label->{req_h} * $diff) 4237 $label->set_max_size (undef, $label->{req_h} * $diff)
3228 if $diff < 1; 4238 if $diff < 1;
3229 $self->{timer}->interval (1/30); 4239 $self->{timer}->set (1/30, 1/30);
3230 } else { 4240 } else {
3231 $label->{fg}[3] = $item->{fg}[3] || 1; 4241 $label->{fg}[3] = $item->{fg}[3] || 1;
3232 } 4242 }
3233 4243
3234 push @widgets, $label; 4244 push @widgets, $label;
… …
3255 $item->{count}++; 4265 $item->{count}++;
3256 } else { 4266 } else {
3257 $item->{count} = 1; 4267 $item->{count} = 1;
3258 $item->{text} = $item->{tooltip} = $text; 4268 $item->{text} = $item->{tooltip} = $text;
3259 } 4269 }
3260 $item->{id} = ++$self->{id}; 4270 $item->{id} += 0.2;#d#
3261 $item->{timeout} = $timeout; 4271 $item->{timeout} = $timeout;
3262 delete $item->{label}; 4272 delete $item->{label};
3263 } else { 4273 } else {
3264 $self->{item}{$group} = { 4274 $self->{item}{$group} = {
3265 id => ++$self->{id}, 4275 id => ++$self->{id},
… …
3271 count => 1, 4281 count => 1,
3272 %arg, 4282 %arg,
3273 }; 4283 };
3274 } 4284 }
3275 4285
4286 $ROOT->on_refresh (reorder => sub {
3276 $self->reorder; 4287 $self->reorder;
4288 });
3277} 4289}
3278 4290
3279sub reconfigure { 4291sub reconfigure {
3280 my ($self) = @_; 4292 my ($self) = @_;
3281 4293
… …
3284 4296
3285 $self->reorder; 4297 $self->reorder;
3286 $self->SUPER::reconfigure; 4298 $self->SUPER::reconfigure;
3287} 4299}
3288 4300
3289sub DESTROY { 4301sub destroy {
3290 my ($self) = @_; 4302 my ($self) = @_;
3291 4303
3292 $self->{timer}->cancel; 4304 $self->{timer}->cancel;
3293 4305
3294 $self->SUPER::DESTROY; 4306 $self->SUPER::destroy;
3295} 4307}
3296 4308
3297############################################################################# 4309#############################################################################
3298 4310
3299package CFClient::UI::Inventory;
3300
3301our @ISA = CFClient::UI::ScrolledWindow::;
3302
3303sub new {
3304 my $class = shift;
3305
3306 my $self = $class->SUPER::new (
3307 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3308 @_,
3309 );
3310
3311 $self
3312}
3313
3314sub set_items {
3315 my ($self, $items) = @_;
3316
3317 $self->{child}->clear;
3318 return unless $items;
3319
3320 my @items = sort {
3321 ($a->{type} <=> $b->{type})
3322 or ($a->{name} cmp $b->{name})
3323 } @$items;
3324
3325 $self->{real_items} = \@items;
3326
3327 my $row = 0;
3328 for my $item (@items) {
3329 CFClient::Item::update_widgets $item;
3330
3331 $self->{child}->add (0, $row, $item->{face_widget});
3332 $self->{child}->add (1, $row, $item->{desc_widget});
3333 $self->{child}->add (2, $row, $item->{weight_widget});
3334
3335 $row++;
3336 }
3337}
3338
3339#############################################################################
3340
3341package CFClient::UI::BindEditor;
3342
3343our @ISA = CFClient::UI::FancyFrame::;
3344
3345sub new {
3346 my $class = shift;
3347
3348 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3349
3350 $self->add (my $vb = new CFClient::UI::VBox);
3351
3352
3353 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3354 text => "start recording",
3355 tooltip => "Start/Stops recording of actions."
3356 ."All subsequent actions after the recording started will be captured."
3357 ."The actions are displayed after the record was stopped."
3358 ."To bind the action you have to click on the 'Bind' button",
3359 on_activate => sub {
3360 unless ($self->{recording}) {
3361 $self->start;
3362 } else {
3363 $self->stop;
3364 }
3365 });
3366
3367 $vb->add (new CFClient::UI::Label text => "Actions:");
3368 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3369
3370 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3371 $vb->add (my $hb = new CFClient::UI::HBox);
3372 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3373 $hb->add (new CFClient::UI::Button
3374 text => "bind",
3375 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3376 on_activate => sub {
3377 $self->ask_for_bind;
3378 });
3379
3380 $vb->add (my $hb = new CFClient::UI::HBox);
3381 $hb->add (new CFClient::UI::Button
3382 text => "ok",
3383 expand => 1,
3384 tooltip => "This closes the binding editor and saves the binding",
3385 on_activate => sub {
3386 $self->hide;
3387 $self->commit;
3388 });
3389
3390 $hb->add (new CFClient::UI::Button
3391 text => "cancel",
3392 expand => 1,
3393 tooltip => "This closes the binding editor without saving",
3394 on_activate => sub {
3395 $self->hide;
3396 $self->{binding_cancel}->()
3397 if $self->{binding_cancel};
3398 });
3399
3400 $self->update_binding_widgets;
3401
3402 $self
3403}
3404
3405sub commit {
3406 my ($self) = @_;
3407 my ($mod, $sym, $cmds) = $self->get_binding;
3408 if ($sym != 0 && @$cmds > 0) {
3409 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3410 ."'. Don't forget 'Save Config'!");
3411 $self->{binding_change}->($mod, $sym, $cmds)
3412 if $self->{binding_change};
3413 } else {
3414 $::STATUSBOX->add ("No action bound, no key or action specified!");
3415 $self->{binding_cancel}->()
3416 if $self->{binding_cancel};
3417 }
3418}
3419
3420sub start {
3421 my ($self) = @_;
3422
3423 $self->{rec_btn}->set_text ("stop recording");
3424 $self->{recording} = 1;
3425 $self->clear_command_list;
3426 $::CONN->start_record if $::CONN;
3427}
3428
3429sub stop {
3430 my ($self) = @_;
3431
3432 $self->{rec_btn}->set_text ("start recording");
3433 $self->{recording} = 0;
3434
3435 my $rec;
3436 $rec = $::CONN->stop_record if $::CONN;
3437 return unless ref $rec eq 'ARRAY';
3438 $self->set_command_list ($rec);
3439}
3440
3441
3442sub ask_for_bind_and_commit {
3443 my ($self) = @_;
3444 $self->ask_for_bind (1);
3445}
3446
3447sub ask_for_bind {
3448 my ($self, $commit) = @_;
3449
3450 CFClient::Binder::open_binding_dialog (sub {
3451 my ($mod, $sym) = @_;
3452 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3453 $self->update_binding_widgets;
3454 $self->commit if $commit;
3455 });
3456}
3457
3458# $mod and $sym are the modifiers and key symbol
3459# $cmds is a array ref of strings (the commands)
3460# $cb is the callback that is executed on OK
3461# $ccb is the callback that is executed on CANCEL and
3462# when the binding was unsuccessful on OK
3463sub set_binding {
3464 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3465
3466 $self->clear_command_list;
3467 $self->{recording} = 0;
3468 $self->{rec_btn}->set_text ("start recording");
3469
3470 $self->{binding} = [$mod, $sym];
3471 $self->{commands} = $cmds;
3472
3473 $self->{binding_change} = $cb;
3474 $self->{binding_cancel} = $ccb;
3475
3476 $self->update_binding_widgets;
3477}
3478
3479# this is a shortcut method that asks for a binding
3480# and then just binds it.
3481sub do_quick_binding {
3482 my ($self, $cmds) = @_;
3483 $self->set_binding (undef, undef, $cmds, sub {
3484 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3485 });
3486 $self->ask_for_bind (1);
3487}
3488
3489sub update_binding_widgets {
3490 my ($self) = @_;
3491 my ($mod, $sym, $cmds) = $self->get_binding;
3492 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3493 $self->set_command_list ($cmds);
3494}
3495
3496sub get_binding {
3497 my ($self) = @_;
3498 return (
3499 $self->{binding}->[0],
3500 $self->{binding}->[1],
3501 [ grep { defined $_ } @{$self->{commands}} ]
3502 );
3503}
3504
3505sub clear_command_list {
3506 my ($self) = @_;
3507 $self->{cmdbox}->clear ();
3508}
3509
3510sub set_command_list {
3511 my ($self, $cmds) = @_;
3512
3513 $self->{cmdbox}->clear ();
3514 $self->{commands} = $cmds;
3515
3516 my $idx = 0;
3517
3518 for (@$cmds) {
3519 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3520
3521 my $i = $idx;
3522 $hb->add (new CFClient::UI::Label text => $_);
3523 $hb->add (new CFClient::UI::Button
3524 text => "delete",
3525 tooltip => "Deletes the action from the record",
3526 on_activate => sub {
3527 $self->{cmdbox}->remove ($hb);
3528 $cmds->[$i] = undef;
3529 });
3530
3531
3532 $idx++
3533 }
3534}
3535
3536#############################################################################
3537
3538package CFClient::UI::SpellList;
3539
3540our @ISA = CFClient::UI::Table::;
3541
3542sub new {
3543 my $class = shift;
3544
3545 my $self = $class->SUPER::new (
3546 binding => [],
3547 commands => [],
3548 @_,
3549 )
3550}
3551
3552my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3553 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3554my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3555 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3556my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3557 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3558
3559sub rebuild_spell_list {
3560 my ($self) = @_;
3561
3562 $CFClient::UI::ROOT->on_refresh ($self => sub {
3563 $self->clear;
3564
3565 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3566 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3567 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3568 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3569
3570 my $row = 0;
3571
3572 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3573 my $spell = $self->{spell}{$_};
3574
3575 $row++;
3576
3577 $self->add (0, $row, new CFClient::UI::Face
3578 face => $spell->{face},
3579 can_hover => 1,
3580 can_events => 1,
3581 tooltip => $spell->{message},
3582 );
3583
3584 $self->add (1, $row, new CFClient::UI::Label
3585 expand => 1,
3586 text => $spell->{name},
3587 can_hover => 1,
3588 can_events => 1,
3589 tooltip => $spell->{message},
3590 );
3591
3592 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3593 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3594 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3595
3596 # TODO: should be done via popup
3597 $self->add (5, $row, new CFClient::UI::Button
3598 text => "bind",
3599 tooltip => "bind spell readying (cast command) to key",
3600 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3601 );
3602 }
3603 });
3604}
3605
3606sub add_spell {
3607 my ($self, $spell) = @_;
3608
3609 $self->{spell}->{$spell->{name}} = $spell;
3610 $self->rebuild_spell_list;
3611}
3612
3613sub remove_spell {
3614 my ($self, $spell) = @_;
3615
3616 delete $self->{spell}->{$spell->{name}};
3617 $self->rebuild_spell_list;
3618}
3619
3620#############################################################################
3621
3622package CFClient::UI::Root; 4311package DC::UI::Root;
3623 4312
3624our @ISA = CFClient::UI::Container::; 4313our @ISA = DC::UI::Container::;
3625 4314
3626use List::Util qw(min max); 4315use List::Util qw(min max);
3627 4316
3628use CFClient::OpenGL; 4317use DC::OpenGL;
3629 4318
3630sub new { 4319sub new {
3631 my $class = shift; 4320 my $class = shift;
3632 4321
3633 my $self = $class->SUPER::new ( 4322 my $self = $class->SUPER::new (
3634 visible => 1, 4323 visible => 1,
3635 @_, 4324 @_,
3636 ); 4325 );
3637 4326
3638 Scalar::Util::weaken ($self->{root} = $self); 4327 DC::weaken ($self->{root} = $self);
3639 4328
3640 $self 4329 $self
3641} 4330}
3642 4331
3643sub size_request { 4332sub size_request {
… …
3658 $coord = $max - $size if $coord > $max - $size; 4347 $coord = $max - $size if $coord > $max - $size;
3659 4348
3660 int $coord + 0.5 4349 int $coord + 0.5
3661} 4350}
3662 4351
3663sub size_allocate { 4352sub invoke_size_allocate {
3664 my ($self, $w, $h) = @_; 4353 my ($self, $w, $h) = @_;
3665 4354
3666 for my $child ($self->children) { 4355 for my $child ($self->children) {
3667 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4356 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3668 4357
… …
3672 $X = _to_pixel $X, $W, $self->{w}; 4361 $X = _to_pixel $X, $W, $self->{w};
3673 $Y = _to_pixel $Y, $H, $self->{h}; 4362 $Y = _to_pixel $Y, $H, $self->{h};
3674 4363
3675 $child->configure ($X, $Y, $W, $H); 4364 $child->configure ($X, $Y, $W, $H);
3676 } 4365 }
4366
4367 1
3677} 4368}
3678 4369
3679sub coord2local { 4370sub coord2local {
3680 my ($self, $x, $y) = @_; 4371 my ($self, $x, $y) = @_;
3681 4372
… …
3689} 4380}
3690 4381
3691sub update { 4382sub update {
3692 my ($self) = @_; 4383 my ($self) = @_;
3693 4384
3694 $::WANT_REFRESH++; 4385 $::WANT_REFRESH = 1;
3695} 4386}
3696 4387
3697sub add { 4388sub add {
3698 my ($self, @children) = @_; 4389 my ($self, @children) = @_;
3699 4390
… …
3736 while ($self->{refresh_hook}) { 4427 while ($self->{refresh_hook}) {
3737 $_->() 4428 $_->()
3738 for values %{delete $self->{refresh_hook}}; 4429 for values %{delete $self->{refresh_hook}};
3739 } 4430 }
3740 4431
3741 if ($self->{realloc}) { 4432 while ($self->{realloc}) {
3742 my %queue; 4433 my %queue;
3743 my @queue; 4434 my @queue;
3744 my $widget; 4435 my $widget;
3745 4436
3746 outer: 4437 outer:
… …
3793 } 4484 }
3794 } 4485 }
3795 4486
3796 delete $self->{realloc}{$widget+0}; 4487 delete $self->{realloc}{$widget+0};
3797 } 4488 }
3798 }
3799 4489
3800 while (my $size_alloc = delete $self->{size_alloc}) { 4490 while (my $size_alloc = delete $self->{size_alloc}) {
3801 my @queue = sort { $b->{visible} <=> $a->{visible} } 4491 my @queue = sort { $a->{visible} <=> $b->{visible} }
3802 values %$size_alloc; 4492 values %$size_alloc;
3803 4493
3804 while () { 4494 while () {
3805 my $widget = pop @queue || last; 4495 my $widget = pop @queue || last;
3806 4496
3807 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4497 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3808 4498
3809 $w = 0 if $w < 0; 4499 $w = max $widget->{min_w}, $w;
3810 $h = 0 if $h < 0; 4500 $h = max $widget->{min_h}, $h;
3811 4501
4502# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4503# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4504
4505 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4506 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4507
3812 $w = int $w + 0.5; 4508 $w = int $w + 0.5;
3813 $h = int $h + 0.5; 4509 $h = int $h + 0.5;
3814 4510
3815 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4511 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3816 $widget->{old_w} = $widget->{w}; 4512 $widget->{old_w} = $widget->{w};
3817 $widget->{old_h} = $widget->{h}; 4513 $widget->{old_h} = $widget->{h};
3818 4514
3819 $widget->{w} = $w; 4515 $widget->{w} = $w;
3820 $widget->{h} = $h; 4516 $widget->{h} = $h;
3821 4517
3822 $widget->emit (size_allocate => $w, $h); 4518 $widget->emit (size_allocate => $w, $h);
4519 }
3823 } 4520 }
3824 } 4521 }
3825 } 4522 }
3826 4523
3827 while ($self->{post_alloc_hook}) { 4524 while ($self->{post_alloc_hook}) {
3828 $_->() 4525 $_->()
3829 for values %{delete $self->{post_alloc_hook}}; 4526 for values %{delete $self->{post_alloc_hook}};
3830 } 4527 }
3831
3832 4528
3833 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4529 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3834 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4530 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3835 glClear GL_COLOR_BUFFER_BIT; 4531 glClear GL_COLOR_BUFFER_BIT;
3836 4532
… …
3839 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4535 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3840 glMatrixMode GL_MODELVIEW; 4536 glMatrixMode GL_MODELVIEW;
3841 glLoadIdentity; 4537 glLoadIdentity;
3842 4538
3843 { 4539 {
3844 package CFClient::UI::Base; 4540 package DC::UI::Base;
3845 4541
3846 ($draw_x, $draw_y, $draw_w, $draw_h) = 4542 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3847 (0, 0, $self->{w}, $self->{h}); 4543 (0, 0, $self->{w}, $self->{h});
3848 }
3849 4544
3850 $self->_draw; 4545 $self->_draw;
4546 }
3851} 4547}
3852 4548
3853############################################################################# 4549#############################################################################
3854 4550
3855package CFClient::UI; 4551package DC::UI;
3856 4552
3857$ROOT = new CFClient::UI::Root; 4553$ROOT = new DC::UI::Root;
3858$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4554$TOOLTIP = new DC::UI::Tooltip z => 900;
3859 4555
38601 45561
3861 4557

Diff Legend

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