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

Diff Legend

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