ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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