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.260 by elmex, Tue May 30 14:35:09 2006 UTC vs.
Revision 1.462 by root, Thu Mar 20 22:28:33 2008 UTC

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

Diff Legend

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