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

Diff Legend

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