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.247 by root, Sun May 28 01:16:04 2006 UTC vs.
Revision 1.472 by root, Wed Dec 24 04:09:27 2008 UTC

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

Diff Legend

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