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.455 by root, Thu Dec 27 19:12:19 2007 UTC

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

Diff Legend

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