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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.280 by root, Mon Jun 5 01:22:08 2006 UTC vs.
Revision 1.457 by root, Fri Dec 28 15:05:20 2007 UTC

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

Diff Legend

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