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.285 by root, Mon Jun 5 03:07:01 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
273 return unless $self->{visible}; 309 return unless $self->{visible};
274 310
275 $_->set_invisible for $self->children; 311 $_->set_invisible for $self->children;
276 312
313 delete $self->{visible};
277 delete $self->{root}; 314 delete $self->{root};
278 delete $self->{visible};
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
320 $self->{x} = List::Util::max 0, int $x; 358 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
321 $self->{y} = List::Util::max 0, int $y; 359 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322 $self->{z} = $z if defined $z; 360 $self->{z} = $z if defined $z;
323 361
324 $self->update; 362 $self->update;
325} 363}
326 364
… …
329 367
330 $self->{force_w} = $w; 368 $self->{force_w} = $w;
331 $self->{force_h} = $h; 369 $self->{force_h} = $h;
332 370
333 $self->realloc; 371 $self->realloc;
372}
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)
334} 390}
335 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
633 return if DC::in_destruct;
634
635 local $@;
636 eval { $self->destroy };
637 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
638
597 delete $WIDGET{$self+0}; 639 delete $WIDGET{$self+0};
598 #$self->deactivate;
599} 640}
600 641
601############################################################################# 642#############################################################################
602 643
603package CFClient::UI::DrawBG; 644package DC::UI::DrawBG;
604 645
605our @ISA = CFClient::UI::Base::; 646our @ISA = DC::UI::Base::;
606 647
607use strict; 648use strict;
608use CFClient::OpenGL; 649use DC::OpenGL;
609 650
610sub new { 651sub new {
611 my $class = shift; 652 my $class = shift;
612
613 # range [value, low, high, page]
614 653
615 $class->SUPER::new ( 654 $class->SUPER::new (
616 #bg => [0, 0, 0, 0.2], 655 #bg => [0, 0, 0, 0.2],
617 #active_bg => [1, 1, 1, 0.5], 656 #active_bg => [1, 1, 1, 0.5],
618 @_ 657 @_
619 ) 658 )
620} 659}
621 660
661sub set_bg {
662 my ($self, $bg) = @_;
663
664 $self->{bg} = $bg;
665 $self->update;
666}
667
622sub _draw { 668sub _draw {
623 my ($self) = @_; 669 my ($self) = @_;
624 670
625 my $color = $FOCUS == $self && $self->{active_bg} 671 my $color = $FOCUS == $self && $self->{active_bg}
626 ? $self->{active_bg} 672 ? $self->{active_bg}
… …
630 my ($w, $h) = @$self{qw(w h)}; 676 my ($w, $h) = @$self{qw(w h)};
631 677
632 glEnable GL_BLEND; 678 glEnable GL_BLEND;
633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 679 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
634 glColor_premultiply @$color; 680 glColor_premultiply @$color;
635
636 glBegin GL_QUADS;
637 glVertex 0 , 0;
638 glVertex 0 , $h;
639 glVertex $w, $h; 681 glRect 0, 0, $w, $h;
640 glVertex $w, 0;
641 glEnd;
642
643 glDisable GL_BLEND; 682 glDisable GL_BLEND;
644 } 683 }
645} 684}
646 685
647############################################################################# 686#############################################################################
648 687
649package CFClient::UI::Empty; 688package DC::UI::Empty;
650 689
651our @ISA = CFClient::UI::Base::; 690our @ISA = DC::UI::Base::;
652 691
653sub new { 692sub new {
654 my ($class, %arg) = @_; 693 my ($class, %arg) = @_;
655 $class->SUPER::new (can_events => 0, %arg); 694 $class->SUPER::new (can_events => 0, %arg);
656} 695}
… …
663 702
664sub draw { } 703sub draw { }
665 704
666############################################################################# 705#############################################################################
667 706
668package CFClient::UI::Container; 707package DC::UI::Container;
669 708
670our @ISA = CFClient::UI::Base::; 709our @ISA = DC::UI::Base::;
671 710
672sub new { 711sub new {
673 my ($class, %arg) = @_; 712 my ($class, %arg) = @_;
674 713
675 my $children = delete $arg{children}; 714 my $children = delete $arg{children};
… …
679 can_events => 0, 718 can_events => 0,
680 %arg, 719 %arg,
681 ); 720 );
682 721
683 $self->add (@$children) 722 $self->add (@$children)
684 if $children; 723 if $children && @$children;
685 724
686 $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;
687} 734}
688 735
689sub add { 736sub add {
690 my ($self, @widgets) = @_; 737 my ($self, @widgets) = @_;
691 738
692 $_->set_parent ($self) 739 $_->set_parent ($self)
693 for @widgets; 740 for @widgets;
694 741
742 # TODO: only do this in widgets that need it, e.g. root, fixed
695 use sort 'stable'; 743 use sort 'stable';
696 744
697 $self->{children} = [ 745 $self->{children} = [
698 sort { $a->{z} <=> $b->{z} } 746 sort { $a->{z} <=> $b->{z} }
699 @{$self->{children}}, @widgets 747 @{$self->{children}}, @widgets
700 ]; 748 ];
701 749
702 $self->realloc; 750 $self->realloc;
751
752 $self->emit (c_add => \@widgets);
753
754 map $_+0, @widgets
703} 755}
704 756
705sub children { 757sub children {
706 @{ $_[0]{children} } 758 @{ $_[0]{children} }
707} 759}
708 760
709sub remove { 761sub remove {
710 my ($self, $child) = @_; 762 my ($self, @widgets) = @_;
711 763
764 $self->emit (c_remove => \@widgets);
765
766 for my $child (@widgets) {
712 delete $child->{parent}; 767 delete $child->{parent};
713 $child->hide; 768 $child->hide;
714
715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 769 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
770 }
716 771
717 $self->realloc; 772 $self->realloc;
718} 773}
719 774
720sub clear { 775sub clear {
721 my ($self) = @_; 776 my ($self) = @_;
722 777
723 my $children = delete $self->{children}; 778 my $children = $self->{children};
724 $self->{children} = []; 779 $self->{children} = [];
725 780
726 for (@$children) { 781 for (@$children) {
727 delete $_->{parent}; 782 delete $_->{parent};
728 $_->hide; 783 $_->hide;
… …
748} 803}
749 804
750sub _draw { 805sub _draw {
751 my ($self) = @_; 806 my ($self) = @_;
752 807
753 $_->draw for @{$self->{children}}; 808 $_->draw for $self->visible_children;
754} 809}
755 810
756############################################################################# 811#############################################################################
757 812
758package CFClient::UI::Bin; 813package DC::UI::Bin;
759 814
760our @ISA = CFClient::UI::Container::; 815our @ISA = DC::UI::Container::;
761 816
762sub new { 817sub new {
763 my ($class, %arg) = @_; 818 my ($class, %arg) = @_;
764 819
765 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 820 my $child = (delete $arg{child}) || new DC::UI::Empty::;
766 821
767 $class->SUPER::new (children => [$child], %arg) 822 $class->SUPER::new (children => [$child], %arg)
768} 823}
769 824
770sub add { 825sub add {
771 my ($self, $child) = @_; 826 my ($self, $child) = @_;
772 827
773 $self->{children} = []; 828 $self->clear;
774
775 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
776} 830}
777 831
778sub remove { 832sub remove {
779 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
780 834
781 $self->SUPER::remove ($widget); 835 $self->SUPER::remove ($widget);
782 836
783 $self->{children} = [new CFClient::UI::Empty] 837 $self->{children} = [new DC::UI::Empty]
784 unless @{$self->{children}}; 838 unless @{$self->{children}};
785} 839}
786 840
787sub child { $_[0]->{children}[0] } 841sub child { $_[0]->{children}[0] }
788 842
789sub size_request { 843sub size_request {
790 $_[0]{children}[0]->size_request 844 $_[0]{children}[0]->size_request
791} 845}
792 846
793sub size_allocate { 847sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
795 849
796 $self->{children}[0]->configure (0, 0, $w, $h); 850 $self->{children}[0]->configure (0, 0, $w, $h);
851
852 1
797} 853}
798 854
799############################################################################# 855#############################################################################
800
801# back-buffered drawing area 856# back-buffered drawing area
802 857
803package CFClient::UI::Window; 858package DC::UI::Window;
804 859
805our @ISA = CFClient::UI::Bin::; 860our @ISA = DC::UI::Bin::;
806 861
807use CFClient::OpenGL; 862use DC::OpenGL;
808 863
809sub new { 864sub new {
810 my ($class, %arg) = @_; 865 my ($class, %arg) = @_;
811 866
812 my $self = $class->SUPER::new (%arg); 867 my $self = $class->SUPER::new (%arg);
… …
817 872
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 873 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 874 $self->SUPER::update;
820} 875}
821 876
822sub size_allocate { 877sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 878 my ($self, $w, $h) = @_;
824 879
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 880 $self->update;
881
882 $self->SUPER::invoke_size_allocate ($w, $h)
827} 883}
828 884
829sub _render { 885sub _render {
830 my ($self) = @_; 886 my ($self) = @_;
831 887
… …
833} 889}
834 890
835sub render_child { 891sub render_child {
836 my ($self) = @_; 892 my ($self) = @_;
837 893
838 $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 {
839 glClearColor 0, 0, 0, 0; 895 glClearColor 0, 0, 0, 0;
840 glClear GL_COLOR_BUFFER_BIT; 896 glClear GL_COLOR_BUFFER_BIT;
841 897
842 { 898 {
843 package CFClient::UI::Base; 899 package DC::UI::Base;
844 900
845 ($draw_x, $draw_y, $draw_w, $draw_h) = 901 local ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h}); 902 (0, 0, $self->{w}, $self->{h});
903
904 $self->_render;
847 } 905 }
848
849 $self->_render;
850 }; 906 };
851} 907}
852 908
853sub _draw { 909sub _draw {
854 my ($self) = @_; 910 my ($self) = @_;
855
856 my ($w, $h) = @$self{qw(w h)};
857 911
858 my $tex = $self->{texture} 912 my $tex = $self->{texture}
859 or return; 913 or return;
860 914
861 glEnable GL_TEXTURE_2D; 915 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863 glColor 0, 0, 0, 1; 917 glColor 0, 0, 0, 1;
864 918
865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 919 $tex->draw_quad_alpha_premultiplied (0, 0);
866 920
867 glDisable GL_TEXTURE_2D; 921 glDisable GL_TEXTURE_2D;
868} 922}
869 923
870############################################################################# 924#############################################################################
871 925
872package CFClient::UI::ViewPort; 926package DC::UI::ViewPort;
873 927
928use List::Util qw(min max);
929
874our @ISA = CFClient::UI::Window::; 930our @ISA = DC::UI::Window::;
875 931
876sub new { 932sub new {
877 my $class = shift; 933 my $class = shift;
878 934
879 $class->SUPER::new ( 935 $class->SUPER::new (
… …
886sub size_request { 942sub size_request {
887 my ($self) = @_; 943 my ($self) = @_;
888 944
889 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 945 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
890 946
891 $w = 10 if $self->{scroll_x}; 947 $w = 1 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y}; 948 $h = 1 if $self->{scroll_y};
893 949
894 ($w, $h) 950 ($w, $h)
895} 951}
896 952
897sub size_allocate { 953sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 954 my ($self, $w, $h) = @_;
899 955
900 my $child = $self->child; 956 my $child = $self->child;
901 957
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 958 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 959 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 960
905 $self->child->configure (0, 0, $w, $h); 961 $self->child->configure (0, 0, $w, $h);
906 $self->update; 962 $self->update;
963
964 1
907} 965}
908 966
909sub set_offset { 967sub set_offset {
910 my ($self, $x, $y) = @_; 968 my ($self, $x, $y) = @_;
911 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}) {
912 $self->{view_x} = int $x; 974 $self->{view_x} = $x;
913 $self->{view_y} = int $y; 975 $self->{view_y} = $y;
914 976
977 $self->emit (changed => $x, $y);
915 $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 }
916} 998}
917 999
918# 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
919sub coord2local { 1001sub coord2local {
920 my ($self, $x, $y) = @_; 1002 my ($self, $x, $y) = @_;
… …
935 my ($self, $x, $y) = @_; 1017 my ($self, $x, $y) = @_;
936 1018
937 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
939 ) { 1021 ) {
940 $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})
941 } else { 1023 } else {
942 $self->CFClient::UI::Base::find_widget ($x, $y) 1024 $self->DC::UI::Base::find_widget ($x, $y)
943 } 1025 }
944} 1026}
945 1027
946sub _render { 1028sub _render {
947 my ($self) = @_; 1029 my ($self) = @_;
948 1030
949 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};
950 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};
951 1033
952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1034 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953 1035
954 $self->SUPER::_render; 1036 $self->SUPER::_render;
955} 1037}
956 1038
957############################################################################# 1039#############################################################################
958 1040
959package CFClient::UI::ScrolledWindow; 1041package DC::UI::ScrolledWindow;
960 1042
961our @ISA = CFClient::UI::HBox::; 1043our @ISA = DC::UI::Table::;
962 1044
963sub new { 1045sub new {
964 my ($class, %arg) = @_; 1046 my ($class, %arg) = @_;
965 1047
966 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
967 1049
968 my $self; 1050 my $self;
969 1051
970 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,
971 vertical => 1, 1066 vertical => 1,
972 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
973 on_changed => sub { 1068 on_changed => sub {
974 $self->{vp}->set_offset (0, $_[1]); 1069 $self->{vpos} = $_[1];
1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
975 }, 1071 },
976 ; 1072 ;
977 1073
978 $self = $class->SUPER::new ( 1074 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1075 scroll_x => 0,
1076 scroll_y => 1,
1077 can_events => 1,
980 slider => $slider, 1078 hslider => $hslider,
1079 vslider => $vslider,
1080 col_expand => [1, 0],
1081 row_expand => [1, 0],
981 %arg, 1082 %arg,
982 ); 1083 );
983 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
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1106 $self->SUPER::add ($self->{vp});
1107
985 $self->add ($child) if $child; 1108 $self->add ($child) if $child;
986 1109
987 $self 1110 $self
988} 1111}
989 1112
… …
991 my ($self, $widget) = @_; 1114 my ($self, $widget) = @_;
992 1115
993 $self->{vp}->add ($self->{child} = $widget); 1116 $self->{vp}->add ($self->{child} = $widget);
994} 1117}
995 1118
1119sub set_offset { shift->{vp}->set_offset (@_) }
1120sub set_center { shift->{vp}->set_center (@_) }
1121sub make_visible { shift->{vp}->make_visible (@_) }
1122
996sub 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 {
997 my ($self) = @_; 1154 my ($self, $ev) = @_;
998 1155
999 $self->SUPER::update; 1156 $self->grab_focus;
1000 1157
1001 # todo: overwrite size_allocate of child 1158 my $ox = $self->{vp}{view_x};
1002 my $child = $self->{vp}->child; 1159 my $oy = $self->{vp}{view_y};
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1160
1004} 1161 $self->{motion} = sub {
1162 my ($ev, $x, $y) = @_;
1005 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
1006sub size_allocate { 1212sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1213 my ($self, $w, $h) = @_;
1008 1214
1215 $self->update_slider;
1009 $self->SUPER::size_allocate ($w, $h); 1216 $self->SUPER::invoke_size_allocate ($w, $h)
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013} 1217}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1218
1018############################################################################# 1219#############################################################################
1019 1220
1020package CFClient::UI::Frame; 1221package DC::UI::Frame;
1021 1222
1022our @ISA = CFClient::UI::Bin::; 1223our @ISA = DC::UI::Bin::;
1023 1224
1024use CFClient::OpenGL; 1225use DC::OpenGL;
1025 1226
1026sub new { 1227sub new {
1027 my $class = shift; 1228 my $class = shift;
1028 1229
1029 $class->SUPER::new ( 1230 $class->SUPER::new (
… …
1039 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1040 1241
1041 glEnable GL_BLEND; 1242 glEnable GL_BLEND;
1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1243 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1043 glColor_premultiply @{ $self->{bg} }; 1244 glColor_premultiply @{ $self->{bg} };
1044
1045 glBegin GL_QUADS;
1046 glVertex 0 , 0;
1047 glVertex 0 , $h;
1048 glVertex $w, $h; 1245 glRect 0, 0, $w, $h;
1049 glVertex $w, 0;
1050 glEnd;
1051
1052 glDisable GL_BLEND; 1246 glDisable GL_BLEND;
1053 } 1247 }
1054 1248
1055 $self->SUPER::_draw; 1249 $self->SUPER::_draw;
1056} 1250}
1057 1251
1058############################################################################# 1252#############################################################################
1059 1253
1060package CFClient::UI::FancyFrame; 1254package DC::UI::FancyFrame;
1061 1255
1062our @ISA = CFClient::UI::Bin::; 1256our @ISA = DC::UI::Bin::;
1063 1257
1064use CFClient::OpenGL; 1258use DC::OpenGL;
1065
1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1259
1074sub new { 1260sub new {
1075 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1076 1262
1077 my $title = delete $arg{title}; 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 }
1078 1270
1079 my $self = $class->SUPER::new ( 1271 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1272 # label => "",
1081 border_bg => [1, 1, 1, 1], 1273 fg => undef,
1082 border => 0.6, 1274 border => 0.8,
1083 can_events => 1, 1275 style => 'single',
1084 min_w => 16,
1085 min_h => 16,
1086 %arg, 1276 %arg,
1087 ); 1277 );
1088 1278
1089 $self->{title} = new CFClient::UI::Label
1090 align => 0,
1091 valign => 1,
1092 text => $title,
1093 fontsize => $self->{border}
1094 if defined $title;
1095
1096 $self 1279 $self
1097} 1280}
1098 1281
1099sub add { 1282sub add {
1100 my ($self, @widgets) = @_; 1283 my ($self, @widgets) = @_;
1101 1284
1102 $self->SUPER::add (@widgets); 1285 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1286 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1104} 1287}
1105 1288
1106sub border { 1289sub border {
1107 int $_[0]{border} * $::FONTSIZE 1290 int $_[0]{border} * $::FONTSIZE
1108} 1291}
1109 1292
1110sub size_request { 1293sub size_request {
1111 my ($self) = @_; 1294 my ($self) = @_;
1112 1295
1113 $self->{title}->size_request 1296 ($self->{label_w}, undef) = $self->{label}->size_request
1114 if $self->{title}; 1297 if $self->{label};
1115 1298
1116 my ($w, $h) = $self->SUPER::size_request; 1299 my ($w, $h) = $self->SUPER::size_request;
1117 1300
1118 ( 1301 (
1119 $w + $self->border * 2, 1302 $w + $self->border * 2,
1120 $h + $self->border * 2, 1303 $h + $self->border * 2,
1121 ) 1304 )
1122} 1305}
1123 1306
1124sub size_allocate { 1307sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1308 my ($self, $w, $h) = @_;
1126 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
1127 if ($self->{title}) { 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;
1359
1360my $bg =
1361 new_from_resource DC::Texture "d1_bg.png",
1362 mipmap => 1, wrap => 1;
1363
1364my @border =
1365 map { new_from_resource DC::Texture $_, mipmap => 1 }
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);
1371
1372sub new {
1373 my ($class, %arg) = @_;
1374
1375 my $self = $class->SUPER::new (
1376 bg => [1, 1, 1, 1],
1377 border_bg => [1, 1, 1, 1],
1378 border => 0.8,
1379 can_events => 1,
1380 min_w => 64,
1381 min_h => 32,
1382 %arg,
1383 );
1384
1385 $self->{title_widget} = new DC::UI::Label
1386 align => 0.5,
1387 valign => 1,
1388 text => $self->{title},
1389 fontsize => $self->{border},
1390 if exists $self->{title};
1391
1392 if ($self->{has_close_button}) {
1393 $self->{close_button} =
1394 new DC::UI::ImageButton
1395 path => 'x1_close.png',
1396 on_activate => sub { $self->emit ("delete") };
1397
1398 $self->DC::UI::Container::add ($self->{close_button});
1399 }
1400
1401 $self
1402}
1403
1404sub add {
1405 my ($self, @widgets) = @_;
1406
1407 $self->SUPER::add (@widgets);
1408 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1409 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1410}
1411
1412sub border {
1413 int $_[0]{border} * $::FONTSIZE
1414}
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
1425sub size_request {
1426 my ($self) = @_;
1427
1428 $self->{title_widget}->size_request
1429 if $self->{title_widget};
1430
1431 $self->{close_button}->size_request
1432 if $self->{close_button};
1433
1434 my ($w, $h) = $self->SUPER::size_request;
1435
1436 (
1437 $w + $self->border * 2,
1438 $h + $self->border * 2,
1439 )
1440}
1441
1442sub invoke_size_allocate {
1443 my ($self, $w, $h) = @_;
1444
1445 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1446 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1447 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1448 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1449 }
1132 1450
1133 my $border = $self->border; 1451 my $border = $self->border;
1134 1452
1135 $h -= List::Util::max 0, $border * 2; 1453 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1454 $w -= List::Util::max 0, $border * 2;
1455
1456 $self->child->configure ($border, $border, $w, $h);
1457
1458 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1459 if $self->{close_button};
1460
1461 1
1462}
1463
1464sub invoke_delete {
1465 my ($self) = @_;
1466
1467 $self->hide;
1137 1468
1138 $self->child->configure ($border, $border, $w, $h); 1469 1
1139} 1470}
1140 1471
1141sub button_down { 1472sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1473 my ($self, $ev, $x, $y) = @_;
1143 1474
1144 my ($w, $h) = @$self{qw(w h)}; 1475 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1476 my $border = $self->border;
1146 1477
… …
1177 1508
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1509 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1510
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1511 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1512 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1513 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1514 };
1184 } else { 1515 } else {
1185 return 0; 1516 return 0;
1186 } 1517 }
1187 1518
1188 1 1519 1
1189} 1520}
1190 1521
1191sub button_up { 1522sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1523 my ($self, $ev, $x, $y) = @_;
1193 1524
1194 !!delete $self->{motion} 1525 ! ! delete $self->{motion}
1195} 1526}
1196 1527
1197sub mouse_motion { 1528sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1529 my ($self, $ev, $x, $y) = @_;
1199 1530
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1531 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1532
1202 !!$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
1203} 1542}
1204 1543
1205sub _draw { 1544sub _draw {
1206 my ($self) = @_; 1545 my ($self) = @_;
1207 1546
… …
1213 glEnable GL_TEXTURE_2D; 1552 glEnable GL_TEXTURE_2D;
1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1215 1554
1216 my $border = $self->border; 1555 my $border = $self->border;
1217 1556
1557 if ($border) {
1218 glColor @{ $self->{border_bg} }; 1558 glColor @{ $self->{border_bg} };
1219 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1559 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1560 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1561 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1222 $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 }
1223 1578
1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1579 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1225 glColor @{ $self->{bg} }; 1580 glColor @{ $self->{bg} };
1226 1581
1227 # TODO: repeat texture not scale 1582 # TODO: repeat texture not scale
… …
1233 1588
1234 glDisable GL_TEXTURE_2D; 1589 glDisable GL_TEXTURE_2D;
1235 1590
1236 $child->draw; 1591 $child->draw;
1237 1592
1238 if ($self->{title}) { 1593 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1594 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1595 $self->{title_widget}->_draw;
1596
1597 glTranslate 0, - ($border - $self->{h});
1241 } 1598 }
1599
1600 $self->{close_button}->draw
1601 if $self->{close_button};
1242} 1602}
1243 1603
1244############################################################################# 1604#############################################################################
1245 1605
1246package CFClient::UI::Table; 1606package DC::UI::Table;
1247 1607
1248our @ISA = CFClient::UI::Base::; 1608our @ISA = DC::UI::Container::;
1249 1609
1250use List::Util qw(max sum); 1610use List::Util qw(max sum);
1251 1611
1252use CFClient::OpenGL; 1612use DC::OpenGL;
1253 1613
1254sub new { 1614sub new {
1255 my $class = shift; 1615 my $class = shift;
1256 1616
1257 $class->SUPER::new ( 1617 $class->SUPER::new (
1258 col_expand => [], 1618 col_expand => [],
1619 row_expand => [],
1259 @_, 1620 @_,
1260 ) 1621 )
1261} 1622}
1262 1623
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265}
1266
1267sub add { 1624sub add {
1268 my ($self, $x, $y, $child) = @_;
1269
1270 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child;
1272
1273 $self->realloc;
1274}
1275
1276# TODO: move to container class maybe? send children a signal on removal?
1277sub clear {
1278 my ($self) = @_; 1625 my ($self, @widgets) = @_;
1626
1627 for my $child (@widgets) {
1628 $child->{c_rowspan} ||= 1;
1629 $child->{c_colspan} ||= 1;
1630 }
1631
1632 $self->SUPER::add (@widgets);
1633}
1634
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 {
1653 my ($self) = @_;
1654
1655 my (@w, @h);
1279 1656
1280 my @children = $self->children; 1657 my @children = $self->children;
1281 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 }
1282 1668 }
1283 for (@children) {
1284 delete $_->{parent};
1285 $_->hide;
1286 }
1287 1669
1288 $self->realloc; 1670 # second pass, rows
1289} 1671 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1290
1291sub get_wh {
1292 my ($self) = @_;
1293
1294 my (@w, @h);
1295
1296 for my $y (0 .. $#{$self->{children}}) {
1297 my $row = $self->{children}[$y]
1298 or next;
1299
1300 for my $x (0 .. $#$row) {
1301 my $widget = $row->[$x]
1302 or next;
1303 my ($w, $h) = @$widget{qw(req_w req_h)}; 1672 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1304 1673
1305 $w[$x] = max $w[$x], $w; 1674 my $sh = sum @h[$r .. $r + $rs - 1];
1306 $h[$y] = max $h[$y], $h; 1675
1676 if ($h > $sh) {
1677 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1307 } 1678 }
1308 } 1679 }
1309 1680
1310 (\@w, \@h) 1681 (\@w, \@h)
1311} 1682}
… …
1319 (sum @$ws), 1690 (sum @$ws),
1320 (sum @$hs), 1691 (sum @$hs),
1321 ) 1692 )
1322} 1693}
1323 1694
1324sub size_allocate { 1695sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1696 my ($self, $w, $h) = @_;
1326 1697
1327 my ($ws, $hs) = $self->get_wh; 1698 my ($ws, $hs) = $self->get_wh;
1328 1699
1329 my $req_w = (sum @$ws) || 1; 1700 my $req_w = (sum @$ws) || 1;
1330 my $req_h = (sum @$hs) || 1; 1701 my $req_h = (sum @$hs) || 1;
1331 1702
1332 # TODO: nicer code && do row_expand 1703 # now linearly scale the rows/columns to the allocated size
1333 my @col_expand = @{$self->{col_expand}}; 1704 my @col_expand = @{$self->{col_expand}};
1334 @col_expand = (1) x @$ws unless @col_expand; 1705 @col_expand = (1) x @$ws unless @col_expand;
1335 my $col_expand = (sum @col_expand) || 1; 1706 my $col_expand = (sum @col_expand) || 1;
1336 1707
1337 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1708 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1709
1341 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
1342 CFClient::UI::harmonize $hs; 1718 DC::UI::harmonize $hs;
1343 1719
1344 my $y; 1720 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1721 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1345 1722
1346 for my $r (0 .. $#{$self->{children}}) { 1723 for my $widget ($self->children) {
1347 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)};
1348 or next;
1349 1725
1350 my $x = 0; 1726 $widget->configure (
1351 my $row_h = $hs->[$r]; 1727 $x[$c], $y[$r],
1728 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1352 1729 );
1353 for my $c (0 .. $#$row) { 1730 }
1354 my $col_w = $ws->[$c];
1355 1731
1356 if (my $widget = $row->[$c]) { 1732 1
1357 $widget->configure ($x, $y, $col_w, $row_h); 1733}
1358 }
1359 1734
1360 $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};
1361 } 1762 }
1362
1363 $y += $row_h;
1364 } 1763 }
1365 1764
1366} 1765 my $W = $x2 - $x1;
1766 my $H = $y2 - $y1;
1367 1767
1368sub 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 {
1369 my ($self, $x, $y) = @_; 1786 my ($self, $W, $H) = @_;
1370 1787
1371 $x -= $self->{x}; 1788 for my $child ($self->visible_children) {
1372 $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;
1373 1791
1374 my $res; 1792 $x += $child->{c_halign} * $child->{req_w};
1793 $y += $child->{c_valign} * $child->{req_h};
1375 1794
1376 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1795 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1377 $res = $_->find_widget ($x, $y) 1796 }
1378 and return $res; 1797
1379 } 1798 1
1380
1381 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1382}
1383
1384sub _draw {
1385 my ($self) = @_;
1386
1387 for (grep $_, @{$self->{children}}) {
1388 $_->draw for grep $_, @$_;
1389 }
1390} 1799}
1391 1800
1392############################################################################# 1801#############################################################################
1393 1802
1394package CFClient::UI::Box; 1803package DC::UI::Box;
1395 1804
1396our @ISA = CFClient::UI::Container::; 1805our @ISA = DC::UI::Container::;
1397 1806
1398sub size_request { 1807sub size_request {
1399 my ($self) = @_; 1808 my ($self) = @_;
1809
1810 my @children = $self->visible_children;
1400 1811
1401 $self->{vertical} 1812 $self->{vertical}
1402 ? ( 1813 ? (
1403 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1814 (List::Util::max map $_->{req_w}, @children),
1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1815 (List::Util::sum map $_->{req_h}, @children),
1405 ) 1816 )
1406 : ( 1817 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1818 (List::Util::sum map $_->{req_w}, @children),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1819 (List::Util::max map $_->{req_h}, @children),
1409 ) 1820 )
1410} 1821}
1411 1822
1412sub size_allocate { 1823sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1824 my ($self, $w, $h) = @_;
1414 1825
1415 my $space = $self->{vertical} ? $h : $w; 1826 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1827 my @children = $self->visible_children;
1417 1828
1418 my @req; 1829 my @req;
1419 1830
1420 if ($self->{homogeneous}) { 1831 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1832 @req = ($space / (@children || 1)) x @children;
1422 } else { 1833 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1834 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1835 my $req = List::Util::sum @req;
1425 1836
1426 if ($req > $space) { 1837 if ($req > $space) {
1427 # ah well, not enough space 1838 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1839 $_ *= $space / $req for @req;
1429 } else { 1840 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1841 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1842
1432 $space = ($space - $req) / $expand; # remaining space to give away 1843 $space = ($space - $req) / $expand; # remaining space to give away
1433 1844
1434 $req[$_] += $space * $children->[$_]{expand} 1845 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1846 for 0 .. $#children;
1436 } 1847 }
1437 } 1848 }
1438 1849
1439 CFClient::UI::harmonize \@req; 1850 DC::UI::harmonize \@req;
1440 1851
1441 my $pos = 0; 1852 my $pos = 0;
1442 for (0 .. $#$children) { 1853 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1854 my $alloc = $req[$_];
1444 $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));
1445 1856
1446 $pos += $alloc; 1857 $pos += $alloc;
1447 } 1858 }
1448 1859
1449 1 1860 1
1450} 1861}
1451 1862
1452############################################################################# 1863#############################################################################
1453 1864
1454package CFClient::UI::HBox; 1865package DC::UI::HBox;
1455 1866
1456our @ISA = CFClient::UI::Box::; 1867our @ISA = DC::UI::Box::;
1457 1868
1458sub new { 1869sub new {
1459 my $class = shift; 1870 my $class = shift;
1460 1871
1461 $class->SUPER::new ( 1872 $class->SUPER::new (
… …
1464 ) 1875 )
1465} 1876}
1466 1877
1467############################################################################# 1878#############################################################################
1468 1879
1469package CFClient::UI::VBox; 1880package DC::UI::VBox;
1470 1881
1471our @ISA = CFClient::UI::Box::; 1882our @ISA = DC::UI::Box::;
1472 1883
1473sub new { 1884sub new {
1474 my $class = shift; 1885 my $class = shift;
1475 1886
1476 $class->SUPER::new ( 1887 $class->SUPER::new (
… …
1479 ) 1890 )
1480} 1891}
1481 1892
1482############################################################################# 1893#############################################################################
1483 1894
1484package CFClient::UI::Label; 1895package DC::UI::Label;
1485 1896
1486our @ISA = CFClient::UI::DrawBG::; 1897our @ISA = DC::UI::DrawBG::;
1487 1898
1488use CFClient::OpenGL; 1899use DC::OpenGL;
1489 1900
1490sub new { 1901sub new {
1491 my ($class, %arg) = @_; 1902 my ($class, %arg) = @_;
1492 1903
1493 my $self = $class->SUPER::new ( 1904 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1907 #active_bg => none
1497 #font => default_font 1908 #font => default_font
1498 #text => initial text 1909 #text => initial text
1499 #markup => initial narkup 1910 #markup => initial narkup
1500 #max_w => maximum pixel width 1911 #max_w => maximum pixel width
1912 #style => 0, # render flags
1501 ellipsise => 3, # end 1913 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1914 layout => (new DC::Layout),
1503 fontsize => 1, 1915 fontsize => 1,
1504 align => -1, 1916 align => 0.5,
1505 valign => -1, 1917 valign => 0.5,
1506 padding_x => 2, 1918 padding_x => 4,
1507 padding_y => 2, 1919 padding_y => 2,
1508 can_events => 0, 1920 can_events => 0,
1509 %arg 1921 %arg
1510 ); 1922 );
1511 1923
1512 if (exists $self->{template}) { 1924 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1925 my $layout = new DC::Layout;
1514 $layout->set_text (delete $self->{template}); 1926 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1927 $self->{template} = $layout;
1516 } 1928 }
1517 1929
1518 if (exists $self->{markup}) { 1930 if (exists $self->{markup}) {
… …
1522 } 1934 }
1523 1935
1524 $self 1936 $self
1525} 1937}
1526 1938
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1939sub update {
1538 my ($self) = @_; 1940 my ($self) = @_;
1539 1941
1540 delete $self->{texture}; 1942 delete $self->{texture};
1541 $self->SUPER::update; 1943 $self->SUPER::update;
… …
1546 1948
1547 delete $self->{ox}; 1949 delete $self->{ox};
1548 $self->SUPER::realloc; 1950 $self->SUPER::realloc;
1549} 1951}
1550 1952
1953sub clear {
1954 my ($self) = @_;
1955
1956 $self->set_text ("");
1957}
1958
1551sub set_text { 1959sub set_text {
1552 my ($self, $text) = @_; 1960 my ($self, $text) = @_;
1553 1961
1554 return if $self->{text} eq "T$text"; 1962 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1963 $self->{text} = "T$text";
1556 1964
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1965 $self->{layout}->set_text ($text);
1966
1559 delete $self->{req_h}; 1967 delete $self->{size_req};
1560
1561 $self->realloc; 1968 $self->realloc;
1562 $self->update; 1969 $self->update;
1563} 1970}
1564 1971
1565sub set_markup { 1972sub set_markup {
… …
1568 return if $self->{text} eq "M$markup"; 1975 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1976 $self->{text} = "M$markup";
1570 1977
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1978 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1979
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1980 $self->{layout}->set_markup ($markup);
1981
1575 delete $self->{req_h}; 1982 delete $self->{size_req};
1576
1577 $self->realloc; 1983 $self->realloc;
1578 $self->update; 1984 $self->update;
1579} 1985}
1580 1986
1581sub size_request { 1987sub size_request {
1582 my ($self) = @_; 1988 my ($self) = @_;
1583 1989
1584 if (exists $self->{req_h}) { 1990 $self->{size_req} ||= do {
1585 @$self{qw(req_w req_h)} 1991 my ($max_w, $max_h) = $self->get_max_wh;
1586 } else { 1992
1587 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1993 $self->{layout}->set_font ($self->{font}) if $self->{font};
1588 $self->{layout}->set_width ($self->{max_w} || -1); 1994 $self->{layout}->set_width ($max_w);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1995 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1996 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592 1998
1593 my ($w, $h) = $self->{layout}->size; 1999 my ($w, $h) = $self->{layout}->size;
1594 2000
1595 if (exists $self->{template}) { 2001 if (exists $self->{template}) {
1596 $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);
1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2004 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 2005
1599 my ($w2, $h2) = $self->{template}->size; 2006 my ($w2, $h2) = $self->{template}->size;
1600 2007
1601 $w = List::Util::max $w, $w2; 2008 $w = List::Util::max $w, $w2;
1602 $h = List::Util::max $h, $h2; 2009 $h = List::Util::max $h, $h2;
1603 } 2010 }
1604 2011
1605 ($w, $h) 2012 [$w, $h]
1606 } 2013 };
1607}
1608 2014
2015 @{ $self->{size_req} }
2016}
2017
2018sub baseline_shift {
2019 $_[0]{layout}->descent
2020}
2021
1609sub size_allocate { 2022sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 2023 my ($self, $w, $h) = @_;
1611 2024
1612 delete $self->{ox}; 2025 delete $self->{ox};
1613 2026
1614 delete $self->{texture} 2027 delete $self->{texture}
1615 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
1616} 2031}
1617 2032
1618sub set_fontsize { 2033sub set_fontsize {
1619 my ($self, $fontsize) = @_; 2034 my ($self, $fontsize) = @_;
1620 2035
1621 $self->{fontsize} = $fontsize; 2036 $self->{fontsize} = $fontsize;
2037 delete $self->{size_req};
1622 delete $self->{texture}; 2038 delete $self->{texture};
1623 2039
1624 $self->realloc; 2040 $self->realloc;
1625} 2041}
1626 2042
2043sub reconfigure {
2044 my ($self) = @_;
2045
2046 delete $self->{size_req};
2047 delete $self->{texture};
2048
2049 $self->SUPER::reconfigure;
2050}
2051
1627sub _draw { 2052sub _draw {
1628 my ($self) = @_; 2053 my ($self) = @_;
1629 2054
1630 $self->SUPER::_draw; # draw background, if applicable 2055 $self->SUPER::_draw; # draw background, if applicable
1631 2056
1632 my $tex = $self->{texture} ||= do { 2057 my $size = $self->{texture} ||= do {
1633 $self->{layout}->set_foreground (@{$self->{fg}}); 2058 $self->{layout}->set_foreground (@{$self->{fg}});
1634 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2059 $self->{layout}->set_font ($self->{font}) if $self->{font};
1635 $self->{layout}->set_width ($self->{w}); 2060 $self->{layout}->set_width ($self->{w});
1636 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2061 $self->{layout}->set_ellipsise ($self->{ellipsise});
1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2062 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2063 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639 2064
1640 new_from_layout CFClient::Texture $self->{layout} 2065 [$self->{layout}->size]
1641 }; 2066 };
1642 2067
1643 unless (exists $self->{ox}) { 2068 unless (exists $self->{ox}) {
1644 $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);
1645 : $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);
1646 : ($self->{w} - $tex->{w}) * 0.5);
1647 2071
1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2072 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1650 : ($self->{h} - $tex->{h}) * 0.5);
1651 }; 2073 };
1652 2074
1653 glEnable GL_TEXTURE_2D; 2075# unless ($self->{list}) {
1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2076# $self->{list} = DC::OpenGL::glGenList;
2077# DC::OpenGL::glNewList $self->{list};
2078# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2079# DC::OpenGL::glEndList;
2080# }
2081#
2082# DC::OpenGL::glCallList $self->{list};
1655 2083
1656 glColor_premultiply @{$self->{fg}} 2084 $self->{layout}->draw;
1657 if $tex->{format} == GL_ALPHA;
1658
1659 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1660
1661 glDisable GL_TEXTURE_2D;
1662} 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#}
1663 2094
1664############################################################################# 2095#############################################################################
1665 2096
1666package CFClient::UI::EntryBase; 2097package DC::UI::EntryBase;
1667 2098
1668our @ISA = CFClient::UI::Label::; 2099our @ISA = DC::UI::Label::;
1669 2100
1670use CFClient::OpenGL; 2101use DC::OpenGL;
1671 2102
1672sub new { 2103sub new {
1673 my $class = shift; 2104 my $class = shift;
1674 2105
1675 $class->SUPER::new ( 2106 $class->SUPER::new (
1676 fg => [1, 1, 1], 2107 fg => [1, 1, 1],
1677 bg => [0, 0, 0, 0.2], 2108 bg => [0, 0, 0, 0.2],
2109 outline => undef,
1678 active_bg => [1, 1, 1, 0.5], 2110 active_bg => [0, 0, 1, .2],
1679 active_fg => [0, 0, 0], 2111 active_fg => [1, 1, 1],
2112 active_outline => [1, 1, 0],
1680 can_hover => 1, 2113 can_hover => 1,
1681 can_focus => 1, 2114 can_focus => 1,
2115 align => 0,
1682 valign => 0, 2116 valign => 0.5,
1683 can_events => 1, 2117 can_events => 1,
2118 ellipsise => 0,
2119 padding_x => 4,
2120 padding_y => 2,
1684 #text => ... 2121 #text => ...
2122 #hidden => "*",
1685 @_ 2123 @_
1686 ) 2124 )
1687} 2125}
1688 2126
1689sub _set_text { 2127sub _set_text {
… …
1696 $self->{last_activity} = $::NOW; 2134 $self->{last_activity} = $::NOW;
1697 $self->{text} = $text; 2135 $self->{text} = $text;
1698 2136
1699 $text =~ s/./*/g if $self->{hidden}; 2137 $text =~ s/./*/g if $self->{hidden};
1700 $self->{layout}->set_text ("$text "); 2138 $self->{layout}->set_text ("$text ");
1701 delete $self->{req_h}; 2139 delete $self->{size_req};
1702 2140
1703 $self->_emit (changed => $self->{text}); 2141 $self->emit (changed => $self->{text});
1704 2142
1705 $self->realloc; 2143 $self->realloc;
1706 $self->update; 2144 $self->update;
1707} 2145}
1708 2146
… …
1723 my ($w, $h) = $self->SUPER::size_request; 2161 my ($w, $h) = $self->SUPER::size_request;
1724 2162
1725 ($w + 1, $h) # add 1 for cursor 2163 ($w + 1, $h) # add 1 for cursor
1726} 2164}
1727 2165
1728sub key_down { 2166sub invoke_key_down {
1729 my ($self, $ev) = @_; 2167 my ($self, $ev) = @_;
1730 2168
1731 my $mod = $ev->{mod}; 2169 my $mod = $ev->{mod};
1732 my $sym = $ev->{sym}; 2170 my $sym = $ev->{sym};
1733 my $uni = $ev->{unicode}; 2171 my $uni = $ev->{unicode};
1734 2172
1735 my $text = $self->get_text; 2173 my $text = $self->get_text;
1736 2174
1737 if ($uni == 8) { 2175 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2176
2177 if ($sym == DC::SDLK_BACKSPACE) {
1738 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2178 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1739 } elsif ($uni == 127) { 2179 } elsif ($sym == DC::SDLK_DELETE) {
1740 substr $text, $self->{cursor}, 1, ""; 2180 substr $text, $self->{cursor}, 1, "";
1741 } elsif ($sym == CFClient::SDLK_LEFT) { 2181 } elsif ($sym == DC::SDLK_LEFT) {
1742 --$self->{cursor} if $self->{cursor}; 2182 --$self->{cursor} if $self->{cursor};
1743 } elsif ($sym == CFClient::SDLK_RIGHT) { 2183 } elsif ($sym == DC::SDLK_RIGHT) {
1744 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2184 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1745 } 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 = "";
1746 $self->{cursor} = 0; 2199 $self->{cursor} = 0;
1747 } elsif ($sym == CFClient::SDLK_END) {
1748 $self->{cursor} = length $text;
1749 } elsif ($uni == 27) { 2200 } elsif ($uni == 27) {
1750 $self->_emit ('escape'); 2201 $self->emit ('escape');
1751 } elsif ($uni) { 2202 } elsif ($uni == 0x0d) {
2203 substr $text, $self->{cursor}++, 0, "\012";
2204 } elsif ($uni >= 0x20) {
1752 substr $text, $self->{cursor}++, 0, chr $uni; 2205 substr $text, $self->{cursor}++, 0, chr $uni;
1753 } else { 2206 } else {
1754 return 0; 2207 return 0;
1755 } 2208 }
1756 2209
1757 $self->_set_text ($text); 2210 $self->_set_text ($text);
1758 2211
1759 $self->realloc; 2212 $self->realloc;
2213 $self->update;
1760 2214
1761 1 2215 1
1762} 2216}
1763 2217
1764sub focus_in { 2218sub invoke_focus_in {
1765 my ($self) = @_; 2219 my ($self) = @_;
1766 2220
1767 $self->{last_activity} = $::NOW; 2221 $self->{last_activity} = $::NOW;
1768 2222
1769 $self->SUPER::focus_in; 2223 $self->SUPER::invoke_focus_in
1770} 2224}
1771 2225
1772sub button_down { 2226sub invoke_button_down {
1773 my ($self, $ev, $x, $y) = @_; 2227 my ($self, $ev, $x, $y) = @_;
1774 2228
1775 $self->SUPER::button_down ($ev, $x, $y); 2229 $self->SUPER::invoke_button_down ($ev, $x, $y);
1776 2230
1777 my $idx = $self->{layout}->xy_to_index ($x, $y); 2231 my $idx = $self->{layout}->xy_to_index ($x, $y);
1778 2232
1779 # byte-index to char-index 2233 # byte-index to char-index
1780 my $text = $self->{text}; 2234 my $text = $self->{text};
1781 utf8::encode $text; 2235 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1782 $self->{cursor} = length substr $text, 0, $idx; 2236 $self->{cursor} = length $text;
1783 2237
1784 $self->_set_text ($self->{text}); 2238 $self->_set_text ($self->{text});
1785 $self->update; 2239 $self->update;
1786 2240
1787 1 2241 1
1788} 2242}
1789 2243
1790sub mouse_motion { 2244sub invoke_mouse_motion {
1791 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
1792# 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#
1793 2247
1794 0 2248 1
1795} 2249}
1796 2250
1797sub _draw { 2251sub _draw {
1798 my ($self) = @_; 2252 my ($self) = @_;
1799 2253
… …
1806 glColor_premultiply @{$self->{bg}}; 2260 glColor_premultiply @{$self->{bg}};
1807 } 2261 }
1808 2262
1809 glEnable GL_BLEND; 2263 glEnable GL_BLEND;
1810 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2264 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1811 glBegin GL_QUADS;
1812 glVertex 0 , 0;
1813 glVertex 0 , $self->{h};
1814 glVertex $self->{w}, $self->{h}; 2265 glRect 0, 0, $self->{w}, $self->{h};
1815 glVertex $self->{w}, 0;
1816 glEnd;
1817 glDisable GL_BLEND; 2266 glDisable GL_BLEND;
1818 2267
1819 $self->SUPER::_draw; 2268 $self->SUPER::_draw;
1820 2269
1821 #TODO: force update every cursor change :( 2270 #TODO: force update every cursor change :(
… …
1823 2272
1824 unless (exists $self->{cur_h}) { 2273 unless (exists $self->{cur_h}) {
1825 my $text = substr $self->{text}, 0, $self->{cursor}; 2274 my $text = substr $self->{text}, 0, $self->{cursor};
1826 utf8::encode $text; 2275 utf8::encode $text;
1827 2276
1828 @$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);
1829 } 2278 }
1830 2279
1831 glColor @{$self->{fg}}; 2280 glColor_premultiply @{$self->{active_fg}};
1832 glBegin GL_LINES; 2281 glBegin GL_LINES;
1833 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2282 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1834 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};
1835 glEnd; 2284 glEnd;
1836 }
1837}
1838 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
1839package CFClient::UI::Entry; 2304package DC::UI::Entry;
1840 2305
1841our @ISA = CFClient::UI::EntryBase::; 2306our @ISA = DC::UI::EntryBase::;
1842 2307
1843use CFClient::OpenGL; 2308use DC::OpenGL;
1844 2309
2310sub new {
2311 my $class = shift;
2312
2313 $class->SUPER::new (
2314 history_pointer => -1,
2315 @_
2316 )
2317}
2318
2319
1845sub key_down { 2320sub invoke_key_down {
1846 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
1847 2322
1848 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
1849 2324
1850 if ($sym == 13) { 2325 if ($ev->{uni} == 0x0d || $sym == 13) {
1851 unshift @{$self->{history}}, 2326 unshift @{$self->{history}},
1852 my $txt = $self->get_text; 2327 my $txt = $self->get_text;
2328
1853 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
1854 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
1855 $self->_emit (activate => $txt); 2331 $self->emit (activate => $txt);
1856 $self->update; 2332 $self->update;
1857 2333
1858 } elsif ($sym == CFClient::SDLK_UP) { 2334 } elsif ($sym == DC::SDLK_UP) {
1859 if ($self->{history_pointer} < 0) { 2335 if ($self->{history_pointer} < 0) {
1860 $self->{history_saveback} = $self->get_text; 2336 $self->{history_saveback} = $self->get_text;
1861 } 2337 }
1862 if (@{$self->{history} || []} > 0) { 2338 if (@{$self->{history} || []} > 0) {
1863 $self->{history_pointer}++; 2339 $self->{history_pointer}++;
… …
1865 $self->{history_pointer} = @{$self->{history} || []} - 1; 2341 $self->{history_pointer} = @{$self->{history} || []} - 1;
1866 } 2342 }
1867 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1868 } 2344 }
1869 2345
1870 } elsif ($sym == CFClient::SDLK_DOWN) { 2346 } elsif ($sym == DC::SDLK_DOWN) {
1871 $self->{history_pointer}--; 2347 $self->{history_pointer}--;
1872 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2348 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1873 2349
1874 if ($self->{history_pointer} >= 0) { 2350 if ($self->{history_pointer} >= 0) {
1875 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2351 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1876 } else { 2352 } else {
2353 if (defined $self->{history_saveback}) {
1877 $self->set_text ($self->{history_saveback}); 2354 $self->set_text ($self->{history_saveback});
2355 $self->{history_saveback} = undef;
2356 }
1878 } 2357 }
1879 2358
1880 } else { 2359 } else {
1881 return $self->SUPER::key_down ($ev) 2360 return $self->SUPER::invoke_key_down ($ev)
1882 } 2361 }
1883 2362
1884 1 2363 1
1885} 2364}
1886 2365
1887############################################################################# 2366#############################################################################
1888 2367
1889package CFClient::UI::Button; 2368package DC::UI::TextEdit;
1890 2369
1891our @ISA = CFClient::UI::Label::; 2370our @ISA = DC::UI::EntryBase::;
1892 2371
1893use CFClient::OpenGL; 2372use DC::OpenGL;
1894
1895my @tex =
1896 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1897 qw(b1_button_active.png);
1898 2373
1899sub new { 2374sub new {
1900 my $class = shift; 2375 my $class = shift;
1901 2376
1902 $class->SUPER::new ( 2377 $class->SUPER::new (
1903 padding_x => 4,
1904 padding_y => 4, 2378 padding_y => 4,
1905 fg => [1, 1, 1], 2379
1906 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 (
1907 can_hover => 1, 2431 can_hover => 1,
1908 align => 0, 2432 align => 0.5,
1909 valign => 0, 2433 valign => 0.5,
1910 can_events => 1, 2434 can_events => 1,
1911 @_ 2435 @_
1912 ) 2436 )
1913} 2437}
1914 2438
1915sub activate { }
1916
1917sub button_up { 2439sub invoke_button_up {
1918 my ($self, $ev, $x, $y) = @_; 2440 my ($self, $ev, $x, $y) = @_;
1919 2441
1920 $self->emit ("activate") 2442 $self->emit ("activate")
1921 if $x >= 0 && $x < $self->{w} 2443 if $x >= 0 && $x < $self->{w}
1922 && $y >= 0 && $y < $self->{h}; 2444 && $y >= 0 && $y < $self->{h};
… …
1925} 2447}
1926 2448
1927sub _draw { 2449sub _draw {
1928 my ($self) = @_; 2450 my ($self) = @_;
1929 2451
1930 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1931
1932 glEnable GL_TEXTURE_2D; 2452 glEnable GL_TEXTURE_2D;
1933 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1934 glColor 0, 0, 0, 1; 2454 glColor 0, 0, 0, 1;
1935 2455
2456 my $tex = $tex[$GRAB == $self];
1936 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2457 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1937 2458
1938 glDisable GL_TEXTURE_2D; 2459 glDisable GL_TEXTURE_2D;
1939 2460
1940 $self->SUPER::_draw; 2461 $self->SUPER::_draw;
1941} 2462}
1942 2463
1943############################################################################# 2464#############################################################################
1944 2465
1945package CFClient::UI::CheckBox; 2466package DC::UI::Button;
1946 2467
1947our @ISA = CFClient::UI::DrawBG::; 2468our @ISA = DC::UI::Label::;
2469
2470use DC::OpenGL;
1948 2471
1949my @tex = 2472my @tex =
1950 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2473 map { new_from_resource DC::Texture $_, mipmap => 1 }
1951 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2474 qw(b1_button_inactive.png b1_button_active.png);
1952
1953use CFClient::OpenGL;
1954 2475
1955sub new { 2476sub new {
1956 my $class = shift; 2477 my $class = shift;
1957 2478
1958 $class->SUPER::new ( 2479 $class->SUPER::new (
2480 padding_x => 8,
2481 padding_y => 4,
2482 fg => [1.0, 1.0, 1.0],
2483 active_fg => [0.8, 0.8, 0.8],
2484 can_hover => 1,
2485 align => 0.5,
2486 valign => 0.5,
2487 can_events => 1,
2488 @_
2489 )
2490}
2491
2492sub invoke_button_up {
2493 my ($self, $ev, $x, $y) = @_;
2494
2495 $self->emit ("activate")
2496 if $x >= 0 && $x < $self->{w}
2497 && $y >= 0 && $y < $self->{h};
2498
2499 1
2500}
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
2519#############################################################################
2520
2521package DC::UI::CheckBox;
2522
2523our @ISA = DC::UI::DrawBG::;
2524
2525my @tex =
2526 map { new_from_resource DC::Texture $_, mipmap => 1 }
2527 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2528
2529use DC::OpenGL;
2530
2531sub new {
2532 my $class = shift;
2533
2534 $class->SUPER::new (
2535 fontsize => 1,
1959 padding_x => 2, 2536 padding_x => 2,
1960 padding_y => 2, 2537 padding_y => 2,
1961 fg => [1, 1, 1], 2538 fg => [1, 1, 1],
1962 active_fg => [1, 1, 0], 2539 active_fg => [1, 1, 0],
1963 bg => [0, 0, 0, 0.2], 2540 bg => [0, 0, 0, 0.2],
… …
1969} 2546}
1970 2547
1971sub size_request { 2548sub size_request {
1972 my ($self) = @_; 2549 my ($self) = @_;
1973 2550
1974 (6) x 2 2551 ($self->{fontsize} * $::FONTSIZE) x 2
1975} 2552}
1976 2553
2554sub toggle {
2555 my ($self) = @_;
2556
2557 $self->{state} = !$self->{state};
2558 $self->emit (changed => $self->{state});
2559 $self->update;
2560}
2561
1977sub button_down { 2562sub invoke_button_down {
1978 my ($self, $ev, $x, $y) = @_; 2563 my ($self, $ev, $x, $y) = @_;
1979 2564
1980 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2565 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1981 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2566 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1982 $self->{state} = !$self->{state}; 2567 $self->toggle;
1983 $self->_emit (changed => $self->{state});
1984 } else { 2568 } else {
1985 return 0 2569 return 0
1986 } 2570 }
1987 2571
1988 1 2572 1
… …
1991sub _draw { 2575sub _draw {
1992 my ($self) = @_; 2576 my ($self) = @_;
1993 2577
1994 $self->SUPER::_draw; 2578 $self->SUPER::_draw;
1995 2579
1996 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2580 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
1997 2581
1998 my ($w, $h) = @$self{qw(w h)}; 2582 my ($w, $h) = @$self{qw(w h)};
1999 2583
2000 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;
2001 2585
… …
2008 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2009} 2593}
2010 2594
2011############################################################################# 2595#############################################################################
2012 2596
2013package CFClient::UI::Image; 2597package DC::UI::Image;
2014 2598
2015our @ISA = CFClient::UI::Base::; 2599our @ISA = DC::UI::Base::;
2016 2600
2017use CFClient::OpenGL; 2601use DC::OpenGL;
2018use Carp qw/confess/;
2019 2602
2020our %loaded_images; 2603our %texture_cache;
2021 2604
2022sub new { 2605sub new {
2023 my $class = shift; 2606 my $class = shift;
2024 2607
2025 my $self = $class->SUPER::new (can_events => 0, @_); 2608 my $self = $class->SUPER::new (
2609 can_events => 0,
2610 scale => 1,
2611 @_,
2612 );
2026 2613
2027 $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";
2028 2616
2029 $loaded_images{$self->{image}} ||= 2617 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2030 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2618 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2031 2619
2032 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2620 DC::weaken $texture_cache{$self->{path}};
2033 2621
2034 Scalar::Util::weaken $loaded_images{$self->{image}}; 2622 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2035
2036 $self->{aspect} = $tex->{w} / $tex->{h};
2037 2623
2038 $self 2624 $self
2039} 2625}
2040 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
2041sub size_request { 2642sub size_request {
2042 my ($self) = @_; 2643 my ($self) = @_;
2043 2644
2044 ($self->{tex}->{w}, $self->{tex}->{h}) 2645 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2045} 2646}
2046 2647
2047sub _draw { 2648sub _draw {
2048 my ($self) = @_; 2649 my ($self) = @_;
2049 2650
… …
2066 glDisable GL_TEXTURE_2D; 2667 glDisable GL_TEXTURE_2D;
2067} 2668}
2068 2669
2069############################################################################# 2670#############################################################################
2070 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
2071package CFClient::UI::VGauge; 2714package DC::UI::VGauge;
2072 2715
2073our @ISA = CFClient::UI::Base::; 2716our @ISA = DC::UI::Base::;
2074 2717
2075use List::Util qw(min max); 2718use List::Util qw(min max);
2076 2719
2077use CFClient::OpenGL; 2720use DC::OpenGL;
2078 2721
2079my %tex = ( 2722my %tex = (
2080 food => [ 2723 food => [
2081 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2724 map { new_from_resource DC::Texture $_, mipmap => 1 }
2082 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2725 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2083 ], 2726 ],
2084 grace => [ 2727 grace => [
2085 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2728 map { new_from_resource DC::Texture $_, mipmap => 1 }
2086 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/
2087 ], 2730 ],
2088 hp => [ 2731 hp => [
2089 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2732 map { new_from_resource DC::Texture $_, mipmap => 1 }
2090 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2733 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2091 ], 2734 ],
2092 mana => [ 2735 mana => [
2093 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2736 map { new_from_resource DC::Texture $_, mipmap => 1 }
2094 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/
2095 ], 2738 ],
2096); 2739);
2097 2740
2098# eg. VGauge->new (gauge => 'food'), default gauge: food 2741# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2158 my $ycut1 = max 0, min 1, $ycut; 2801 my $ycut1 = max 0, min 1, $ycut;
2159 my $ycut2 = max 0, min 1, $ycut - 1; 2802 my $ycut2 = max 0, min 1, $ycut - 1;
2160 2803
2161 my $h1 = $self->{h} * (1 - $ycut1); 2804 my $h1 = $self->{h} * (1 - $ycut1);
2162 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);
2163 2809
2164 glEnable GL_BLEND; 2810 glEnable GL_BLEND;
2165 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2811 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2166 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2812 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2167 glEnable GL_TEXTURE_2D; 2813 glEnable GL_TEXTURE_2D;
… …
2186 2832
2187 if ($t3) { 2833 if ($t3) {
2188 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2834 glBindTexture GL_TEXTURE_2D, $t3->{name};
2189 glBegin GL_QUADS; 2835 glBegin GL_QUADS;
2190 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2836 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2191 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2837 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2192 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2838 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2193 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2839 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2194 glEnd; 2840 glEnd;
2195 } 2841 }
2196 2842
2197 glDisable GL_BLEND; 2843 glDisable GL_BLEND;
2198 glDisable GL_TEXTURE_2D; 2844 glDisable GL_TEXTURE_2D;
2199} 2845}
2200 2846
2201############################################################################# 2847#############################################################################
2202 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
2203package CFClient::UI::Gauge; 3003package DC::UI::Gauge;
2204 3004
2205our @ISA = CFClient::UI::VBox::; 3005our @ISA = DC::UI::VBox::;
2206 3006
2207sub new { 3007sub new {
2208 my ($class, %arg) = @_; 3008 my ($class, %arg) = @_;
2209 3009
2210 my $self = $class->SUPER::new ( 3010 my $self = $class->SUPER::new (
… …
2212 can_hover => 1, 3012 can_hover => 1,
2213 can_events => 1, 3013 can_events => 1,
2214 %arg, 3014 %arg,
2215 ); 3015 );
2216 3016
2217 $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");
2218 $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);
2219 $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");
2220 3020
2221 $self 3021 $self
2222} 3022}
2223 3023
2224sub set_fontsize { 3024sub set_fontsize {
… …
2245 $self->{value}->set_text ($val); 3045 $self->{value}->set_text ($val);
2246} 3046}
2247 3047
2248############################################################################# 3048#############################################################################
2249 3049
2250package CFClient::UI::Slider; 3050package DC::UI::Slider;
2251 3051
2252use strict; 3052use strict;
2253 3053
2254use CFClient::OpenGL; 3054use DC::OpenGL;
2255 3055
2256our @ISA = CFClient::UI::DrawBG::; 3056our @ISA = DC::UI::DrawBG::;
2257 3057
2258my @tex = 3058my @tex =
2259 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 3059 map { new_from_resource DC::Texture $_ }
2260 qw(s1_slider.png s1_slider_bg.png); 3060 qw(s1_slider.png s1_slider_bg.png);
2261 3061
2262sub new { 3062sub new {
2263 my $class = shift; 3063 my $class = shift;
2264 3064
… …
2285 $self->update; 3085 $self->update;
2286 3086
2287 $self 3087 $self
2288} 3088}
2289 3089
2290sub changed { }
2291
2292sub set_range { 3090sub set_range {
2293 my ($self, $range) = @_; 3091 my ($self, $range) = @_;
2294 3092
2295 ($range, $self->{range}) = ($self->{range}, $range); 3093 ($range, $self->{range}) = ($self->{range}, $range);
2296 3094
2297 $self->update
2298 if "@$range" ne "@{$self->{range}}"; 3095 if ("@$range" ne "@{$self->{range}}") {
3096 $self->update;
3097 $self->set_value ($self->{range}[0]);
3098 }
2299} 3099}
2300 3100
2301sub set_value { 3101sub set_value {
2302 my ($self, $value) = @_; 3102 my ($self, $value) = @_;
2303 3103
2304 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3104 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2305 3105
2306 $hi = $lo + 1 if $hi <= $lo; 3106 $hi = $lo if $hi < $lo;
2307 3107
2308 $page = $hi - $lo if $page > $hi - $lo; 3108 $value = $hi - $page if $value > $hi - $page;
2309
2310 $value = $lo if $value < $lo; 3109 $value = $lo if $value < $lo;
2311 $value = $hi - $page if $value > $hi - $page;
2312 3110
2313 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3111 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2314 if $unit; 3112 if $unit;
2315 3113
2316 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3114 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2317 3115
2318 if ($value != $old_value) { 3116 if ($value != $old_value) {
2319 $self->_emit (changed => $value); 3117 $self->emit (changed => $value);
2320 $self->update; 3118 $self->update;
2321 } 3119 }
2322} 3120}
2323 3121
2324sub size_request { 3122sub size_request {
2325 my ($self) = @_; 3123 my ($self) = @_;
2326 3124
2327 ($self->{req_w}, $self->{req_h}) 3125 ($self->{req_w}, $self->{req_h})
2328} 3126}
2329 3127
2330sub button_down { 3128sub invoke_button_down {
2331 my ($self, $ev, $x, $y) = @_; 3129 my ($self, $ev, $x, $y) = @_;
2332 3130
2333 $self->SUPER::button_down ($ev, $x, $y); 3131 $self->SUPER::invoke_button_down ($ev, $x, $y);
2334 3132
2335 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3133 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2336 3134
2337 $self->mouse_motion ($ev, $x, $y) 3135 $self->invoke_mouse_motion ($ev, $x, $y);
2338}
2339 3136
3137 1
3138}
3139
2340sub mouse_motion { 3140sub invoke_mouse_motion {
2341 my ($self, $ev, $x, $y) = @_; 3141 my ($self, $ev, $x, $y) = @_;
2342 3142
2343 if ($GRAB == $self) { 3143 if ($GRAB == $self) {
2344 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3144 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2345 3145
… …
2353 } 3153 }
2354 3154
2355 1 3155 1
2356} 3156}
2357 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
2358sub update { 3170sub update {
2359 my ($self) = @_; 3171 my ($self) = @_;
2360 3172
2361 delete $self->{knob_w}; 3173 delete $self->{knob_w};
2362 $self->SUPER::update; 3174 $self->SUPER::update;
… …
2366 my ($self) = @_; 3178 my ($self) = @_;
2367 3179
2368 unless ($self->{knob_w}) { 3180 unless ($self->{knob_w}) {
2369 $self->set_value ($self->{range}[0]); 3181 $self->set_value ($self->{range}[0]);
2370 3182
2371 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3183 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2372 my $range = ($hi - $page - $lo) || 1e-100; 3184 my $range = ($hi - $page - $lo) || 1e-10;
2373 3185
2374 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};
2375 3187
2376 $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;
2377 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3189 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2378 3190
2379 $value = ($value - $lo) / $range; 3191 $value = ($value - $lo) / $range;
… …
2409 glDisable GL_TEXTURE_2D; 3221 glDisable GL_TEXTURE_2D;
2410} 3222}
2411 3223
2412############################################################################# 3224#############################################################################
2413 3225
2414package CFClient::UI::ValSlider; 3226package DC::UI::ValSlider;
2415 3227
2416our @ISA = CFClient::UI::HBox::; 3228our @ISA = DC::UI::HBox::;
2417 3229
2418sub new { 3230sub new {
2419 my ($class, %arg) = @_; 3231 my ($class, %arg) = @_;
2420 3232
2421 my $range = delete $arg{range}; 3233 my $range = delete $arg{range};
2422 3234
2423 my $self = $class->SUPER::new ( 3235 my $self = $class->SUPER::new (
2424 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3236 slider => (new DC::UI::Slider expand => 1, range => $range),
2425 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3237 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2426 to_value => sub { shift }, 3238 to_value => sub { shift },
2427 from_value => sub { shift }, 3239 from_value => sub { shift },
2428 %arg, 3240 %arg,
2429 ); 3241 );
2430 3242
… …
2450sub set_range { shift->{slider}->set_range (@_) } 3262sub set_range { shift->{slider}->set_range (@_) }
2451sub set_value { shift->{slider}->set_value (@_) } 3263sub set_value { shift->{slider}->set_value (@_) }
2452 3264
2453############################################################################# 3265#############################################################################
2454 3266
2455package CFClient::UI::TextView; 3267package DC::UI::TextScroller;
2456 3268
2457our @ISA = CFClient::UI::HBox::; 3269our @ISA = DC::UI::HBox::;
2458 3270
2459use CFClient::OpenGL; 3271use DC::OpenGL;
2460 3272
2461sub new { 3273sub new {
2462 my $class = shift; 3274 my $class = shift;
2463 3275
2464 my $self = $class->SUPER::new ( 3276 my $self = $class->SUPER::new (
2465 fontsize => 1, 3277 fontsize => 1,
2466 can_events => 0, 3278 can_events => 1,
3279 indent => 0,
2467 #font => default_font 3280 #font => default_font
2468 @_, 3281 @_,
2469 3282
2470 layout => (new CFClient::Layout 1), 3283 layout => (new DC::Layout),
2471 par => [], 3284 par => [],
3285 max_par => 0,
2472 height => 0, 3286 height => 0,
2473 children => [ 3287 children => [
2474 (new CFClient::UI::Empty expand => 1), 3288 (new DC::UI::Empty expand => 1),
2475 (new CFClient::UI::Slider vertical => 1), 3289 (new DC::UI::Slider vertical => 1),
2476 ], 3290 ],
2477 ); 3291 );
2478 3292
2479 $self->{children}[1]->connect (changed => sub { $self->update }); 3293 $self->{children}[1]->connect (changed => sub { $self->update });
2480 3294
… …
2486 3300
2487 $self->{fontsize} = $fontsize; 3301 $self->{fontsize} = $fontsize;
2488 $self->reflow; 3302 $self->reflow;
2489} 3303}
2490 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
2491sub size_allocate { 3314sub invoke_size_allocate {
2492 my ($self, $w, $h) = @_; 3315 my ($self, $w, $h) = @_;
2493 3316
2494 $self->SUPER::size_allocate ($w, $h); 3317 my ($empty, $slider, @other) = @{ $self->{children} };
3318 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2495 3319
2496 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3320 $self->{layout}->set_font ($self->{font}) if $self->{font};
2497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3321 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2498 $self->{layout}->set_width ($self->{children}[0]{w}); 3322 $self->{layout}->set_width ($empty->{w});
3323 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2499 3324
2500 $self->reflow; 3325 $self->reflow;
2501}
2502 3326
2503sub text_size { 3327 local $self->{children} = [$empty, $slider];
3328 $self->SUPER::invoke_size_allocate ($w, $h)
3329}
3330
3331sub invoke_mouse_wheel {
2504 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) = @_;
2505 3343
2506 my $layout = $self->{layout}; 3344 my $layout = $self->{layout};
2507 3345
3346 $layout->set_font ($self->{font}) if $self->{font};
3347 $layout->set_foreground (@{$para->{fg}});
2508 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3348 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2509 $layout->set_width ($self->{children}[0]{w} - $indent); 3349 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3350 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2510 $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}}
2511 3357 );
3358
2512 $layout->size 3359 $layout
2513} 3360}
2514 3361
2515sub reflow { 3362sub reflow {
2516 my ($self) = @_; 3363 my ($self) = @_;
2517 3364
… …
2524 3371
2525 # todo: base offset on lines or so, not on pixels 3372 # todo: base offset on lines or so, not on pixels
2526 $self->{children}[1]->set_value ($offset); 3373 $self->{children}[1]->set_value ($offset);
2527} 3374}
2528 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
2529sub clear { 3391sub clear {
2530 my ($self) = @_; 3392 my ($self) = @_;
3393
3394 my (undef, undef, @other) = @{ $self->{children} };
3395 $self->remove ($_) for @other;
2531 3396
2532 $self->{par} = []; 3397 $self->{par} = [];
2533 $self->{height} = 0; 3398 $self->{height} = 0;
2534 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3399 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2535} 3400}
2536 3401
2537sub add_paragraph { 3402sub add_paragraph {
2538 my ($self, $color, $text, $indent) = @_; 3403 my $self = shift;
2539 3404
2540 for my $line (split /\n/, $text) { 3405 for my $para (@_) {
2541 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
2542 $self->{height} += $h; 3457 $self->{height} = $height;
2543 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3458 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2544 }
2545 3459
2546 $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 }
2547} 3466}
2548 3467
2549sub update { 3468sub update {
2550 my ($self) = @_; 3469 my ($self) = @_;
2551 3470
… …
2553 3472
2554 return unless $self->{h} > 0; 3473 return unless $self->{h} > 0;
2555 3474
2556 delete $self->{texture}; 3475 delete $self->{texture};
2557 3476
2558 $ROOT->on_post_alloc ($self, sub { 3477 $ROOT->on_post_alloc ($self => sub {
3478 $self->force_uptodate;
3479
2559 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3480 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2560 3481
2561 if (delete $self->{need_reflow}) {
2562 my $height = 0;
2563
2564 my $layout = $self->{layout};
2565
2566 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2567
2568 for (@{$self->{par}}) {
2569 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2570 $layout->set_width ($W - $_->[3]);
2571 $layout->set_markup ($_->[4]);
2572 my ($w, $h) = $layout->size;
2573 $_->[0] = $w + $_->[3];
2574 $_->[1] = $h;
2575 }
2576
2577 $height += $_->[1];
2578 }
2579
2580 $self->{height} = $height;
2581
2582 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2583
2584 delete $self->{texture};
2585 }
2586
2587 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3482 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2588 glClearColor 0, 0, 0, 0; 3483 glClearColor 0, 0, 0, 0;
2589 glClear GL_COLOR_BUFFER_BIT; 3484 glClear GL_COLOR_BUFFER_BIT;
2590 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;
2591 my $top = int $self->{children}[1]{range}[0]; 3494 my $top = int $self->{children}[1]{range}[0];
2592 3495
2593 my $y0 = $top; 3496 my $y0 = $top;
2594 my $y1 = $top + $H; 3497 my $y1 = $top + $H;
2595 3498
2596 my $y = 0;
2597
2598 my $layout = $self->{layout};
2599
2600 $layout->set_font ($self->{font}) if $self->{font};
2601
2602 glEnable GL_BLEND;
2603 #TODO# not correct in windows where rgba is forced off
2604 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2605
2606 for my $par (@{$self->{par}}) { 3499 for my $para (@{$self->{par}}) {
2607 my $h = $par->[1]; 3500 my $h = $para->{h};
3501 my $y = $para->{y};
2608 3502
2609 if ($y0 < $y + $h && $y < $y1) { 3503 if ($y0 < $y + $h && $y < $y1) {
2610 $layout->set_foreground (@{ $par->[2] }); 3504 my $layout = $self->get_layout ($para);
2611 $layout->set_width ($W - $par->[3]);
2612 $layout->set_markup ($par->[4]);
2613 3505
2614 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3506 $layout->render ($para->{indent}, $y - $y0);
3507 $layout->draw;
2615 3508
2616 glRasterPos $par->[3], $y - $y0; 3509 if (my @w = @{ $para->{widget} }) {
2617 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 }
2618 } 3521 }
2619 3522
2620 $y += $h; 3523 $paridx++;
3524 $top_paragraph ||= $paridx if $y >= $top;
2621 } 3525 }
2622 3526
2623 glDisable GL_BLEND; 3527 $self->{top_paragraph} = $top_paragraph;
2624 }; 3528 };
2625 }); 3529 });
3530}
3531
3532sub reconfigure {
3533 my ($self) = @_;
3534
3535 $self->SUPER::reconfigure;
3536
3537 $_->{w} = 1e10 for @{ $self->{par} };
3538 $self->reflow;
2626} 3539}
2627 3540
2628sub _draw { 3541sub _draw {
2629 my ($self) = @_; 3542 my ($self) = @_;
2630 3543
… …
2633 glColor 0, 0, 0, 1; 3546 glColor 0, 0, 0, 1;
2634 $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});
2635 glDisable GL_TEXTURE_2D; 3548 glDisable GL_TEXTURE_2D;
2636 3549
2637 $self->{children}[1]->draw; 3550 $self->{children}[1]->draw;
2638
2639} 3551}
2640 3552
2641############################################################################# 3553#############################################################################
2642 3554
2643package CFClient::UI::Animator; 3555package DC::UI::Animator;
2644 3556
2645use CFClient::OpenGL; 3557use DC::OpenGL;
2646 3558
2647our @ISA = CFClient::UI::Bin::; 3559our @ISA = DC::UI::Bin::;
2648 3560
2649sub moveto { 3561sub moveto {
2650 my ($self, $x, $y) = @_; 3562 my ($self, $x, $y) = @_;
2651 3563
2652 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3564 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2680 glPopMatrix; 3592 glPopMatrix;
2681} 3593}
2682 3594
2683############################################################################# 3595#############################################################################
2684 3596
2685package CFClient::UI::Flopper; 3597package DC::UI::Flopper;
2686 3598
2687our @ISA = CFClient::UI::Button::; 3599our @ISA = DC::UI::Button::;
2688 3600
2689sub new { 3601sub new {
2690 my $class = shift; 3602 my $class = shift;
2691 3603
2692 my $self = $class->SUPER::new ( 3604 my $self = $class->SUPER::new (
… …
2704 $self->{other}->toggle_visibility; 3616 $self->{other}->toggle_visibility;
2705} 3617}
2706 3618
2707############################################################################# 3619#############################################################################
2708 3620
2709package CFClient::UI::Tooltip; 3621package DC::UI::Tooltip;
2710 3622
2711our @ISA = CFClient::UI::Bin::; 3623our @ISA = DC::UI::Bin::;
2712 3624
2713use CFClient::OpenGL; 3625use DC::OpenGL;
2714 3626
2715sub new { 3627sub new {
2716 my $class = shift; 3628 my $class = shift;
2717 3629
2718 $class->SUPER::new ( 3630 $class->SUPER::new (
… …
2722} 3634}
2723 3635
2724sub set_tooltip_from { 3636sub set_tooltip_from {
2725 my ($self, $widget) = @_; 3637 my ($self, $widget) = @_;
2726 3638
2727 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 =~ /^#(.*)$/;
2728 3644
2729 if ($ENV{CFPLUS_DEBUG} & 2) { 3645 if ($ENV{CFPLUS_DEBUG} & 2) {
2730 $tooltip .= "\n\n" . (ref $widget) . "\n" 3646 $tip .= "\n\n" . (ref $widget) . "\n"
2731 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3647 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2732 . "req $widget->{req_w} $widget->{req_h}\n" 3648 . "req $widget->{req_w} $widget->{req_h}\n"
2733 . "visible $widget->{visible}"; 3649 . "visible $widget->{visible}";
2734 } 3650 }
2735 3651
3652 $tip =~ s/^\n+//;
3653 $tip =~ s/\n+$//;
3654
2736 $self->add (new CFClient::UI::Label 3655 $self->add (new DC::UI::Label
3656 fg => $DC::THEME{tooltip_fg},
2737 markup => $tooltip, 3657 markup => $tip,
2738 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3658 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3659 align => 0,
2739 fontsize => 0.8, 3660 fontsize => 0.8,
2740 fg => [0, 0, 0, 1], 3661 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
2741 ellipsise => 0, 3662 ellipsise => 0,
2742 font => ($widget->{tooltip_font} || $::FONT_PROP), 3663 font => ($widget->{tooltip_font} || $::FONT_PROP),
2743 ); 3664 );
2744} 3665}
2745 3666
… …
2749 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3670 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2750 3671
2751 ($w + 4, $h + 4) 3672 ($w + 4, $h + 4)
2752} 3673}
2753 3674
2754sub size_allocate { 3675sub invoke_size_allocate {
2755 my ($self, $w, $h) = @_; 3676 my ($self, $w, $h) = @_;
2756 3677
2757 $self->SUPER::size_allocate ($w - 4, $h - 4); 3678 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2758} 3679}
2759 3680
2760sub visibility_change { 3681sub invoke_visibility_change {
2761 my ($self, $visible) = @_; 3682 my ($self, $visible) = @_;
2762 3683
2763 return unless $visible; 3684 return unless $visible;
2764 3685
2765 $self->{root}->on_post_alloc ("move_$self" => sub { 3686 $self->{root}->on_post_alloc ("move_$self" => sub {
2766 my $widget = $self->{owner} 3687 my $widget = $self->{owner}
2767 or return; 3688 or return;
2768 3689
3690 if ($widget->{visible}) {
2769 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3691 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2770 3692
2771 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3693 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2772 if $x + $self->{w} > $::WIDTH; 3694 if $x + $self->{w} > $self->{root}{w};
2773 3695
2774 $self->move_abs ($x, $y); 3696 $self->move_abs ($x, $y);
3697 } else {
3698 $self->hide;
3699 }
2775 }); 3700 });
2776} 3701}
2777 3702
2778sub _draw { 3703sub _draw {
2779 my ($self) = @_; 3704 my ($self) = @_;
2780 3705
2781 glTranslate 0.375, 0.375;
2782
2783 my ($w, $h) = @$self{qw(w h)}; 3706 my ($w, $h) = @$self{qw(w h)};
2784 3707
2785 glColor 1, 0.8, 0.4; 3708 glColor @{ $DC::THEME{tooltip_bg} };
2786 glBegin GL_QUADS; 3709 glRect 0, 0, $w, $h;
2787 glVertex 0 , 0;
2788 glVertex 0 , $h;
2789 glVertex $w, $h;
2790 glVertex $w, 0;
2791 glEnd;
2792 3710
2793 glColor 0, 0, 0; 3711 glColor @{ $DC::THEME{tooltip_border} };
2794 glBegin GL_LINE_LOOP; 3712 glRect_lineloop .5, .5, $w + .5, $h + .5;
2795 glVertex 0 , 0;
2796 glVertex 0 , $h;
2797 glVertex $w, $h;
2798 glVertex $w, 0;
2799 glEnd;
2800 3713
2801 glTranslate 2 - 0.375, 2 - 0.375; 3714 glTranslate 2, 2;
2802 3715
2803 $self->SUPER::_draw; 3716 $self->SUPER::_draw;
2804} 3717}
2805 3718
2806############################################################################# 3719#############################################################################
2807 3720
2808package CFClient::UI::Face; 3721package DC::UI::Face;
2809 3722
2810our @ISA = CFClient::UI::Base::; 3723our @ISA = DC::UI::DrawBG::;
2811 3724
2812use CFClient::OpenGL; 3725use DC::OpenGL;
2813 3726
2814sub new { 3727sub new {
2815 my $class = shift; 3728 my $class = shift;
2816 3729
2817 my $self = $class->SUPER::new ( 3730 my $self = $class->SUPER::new (
3731 size_w => 32,
3732 size_h => 8,
2818 aspect => 1, 3733 aspect => 1,
2819 can_events => 0, 3734 can_events => 0,
2820 @_, 3735 @_,
2821 ); 3736 );
2822 3737
2823 if ($self->{anim} && $self->{animspeed}) { 3738 $self->update_anim;
2824 Scalar::Util::weaken (my $widget = $self);
2825
2826 $self->{timer} = Event->timer (
2827 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2828 hard => 1,
2829 interval => $self->{animspeed},
2830 cb => sub {
2831 ++$widget->{frame};
2832 $widget->update;
2833 },
2834 );
2835 }
2836 3739
2837 $self 3740 $self
2838} 3741}
2839 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
2840sub size_request { 3802sub size_request {
2841 (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)
2842} 3820}
2843 3821
2844sub update { 3822sub update {
2845 my ($self) = @_; 3823 my ($self) = @_;
2846 3824
2847 return unless $self->{visible}; 3825 return unless $self->{visible};
2848 3826
2849 $self->SUPER::update; 3827 $self->SUPER::update;
2850} 3828}
2851 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
2852sub _draw { 3859sub _draw {
2853 my ($self) = @_; 3860 my ($self) = @_;
2854 3861
2855 return unless $::CONN; 3862 $self->SUPER::_draw;
2856 3863
2857 my $face; 3864 if (my $tex = $self->{tex}) {
2858
2859 if ($self->{frame}) {
2860 my $anim = $::CONN->{anim}[$self->{anim}];
2861
2862 $face = $anim->[ $self->{frame} % @$anim ]
2863 if $anim && @$anim;
2864 }
2865
2866 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2867
2868 if ($tex) {
2869 glEnable GL_TEXTURE_2D; 3865 glEnable GL_TEXTURE_2D;
2870 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2871 glColor 0, 0, 0, 1; 3867 glColor 0, 0, 0, 1;
2872 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3868 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2873 glDisable GL_TEXTURE_2D; 3869 glDisable GL_TEXTURE_2D;
2874 } 3870 }
2875} 3871}
2876 3872
2877sub DESTROY { 3873sub destroy {
2878 my ($self) = @_; 3874 my ($self) = @_;
2879 3875
2880 $self->{timer}->cancel 3876 (delete $self->{timer})->cancel
2881 if $self->{timer}; 3877 if $self->{timer};
2882 3878
2883 $self->SUPER::DESTROY; 3879 $self->SUPER::destroy;
2884} 3880}
2885 3881
2886############################################################################# 3882#############################################################################
2887 3883
2888package CFClient::UI::Buttonbar; 3884package DC::UI::Buttonbar;
2889 3885
2890our @ISA = CFClient::UI::HBox::; 3886our @ISA = DC::UI::HBox::;
2891 3887
2892# TODO: should actualyl wrap buttons and other goodies. 3888# TODO: should actually wrap buttons and other goodies.
2893 3889
2894############################################################################# 3890#############################################################################
2895 3891
2896package CFClient::UI::Menu; 3892package DC::UI::Menu;
2897 3893
2898our @ISA = CFClient::UI::FancyFrame::; 3894our @ISA = DC::UI::Toplevel::;
2899 3895
2900use CFClient::OpenGL; 3896use DC::OpenGL;
2901 3897
2902sub new { 3898sub new {
2903 my $class = shift; 3899 my $class = shift;
2904 3900
2905 my $self = $class->SUPER::new ( 3901 my $self = $class->SUPER::new (
2906 items => [], 3902 items => [],
2907 z => 100, 3903 z => 100,
2908 @_, 3904 @_,
2909 ); 3905 );
2910 3906
2911 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3907 $self->add ($self->{vbox} = new DC::UI::VBox);
2912 3908
2913 for my $item (@{ $self->{items} }) { 3909 for my $item (@{ $self->{items} }) {
2914 my ($widget, $cb) = @$item; 3910 my ($widget, $cb, $tooltip) = @$item;
2915 3911
2916 # handle various types of items, only text for now 3912 # handle various types of items, only text for now
2917 if (!ref $widget) { 3913 if (!ref $widget) {
3914 if ($widget =~ /\t/) {
3915 my ($left, $right) = split /\t/, $widget, 2;
3916
2918 $widget = new CFClient::UI::Label 3917 $widget = new DC::UI::HBox
2919 can_hover => 1, 3918 can_hover => 1,
2920 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,
2921 text => $widget; 3932 markup => $widget,
3933 tooltip => $tooltip;
3934 }
2922 } 3935 }
2923 3936
2924 $self->{item}{$widget} = $item; 3937 $self->{item}{$widget} = $item;
2925 3938
2926 $self->{vbox}->add ($widget); 3939 $self->{vbox}->add ($widget);
… …
2931 3944
2932# 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)
2933sub popup { 3946sub popup {
2934 my ($self, $ev) = @_; 3947 my ($self, $ev) = @_;
2935 3948
2936 $self->_emit ("popdown"); 3949 $self->emit ("popdown");
2937 3950
2938 # maybe save $GRAB? must be careful about events... 3951 # maybe save $GRAB? must be careful about events...
2939 $GRAB = $self; 3952 $GRAB = $self;
2940 $self->{button} = $ev->{button}; 3953 $self->{button} = $ev->{button};
2941 3954
2942 $self->show; 3955 $self->show;
2943 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2944}
2945 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
2946sub mouse_motion { 3967sub invoke_mouse_motion {
2947 my ($self, $ev, $x, $y) = @_; 3968 my ($self, $ev, $x, $y) = @_;
2948 3969
2949 # TODO: should use vbox->find_widget or so 3970 # TODO: should use vbox->find_widget or so
2950 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3971 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2951 $self->{hover} = $self->{item}{$HOVER}; 3972 $self->{hover} = $self->{item}{$HOVER};
2952 3973
2953 0 3974 0
2954} 3975}
2955 3976
2956sub button_up { 3977sub invoke_button_up {
2957 my ($self, $ev, $x, $y) = @_; 3978 my ($self, $ev, $x, $y) = @_;
2958 3979
2959 if ($ev->{button} == $self->{button}) { 3980 if ($ev->{button} == $self->{button}) {
2960 undef $GRAB; 3981 undef $GRAB;
2961 $self->hide; 3982 $self->hide;
2962 3983
2963 $self->_emit ("popdown"); 3984 $self->emit ("popdown");
2964 $self->{hover}[1]->() if $self->{hover}; 3985 $self->{hover}[1]->() if $self->{hover};
2965 } else { 3986 } else {
2966 return 0 3987 return 0
2967 } 3988 }
2968 3989
2969 1 3990 1
2970} 3991}
2971 3992
2972############################################################################# 3993#############################################################################
2973 3994
2974package CFClient::UI::Multiplexer; 3995package DC::UI::Multiplexer;
2975 3996
2976our @ISA = CFClient::UI::Container::; 3997our @ISA = DC::UI::Container::;
2977 3998
2978sub new { 3999sub new {
2979 my $class = shift; 4000 my $class = shift;
2980 4001
2981 my $self = $class->SUPER::new ( 4002 my $self = $class->SUPER::new (
2982 @_, 4003 @_,
2983 ); 4004 );
2984 4005
2985 $self->{current} = $self->{children}[0] 4006 $self->set_current_page (0);
2986 if @{ $self->{children} };
2987 4007
2988 $self 4008 $self
2989} 4009}
2990 4010
2991sub add { 4011sub add {
2992 my ($self, @widgets) = @_; 4012 my ($self, @widgets) = @_;
2993 4013
2994 $self->SUPER::add (@widgets); 4014 $self->SUPER::add (@widgets);
2995 4015
2996 $self->{current} = $self->{children}[0] 4016 $self->set_current_page (0)
2997 if @{ $self->{children} }; 4017 if @widgets == @{ $self->{children} };
4018}
4019
4020sub get_current_page {
4021 my ($self) = @_;
4022
4023 $self->{current}
2998} 4024}
2999 4025
3000sub set_current_page { 4026sub set_current_page {
3001 my ($self, $page_or_widget) = @_; 4027 my ($self, $page_or_widget) = @_;
3002 4028
3003 my $widget = ref $page_or_widget 4029 my $widget = ref $page_or_widget
3004 ? $page_or_widget 4030 ? $page_or_widget
3005 : $self->{children}[$page_or_widget]; 4031 : $self->{children}[$page_or_widget];
3006 4032
4033 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4034
3007 $self->{current} = $widget; 4035 if (($self->{current} = $widget)) {
4036 $self->{current}->set_visible if $self->{current} && $self->{visible};
3008 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4037 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3009 4038
3010 $self->_emit (page_changed => $self->{current}); 4039 $self->emit (page_changed => $self->{current});
4040 }
3011 4041
3012 $self->realloc; 4042 $self->realloc;
3013} 4043}
3014 4044
3015sub visible_children { 4045sub visible_children {
3016 $_[0]{current} 4046 $_[0]{current} || ()
3017} 4047}
3018 4048
3019sub size_request { 4049sub size_request {
3020 my ($self) = @_; 4050 my ($self) = @_;
3021 4051
4052 $self->{current}
3022 $self->{current}->size_request 4053 ? $self->{current}->size_request
4054 : (0, 0)
3023} 4055}
3024 4056
3025sub size_allocate { 4057sub invoke_size_allocate {
3026 my ($self, $w, $h) = @_; 4058 my ($self, $w, $h) = @_;
3027 4059
3028 $self->{current}->configure (0, 0, $w, $h); 4060 $self->{current}->configure (0, 0, $w, $h)
4061 if $self->{current};
4062
4063 1
3029} 4064}
3030 4065
3031sub _draw { 4066sub _draw {
3032 my ($self) = @_; 4067 my ($self) = @_;
3033 4068
3034 $self->{current}->draw; 4069 $self->{current}->draw
4070 if $self->{current};
3035} 4071}
3036 4072
3037############################################################################# 4073#############################################################################
3038 4074
3039package CFClient::UI::Notebook; 4075package DC::UI::Notebook;
3040 4076
4077use DC::OpenGL;
4078
3041our @ISA = CFClient::UI::VBox::; 4079our @ISA = DC::UI::VBox::;
3042 4080
3043sub new { 4081sub new {
3044 my $class = shift; 4082 my $class = shift;
3045 4083
3046 my $self = $class->SUPER::new ( 4084 my $self = $class->SUPER::new (
3047 buttonbar => (new CFClient::UI::Buttonbar), 4085 buttonbar => (new DC::UI::Buttonbar),
3048 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 4086 multiplexer => (new DC::UI::Multiplexer expand => 1),
4087 active_outline => [.7, .7, 0.2],
3049 # filter => # will be put between multiplexer and $self 4088 # filter => # will be put between multiplexer and $self
3050 @_, 4089 @_,
3051 ); 4090 );
3052 4091
3053 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4092 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3054 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4093 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3055 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
3056 $self 4129 $self
3057} 4130}
3058 4131
3059sub 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 {
3060 my ($self, $title, $widget, $tooltip) = @_; 4162 my ($self, $title, $widget, $tooltip) = @_;
3061 4163
3062 Scalar::Util::weaken $self; 4164 $title = [$title, $tooltip] unless ref $title;
4165 $widget->{c_tab} = $title;
3063 4166
3064 $self->{buttonbar}->add (new CFClient::UI::Button
3065 markup => $title,
3066 tooltip => $tooltip,
3067 on_activate => sub { $self->set_current_page ($widget) },
3068 );
3069
3070 $self->{multiplexer}->add ($widget); 4167 $self->add ($widget);
4168}
4169
4170sub get_current_page {
4171 my ($self) = @_;
4172
4173 $self->{multiplexer}->get_current_page
3071} 4174}
3072 4175
3073sub set_current_page { 4176sub set_current_page {
3074 my ($self, $page) = @_; 4177 my ($self, $page) = @_;
3075 4178
3076 $self->{multiplexer}->set_current_page ($page); 4179 $self->{multiplexer}->set_current_page ($page);
3077 $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 }
3078} 4201}
3079 4202
3080############################################################################# 4203#############################################################################
3081 4204
4205package DC::UI::Selector;
4206
4207use utf8;
4208
4209our @ISA = DC::UI::Button::;
4210
4211sub new {
4212 my $class = shift;
4213
4214 my $self = $class->SUPER::new (
4215 options => [], # [value, title, longdesc], ...
4216 value => undef,
4217 @_,
4218 );
4219
4220 $self->_set_value ($self->{value});
4221
4222 $self
4223}
4224
4225sub invoke_button_down {
4226 my ($self, $ev) = @_;
4227
4228 my @menu_items;
4229
4230 for (@{ $self->{options} }) {
4231 my ($value, $title, $tooltip) = @$_;
4232
4233 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
4234 }
4235
4236 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
4237}
4238
4239sub _set_value {
4240 my ($self, $value) = @_;
4241
4242 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4243 $item ||= $self->{options}[0]
4244 or return;
4245
4246 $self->{value} = $item->[0];
4247 $self->set_markup ("$item->[1] ⇓");
4248# $self->set_tooltip ($item->[2]);
4249}
4250
4251sub set_value {
4252 my ($self, $value) = @_;
4253
4254 return unless $self->{value} ne $value;
4255
4256 $self->_set_value ($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});
4265}
4266
4267#############################################################################
4268
3082package CFClient::UI::Statusbox; 4269package DC::UI::Statusbox;
3083 4270
3084our @ISA = CFClient::UI::VBox::; 4271our @ISA = DC::UI::VBox::;
3085 4272
3086sub new { 4273sub new {
3087 my $class = shift; 4274 my $class = shift;
3088 4275
3089 my $self = $class->SUPER::new ( 4276 my $self = $class->SUPER::new (
3090 fontsize => 0.8, 4277 fontsize => 0.8,
3091 @_, 4278 @_,
3092 ); 4279 );
3093 4280
3094 Scalar::Util::weaken (my $this = $self); 4281 DC::weaken (my $this = $self);
3095 4282
3096 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4283 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3097 4284
3098 $self 4285 $self
3099} 4286}
3100 4287
3101sub reorder { 4288sub reorder {
3102 my ($self) = @_; 4289 my ($self) = @_;
3103 my $NOW = Time::HiRes::time; 4290 my $NOW = EV::time;
3104 4291
3105 # freeze display when hovering over any label 4292 # freeze display when hovering over any label
3106 return if $CFClient::UI::TOOLTIP->{owner} 4293 return if $DC::UI::TOOLTIP->{owner}
3107 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4294 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3108 values %{ $self->{item} }; 4295 values %{ $self->{item} };
3109 4296
3110 while (my ($k, $v) = each %{ $self->{item} }) { 4297 while (my ($k, $v) = each %{ $self->{item} }) {
3111 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4298 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3112 } 4299 }
4300
4301 $self->{timer}->set (1, 1);
3113 4302
3114 my @widgets; 4303 my @widgets;
3115 4304
3116 my @items = sort { 4305 my @items = sort {
3117 $a->{pri} <=> $b->{pri} 4306 $a->{pri} <=> $b->{pri}
3118 or $b->{id} <=> $a->{id} 4307 or $b->{id} <=> $a->{id}
3119 } values %{ $self->{item} }; 4308 } values %{ $self->{item} };
3120
3121 $self->{timer}->interval (1);
3122 4309
3123 my $count = 10 + 1; 4310 my $count = 10 + 1;
3124 for my $item (@items) { 4311 for my $item (@items) {
3125 last unless --$count; 4312 last unless --$count;
3126 4313
… …
3133 for ($short) { 4320 for ($short) {
3134 s/^\s+//; 4321 s/^\s+//;
3135 s/\s+/ /g; 4322 s/\s+/ /g;
3136 } 4323 }
3137 4324
3138 new CFClient::UI::Label 4325 new DC::UI::Label
3139 markup => $short, 4326 markup => $short,
3140 tooltip => $item->{tooltip}, 4327 tooltip => $item->{tooltip},
3141 tooltip_font => $::FONT_PROP, 4328 tooltip_font => $::FONT_PROP,
3142 tooltip_width => 0.67, 4329 tooltip_width => 0.67,
3143 fontsize => $item->{fontsize} || $self->{fontsize}, 4330 fontsize => $item->{fontsize} || $self->{fontsize},
3144 max_w => $::WIDTH * 0.44, 4331 max_w => $::WIDTH * 0.44,
4332 align => 0,
3145 fg => [@{ $item->{fg} }], 4333 fg => [@{ $item->{fg} }],
3146 can_events => 1, 4334 can_events => 1,
3147 can_hover => 1 4335 can_hover => 1
3148 }; 4336 };
3149 4337
3150 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4338 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3151 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4339 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3152 $label->update; 4340 $label->update;
3153 $label->set_max_size (undef, $label->{req_h} * $diff) 4341 $label->set_max_size (undef, $label->{req_h} * $diff)
3154 if $diff < 1; 4342 if $diff < 1;
3155 $self->{timer}->interval (1/30); 4343 $self->{timer}->set (1/30, 1/30);
3156 } else { 4344 } else {
3157 $label->{fg}[3] = $item->{fg}[3] || 1; 4345 $label->{fg}[3] = $item->{fg}[3] || 1;
3158 } 4346 }
3159 4347
3160 push @widgets, $label; 4348 push @widgets, $label;
3161 } 4349 }
4350
4351 my $hash = join ",", @widgets;
4352 return if $hash eq $self->{last_widget_hash};
4353 $self->{last_widget_hash} = $hash;
3162 4354
3163 $self->clear; 4355 $self->clear;
3164 $self->SUPER::add (reverse @widgets); 4356 $self->SUPER::add (reverse @widgets);
3165} 4357}
3166 4358
… …
3181 $item->{count}++; 4373 $item->{count}++;
3182 } else { 4374 } else {
3183 $item->{count} = 1; 4375 $item->{count} = 1;
3184 $item->{text} = $item->{tooltip} = $text; 4376 $item->{text} = $item->{tooltip} = $text;
3185 } 4377 }
3186 $item->{id} = ++$self->{id}; 4378 $item->{id} += 0.2;#d#
3187 $item->{timeout} = $timeout; 4379 $item->{timeout} = $timeout;
3188 delete $item->{label}; 4380 delete $item->{label};
3189 } else { 4381 } else {
3190 $self->{item}{$group} = { 4382 $self->{item}{$group} = {
3191 id => ++$self->{id}, 4383 id => ++$self->{id},
… …
3197 count => 1, 4389 count => 1,
3198 %arg, 4390 %arg,
3199 }; 4391 };
3200 } 4392 }
3201 4393
4394 $ROOT->on_refresh (reorder => sub {
3202 $self->reorder; 4395 $self->reorder;
4396 });
3203} 4397}
3204 4398
3205sub reconfigure { 4399sub reconfigure {
3206 my ($self) = @_; 4400 my ($self) = @_;
3207 4401
… …
3210 4404
3211 $self->reorder; 4405 $self->reorder;
3212 $self->SUPER::reconfigure; 4406 $self->SUPER::reconfigure;
3213} 4407}
3214 4408
3215sub DESTROY { 4409sub destroy {
3216 my ($self) = @_; 4410 my ($self) = @_;
3217 4411
3218 $self->{timer}->cancel; 4412 $self->{timer}->cancel;
3219 4413
3220 $self->SUPER::DESTROY; 4414 $self->SUPER::destroy;
3221} 4415}
3222 4416
3223############################################################################# 4417#############################################################################
3224 4418
3225package CFClient::UI::Inventory;
3226
3227our @ISA = CFClient::UI::ScrolledWindow::;
3228
3229sub new {
3230 my $class = shift;
3231
3232 my $self = $class->SUPER::new (
3233 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3234 @_,
3235 );
3236
3237 $self
3238}
3239
3240sub set_items {
3241 my ($self, $items) = @_;
3242
3243 $self->{child}->clear;
3244 return unless $items;
3245
3246 my @items = sort {
3247 ($a->{type} <=> $b->{type})
3248 or ($a->{name} cmp $b->{name})
3249 } @$items;
3250
3251 $self->{real_items} = \@items;
3252
3253 my $row = 0;
3254 for my $item (@items) {
3255 CFClient::Item::update_widgets $item;
3256
3257 $self->{child}->add (0, $row, $item->{face_widget});
3258 $self->{child}->add (1, $row, $item->{desc_widget});
3259 $self->{child}->add (2, $row, $item->{weight_widget});
3260
3261 $row++;
3262 }
3263}
3264
3265#############################################################################
3266
3267package CFClient::UI::BindEditor;
3268
3269our @ISA = CFClient::UI::FancyFrame::;
3270
3271sub new {
3272 my $class = shift;
3273
3274 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3275
3276 $self->add (my $vb = new CFClient::UI::VBox);
3277
3278
3279 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3280 text => "start recording",
3281 tooltip => "Start/Stops recording of actions."
3282 ."All subsequent actions after the recording started will be captured."
3283 ."The actions are displayed after the record was stopped."
3284 ."To bind the action you have to click on the 'Bind' button",
3285 on_activate => sub {
3286 unless ($self->{recording}) {
3287 $self->start;
3288 } else {
3289 $self->stop;
3290 }
3291 });
3292
3293 $vb->add (new CFClient::UI::Label text => "Actions:");
3294 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3295
3296 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3297 $vb->add (my $hb = new CFClient::UI::HBox);
3298 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3299 $hb->add (new CFClient::UI::Button
3300 text => "bind",
3301 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3302 on_activate => sub {
3303 $self->ask_for_bind;
3304 });
3305
3306 $vb->add (my $hb = new CFClient::UI::HBox);
3307 $hb->add (new CFClient::UI::Button
3308 text => "ok",
3309 expand => 1,
3310 tooltip => "This closes the binding editor and saves the binding",
3311 on_activate => sub {
3312 $self->hide;
3313 $self->commit;
3314 });
3315
3316 $hb->add (new CFClient::UI::Button
3317 text => "cancel",
3318 expand => 1,
3319 tooltip => "This closes the binding editor without saving",
3320 on_activate => sub {
3321 $self->hide;
3322 $self->{binding_cancel}->()
3323 if $self->{binding_cancel};
3324 });
3325
3326 $self->update_binding_widgets;
3327
3328 $self
3329}
3330
3331sub commit {
3332 my ($self) = @_;
3333 my ($mod, $sym, $cmds) = $self->get_binding;
3334 if ($sym != 0 && @$cmds > 0) {
3335 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3336 ."'. Don't forget 'Save Config'!");
3337 $self->{binding_change}->($mod, $sym, $cmds)
3338 if $self->{binding_change};
3339 } else {
3340 $::STATUSBOX->add ("No action bound, no key or action specified!");
3341 $self->{binding_cancel}->()
3342 if $self->{binding_cancel};
3343 }
3344}
3345
3346sub start {
3347 my ($self) = @_;
3348
3349 $self->{rec_btn}->set_text ("stop recording");
3350 $self->{recording} = 1;
3351 $self->clear_command_list;
3352 $::CONN->start_record if $::CONN;
3353}
3354
3355sub stop {
3356 my ($self) = @_;
3357
3358 $self->{rec_btn}->set_text ("start recording");
3359 $self->{recording} = 0;
3360
3361 my $rec;
3362 $rec = $::CONN->stop_record if $::CONN;
3363 return unless ref $rec eq 'ARRAY';
3364 $self->set_command_list ($rec);
3365}
3366
3367
3368sub ask_for_bind_and_commit {
3369 my ($self) = @_;
3370 $self->ask_for_bind (1);
3371}
3372
3373sub ask_for_bind {
3374 my ($self, $commit) = @_;
3375
3376 CFClient::Binder::open_binding_dialog (sub {
3377 my ($mod, $sym) = @_;
3378 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3379 $self->update_binding_widgets;
3380 $self->commit if $commit;
3381 });
3382}
3383
3384# $mod and $sym are the modifiers and key symbol
3385# $cmds is a array ref of strings (the commands)
3386# $cb is the callback that is executed on OK
3387# $ccb is the callback that is executed on CANCEL and
3388# when the binding was unsuccessful on OK
3389sub set_binding {
3390 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3391
3392 $self->clear_command_list;
3393 $self->{recording} = 0;
3394 $self->{rec_btn}->set_text ("start recording");
3395
3396 $self->{binding} = [$mod, $sym];
3397 $self->{commands} = $cmds;
3398
3399 $self->{binding_change} = $cb;
3400 $self->{binding_cancel} = $ccb;
3401
3402 $self->update_binding_widgets;
3403}
3404
3405# this is a shortcut method that asks for a binding
3406# and then just binds it.
3407sub do_quick_binding {
3408 my ($self, $cmds) = @_;
3409 $self->set_binding (undef, undef, $cmds, sub {
3410 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3411 });
3412 $self->ask_for_bind (1);
3413}
3414
3415sub update_binding_widgets {
3416 my ($self) = @_;
3417 my ($mod, $sym, $cmds) = $self->get_binding;
3418 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3419 $self->set_command_list ($cmds);
3420}
3421
3422sub get_binding {
3423 my ($self) = @_;
3424 return (
3425 $self->{binding}->[0],
3426 $self->{binding}->[1],
3427 [ grep { defined $_ } @{$self->{commands}} ]
3428 );
3429}
3430
3431sub clear_command_list {
3432 my ($self) = @_;
3433 $self->{cmdbox}->clear ();
3434}
3435
3436sub set_command_list {
3437 my ($self, $cmds) = @_;
3438
3439 $self->{cmdbox}->clear ();
3440 $self->{commands} = $cmds;
3441
3442 my $idx = 0;
3443
3444 for (@$cmds) {
3445 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3446
3447 my $i = $idx;
3448 $hb->add (new CFClient::UI::Label text => $_);
3449 $hb->add (new CFClient::UI::Button
3450 text => "delete",
3451 tooltip => "Deletes the action from the record",
3452 on_activate => sub {
3453 $self->{cmdbox}->remove ($hb);
3454 $cmds->[$i] = undef;
3455 });
3456
3457
3458 $idx++
3459 }
3460}
3461
3462#############################################################################
3463
3464package CFClient::UI::SpellList;
3465
3466our @ISA = CFClient::UI::Table::;
3467
3468sub new {
3469 my $class = shift;
3470
3471 my $self = $class->SUPER::new (
3472 binding => [],
3473 commands => [],
3474 @_,
3475 )
3476}
3477
3478# XXX: Do sorting? Argl...
3479sub add_spell {
3480 my ($self, $spell) = @_;
3481 $self->{spells}->{$spell->{name}} = $spell;
3482
3483 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3484 face => $spell->{face},
3485 can_hover => 1,
3486 can_events => 1,
3487 tooltip => $spell->{message});
3488
3489 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3490 text => $spell->{name},
3491 can_hover => 1,
3492 can_events => 1,
3493 tooltip => $spell->{message},
3494 expand => 1);
3495
3496 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3498 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3499 expand => 1);
3500
3501 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3502 text => "bind to key",
3503 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3504}
3505
3506sub rebuild_spell_list {
3507 my ($self) = @_;
3508 $self->{tbl_idx} = 0;
3509 $self->add_spell ($_) for values %{$self->{spells}};
3510}
3511
3512sub remove_spell {
3513 my ($self, $spell) = @_;
3514 delete $self->{spells}->{$spell->{name}};
3515 $self->rebuild_spell_list;
3516}
3517
3518#############################################################################
3519
3520package CFClient::UI::Root; 4419package DC::UI::Root;
3521 4420
3522our @ISA = CFClient::UI::Container::; 4421our @ISA = DC::UI::Container::;
3523 4422
3524use List::Util qw(min max); 4423use List::Util qw(min max);
3525 4424
3526use CFClient::OpenGL; 4425use DC::OpenGL;
3527 4426
3528sub new { 4427sub new {
3529 my $class = shift; 4428 my $class = shift;
3530 4429
3531 my $self = $class->SUPER::new ( 4430 my $self = $class->SUPER::new (
3532 visible => 1, 4431 visible => 1,
3533 @_, 4432 @_,
3534 ); 4433 );
3535 4434
3536 Scalar::Util::weaken ($self->{root} = $self); 4435 DC::weaken ($self->{root} = $self);
3537 4436
3538 $self 4437 $self
3539} 4438}
3540 4439
3541sub size_request { 4440sub size_request {
… …
3556 $coord = $max - $size if $coord > $max - $size; 4455 $coord = $max - $size if $coord > $max - $size;
3557 4456
3558 int $coord + 0.5 4457 int $coord + 0.5
3559} 4458}
3560 4459
3561sub size_allocate { 4460sub invoke_size_allocate {
3562 my ($self, $w, $h) = @_; 4461 my ($self, $w, $h) = @_;
3563 4462
3564 for my $child ($self->children) { 4463 for my $child ($self->children) {
3565 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)};
3566 4465
… …
3570 $X = _to_pixel $X, $W, $self->{w}; 4469 $X = _to_pixel $X, $W, $self->{w};
3571 $Y = _to_pixel $Y, $H, $self->{h}; 4470 $Y = _to_pixel $Y, $H, $self->{h};
3572 4471
3573 $child->configure ($X, $Y, $W, $H); 4472 $child->configure ($X, $Y, $W, $H);
3574 } 4473 }
4474
4475 1
3575} 4476}
3576 4477
3577sub coord2local { 4478sub coord2local {
3578 my ($self, $x, $y) = @_; 4479 my ($self, $x, $y) = @_;
3579 4480
… …
3587} 4488}
3588 4489
3589sub update { 4490sub update {
3590 my ($self) = @_; 4491 my ($self) = @_;
3591 4492
3592 $::WANT_REFRESH++; 4493 $::WANT_REFRESH = 1;
3593} 4494}
3594 4495
3595sub add { 4496sub add {
3596 my ($self, @children) = @_; 4497 my ($self, @children) = @_;
3597 4498
… …
3634 while ($self->{refresh_hook}) { 4535 while ($self->{refresh_hook}) {
3635 $_->() 4536 $_->()
3636 for values %{delete $self->{refresh_hook}}; 4537 for values %{delete $self->{refresh_hook}};
3637 } 4538 }
3638 4539
3639 if ($self->{realloc}) { 4540 while ($self->{realloc}) {
3640 my %queue; 4541 my %queue;
3641 my @queue; 4542 my @queue;
3642 my $widget; 4543 my $widget;
3643 4544
3644 outer: 4545 outer:
… …
3664 4565
3665 delete $queue{$widget+0}; 4566 delete $queue{$widget+0};
3666 4567
3667 my ($w, $h) = $widget->size_request; 4568 my ($w, $h) = $widget->size_request;
3668 4569
3669 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4570 $w += $widget->{padding_x} * 2;
3670 $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;
3671 4575
3672 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4576 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3673 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4577 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3674 4578
3675 $w = $widget->{force_w} if exists $widget->{force_w}; 4579 $w = $widget->{force_w} if exists $widget->{force_w};
… …
3691 } 4595 }
3692 } 4596 }
3693 4597
3694 delete $self->{realloc}{$widget+0}; 4598 delete $self->{realloc}{$widget+0};
3695 } 4599 }
3696 }
3697 4600
3698 while (my $size_alloc = delete $self->{size_alloc}) { 4601 while (my $size_alloc = delete $self->{size_alloc}) {
3699 my @queue = sort { $b->{visible} <=> $a->{visible} } 4602 my @queue = sort { $a->{visible} <=> $b->{visible} }
3700 values %$size_alloc; 4603 values %$size_alloc;
3701 4604
3702 while () { 4605 while () {
3703 my $widget = pop @queue || last; 4606 my $widget = pop @queue || last;
3704 4607
3705 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4608 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3706 4609
3707 $w = 0 if $w < 0; 4610 $w = max $widget->{min_w}, $w;
3708 $h = 0 if $h < 0; 4611 $h = max $widget->{min_h}, $h;
3709 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
3710 $w = int $w + 0.5; 4619 $w = int $w + 0.5;
3711 $h = int $h + 0.5; 4620 $h = int $h + 0.5;
3712 4621
3713 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}) {
3714 $widget->{old_w} = $widget->{w}; 4623 $widget->{old_w} = $widget->{w};
3715 $widget->{old_h} = $widget->{h}; 4624 $widget->{old_h} = $widget->{h};
3716 4625
3717 $widget->{w} = $w; 4626 $widget->{w} = $w;
3718 $widget->{h} = $h; 4627 $widget->{h} = $h;
3719 4628
3720 $widget->emit (size_allocate => $w, $h); 4629 $widget->emit (size_allocate => $w, $h);
4630 }
3721 } 4631 }
3722 } 4632 }
3723 } 4633 }
3724 4634
3725 while ($self->{post_alloc_hook}) { 4635 while ($self->{post_alloc_hook}) {
3726 $_->() 4636 $_->()
3727 for values %{delete $self->{post_alloc_hook}}; 4637 for values %{delete $self->{post_alloc_hook}};
3728 } 4638 }
3729
3730 4639
3731 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4640 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3732 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4641 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3733 glClear GL_COLOR_BUFFER_BIT; 4642 glClear GL_COLOR_BUFFER_BIT;
3734 4643
… …
3737 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4646 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3738 glMatrixMode GL_MODELVIEW; 4647 glMatrixMode GL_MODELVIEW;
3739 glLoadIdentity; 4648 glLoadIdentity;
3740 4649
3741 { 4650 {
3742 package CFClient::UI::Base; 4651 package DC::UI::Base;
3743 4652
3744 ($draw_x, $draw_y, $draw_w, $draw_h) = 4653 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3745 (0, 0, $self->{w}, $self->{h}); 4654 (0, 0, $self->{w}, $self->{h});
3746 }
3747 4655
3748 $self->_draw; 4656 $self->_draw;
4657 }
3749} 4658}
3750 4659
3751############################################################################# 4660#############################################################################
3752 4661
3753package CFClient::UI; 4662package DC::UI;
3754 4663
3755$ROOT = new CFClient::UI::Root; 4664$ROOT = new DC::UI::Root;
3756$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4665$TOOLTIP = new DC::UI::Tooltip z => 900;
3757 4666
37581 46671
3759

Diff Legend

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