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.278 by root, Sun Jun 4 23:05:06 2006 UTC vs.
Revision 1.472 by root, Wed Dec 24 04:09:27 2008 UTC

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

Diff Legend

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