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

Diff Legend

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