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

Diff Legend

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