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.277 by root, Sun Jun 4 00:21:52 2006 UTC vs.
Revision 1.470 by root, Fri Sep 19 02:24:32 2008 UTC

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

Diff Legend

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