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.278 by root, Sun Jun 4 23:05:06 2006 UTC vs.
Revision 1.464 by root, Fri Jul 18 22:32:54 2008 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 ();
8 7
9use CFClient; 8use DC;
9use DC::Pod;
10use CFClient::Texture; 10use DC::Texture;
11 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13 13
14our $LAYOUT; 14our $LAYOUT;
15our $ROOT; 15our $ROOT;
16our $TOOLTIP; 16our $TOOLTIP;
17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20
21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
24 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) {
28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
29 $TOOLTIP->hide;
30
31 $TOOLTIP->{owner} = $widget;
32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
33
34 return if $ENV{CFPLUS_DEBUG} & 8;
35
36 $TOOLTIP->set_tooltip_from ($widget);
37 $TOOLTIP->show;
38 }
39
40 return;
41 }
42 }
43 }
44
45 $TOOLTIP->hide;
46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner};
48};
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
78sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 81 if $FOCUS;
81} 82}
82 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
83sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
84 my ($ev) = @_; 98 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
86 100
87 if (!$BUTTON_STATE) { 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
88 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
89 105
90 $GRAB = $widget; 106 $GRAB = $widget;
91 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
92 108
93 check_tooltip; 109 $TOOLTIP_WATCHER->invoke;
94 } 110 }
95 111
96 $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;
97 117
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 118 $ev->{dx} = $shift ? $delta : 0;
99 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 }
100} 126}
101 127
102sub feed_sdl_button_up_event { 128sub feed_sdl_button_up_event {
103 my ($ev) = @_; 129 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 130
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 131 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 132
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 133 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 134
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 135 $GRAB->emit (button_up => $ev)
111 if $GRAB; 136 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 137
113 if (!$BUTTON_STATE) { 138 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 140 $grab->update if $grab;
116 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
117 142
118 check_tooltip; 143 check_hover $widget;
144 $TOOLTIP_WATCHER->invoke;
119 } 145 }
120} 146}
121 147
122sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
123 my ($ev) = @_; 149 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 150 my ($x, $y) = ($ev->{x}, $ev->{y});
125 151
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 152 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 153
128 if ($widget != $HOVER) { 154 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 155
131 $hover->update if $hover && $hover->{can_hover}; 156 $HOVER->emit (mouse_motion => $ev)
132 $HOVER->update if $HOVER && $HOVER->{can_hover};
133
134 check_tooltip;
135 }
136
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 157 if $HOVER;
139} 158}
140 159
141# convert position array to integers 160# convert position array to integers
142sub harmonize { 161sub harmonize {
… …
192 reconfigure_widgets; 211 reconfigure_widgets;
193} 212}
194 213
195############################################################################# 214#############################################################################
196 215
216package DC::UI::Event;
217
218sub xy {
219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
220}
221
222#############################################################################
223
197package CFClient::UI::Base; 224package DC::UI::Base;
198 225
199use strict; 226use strict;
200 227
201use CFClient::OpenGL; 228use DC::OpenGL;
202 229
203sub new { 230sub new {
204 my $class = shift; 231 my $class = shift;
205 232
206 my $self = bless { 233 my $self = bless {
… …
211 h => undef, 238 h => undef,
212 can_events => 1, 239 can_events => 1,
213 @_ 240 @_
214 }, $class; 241 }, $class;
215 242
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 243 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
217 244
218 for (keys %$self) { 245 for (keys %$self) {
219 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
220 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
221 } 248 }
222 } 249 }
223 250
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
225 $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};
226 $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};
227 $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};
228 $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};
229 256
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232 259
233 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
… …
238 265
239sub destroy { 266sub destroy {
240 my ($self) = @_; 267 my ($self) = @_;
241 268
242 $self->hide; 269 $self->hide;
270 $self->emit ("destroy");
243 %$self = (); 271 %$self = ();
244} 272}
245 273
274sub TO_JSON {
275 { "\fw" => $_[0]{s_id} }
276}
277
246sub show { 278sub show {
247 my ($self) = @_; 279 my ($self) = @_;
248 280
249 return if $self->{parent}; 281 return if $self->{parent};
250 282
251 $CFClient::UI::ROOT->add ($self); 283 $DC::UI::ROOT->add ($self);
252} 284}
253 285
254sub set_visible { 286sub set_visible {
255 my ($self) = @_; 287 my ($self) = @_;
256 288
… …
271 303
272 return unless $self->{visible}; 304 return unless $self->{visible};
273 305
274 $_->set_invisible for $self->children; 306 $_->set_invisible for $self->children;
275 307
308 delete $self->{visible};
276 delete $self->{root}; 309 delete $self->{root};
277 delete $self->{visible};
278 310
279 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
281 313
282 CFClient::UI::check_tooltip 314 $DC::UI::TOOLTIP_WATCHER->invoke
283 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
284 316
285 $self->focus_out; 317 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
288} 319}
289 320
290sub set_visibility { 321sub set_visibility {
291 my ($self, $visible) = @_; 322 my ($self, $visible) = @_;
292 323
293 return if $self->{visible} == $visible; 324 return if $self->{visible} == $visible;
294 325
295 $visible ? $self->hide 326 $visible ? $self->show
296 : $self->show; 327 : $self->hide;
297} 328}
298 329
299sub toggle_visibility { 330sub toggle_visibility {
300 my ($self) = @_; 331 my ($self) = @_;
301 332
… …
307sub hide { 338sub hide {
308 my ($self) = @_; 339 my ($self) = @_;
309 340
310 $self->set_invisible; 341 $self->set_invisible;
311 342
343 # extra $parent copy for 5.8.8+ bug workaround
344 # (otherwise $_[0] in remove gets freed
345 if (my $parent = $self->{parent}) {
312 $self->{parent}->remove ($self) 346 $parent->remove ($self);
313 if $self->{parent}; 347 }
314} 348}
315 349
316sub move_abs { 350sub move_abs {
317 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
318 352
319 $self->{x} = List::Util::max 0, int $x; 353 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 354 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 355 $self->{z} = $z if defined $z;
322 356
323 $self->update; 357 $self->update;
324} 358}
325 359
… …
328 362
329 $self->{force_w} = $w; 363 $self->{force_w} = $w;
330 $self->{force_h} = $h; 364 $self->{force_h} = $h;
331 365
332 $self->realloc; 366 $self->realloc;
367}
368
369# traverse the widget chain up to find the maximum "physical" size constraints
370sub get_max_wh {
371 my ($self) = @_;
372
373 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)
333} 385}
334 386
335sub size_request { 387sub size_request {
336 require Carp; 388 require Carp;
337 Carp::confess "size_request is abstract"; 389 Carp::confess "size_request is abstract";
338} 390}
339 391
392sub baseline_shift {
393 0
394}
395
340sub configure { 396sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 397 my ($self, $x, $y, $w, $h) = @_;
342 398
343 if ($self->{aspect}) { 399 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 400 my ($ow, $oh) = ($w, $h);
345 401
346 $w = List::Util::min $w, int $h * $self->{aspect}; 402 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 403 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
348 404
349 # use alignment to adjust x, y 405 # use alignment to adjust x, y
350 406
351 $x += int 0.5 * ($ow - $w); 407 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 408 $y += int 0.5 * ($oh - $h);
… …
366 422
367 $self->{root}{size_alloc}{$self+0} = $self; 423 $self->{root}{size_alloc}{$self+0} = $self;
368 } 424 }
369} 425}
370 426
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 427sub children {
376 # nop 428 # nop
377} 429}
378 430
379sub visible_children { 431sub visible_children {
… …
381} 433}
382 434
383sub set_max_size { 435sub set_max_size {
384 my ($self, $w, $h) = @_; 436 my ($self, $w, $h) = @_;
385 437
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 438 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 439 $self->{max_h} = int $h if defined $h;
440
441 $self->realloc;
388} 442}
389 443
390sub set_tooltip { 444sub set_tooltip {
391 my ($self, $tooltip) = @_; 445 my ($self, $tooltip) = @_;
392 446
… …
395 449
396 return if $self->{tooltip} eq $tooltip; 450 return if $self->{tooltip} eq $tooltip;
397 451
398 $self->{tooltip} = $tooltip; 452 $self->{tooltip} = $tooltip;
399 453
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 454 if ($DC::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 455 delete $DC::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 456 $DC::UI::TOOLTIP_WATCHER->invoke;
403 } 457 }
404} 458}
405 459
406# translate global coordinates to local coordinate system 460# translate global coordinates to local coordinate system
407sub coord2local { 461sub coord2local {
408 my ($self, $x, $y) = @_; 462 my ($self, $x, $y) = @_;
409 463
464 return (undef, undef) unless $self->{parent};
465
410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 466 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
411} 467}
412 468
413# translate local coordinates to global coordinate system 469# translate local coordinates to global coordinate system
414sub coord2global { 470sub coord2global {
415 my ($self, $x, $y) = @_; 471 my ($self, $x, $y) = @_;
416 472
473 return (undef, undef) unless $self->{parent};
474
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 475 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 476}
419 477
420sub focus_in { 478sub invoke_focus_in {
421 my ($self) = @_; 479 my ($self) = @_;
422 480
423 return if $FOCUS == $self; 481 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 482 return unless $self->{can_focus};
425 483
426 my $focus = $FOCUS; $FOCUS = $self; 484 $FOCUS = $self;
427 485
428 $self->_emit (focus_in => $focus); 486 $self->update;
429 487
430 $focus->update if $focus; 488 0
431 $FOCUS->update;
432} 489}
433 490
434sub focus_out { 491sub invoke_focus_out {
435 my ($self) = @_; 492 my ($self) = @_;
436 493
437 return unless $FOCUS == $self; 494 return unless $FOCUS == $self;
438 495
439 my $focus = $FOCUS; undef $FOCUS; 496 undef $FOCUS;
440 497
441 $self->_emit (focus_out => $focus); 498 $self->update;
442 499
443 $focus->update if $focus; #?
444
445 $::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
446 unless $FOCUS; 501 unless $FOCUS;
447}
448 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
449sub mouse_motion { 0 } 513sub invoke_mouse_motion { 0 }
450sub button_up { 0 } 514sub invoke_button_up { 0 }
451sub key_down { 0 } 515sub invoke_key_down { 0 }
452sub key_up { 0 } 516sub invoke_key_up { 0 }
517sub invoke_mouse_wheel { 0 }
453 518
454sub button_down { 519sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 520 my ($self, $ev, $x, $y) = @_;
456 521
457 $self->focus_in; 522 $self->grab_focus;
458 523
459 0 524 0
460} 525}
461 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
462sub find_widget { 574#sub find_widget {
463 my ($self, $x, $y) = @_; 575# in .xs
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473 576
474sub set_parent { 577sub set_parent {
475 my ($self, $parent) = @_; 578 my ($self, $parent) = @_;
476 579
477 Scalar::Util::weaken ($self->{parent} = $parent); 580 DC::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 581 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502} 582}
503 583
504sub realloc { 584sub realloc {
505 my ($self) = @_; 585 my ($self) = @_;
506 586
… …
531 611
532# 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
533# functions seems pointless. 613# functions seems pointless.
534our ($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
535 615
536sub draw { 616#sub draw {
537 my ($self) = @_; 617#CFPlus.xs
538
539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550
551 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0;
553
554 if ($self == $HOVER && $self->{can_hover}) {
555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
556 glEnable GL_BLEND;
557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
558 glBegin GL_QUADS;
559 glVertex 0 , 0;
560 glVertex $self->{w}, 0;
561 glVertex $self->{w}, $self->{h};
562 glVertex 0 , $self->{h};
563 glEnd;
564 glDisable GL_BLEND;
565 }
566
567 if ($ENV{CFPLUS_DEBUG} & 1) {
568 glPushMatrix;
569 glColor 1, 1, 0, 1;
570 glTranslate 0.375, 0.375;
571 glBegin GL_LINE_LOOP;
572 glVertex 0 , 0;
573 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1;
576 glEnd;
577 glPopMatrix;
578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
579 }
580
581 $self->_draw;
582 glPopMatrix;
583}
584 618
585sub _draw { 619sub _draw {
586 my ($self) = @_; 620 my ($self) = @_;
587 621
588 warn "no draw defined for $self\n"; 622 warn "no draw defined for $self\n";
589} 623}
590 624
591sub DESTROY { 625sub DESTROY {
592 my ($self) = @_; 626 my ($self) = @_;
593 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
594 delete $WIDGET{$self+0}; 634 delete $WIDGET{$self+0};
595 #$self->deactivate;
596} 635}
597 636
598############################################################################# 637#############################################################################
599 638
600package CFClient::UI::DrawBG; 639package DC::UI::DrawBG;
601 640
602our @ISA = CFClient::UI::Base::; 641our @ISA = DC::UI::Base::;
603 642
604use strict; 643use strict;
605use CFClient::OpenGL; 644use DC::OpenGL;
606 645
607sub new { 646sub new {
608 my $class = shift; 647 my $class = shift;
609
610 # range [value, low, high, page]
611 648
612 $class->SUPER::new ( 649 $class->SUPER::new (
613 #bg => [0, 0, 0, 0.2], 650 #bg => [0, 0, 0, 0.2],
614 #active_bg => [1, 1, 1, 0.5], 651 #active_bg => [1, 1, 1, 0.5],
615 @_ 652 @_
… …
627 my ($w, $h) = @$self{qw(w h)}; 664 my ($w, $h) = @$self{qw(w h)};
628 665
629 glEnable GL_BLEND; 666 glEnable GL_BLEND;
630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 667 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
631 glColor_premultiply @$color; 668 glColor_premultiply @$color;
632
633 glBegin GL_QUADS;
634 glVertex 0 , 0;
635 glVertex 0 , $h;
636 glVertex $w, $h; 669 glRect 0, 0, $w, $h;
637 glVertex $w, 0;
638 glEnd;
639
640 glDisable GL_BLEND; 670 glDisable GL_BLEND;
641 } 671 }
642} 672}
643 673
644############################################################################# 674#############################################################################
645 675
646package CFClient::UI::Empty; 676package DC::UI::Empty;
647 677
648our @ISA = CFClient::UI::Base::; 678our @ISA = DC::UI::Base::;
649 679
650sub new { 680sub new {
651 my ($class, %arg) = @_; 681 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 682 $class->SUPER::new (can_events => 0, %arg);
653} 683}
… …
660 690
661sub draw { } 691sub draw { }
662 692
663############################################################################# 693#############################################################################
664 694
665package CFClient::UI::Container; 695package DC::UI::Container;
666 696
667our @ISA = CFClient::UI::Base::; 697our @ISA = DC::UI::Base::;
668 698
669sub new { 699sub new {
670 my ($class, %arg) = @_; 700 my ($class, %arg) = @_;
671 701
672 my $children = delete $arg{children}; 702 my $children = delete $arg{children};
… …
676 can_events => 0, 706 can_events => 0,
677 %arg, 707 %arg,
678 ); 708 );
679 709
680 $self->add (@$children) 710 $self->add (@$children)
681 if $children; 711 if $children && @$children;
682 712
683 $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;
684} 722}
685 723
686sub add { 724sub add {
687 my ($self, @widgets) = @_; 725 my ($self, @widgets) = @_;
688 726
689 $_->set_parent ($self) 727 $_->set_parent ($self)
690 for @widgets; 728 for @widgets;
691 729
730 # TODO: only do this in widgets that need it, e.g. root, fixed
692 use sort 'stable'; 731 use sort 'stable';
693 732
694 $self->{children} = [ 733 $self->{children} = [
695 sort { $a->{z} <=> $b->{z} } 734 sort { $a->{z} <=> $b->{z} }
696 @{$self->{children}}, @widgets 735 @{$self->{children}}, @widgets
697 ]; 736 ];
698 737
699 $self->realloc; 738 $self->realloc;
739
740 $self->emit (c_add => \@widgets);
741
742 map $_+0, @widgets
700} 743}
701 744
702sub children { 745sub children {
703 @{ $_[0]{children} } 746 @{ $_[0]{children} }
704} 747}
705 748
706sub remove { 749sub remove {
707 my ($self, $child) = @_; 750 my ($self, @widgets) = @_;
708 751
752 $self->emit (c_remove => \@widgets);
753
754 for my $child (@widgets) {
709 delete $child->{parent}; 755 delete $child->{parent};
710 $child->hide; 756 $child->hide;
711
712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 757 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
758 }
713 759
714 $self->realloc; 760 $self->realloc;
715} 761}
716 762
717sub clear { 763sub clear {
718 my ($self) = @_; 764 my ($self) = @_;
719 765
720 my $children = delete $self->{children}; 766 my $children = $self->{children};
721 $self->{children} = []; 767 $self->{children} = [];
722 768
723 for (@$children) { 769 for (@$children) {
724 delete $_->{parent}; 770 delete $_->{parent};
725 $_->hide; 771 $_->hide;
… …
745} 791}
746 792
747sub _draw { 793sub _draw {
748 my ($self) = @_; 794 my ($self) = @_;
749 795
750 $_->draw for @{$self->{children}}; 796 $_->draw for $self->visible_children;
751} 797}
752 798
753############################################################################# 799#############################################################################
754 800
755package CFClient::UI::Bin; 801package DC::UI::Bin;
756 802
757our @ISA = CFClient::UI::Container::; 803our @ISA = DC::UI::Container::;
758 804
759sub new { 805sub new {
760 my ($class, %arg) = @_; 806 my ($class, %arg) = @_;
761 807
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 808 my $child = (delete $arg{child}) || new DC::UI::Empty::;
763 809
764 $class->SUPER::new (children => [$child], %arg) 810 $class->SUPER::new (children => [$child], %arg)
765} 811}
766 812
767sub add { 813sub add {
768 my ($self, $child) = @_; 814 my ($self, $child) = @_;
769 815
770 $self->{children} = []; 816 $self->clear;
771
772 $self->SUPER::add ($child); 817 $self->SUPER::add ($child);
773} 818}
774 819
775sub remove { 820sub remove {
776 my ($self, $widget) = @_; 821 my ($self, $widget) = @_;
777 822
778 $self->SUPER::remove ($widget); 823 $self->SUPER::remove ($widget);
779 824
780 $self->{children} = [new CFClient::UI::Empty] 825 $self->{children} = [new DC::UI::Empty]
781 unless @{$self->{children}}; 826 unless @{$self->{children}};
782} 827}
783 828
784sub child { $_[0]->{children}[0] } 829sub child { $_[0]->{children}[0] }
785 830
786sub size_request { 831sub size_request {
787 $_[0]{children}[0]->size_request 832 $_[0]{children}[0]->size_request
788} 833}
789 834
790sub size_allocate { 835sub invoke_size_allocate {
791 my ($self, $w, $h) = @_; 836 my ($self, $w, $h) = @_;
792 837
793 $self->{children}[0]->configure (0, 0, $w, $h); 838 $self->{children}[0]->configure (0, 0, $w, $h);
839
840 1
794} 841}
795 842
796############################################################################# 843#############################################################################
797
798# back-buffered drawing area 844# back-buffered drawing area
799 845
800package CFClient::UI::Window; 846package DC::UI::Window;
801 847
802our @ISA = CFClient::UI::Bin::; 848our @ISA = DC::UI::Bin::;
803 849
804use CFClient::OpenGL; 850use DC::OpenGL;
805 851
806sub new { 852sub new {
807 my ($class, %arg) = @_; 853 my ($class, %arg) = @_;
808 854
809 my $self = $class->SUPER::new (%arg); 855 my $self = $class->SUPER::new (%arg);
… …
814 860
815 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 861 $ROOT->on_post_alloc ($self => sub { $self->render_child });
816 $self->SUPER::update; 862 $self->SUPER::update;
817} 863}
818 864
819sub size_allocate { 865sub invoke_size_allocate {
820 my ($self, $w, $h) = @_; 866 my ($self, $w, $h) = @_;
821 867
822 $self->SUPER::size_allocate ($w, $h);
823 $self->update; 868 $self->update;
869
870 $self->SUPER::invoke_size_allocate ($w, $h)
824} 871}
825 872
826sub _render { 873sub _render {
827 my ($self) = @_; 874 my ($self) = @_;
828 875
… …
830} 877}
831 878
832sub render_child { 879sub render_child {
833 my ($self) = @_; 880 my ($self) = @_;
834 881
835 $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 {
836 glClearColor 0, 0, 0, 0; 883 glClearColor 0, 0, 0, 0;
837 glClear GL_COLOR_BUFFER_BIT; 884 glClear GL_COLOR_BUFFER_BIT;
838 885
839 { 886 {
840 package CFClient::UI::Base; 887 package DC::UI::Base;
841 888
842 ($draw_x, $draw_y, $draw_w, $draw_h) = 889 local ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h}); 890 (0, 0, $self->{w}, $self->{h});
891
892 $self->_render;
844 } 893 }
845
846 $self->_render;
847 }; 894 };
848} 895}
849 896
850sub _draw { 897sub _draw {
851 my ($self) = @_; 898 my ($self) = @_;
852
853 my ($w, $h) = @$self{qw(w h)};
854 899
855 my $tex = $self->{texture} 900 my $tex = $self->{texture}
856 or return; 901 or return;
857 902
858 glEnable GL_TEXTURE_2D; 903 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 904 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glEnable GL_BLEND;
861 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
862 glColor 0, 0, 0, 1; 905 glColor 0, 0, 0, 1;
863 906
864 $tex->draw_quad (0, 0, $w, $h); 907 $tex->draw_quad_alpha_premultiplied (0, 0);
865 908
866 glDisable GL_BLEND;
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;
1542} 1930}
1543 1931
1932sub realloc {
1933 my ($self) = @_;
1934
1935 delete $self->{ox};
1936 $self->SUPER::realloc;
1937}
1938
1939sub clear {
1940 my ($self) = @_;
1941
1942 $self->set_text ("");
1943}
1944
1544sub set_text { 1945sub set_text {
1545 my ($self, $text) = @_; 1946 my ($self, $text) = @_;
1546 1947
1547 return if $self->{text} eq "T$text"; 1948 return if $self->{text} eq "T$text";
1548 $self->{text} = "T$text"; 1949 $self->{text} = "T$text";
1549 1950
1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1551 $self->{layout}->set_text ($text); 1951 $self->{layout}->set_text ($text);
1552 1952
1953 delete $self->{size_req};
1553 $self->realloc; 1954 $self->realloc;
1554 $self->update; 1955 $self->update;
1555} 1956}
1556 1957
1557sub set_markup { 1958sub set_markup {
… …
1560 return if $self->{text} eq "M$markup"; 1961 return if $self->{text} eq "M$markup";
1561 $self->{text} = "M$markup"; 1962 $self->{text} = "M$markup";
1562 1963
1563 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1964 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1564 1965
1565 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1566 $self->{layout}->set_markup ($markup); 1966 $self->{layout}->set_markup ($markup);
1567 1967
1968 delete $self->{size_req};
1568 $self->realloc; 1969 $self->realloc;
1569 $self->update; 1970 $self->update;
1570} 1971}
1571 1972
1572sub size_request { 1973sub size_request {
1573 my ($self) = @_; 1974 my ($self) = @_;
1574 1975
1976 $self->{size_req} ||= do {
1977 my ($max_w, $max_h) = $self->get_max_wh;
1978
1575 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1979 $self->{layout}->set_font ($self->{font}) if $self->{font};
1576 $self->{layout}->set_width ($self->{max_w} || -1); 1980 $self->{layout}->set_width ($max_w);
1577 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1981 $self->{layout}->set_ellipsise ($self->{ellipsise});
1578 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1982 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1579 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1983 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1984
1581 my ($w, $h) = $self->{layout}->size; 1985 my ($w, $h) = $self->{layout}->size;
1582 1986
1583 if (exists $self->{template}) { 1987 if (exists $self->{template}) {
1584 $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);
1585 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1586 1991
1587 my ($w2, $h2) = $self->{template}->size; 1992 my ($w2, $h2) = $self->{template}->size;
1588 1993
1589 $w = List::Util::max $w, $w2; 1994 $w = List::Util::max $w, $w2;
1590 $h = List::Util::max $h, $h2; 1995 $h = List::Util::max $h, $h2;
1996 }
1997
1998 [$w, $h]
1591 } 1999 };
1592 2000
1593 ($w, $h) 2001 @{ $self->{size_req} }
1594} 2002}
1595 2003
2004sub baseline_shift {
2005 $_[0]{layout}->descent
2006}
2007
1596sub size_allocate { 2008sub invoke_size_allocate {
1597 my ($self, $w, $h) = @_; 2009 my ($self, $w, $h) = @_;
1598 2010
1599 delete $self->{ox}; 2011 delete $self->{ox};
1600 2012
1601 delete $self->{texture} 2013 delete $self->{texture}
1602 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
1603} 2017}
1604 2018
1605sub set_fontsize { 2019sub set_fontsize {
1606 my ($self, $fontsize) = @_; 2020 my ($self, $fontsize) = @_;
1607 2021
1608 $self->{fontsize} = $fontsize; 2022 $self->{fontsize} = $fontsize;
2023 delete $self->{size_req};
1609 delete $self->{texture}; 2024 delete $self->{texture};
1610 2025
1611 $self->realloc; 2026 $self->realloc;
1612} 2027}
1613 2028
2029sub reconfigure {
2030 my ($self) = @_;
2031
2032 delete $self->{size_req};
2033 delete $self->{texture};
2034
2035 $self->SUPER::reconfigure;
2036}
2037
1614sub _draw { 2038sub _draw {
1615 my ($self) = @_; 2039 my ($self) = @_;
1616 2040
1617 $self->SUPER::_draw; # draw background, if applicable 2041 $self->SUPER::_draw; # draw background, if applicable
1618 2042
1619 my $tex = $self->{texture} ||= do { 2043 my $size = $self->{texture} ||= do {
1620 $self->{layout}->set_foreground (@{$self->{fg}}); 2044 $self->{layout}->set_foreground (@{$self->{fg}});
1621 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2045 $self->{layout}->set_font ($self->{font}) if $self->{font};
1622 $self->{layout}->set_width ($self->{w}); 2046 $self->{layout}->set_width ($self->{w});
1623 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2047 $self->{layout}->set_ellipsise ($self->{ellipsise});
1624 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2048 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1625 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2049 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1626 2050
1627 new_from_layout CFClient::Texture $self->{layout} 2051 [$self->{layout}->size]
1628 }; 2052 };
1629 2053
1630 unless (exists $self->{ox}) { 2054 unless (exists $self->{ox}) {
1631 $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);
1632 : $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);
1633 : ($self->{w} - $tex->{w}) * 0.5);
1634 2057
1635 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2058 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1637 : ($self->{h} - $tex->{h}) * 0.5);
1638 }; 2059 };
1639 2060
1640 glEnable GL_TEXTURE_2D; 2061# unless ($self->{list}) {
1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2062# $self->{list} = DC::OpenGL::glGenList;
1642 2063# DC::OpenGL::glNewList $self->{list};
1643 if ($tex->{format} == GL_ALPHA) { 2064# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1644 glColor @{$self->{fg}}; 2065# DC::OpenGL::glEndList;
1645 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1646 } else {
1647 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1648 } 2066# }
2067#
2068# DC::OpenGL::glCallList $self->{list};
1649 2069
1650 glDisable GL_TEXTURE_2D; 2070 $self->{layout}->draw;
1651} 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#}
1652 2080
1653############################################################################# 2081#############################################################################
1654 2082
1655package CFClient::UI::EntryBase; 2083package DC::UI::EntryBase;
1656 2084
1657our @ISA = CFClient::UI::Label::; 2085our @ISA = DC::UI::Label::;
1658 2086
1659use CFClient::OpenGL; 2087use DC::OpenGL;
1660 2088
1661sub new { 2089sub new {
1662 my $class = shift; 2090 my $class = shift;
1663 2091
1664 $class->SUPER::new ( 2092 $class->SUPER::new (
1665 fg => [1, 1, 1], 2093 fg => [1, 1, 1],
1666 bg => [0, 0, 0, 0.2], 2094 bg => [0, 0, 0, 0.2],
2095 outline => [0.6, 0.3, 0.1],
1667 active_bg => [1, 1, 1, 0.5], 2096 active_bg => [0, 0, 1, .2],
1668 active_fg => [0, 0, 0], 2097 active_fg => [1, 1, 1],
2098 active_outline => [1, 1, 0],
1669 can_hover => 1, 2099 can_hover => 1,
1670 can_focus => 1, 2100 can_focus => 1,
2101 align => 0,
1671 valign => 0, 2102 valign => 0.5,
1672 can_events => 1, 2103 can_events => 1,
2104 ellipsise => 0,
2105 padding_x => 4,
2106 padding_y => 2,
1673 #text => ... 2107 #text => ...
2108 #hidden => "*",
1674 @_ 2109 @_
1675 ) 2110 )
1676} 2111}
1677 2112
1678sub _set_text { 2113sub _set_text {
… …
1685 $self->{last_activity} = $::NOW; 2120 $self->{last_activity} = $::NOW;
1686 $self->{text} = $text; 2121 $self->{text} = $text;
1687 2122
1688 $text =~ s/./*/g if $self->{hidden}; 2123 $text =~ s/./*/g if $self->{hidden};
1689 $self->{layout}->set_text ("$text "); 2124 $self->{layout}->set_text ("$text ");
2125 delete $self->{size_req};
1690 2126
1691 $self->_emit (changed => $self->{text}); 2127 $self->emit (changed => $self->{text});
2128
2129 $self->realloc;
1692 $self->update; 2130 $self->update;
1693} 2131}
1694 2132
1695sub set_text { 2133sub set_text {
1696 my ($self, $text) = @_; 2134 my ($self, $text) = @_;
1697 2135
1698 $self->{cursor} = length $text; 2136 $self->{cursor} = length $text;
1699 $self->_set_text ($text); 2137 $self->_set_text ($text);
1700
1701 $self->realloc;
1702} 2138}
1703 2139
1704sub get_text { 2140sub get_text {
1705 $_[0]{text} 2141 $_[0]{text}
1706} 2142}
… …
1711 my ($w, $h) = $self->SUPER::size_request; 2147 my ($w, $h) = $self->SUPER::size_request;
1712 2148
1713 ($w + 1, $h) # add 1 for cursor 2149 ($w + 1, $h) # add 1 for cursor
1714} 2150}
1715 2151
1716sub key_down { 2152sub invoke_key_down {
1717 my ($self, $ev) = @_; 2153 my ($self, $ev) = @_;
1718 2154
1719 my $mod = $ev->{mod}; 2155 my $mod = $ev->{mod};
1720 my $sym = $ev->{sym}; 2156 my $sym = $ev->{sym};
1721 my $uni = $ev->{unicode}; 2157 my $uni = $ev->{unicode};
1722 2158
1723 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;
1724 2162
1725 if ($uni == 8) { 2163 if ($uni == 8) {
1726 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2164 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1727 } elsif ($uni == 127) { 2165 } elsif ($uni == 127) {
1728 substr $text, $self->{cursor}, 1, ""; 2166 substr $text, $self->{cursor}, 1, "";
1729 } elsif ($sym == CFClient::SDLK_LEFT) { 2167 } elsif ($sym == DC::SDLK_LEFT) {
1730 --$self->{cursor} if $self->{cursor}; 2168 --$self->{cursor} if $self->{cursor};
1731 } elsif ($sym == CFClient::SDLK_RIGHT) { 2169 } elsif ($sym == DC::SDLK_RIGHT) {
1732 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2170 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1733 } 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 = "";
1734 $self->{cursor} = 0; 2185 $self->{cursor} = 0;
1735 } elsif ($sym == CFClient::SDLK_END) {
1736 $self->{cursor} = length $text;
1737 } elsif ($uni == 27) { 2186 } elsif ($uni == 27) {
1738 $self->_emit ('escape'); 2187 $self->emit ('escape');
1739 } elsif ($uni) { 2188 } elsif ($uni == 0x0d) {
2189 substr $text, $self->{cursor}++, 0, "\012";
2190 } elsif ($uni >= 0x20) {
1740 substr $text, $self->{cursor}++, 0, chr $uni; 2191 substr $text, $self->{cursor}++, 0, chr $uni;
1741 } else { 2192 } else {
1742 return 0; 2193 return 0;
1743 } 2194 }
1744 2195
1745 $self->_set_text ($text); 2196 $self->_set_text ($text);
1746 2197
1747 $self->realloc; 2198 $self->realloc;
2199 $self->update;
1748 2200
1749 1 2201 1
1750} 2202}
1751 2203
1752sub focus_in { 2204sub invoke_focus_in {
1753 my ($self) = @_; 2205 my ($self) = @_;
1754 2206
1755 $self->{last_activity} = $::NOW; 2207 $self->{last_activity} = $::NOW;
1756 2208
1757 $self->SUPER::focus_in; 2209 $self->SUPER::invoke_focus_in
1758} 2210}
1759 2211
1760sub button_down { 2212sub invoke_button_down {
1761 my ($self, $ev, $x, $y) = @_; 2213 my ($self, $ev, $x, $y) = @_;
1762 2214
1763 $self->SUPER::button_down ($ev, $x, $y); 2215 $self->SUPER::invoke_button_down ($ev, $x, $y);
1764 2216
1765 my $idx = $self->{layout}->xy_to_index ($x, $y); 2217 my $idx = $self->{layout}->xy_to_index ($x, $y);
1766 2218
1767 # byte-index to char-index 2219 # byte-index to char-index
1768 my $text = $self->{text}; 2220 my $text = $self->{text};
1769 utf8::encode $text; 2221 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1770 $self->{cursor} = length substr $text, 0, $idx; 2222 $self->{cursor} = length $text;
1771 2223
1772 $self->_set_text ($self->{text}); 2224 $self->_set_text ($self->{text});
1773 $self->update; 2225 $self->update;
1774 2226
1775 1 2227 1
1776} 2228}
1777 2229
1778sub mouse_motion { 2230sub invoke_mouse_motion {
1779 my ($self, $ev, $x, $y) = @_; 2231 my ($self, $ev, $x, $y) = @_;
1780# 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#
1781 2233
1782 0 2234 1
1783} 2235}
1784 2236
1785sub _draw { 2237sub _draw {
1786 my ($self) = @_; 2238 my ($self) = @_;
1787 2239
… …
1794 glColor_premultiply @{$self->{bg}}; 2246 glColor_premultiply @{$self->{bg}};
1795 } 2247 }
1796 2248
1797 glEnable GL_BLEND; 2249 glEnable GL_BLEND;
1798 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2250 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1799 glBegin GL_QUADS;
1800 glVertex 0 , 0;
1801 glVertex 0 , $self->{h};
1802 glVertex $self->{w}, $self->{h}; 2251 glRect 0, 0, $self->{w}, $self->{h};
1803 glVertex $self->{w}, 0;
1804 glEnd;
1805 glDisable GL_BLEND; 2252 glDisable GL_BLEND;
1806 2253
1807 $self->SUPER::_draw; 2254 $self->SUPER::_draw;
1808 2255
1809 #TODO: force update every cursor change :( 2256 #TODO: force update every cursor change :(
… …
1811 2258
1812 unless (exists $self->{cur_h}) { 2259 unless (exists $self->{cur_h}) {
1813 my $text = substr $self->{text}, 0, $self->{cursor}; 2260 my $text = substr $self->{text}, 0, $self->{cursor};
1814 utf8::encode $text; 2261 utf8::encode $text;
1815 2262
1816 @$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);
1817 } 2264 }
1818 2265
1819 glColor @{$self->{fg}}; 2266 glColor_premultiply @{$self->{active_fg}};
1820 glBegin GL_LINES; 2267 glBegin GL_LINES;
1821 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2268 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1822 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};
1823 glEnd; 2270 glEnd;
1824 }
1825}
1826 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
1827package CFClient::UI::Entry; 2290package DC::UI::Entry;
1828 2291
1829our @ISA = CFClient::UI::EntryBase::; 2292our @ISA = DC::UI::EntryBase::;
1830 2293
1831use CFClient::OpenGL; 2294use DC::OpenGL;
1832 2295
2296sub new {
2297 my $class = shift;
2298
2299 $class->SUPER::new (
2300 history_pointer => -1,
2301 @_
2302 )
2303}
2304
2305
1833sub key_down { 2306sub invoke_key_down {
1834 my ($self, $ev) = @_; 2307 my ($self, $ev) = @_;
1835 2308
1836 my $sym = $ev->{sym}; 2309 my $sym = $ev->{sym};
1837 2310
1838 if ($sym == 13) { 2311 if ($ev->{uni} == 0x0d || $sym == 13) {
1839 unshift @{$self->{history}}, 2312 unshift @{$self->{history}},
1840 my $txt = $self->get_text; 2313 my $txt = $self->get_text;
2314
1841 $self->{history_pointer} = -1; 2315 $self->{history_pointer} = -1;
1842 $self->{history_saveback} = ''; 2316 $self->{history_saveback} = '';
1843 $self->_emit (activate => $txt); 2317 $self->emit (activate => $txt);
1844 $self->update; 2318 $self->update;
1845 2319
1846 } elsif ($sym == CFClient::SDLK_UP) { 2320 } elsif ($sym == DC::SDLK_UP) {
1847 if ($self->{history_pointer} < 0) { 2321 if ($self->{history_pointer} < 0) {
1848 $self->{history_saveback} = $self->get_text; 2322 $self->{history_saveback} = $self->get_text;
1849 } 2323 }
1850 if (@{$self->{history} || []} > 0) { 2324 if (@{$self->{history} || []} > 0) {
1851 $self->{history_pointer}++; 2325 $self->{history_pointer}++;
… …
1853 $self->{history_pointer} = @{$self->{history} || []} - 1; 2327 $self->{history_pointer} = @{$self->{history} || []} - 1;
1854 } 2328 }
1855 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2329 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1856 } 2330 }
1857 2331
1858 } elsif ($sym == CFClient::SDLK_DOWN) { 2332 } elsif ($sym == DC::SDLK_DOWN) {
1859 $self->{history_pointer}--; 2333 $self->{history_pointer}--;
1860 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2334 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1861 2335
1862 if ($self->{history_pointer} >= 0) { 2336 if ($self->{history_pointer} >= 0) {
1863 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2337 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1864 } else { 2338 } else {
2339 if (defined $self->{history_saveback}) {
1865 $self->set_text ($self->{history_saveback}); 2340 $self->set_text ($self->{history_saveback});
2341 $self->{history_saveback} = undef;
2342 }
1866 } 2343 }
1867 2344
1868 } else { 2345 } else {
1869 return $self->SUPER::key_down ($ev) 2346 return $self->SUPER::invoke_key_down ($ev)
1870 } 2347 }
1871 2348
1872 1 2349 1
1873} 2350}
1874 2351
1875############################################################################# 2352#############################################################################
1876 2353
1877package CFClient::UI::Button; 2354package DC::UI::TextEdit;
1878 2355
1879our @ISA = CFClient::UI::Label::; 2356our @ISA = DC::UI::EntryBase::;
1880 2357
1881use CFClient::OpenGL; 2358use DC::OpenGL;
1882
1883my @tex =
1884 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1885 qw(b1_button_active.png);
1886 2359
1887sub new { 2360sub new {
1888 my $class = shift; 2361 my $class = shift;
1889 2362
1890 $class->SUPER::new ( 2363 $class->SUPER::new (
1891 padding_x => 4,
1892 padding_y => 4, 2364 padding_y => 4,
1893 fg => [1, 1, 1], 2365
1894 active_fg => [0, 0, 1], 2366 @_
2367 )
2368}
2369
2370sub move_cursor_ver {
2371 my ($self, $dy) = @_;
2372
2373 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2374
2375 $line += $dy;
2376
2377 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2378 $self->{cursor} = $index;
2379 delete $self->{cur_h};
2380 $self->update;
2381 return;
2382 }
2383}
2384
2385sub invoke_key_down {
2386 my ($self, $ev) = @_;
2387
2388 my $sym = $ev->{sym};
2389
2390 if ($sym == DC::SDLK_UP) {
2391 $self->move_cursor_ver (-1);
2392 } elsif ($sym == DC::SDLK_DOWN) {
2393 $self->move_cursor_ver (+1);
2394 } else {
2395 return $self->SUPER::invoke_key_down ($ev)
2396 }
2397
2398 1
2399}
2400
2401#############################################################################
2402
2403package DC::UI::ButtonBin;
2404
2405our @ISA = DC::UI::Bin::;
2406
2407use DC::OpenGL;
2408
2409my @tex =
2410 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2411 qw(b1_button_inactive.png b1_button_active.png);
2412
2413sub new {
2414 my $class = shift;
2415
2416 $class->SUPER::new (
1895 can_hover => 1, 2417 can_hover => 1,
1896 align => 0, 2418 align => 0.5,
1897 valign => 0, 2419 valign => 0.5,
1898 can_events => 1, 2420 can_events => 1,
1899 @_ 2421 @_
1900 ) 2422 )
1901} 2423}
1902 2424
1903sub activate { }
1904
1905sub button_up { 2425sub invoke_button_up {
1906 my ($self, $ev, $x, $y) = @_; 2426 my ($self, $ev, $x, $y) = @_;
1907 2427
1908 $self->emit ("activate") 2428 $self->emit ("activate")
1909 if $x >= 0 && $x < $self->{w} 2429 if $x >= 0 && $x < $self->{w}
1910 && $y >= 0 && $y < $self->{h}; 2430 && $y >= 0 && $y < $self->{h};
… …
1913} 2433}
1914 2434
1915sub _draw { 2435sub _draw {
1916 my ($self) = @_; 2436 my ($self) = @_;
1917 2437
1918 local $self->{fg} = $self->{fg};
1919
1920 if ($GRAB == $self) {
1921 $self->{fg} = $self->{active_fg};
1922 }
1923
1924 glEnable GL_TEXTURE_2D; 2438 glEnable GL_TEXTURE_2D;
1925 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1926 glColor 0, 0, 0, 1; 2440 glColor 0, 0, 0, 1;
1927 2441
2442 my $tex = $tex[$GRAB == $self];
1928 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2443 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1929 2444
1930 glDisable GL_TEXTURE_2D; 2445 glDisable GL_TEXTURE_2D;
1931 2446
1932 $self->SUPER::_draw; 2447 $self->SUPER::_draw;
1933} 2448}
1934 2449
1935############################################################################# 2450#############################################################################
1936 2451
1937package CFClient::UI::CheckBox; 2452package DC::UI::Button;
1938 2453
1939our @ISA = CFClient::UI::DrawBG::; 2454our @ISA = DC::UI::Label::;
2455
2456use DC::OpenGL;
1940 2457
1941my @tex = 2458my @tex =
1942 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2459 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2460 qw(b1_button_inactive.png b1_button_active.png);
2461
2462sub new {
2463 my $class = shift;
2464
2465 $class->SUPER::new (
2466 padding_x => 8,
2467 padding_y => 4,
2468 fg => [1.0, 1.0, 1.0],
2469 active_fg => [0.8, 0.8, 0.8],
2470 can_hover => 1,
2471 align => 0.5,
2472 valign => 0.5,
2473 can_events => 1,
2474 @_
2475 )
2476}
2477
2478sub invoke_button_up {
2479 my ($self, $ev, $x, $y) = @_;
2480
2481 $self->emit ("activate")
2482 if $x >= 0 && $x < $self->{w}
2483 && $y >= 0 && $y < $self->{h};
2484
2485 1
2486}
2487
2488sub _draw {
2489 my ($self) = @_;
2490
2491 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2492
2493 glEnable GL_TEXTURE_2D;
2494 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2495 glColor 0, 0, 0, 1;
2496
2497 my $tex = $tex[$GRAB == $self];
2498 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2499
2500 glDisable GL_TEXTURE_2D;
2501
2502 $self->SUPER::_draw;
2503}
2504
2505#############################################################################
2506
2507package DC::UI::CheckBox;
2508
2509our @ISA = DC::UI::DrawBG::;
2510
2511my @tex =
2512 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1943 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2513 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1944 2514
1945use CFClient::OpenGL; 2515use DC::OpenGL;
1946 2516
1947sub new { 2517sub new {
1948 my $class = shift; 2518 my $class = shift;
1949 2519
1950 $class->SUPER::new ( 2520 $class->SUPER::new (
… …
1964 my ($self) = @_; 2534 my ($self) = @_;
1965 2535
1966 (6) x 2 2536 (6) x 2
1967} 2537}
1968 2538
2539sub toggle {
2540 my ($self) = @_;
2541
2542 $self->{state} = !$self->{state};
2543 $self->emit (changed => $self->{state});
2544 $self->update;
2545}
2546
1969sub button_down { 2547sub invoke_button_down {
1970 my ($self, $ev, $x, $y) = @_; 2548 my ($self, $ev, $x, $y) = @_;
1971 2549
1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2550 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2551 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1974 $self->{state} = !$self->{state}; 2552 $self->toggle;
1975 $self->_emit (changed => $self->{state});
1976 } else { 2553 } else {
1977 return 0 2554 return 0
1978 } 2555 }
1979 2556
1980 1 2557 1
… …
1983sub _draw { 2560sub _draw {
1984 my ($self) = @_; 2561 my ($self) = @_;
1985 2562
1986 $self->SUPER::_draw; 2563 $self->SUPER::_draw;
1987 2564
1988 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2565 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
1989 2566
1990 my ($w, $h) = @$self{qw(w h)}; 2567 my ($w, $h) = @$self{qw(w h)};
1991 2568
1992 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2569 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1993 2570
… …
2000 glDisable GL_TEXTURE_2D; 2577 glDisable GL_TEXTURE_2D;
2001} 2578}
2002 2579
2003############################################################################# 2580#############################################################################
2004 2581
2005package CFClient::UI::Image; 2582package DC::UI::Image;
2006 2583
2007our @ISA = CFClient::UI::Base::; 2584our @ISA = DC::UI::Base::;
2008 2585
2009use CFClient::OpenGL; 2586use DC::OpenGL;
2010use Carp qw/confess/;
2011 2587
2012our %loaded_images; 2588our %texture_cache;
2013 2589
2014sub new { 2590sub new {
2015 my $class = shift; 2591 my $class = shift;
2016 2592
2017 my $self = $class->SUPER::new (can_events => 0, @_); 2593 my $self = $class->SUPER::new (
2594 can_events => 0,
2595 scale => 1,
2596 @_,
2597 );
2018 2598
2019 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2599 $self->{path} || $self->{tex}
2600 or Carp::croak "'path' or 'tex' attributes required";
2020 2601
2021 $loaded_images{$self->{image}} ||= 2602 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2022 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2603 new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1;
2023 2604
2024 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2605 DC::weaken $texture_cache{$self->{path}};
2025 2606
2026 Scalar::Util::weaken $loaded_images{$self->{image}}; 2607 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2027
2028 $self->{aspect} = $tex->{w} / $tex->{h};
2029 2608
2030 $self 2609 $self
2031} 2610}
2032 2611
2612sub STORABLE_freeze {
2613 my ($self, $cloning) = @_;
2614
2615 $self->{path}
2616 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2617
2618 $self->{path}
2619}
2620
2621sub STORABLE_attach {
2622 my ($self, $cloning, $path) = @_;
2623
2624 $self->new (path => $path)
2625}
2626
2033sub size_request { 2627sub size_request {
2034 my ($self) = @_; 2628 my ($self) = @_;
2035 2629
2036 ($self->{tex}->{w}, $self->{tex}->{h}) 2630 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2037} 2631}
2038 2632
2039sub _draw { 2633sub _draw {
2040 my ($self) = @_; 2634 my ($self) = @_;
2041 2635
… …
2058 glDisable GL_TEXTURE_2D; 2652 glDisable GL_TEXTURE_2D;
2059} 2653}
2060 2654
2061############################################################################# 2655#############################################################################
2062 2656
2657package DC::UI::ImageButton;
2658
2659our @ISA = DC::UI::Image::;
2660
2661use DC::OpenGL;
2662
2663my %textures;
2664
2665sub new {
2666 my $class = shift;
2667
2668 my $self = $class->SUPER::new (
2669 padding_x => 4,
2670 padding_y => 4,
2671 fg => [1, 1, 1],
2672 active_fg => [0, 0, 1],
2673 can_hover => 1,
2674 align => 0.5,
2675 valign => 0.5,
2676 can_events => 1,
2677 @_
2678 );
2679}
2680
2681sub invoke_button_down {
2682 my ($self, $ev, $x, $y) = @_;
2683
2684 1
2685}
2686
2687sub invoke_button_up {
2688 my ($self, $ev, $x, $y) = @_;
2689
2690 $self->emit ("activate")
2691 if $x >= 0 && $x < $self->{w}
2692 && $y >= 0 && $y < $self->{h};
2693
2694 1
2695}
2696
2697#############################################################################
2698
2063package CFClient::UI::VGauge; 2699package DC::UI::VGauge;
2064 2700
2065our @ISA = CFClient::UI::Base::; 2701our @ISA = DC::UI::Base::;
2066 2702
2067use List::Util qw(min max); 2703use List::Util qw(min max);
2068 2704
2069use CFClient::OpenGL; 2705use DC::OpenGL;
2070 2706
2071my %tex = ( 2707my %tex = (
2072 food => [ 2708 food => [
2073 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2709 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2074 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2710 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2075 ], 2711 ],
2076 grace => [ 2712 grace => [
2077 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2713 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2078 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2714 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2079 ], 2715 ],
2080 hp => [ 2716 hp => [
2081 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2717 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2082 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2718 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2083 ], 2719 ],
2084 mana => [ 2720 mana => [
2085 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2721 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2086 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2722 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2087 ], 2723 ],
2088); 2724);
2089 2725
2090# eg. VGauge->new (gauge => 'food'), default gauge: food 2726# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2150 my $ycut1 = max 0, min 1, $ycut; 2786 my $ycut1 = max 0, min 1, $ycut;
2151 my $ycut2 = max 0, min 1, $ycut - 1; 2787 my $ycut2 = max 0, min 1, $ycut - 1;
2152 2788
2153 my $h1 = $self->{h} * (1 - $ycut1); 2789 my $h1 = $self->{h} * (1 - $ycut1);
2154 my $h2 = $self->{h} * (1 - $ycut2); 2790 my $h2 = $self->{h} * (1 - $ycut2);
2791 my $h3 = $self->{h};
2792
2793 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2155 2794
2156 glEnable GL_BLEND; 2795 glEnable GL_BLEND;
2157 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2796 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2158 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2797 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2159 glEnable GL_TEXTURE_2D; 2798 glEnable GL_TEXTURE_2D;
… …
2178 2817
2179 if ($t3) { 2818 if ($t3) {
2180 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2819 glBindTexture GL_TEXTURE_2D, $t3->{name};
2181 glBegin GL_QUADS; 2820 glBegin GL_QUADS;
2182 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2821 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2183 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2822 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2184 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2823 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2185 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2824 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2186 glEnd; 2825 glEnd;
2187 } 2826 }
2188 2827
2189 glDisable GL_BLEND; 2828 glDisable GL_BLEND;
2190 glDisable GL_TEXTURE_2D; 2829 glDisable GL_TEXTURE_2D;
2191} 2830}
2192 2831
2193############################################################################# 2832#############################################################################
2194 2833
2834package DC::UI::Progress;
2835
2836our @ISA = DC::UI::Label::;
2837
2838use DC::OpenGL;
2839
2840sub new {
2841 my ($class, %arg) = @_;
2842
2843 my $self = $class->SUPER::new (
2844 fg => [1, 1, 1],
2845 bg => [0, 0, 1, 0.2],
2846 bar => [0.7, 0.5, 0.1, 0.8],
2847 outline => [0.4, 0.3, 0],
2848 fontsize => 0.9,
2849 valign => 0.5,
2850 align => 0.5,
2851 can_events => 1,
2852 ellipsise => 1,
2853 label => "%d%%",
2854 %arg,
2855 );
2856
2857 $self->set_value ($arg{value} || -1);
2858
2859 $self
2860}
2861
2862sub set_label {
2863 my ($self, $label) = @_;
2864
2865 return if $self->{label} eq $label;
2866 $self->{label} = $label;
2867
2868 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2869}
2870
2871sub set_value {
2872 my ($self, $value) = @_;
2873
2874 if ($self->{value} ne $value) {
2875 $self->{value} = $value;
2876
2877 if ($value < 0) {
2878 $self->set_text ("-");
2879 } else {
2880 $self->set_text (sprintf $self->{label}, $value * 100);
2881 }
2882
2883 $self->update;
2884 }
2885}
2886
2887sub _draw {
2888 my ($self) = @_;
2889
2890 glEnable GL_BLEND;
2891 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2892
2893 if ($self->{value} >= 0) {
2894 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2895
2896 glColor_premultiply @{$self->{bar}};
2897 glRect 2, 2, $s, $self->{h} - 2;
2898 glColor_premultiply @{$self->{bg}};
2899 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2900 }
2901
2902 glColor_premultiply @{$self->{outline}};
2903 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2904
2905 glDisable GL_BLEND;
2906
2907 {
2908 local $self->{bg}; # do not draw background
2909 $self->SUPER::_draw;
2910 }
2911}
2912
2913#############################################################################
2914
2915package DC::UI::ExperienceProgress;
2916
2917our @ISA = DC::UI::Progress::;
2918
2919sub new {
2920 my ($class, %arg) = @_;
2921
2922 my $self = $class->SUPER::new (
2923 tooltip => sub {
2924 my ($self) = @_;
2925
2926 sprintf "level %d\n%s points\n%s next level\n%s to go",
2927 $self->{lvl},
2928 ::formsep ($self->{exp}),
2929 ::formsep ($self->{nxt}),
2930 ::formsep ($self->{nxt} - $self->{exp}),
2931 },
2932 %arg
2933 );
2934
2935 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2936 if $::CONN;
2937
2938 $self
2939}
2940
2941sub DESTROY {
2942 my ($self) = @_;
2943
2944 delete $::CONN->{on_exp_update}{$self+0}
2945 if $::CONN;
2946
2947 $self->SUPER::DESTROY;
2948}
2949
2950sub set_value {
2951 my ($self, $lvl, $exp) = @_;
2952
2953 $self->{lvl} = $lvl;
2954 $self->{exp} = $exp;
2955
2956 my $v = -1;
2957
2958 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2959 my $l0 = $table->[$lvl - 1];
2960 my $l1 = $table->[$lvl];
2961
2962 $self->{nxt} = $l1;
2963
2964 $v = ($exp - $l0) / ($l1 - $l0);
2965 }
2966
2967 $self->SUPER::set_value ($v);
2968}
2969
2970#############################################################################
2971
2195package CFClient::UI::Gauge; 2972package DC::UI::Gauge;
2196 2973
2197our @ISA = CFClient::UI::VBox::; 2974our @ISA = DC::UI::VBox::;
2198 2975
2199sub new { 2976sub new {
2200 my ($class, %arg) = @_; 2977 my ($class, %arg) = @_;
2201 2978
2202 my $self = $class->SUPER::new ( 2979 my $self = $class->SUPER::new (
… …
2204 can_hover => 1, 2981 can_hover => 1,
2205 can_events => 1, 2982 can_events => 1,
2206 %arg, 2983 %arg,
2207 ); 2984 );
2208 2985
2209 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2986 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2210 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2987 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2211 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2988 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2212 2989
2213 $self 2990 $self
2214} 2991}
2215 2992
2216sub set_fontsize { 2993sub set_fontsize {
… …
2237 $self->{value}->set_text ($val); 3014 $self->{value}->set_text ($val);
2238} 3015}
2239 3016
2240############################################################################# 3017#############################################################################
2241 3018
2242package CFClient::UI::Slider; 3019package DC::UI::Slider;
2243 3020
2244use strict; 3021use strict;
2245 3022
2246use CFClient::OpenGL; 3023use DC::OpenGL;
2247 3024
2248our @ISA = CFClient::UI::DrawBG::; 3025our @ISA = DC::UI::DrawBG::;
2249 3026
2250my @tex = 3027my @tex =
2251 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 3028 map { new_from_file DC::Texture DC::find_rcfile $_ }
2252 qw(s1_slider.png s1_slider_bg.png); 3029 qw(s1_slider.png s1_slider_bg.png);
2253 3030
2254sub new { 3031sub new {
2255 my $class = shift; 3032 my $class = shift;
2256 3033
… …
2277 $self->update; 3054 $self->update;
2278 3055
2279 $self 3056 $self
2280} 3057}
2281 3058
2282sub changed { }
2283
2284sub set_range { 3059sub set_range {
2285 my ($self, $range) = @_; 3060 my ($self, $range) = @_;
2286 3061
2287 ($range, $self->{range}) = ($self->{range}, $range); 3062 ($range, $self->{range}) = ($self->{range}, $range);
2288 3063
2289 $self->update
2290 if "@$range" ne "@{$self->{range}}"; 3064 if ("@$range" ne "@{$self->{range}}") {
3065 $self->update;
3066 $self->set_value ($self->{range}[0]);
3067 }
2291} 3068}
2292 3069
2293sub set_value { 3070sub set_value {
2294 my ($self, $value) = @_; 3071 my ($self, $value) = @_;
2295 3072
2296 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3073 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2297 3074
2298 $hi = $lo + 1 if $hi <= $lo; 3075 $hi = $lo if $hi < $lo;
2299 3076
2300 $page = $hi - $lo if $page > $hi - $lo; 3077 $value = $hi - $page if $value > $hi - $page;
2301
2302 $value = $lo if $value < $lo; 3078 $value = $lo if $value < $lo;
2303 $value = $hi - $page if $value > $hi - $page;
2304 3079
2305 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3080 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2306 if $unit; 3081 if $unit;
2307 3082
2308 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3083 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2309 3084
2310 if ($value != $old_value) { 3085 if ($value != $old_value) {
2311 $self->_emit (changed => $value); 3086 $self->emit (changed => $value);
2312 $self->update; 3087 $self->update;
2313 } 3088 }
2314} 3089}
2315 3090
2316sub size_request { 3091sub size_request {
2317 my ($self) = @_; 3092 my ($self) = @_;
2318 3093
2319 ($self->{req_w}, $self->{req_h}) 3094 ($self->{req_w}, $self->{req_h})
2320} 3095}
2321 3096
2322sub button_down { 3097sub invoke_button_down {
2323 my ($self, $ev, $x, $y) = @_; 3098 my ($self, $ev, $x, $y) = @_;
2324 3099
2325 $self->SUPER::button_down ($ev, $x, $y); 3100 $self->SUPER::invoke_button_down ($ev, $x, $y);
2326 3101
2327 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3102 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2328 3103
2329 $self->mouse_motion ($ev, $x, $y) 3104 $self->invoke_mouse_motion ($ev, $x, $y);
2330}
2331 3105
3106 1
3107}
3108
2332sub mouse_motion { 3109sub invoke_mouse_motion {
2333 my ($self, $ev, $x, $y) = @_; 3110 my ($self, $ev, $x, $y) = @_;
2334 3111
2335 if ($GRAB == $self) { 3112 if ($GRAB == $self) {
2336 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3113 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2337 3114
… …
2345 } 3122 }
2346 3123
2347 1 3124 1
2348} 3125}
2349 3126
3127sub invoke_mouse_wheel {
3128 my ($self, $ev) = @_;
3129
3130 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3131
3132 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
3133
3134 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
3135
3136 1
3137}
3138
2350sub update { 3139sub update {
2351 my ($self) = @_; 3140 my ($self) = @_;
2352 3141
2353 delete $self->{knob_w}; 3142 delete $self->{knob_w};
2354 $self->SUPER::update; 3143 $self->SUPER::update;
… …
2358 my ($self) = @_; 3147 my ($self) = @_;
2359 3148
2360 unless ($self->{knob_w}) { 3149 unless ($self->{knob_w}) {
2361 $self->set_value ($self->{range}[0]); 3150 $self->set_value ($self->{range}[0]);
2362 3151
2363 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3152 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2364 my $range = ($hi - $page - $lo) || 1e-100; 3153 my $range = ($hi - $page - $lo) || 1e-10;
2365 3154
2366 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3155 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2367 3156
2368 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3157 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2369 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3158 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2370 3159
2371 $value = ($value - $lo) / $range; 3160 $value = ($value - $lo) / $range;
… …
2401 glDisable GL_TEXTURE_2D; 3190 glDisable GL_TEXTURE_2D;
2402} 3191}
2403 3192
2404############################################################################# 3193#############################################################################
2405 3194
2406package CFClient::UI::ValSlider; 3195package DC::UI::ValSlider;
2407 3196
2408our @ISA = CFClient::UI::HBox::; 3197our @ISA = DC::UI::HBox::;
2409 3198
2410sub new { 3199sub new {
2411 my ($class, %arg) = @_; 3200 my ($class, %arg) = @_;
2412 3201
2413 my $range = delete $arg{range}; 3202 my $range = delete $arg{range};
2414 3203
2415 my $self = $class->SUPER::new ( 3204 my $self = $class->SUPER::new (
2416 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3205 slider => (new DC::UI::Slider expand => 1, range => $range),
2417 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3206 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2418 to_value => sub { shift }, 3207 to_value => sub { shift },
2419 from_value => sub { shift }, 3208 from_value => sub { shift },
2420 %arg, 3209 %arg,
2421 ); 3210 );
2422 3211
… …
2442sub set_range { shift->{slider}->set_range (@_) } 3231sub set_range { shift->{slider}->set_range (@_) }
2443sub set_value { shift->{slider}->set_value (@_) } 3232sub set_value { shift->{slider}->set_value (@_) }
2444 3233
2445############################################################################# 3234#############################################################################
2446 3235
2447package CFClient::UI::TextView; 3236package DC::UI::TextScroller;
2448 3237
2449our @ISA = CFClient::UI::HBox::; 3238our @ISA = DC::UI::HBox::;
2450 3239
2451use CFClient::OpenGL; 3240use DC::OpenGL;
2452 3241
2453sub new { 3242sub new {
2454 my $class = shift; 3243 my $class = shift;
2455 3244
2456 my $self = $class->SUPER::new ( 3245 my $self = $class->SUPER::new (
2457 fontsize => 1, 3246 fontsize => 1,
2458 can_events => 0, 3247 can_events => 1,
3248 indent => 0,
2459 #font => default_font 3249 #font => default_font
2460 @_, 3250 @_,
2461 3251
2462 layout => (new CFClient::Layout 1), 3252 layout => (new DC::Layout),
2463 par => [], 3253 par => [],
3254 max_par => 0,
2464 height => 0, 3255 height => 0,
2465 children => [ 3256 children => [
2466 (new CFClient::UI::Empty expand => 1), 3257 (new DC::UI::Empty expand => 1),
2467 (new CFClient::UI::Slider vertical => 1), 3258 (new DC::UI::Slider vertical => 1),
2468 ], 3259 ],
2469 ); 3260 );
2470 3261
2471 $self->{children}[1]->connect (changed => sub { $self->update }); 3262 $self->{children}[1]->connect (changed => sub { $self->update });
2472 3263
… …
2478 3269
2479 $self->{fontsize} = $fontsize; 3270 $self->{fontsize} = $fontsize;
2480 $self->reflow; 3271 $self->reflow;
2481} 3272}
2482 3273
3274sub size_request {
3275 my ($self) = @_;
3276
3277 my ($empty, $slider) = $self->visible_children;
3278
3279 local $self->{children} = [$empty, $slider];
3280 $self->SUPER::size_request
3281}
3282
2483sub size_allocate { 3283sub invoke_size_allocate {
2484 my ($self, $w, $h) = @_; 3284 my ($self, $w, $h) = @_;
2485 3285
2486 $self->SUPER::size_allocate ($w, $h); 3286 my ($empty, $slider, @other) = @{ $self->{children} };
3287 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2487 3288
2488 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3289 $self->{layout}->set_font ($self->{font}) if $self->{font};
2489 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3290 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2490 $self->{layout}->set_width ($self->{children}[0]{w}); 3291 $self->{layout}->set_width ($empty->{w});
3292 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2491 3293
2492 $self->reflow; 3294 $self->reflow;
2493}
2494 3295
2495sub text_size { 3296 local $self->{children} = [$empty, $slider];
3297 $self->SUPER::invoke_size_allocate ($w, $h)
3298}
3299
3300sub invoke_mouse_wheel {
2496 my ($self, $text, $indent) = @_; 3301 my ($self, $ev) = @_;
3302
3303 return 0 unless $ev->{dy}; # only vertical movements
3304
3305 $self->{children}[1]->emit (mouse_wheel => $ev);
3306
3307 1
3308}
3309
3310sub get_layout {
3311 my ($self, $para) = @_;
2497 3312
2498 my $layout = $self->{layout}; 3313 my $layout = $self->{layout};
2499 3314
3315 $layout->set_font ($self->{font}) if $self->{font};
3316 $layout->set_foreground (@{$para->{fg}});
2500 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3317 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2501 $layout->set_width ($self->{children}[0]{w} - $indent); 3318 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3319 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2502 $layout->set_markup ($text); 3320 $layout->set_markup ($para->{markup});
3321
3322 $layout->set_shapes (
3323 map
3324 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3325 @{$para->{widget}}
2503 3326 );
3327
2504 $layout->size 3328 $layout
2505} 3329}
2506 3330
2507sub reflow { 3331sub reflow {
2508 my ($self) = @_; 3332 my ($self) = @_;
2509 3333
… …
2516 3340
2517 # todo: base offset on lines or so, not on pixels 3341 # todo: base offset on lines or so, not on pixels
2518 $self->{children}[1]->set_value ($offset); 3342 $self->{children}[1]->set_value ($offset);
2519} 3343}
2520 3344
3345sub current_paragraph {
3346 my ($self) = @_;
3347
3348 $self->{top_paragraph} - 1
3349}
3350
3351sub scroll_to {
3352 my ($self, $para) = @_;
3353
3354 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3355
3356 $self->{scroll_to} = $para;
3357 $self->update;
3358}
3359
2521sub clear { 3360sub clear {
2522 my ($self) = @_; 3361 my ($self) = @_;
3362
3363 my (undef, undef, @other) = @{ $self->{children} };
3364 $self->remove ($_) for @other;
2523 3365
2524 $self->{par} = []; 3366 $self->{par} = [];
2525 $self->{height} = 0; 3367 $self->{height} = 0;
2526 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3368 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2527} 3369}
2528 3370
2529sub add_paragraph { 3371sub add_paragraph {
2530 my ($self, $color, $text, $indent) = @_; 3372 my $self = shift;
2531 3373
2532 for my $line (split /\n/, $text) { 3374 for my $para (@_) {
2533 my ($w, $h) = $self->text_size ($line); 3375 $para = {
3376 fg => [1, 1, 1, 1],
3377 indent => 0,
3378 markup => "",
3379 widget => [],
3380 ref $para ? %$para : (markup => $para),
3381 w => 1e10,
3382 wrapped => 1,
3383 };
3384
3385 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3386 push @{$self->{par}}, $para;
3387 }
3388
3389 if (my $max = $self->{max_par}) {
3390 shift @{$self->{par}} while @{$self->{par}} > $max;
3391 }
3392
3393 $self->{need_reflow}++;
3394 $self->update;
3395}
3396
3397sub scroll_to_bottom {
3398 my ($self) = @_;
3399
3400 $self->{scroll_to} = $#{$self->{par}};
3401 $self->update;
3402}
3403
3404sub force_uptodate {
3405 my ($self) = @_;
3406
3407 if (delete $self->{need_reflow}) {
3408 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3409
3410 my $height = 0;
3411
3412 for my $para (@{$self->{par}}) {
3413 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3414 my $layout = $self->get_layout ($para);
3415 my ($w, $h) = $layout->size;
3416
3417 $para->{w} = $w + $para->{indent};
3418 $para->{h} = $h;
3419 $para->{wrapped} = $layout->has_wrapped;
3420 }
3421
3422 $para->{y} = $height;
3423 $height += $para->{h};
3424 }
3425
2534 $self->{height} += $h; 3426 $self->{height} = $height;
2535 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3427 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2536 }
2537 3428
2538 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3429 delete $self->{texture};
3430 }
3431
3432 if (my $paridx = delete $self->{scroll_to}) {
3433 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3434 }
2539} 3435}
2540 3436
2541sub update { 3437sub update {
2542 my ($self) = @_; 3438 my ($self) = @_;
2543 3439
… …
2545 3441
2546 return unless $self->{h} > 0; 3442 return unless $self->{h} > 0;
2547 3443
2548 delete $self->{texture}; 3444 delete $self->{texture};
2549 3445
2550 $ROOT->on_post_alloc ($self, sub { 3446 $ROOT->on_post_alloc ($self => sub {
3447 $self->force_uptodate;
3448
2551 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3449 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2552 3450
2553 if (delete $self->{need_reflow}) {
2554 my $height = 0;
2555
2556 my $layout = $self->{layout};
2557
2558 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2559
2560 for (@{$self->{par}}) {
2561 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2562 $layout->set_width ($W - $_->[3]);
2563 $layout->set_markup ($_->[4]);
2564 my ($w, $h) = $layout->size;
2565 $_->[0] = $w + $_->[3];
2566 $_->[1] = $h;
2567 }
2568
2569 $height += $_->[1];
2570 }
2571
2572 $self->{height} = $height;
2573
2574 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2575
2576 delete $self->{texture};
2577 }
2578
2579 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3451 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2580 glClearColor 0.5, 0.5, 0.5, 0; 3452 glClearColor 0, 0, 0, 0;
2581 glClear GL_COLOR_BUFFER_BIT; 3453 glClear GL_COLOR_BUFFER_BIT;
2582 3454
3455 package DC::UI::Base;
3456 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3457 (0, 0, $self->{w}, $self->{h});
3458
3459 my $top = int $self->{children}[1]{range}[0];
3460
3461 my $paridx = 0;
3462 my $top_paragraph;
2583 my $top = int $self->{children}[1]{range}[0]; 3463 my $top = int $self->{children}[1]{range}[0];
2584 3464
2585 my $y0 = $top; 3465 my $y0 = $top;
2586 my $y1 = $top + $H; 3466 my $y1 = $top + $H;
2587 3467
2588 my $y = 0;
2589
2590 my $layout = $self->{layout};
2591
2592 $layout->set_font ($self->{font}) if $self->{font};
2593
2594 glEnable GL_BLEND;
2595 #TODO# not correct in windows where rgba is forced off
2596 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2597
2598 for my $par (@{$self->{par}}) { 3468 for my $para (@{$self->{par}}) {
2599 my $h = $par->[1]; 3469 my $h = $para->{h};
3470 my $y = $para->{y};
2600 3471
2601 if ($y0 < $y + $h && $y < $y1) { 3472 if ($y0 < $y + $h && $y < $y1) {
2602 $layout->set_foreground (@{ $par->[2] }); 3473 my $layout = $self->get_layout ($para);
2603 $layout->set_width ($W - $par->[3]);
2604 $layout->set_markup ($par->[4]);
2605 3474
2606 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3475 $layout->render ($para->{indent}, $y - $y0);
3476 $layout->draw;
2607 3477
2608 glRasterPos $par->[3], $y - $y0; 3478 if (my @w = @{ $para->{widget} }) {
2609 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3479 my @s = $layout->get_shapes;
3480
3481 for (@w) {
3482 my ($dx, $dy) = splice @s, 0, 2, ();
3483
3484 $_->{x} = $dx + $para->{indent};
3485 $_->{y} = $dy + $y - $y0;
3486
3487 $_->draw;
3488 }
3489 }
2610 } 3490 }
2611 3491
2612 $y += $h; 3492 $paridx++;
3493 $top_paragraph ||= $paridx if $y >= $top;
2613 } 3494 }
2614 3495
2615 glDisable GL_BLEND; 3496 $self->{top_paragraph} = $top_paragraph;
2616 }; 3497 };
2617 }); 3498 });
2618} 3499}
2619 3500
3501sub reconfigure {
3502 my ($self) = @_;
3503
3504 $self->SUPER::reconfigure;
3505
3506 $_->{w} = 1e10 for @{ $self->{par} };
3507 $self->reflow;
3508}
3509
2620sub _draw { 3510sub _draw {
2621 my ($self) = @_; 3511 my ($self) = @_;
2622 3512
2623 glEnable GL_TEXTURE_2D; 3513 glEnable GL_TEXTURE_2D;
2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3514 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625 glColor 1, 1, 1, 1; 3515 glColor 0, 0, 0, 1;
2626 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3516 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2627 glDisable GL_TEXTURE_2D; 3517 glDisable GL_TEXTURE_2D;
2628 3518
2629 $self->{children}[1]->draw; 3519 $self->{children}[1]->draw;
2630
2631} 3520}
2632 3521
2633############################################################################# 3522#############################################################################
2634 3523
2635package CFClient::UI::Animator; 3524package DC::UI::Animator;
2636 3525
2637use CFClient::OpenGL; 3526use DC::OpenGL;
2638 3527
2639our @ISA = CFClient::UI::Bin::; 3528our @ISA = DC::UI::Bin::;
2640 3529
2641sub moveto { 3530sub moveto {
2642 my ($self, $x, $y) = @_; 3531 my ($self, $x, $y) = @_;
2643 3532
2644 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3533 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2672 glPopMatrix; 3561 glPopMatrix;
2673} 3562}
2674 3563
2675############################################################################# 3564#############################################################################
2676 3565
2677package CFClient::UI::Flopper; 3566package DC::UI::Flopper;
2678 3567
2679our @ISA = CFClient::UI::Button::; 3568our @ISA = DC::UI::Button::;
2680 3569
2681sub new { 3570sub new {
2682 my $class = shift; 3571 my $class = shift;
2683 3572
2684 my $self = $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
… …
2696 $self->{other}->toggle_visibility; 3585 $self->{other}->toggle_visibility;
2697} 3586}
2698 3587
2699############################################################################# 3588#############################################################################
2700 3589
2701package CFClient::UI::Tooltip; 3590package DC::UI::Tooltip;
2702 3591
2703our @ISA = CFClient::UI::Bin::; 3592our @ISA = DC::UI::Bin::;
2704 3593
2705use CFClient::OpenGL; 3594use DC::OpenGL;
2706 3595
2707sub new { 3596sub new {
2708 my $class = shift; 3597 my $class = shift;
2709 3598
2710 $class->SUPER::new ( 3599 $class->SUPER::new (
… …
2714} 3603}
2715 3604
2716sub set_tooltip_from { 3605sub set_tooltip_from {
2717 my ($self, $widget) = @_; 3606 my ($self, $widget) = @_;
2718 3607
2719 my $tooltip = $widget->{tooltip}; 3608 my $tip = $widget->{tooltip};
3609 $tip = $tip->($widget) if "CODE" eq ref $tip;
3610
3611 $tip = DC::Pod::section_label tooltip => $1
3612 if $tip =~ /^#(.*)$/;
2720 3613
2721 if ($ENV{CFPLUS_DEBUG} & 2) { 3614 if ($ENV{CFPLUS_DEBUG} & 2) {
2722 $tooltip .= "\n\n" . (ref $widget) . "\n" 3615 $tip .= "\n\n" . (ref $widget) . "\n"
2723 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3616 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2724 . "req $widget->{req_w} $widget->{req_h}\n" 3617 . "req $widget->{req_w} $widget->{req_h}\n"
2725 . "visible $widget->{visible}"; 3618 . "visible $widget->{visible}";
2726 } 3619 }
2727 3620
3621 $tip =~ s/^\n+//;
3622 $tip =~ s/\n+$//;
3623
2728 $self->add (new CFClient::UI::Label 3624 $self->add (new DC::UI::Label
2729 markup => $tooltip, 3625 markup => $tip,
2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3627 align => 0,
2731 fontsize => 0.8, 3628 fontsize => 0.8,
2732 fg => [0, 0, 0, 1], 3629 style => 1, # FLAG_INVERSE
2733 ellipsise => 0, 3630 ellipsise => 0,
2734 font => ($widget->{tooltip_font} || $::FONT_PROP), 3631 font => ($widget->{tooltip_font} || $::FONT_PROP),
2735 ); 3632 );
2736} 3633}
2737 3634
… …
2741 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3638 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2742 3639
2743 ($w + 4, $h + 4) 3640 ($w + 4, $h + 4)
2744} 3641}
2745 3642
2746sub size_allocate { 3643sub invoke_size_allocate {
2747 my ($self, $w, $h) = @_; 3644 my ($self, $w, $h) = @_;
2748 3645
2749 $self->SUPER::size_allocate ($w - 4, $h - 4); 3646 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2750} 3647}
2751 3648
2752sub visibility_change { 3649sub invoke_visibility_change {
2753 my ($self, $visible) = @_; 3650 my ($self, $visible) = @_;
2754 3651
2755 return unless $visible; 3652 return unless $visible;
2756 3653
2757 $self->{root}->on_post_alloc ("move_$self" => sub { 3654 $self->{root}->on_post_alloc ("move_$self" => sub {
2758 my $widget = $self->{owner} 3655 my $widget = $self->{owner}
2759 or return; 3656 or return;
2760 3657
3658 if ($widget->{visible}) {
2761 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2762 3660
2763 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3661 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2764 if $x + $self->{w} > $::WIDTH; 3662 if $x + $self->{w} > $self->{root}{w};
2765 3663
2766 $self->move_abs ($x, $y); 3664 $self->move_abs ($x, $y);
3665 } else {
3666 $self->hide;
3667 }
2767 }); 3668 });
2768} 3669}
2769 3670
2770sub _draw { 3671sub _draw {
2771 my ($self) = @_; 3672 my ($self) = @_;
2772 3673
2773 glTranslate 0.375, 0.375;
2774
2775 my ($w, $h) = @$self{qw(w h)}; 3674 my ($w, $h) = @$self{qw(w h)};
2776 3675
2777 glColor 1, 0.8, 0.4; 3676 glColor 1, 0.8, 0.4;
2778 glBegin GL_QUADS; 3677 glRect 0, 0, $w, $h;
2779 glVertex 0 , 0;
2780 glVertex 0 , $h;
2781 glVertex $w, $h;
2782 glVertex $w, 0;
2783 glEnd;
2784 3678
2785 glColor 0, 0, 0; 3679 glColor 0, 0, 0;
2786 glBegin GL_LINE_LOOP; 3680 glRect_lineloop .5, .5, $w + .5, $h + .5;
2787 glVertex 0 , 0;
2788 glVertex 0 , $h;
2789 glVertex $w, $h;
2790 glVertex $w, 0;
2791 glEnd;
2792 3681
2793 glTranslate 2 - 0.375, 2 - 0.375; 3682 glTranslate 2, 2;
2794 3683
2795 $self->SUPER::_draw; 3684 $self->SUPER::_draw;
2796} 3685}
2797 3686
2798############################################################################# 3687#############################################################################
2799 3688
2800package CFClient::UI::Face; 3689package DC::UI::Face;
2801 3690
2802our @ISA = CFClient::UI::Base::; 3691our @ISA = DC::UI::DrawBG::;
2803 3692
2804use CFClient::OpenGL; 3693use DC::OpenGL;
2805 3694
2806sub new { 3695sub new {
2807 my $class = shift; 3696 my $class = shift;
2808 3697
2809 my $self = $class->SUPER::new ( 3698 my $self = $class->SUPER::new (
3699 size_w => 32,
3700 size_h => 8,
2810 aspect => 1, 3701 aspect => 1,
2811 can_events => 0, 3702 can_events => 0,
2812 @_, 3703 @_,
2813 ); 3704 );
2814 3705
2815 if ($self->{anim} && $self->{animspeed}) { 3706 if ($self->{anim} && $self->{animspeed}) {
2816 Scalar::Util::weaken (my $widget = $self); 3707 DC::weaken (my $widget = $self);
2817 3708
2818 $self->{timer} = Event->timer ( 3709 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
2819 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3710 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
2820 hard => 1, 3711 return unless $::CONN;
2821 interval => $self->{animspeed}, 3712
2822 cb => sub { 3713 my $w = $widget
3714 or return;
3715
2823 ++$widget->{frame}; 3716 ++$w->{frame};
3717 $w->update_face;
3718
3719 # somehow, $widget can go away
2824 $widget->update; 3720 $w->update;
2825 }, 3721 $w->update_timer;
2826 ); 3722 };
3723
3724 $self->update_face;
3725 $self->update_timer;
2827 } 3726 }
2828 3727
2829 $self 3728 $self
2830} 3729}
2831 3730
3731sub update_timer {
3732 my ($self) = @_;
3733
3734 return unless $self->{timer};
3735
3736 if ($self->{visible}) {
3737 $self->{timer}->start;
3738 } else {
3739 $self->{timer}->stop;
3740 }
3741}
3742
3743sub update_face {
3744 my ($self) = @_;
3745
3746 if ($::CONN) {
3747 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3748 if ($anim && @$anim) {
3749 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3750 delete $self->{face_change_cb};
3751
3752 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3753 unless ($tex->{name} || $tex->{loading}) {
3754 $tex->upload (sub { $self->reconfigure });
3755 }
3756 }
3757 }
3758 }
3759 }
3760}
3761
2832sub size_request { 3762sub size_request {
2833 (32, 8) 3763 my ($self) = @_;
3764
3765 if ($::CONN) {
3766 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3767 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3768 if ($tex->{name}) {
3769 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3770 } elsif (!$tex->{loading}) {
3771 $tex->upload (sub { $self->reconfigure });
3772 }
3773 }
3774
3775 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3776 }
3777 }
3778
3779 ($self->{size_w} || 8, $self->{size_h} || 8)
2834} 3780}
2835 3781
2836sub update { 3782sub update {
2837 my ($self) = @_; 3783 my ($self) = @_;
2838 3784
2839 return unless $self->{visible}; 3785 return unless $self->{visible};
2840 3786
2841 $self->SUPER::update; 3787 $self->SUPER::update;
2842} 3788}
2843 3789
3790sub invoke_visibility_change {
3791 my ($self) = @_;
3792
3793 $self->update_timer;
3794
3795 0
3796}
3797
2844sub _draw { 3798sub _draw {
2845 my ($self) = @_; 3799 my ($self) = @_;
2846 3800
2847 return unless $::CONN; 3801 $self->SUPER::_draw;
2848 3802
2849 my $face; 3803 if (my $tex = $self->{tex}) {
2850
2851 if ($self->{frame}) {
2852 my $anim = $::CONN->{anim}[$self->{anim}];
2853
2854 $face = $anim->[ $self->{frame} % @$anim ]
2855 if $anim && @$anim;
2856 }
2857
2858 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2859
2860 if ($tex) {
2861 glEnable GL_TEXTURE_2D; 3804 glEnable GL_TEXTURE_2D;
2862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3805 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2863 glColor 1, 1, 1, 1; 3806 glColor 0, 0, 0, 1;
2864 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3807 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2865 glDisable GL_TEXTURE_2D; 3808 glDisable GL_TEXTURE_2D;
2866 } 3809 }
2867} 3810}
2868 3811
2869sub DESTROY { 3812sub destroy {
2870 my ($self) = @_; 3813 my ($self) = @_;
2871 3814
2872 $self->{timer}->cancel 3815 (delete $self->{timer})->cancel
2873 if $self->{timer}; 3816 if $self->{timer};
2874 3817
2875 $self->SUPER::DESTROY; 3818 $self->SUPER::destroy;
2876} 3819}
2877 3820
2878############################################################################# 3821#############################################################################
2879 3822
2880package CFClient::UI::Buttonbar; 3823package DC::UI::Buttonbar;
2881 3824
2882our @ISA = CFClient::UI::HBox::; 3825our @ISA = DC::UI::HBox::;
2883 3826
2884# TODO: should actualyl wrap buttons and other goodies. 3827# TODO: should actually wrap buttons and other goodies.
2885 3828
2886############################################################################# 3829#############################################################################
2887 3830
2888package CFClient::UI::Menu; 3831package DC::UI::Menu;
2889 3832
2890our @ISA = CFClient::UI::FancyFrame::; 3833our @ISA = DC::UI::Toplevel::;
2891 3834
2892use CFClient::OpenGL; 3835use DC::OpenGL;
2893 3836
2894sub new { 3837sub new {
2895 my $class = shift; 3838 my $class = shift;
2896 3839
2897 my $self = $class->SUPER::new ( 3840 my $self = $class->SUPER::new (
2898 items => [], 3841 items => [],
2899 z => 100, 3842 z => 100,
2900 @_, 3843 @_,
2901 ); 3844 );
2902 3845
2903 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3846 $self->add ($self->{vbox} = new DC::UI::VBox);
2904 3847
2905 for my $item (@{ $self->{items} }) { 3848 for my $item (@{ $self->{items} }) {
2906 my ($widget, $cb) = @$item; 3849 my ($widget, $cb, $tooltip) = @$item;
2907 3850
2908 # handle various types of items, only text for now 3851 # handle various types of items, only text for now
2909 if (!ref $widget) { 3852 if (!ref $widget) {
3853 if ($widget =~ /\t/) {
3854 my ($left, $right) = split /\t/, $widget, 2;
3855
2910 $widget = new CFClient::UI::Label 3856 $widget = new DC::UI::HBox
2911 can_hover => 1, 3857 can_hover => 1,
2912 can_events => 1, 3858 can_events => 1,
3859 tooltip => $tooltip,
3860 children => [
3861 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3862 (new DC::UI::Label markup => $right, align => 1),
3863 ],
3864 ;
3865
3866 } else {
3867 $widget = new DC::UI::Label
3868 can_hover => 1,
3869 can_events => 1,
3870 align => 0,
2913 text => $widget; 3871 markup => $widget,
3872 tooltip => $tooltip;
3873 }
2914 } 3874 }
2915 3875
2916 $self->{item}{$widget} = $item; 3876 $self->{item}{$widget} = $item;
2917 3877
2918 $self->{vbox}->add ($widget); 3878 $self->{vbox}->add ($widget);
… …
2923 3883
2924# popup given the event (must be a mouse button down event currently) 3884# popup given the event (must be a mouse button down event currently)
2925sub popup { 3885sub popup {
2926 my ($self, $ev) = @_; 3886 my ($self, $ev) = @_;
2927 3887
2928 $self->_emit ("popdown"); 3888 $self->emit ("popdown");
2929 3889
2930 # maybe save $GRAB? must be careful about events... 3890 # maybe save $GRAB? must be careful about events...
2931 $GRAB = $self; 3891 $GRAB = $self;
2932 $self->{button} = $ev->{button}; 3892 $self->{button} = $ev->{button};
2933 3893
2934 $self->show; 3894 $self->show;
2935 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3895 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2936} 3896}
2937 3897
2938sub mouse_motion { 3898sub invoke_mouse_motion {
2939 my ($self, $ev, $x, $y) = @_; 3899 my ($self, $ev, $x, $y) = @_;
2940 3900
2941 # TODO: should use vbox->find_widget or so 3901 # TODO: should use vbox->find_widget or so
2942 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3902 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2943 $self->{hover} = $self->{item}{$HOVER}; 3903 $self->{hover} = $self->{item}{$HOVER};
2944 3904
2945 0 3905 0
2946} 3906}
2947 3907
2948sub button_up { 3908sub invoke_button_up {
2949 my ($self, $ev, $x, $y) = @_; 3909 my ($self, $ev, $x, $y) = @_;
2950 3910
2951 if ($ev->{button} == $self->{button}) { 3911 if ($ev->{button} == $self->{button}) {
2952 undef $GRAB; 3912 undef $GRAB;
2953 $self->hide; 3913 $self->hide;
2954 3914
2955 $self->_emit ("popdown"); 3915 $self->emit ("popdown");
2956 $self->{hover}[1]->() if $self->{hover}; 3916 $self->{hover}[1]->() if $self->{hover};
2957 } else { 3917 } else {
2958 return 0 3918 return 0
2959 } 3919 }
2960 3920
2961 1 3921 1
2962} 3922}
2963 3923
2964############################################################################# 3924#############################################################################
2965 3925
2966package CFClient::UI::Multiplexer; 3926package DC::UI::Multiplexer;
2967 3927
2968our @ISA = CFClient::UI::Container::; 3928our @ISA = DC::UI::Container::;
2969 3929
2970sub new { 3930sub new {
2971 my $class = shift; 3931 my $class = shift;
2972 3932
2973 my $self = $class->SUPER::new ( 3933 my $self = $class->SUPER::new (
… …
2987 3947
2988 $self->{current} = $self->{children}[0] 3948 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} }; 3949 if @{ $self->{children} };
2990} 3950}
2991 3951
3952sub get_current_page {
3953 my ($self) = @_;
3954
3955 $self->{current}
3956}
3957
2992sub set_current_page { 3958sub set_current_page {
2993 my ($self, $page_or_widget) = @_; 3959 my ($self, $page_or_widget) = @_;
2994 3960
2995 my $widget = ref $page_or_widget 3961 my $widget = ref $page_or_widget
2996 ? $page_or_widget 3962 ? $page_or_widget
2997 : $self->{children}[$page_or_widget]; 3963 : $self->{children}[$page_or_widget];
2998 3964
2999 $self->{current} = $widget; 3965 $self->{current} = $widget;
3000 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3966 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3001 3967
3002 $self->_emit (page_changed => $self->{current}); 3968 $self->emit (page_changed => $self->{current});
3003 3969
3004 $self->realloc; 3970 $self->realloc;
3005} 3971}
3006 3972
3007sub visible_children { 3973sub visible_children {
… …
3012 my ($self) = @_; 3978 my ($self) = @_;
3013 3979
3014 $self->{current}->size_request 3980 $self->{current}->size_request
3015} 3981}
3016 3982
3017sub size_allocate { 3983sub invoke_size_allocate {
3018 my ($self, $w, $h) = @_; 3984 my ($self, $w, $h) = @_;
3019 3985
3020 $self->{current}->configure (0, 0, $w, $h); 3986 $self->{current}->configure (0, 0, $w, $h);
3987
3988 1
3021} 3989}
3022 3990
3023sub _draw { 3991sub _draw {
3024 my ($self) = @_; 3992 my ($self) = @_;
3025 3993
3026 $self->{current}->draw; 3994 $self->{current}->draw;
3027} 3995}
3028 3996
3029############################################################################# 3997#############################################################################
3030 3998
3031package CFClient::UI::Notebook; 3999package DC::UI::Notebook;
3032 4000
4001use DC::OpenGL;
4002
3033our @ISA = CFClient::UI::VBox::; 4003our @ISA = DC::UI::VBox::;
3034 4004
3035sub new { 4005sub new {
3036 my $class = shift; 4006 my $class = shift;
3037 4007
3038 my $self = $class->SUPER::new ( 4008 my $self = $class->SUPER::new (
3039 buttonbar => (new CFClient::UI::Buttonbar), 4009 buttonbar => (new DC::UI::Buttonbar),
3040 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 4010 multiplexer => (new DC::UI::Multiplexer expand => 1),
4011 active_outline => [.7, .7, 0.2],
3041 # filter => # will be put between multiplexer and $self 4012 # filter => # will be put between multiplexer and $self
3042 @_, 4013 @_,
3043 ); 4014 );
3044 4015
3045 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4016 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3046 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4017 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3047 4018
4019 {
4020 Scalar::Util::weaken (my $wself = $self);
4021
4022 $self->{multiplexer}->connect (c_add => sub {
4023 my ($mplex, $widgets) = @_;
4024
4025 for my $child (@$widgets) {
4026 Scalar::Util::weaken $child;
4027 $child->{c_tab_} ||= do {
4028 my $tab =
4029 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4030 ? $child->{c_tab}
4031 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4032
4033 $tab->connect (activate => sub {
4034 $wself->set_current_page ($child);
4035 });
4036
4037 $tab
4038 };
4039
4040 $self->{buttonbar}->add ($child->{c_tab_});
4041 }
4042 });
4043
4044 $self->{multiplexer}->connect (c_remove => sub {
4045 my ($mplex, $widgets) = @_;
4046
4047 for my $child (@$widgets) {
4048 $wself->{buttonbar}->remove ($child->{c_tab_});
4049 }
4050 });
4051 }
4052
3048 $self 4053 $self
3049} 4054}
3050 4055
3051sub add { 4056sub add {
4057 my ($self, @widgets) = @_;
4058
4059 $self->{multiplexer}->add (@widgets)
4060}
4061
4062sub remove {
4063 my ($self, @widgets) = @_;
4064
4065 $self->{multiplexer}->remove (@widgets)
4066}
4067
4068sub pages {
4069 my ($self) = @_;
4070 $self->{multiplexer}->children
4071}
4072
4073sub page_index {
4074 my ($self, $widget) = @_;
4075
4076 my $i = 0;
4077 for ($self->pages) {
4078 if ($_ eq $widget) { return $i };
4079 $i++;
4080 }
4081
4082 undef
4083}
4084
4085sub add_tab {
3052 my ($self, $title, $widget, $tooltip) = @_; 4086 my ($self, $title, $widget, $tooltip) = @_;
3053 4087
3054 Scalar::Util::weaken $self; 4088 $title = [$title, $tooltip] unless ref $title;
4089 $widget->{c_tab} = $title;
3055 4090
3056 $self->{buttonbar}->add (new CFClient::UI::Button
3057 markup => $title,
3058 tooltip => $tooltip,
3059 on_activate => sub { $self->set_current_page ($widget) },
3060 );
3061
3062 $self->{multiplexer}->add ($widget); 4091 $self->add ($widget);
4092}
4093
4094sub get_current_page {
4095 my ($self) = @_;
4096
4097 $self->{multiplexer}->get_current_page
3063} 4098}
3064 4099
3065sub set_current_page { 4100sub set_current_page {
3066 my ($self, $page) = @_; 4101 my ($self, $page) = @_;
3067 4102
3068 $self->{multiplexer}->set_current_page ($page); 4103 $self->{multiplexer}->set_current_page ($page);
3069 $self->_emit (page_changed => $self->{multiplexer}{current}); 4104 $self->emit (page_changed => $self->{multiplexer}{current});
4105}
4106
4107sub _draw {
4108 my ($self) = @_;
4109
4110 $self->SUPER::_draw ();
4111
4112 if (my $cur = $self->{multiplexer}{current}) {
4113 if ($cur = $cur->{c_tab_}) {
4114 glTranslate $self->{buttonbar}{x} + $cur->{x},
4115 $self->{buttonbar}{y} + $cur->{y};
4116 glLineWidth 3;
4117 #glEnable GL_BLEND;
4118 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4119 glColor @{$self->{active_outline}};
4120 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4121 glLineWidth 1;
4122 #glDisable GL_BLEND;
4123 }
4124 }
3070} 4125}
3071 4126
3072############################################################################# 4127#############################################################################
3073 4128
3074package CFClient::UI::Statusbox; 4129package DC::UI::Selector;
3075 4130
4131use utf8;
4132
3076our @ISA = CFClient::UI::VBox::; 4133our @ISA = DC::UI::Button::;
3077 4134
3078sub new { 4135sub new {
3079 my $class = shift; 4136 my $class = shift;
3080 4137
3081 $class->SUPER::new ( 4138 my $self = $class->SUPER::new (
4139 options => [], # [value, title, longdesc], ...
4140 value => undef,
4141 @_,
4142 );
4143
4144 $self->_set_value ($self->{value});
4145
4146 $self
4147}
4148
4149sub invoke_button_down {
4150 my ($self, $ev) = @_;
4151
4152 my @menu_items;
4153
4154 for (@{ $self->{options} }) {
4155 my ($value, $title, $tooltip) = @$_;
4156
4157 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
4158 }
4159
4160 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
4161}
4162
4163sub _set_value {
4164 my ($self, $value) = @_;
4165
4166 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4167 $item ||= $self->{options}[0]
4168 or return;
4169
4170 $self->{value} = $item->[0];
4171 $self->set_markup ("$item->[1] ⇓");
4172# $self->set_tooltip ($item->[2]);
4173}
4174
4175sub set_value {
4176 my ($self, $value) = @_;
4177
4178 return unless $self->{value} ne $value;
4179
4180 $self->_set_value ($value);
4181 $self->emit (changed => $value);
4182}
4183
4184sub set_options {
4185 my ($self, $options) = @_;
4186
4187 $self->{options} = $options;
4188 $self->_set_value ($self->{value});
4189}
4190
4191#############################################################################
4192
4193package DC::UI::Statusbox;
4194
4195our @ISA = DC::UI::VBox::;
4196
4197sub new {
4198 my $class = shift;
4199
4200 my $self = $class->SUPER::new (
3082 fontsize => 0.8, 4201 fontsize => 0.8,
3083 @_, 4202 @_,
3084 ) 4203 );
4204
4205 DC::weaken (my $this = $self);
4206
4207 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
4208
4209 $self
3085} 4210}
3086 4211
3087sub reorder { 4212sub reorder {
3088 my ($self) = @_; 4213 my ($self) = @_;
3089 my $NOW = time; 4214 my $NOW = Time::HiRes::time;
4215
4216 # freeze display when hovering over any label
4217 return if $DC::UI::TOOLTIP->{owner}
4218 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
4219 values %{ $self->{item} };
3090 4220
3091 while (my ($k, $v) = each %{ $self->{item} }) { 4221 while (my ($k, $v) = each %{ $self->{item} }) {
3092 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4222 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3093 } 4223 }
4224
4225 $self->{timer}->set (1, 1);
3094 4226
3095 my @widgets; 4227 my @widgets;
3096 4228
3097 my @items = sort { 4229 my @items = sort {
3098 $a->{pri} <=> $b->{pri} 4230 $a->{pri} <=> $b->{pri}
… …
3101 4233
3102 my $count = 10 + 1; 4234 my $count = 10 + 1;
3103 for my $item (@items) { 4235 for my $item (@items) {
3104 last unless --$count; 4236 last unless --$count;
3105 4237
3106 push @widgets, $item->{label} ||= do { 4238 my $label = $item->{label} ||= do {
3107 # TODO: doesn't handle markup well (read as: at all) 4239 # TODO: doesn't handle markup well (read as: at all)
3108 my $short = $item->{count} > 1 4240 my $short = $item->{count} > 1
3109 ? "<b>$item->{count} ×</b> $item->{text}" 4241 ? "<b>$item->{count} ×</b> $item->{text}"
3110 : $item->{text}; 4242 : $item->{text};
3111 4243
3112 for ($short) { 4244 for ($short) {
3113 s/^\s+//; 4245 s/^\s+//;
3114 s/\s+/ /g; 4246 s/\s+/ /g;
3115 } 4247 }
3116 4248
3117 new CFClient::UI::Label 4249 new DC::UI::Label
3118 markup => $short, 4250 markup => $short,
3119 tooltip => $item->{tooltip}, 4251 tooltip => $item->{tooltip},
3120 tooltip_font => $::FONT_PROP, 4252 tooltip_font => $::FONT_PROP,
3121 tooltip_width => 0.67, 4253 tooltip_width => 0.67,
3122 fontsize => $item->{fontsize} || $self->{fontsize}, 4254 fontsize => $item->{fontsize} || $self->{fontsize},
3123 max_w => $::WIDTH * 0.44, 4255 max_w => $::WIDTH * 0.44,
4256 align => 0,
3124 fg => $item->{fg}, 4257 fg => [@{ $item->{fg} }],
3125 can_events => 1, 4258 can_events => 1,
3126 can_hover => 1 4259 can_hover => 1
3127 }; 4260 };
4261
4262 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4263 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4264 $label->update;
4265 $label->set_max_size (undef, $label->{req_h} * $diff)
4266 if $diff < 1;
4267 $self->{timer}->set (1/30, 1/30);
4268 } else {
4269 $label->{fg}[3] = $item->{fg}[3] || 1;
4270 }
4271
4272 push @widgets, $label;
3128 } 4273 }
3129 4274
3130 $self->clear; 4275 $self->clear;
3131 $self->SUPER::add (reverse @widgets); 4276 $self->SUPER::add (reverse @widgets);
3132} 4277}
… …
3137 $text =~ s/^\s+//; 4282 $text =~ s/^\s+//;
3138 $text =~ s/\s+$//; 4283 $text =~ s/\s+$//;
3139 4284
3140 return unless $text; 4285 return unless $text;
3141 4286
3142 my $timeout = time + ((delete $arg{timeout}) || 60); 4287 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3143 4288
3144 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4289 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3145 4290
3146 if (my $item = $self->{item}{$group}) { 4291 if (my $item = $self->{item}{$group}) {
3147 if ($item->{text} eq $text) { 4292 if ($item->{text} eq $text) {
3148 $item->{count}++; 4293 $item->{count}++;
3149 } else { 4294 } else {
3150 $item->{count} = 1; 4295 $item->{count} = 1;
3151 $item->{text} = $item->{tooltip} = $text; 4296 $item->{text} = $item->{tooltip} = $text;
3152 } 4297 }
3153 $item->{id} = ++$self->{id}; 4298 $item->{id} += 0.2;#d#
3154 $item->{timeout} = $timeout; 4299 $item->{timeout} = $timeout;
3155 delete $item->{label}; 4300 delete $item->{label};
3156 } else { 4301 } else {
3157 $self->{item}{$group} = { 4302 $self->{item}{$group} = {
3158 id => ++$self->{id}, 4303 id => ++$self->{id},
… …
3164 count => 1, 4309 count => 1,
3165 %arg, 4310 %arg,
3166 }; 4311 };
3167 } 4312 }
3168 4313
4314 $ROOT->on_refresh (reorder => sub {
3169 $self->reorder; 4315 $self->reorder;
4316 });
3170} 4317}
3171 4318
3172sub reconfigure { 4319sub reconfigure {
3173 my ($self) = @_; 4320 my ($self) = @_;
3174 4321
… …
3177 4324
3178 $self->reorder; 4325 $self->reorder;
3179 $self->SUPER::reconfigure; 4326 $self->SUPER::reconfigure;
3180} 4327}
3181 4328
4329sub destroy {
4330 my ($self) = @_;
4331
4332 $self->{timer}->cancel;
4333
4334 $self->SUPER::destroy;
4335}
4336
3182############################################################################# 4337#############################################################################
3183 4338
3184package CFClient::UI::Inventory;
3185
3186our @ISA = CFClient::UI::ScrolledWindow::;
3187
3188sub new {
3189 my $class = shift;
3190
3191 my $self = $class->SUPER::new (
3192 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3193 @_,
3194 );
3195
3196 $self
3197}
3198
3199sub set_items {
3200 my ($self, $items) = @_;
3201
3202 $self->{child}->clear;
3203 return unless $items;
3204
3205 my @items = sort {
3206 ($a->{type} <=> $b->{type})
3207 or ($a->{name} cmp $b->{name})
3208 } @$items;
3209
3210 $self->{real_items} = \@items;
3211
3212 my $row = 0;
3213 for my $item (@items) {
3214 CFClient::Item::update_widgets $item;
3215
3216 $self->{child}->add (0, $row, $item->{face_widget});
3217 $self->{child}->add (1, $row, $item->{desc_widget});
3218 $self->{child}->add (2, $row, $item->{weight_widget});
3219
3220 $row++;
3221 }
3222}
3223
3224#############################################################################
3225
3226package CFClient::UI::BindEditor;
3227
3228our @ISA = CFClient::UI::FancyFrame::;
3229
3230sub new {
3231 my $class = shift;
3232
3233 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3234
3235 $self->add (my $vb = new CFClient::UI::VBox);
3236
3237
3238 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3239 text => "start recording",
3240 tooltip => "Start/Stops recording of actions."
3241 ."All subsequent actions after the recording started will be captured."
3242 ."The actions are displayed after the record was stopped."
3243 ."To bind the action you have to click on the 'Bind' button",
3244 on_activate => sub {
3245 unless ($self->{recording}) {
3246 $self->start;
3247 } else {
3248 $self->stop;
3249 }
3250 });
3251
3252 $vb->add (new CFClient::UI::Label text => "Actions:");
3253 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3254
3255 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3258 $hb->add (new CFClient::UI::Button
3259 text => "bind",
3260 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3261 on_activate => sub {
3262 $self->ask_for_bind;
3263 });
3264
3265 $vb->add (my $hb = new CFClient::UI::HBox);
3266 $hb->add (new CFClient::UI::Button
3267 text => "ok",
3268 expand => 1,
3269 tooltip => "This closes the binding editor and saves the binding",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->commit;
3273 });
3274
3275 $hb->add (new CFClient::UI::Button
3276 text => "cancel",
3277 expand => 1,
3278 tooltip => "This closes the binding editor without saving",
3279 on_activate => sub {
3280 $self->hide;
3281 $self->{binding_cancel}->()
3282 if $self->{binding_cancel};
3283 });
3284
3285 $self->update_binding_widgets;
3286
3287 $self
3288}
3289
3290sub commit {
3291 my ($self) = @_;
3292 my ($mod, $sym, $cmds) = $self->get_binding;
3293 if ($sym != 0 && @$cmds > 0) {
3294 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3295 ."'. Don't forget 'Save Config'!");
3296 $self->{binding_change}->($mod, $sym, $cmds)
3297 if $self->{binding_change};
3298 } else {
3299 $::STATUSBOX->add ("No action bound, no key or action specified!");
3300 $self->{binding_cancel}->()
3301 if $self->{binding_cancel};
3302 }
3303}
3304
3305sub start {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("stop recording");
3309 $self->{recording} = 1;
3310 $self->clear_command_list;
3311 $::CONN->start_record if $::CONN;
3312}
3313
3314sub stop {
3315 my ($self) = @_;
3316
3317 $self->{rec_btn}->set_text ("start recording");
3318 $self->{recording} = 0;
3319
3320 my $rec;
3321 $rec = $::CONN->stop_record if $::CONN;
3322 return unless ref $rec eq 'ARRAY';
3323 $self->set_command_list ($rec);
3324}
3325
3326
3327sub ask_for_bind_and_commit {
3328 my ($self) = @_;
3329 $self->ask_for_bind (1);
3330}
3331
3332sub ask_for_bind {
3333 my ($self, $commit) = @_;
3334
3335 CFClient::Binder::open_binding_dialog (sub {
3336 my ($mod, $sym) = @_;
3337 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3338 $self->update_binding_widgets;
3339 $self->commit if $commit;
3340 });
3341}
3342
3343# $mod and $sym are the modifiers and key symbol
3344# $cmds is a array ref of strings (the commands)
3345# $cb is the callback that is executed on OK
3346# $ccb is the callback that is executed on CANCEL and
3347# when the binding was unsuccessful on OK
3348sub set_binding {
3349 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3350
3351 $self->clear_command_list;
3352 $self->{recording} = 0;
3353 $self->{rec_btn}->set_text ("start recording");
3354
3355 $self->{binding} = [$mod, $sym];
3356 $self->{commands} = $cmds;
3357
3358 $self->{binding_change} = $cb;
3359 $self->{binding_cancel} = $ccb;
3360
3361 $self->update_binding_widgets;
3362}
3363
3364# this is a shortcut method that asks for a binding
3365# and then just binds it.
3366sub do_quick_binding {
3367 my ($self, $cmds) = @_;
3368 $self->set_binding (undef, undef, $cmds, sub {
3369 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3370 });
3371 $self->ask_for_bind (1);
3372}
3373
3374sub update_binding_widgets {
3375 my ($self) = @_;
3376 my ($mod, $sym, $cmds) = $self->get_binding;
3377 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3378 $self->set_command_list ($cmds);
3379}
3380
3381sub get_binding {
3382 my ($self) = @_;
3383 return (
3384 $self->{binding}->[0],
3385 $self->{binding}->[1],
3386 [ grep { defined $_ } @{$self->{commands}} ]
3387 );
3388}
3389
3390sub clear_command_list {
3391 my ($self) = @_;
3392 $self->{cmdbox}->clear ();
3393}
3394
3395sub set_command_list {
3396 my ($self, $cmds) = @_;
3397
3398 $self->{cmdbox}->clear ();
3399 $self->{commands} = $cmds;
3400
3401 my $idx = 0;
3402
3403 for (@$cmds) {
3404 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3405
3406 my $i = $idx;
3407 $hb->add (new CFClient::UI::Label text => $_);
3408 $hb->add (new CFClient::UI::Button
3409 text => "delete",
3410 tooltip => "Deletes the action from the record",
3411 on_activate => sub {
3412 $self->{cmdbox}->remove ($hb);
3413 $cmds->[$i] = undef;
3414 });
3415
3416
3417 $idx++
3418 }
3419}
3420
3421#############################################################################
3422
3423package CFClient::UI::SpellList;
3424
3425our @ISA = CFClient::UI::Table::;
3426
3427sub new {
3428 my $class = shift;
3429
3430 my $self = $class->SUPER::new (
3431 binding => [],
3432 commands => [],
3433 @_,
3434 )
3435}
3436
3437# XXX: Do sorting? Argl...
3438sub add_spell {
3439 my ($self, $spell) = @_;
3440 $self->{spells}->{$spell->{name}} = $spell;
3441
3442 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3443 face => $spell->{face},
3444 can_hover => 1,
3445 can_events => 1,
3446 tooltip => $spell->{message});
3447
3448 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => $spell->{name},
3450 can_hover => 1,
3451 can_events => 1,
3452 tooltip => $spell->{message},
3453 expand => 1);
3454
3455 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3456 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3457 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3458 expand => 1);
3459
3460 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3461 text => "bind to key",
3462 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3463}
3464
3465sub rebuild_spell_list {
3466 my ($self) = @_;
3467 $self->{tbl_idx} = 0;
3468 $self->add_spell ($_) for values %{$self->{spells}};
3469}
3470
3471sub remove_spell {
3472 my ($self, $spell) = @_;
3473 delete $self->{spells}->{$spell->{name}};
3474 $self->rebuild_spell_list;
3475}
3476
3477#############################################################################
3478
3479package CFClient::UI::Root; 4339package DC::UI::Root;
3480 4340
3481our @ISA = CFClient::UI::Container::; 4341our @ISA = DC::UI::Container::;
3482 4342
4343use List::Util qw(min max);
4344
3483use CFClient::OpenGL; 4345use DC::OpenGL;
3484 4346
3485sub new { 4347sub new {
3486 my $class = shift; 4348 my $class = shift;
3487 4349
3488 my $self = $class->SUPER::new ( 4350 my $self = $class->SUPER::new (
3489 visible => 1, 4351 visible => 1,
3490 @_, 4352 @_,
3491 ); 4353 );
3492 4354
3493 Scalar::Util::weaken ($self->{root} = $self); 4355 DC::weaken ($self->{root} = $self);
3494 4356
3495 $self 4357 $self
3496} 4358}
3497 4359
3498sub size_request { 4360sub size_request {
… …
3513 $coord = $max - $size if $coord > $max - $size; 4375 $coord = $max - $size if $coord > $max - $size;
3514 4376
3515 int $coord + 0.5 4377 int $coord + 0.5
3516} 4378}
3517 4379
3518sub size_allocate { 4380sub invoke_size_allocate {
3519 my ($self, $w, $h) = @_; 4381 my ($self, $w, $h) = @_;
3520 4382
3521 for my $child ($self->children) { 4383 for my $child ($self->children) {
3522 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4384 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3523 4385
… …
3527 $X = _to_pixel $X, $W, $self->{w}; 4389 $X = _to_pixel $X, $W, $self->{w};
3528 $Y = _to_pixel $Y, $H, $self->{h}; 4390 $Y = _to_pixel $Y, $H, $self->{h};
3529 4391
3530 $child->configure ($X, $Y, $W, $H); 4392 $child->configure ($X, $Y, $W, $H);
3531 } 4393 }
4394
4395 1
3532} 4396}
3533 4397
3534sub coord2local { 4398sub coord2local {
3535 my ($self, $x, $y) = @_; 4399 my ($self, $x, $y) = @_;
3536 4400
… …
3544} 4408}
3545 4409
3546sub update { 4410sub update {
3547 my ($self) = @_; 4411 my ($self) = @_;
3548 4412
3549 $::WANT_REFRESH++; 4413 $::WANT_REFRESH = 1;
3550} 4414}
3551 4415
3552sub add { 4416sub add {
3553 my ($self, @children) = @_; 4417 my ($self, @children) = @_;
3554 4418
… …
3591 while ($self->{refresh_hook}) { 4455 while ($self->{refresh_hook}) {
3592 $_->() 4456 $_->()
3593 for values %{delete $self->{refresh_hook}}; 4457 for values %{delete $self->{refresh_hook}};
3594 } 4458 }
3595 4459
3596 if ($self->{realloc}) { 4460 while ($self->{realloc}) {
3597 my %queue; 4461 my %queue;
3598 my @queue; 4462 my @queue;
3599 my $widget; 4463 my $widget;
3600 4464
3601 outer: 4465 outer:
… …
3621 4485
3622 delete $queue{$widget+0}; 4486 delete $queue{$widget+0};
3623 4487
3624 my ($w, $h) = $widget->size_request; 4488 my ($w, $h) = $widget->size_request;
3625 4489
3626 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4490 $w += $widget->{padding_x} * 2;
3627 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4491 $h += $widget->{padding_y} * 2;
4492
4493 $w = max $widget->{min_w}, $w;
4494 $h = max $widget->{min_h}, $h;
4495
4496 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4497 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3628 4498
3629 $w = $widget->{force_w} if exists $widget->{force_w}; 4499 $w = $widget->{force_w} if exists $widget->{force_w};
3630 $h = $widget->{force_h} if exists $widget->{force_h}; 4500 $h = $widget->{force_h} if exists $widget->{force_h};
3631 4501
3632 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4502 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3645 } 4515 }
3646 } 4516 }
3647 4517
3648 delete $self->{realloc}{$widget+0}; 4518 delete $self->{realloc}{$widget+0};
3649 } 4519 }
3650 }
3651 4520
3652 while (my $size_alloc = delete $self->{size_alloc}) { 4521 while (my $size_alloc = delete $self->{size_alloc}) {
3653 my @queue = sort { $b->{visible} <=> $a->{visible} } 4522 my @queue = sort { $a->{visible} <=> $b->{visible} }
3654 values %$size_alloc; 4523 values %$size_alloc;
3655 4524
3656 while () { 4525 while () {
3657 my $widget = pop @queue || last; 4526 my $widget = pop @queue || last;
3658 4527
3659 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4528 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3660 4529
3661 $w = 0 if $w < 0; 4530 $w = max $widget->{min_w}, $w;
3662 $h = 0 if $h < 0; 4531 $h = max $widget->{min_h}, $h;
3663 4532
4533# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4534# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4535
4536 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4537 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4538
3664 $w = int $w + 0.5; 4539 $w = int $w + 0.5;
3665 $h = int $h + 0.5; 4540 $h = int $h + 0.5;
3666 4541
3667 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4542 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3668 $widget->{old_w} = $widget->{w}; 4543 $widget->{old_w} = $widget->{w};
3669 $widget->{old_h} = $widget->{h}; 4544 $widget->{old_h} = $widget->{h};
3670 4545
3671 $widget->{w} = $w; 4546 $widget->{w} = $w;
3672 $widget->{h} = $h; 4547 $widget->{h} = $h;
3673 4548
3674 $widget->emit (size_allocate => $w, $h); 4549 $widget->emit (size_allocate => $w, $h);
4550 }
3675 } 4551 }
3676 } 4552 }
3677 } 4553 }
3678 4554
3679 while ($self->{post_alloc_hook}) { 4555 while ($self->{post_alloc_hook}) {
3680 $_->() 4556 $_->()
3681 for values %{delete $self->{post_alloc_hook}}; 4557 for values %{delete $self->{post_alloc_hook}};
3682 } 4558 }
3683
3684 4559
3685 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4560 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3686 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4561 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3687 glClear GL_COLOR_BUFFER_BIT; 4562 glClear GL_COLOR_BUFFER_BIT;
3688 4563
… …
3691 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4566 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3692 glMatrixMode GL_MODELVIEW; 4567 glMatrixMode GL_MODELVIEW;
3693 glLoadIdentity; 4568 glLoadIdentity;
3694 4569
3695 { 4570 {
3696 package CFClient::UI::Base; 4571 package DC::UI::Base;
3697 4572
3698 ($draw_x, $draw_y, $draw_w, $draw_h) = 4573 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3699 (0, 0, $self->{w}, $self->{h}); 4574 (0, 0, $self->{w}, $self->{h});
3700 }
3701 4575
3702 $self->_draw; 4576 $self->_draw;
4577 }
3703} 4578}
3704 4579
3705############################################################################# 4580#############################################################################
3706 4581
3707package CFClient::UI; 4582package DC::UI;
3708 4583
3709$ROOT = new CFClient::UI::Root; 4584$ROOT = new DC::UI::Root;
3710$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4585$TOOLTIP = new DC::UI::Tooltip z => 900;
3711 4586
37121 45871
3713 4588

Diff Legend

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