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

Diff Legend

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