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.273 by root, Sat Jun 3 02:32:35 2006 UTC vs.
Revision 1.467 by root, Wed Sep 3 06:07:39 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 $self->_draw;
554 glPopMatrix;
555
556 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2;
560 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS;
563 glVertex $x , $y;
564 glVertex $x + $self->{w}, $y;
565 glVertex $x + $self->{w}, $y + $self->{h};
566 glVertex $x , $y + $self->{h};
567 glEnd;
568 glDisable GL_BLEND;
569 }
570
571 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix;
573 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
575 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1;
580 glEnd;
581 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 }
584}
585 618
586sub _draw { 619sub _draw {
587 my ($self) = @_; 620 my ($self) = @_;
588 621
589 warn "no draw defined for $self\n"; 622 warn "no draw defined for $self\n";
590} 623}
591 624
592sub DESTROY { 625sub DESTROY {
593 my ($self) = @_; 626 my ($self) = @_;
594 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
595 delete $WIDGET{$self+0}; 634 delete $WIDGET{$self+0};
596 #$self->deactivate;
597} 635}
598 636
599############################################################################# 637#############################################################################
600 638
601package CFClient::UI::DrawBG; 639package DC::UI::DrawBG;
602 640
603our @ISA = CFClient::UI::Base::; 641our @ISA = DC::UI::Base::;
604 642
605use strict; 643use strict;
606use CFClient::OpenGL; 644use DC::OpenGL;
607 645
608sub new { 646sub new {
609 my $class = shift; 647 my $class = shift;
610
611 # range [value, low, high, page]
612 648
613 $class->SUPER::new ( 649 $class->SUPER::new (
614 #bg => [0, 0, 0, 0.2], 650 #bg => [0, 0, 0, 0.2],
615 #active_bg => [1, 1, 1, 0.5], 651 #active_bg => [1, 1, 1, 0.5],
616 @_ 652 @_
… …
626 662
627 if ($color && (@$color < 4 || $color->[3])) { 663 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 664 my ($w, $h) = @$self{qw(w h)};
629 665
630 glEnable GL_BLEND; 666 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 667 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 668 glColor_premultiply @$color;
633
634 glBegin GL_QUADS;
635 glVertex 0 , 0;
636 glVertex 0 , $h;
637 glVertex $w, $h; 669 glRect 0, 0, $w, $h;
638 glVertex $w, 0;
639 glEnd;
640
641 glDisable GL_BLEND; 670 glDisable GL_BLEND;
642 } 671 }
643} 672}
644 673
645############################################################################# 674#############################################################################
646 675
647package CFClient::UI::Empty; 676package DC::UI::Empty;
648 677
649our @ISA = CFClient::UI::Base::; 678our @ISA = DC::UI::Base::;
650 679
651sub new { 680sub new {
652 my ($class, %arg) = @_; 681 my ($class, %arg) = @_;
653 $class->SUPER::new (can_events => 0, %arg); 682 $class->SUPER::new (can_events => 0, %arg);
654} 683}
… …
661 690
662sub draw { } 691sub draw { }
663 692
664############################################################################# 693#############################################################################
665 694
666package CFClient::UI::Container; 695package DC::UI::Container;
667 696
668our @ISA = CFClient::UI::Base::; 697our @ISA = DC::UI::Base::;
669 698
670sub new { 699sub new {
671 my ($class, %arg) = @_; 700 my ($class, %arg) = @_;
672 701
673 my $children = delete $arg{children}; 702 my $children = delete $arg{children};
… …
677 can_events => 0, 706 can_events => 0,
678 %arg, 707 %arg,
679 ); 708 );
680 709
681 $self->add (@$children) 710 $self->add (@$children)
682 if $children; 711 if $children && @$children;
683 712
684 $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;
685} 722}
686 723
687sub add { 724sub add {
688 my ($self, @widgets) = @_; 725 my ($self, @widgets) = @_;
689 726
690 $_->set_parent ($self) 727 $_->set_parent ($self)
691 for @widgets; 728 for @widgets;
692 729
730 # TODO: only do this in widgets that need it, e.g. root, fixed
693 use sort 'stable'; 731 use sort 'stable';
694 732
695 $self->{children} = [ 733 $self->{children} = [
696 sort { $a->{z} <=> $b->{z} } 734 sort { $a->{z} <=> $b->{z} }
697 @{$self->{children}}, @widgets 735 @{$self->{children}}, @widgets
698 ]; 736 ];
699 737
700 $self->realloc; 738 $self->realloc;
739
740 $self->emit (c_add => \@widgets);
741
742 map $_+0, @widgets
701} 743}
702 744
703sub children { 745sub children {
704 @{ $_[0]{children} } 746 @{ $_[0]{children} }
705} 747}
706 748
707sub remove { 749sub remove {
708 my ($self, $child) = @_; 750 my ($self, @widgets) = @_;
709 751
752 $self->emit (c_remove => \@widgets);
753
754 for my $child (@widgets) {
710 delete $child->{parent}; 755 delete $child->{parent};
711 $child->hide; 756 $child->hide;
712
713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 757 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
758 }
714 759
715 $self->realloc; 760 $self->realloc;
716} 761}
717 762
718sub clear { 763sub clear {
719 my ($self) = @_; 764 my ($self) = @_;
720 765
721 my $children = delete $self->{children}; 766 my $children = $self->{children};
722 $self->{children} = []; 767 $self->{children} = [];
723 768
724 for (@$children) { 769 for (@$children) {
725 delete $_->{parent}; 770 delete $_->{parent};
726 $_->hide; 771 $_->hide;
… …
746} 791}
747 792
748sub _draw { 793sub _draw {
749 my ($self) = @_; 794 my ($self) = @_;
750 795
751 $_->draw for @{$self->{children}}; 796 $_->draw for $self->visible_children;
752} 797}
753 798
754############################################################################# 799#############################################################################
755 800
756package CFClient::UI::Bin; 801package DC::UI::Bin;
757 802
758our @ISA = CFClient::UI::Container::; 803our @ISA = DC::UI::Container::;
759 804
760sub new { 805sub new {
761 my ($class, %arg) = @_; 806 my ($class, %arg) = @_;
762 807
763 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 808 my $child = (delete $arg{child}) || new DC::UI::Empty::;
764 809
765 $class->SUPER::new (children => [$child], %arg) 810 $class->SUPER::new (children => [$child], %arg)
766} 811}
767 812
768sub add { 813sub add {
769 my ($self, $child) = @_; 814 my ($self, $child) = @_;
770 815
771 $self->{children} = []; 816 $self->clear;
772
773 $self->SUPER::add ($child); 817 $self->SUPER::add ($child);
774} 818}
775 819
776sub remove { 820sub remove {
777 my ($self, $widget) = @_; 821 my ($self, $widget) = @_;
778 822
779 $self->SUPER::remove ($widget); 823 $self->SUPER::remove ($widget);
780 824
781 $self->{children} = [new CFClient::UI::Empty] 825 $self->{children} = [new DC::UI::Empty]
782 unless @{$self->{children}}; 826 unless @{$self->{children}};
783} 827}
784 828
785sub child { $_[0]->{children}[0] } 829sub child { $_[0]->{children}[0] }
786 830
787sub size_request { 831sub size_request {
788 $_[0]{children}[0]->size_request 832 $_[0]{children}[0]->size_request
789} 833}
790 834
791sub size_allocate { 835sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 836 my ($self, $w, $h) = @_;
793 837
794 $self->{children}[0]->configure (0, 0, $w, $h); 838 $self->{children}[0]->configure (0, 0, $w, $h);
839
840 1
795} 841}
796 842
797############################################################################# 843#############################################################################
844# back-buffered drawing area
798 845
799package CFClient::UI::Window; 846package DC::UI::Window;
800 847
801our @ISA = CFClient::UI::Bin::; 848our @ISA = DC::UI::Bin::;
802 849
803use CFClient::OpenGL; 850use DC::OpenGL;
804 851
805sub new { 852sub new {
806 my ($class, %arg) = @_; 853 my ($class, %arg) = @_;
807 854
808 my $self = $class->SUPER::new (%arg); 855 my $self = $class->SUPER::new (%arg);
… …
813 860
814 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 861 $ROOT->on_post_alloc ($self => sub { $self->render_child });
815 $self->SUPER::update; 862 $self->SUPER::update;
816} 863}
817 864
818sub size_allocate { 865sub invoke_size_allocate {
819 my ($self, $w, $h) = @_; 866 my ($self, $w, $h) = @_;
820 867
821 $self->SUPER::size_allocate ($w, $h);
822 $self->update; 868 $self->update;
869
870 $self->SUPER::invoke_size_allocate ($w, $h)
823} 871}
824 872
825sub _render { 873sub _render {
826 my ($self) = @_; 874 my ($self) = @_;
827 875
… …
829} 877}
830 878
831sub render_child { 879sub render_child {
832 my ($self) = @_; 880 my ($self) = @_;
833 881
834 $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 {
835 glClearColor 0, 0, 0, 0; 883 glClearColor 0, 0, 0, 0;
836 glClear GL_COLOR_BUFFER_BIT; 884 glClear GL_COLOR_BUFFER_BIT;
837 885
838 { 886 {
839 package CFClient::UI::Base; 887 package DC::UI::Base;
840 888
841 ($draw_x, $draw_y, $draw_w, $draw_h) = 889 local ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h}); 890 (0, 0, $self->{w}, $self->{h});
891
892 $self->_render;
843 } 893 }
844
845 $self->_render;
846 }; 894 };
847} 895}
848 896
849sub _draw { 897sub _draw {
850 my ($self) = @_; 898 my ($self) = @_;
851
852 my ($w, $h) = @$self{qw(w h)};
853 899
854 my $tex = $self->{texture} 900 my $tex = $self->{texture}
855 or return; 901 or return;
856 902
857 glEnable GL_TEXTURE_2D; 903 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 904 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 905 glColor 0, 0, 0, 1;
860 906
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 907 $tex->draw_quad_alpha_premultiplied (0, 0);
862 908
863 glDisable GL_TEXTURE_2D; 909 glDisable GL_TEXTURE_2D;
864} 910}
865 911
866############################################################################# 912#############################################################################
867 913
868package CFClient::UI::ViewPort; 914package DC::UI::ViewPort;
869 915
916use List::Util qw(min max);
917
870our @ISA = CFClient::UI::Window::; 918our @ISA = DC::UI::Window::;
871 919
872sub new { 920sub new {
873 my $class = shift; 921 my $class = shift;
874 922
875 $class->SUPER::new ( 923 $class->SUPER::new (
… …
882sub size_request { 930sub size_request {
883 my ($self) = @_; 931 my ($self) = @_;
884 932
885 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 933 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
886 934
887 $w = 10 if $self->{scroll_x}; 935 $w = 1 if $self->{scroll_x};
888 $h = 10 if $self->{scroll_y}; 936 $h = 1 if $self->{scroll_y};
889 937
890 ($w, $h) 938 ($w, $h)
891} 939}
892 940
893sub size_allocate { 941sub invoke_size_allocate {
894 my ($self, $w, $h) = @_; 942 my ($self, $w, $h) = @_;
895 943
896 my $child = $self->child; 944 my $child = $self->child;
897 945
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 946 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 947 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900 948
901 $self->child->configure (0, 0, $w, $h); 949 $self->child->configure (0, 0, $w, $h);
902 $self->update; 950 $self->update;
951
952 1
903} 953}
904 954
905sub set_offset { 955sub set_offset {
906 my ($self, $x, $y) = @_; 956 my ($self, $x, $y) = @_;
907 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}) {
908 $self->{view_x} = int $x; 962 $self->{view_x} = $x;
909 $self->{view_y} = int $y; 963 $self->{view_y} = $y;
910 964
965 $self->emit (changed => $x, $y);
911 $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 }
912} 986}
913 987
914# 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
915sub coord2local { 989sub coord2local {
916 my ($self, $x, $y) = @_; 990 my ($self, $x, $y) = @_;
… …
931 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
932 1006
933 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
934 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
935 ) { 1009 ) {
936 $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})
937 } else { 1011 } else {
938 $self->CFClient::UI::Base::find_widget ($x, $y) 1012 $self->DC::UI::Base::find_widget ($x, $y)
939 } 1013 }
940} 1014}
941 1015
942sub _render { 1016sub _render {
943 my ($self) = @_; 1017 my ($self) = @_;
944 1018
945 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};
946 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};
947 1021
948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1022 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
949 1023
950 $self->SUPER::_render; 1024 $self->SUPER::_render;
951} 1025}
952 1026
953############################################################################# 1027#############################################################################
954 1028
955package CFClient::UI::ScrolledWindow; 1029package DC::UI::ScrolledWindow;
956 1030
957our @ISA = CFClient::UI::HBox::; 1031our @ISA = DC::UI::Table::;
958 1032
959sub new { 1033sub new {
960 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
961 1035
962 my $child = delete $arg{child}; 1036 my $child = delete $arg{child};
963 1037
964 my $self; 1038 my $self;
965 1039
966 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,
967 vertical => 1, 1054 vertical => 1,
968 range => [0, 0, 1, 0.01], # HACK fix 1055 range => [0, 0, 1, 0.01], # HACK fix
969 on_changed => sub { 1056 on_changed => sub {
970 $self->{vp}->set_offset (0, $_[1]); 1057 $self->{vpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
971 }, 1059 },
972 ; 1060 ;
973 1061
974 $self = $class->SUPER::new ( 1062 $self = $class->SUPER::new (
975 vp => (new CFClient::UI::ViewPort expand => 1), 1063 scroll_x => 0,
1064 scroll_y => 1,
1065 can_events => 1,
976 slider => $slider, 1066 hslider => $hslider,
1067 vslider => $vslider,
1068 col_expand => [1, 0],
1069 row_expand => [1, 0],
977 %arg, 1070 %arg,
978 ); 1071 );
979 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
980 $self->SUPER::add ($self->{vp}, $self->{slider}); 1094 $self->SUPER::add ($self->{vp});
1095
981 $self->add ($child) if $child; 1096 $self->add ($child) if $child;
982 1097
983 $self 1098 $self
984} 1099}
985 1100
… …
987 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
988 1103
989 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
990} 1105}
991 1106
1107sub set_offset { shift->{vp}->set_offset (@_) }
1108sub set_center { shift->{vp}->set_center (@_) }
1109sub make_visible { shift->{vp}->make_visible (@_) }
1110
992sub 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 {
993 my ($self) = @_; 1142 my ($self, $ev) = @_;
994 1143
995 $self->SUPER::update; 1144 $self->grab_focus;
996 1145
997 # todo: overwrite size_allocate of child 1146 my $ox = $self->{vp}{view_x};
998 my $child = $self->{vp}->child; 1147 my $oy = $self->{vp}{view_y};
999 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1148
1000} 1149 $self->{motion} = sub {
1150 my ($ev, $x, $y) = @_;
1001 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
1002sub size_allocate { 1200sub invoke_size_allocate {
1003 my ($self, $w, $h) = @_; 1201 my ($self, $w, $h) = @_;
1004 1202
1203 $self->update_slider;
1005 $self->SUPER::size_allocate ($w, $h); 1204 $self->SUPER::invoke_size_allocate ($w, $h)
1006
1007 my $child = $self->{vp}->child;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009} 1205}
1010
1011#TODO# update range on size_allocate depending on child
1012# update viewport offset on scroll
1013 1206
1014############################################################################# 1207#############################################################################
1015 1208
1016package CFClient::UI::Frame; 1209package DC::UI::Frame;
1017 1210
1018our @ISA = CFClient::UI::Bin::; 1211our @ISA = DC::UI::Bin::;
1019 1212
1020use CFClient::OpenGL; 1213use DC::OpenGL;
1021 1214
1022sub new { 1215sub new {
1023 my $class = shift; 1216 my $class = shift;
1024 1217
1025 $class->SUPER::new ( 1218 $class->SUPER::new (
… …
1033 1226
1034 if ($self->{bg}) { 1227 if ($self->{bg}) {
1035 my ($w, $h) = @$self{qw(w h)}; 1228 my ($w, $h) = @$self{qw(w h)};
1036 1229
1037 glEnable GL_BLEND; 1230 glEnable GL_BLEND;
1038 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1039 glColor @{ $self->{bg} }; 1232 glColor_premultiply @{ $self->{bg} };
1040
1041 glBegin GL_QUADS;
1042 glVertex 0 , 0;
1043 glVertex 0 , $h;
1044 glVertex $w, $h; 1233 glRect 0, 0, $w, $h;
1045 glVertex $w, 0;
1046 glEnd;
1047
1048 glDisable GL_BLEND; 1234 glDisable GL_BLEND;
1049 } 1235 }
1050 1236
1051 $self->SUPER::_draw; 1237 $self->SUPER::_draw;
1052} 1238}
1053 1239
1054############################################################################# 1240#############################################################################
1055 1241
1056package CFClient::UI::FancyFrame; 1242package DC::UI::FancyFrame;
1057 1243
1058our @ISA = CFClient::UI::Bin::; 1244our @ISA = DC::UI::Bin::;
1059 1245
1060use CFClient::OpenGL; 1246use DC::OpenGL;
1061
1062my $bg =
1063 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1064 mipmap => 1, wrap => 1;
1065
1066my @border =
1067 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1068 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1069 1247
1070sub new { 1248sub new {
1071 my ($class, %arg) = @_; 1249 my ($class, %arg) = @_;
1072 1250
1073 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 }
1074 1258
1075 my $self = $class->SUPER::new ( 1259 my $self = $class->SUPER::new (
1260 # label => "",
1076 bg => [1, 1, 1, 1], 1261 fg => [0.6, 0.3, 0.1],
1077 border_bg => [1, 1, 1, 1],
1078 border => 0.6, 1262 border => 0.8,
1079 can_events => 1, 1263 style => 'single',
1080 min_w => 16,
1081 min_h => 16,
1082 %arg, 1264 %arg,
1083 ); 1265 );
1084 1266
1085 $self->{title} = new CFClient::UI::Label
1086 align => 0,
1087 valign => 1,
1088 text => $title,
1089 fontsize => $self->{border}
1090 if defined $title;
1091
1092 $self 1267 $self
1093} 1268}
1094 1269
1095sub add { 1270sub add {
1096 my ($self, @widgets) = @_; 1271 my ($self, @widgets) = @_;
1097 1272
1098 $self->SUPER::add (@widgets); 1273 $self->SUPER::add (@widgets);
1099 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1274 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1100} 1275}
1101 1276
1102sub border { 1277sub border {
1103 int $_[0]{border} * $::FONTSIZE 1278 int $_[0]{border} * $::FONTSIZE
1104} 1279}
1105 1280
1106sub size_request { 1281sub size_request {
1107 my ($self) = @_; 1282 my ($self) = @_;
1108 1283
1109 $self->{title}->size_request 1284 ($self->{label_w}, undef) = $self->{label}->size_request
1110 if $self->{title}; 1285 if $self->{label};
1111 1286
1112 my ($w, $h) = $self->SUPER::size_request; 1287 my ($w, $h) = $self->SUPER::size_request;
1113 1288
1114 ( 1289 (
1115 $w + $self->border * 2, 1290 $w + $self->border * 2,
1116 $h + $self->border * 2, 1291 $h + $self->border * 2,
1117 ) 1292 )
1118} 1293}
1119 1294
1120sub size_allocate { 1295sub invoke_size_allocate {
1121 my ($self, $w, $h) = @_; 1296 my ($self, $w, $h) = @_;
1122 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
1123 if ($self->{title}) { 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_resource DC::Texture "d1_bg.png",
1350 mipmap => 1, wrap => 1;
1351
1352my @border =
1353 map { new_from_resource DC::Texture $_, 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_resource DC::Texture $_, mipmap => 1 }
1358 qw(x1_move.png x1_resize.png);
1359
1360sub new {
1361 my ($class, %arg) = @_;
1362
1363 my $self = $class->SUPER::new (
1364 bg => [1, 1, 1, 1],
1365 border_bg => [1, 1, 1, 1],
1366 border => 1,
1367 can_events => 1,
1368 min_w => 64,
1369 min_h => 32,
1370 %arg,
1371 );
1372
1373 $self->{title_widget} = new DC::UI::Label
1374 align => 0.5,
1375 valign => 1,
1376 text => $self->{title},
1377 fontsize => $self->{border},
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 }
1388
1389 $self
1390}
1391
1392sub add {
1393 my ($self, @widgets) = @_;
1394
1395 $self->SUPER::add (@widgets);
1396 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1397 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1398}
1399
1400sub border {
1401 int $_[0]{border} * $::FONTSIZE
1402}
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
1413sub size_request {
1414 my ($self) = @_;
1415
1416 $self->{title_widget}->size_request
1417 if $self->{title_widget};
1418
1419 $self->{close_button}->size_request
1420 if $self->{close_button};
1421
1422 my ($w, $h) = $self->SUPER::size_request;
1423
1424 (
1425 $w + $self->border * 2,
1426 $h + $self->border * 2,
1427 )
1428}
1429
1430sub invoke_size_allocate {
1431 my ($self, $w, $h) = @_;
1432
1433 if ($self->{title_widget}) {
1124 $self->{title}{w} = $w; 1434 $self->{title_widget}{w} = $w;
1125 $self->{title}{h} = $h; 1435 $self->{title_widget}{h} = $h;
1126 $self->{title}->size_allocate ($w, $h); 1436 $self->{title_widget}->invoke_size_allocate ($w, $h);
1127 } 1437 }
1128 1438
1129 my $border = $self->border; 1439 my $border = $self->border;
1130 1440
1131 $h -= List::Util::max 0, $border * 2; 1441 $h -= List::Util::max 0, $border * 2;
1132 $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;
1133 1456
1134 $self->child->configure ($border, $border, $w, $h); 1457 1
1135} 1458}
1136 1459
1137sub button_down { 1460sub invoke_button_down {
1138 my ($self, $ev, $x, $y) = @_; 1461 my ($self, $ev, $x, $y) = @_;
1139 1462
1140 my ($w, $h) = @$self{qw(w h)}; 1463 my ($w, $h) = @$self{qw(w h)};
1141 my $border = $self->border; 1464 my $border = $self->border;
1142 1465
… …
1158 my $dy = $ev->{y} - $oy; 1481 my $dy = $ev->{y} - $oy;
1159 1482
1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1483 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1484 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162 1485
1486 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1163 $self->realloc; 1487 $self->realloc;
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 }; 1488 };
1166 1489
1167 } elsif ($lr ^ $td) { 1490 } elsif ($lr ^ $td) {
1168 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1491 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1169 my ($bx, $by) = ($self->{x}, $self->{y}); 1492 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1172 my ($ev, $x, $y) = @_; 1495 my ($ev, $x, $y) = @_;
1173 1496
1174 ($x, $y) = ($ev->{x}, $ev->{y}); 1497 ($x, $y) = ($ev->{x}, $ev->{y});
1175 1498
1176 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1499 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1500 # HACK: the next line is required to enforce placement
1501 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1177 }; 1502 };
1178 } else { 1503 } else {
1179 return 0; 1504 return 0;
1180 } 1505 }
1181 1506
1182 1 1507 1
1183} 1508}
1184 1509
1185sub button_up { 1510sub invoke_button_up {
1186 my ($self, $ev, $x, $y) = @_; 1511 my ($self, $ev, $x, $y) = @_;
1187 1512
1188 !!delete $self->{motion} 1513 ! ! delete $self->{motion}
1189} 1514}
1190 1515
1191sub mouse_motion { 1516sub invoke_mouse_motion {
1192 my ($self, $ev, $x, $y) = @_; 1517 my ($self, $ev, $x, $y) = @_;
1193 1518
1194 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1519 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195 1520
1196 !!$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
1197} 1530}
1198 1531
1199sub _draw { 1532sub _draw {
1200 my ($self) = @_; 1533 my ($self) = @_;
1201 1534
… …
1208 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1209 1542
1210 my $border = $self->border; 1543 my $border = $self->border;
1211 1544
1212 glColor @{ $self->{border_bg} }; 1545 glColor @{ $self->{border_bg} };
1213 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1546 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1214 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1547 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1215 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1548 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1216 $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);
1217 1564
1218 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1565 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1219 glColor @{ $self->{bg} }; 1566 glColor @{ $self->{bg} };
1220 1567
1221 # TODO: repeat texture not scale 1568 # TODO: repeat texture not scale
… …
1227 1574
1228 glDisable GL_TEXTURE_2D; 1575 glDisable GL_TEXTURE_2D;
1229 1576
1230 $child->draw; 1577 $child->draw;
1231 1578
1232 if ($self->{title}) { 1579 if ($self->{title_widget}) {
1233 glTranslate 0, $border - $self->{h}; 1580 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw; 1581 $self->{title_widget}->_draw;
1582
1583 glTranslate 0, - ($border - $self->{h});
1235 } 1584 }
1585
1586 $self->{close_button}->draw
1587 if $self->{close_button};
1236} 1588}
1237 1589
1238############################################################################# 1590#############################################################################
1239 1591
1240package CFClient::UI::Table; 1592package DC::UI::Table;
1241 1593
1242our @ISA = CFClient::UI::Base::; 1594our @ISA = DC::UI::Container::;
1243 1595
1244use List::Util qw(max sum); 1596use List::Util qw(max sum);
1245 1597
1246use CFClient::OpenGL; 1598use DC::OpenGL;
1247 1599
1248sub new { 1600sub new {
1249 my $class = shift; 1601 my $class = shift;
1250 1602
1251 $class->SUPER::new ( 1603 $class->SUPER::new (
1252 col_expand => [], 1604 col_expand => [],
1605 row_expand => [],
1253 @_, 1606 @_,
1254 ) 1607 )
1255} 1608}
1256 1609
1257sub children {
1258 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1259}
1260
1261sub add { 1610sub add {
1262 my ($self, $x, $y, $child) = @_;
1263
1264 $child->set_parent ($self);
1265 $self->{children}[$y][$x] = $child;
1266
1267 $self->realloc;
1268}
1269
1270# TODO: move to container class maybe? send children a signal on removal?
1271sub clear {
1272 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);
1273 1642
1274 my @children = $self->children; 1643 my @children = $self->children;
1275 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 }
1276 1654 }
1277 for (@children) {
1278 delete $_->{parent};
1279 $_->hide;
1280 }
1281 1655
1282 $self->realloc; 1656 # second pass, rows
1283} 1657 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1284
1285sub get_wh {
1286 my ($self) = @_;
1287
1288 my (@w, @h);
1289
1290 for my $y (0 .. $#{$self->{children}}) {
1291 my $row = $self->{children}[$y]
1292 or next;
1293
1294 for my $x (0 .. $#$row) {
1295 my $widget = $row->[$x]
1296 or next;
1297 my ($w, $h) = @$widget{qw(req_w req_h)}; 1658 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1298 1659
1299 $w[$x] = max $w[$x], $w; 1660 my $sh = sum @h[$r .. $r + $rs - 1];
1300 $h[$y] = max $h[$y], $h; 1661
1662 if ($h > $sh) {
1663 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1301 } 1664 }
1302 } 1665 }
1303 1666
1304 (\@w, \@h) 1667 (\@w, \@h)
1305} 1668}
… …
1313 (sum @$ws), 1676 (sum @$ws),
1314 (sum @$hs), 1677 (sum @$hs),
1315 ) 1678 )
1316} 1679}
1317 1680
1318sub size_allocate { 1681sub invoke_size_allocate {
1319 my ($self, $w, $h) = @_; 1682 my ($self, $w, $h) = @_;
1320 1683
1321 my ($ws, $hs) = $self->get_wh; 1684 my ($ws, $hs) = $self->get_wh;
1322 1685
1323 my $req_w = (sum @$ws) || 1; 1686 my $req_w = (sum @$ws) || 1;
1324 my $req_h = (sum @$hs) || 1; 1687 my $req_h = (sum @$hs) || 1;
1325 1688
1326 # TODO: nicer code && do row_expand 1689 # now linearly scale the rows/columns to the allocated size
1327 my @col_expand = @{$self->{col_expand}}; 1690 my @col_expand = @{$self->{col_expand}};
1328 @col_expand = (1) x @$ws unless @col_expand; 1691 @col_expand = (1) x @$ws unless @col_expand;
1329 my $col_expand = (sum @col_expand) || 1; 1692 my $col_expand = (sum @col_expand) || 1;
1330 1693
1331 # linearly scale sizes
1332 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1694 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1333 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1334 1695
1335 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
1336 CFClient::UI::harmonize $hs; 1704 DC::UI::harmonize $hs;
1337 1705
1338 my $y; 1706 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1707 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1339 1708
1340 for my $r (0 .. $#{$self->{children}}) { 1709 for my $widget ($self->children) {
1341 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)};
1342 or next;
1343 1711
1344 my $x = 0; 1712 $widget->configure (
1345 my $row_h = $hs->[$r]; 1713 $x[$c], $y[$r],
1714 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1346 1715 );
1347 for my $c (0 .. $#$row) { 1716 }
1348 my $col_w = $ws->[$c];
1349 1717
1350 if (my $widget = $row->[$c]) { 1718 1
1351 $widget->configure ($x, $y, $col_w, $row_h); 1719}
1352 }
1353 1720
1354 $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};
1355 } 1748 }
1356
1357 $y += $row_h;
1358 } 1749 }
1359 1750
1360} 1751 my $W = $x2 - $x1;
1752 my $H = $y2 - $y1;
1361 1753
1362sub 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 {
1363 my ($self, $x, $y) = @_; 1772 my ($self, $W, $H) = @_;
1364 1773
1365 $x -= $self->{x}; 1774 for my $child ($self->visible_children) {
1366 $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;
1367 1777
1368 my $res; 1778 $x += $child->{c_halign} * $child->{req_w};
1779 $y += $child->{c_valign} * $child->{req_h};
1369 1780
1370 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1781 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1371 $res = $_->find_widget ($x, $y) 1782 }
1372 and return $res; 1783
1373 } 1784 1
1374
1375 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1376}
1377
1378sub _draw {
1379 my ($self) = @_;
1380
1381 for (grep $_, @{$self->{children}}) {
1382 $_->draw for grep $_, @$_;
1383 }
1384} 1785}
1385 1786
1386############################################################################# 1787#############################################################################
1387 1788
1388package CFClient::UI::Box; 1789package DC::UI::Box;
1389 1790
1390our @ISA = CFClient::UI::Container::; 1791our @ISA = DC::UI::Container::;
1391 1792
1392sub size_request { 1793sub size_request {
1393 my ($self) = @_; 1794 my ($self) = @_;
1795
1796 my @children = $self->visible_children;
1394 1797
1395 $self->{vertical} 1798 $self->{vertical}
1396 ? ( 1799 ? (
1397 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1800 (List::Util::max map $_->{req_w}, @children),
1398 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1801 (List::Util::sum map $_->{req_h}, @children),
1399 ) 1802 )
1400 : ( 1803 : (
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1804 (List::Util::sum map $_->{req_w}, @children),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1805 (List::Util::max map $_->{req_h}, @children),
1403 ) 1806 )
1404} 1807}
1405 1808
1406sub size_allocate { 1809sub invoke_size_allocate {
1407 my ($self, $w, $h) = @_; 1810 my ($self, $w, $h) = @_;
1408 1811
1409 my $space = $self->{vertical} ? $h : $w; 1812 my $space = $self->{vertical} ? $h : $w;
1410 my $children = $self->{children}; 1813 my @children = $self->visible_children;
1411 1814
1412 my @req; 1815 my @req;
1413 1816
1414 if ($self->{homogeneous}) { 1817 if ($self->{homogeneous}) {
1415 @req = ($space / (@$children || 1)) x @$children; 1818 @req = ($space / (@children || 1)) x @children;
1416 } else { 1819 } else {
1417 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1820 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1418 my $req = List::Util::sum @req; 1821 my $req = List::Util::sum @req;
1419 1822
1420 if ($req > $space) { 1823 if ($req > $space) {
1421 # ah well, not enough space 1824 # ah well, not enough space
1422 $_ *= $space / $req for @req; 1825 $_ *= $space / $req for @req;
1423 } else { 1826 } else {
1424 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1827 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1425 1828
1426 $space = ($space - $req) / $expand; # remaining space to give away 1829 $space = ($space - $req) / $expand; # remaining space to give away
1427 1830
1428 $req[$_] += $space * $children->[$_]{expand} 1831 $req[$_] += $space * $children[$_]{expand}
1429 for 0 .. $#$children; 1832 for 0 .. $#children;
1430 } 1833 }
1431 } 1834 }
1432 1835
1433 CFClient::UI::harmonize \@req; 1836 DC::UI::harmonize \@req;
1434 1837
1435 my $pos = 0; 1838 my $pos = 0;
1436 for (0 .. $#$children) { 1839 for (0 .. $#children) {
1437 my $alloc = $req[$_]; 1840 my $alloc = $req[$_];
1438 $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));
1439 1842
1440 $pos += $alloc; 1843 $pos += $alloc;
1441 } 1844 }
1442 1845
1443 1 1846 1
1444} 1847}
1445 1848
1446############################################################################# 1849#############################################################################
1447 1850
1448package CFClient::UI::HBox; 1851package DC::UI::HBox;
1449 1852
1450our @ISA = CFClient::UI::Box::; 1853our @ISA = DC::UI::Box::;
1451 1854
1452sub new { 1855sub new {
1453 my $class = shift; 1856 my $class = shift;
1454 1857
1455 $class->SUPER::new ( 1858 $class->SUPER::new (
… …
1458 ) 1861 )
1459} 1862}
1460 1863
1461############################################################################# 1864#############################################################################
1462 1865
1463package CFClient::UI::VBox; 1866package DC::UI::VBox;
1464 1867
1465our @ISA = CFClient::UI::Box::; 1868our @ISA = DC::UI::Box::;
1466 1869
1467sub new { 1870sub new {
1468 my $class = shift; 1871 my $class = shift;
1469 1872
1470 $class->SUPER::new ( 1873 $class->SUPER::new (
… …
1473 ) 1876 )
1474} 1877}
1475 1878
1476############################################################################# 1879#############################################################################
1477 1880
1478package CFClient::UI::Label; 1881package DC::UI::Label;
1479 1882
1480our @ISA = CFClient::UI::DrawBG::; 1883our @ISA = DC::UI::DrawBG::;
1481 1884
1482use CFClient::OpenGL; 1885use DC::OpenGL;
1483 1886
1484sub new { 1887sub new {
1485 my ($class, %arg) = @_; 1888 my ($class, %arg) = @_;
1486 1889
1487 my $self = $class->SUPER::new ( 1890 my $self = $class->SUPER::new (
… …
1490 #active_bg => none 1893 #active_bg => none
1491 #font => default_font 1894 #font => default_font
1492 #text => initial text 1895 #text => initial text
1493 #markup => initial narkup 1896 #markup => initial narkup
1494 #max_w => maximum pixel width 1897 #max_w => maximum pixel width
1898 #style => 0, # render flags
1495 ellipsise => 3, # end 1899 ellipsise => 3, # end
1496 layout => (new CFClient::Layout), 1900 layout => (new DC::Layout),
1497 fontsize => 1, 1901 fontsize => 1,
1498 align => -1, 1902 align => 0.5,
1499 valign => -1, 1903 valign => 0.5,
1500 padding_x => 2, 1904 padding_x => 4,
1501 padding_y => 2, 1905 padding_y => 2,
1502 can_events => 0, 1906 can_events => 0,
1503 %arg 1907 %arg
1504 ); 1908 );
1505 1909
1506 if (exists $self->{template}) { 1910 if (exists $self->{template}) {
1507 my $layout = new CFClient::Layout; 1911 my $layout = new DC::Layout;
1508 $layout->set_text (delete $self->{template}); 1912 $layout->set_text (delete $self->{template});
1509 $self->{template} = $layout; 1913 $self->{template} = $layout;
1510 } 1914 }
1511 1915
1512 if (exists $self->{markup}) { 1916 if (exists $self->{markup}) {
… …
1516 } 1920 }
1517 1921
1518 $self 1922 $self
1519} 1923}
1520 1924
1521sub escape($) {
1522 local $_ = $_[0];
1523
1524 s/&/&amp;/g;
1525 s/>/&gt;/g;
1526 s/</&lt;/g;
1527
1528 $_
1529}
1530
1531sub update { 1925sub update {
1532 my ($self) = @_; 1926 my ($self) = @_;
1533 1927
1534 delete $self->{texture}; 1928 delete $self->{texture};
1535 $self->SUPER::update; 1929 $self->SUPER::update;
1536} 1930}
1537 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
1538sub set_text { 1945sub set_text {
1539 my ($self, $text) = @_; 1946 my ($self, $text) = @_;
1540 1947
1541 return if $self->{text} eq "T$text"; 1948 return if $self->{text} eq "T$text";
1542 $self->{text} = "T$text"; 1949 $self->{text} = "T$text";
1543 1950
1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1545 $self->{layout}->set_text ($text); 1951 $self->{layout}->set_text ($text);
1546 1952
1953 delete $self->{size_req};
1547 $self->realloc; 1954 $self->realloc;
1548 $self->update; 1955 $self->update;
1549} 1956}
1550 1957
1551sub set_markup { 1958sub set_markup {
… …
1554 return if $self->{text} eq "M$markup"; 1961 return if $self->{text} eq "M$markup";
1555 $self->{text} = "M$markup"; 1962 $self->{text} = "M$markup";
1556 1963
1557 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1964 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1558 1965
1559 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1560 $self->{layout}->set_markup ($markup); 1966 $self->{layout}->set_markup ($markup);
1561 1967
1968 delete $self->{size_req};
1562 $self->realloc; 1969 $self->realloc;
1563 $self->update; 1970 $self->update;
1564} 1971}
1565 1972
1566sub size_request { 1973sub size_request {
1567 my ($self) = @_; 1974 my ($self) = @_;
1568 1975
1976 $self->{size_req} ||= do {
1977 my ($max_w, $max_h) = $self->get_max_wh;
1978
1569 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1979 $self->{layout}->set_font ($self->{font}) if $self->{font};
1570 $self->{layout}->set_width ($self->{max_w} || -1); 1980 $self->{layout}->set_width ($max_w);
1571 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1981 $self->{layout}->set_ellipsise ($self->{ellipsise});
1572 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1982 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1983 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1574 1984
1575 my ($w, $h) = $self->{layout}->size; 1985 my ($w, $h) = $self->{layout}->size;
1576 1986
1577 if (exists $self->{template}) { 1987 if (exists $self->{template}) {
1578 $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);
1579 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1991
1581 my ($w2, $h2) = $self->{template}->size; 1992 my ($w2, $h2) = $self->{template}->size;
1582 1993
1583 $w = List::Util::max $w, $w2; 1994 $w = List::Util::max $w, $w2;
1584 $h = List::Util::max $h, $h2; 1995 $h = List::Util::max $h, $h2;
1996 }
1997
1998 [$w, $h]
1585 } 1999 };
1586 2000
1587 ($w, $h) 2001 @{ $self->{size_req} }
1588} 2002}
1589 2003
2004sub baseline_shift {
2005 $_[0]{layout}->descent
2006}
2007
1590sub size_allocate { 2008sub invoke_size_allocate {
1591 my ($self, $w, $h) = @_; 2009 my ($self, $w, $h) = @_;
1592 2010
1593 delete $self->{ox}; 2011 delete $self->{ox};
1594 2012
1595 delete $self->{texture} 2013 delete $self->{texture}
1596 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
1597} 2017}
1598 2018
1599sub set_fontsize { 2019sub set_fontsize {
1600 my ($self, $fontsize) = @_; 2020 my ($self, $fontsize) = @_;
1601 2021
1602 $self->{fontsize} = $fontsize; 2022 $self->{fontsize} = $fontsize;
2023 delete $self->{size_req};
1603 delete $self->{texture}; 2024 delete $self->{texture};
1604 2025
1605 $self->realloc; 2026 $self->realloc;
1606} 2027}
1607 2028
2029sub reconfigure {
2030 my ($self) = @_;
2031
2032 delete $self->{size_req};
2033 delete $self->{texture};
2034
2035 $self->SUPER::reconfigure;
2036}
2037
1608sub _draw { 2038sub _draw {
1609 my ($self) = @_; 2039 my ($self) = @_;
1610 2040
1611 $self->SUPER::_draw; # draw background, if applicable 2041 $self->SUPER::_draw; # draw background, if applicable
1612 2042
1613 my $tex = $self->{texture} ||= do { 2043 my $size = $self->{texture} ||= do {
1614 $self->{layout}->set_foreground (@{$self->{fg}}); 2044 $self->{layout}->set_foreground (@{$self->{fg}});
1615 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2045 $self->{layout}->set_font ($self->{font}) if $self->{font};
1616 $self->{layout}->set_width ($self->{w}); 2046 $self->{layout}->set_width ($self->{w});
1617 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2047 $self->{layout}->set_ellipsise ($self->{ellipsise});
1618 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2048 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1619 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2049 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1620 2050
1621 new_from_layout CFClient::Texture $self->{layout} 2051 [$self->{layout}->size]
1622 }; 2052 };
1623 2053
1624 unless (exists $self->{ox}) { 2054 unless (exists $self->{ox}) {
1625 $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);
1626 : $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);
1627 : ($self->{w} - $tex->{w}) * 0.5);
1628 2057
1629 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2058 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1631 : ($self->{h} - $tex->{h}) * 0.5);
1632 }; 2059 };
1633 2060
1634 glEnable GL_TEXTURE_2D; 2061# unless ($self->{list}) {
1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2062# $self->{list} = DC::OpenGL::glGenList;
1636 2063# DC::OpenGL::glNewList $self->{list};
1637 if ($tex->{format} == GL_ALPHA) { 2064# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1638 glColor @{$self->{fg}}; 2065# DC::OpenGL::glEndList;
1639 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1640 } else {
1641 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1642 } 2066# }
2067#
2068# DC::OpenGL::glCallList $self->{list};
1643 2069
1644 glDisable GL_TEXTURE_2D; 2070 $self->{layout}->draw;
1645} 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#}
1646 2080
1647############################################################################# 2081#############################################################################
1648 2082
1649package CFClient::UI::EntryBase; 2083package DC::UI::EntryBase;
1650 2084
1651our @ISA = CFClient::UI::Label::; 2085our @ISA = DC::UI::Label::;
1652 2086
1653use CFClient::OpenGL; 2087use DC::OpenGL;
1654 2088
1655sub new { 2089sub new {
1656 my $class = shift; 2090 my $class = shift;
1657 2091
1658 $class->SUPER::new ( 2092 $class->SUPER::new (
1659 fg => [1, 1, 1], 2093 fg => [1, 1, 1],
1660 bg => [0, 0, 0, 0.2], 2094 bg => [0, 0, 0, 0.2],
2095 outline => [0.6, 0.3, 0.1],
1661 active_bg => [1, 1, 1, 0.5], 2096 active_bg => [0, 0, 1, .2],
1662 active_fg => [0, 0, 0], 2097 active_fg => [1, 1, 1],
2098 active_outline => [1, 1, 0],
1663 can_hover => 1, 2099 can_hover => 1,
1664 can_focus => 1, 2100 can_focus => 1,
2101 align => 0,
1665 valign => 0, 2102 valign => 0.5,
1666 can_events => 1, 2103 can_events => 1,
2104 ellipsise => 0,
2105 padding_x => 4,
2106 padding_y => 2,
1667 #text => ... 2107 #text => ...
2108 #hidden => "*",
1668 @_ 2109 @_
1669 ) 2110 )
1670} 2111}
1671 2112
1672sub _set_text { 2113sub _set_text {
… …
1674 2115
1675 delete $self->{cur_h}; 2116 delete $self->{cur_h};
1676 2117
1677 return if $self->{text} eq $text; 2118 return if $self->{text} eq $text;
1678 2119
1679 delete $self->{texture};
1680
1681 $self->{last_activity} = $::NOW; 2120 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 2121 $self->{text} = $text;
1683 2122
1684 $text =~ s/./*/g if $self->{hidden}; 2123 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 2124 $self->{layout}->set_text ("$text ");
2125 delete $self->{size_req};
1686 2126
1687 $self->_emit (changed => $self->{text}); 2127 $self->emit (changed => $self->{text});
2128
2129 $self->realloc;
2130 $self->update;
1688} 2131}
1689 2132
1690sub set_text { 2133sub set_text {
1691 my ($self, $text) = @_; 2134 my ($self, $text) = @_;
1692 2135
1693 $self->{cursor} = length $text; 2136 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 2137 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 2138}
1698 2139
1699sub get_text { 2140sub get_text {
1700 $_[0]{text} 2141 $_[0]{text}
1701} 2142}
… …
1706 my ($w, $h) = $self->SUPER::size_request; 2147 my ($w, $h) = $self->SUPER::size_request;
1707 2148
1708 ($w + 1, $h) # add 1 for cursor 2149 ($w + 1, $h) # add 1 for cursor
1709} 2150}
1710 2151
1711sub key_down { 2152sub invoke_key_down {
1712 my ($self, $ev) = @_; 2153 my ($self, $ev) = @_;
1713 2154
1714 my $mod = $ev->{mod}; 2155 my $mod = $ev->{mod};
1715 my $sym = $ev->{sym}; 2156 my $sym = $ev->{sym};
1716 my $uni = $ev->{unicode}; 2157 my $uni = $ev->{unicode};
1717 2158
1718 my $text = $self->get_text; 2159 my $text = $self->get_text;
1719 2160
1720 if ($uni == 8) { 2161 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2162
2163 if ($sym == DC::SDLK_BACKSPACE) {
1721 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2164 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1722 } elsif ($uni == 127) { 2165 } elsif ($sym == DC::SDLK_DELETE) {
1723 substr $text, $self->{cursor}, 1, ""; 2166 substr $text, $self->{cursor}, 1, "";
1724 } elsif ($sym == CFClient::SDLK_LEFT) { 2167 } elsif ($sym == DC::SDLK_LEFT) {
1725 --$self->{cursor} if $self->{cursor}; 2168 --$self->{cursor} if $self->{cursor};
1726 } elsif ($sym == CFClient::SDLK_RIGHT) { 2169 } elsif ($sym == DC::SDLK_RIGHT) {
1727 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2170 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1728 } 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 = "";
1729 $self->{cursor} = 0; 2185 $self->{cursor} = 0;
1730 } elsif ($sym == CFClient::SDLK_END) {
1731 $self->{cursor} = length $text;
1732 } elsif ($uni == 27) { 2186 } elsif ($uni == 27) {
1733 $self->_emit ('escape'); 2187 $self->emit ('escape');
1734 } elsif ($uni) { 2188 } elsif ($uni == 0x0d) {
2189 substr $text, $self->{cursor}++, 0, "\012";
2190 } elsif ($uni >= 0x20) {
1735 substr $text, $self->{cursor}++, 0, chr $uni; 2191 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else { 2192 } else {
1737 return 0; 2193 return 0;
1738 } 2194 }
1739 2195
1740 $self->_set_text ($text); 2196 $self->_set_text ($text);
1741 2197
1742 $self->realloc; 2198 $self->realloc;
2199 $self->update;
1743 2200
1744 1 2201 1
1745} 2202}
1746 2203
1747sub focus_in { 2204sub invoke_focus_in {
1748 my ($self) = @_; 2205 my ($self) = @_;
1749 2206
1750 $self->{last_activity} = $::NOW; 2207 $self->{last_activity} = $::NOW;
1751 2208
1752 $self->SUPER::focus_in; 2209 $self->SUPER::invoke_focus_in
1753} 2210}
1754 2211
1755sub button_down { 2212sub invoke_button_down {
1756 my ($self, $ev, $x, $y) = @_; 2213 my ($self, $ev, $x, $y) = @_;
1757 2214
1758 $self->SUPER::button_down ($ev, $x, $y); 2215 $self->SUPER::invoke_button_down ($ev, $x, $y);
1759 2216
1760 my $idx = $self->{layout}->xy_to_index ($x, $y); 2217 my $idx = $self->{layout}->xy_to_index ($x, $y);
1761 2218
1762 # byte-index to char-index 2219 # byte-index to char-index
1763 my $text = $self->{text}; 2220 my $text = $self->{text};
1764 utf8::encode $text; 2221 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1765 $self->{cursor} = length substr $text, 0, $idx; 2222 $self->{cursor} = length $text;
1766 2223
1767 $self->_set_text ($self->{text}); 2224 $self->_set_text ($self->{text});
1768 $self->update; 2225 $self->update;
1769 2226
1770 1 2227 1
1771} 2228}
1772 2229
1773sub mouse_motion { 2230sub invoke_mouse_motion {
1774 my ($self, $ev, $x, $y) = @_; 2231 my ($self, $ev, $x, $y) = @_;
1775# 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#
1776 2233
1777 0 2234 1
1778} 2235}
1779 2236
1780sub _draw { 2237sub _draw {
1781 my ($self) = @_; 2238 my ($self) = @_;
1782 2239
1783 local $self->{fg} = $self->{fg}; 2240 local $self->{fg} = $self->{fg};
1784 2241
1785 if ($FOCUS == $self) { 2242 if ($FOCUS == $self) {
1786 glColor @{$self->{active_bg}}; 2243 glColor_premultiply @{$self->{active_bg}};
1787 $self->{fg} = $self->{active_fg}; 2244 $self->{fg} = $self->{active_fg};
1788 } else { 2245 } else {
1789 glColor @{$self->{bg}}; 2246 glColor_premultiply @{$self->{bg}};
1790 } 2247 }
1791 2248
1792 glEnable GL_BLEND; 2249 glEnable GL_BLEND;
1793 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2250 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1794 glBegin GL_QUADS;
1795 glVertex 0 , 0;
1796 glVertex 0 , $self->{h};
1797 glVertex $self->{w}, $self->{h}; 2251 glRect 0, 0, $self->{w}, $self->{h};
1798 glVertex $self->{w}, 0;
1799 glEnd;
1800 glDisable GL_BLEND; 2252 glDisable GL_BLEND;
1801 2253
1802 $self->SUPER::_draw; 2254 $self->SUPER::_draw;
1803 2255
1804 #TODO: force update every cursor change :( 2256 #TODO: force update every cursor change :(
… …
1806 2258
1807 unless (exists $self->{cur_h}) { 2259 unless (exists $self->{cur_h}) {
1808 my $text = substr $self->{text}, 0, $self->{cursor}; 2260 my $text = substr $self->{text}, 0, $self->{cursor};
1809 utf8::encode $text; 2261 utf8::encode $text;
1810 2262
1811 @$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);
1812 } 2264 }
1813 2265
1814 glColor @{$self->{fg}}; 2266 glColor_premultiply @{$self->{active_fg}};
1815 glBegin GL_LINES; 2267 glBegin GL_LINES;
1816 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2268 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1817 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};
1818 glEnd; 2270 glEnd;
1819 }
1820}
1821 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
1822package CFClient::UI::Entry; 2290package DC::UI::Entry;
1823 2291
1824our @ISA = CFClient::UI::EntryBase::; 2292our @ISA = DC::UI::EntryBase::;
1825 2293
1826use CFClient::OpenGL; 2294use DC::OpenGL;
1827 2295
2296sub new {
2297 my $class = shift;
2298
2299 $class->SUPER::new (
2300 history_pointer => -1,
2301 @_
2302 )
2303}
2304
2305
1828sub key_down { 2306sub invoke_key_down {
1829 my ($self, $ev) = @_; 2307 my ($self, $ev) = @_;
1830 2308
1831 my $sym = $ev->{sym}; 2309 my $sym = $ev->{sym};
1832 2310
1833 if ($sym == 13) { 2311 if ($ev->{uni} == 0x0d || $sym == 13) {
1834 unshift @{$self->{history}}, 2312 unshift @{$self->{history}},
1835 my $txt = $self->get_text; 2313 my $txt = $self->get_text;
2314
1836 $self->{history_pointer} = -1; 2315 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = ''; 2316 $self->{history_saveback} = '';
1838 $self->_emit (activate => $txt); 2317 $self->emit (activate => $txt);
1839 $self->update; 2318 $self->update;
1840 2319
1841 } elsif ($sym == CFClient::SDLK_UP) { 2320 } elsif ($sym == DC::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) { 2321 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text; 2322 $self->{history_saveback} = $self->get_text;
1844 } 2323 }
1845 if (@{$self->{history} || []} > 0) { 2324 if (@{$self->{history} || []} > 0) {
1846 $self->{history_pointer}++; 2325 $self->{history_pointer}++;
… …
1848 $self->{history_pointer} = @{$self->{history} || []} - 1; 2327 $self->{history_pointer} = @{$self->{history} || []} - 1;
1849 } 2328 }
1850 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2329 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1851 } 2330 }
1852 2331
1853 } elsif ($sym == CFClient::SDLK_DOWN) { 2332 } elsif ($sym == DC::SDLK_DOWN) {
1854 $self->{history_pointer}--; 2333 $self->{history_pointer}--;
1855 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2334 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1856 2335
1857 if ($self->{history_pointer} >= 0) { 2336 if ($self->{history_pointer} >= 0) {
1858 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2337 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1859 } else { 2338 } else {
2339 if (defined $self->{history_saveback}) {
1860 $self->set_text ($self->{history_saveback}); 2340 $self->set_text ($self->{history_saveback});
2341 $self->{history_saveback} = undef;
2342 }
1861 } 2343 }
1862 2344
1863 } else { 2345 } else {
1864 return $self->SUPER::key_down ($ev) 2346 return $self->SUPER::invoke_key_down ($ev)
1865 } 2347 }
1866 2348
1867 1 2349 1
1868} 2350}
1869 2351
1870############################################################################# 2352#############################################################################
1871 2353
1872package CFClient::UI::Button; 2354package DC::UI::TextEdit;
1873 2355
1874our @ISA = CFClient::UI::Label::; 2356our @ISA = DC::UI::EntryBase::;
1875 2357
1876use CFClient::OpenGL; 2358use DC::OpenGL;
1877
1878my @tex =
1879 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1880 qw(b1_button_active.png);
1881 2359
1882sub new { 2360sub new {
1883 my $class = shift; 2361 my $class = shift;
1884 2362
1885 $class->SUPER::new ( 2363 $class->SUPER::new (
1886 padding_x => 4,
1887 padding_y => 4, 2364 padding_y => 4,
1888 fg => [1, 1, 1], 2365
1889 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_resource DC::Texture $_, mipmap => 1 }
2411 qw(b1_button_inactive.png b1_button_active.png);
2412
2413sub new {
2414 my $class = shift;
2415
2416 $class->SUPER::new (
1890 can_hover => 1, 2417 can_hover => 1,
1891 align => 0, 2418 align => 0.5,
1892 valign => 0, 2419 valign => 0.5,
1893 can_events => 1, 2420 can_events => 1,
1894 @_ 2421 @_
1895 ) 2422 )
1896} 2423}
1897 2424
1898sub activate { }
1899
1900sub button_up { 2425sub invoke_button_up {
1901 my ($self, $ev, $x, $y) = @_; 2426 my ($self, $ev, $x, $y) = @_;
1902 2427
1903 $self->emit ("activate") 2428 $self->emit ("activate")
1904 if $x >= 0 && $x < $self->{w} 2429 if $x >= 0 && $x < $self->{w}
1905 && $y >= 0 && $y < $self->{h}; 2430 && $y >= 0 && $y < $self->{h};
… …
1908} 2433}
1909 2434
1910sub _draw { 2435sub _draw {
1911 my ($self) = @_; 2436 my ($self) = @_;
1912 2437
1913 local $self->{fg} = $self->{fg};
1914
1915 if ($GRAB == $self) {
1916 $self->{fg} = $self->{active_fg};
1917 }
1918
1919 glEnable GL_TEXTURE_2D; 2438 glEnable GL_TEXTURE_2D;
1920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1921 glColor 0, 0, 0, 1; 2440 glColor 0, 0, 0, 1;
1922 2441
2442 my $tex = $tex[$GRAB == $self];
1923 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2443 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1924 2444
1925 glDisable GL_TEXTURE_2D; 2445 glDisable GL_TEXTURE_2D;
1926 2446
1927 $self->SUPER::_draw; 2447 $self->SUPER::_draw;
1928} 2448}
1929 2449
1930############################################################################# 2450#############################################################################
1931 2451
1932package CFClient::UI::CheckBox; 2452package DC::UI::Button;
1933 2453
1934our @ISA = CFClient::UI::DrawBG::; 2454our @ISA = DC::UI::Label::;
2455
2456use DC::OpenGL;
1935 2457
1936my @tex = 2458my @tex =
1937 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2459 map { new_from_resource DC::Texture $_, 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_resource DC::Texture $_, mipmap => 1 }
1938 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2513 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1939 2514
1940use CFClient::OpenGL; 2515use DC::OpenGL;
1941 2516
1942sub new { 2517sub new {
1943 my $class = shift; 2518 my $class = shift;
1944 2519
1945 $class->SUPER::new ( 2520 $class->SUPER::new (
… …
1959 my ($self) = @_; 2534 my ($self) = @_;
1960 2535
1961 (6) x 2 2536 (6) x 2
1962} 2537}
1963 2538
2539sub toggle {
2540 my ($self) = @_;
2541
2542 $self->{state} = !$self->{state};
2543 $self->emit (changed => $self->{state});
2544 $self->update;
2545}
2546
1964sub button_down { 2547sub invoke_button_down {
1965 my ($self, $ev, $x, $y) = @_; 2548 my ($self, $ev, $x, $y) = @_;
1966 2549
1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2550 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2551 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1969 $self->{state} = !$self->{state}; 2552 $self->toggle;
1970 $self->_emit (changed => $self->{state});
1971 } else { 2553 } else {
1972 return 0 2554 return 0
1973 } 2555 }
1974 2556
1975 1 2557 1
… …
1978sub _draw { 2560sub _draw {
1979 my ($self) = @_; 2561 my ($self) = @_;
1980 2562
1981 $self->SUPER::_draw; 2563 $self->SUPER::_draw;
1982 2564
1983 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2565 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
1984 2566
1985 my ($w, $h) = @$self{qw(w h)}; 2567 my ($w, $h) = @$self{qw(w h)};
1986 2568
1987 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;
1988 2570
… …
1995 glDisable GL_TEXTURE_2D; 2577 glDisable GL_TEXTURE_2D;
1996} 2578}
1997 2579
1998############################################################################# 2580#############################################################################
1999 2581
2000package CFClient::UI::Image; 2582package DC::UI::Image;
2001 2583
2002our @ISA = CFClient::UI::Base::; 2584our @ISA = DC::UI::Base::;
2003 2585
2004use CFClient::OpenGL; 2586use DC::OpenGL;
2005use Carp qw/confess/;
2006 2587
2007our %loaded_images; 2588our %texture_cache;
2008 2589
2009sub new { 2590sub new {
2010 my $class = shift; 2591 my $class = shift;
2011 2592
2012 my $self = $class->SUPER::new (can_events => 0, @_); 2593 my $self = $class->SUPER::new (
2594 can_events => 0,
2595 scale => 1,
2596 @_,
2597 );
2013 2598
2014 $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";
2015 2601
2016 $loaded_images{$self->{image}} ||= 2602 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2017 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2603 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2018 2604
2019 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2605 DC::weaken $texture_cache{$self->{path}};
2020 2606
2021 Scalar::Util::weaken $loaded_images{$self->{image}}; 2607 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2022
2023 $self->{aspect} = $tex->{w} / $tex->{h};
2024 2608
2025 $self 2609 $self
2026} 2610}
2027 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
2028sub size_request { 2627sub size_request {
2029 my ($self) = @_; 2628 my ($self) = @_;
2030 2629
2031 ($self->{tex}->{w}, $self->{tex}->{h}) 2630 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2032} 2631}
2033 2632
2034sub _draw { 2633sub _draw {
2035 my ($self) = @_; 2634 my ($self) = @_;
2036 2635
… …
2053 glDisable GL_TEXTURE_2D; 2652 glDisable GL_TEXTURE_2D;
2054} 2653}
2055 2654
2056############################################################################# 2655#############################################################################
2057 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
2058package CFClient::UI::VGauge; 2699package DC::UI::VGauge;
2059 2700
2060our @ISA = CFClient::UI::Base::; 2701our @ISA = DC::UI::Base::;
2061 2702
2062use List::Util qw(min max); 2703use List::Util qw(min max);
2063 2704
2064use CFClient::OpenGL; 2705use DC::OpenGL;
2065 2706
2066my %tex = ( 2707my %tex = (
2067 food => [ 2708 food => [
2068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2709 map { new_from_resource DC::Texture $_, mipmap => 1 }
2069 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2710 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2070 ], 2711 ],
2071 grace => [ 2712 grace => [
2072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2713 map { new_from_resource DC::Texture $_, mipmap => 1 }
2073 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/
2074 ], 2715 ],
2075 hp => [ 2716 hp => [
2076 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2717 map { new_from_resource DC::Texture $_, mipmap => 1 }
2077 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2718 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2078 ], 2719 ],
2079 mana => [ 2720 mana => [
2080 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2721 map { new_from_resource DC::Texture $_, mipmap => 1 }
2081 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/
2082 ], 2723 ],
2083); 2724);
2084 2725
2085# eg. VGauge->new (gauge => 'food'), default gauge: food 2726# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2145 my $ycut1 = max 0, min 1, $ycut; 2786 my $ycut1 = max 0, min 1, $ycut;
2146 my $ycut2 = max 0, min 1, $ycut - 1; 2787 my $ycut2 = max 0, min 1, $ycut - 1;
2147 2788
2148 my $h1 = $self->{h} * (1 - $ycut1); 2789 my $h1 = $self->{h} * (1 - $ycut1);
2149 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);
2150 2794
2151 glEnable GL_BLEND; 2795 glEnable GL_BLEND;
2152 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2796 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2797 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2153 glEnable GL_TEXTURE_2D; 2798 glEnable GL_TEXTURE_2D;
2154 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155 2800
2156 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2801 glBindTexture GL_TEXTURE_2D, $t1->{name};
2157 glBegin GL_QUADS; 2802 glBegin GL_QUADS;
… …
2172 2817
2173 if ($t3) { 2818 if ($t3) {
2174 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2819 glBindTexture GL_TEXTURE_2D, $t3->{name};
2175 glBegin GL_QUADS; 2820 glBegin GL_QUADS;
2176 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2821 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2177 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2822 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2178 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2823 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2179 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2824 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2180 glEnd; 2825 glEnd;
2181 } 2826 }
2182 2827
2183 glDisable GL_BLEND; 2828 glDisable GL_BLEND;
2184 glDisable GL_TEXTURE_2D; 2829 glDisable GL_TEXTURE_2D;
2185} 2830}
2186 2831
2187############################################################################# 2832#############################################################################
2188 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
2189package CFClient::UI::Gauge; 2972package DC::UI::Gauge;
2190 2973
2191our @ISA = CFClient::UI::VBox::; 2974our @ISA = DC::UI::VBox::;
2192 2975
2193sub new { 2976sub new {
2194 my ($class, %arg) = @_; 2977 my ($class, %arg) = @_;
2195 2978
2196 my $self = $class->SUPER::new ( 2979 my $self = $class->SUPER::new (
… …
2198 can_hover => 1, 2981 can_hover => 1,
2199 can_events => 1, 2982 can_events => 1,
2200 %arg, 2983 %arg,
2201 ); 2984 );
2202 2985
2203 $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");
2204 $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);
2205 $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");
2206 2989
2207 $self 2990 $self
2208} 2991}
2209 2992
2210sub set_fontsize { 2993sub set_fontsize {
… …
2231 $self->{value}->set_text ($val); 3014 $self->{value}->set_text ($val);
2232} 3015}
2233 3016
2234############################################################################# 3017#############################################################################
2235 3018
2236package CFClient::UI::Slider; 3019package DC::UI::Slider;
2237 3020
2238use strict; 3021use strict;
2239 3022
2240use CFClient::OpenGL; 3023use DC::OpenGL;
2241 3024
2242our @ISA = CFClient::UI::DrawBG::; 3025our @ISA = DC::UI::DrawBG::;
2243 3026
2244my @tex = 3027my @tex =
2245 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 3028 map { new_from_resource DC::Texture $_ }
2246 qw(s1_slider.png s1_slider_bg.png); 3029 qw(s1_slider.png s1_slider_bg.png);
2247 3030
2248sub new { 3031sub new {
2249 my $class = shift; 3032 my $class = shift;
2250 3033
… …
2271 $self->update; 3054 $self->update;
2272 3055
2273 $self 3056 $self
2274} 3057}
2275 3058
2276sub changed { }
2277
2278sub set_range { 3059sub set_range {
2279 my ($self, $range) = @_; 3060 my ($self, $range) = @_;
2280 3061
2281 ($range, $self->{range}) = ($self->{range}, $range); 3062 ($range, $self->{range}) = ($self->{range}, $range);
2282 3063
2283 $self->update
2284 if "@$range" ne "@{$self->{range}}"; 3064 if ("@$range" ne "@{$self->{range}}") {
3065 $self->update;
3066 $self->set_value ($self->{range}[0]);
3067 }
2285} 3068}
2286 3069
2287sub set_value { 3070sub set_value {
2288 my ($self, $value) = @_; 3071 my ($self, $value) = @_;
2289 3072
2290 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3073 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2291 3074
2292 $hi = $lo + 1 if $hi <= $lo; 3075 $hi = $lo if $hi < $lo;
2293 3076
2294 $page = $hi - $lo if $page > $hi - $lo; 3077 $value = $hi - $page if $value > $hi - $page;
2295
2296 $value = $lo if $value < $lo; 3078 $value = $lo if $value < $lo;
2297 $value = $hi - $page if $value > $hi - $page;
2298 3079
2299 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3080 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2300 if $unit; 3081 if $unit;
2301 3082
2302 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3083 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2303 3084
2304 if ($value != $old_value) { 3085 if ($value != $old_value) {
2305 $self->_emit (changed => $value); 3086 $self->emit (changed => $value);
2306 $self->update; 3087 $self->update;
2307 } 3088 }
2308} 3089}
2309 3090
2310sub size_request { 3091sub size_request {
2311 my ($self) = @_; 3092 my ($self) = @_;
2312 3093
2313 ($self->{req_w}, $self->{req_h}) 3094 ($self->{req_w}, $self->{req_h})
2314} 3095}
2315 3096
2316sub button_down { 3097sub invoke_button_down {
2317 my ($self, $ev, $x, $y) = @_; 3098 my ($self, $ev, $x, $y) = @_;
2318 3099
2319 $self->SUPER::button_down ($ev, $x, $y); 3100 $self->SUPER::invoke_button_down ($ev, $x, $y);
2320 3101
2321 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3102 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2322 3103
2323 $self->mouse_motion ($ev, $x, $y) 3104 $self->invoke_mouse_motion ($ev, $x, $y);
2324}
2325 3105
3106 1
3107}
3108
2326sub mouse_motion { 3109sub invoke_mouse_motion {
2327 my ($self, $ev, $x, $y) = @_; 3110 my ($self, $ev, $x, $y) = @_;
2328 3111
2329 if ($GRAB == $self) { 3112 if ($GRAB == $self) {
2330 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3113 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2331 3114
… …
2339 } 3122 }
2340 3123
2341 1 3124 1
2342} 3125}
2343 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
2344sub update { 3139sub update {
2345 my ($self) = @_; 3140 my ($self) = @_;
2346 3141
2347 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 3142 delete $self->{knob_w};
3143 $self->SUPER::update;
3144}
3145
3146sub _draw {
3147 my ($self) = @_;
3148
3149 unless ($self->{knob_w}) {
2348 $self->set_value ($self->{range}[0]); 3150 $self->set_value ($self->{range}[0]);
2349 3151
2350 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3152 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2351 my $range = ($hi - $page - $lo) || 1e-100; 3153 my $range = ($hi - $page - $lo) || 1e-10;
2352 3154
2353 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};
2354 3156
2355 $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;
2356 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3158 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2357 3159
2358 $value = ($value - $lo) / $range; 3160 $value = ($value - $lo) / $range;
2359 $value = $value * $self->{scale} + $self->{offset}; 3161 $value = $value * $self->{scale} + $self->{offset};
2360 3162
2361 $self->{knob_x} = $value - $knob_w * 0.5; 3163 $self->{knob_x} = $value - $knob_w * 0.5;
2362 $self->{knob_w} = $knob_w; 3164 $self->{knob_w} = $knob_w;
2363 }); 3165 }
2364
2365 $self->SUPER::update;
2366}
2367
2368sub _draw {
2369 my ($self) = @_;
2370 3166
2371 $self->SUPER::_draw (); 3167 $self->SUPER::_draw ();
2372 3168
2373 glScale $self->{w}, $self->{h}; 3169 glScale $self->{w}, $self->{h};
2374 3170
… …
2394 glDisable GL_TEXTURE_2D; 3190 glDisable GL_TEXTURE_2D;
2395} 3191}
2396 3192
2397############################################################################# 3193#############################################################################
2398 3194
2399package CFClient::UI::ValSlider; 3195package DC::UI::ValSlider;
2400 3196
2401our @ISA = CFClient::UI::HBox::; 3197our @ISA = DC::UI::HBox::;
2402 3198
2403sub new { 3199sub new {
2404 my ($class, %arg) = @_; 3200 my ($class, %arg) = @_;
2405 3201
2406 my $range = delete $arg{range}; 3202 my $range = delete $arg{range};
2407 3203
2408 my $self = $class->SUPER::new ( 3204 my $self = $class->SUPER::new (
2409 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3205 slider => (new DC::UI::Slider expand => 1, range => $range),
2410 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3206 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2411 to_value => sub { shift }, 3207 to_value => sub { shift },
2412 from_value => sub { shift }, 3208 from_value => sub { shift },
2413 %arg, 3209 %arg,
2414 ); 3210 );
2415 3211
… …
2435sub set_range { shift->{slider}->set_range (@_) } 3231sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) } 3232sub set_value { shift->{slider}->set_value (@_) }
2437 3233
2438############################################################################# 3234#############################################################################
2439 3235
2440package CFClient::UI::TextView; 3236package DC::UI::TextScroller;
2441 3237
2442our @ISA = CFClient::UI::HBox::; 3238our @ISA = DC::UI::HBox::;
2443 3239
2444use CFClient::OpenGL; 3240use DC::OpenGL;
2445 3241
2446sub new { 3242sub new {
2447 my $class = shift; 3243 my $class = shift;
2448 3244
2449 my $self = $class->SUPER::new ( 3245 my $self = $class->SUPER::new (
2450 fontsize => 1, 3246 fontsize => 1,
2451 can_events => 0, 3247 can_events => 1,
3248 indent => 0,
2452 #font => default_font 3249 #font => default_font
2453 @_, 3250 @_,
2454 3251
2455 layout => (new CFClient::Layout 1), 3252 layout => (new DC::Layout),
2456 par => [], 3253 par => [],
3254 max_par => 0,
2457 height => 0, 3255 height => 0,
2458 children => [ 3256 children => [
2459 (new CFClient::UI::Empty expand => 1), 3257 (new DC::UI::Empty expand => 1),
2460 (new CFClient::UI::Slider vertical => 1), 3258 (new DC::UI::Slider vertical => 1),
2461 ], 3259 ],
2462 ); 3260 );
2463 3261
2464 $self->{children}[1]->connect (changed => sub { $self->update }); 3262 $self->{children}[1]->connect (changed => sub { $self->update });
2465 3263
… …
2471 3269
2472 $self->{fontsize} = $fontsize; 3270 $self->{fontsize} = $fontsize;
2473 $self->reflow; 3271 $self->reflow;
2474} 3272}
2475 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
2476sub size_allocate { 3283sub invoke_size_allocate {
2477 my ($self, $w, $h) = @_; 3284 my ($self, $w, $h) = @_;
2478 3285
2479 $self->SUPER::size_allocate ($w, $h); 3286 my ($empty, $slider, @other) = @{ $self->{children} };
3287 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2480 3288
2481 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3289 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3290 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $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});
2484 3293
2485 $self->reflow; 3294 $self->reflow;
2486}
2487 3295
2488sub text_size { 3296 local $self->{children} = [$empty, $slider];
3297 $self->SUPER::invoke_size_allocate ($w, $h)
3298}
3299
3300sub invoke_mouse_wheel {
2489 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) = @_;
2490 3312
2491 my $layout = $self->{layout}; 3313 my $layout = $self->{layout};
2492 3314
3315 $layout->set_font ($self->{font}) if $self->{font};
3316 $layout->set_foreground (@{$para->{fg}});
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3317 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $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});
2495 $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}}
2496 3326 );
3327
2497 $layout->size 3328 $layout
2498} 3329}
2499 3330
2500sub reflow { 3331sub reflow {
2501 my ($self) = @_; 3332 my ($self) = @_;
2502 3333
… …
2509 3340
2510 # todo: base offset on lines or so, not on pixels 3341 # todo: base offset on lines or so, not on pixels
2511 $self->{children}[1]->set_value ($offset); 3342 $self->{children}[1]->set_value ($offset);
2512} 3343}
2513 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
2514sub clear { 3360sub clear {
2515 my ($self) = @_; 3361 my ($self) = @_;
3362
3363 my (undef, undef, @other) = @{ $self->{children} };
3364 $self->remove ($_) for @other;
2516 3365
2517 $self->{par} = []; 3366 $self->{par} = [];
2518 $self->{height} = 0; 3367 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3368 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520} 3369}
2521 3370
2522sub add_paragraph { 3371sub add_paragraph {
2523 my ($self, $color, $text, $indent) = @_; 3372 my $self = shift;
2524 3373
2525 for my $line (split /\n/, $text) { 3374 for my $para (@_) {
2526 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
2527 $self->{height} += $h; 3426 $self->{height} = $height;
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3427 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2529 }
2530 3428
2531 $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 }
2532} 3435}
2533 3436
2534sub update { 3437sub update {
2535 my ($self) = @_; 3438 my ($self) = @_;
2536 3439
… …
2538 3441
2539 return unless $self->{h} > 0; 3442 return unless $self->{h} > 0;
2540 3443
2541 delete $self->{texture}; 3444 delete $self->{texture};
2542 3445
2543 $ROOT->on_post_alloc ($self, sub { 3446 $ROOT->on_post_alloc ($self => sub {
3447 $self->force_uptodate;
3448
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3449 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545 3450
2546 if (delete $self->{need_reflow}) {
2547 my $height = 0;
2548
2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2553 for (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2555 $layout->set_width ($W - $_->[3]);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3];
2559 $_->[1] = $h;
2560 }
2561
2562 $height += $_->[1];
2563 }
2564
2565 $self->{height} = $height;
2566
2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2568
2569 delete $self->{texture};
2570 }
2571
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3451 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2573 glClearColor 0.5, 0.5, 0.5, 0; 3452 glClearColor 0, 0, 0, 0;
2574 glClear GL_COLOR_BUFFER_BIT; 3453 glClear GL_COLOR_BUFFER_BIT;
2575 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;
2576 my $top = int $self->{children}[1]{range}[0]; 3463 my $top = int $self->{children}[1]{range}[0];
2577 3464
2578 my $y0 = $top; 3465 my $y0 = $top;
2579 my $y1 = $top + $H; 3466 my $y1 = $top + $H;
2580 3467
2581 my $y = 0;
2582
2583 my $layout = $self->{layout};
2584
2585 $layout->set_font ($self->{font}) if $self->{font};
2586
2587 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off
2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2590
2591 for my $par (@{$self->{par}}) { 3468 for my $para (@{$self->{par}}) {
2592 my $h = $par->[1]; 3469 my $h = $para->{h};
3470 my $y = $para->{y};
2593 3471
2594 if ($y0 < $y + $h && $y < $y1) { 3472 if ($y0 < $y + $h && $y < $y1) {
2595 $layout->set_foreground (@{ $par->[2] }); 3473 my $layout = $self->get_layout ($para);
2596 $layout->set_width ($W - $par->[3]);
2597 $layout->set_markup ($par->[4]);
2598 3474
2599 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3475 $layout->render ($para->{indent}, $y - $y0);
3476 $layout->draw;
2600 3477
2601 glRasterPos $par->[3], $y - $y0; 3478 if (my @w = @{ $para->{widget} }) {
2602 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 }
2603 } 3490 }
2604 3491
2605 $y += $h; 3492 $paridx++;
3493 $top_paragraph ||= $paridx if $y >= $top;
2606 } 3494 }
2607 3495
2608 glDisable GL_BLEND; 3496 $self->{top_paragraph} = $top_paragraph;
2609 }; 3497 };
2610 }); 3498 });
2611} 3499}
2612 3500
3501sub reconfigure {
3502 my ($self) = @_;
3503
3504 $self->SUPER::reconfigure;
3505
3506 $_->{w} = 1e10 for @{ $self->{par} };
3507 $self->reflow;
3508}
3509
2613sub _draw { 3510sub _draw {
2614 my ($self) = @_; 3511 my ($self) = @_;
2615 3512
2616 glEnable GL_TEXTURE_2D; 3513 glEnable GL_TEXTURE_2D;
2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3514 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2618 glColor 1, 1, 1, 1; 3515 glColor 0, 0, 0, 1;
2619 $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});
2620 glDisable GL_TEXTURE_2D; 3517 glDisable GL_TEXTURE_2D;
2621 3518
2622 $self->{children}[1]->draw; 3519 $self->{children}[1]->draw;
2623
2624} 3520}
2625 3521
2626############################################################################# 3522#############################################################################
2627 3523
2628package CFClient::UI::Animator; 3524package DC::UI::Animator;
2629 3525
2630use CFClient::OpenGL; 3526use DC::OpenGL;
2631 3527
2632our @ISA = CFClient::UI::Bin::; 3528our @ISA = DC::UI::Bin::;
2633 3529
2634sub moveto { 3530sub moveto {
2635 my ($self, $x, $y) = @_; 3531 my ($self, $x, $y) = @_;
2636 3532
2637 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3533 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2665 glPopMatrix; 3561 glPopMatrix;
2666} 3562}
2667 3563
2668############################################################################# 3564#############################################################################
2669 3565
2670package CFClient::UI::Flopper; 3566package DC::UI::Flopper;
2671 3567
2672our @ISA = CFClient::UI::Button::; 3568our @ISA = DC::UI::Button::;
2673 3569
2674sub new { 3570sub new {
2675 my $class = shift; 3571 my $class = shift;
2676 3572
2677 my $self = $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
… …
2689 $self->{other}->toggle_visibility; 3585 $self->{other}->toggle_visibility;
2690} 3586}
2691 3587
2692############################################################################# 3588#############################################################################
2693 3589
2694package CFClient::UI::Tooltip; 3590package DC::UI::Tooltip;
2695 3591
2696our @ISA = CFClient::UI::Bin::; 3592our @ISA = DC::UI::Bin::;
2697 3593
2698use CFClient::OpenGL; 3594use DC::OpenGL;
2699 3595
2700sub new { 3596sub new {
2701 my $class = shift; 3597 my $class = shift;
2702 3598
2703 $class->SUPER::new ( 3599 $class->SUPER::new (
… …
2707} 3603}
2708 3604
2709sub set_tooltip_from { 3605sub set_tooltip_from {
2710 my ($self, $widget) = @_; 3606 my ($self, $widget) = @_;
2711 3607
2712 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 =~ /^#(.*)$/;
2713 3613
2714 if ($ENV{CFPLUS_DEBUG} & 2) { 3614 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n" 3615 $tip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3616 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n" 3617 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}"; 3618 . "visible $widget->{visible}";
2719 } 3619 }
2720 3620
3621 $tip =~ s/^\n+//;
3622 $tip =~ s/\n+$//;
3623
2721 $self->add (new CFClient::UI::Label 3624 $self->add (new DC::UI::Label
2722 markup => $tooltip, 3625 markup => $tip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3627 align => 0,
2724 fontsize => 0.8, 3628 fontsize => 0.8,
2725 fg => [0, 0, 0, 1], 3629 style => 1, # FLAG_INVERSE
2726 ellipsise => 0, 3630 ellipsise => 0,
2727 font => ($widget->{tooltip_font} || $::FONT_PROP), 3631 font => ($widget->{tooltip_font} || $::FONT_PROP),
2728 ); 3632 );
2729} 3633}
2730 3634
… …
2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3638 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735 3639
2736 ($w + 4, $h + 4) 3640 ($w + 4, $h + 4)
2737} 3641}
2738 3642
2739sub size_allocate { 3643sub invoke_size_allocate {
2740 my ($self, $w, $h) = @_; 3644 my ($self, $w, $h) = @_;
2741 3645
2742 $self->SUPER::size_allocate ($w - 4, $h - 4); 3646 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2743} 3647}
2744 3648
2745sub visibility_change { 3649sub invoke_visibility_change {
2746 my ($self, $visible) = @_; 3650 my ($self, $visible) = @_;
2747 3651
2748 return unless $visible; 3652 return unless $visible;
2749 3653
2750 $self->{root}->on_post_alloc ("move_$self" => sub { 3654 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner} 3655 my $widget = $self->{owner}
2752 or return; 3656 or return;
2753 3657
3658 if ($widget->{visible}) {
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755 3660
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3661 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH; 3662 if $x + $self->{w} > $self->{root}{w};
2758 3663
2759 $self->move_abs ($x, $y); 3664 $self->move_abs ($x, $y);
3665 } else {
3666 $self->hide;
3667 }
2760 }); 3668 });
2761} 3669}
2762 3670
2763sub _draw { 3671sub _draw {
2764 my ($self) = @_; 3672 my ($self) = @_;
2765 3673
2766 glTranslate 0.375, 0.375;
2767
2768 my ($w, $h) = @$self{qw(w h)}; 3674 my ($w, $h) = @$self{qw(w h)};
2769 3675
2770 glColor 1, 0.8, 0.4; 3676 glColor 1, 0.8, 0.4;
2771 glBegin GL_QUADS; 3677 glRect 0, 0, $w, $h;
2772 glVertex 0 , 0;
2773 glVertex 0 , $h;
2774 glVertex $w, $h;
2775 glVertex $w, 0;
2776 glEnd;
2777 3678
2778 glColor 0, 0, 0; 3679 glColor 0, 0, 0;
2779 glBegin GL_LINE_LOOP; 3680 glRect_lineloop .5, .5, $w + .5, $h + .5;
2780 glVertex 0 , 0;
2781 glVertex 0 , $h;
2782 glVertex $w, $h;
2783 glVertex $w, 0;
2784 glEnd;
2785 3681
2786 glTranslate 2 - 0.375, 2 - 0.375; 3682 glTranslate 2, 2;
2787 3683
2788 $self->SUPER::_draw; 3684 $self->SUPER::_draw;
2789} 3685}
2790 3686
2791############################################################################# 3687#############################################################################
2792 3688
2793package CFClient::UI::Face; 3689package DC::UI::Face;
2794 3690
2795our @ISA = CFClient::UI::Base::; 3691our @ISA = DC::UI::DrawBG::;
2796 3692
2797use CFClient::OpenGL; 3693use DC::OpenGL;
2798 3694
2799sub new { 3695sub new {
2800 my $class = shift; 3696 my $class = shift;
2801 3697
2802 my $self = $class->SUPER::new ( 3698 my $self = $class->SUPER::new (
3699 size_w => 32,
3700 size_h => 8,
2803 aspect => 1, 3701 aspect => 1,
2804 can_events => 0, 3702 can_events => 0,
2805 @_, 3703 @_,
2806 ); 3704 );
2807 3705
2808 if ($self->{anim} && $self->{animspeed}) { 3706 if ($self->{anim} && $self->{animspeed}) {
2809 Scalar::Util::weaken (my $widget = $self); 3707 DC::weaken (my $widget = $self);
2810 3708
2811 $self->{timer} = Event->timer ( 3709 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
2812 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3710 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
2813 hard => 1, 3711 return unless $::CONN;
2814 interval => $self->{animspeed}, 3712
2815 cb => sub { 3713 my $w = $widget
3714 or return;
3715
2816 ++$widget->{frame}; 3716 ++$w->{frame};
3717 $w->update_face;
3718
3719 # somehow, $widget can go away
2817 $widget->update; 3720 $w->update;
2818 }, 3721 $w->update_timer;
2819 ); 3722 };
3723
3724 $self->update_face;
3725 $self->update_timer;
2820 } 3726 }
2821 3727
2822 $self 3728 $self
2823} 3729}
2824 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
2825sub size_request { 3762sub size_request {
2826 (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)
2827} 3780}
2828 3781
2829sub update { 3782sub update {
2830 my ($self) = @_; 3783 my ($self) = @_;
2831 3784
2832 return unless $self->{visible}; 3785 return unless $self->{visible};
2833 3786
2834 $self->SUPER::update; 3787 $self->SUPER::update;
2835} 3788}
2836 3789
3790sub invoke_visibility_change {
3791 my ($self) = @_;
3792
3793 $self->update_timer;
3794
3795 0
3796}
3797
2837sub _draw { 3798sub _draw {
2838 my ($self) = @_; 3799 my ($self) = @_;
2839 3800
2840 return unless $::CONN; 3801 $self->SUPER::_draw;
2841 3802
2842 my $face; 3803 if (my $tex = $self->{tex}) {
2843
2844 if ($self->{frame}) {
2845 my $anim = $::CONN->{anim}[$self->{anim}];
2846
2847 $face = $anim->[ $self->{frame} % @$anim ]
2848 if $anim && @$anim;
2849 }
2850
2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2852
2853 if ($tex) {
2854 glEnable GL_TEXTURE_2D; 3804 glEnable GL_TEXTURE_2D;
2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3805 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2856 glColor 1, 1, 1, 1; 3806 glColor 0, 0, 0, 1;
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3807 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 3808 glDisable GL_TEXTURE_2D;
2859 } 3809 }
2860} 3810}
2861 3811
2862sub DESTROY { 3812sub destroy {
2863 my ($self) = @_; 3813 my ($self) = @_;
2864 3814
2865 $self->{timer}->cancel 3815 (delete $self->{timer})->cancel
2866 if $self->{timer}; 3816 if $self->{timer};
2867 3817
2868 $self->SUPER::DESTROY; 3818 $self->SUPER::destroy;
2869} 3819}
2870 3820
2871############################################################################# 3821#############################################################################
2872 3822
2873package CFClient::UI::Buttonbar; 3823package DC::UI::Buttonbar;
2874 3824
2875our @ISA = CFClient::UI::HBox::; 3825our @ISA = DC::UI::HBox::;
2876 3826
2877# TODO: should actualyl wrap buttons and other goodies. 3827# TODO: should actually wrap buttons and other goodies.
2878 3828
2879############################################################################# 3829#############################################################################
2880 3830
2881package CFClient::UI::Menu; 3831package DC::UI::Menu;
2882 3832
2883our @ISA = CFClient::UI::FancyFrame::; 3833our @ISA = DC::UI::Toplevel::;
2884 3834
2885use CFClient::OpenGL; 3835use DC::OpenGL;
2886 3836
2887sub new { 3837sub new {
2888 my $class = shift; 3838 my $class = shift;
2889 3839
2890 my $self = $class->SUPER::new ( 3840 my $self = $class->SUPER::new (
2891 items => [], 3841 items => [],
2892 z => 100, 3842 z => 100,
2893 @_, 3843 @_,
2894 ); 3844 );
2895 3845
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3846 $self->add ($self->{vbox} = new DC::UI::VBox);
2897 3847
2898 for my $item (@{ $self->{items} }) { 3848 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item; 3849 my ($widget, $cb, $tooltip) = @$item;
2900 3850
2901 # handle various types of items, only text for now 3851 # handle various types of items, only text for now
2902 if (!ref $widget) { 3852 if (!ref $widget) {
3853 if ($widget =~ /\t/) {
3854 my ($left, $right) = split /\t/, $widget, 2;
3855
2903 $widget = new CFClient::UI::Label 3856 $widget = new DC::UI::HBox
2904 can_hover => 1, 3857 can_hover => 1,
2905 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,
2906 text => $widget; 3871 markup => $widget,
3872 tooltip => $tooltip;
3873 }
2907 } 3874 }
2908 3875
2909 $self->{item}{$widget} = $item; 3876 $self->{item}{$widget} = $item;
2910 3877
2911 $self->{vbox}->add ($widget); 3878 $self->{vbox}->add ($widget);
… …
2916 3883
2917# 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)
2918sub popup { 3885sub popup {
2919 my ($self, $ev) = @_; 3886 my ($self, $ev) = @_;
2920 3887
2921 $self->_emit ("popdown"); 3888 $self->emit ("popdown");
2922 3889
2923 # maybe save $GRAB? must be careful about events... 3890 # maybe save $GRAB? must be careful about events...
2924 $GRAB = $self; 3891 $GRAB = $self;
2925 $self->{button} = $ev->{button}; 3892 $self->{button} = $ev->{button};
2926 3893
2927 $self->show; 3894 $self->show;
2928 $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);
2929} 3896}
2930 3897
2931sub mouse_motion { 3898sub invoke_mouse_motion {
2932 my ($self, $ev, $x, $y) = @_; 3899 my ($self, $ev, $x, $y) = @_;
2933 3900
2934 # TODO: should use vbox->find_widget or so 3901 # TODO: should use vbox->find_widget or so
2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3902 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936 $self->{hover} = $self->{item}{$HOVER}; 3903 $self->{hover} = $self->{item}{$HOVER};
2937 3904
2938 0 3905 0
2939} 3906}
2940 3907
2941sub button_up { 3908sub invoke_button_up {
2942 my ($self, $ev, $x, $y) = @_; 3909 my ($self, $ev, $x, $y) = @_;
2943 3910
2944 if ($ev->{button} == $self->{button}) { 3911 if ($ev->{button} == $self->{button}) {
2945 undef $GRAB; 3912 undef $GRAB;
2946 $self->hide; 3913 $self->hide;
2947 3914
2948 $self->_emit ("popdown"); 3915 $self->emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover}; 3916 $self->{hover}[1]->() if $self->{hover};
2950 } else { 3917 } else {
2951 return 0 3918 return 0
2952 } 3919 }
2953 3920
2954 1 3921 1
2955} 3922}
2956 3923
2957############################################################################# 3924#############################################################################
2958 3925
2959package CFClient::UI::Multiplexer; 3926package DC::UI::Multiplexer;
2960 3927
2961our @ISA = CFClient::UI::Container::; 3928our @ISA = DC::UI::Container::;
2962 3929
2963sub new { 3930sub new {
2964 my $class = shift; 3931 my $class = shift;
2965 3932
2966 my $self = $class->SUPER::new ( 3933 my $self = $class->SUPER::new (
… …
2980 3947
2981 $self->{current} = $self->{children}[0] 3948 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} }; 3949 if @{ $self->{children} };
2983} 3950}
2984 3951
3952sub get_current_page {
3953 my ($self) = @_;
3954
3955 $self->{current}
3956}
3957
2985sub set_current_page { 3958sub set_current_page {
2986 my ($self, $page_or_widget) = @_; 3959 my ($self, $page_or_widget) = @_;
2987 3960
2988 my $widget = ref $page_or_widget 3961 my $widget = ref $page_or_widget
2989 ? $page_or_widget 3962 ? $page_or_widget
2990 : $self->{children}[$page_or_widget]; 3963 : $self->{children}[$page_or_widget];
2991 3964
2992 $self->{current} = $widget; 3965 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3966 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994 3967
2995 $self->_emit (page_changed => $self->{current}); 3968 $self->emit (page_changed => $self->{current});
2996 3969
2997 $self->realloc; 3970 $self->realloc;
2998} 3971}
2999 3972
3000sub visible_children { 3973sub visible_children {
… …
3005 my ($self) = @_; 3978 my ($self) = @_;
3006 3979
3007 $self->{current}->size_request 3980 $self->{current}->size_request
3008} 3981}
3009 3982
3010sub size_allocate { 3983sub invoke_size_allocate {
3011 my ($self, $w, $h) = @_; 3984 my ($self, $w, $h) = @_;
3012 3985
3013 $self->{current}->configure (0, 0, $w, $h); 3986 $self->{current}->configure (0, 0, $w, $h);
3987
3988 1
3014} 3989}
3015 3990
3016sub _draw { 3991sub _draw {
3017 my ($self) = @_; 3992 my ($self) = @_;
3018 3993
3019 $self->{current}->draw; 3994 $self->{current}->draw;
3020} 3995}
3021 3996
3022############################################################################# 3997#############################################################################
3023 3998
3024package CFClient::UI::Notebook; 3999package DC::UI::Notebook;
3025 4000
4001use DC::OpenGL;
4002
3026our @ISA = CFClient::UI::VBox::; 4003our @ISA = DC::UI::VBox::;
3027 4004
3028sub new { 4005sub new {
3029 my $class = shift; 4006 my $class = shift;
3030 4007
3031 my $self = $class->SUPER::new ( 4008 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar), 4009 buttonbar => (new DC::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 4010 multiplexer => (new DC::UI::Multiplexer expand => 1),
4011 active_outline => [.7, .7, 0.2],
3034 # filter => # will be put between multiplexer and $self 4012 # filter => # will be put between multiplexer and $self
3035 @_, 4013 @_,
3036 ); 4014 );
3037 4015
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4016 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4017 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040 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
3041 $self 4053 $self
3042} 4054}
3043 4055
3044sub 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 {
3045 my ($self, $title, $widget, $tooltip) = @_; 4086 my ($self, $title, $widget, $tooltip) = @_;
3046 4087
3047 Scalar::Util::weaken $self; 4088 $title = [$title, $tooltip] unless ref $title;
4089 $widget->{c_tab} = $title;
3048 4090
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget); 4091 $self->add ($widget);
4092}
4093
4094sub get_current_page {
4095 my ($self) = @_;
4096
4097 $self->{multiplexer}->get_current_page
3056} 4098}
3057 4099
3058sub set_current_page { 4100sub set_current_page {
3059 my ($self, $page) = @_; 4101 my ($self, $page) = @_;
3060 4102
3061 $self->{multiplexer}->set_current_page ($page); 4103 $self->{multiplexer}->set_current_page ($page);
3062 $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 }
3063} 4125}
3064 4126
3065############################################################################# 4127#############################################################################
3066 4128
3067package CFClient::UI::Statusbox; 4129package DC::UI::Selector;
3068 4130
4131use utf8;
4132
3069our @ISA = CFClient::UI::VBox::; 4133our @ISA = DC::UI::Button::;
3070 4134
3071sub new { 4135sub new {
3072 my $class = shift; 4136 my $class = shift;
3073 4137
3074 $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 (
3075 fontsize => 0.8, 4201 fontsize => 0.8,
3076 @_, 4202 @_,
3077 ) 4203 );
4204
4205 DC::weaken (my $this = $self);
4206
4207 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
4208
4209 $self
3078} 4210}
3079 4211
3080sub reorder { 4212sub reorder {
3081 my ($self) = @_; 4213 my ($self) = @_;
3082 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} };
3083 4220
3084 while (my ($k, $v) = each %{ $self->{item} }) { 4221 while (my ($k, $v) = each %{ $self->{item} }) {
3085 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4222 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3086 } 4223 }
4224
4225 $self->{timer}->set (1, 1);
3087 4226
3088 my @widgets; 4227 my @widgets;
3089 4228
3090 my @items = sort { 4229 my @items = sort {
3091 $a->{pri} <=> $b->{pri} 4230 $a->{pri} <=> $b->{pri}
… …
3094 4233
3095 my $count = 10 + 1; 4234 my $count = 10 + 1;
3096 for my $item (@items) { 4235 for my $item (@items) {
3097 last unless --$count; 4236 last unless --$count;
3098 4237
3099 push @widgets, $item->{label} ||= do { 4238 my $label = $item->{label} ||= do {
3100 # TODO: doesn't handle markup well (read as: at all) 4239 # TODO: doesn't handle markup well (read as: at all)
3101 my $short = $item->{count} > 1 4240 my $short = $item->{count} > 1
3102 ? "<b>$item->{count} ×</b> $item->{text}" 4241 ? "<b>$item->{count} ×</b> $item->{text}"
3103 : $item->{text}; 4242 : $item->{text};
3104 4243
3105 for ($short) { 4244 for ($short) {
3106 s/^\s+//; 4245 s/^\s+//;
3107 s/\s+/ /g; 4246 s/\s+/ /g;
3108 } 4247 }
3109 4248
3110 new CFClient::UI::Label 4249 new DC::UI::Label
3111 markup => $short, 4250 markup => $short,
3112 tooltip => $item->{tooltip}, 4251 tooltip => $item->{tooltip},
3113 tooltip_font => $::FONT_PROP, 4252 tooltip_font => $::FONT_PROP,
3114 tooltip_width => 0.67, 4253 tooltip_width => 0.67,
3115 fontsize => $item->{fontsize} || $self->{fontsize}, 4254 fontsize => $item->{fontsize} || $self->{fontsize},
3116 max_w => $::WIDTH * 0.44, 4255 max_w => $::WIDTH * 0.44,
4256 align => 0,
3117 fg => $item->{fg}, 4257 fg => [@{ $item->{fg} }],
3118 can_events => 1, 4258 can_events => 1,
3119 can_hover => 1 4259 can_hover => 1
3120 }; 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;
3121 } 4273 }
3122 4274
3123 $self->clear; 4275 $self->clear;
3124 $self->SUPER::add (reverse @widgets); 4276 $self->SUPER::add (reverse @widgets);
3125} 4277}
… …
3130 $text =~ s/^\s+//; 4282 $text =~ s/^\s+//;
3131 $text =~ s/\s+$//; 4283 $text =~ s/\s+$//;
3132 4284
3133 return unless $text; 4285 return unless $text;
3134 4286
3135 my $timeout = time + ((delete $arg{timeout}) || 60); 4287 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3136 4288
3137 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4289 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3138 4290
3139 if (my $item = $self->{item}{$group}) { 4291 if (my $item = $self->{item}{$group}) {
3140 if ($item->{text} eq $text) { 4292 if ($item->{text} eq $text) {
3141 $item->{count}++; 4293 $item->{count}++;
3142 } else { 4294 } else {
3143 $item->{count} = 1; 4295 $item->{count} = 1;
3144 $item->{text} = $item->{tooltip} = $text; 4296 $item->{text} = $item->{tooltip} = $text;
3145 } 4297 }
3146 $item->{id} = ++$self->{id}; 4298 $item->{id} += 0.2;#d#
3147 $item->{timeout} = $timeout; 4299 $item->{timeout} = $timeout;
3148 delete $item->{label}; 4300 delete $item->{label};
3149 } else { 4301 } else {
3150 $self->{item}{$group} = { 4302 $self->{item}{$group} = {
3151 id => ++$self->{id}, 4303 id => ++$self->{id},
… …
3157 count => 1, 4309 count => 1,
3158 %arg, 4310 %arg,
3159 }; 4311 };
3160 } 4312 }
3161 4313
4314 $ROOT->on_refresh (reorder => sub {
3162 $self->reorder; 4315 $self->reorder;
4316 });
3163} 4317}
3164 4318
3165sub reconfigure { 4319sub reconfigure {
3166 my ($self) = @_; 4320 my ($self) = @_;
3167 4321
… …
3170 4324
3171 $self->reorder; 4325 $self->reorder;
3172 $self->SUPER::reconfigure; 4326 $self->SUPER::reconfigure;
3173} 4327}
3174 4328
4329sub destroy {
4330 my ($self) = @_;
4331
4332 $self->{timer}->cancel;
4333
4334 $self->SUPER::destroy;
4335}
4336
3175############################################################################# 4337#############################################################################
3176 4338
3177package CFClient::UI::Inventory;
3178
3179our @ISA = CFClient::UI::ScrolledWindow::;
3180
3181sub new {
3182 my $class = shift;
3183
3184 my $self = $class->SUPER::new (
3185 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3186 @_,
3187 );
3188
3189 $self
3190}
3191
3192sub set_items {
3193 my ($self, $items) = @_;
3194
3195 $self->{child}->clear;
3196 return unless $items;
3197
3198 my @items = sort {
3199 ($a->{type} <=> $b->{type})
3200 or ($a->{name} cmp $b->{name})
3201 } @$items;
3202
3203 $self->{real_items} = \@items;
3204
3205 my $row = 0;
3206 for my $item (@items) {
3207 CFClient::Item::update_widgets $item;
3208
3209 $self->{child}->add (0, $row, $item->{face_widget});
3210 $self->{child}->add (1, $row, $item->{desc_widget});
3211 $self->{child}->add (2, $row, $item->{weight_widget});
3212
3213 $row++;
3214 }
3215}
3216
3217#############################################################################
3218
3219package CFClient::UI::BindEditor;
3220
3221our @ISA = CFClient::UI::FancyFrame::;
3222
3223sub new {
3224 my $class = shift;
3225
3226 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3227
3228 $self->add (my $vb = new CFClient::UI::VBox);
3229
3230
3231 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3232 text => "start recording",
3233 tooltip => "Start/Stops recording of actions."
3234 ."All subsequent actions after the recording started will be captured."
3235 ."The actions are displayed after the record was stopped."
3236 ."To bind the action you have to click on the 'Bind' button",
3237 on_activate => sub {
3238 unless ($self->{recording}) {
3239 $self->start;
3240 } else {
3241 $self->stop;
3242 }
3243 });
3244
3245 $vb->add (new CFClient::UI::Label text => "Actions:");
3246 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3247
3248 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3251 $hb->add (new CFClient::UI::Button
3252 text => "bind",
3253 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3254 on_activate => sub {
3255 $self->ask_for_bind;
3256 });
3257
3258 $vb->add (my $hb = new CFClient::UI::HBox);
3259 $hb->add (new CFClient::UI::Button
3260 text => "ok",
3261 expand => 1,
3262 tooltip => "This closes the binding editor and saves the binding",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->commit;
3266 });
3267
3268 $hb->add (new CFClient::UI::Button
3269 text => "cancel",
3270 expand => 1,
3271 tooltip => "This closes the binding editor without saving",
3272 on_activate => sub {
3273 $self->hide;
3274 $self->{binding_cancel}->()
3275 if $self->{binding_cancel};
3276 });
3277
3278 $self->update_binding_widgets;
3279
3280 $self
3281}
3282
3283sub commit {
3284 my ($self) = @_;
3285 my ($mod, $sym, $cmds) = $self->get_binding;
3286 if ($sym != 0 && @$cmds > 0) {
3287 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3288 ."'. Don't forget 'Save Config'!");
3289 $self->{binding_change}->($mod, $sym, $cmds)
3290 if $self->{binding_change};
3291 } else {
3292 $::STATUSBOX->add ("No action bound, no key or action specified!");
3293 $self->{binding_cancel}->()
3294 if $self->{binding_cancel};
3295 }
3296}
3297
3298sub start {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("stop recording");
3302 $self->{recording} = 1;
3303 $self->clear_command_list;
3304 $::CONN->start_record if $::CONN;
3305}
3306
3307sub stop {
3308 my ($self) = @_;
3309
3310 $self->{rec_btn}->set_text ("start recording");
3311 $self->{recording} = 0;
3312
3313 my $rec;
3314 $rec = $::CONN->stop_record if $::CONN;
3315 return unless ref $rec eq 'ARRAY';
3316 $self->set_command_list ($rec);
3317}
3318
3319
3320sub ask_for_bind_and_commit {
3321 my ($self) = @_;
3322 $self->ask_for_bind (1);
3323}
3324
3325sub ask_for_bind {
3326 my ($self, $commit) = @_;
3327
3328 CFClient::Binder::open_binding_dialog (sub {
3329 my ($mod, $sym) = @_;
3330 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3331 $self->update_binding_widgets;
3332 $self->commit if $commit;
3333 });
3334}
3335
3336# $mod and $sym are the modifiers and key symbol
3337# $cmds is a array ref of strings (the commands)
3338# $cb is the callback that is executed on OK
3339# $ccb is the callback that is executed on CANCEL and
3340# when the binding was unsuccessful on OK
3341sub set_binding {
3342 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3343
3344 $self->clear_command_list;
3345 $self->{recording} = 0;
3346 $self->{rec_btn}->set_text ("start recording");
3347
3348 $self->{binding} = [$mod, $sym];
3349 $self->{commands} = $cmds;
3350
3351 $self->{binding_change} = $cb;
3352 $self->{binding_cancel} = $ccb;
3353
3354 $self->update_binding_widgets;
3355}
3356
3357# this is a shortcut method that asks for a binding
3358# and then just binds it.
3359sub do_quick_binding {
3360 my ($self, $cmds) = @_;
3361 $self->set_binding (undef, undef, $cmds, sub {
3362 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3363 });
3364 $self->ask_for_bind (1);
3365}
3366
3367sub update_binding_widgets {
3368 my ($self) = @_;
3369 my ($mod, $sym, $cmds) = $self->get_binding;
3370 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3371 $self->set_command_list ($cmds);
3372}
3373
3374sub get_binding {
3375 my ($self) = @_;
3376 return (
3377 $self->{binding}->[0],
3378 $self->{binding}->[1],
3379 [ grep { defined $_ } @{$self->{commands}} ]
3380 );
3381}
3382
3383sub clear_command_list {
3384 my ($self) = @_;
3385 $self->{cmdbox}->clear ();
3386}
3387
3388sub set_command_list {
3389 my ($self, $cmds) = @_;
3390
3391 $self->{cmdbox}->clear ();
3392 $self->{commands} = $cmds;
3393
3394 my $idx = 0;
3395
3396 for (@$cmds) {
3397 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3398
3399 my $i = $idx;
3400 $hb->add (new CFClient::UI::Label text => $_);
3401 $hb->add (new CFClient::UI::Button
3402 text => "delete",
3403 tooltip => "Deletes the action from the record",
3404 on_activate => sub {
3405 $self->{cmdbox}->remove ($hb);
3406 $cmds->[$i] = undef;
3407 });
3408
3409
3410 $idx++
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::SpellList;
3417
3418our @ISA = CFClient::UI::Table::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (
3424 binding => [],
3425 commands => [],
3426 @_,
3427 )
3428}
3429
3430# XXX: Do sorting? Argl...
3431sub add_spell {
3432 my ($self, $spell) = @_;
3433 $self->{spells}->{$spell->{name}} = $spell;
3434
3435 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3436 face => $spell->{face},
3437 can_hover => 1,
3438 can_events => 1,
3439 tooltip => $spell->{message});
3440
3441 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => $spell->{name},
3443 can_hover => 1,
3444 can_events => 1,
3445 tooltip => $spell->{message},
3446 expand => 1);
3447
3448 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3450 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3451 expand => 1);
3452
3453 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3454 text => "bind to key",
3455 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3456}
3457
3458sub rebuild_spell_list {
3459 my ($self) = @_;
3460 $self->{tbl_idx} = 0;
3461 $self->add_spell ($_) for values %{$self->{spells}};
3462}
3463
3464sub remove_spell {
3465 my ($self, $spell) = @_;
3466 delete $self->{spells}->{$spell->{name}};
3467 $self->rebuild_spell_list;
3468}
3469
3470#############################################################################
3471
3472package CFClient::UI::Root; 4339package DC::UI::Root;
3473 4340
3474our @ISA = CFClient::UI::Container::; 4341our @ISA = DC::UI::Container::;
3475 4342
4343use List::Util qw(min max);
4344
3476use CFClient::OpenGL; 4345use DC::OpenGL;
3477 4346
3478sub new { 4347sub new {
3479 my $class = shift; 4348 my $class = shift;
3480 4349
3481 my $self = $class->SUPER::new ( 4350 my $self = $class->SUPER::new (
3482 visible => 1, 4351 visible => 1,
3483 @_, 4352 @_,
3484 ); 4353 );
3485 4354
3486 Scalar::Util::weaken ($self->{root} = $self); 4355 DC::weaken ($self->{root} = $self);
3487 4356
3488 $self 4357 $self
3489} 4358}
3490 4359
3491sub size_request { 4360sub size_request {
… …
3506 $coord = $max - $size if $coord > $max - $size; 4375 $coord = $max - $size if $coord > $max - $size;
3507 4376
3508 int $coord + 0.5 4377 int $coord + 0.5
3509} 4378}
3510 4379
3511sub size_allocate { 4380sub invoke_size_allocate {
3512 my ($self, $w, $h) = @_; 4381 my ($self, $w, $h) = @_;
3513 4382
3514 for my $child ($self->children) { 4383 for my $child ($self->children) {
3515 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)};
3516 4385
… …
3520 $X = _to_pixel $X, $W, $self->{w}; 4389 $X = _to_pixel $X, $W, $self->{w};
3521 $Y = _to_pixel $Y, $H, $self->{h}; 4390 $Y = _to_pixel $Y, $H, $self->{h};
3522 4391
3523 $child->configure ($X, $Y, $W, $H); 4392 $child->configure ($X, $Y, $W, $H);
3524 } 4393 }
4394
4395 1
3525} 4396}
3526 4397
3527sub coord2local { 4398sub coord2local {
3528 my ($self, $x, $y) = @_; 4399 my ($self, $x, $y) = @_;
3529 4400
… …
3537} 4408}
3538 4409
3539sub update { 4410sub update {
3540 my ($self) = @_; 4411 my ($self) = @_;
3541 4412
3542 $::WANT_REFRESH++; 4413 $::WANT_REFRESH = 1;
3543} 4414}
3544 4415
3545sub add { 4416sub add {
3546 my ($self, @children) = @_; 4417 my ($self, @children) = @_;
3547 4418
… …
3584 while ($self->{refresh_hook}) { 4455 while ($self->{refresh_hook}) {
3585 $_->() 4456 $_->()
3586 for values %{delete $self->{refresh_hook}}; 4457 for values %{delete $self->{refresh_hook}};
3587 } 4458 }
3588 4459
3589 if ($self->{realloc}) { 4460 while ($self->{realloc}) {
3590 my %queue; 4461 my %queue;
3591 my @queue; 4462 my @queue;
3592 my $widget; 4463 my $widget;
3593 4464
3594 outer: 4465 outer:
… …
3614 4485
3615 delete $queue{$widget+0}; 4486 delete $queue{$widget+0};
3616 4487
3617 my ($w, $h) = $widget->size_request; 4488 my ($w, $h) = $widget->size_request;
3618 4489
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4490 $w += $widget->{padding_x} * 2;
3620 $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};
3621 4498
3622 $w = $widget->{force_w} if exists $widget->{force_w}; 4499 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h}; 4500 $h = $widget->{force_h} if exists $widget->{force_h};
3624 4501
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4502 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3638 } 4515 }
3639 } 4516 }
3640 4517
3641 delete $self->{realloc}{$widget+0}; 4518 delete $self->{realloc}{$widget+0};
3642 } 4519 }
3643 }
3644 4520
3645 while (my $size_alloc = delete $self->{size_alloc}) { 4521 while (my $size_alloc = delete $self->{size_alloc}) {
3646 my @queue = sort { $b->{visible} <=> $a->{visible} } 4522 my @queue = sort { $a->{visible} <=> $b->{visible} }
3647 values %$size_alloc; 4523 values %$size_alloc;
3648 4524
3649 while () { 4525 while () {
3650 my $widget = pop @queue || last; 4526 my $widget = pop @queue || last;
3651 4527
3652 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4528 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3653 4529
3654 $w = 0 if $w < 0; 4530 $w = max $widget->{min_w}, $w;
3655 $h = 0 if $h < 0; 4531 $h = max $widget->{min_h}, $h;
3656 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
3657 $w = int $w + 0.5; 4539 $w = int $w + 0.5;
3658 $h = int $h + 0.5; 4540 $h = int $h + 0.5;
3659 4541
3660 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}) {
3661 $widget->{old_w} = $widget->{w}; 4543 $widget->{old_w} = $widget->{w};
3662 $widget->{old_h} = $widget->{h}; 4544 $widget->{old_h} = $widget->{h};
3663 4545
3664 $widget->{w} = $w; 4546 $widget->{w} = $w;
3665 $widget->{h} = $h; 4547 $widget->{h} = $h;
3666 4548
3667 $widget->emit (size_allocate => $w, $h); 4549 $widget->emit (size_allocate => $w, $h);
4550 }
3668 } 4551 }
3669 } 4552 }
3670 } 4553 }
3671 4554
3672 while ($self->{post_alloc_hook}) { 4555 while ($self->{post_alloc_hook}) {
3673 $_->() 4556 $_->()
3674 for values %{delete $self->{post_alloc_hook}}; 4557 for values %{delete $self->{post_alloc_hook}};
3675 } 4558 }
3676
3677 4559
3678 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4560 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3679 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4561 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3680 glClear GL_COLOR_BUFFER_BIT; 4562 glClear GL_COLOR_BUFFER_BIT;
3681 4563
… …
3684 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4566 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3685 glMatrixMode GL_MODELVIEW; 4567 glMatrixMode GL_MODELVIEW;
3686 glLoadIdentity; 4568 glLoadIdentity;
3687 4569
3688 { 4570 {
3689 package CFClient::UI::Base; 4571 package DC::UI::Base;
3690 4572
3691 ($draw_x, $draw_y, $draw_w, $draw_h) = 4573 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3692 (0, 0, $self->{w}, $self->{h}); 4574 (0, 0, $self->{w}, $self->{h});
3693 }
3694 4575
3695 $self->_draw; 4576 $self->_draw;
4577 }
3696} 4578}
3697 4579
3698############################################################################# 4580#############################################################################
3699 4581
3700package CFClient::UI; 4582package DC::UI;
3701 4583
3702$ROOT = new CFClient::UI::Root; 4584$ROOT = new DC::UI::Root;
3703$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4585$TOOLTIP = new DC::UI::Tooltip z => 900;
3704 4586
37051 45871
3706 4588

Diff Legend

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