ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.296 by root, Wed Jun 7 05:48:53 2006 UTC vs.
Revision 1.459 by root, Sat Dec 29 13:44:30 2007 UTC

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

Diff Legend

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