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

Diff Legend

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