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

Diff Legend

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