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.230 by root, Wed May 24 21:59:54 2006 UTC vs.
Revision 1.329 by root, Sun Jul 23 02:44:06 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 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;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
102 118
103 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
104 } 120 }
105} 121}
106 122
107sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
108 my ($ev) = @_; 124 my ($ev) = @_;
… …
114 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
115 131
116 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 $TOOLTIP_WATCHER->start;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
158sub rescale_widgets { 172sub rescale_widgets {
159 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
160 174
161 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
162 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
163 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
164 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
165 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
166 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
167 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
168 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
169 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
170 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
171 } 190 }
172 } 191 }
173 192
174 reconfigure_widgets; 193 reconfigure_widgets;
175} 194}
… …
184 203
185sub new { 204sub new {
186 my $class = shift; 205 my $class = shift;
187 206
188 my $self = bless { 207 my $self = bless {
189 x => 0, 208 x => "center",
190 y => 0, 209 y => "center",
191 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
192 can_events => 1, 213 can_events => 1,
193 @_ 214 @_
194 }, $class; 215 }, $class;
195 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
196 for (keys %$self) { 219 for (keys %$self) {
197 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
198 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
199 } 222 }
200 } 223 }
201 224
202 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
203 236
204 $self 237 $self
205} 238}
206 239
207sub destroy { 240sub destroy {
… …
211 %$self = (); 244 %$self = ();
212} 245}
213 246
214sub show { 247sub show {
215 my ($self) = @_; 248 my ($self) = @_;
249
216 return if $self->{parent}; 250 return if $self->{parent};
217 251
218 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
219} 253}
220 254
221sub show_centered { 255sub set_visible {
222 my ($self) = @_; 256 my ($self) = @_;
257
223 return if $self->{parent}; 258 return if $self->{visible};
224 259
225 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
226 262
227 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
228 "centered $self" => sub {
229 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
230 },
231 );
232}
233 264
234sub hide { 265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
235 my ($self) = @_; 271 my ($self) = @_;
272
273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
276
277 delete $self->{visible};
278 delete $self->{root};
236 279
237 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
238 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
239 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
286 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
240 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
241 if $self->{parent}; 313 if $self->{parent};
242} 314}
243 315
244sub move { 316sub move_abs {
245 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
246 318
247 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
248 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
249 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
250 322
251 $self->update; 323 $self->update;
252} 324}
253 325
254sub set_size { 326sub set_size {
255 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
256 328
257 $self->{user_w} = $w; 329 $self->{force_w} = $w;
258 $self->{user_h} = $h; 330 $self->{force_h} = $h;
259 331
260 $self->check_size; 332 $self->realloc;
261} 333}
262 334
263sub size_request { 335sub size_request {
264 require Carp; 336 require Carp;
265 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
266} 338}
267 339
340sub baseline_shift {
341 0
342}
343
268sub configure { 344sub configure {
269 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
270 346
271 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
272 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
273 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
274 352
275 # use alignment to adjust x, y 353 # use alignment to adjust x, y
276 354
277 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
278 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
279
280 ($w, $h) = ($w2, $h2);
281 } 357 }
282 358
283 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
284 $self->{x} = $x; 360 $self->{x} = $x;
285 $self->{y} = $y; 361 $self->{y} = $y;
286 $self->update; 362 $self->update;
287 } 363 }
288 364
289 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
290 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 366 return unless $self->{visible};
291 }
292}
293 367
294sub size_allocate { 368 $self->{alloc_w} = $w;
295 # nothing to be done 369 $self->{alloc_h} = $h;
296}
297 370
298sub reconfigure { 371 $self->{root}{size_alloc}{$self+0} = $self;
299 my ($self) = @_; 372 }
300
301 $self->check_size (1);
302 $self->update;
303} 373}
304 374
305sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
306} 381}
307 382
308sub set_max_size { 383sub set_max_size {
309 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
310 385
311 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
312 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
313} 390}
314 391
315sub set_tooltip { 392sub set_tooltip {
316 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
317 394
395 $tooltip =~ s/^\s+//;
396 $tooltip =~ s/\s+$//;
397
398 return if $self->{tooltip} eq $tooltip;
399
318 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
319 401
320 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
321 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
322 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
323 } 405 }
324} 406}
325 407
326# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
327sub coord2local { 409sub coord2local {
… …
335 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
336 418
337 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
338} 420}
339 421
340sub focus_in { 422sub invoke_focus_in {
341 my ($self) = @_; 423 my ($self) = @_;
342 424
343 return if $FOCUS == $self; 425 return if $FOCUS == $self;
344 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
345 427
346 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
347 429
348 $self->emit (focus_in => $focus); 430 $self->update;
349 431
350 $focus->update if $focus; 432 0
351 $FOCUS->update;
352} 433}
353 434
354sub focus_out { 435sub invoke_focus_out {
355 my ($self) = @_; 436 my ($self) = @_;
356 437
357 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
358 439
359 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
360 441
361 $self->emit (focus_out => $focus); 442 $self->update;
362 443
363 $focus->update if $focus; #? 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
364} 445 unless $FOCUS;
365 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
366sub mouse_motion { } 457sub invoke_mouse_motion { 0 }
367sub button_up { } 458sub invoke_button_up { 0 }
368sub key_down { } 459sub invoke_key_down { 0 }
369sub key_up { } 460sub invoke_key_up { 0 }
370 461
371sub button_down { 462sub invoke_button_down {
372 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
373 464
374 $self->focus_in; 465 $self->grab_focus;
375}
376 466
377sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 0
378sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
379sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
380sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
381sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
480
481 #d##TODO# stop propagating at first true, do not use sum
482 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
483 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
484 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
485}
486
487sub find_widget {
488 my ($self, $x, $y) = @_;
489
490 return () unless $self->{can_events};
491
492 return $self
493 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
494 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
495
496 ()
497}
498
499sub set_parent {
500 my ($self, $parent) = @_;
501
502 Scalar::Util::weaken ($self->{parent} = $parent);
503 $self->set_visible if $parent->{visible};
504}
505
506sub realloc {
507 my ($self) = @_;
508
509 if ($self->{visible}) {
510 return if $self->{root}{realloc}{$self+0};
511
512 $self->{root}{realloc}{$self+0} = $self;
513 $self->{root}->update;
514 } else {
515 delete $self->{req_w};
516 delete $self->{req_h};
517 }
518}
519
520sub update {
521 my ($self) = @_;
522
523 $self->{parent}->update
524 if $self->{parent};
525}
526
527sub reconfigure {
528 my ($self) = @_;
529
530 $self->realloc;
531 $self->update;
532}
533
534# using global variables seems a bit hacky, but passing through all drawing
535# functions seems pointless.
536our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
382 537
383sub draw { 538sub draw {
384 my ($self) = @_; 539 my ($self) = @_;
385 540
386 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
542
543 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
387 550
388 glPushMatrix; 551 glPushMatrix;
389 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
390 $self->_draw;
391 glPopMatrix;
392 553
393 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
394 my ($x, $y) = @$self{qw(x y)};
395
396 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
397 glEnable GL_BLEND; 556 glEnable GL_BLEND;
398 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
399 glBegin GL_QUADS; 558 glBegin GL_QUADS;
400 glVertex $x , $y;
401 glVertex $x + $self->{w}, $y;
402 glVertex $x + $self->{w}, $y + $self->{h};
403 glVertex $x , $y + $self->{h};
404 glEnd;
405 glDisable GL_BLEND;
406 }
407
408 if ($ENV{PCLIENT_DEBUG}) {
409 glPushMatrix;
410 glColor 1, 1, 0, 1;
411 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
412 glBegin GL_LINE_LOOP;
413 glVertex 0 , 0; 559 glVertex 0 , 0;
414 glVertex $self->{w}, 0; 560 glVertex $self->{w}, 0;
415 glVertex $self->{w}, $self->{h}; 561 glVertex $self->{w}, $self->{h};
416 glVertex 0 , $self->{h}; 562 glVertex 0 , $self->{h};
417 glEnd; 563 glEnd;
564 glDisable GL_BLEND;
565 }
566
567 if ($ENV{CFPLUS_DEBUG} & 1) {
568 glPushMatrix;
569 glColor 1, 1, 0, 1;
570 glTranslate 0.375, 0.375;
571 glBegin GL_LINE_LOOP;
572 glVertex 0 , 0;
573 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1;
576 glEnd;
418 glPopMatrix; 577 glPopMatrix;
419 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
420 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
421} 583}
422 584
423sub _draw { 585sub _draw {
424 my ($self) = @_; 586 my ($self) = @_;
425 587
426 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
427} 589}
428 590
429sub find_widget {
430 my ($self, $x, $y) = @_;
431
432 return () unless $self->{can_events};
433
434 return $self
435 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
436 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
437
438 ()
439}
440
441sub set_parent {
442 my ($self, $parent) = @_;
443
444 Scalar::Util::weaken ($self->{parent} = $parent);
445
446 # TODO: req_w _does_change after ->reconfigure
447 $self->check_size
448 unless exists $self->{req_w};
449
450 $self->show;
451}
452
453sub check_size {
454 my ($self, $forced) = @_;
455
456 $self->{force_alloc} = 1 if $forced;
457 $CFClient::UI::ROOT->{check_size}{$self} = $self;
458}
459
460sub update {
461 my ($self) = @_;
462
463 $self->{parent}->update
464 if $self->{parent};
465}
466
467sub connect {
468 my ($self, $signal, $cb) = @_;
469
470 push @{ $self->{signal_cb}{$signal} }, $cb;
471}
472
473sub emit {
474 my ($self, $signal, @args) = @_;
475
476 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
477}
478
479sub DESTROY { 591sub DESTROY {
480 my ($self) = @_; 592 my ($self) = @_;
481 593
594 return if CFClient::in_destruct;
595
482 delete $WIDGET{$self+0}; 596 delete $WIDGET{$self+0};
483 #$self->deactivate; 597
598 eval { $self->destroy };
599 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
484} 600}
485 601
486############################################################################# 602#############################################################################
487 603
488package CFClient::UI::DrawBG; 604package CFClient::UI::DrawBG;
… …
513 629
514 if ($color && (@$color < 4 || $color->[3])) { 630 if ($color && (@$color < 4 || $color->[3])) {
515 my ($w, $h) = @$self{qw(w h)}; 631 my ($w, $h) = @$self{qw(w h)};
516 632
517 glEnable GL_BLEND; 633 glEnable GL_BLEND;
518 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 634 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
519 glColor @$color; 635 glColor_premultiply @$color;
520 636
521 glBegin GL_QUADS; 637 glBegin GL_QUADS;
522 glVertex 0 , 0; 638 glVertex 0 , 0;
523 glVertex 0 , $h; 639 glVertex 0 , $h;
524 glVertex $w, $h; 640 glVertex $w, $h;
… …
539 my ($class, %arg) = @_; 655 my ($class, %arg) = @_;
540 $class->SUPER::new (can_events => 0, %arg); 656 $class->SUPER::new (can_events => 0, %arg);
541} 657}
542 658
543sub size_request { 659sub size_request {
544 (0, 0) 660 my ($self) = @_;
661
662 ($self->{w} + 0, $self->{h} + 0)
545} 663}
546 664
547sub draw { } 665sub draw { }
548 666
549############################################################################# 667#############################################################################
… …
553our @ISA = CFClient::UI::Base::; 671our @ISA = CFClient::UI::Base::;
554 672
555sub new { 673sub new {
556 my ($class, %arg) = @_; 674 my ($class, %arg) = @_;
557 675
558 my $children = delete $arg{children} || []; 676 my $children = delete $arg{children};
559 677
560 my $self = $class->SUPER::new ( 678 my $self = $class->SUPER::new (
561 children => [], 679 children => [],
562 can_events => 0, 680 can_events => 0,
563 %arg, 681 %arg,
564 ); 682 );
683
565 $self->add ($_) for @$children; 684 $self->add (@$children)
685 if $children;
566 686
567 $self 687 $self
568} 688}
569 689
570sub add { 690sub add {
… …
578 $self->{children} = [ 698 $self->{children} = [
579 sort { $a->{z} <=> $b->{z} } 699 sort { $a->{z} <=> $b->{z} }
580 @{$self->{children}}, @widgets 700 @{$self->{children}}, @widgets
581 ]; 701 ];
582 702
583 $self->check_size (1); 703 $self->realloc;
584 $self->update;
585} 704}
586 705
587sub children { 706sub children {
588 @{ $_[0]{children} } 707 @{ $_[0]{children} }
589} 708}
… …
594 delete $child->{parent}; 713 delete $child->{parent};
595 $child->hide; 714 $child->hide;
596 715
597 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 716 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
598 717
599 $self->check_size; 718 $self->realloc;
600 $self->update;
601} 719}
602 720
603sub clear { 721sub clear {
604 my ($self) = @_; 722 my ($self) = @_;
605 723
… …
609 for (@$children) { 727 for (@$children) {
610 delete $_->{parent}; 728 delete $_->{parent};
611 $_->hide; 729 $_->hide;
612 } 730 }
613 731
614 $self->check_size; 732 $self->realloc;
615 $self->update;
616} 733}
617 734
618sub find_widget { 735sub find_widget {
619 my ($self, $x, $y) = @_; 736 my ($self, $x, $y) = @_;
620 737
621 $x -= $self->{x}; 738 $x -= $self->{x};
622 $y -= $self->{y}; 739 $y -= $self->{y};
623 740
624 my $res; 741 my $res;
625 742
626 for (reverse @{ $self->{children} }) { 743 for (reverse $self->visible_children) {
627 $res = $_->find_widget ($x, $y) 744 $res = $_->find_widget ($x, $y)
628 and return $res; 745 and return $res;
629 } 746 }
630 747
631 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 748 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
652} 769}
653 770
654sub add { 771sub add {
655 my ($self, $child) = @_; 772 my ($self, $child) = @_;
656 773
657 $self->{children} = []; 774 $self->SUPER::remove ($_) for @{ $self->{children} };
658
659 $self->SUPER::add ($child); 775 $self->SUPER::add ($child);
660} 776}
661 777
662sub remove { 778sub remove {
663 my ($self, $widget) = @_; 779 my ($self, $widget) = @_;
… …
672 788
673sub size_request { 789sub size_request {
674 $_[0]{children}[0]->size_request 790 $_[0]{children}[0]->size_request
675} 791}
676 792
677sub size_allocate { 793sub invoke_size_allocate {
678 my ($self, $w, $h) = @_; 794 my ($self, $w, $h) = @_;
679 795
680 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
797
798 1
681} 799}
682 800
683############################################################################# 801#############################################################################
802
803# back-buffered drawing area
684 804
685package CFClient::UI::Window; 805package CFClient::UI::Window;
686 806
687our @ISA = CFClient::UI::Bin::; 807our @ISA = CFClient::UI::Bin::;
688 808
… …
699 819
700 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 820 $ROOT->on_post_alloc ($self => sub { $self->render_child });
701 $self->SUPER::update; 821 $self->SUPER::update;
702} 822}
703 823
704sub size_allocate { 824sub invoke_size_allocate {
705 my ($self, $w, $h) = @_; 825 my ($self, $w, $h) = @_;
706 826
707 $self->SUPER::size_allocate ($w, $h);
708 $self->update; 827 $self->update;
828
829 $self->SUPER::invoke_size_allocate ($w, $h)
709} 830}
710 831
711sub _render { 832sub _render {
833 my ($self) = @_;
834
712 $_[0]{children}[0]->draw; 835 $self->{children}[0]->draw;
713} 836}
714 837
715sub render_child { 838sub render_child {
716 my ($self) = @_; 839 my ($self) = @_;
717 840
718 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 841 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
719 glClearColor 0, 0, 0, 0; 842 glClearColor 0, 0, 0, 0;
720 glClear GL_COLOR_BUFFER_BIT; 843 glClear GL_COLOR_BUFFER_BIT;
721 844
845 {
846 package CFClient::UI::Base;
847
848 ($draw_x, $draw_y, $draw_w, $draw_h) =
849 (0, 0, $self->{w}, $self->{h});
850 }
851
722 $self->_render; 852 $self->_render;
723 }; 853 };
724} 854}
725 855
726sub _draw { 856sub _draw {
727 my ($self) = @_; 857 my ($self) = @_;
728 858
729 my ($w, $h) = ($self->w, $self->h); 859 my ($w, $h) = @$self{qw(w h)};
730 860
731 my $tex = $self->{texture} 861 my $tex = $self->{texture}
732 or return; 862 or return;
733 863
734 glEnable GL_TEXTURE_2D; 864 glEnable GL_TEXTURE_2D;
735 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 865 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
736 glColor 1, 1, 1, 1; 866 glColor 0, 0, 0, 1;
737 867
738 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 868 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
739 869
740 glDisable GL_TEXTURE_2D; 870 glDisable GL_TEXTURE_2D;
741} 871}
… …
744 874
745package CFClient::UI::ViewPort; 875package CFClient::UI::ViewPort;
746 876
747our @ISA = CFClient::UI::Window::; 877our @ISA = CFClient::UI::Window::;
748 878
879sub new {
880 my $class = shift;
881
882 $class->SUPER::new (
883 scroll_x => 0,
884 scroll_y => 1,
885 @_,
886 )
887}
888
749sub size_request { 889sub size_request {
750 my ($self) = @_; 890 my ($self) = @_;
751 891
752 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 892 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
753 893
754 @$self{qw(child_w child_h)} 894 $w = 10 if $self->{scroll_x};
755} 895 $h = 10 if $self->{scroll_y};
756 896
897 ($w, $h)
898}
899
757sub size_allocate { 900sub invoke_size_allocate {
758 my ($self, $w, $h) = @_; 901 my ($self, $w, $h) = @_;
759 902
760 my ($cw, $ch) = @$self{qw(child_w child_h)}; 903 my $child = $self->child;
761# $w = $self->{w}; 904
905 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
906 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
907
762 $self->child->configure (0, 0, $cw, $ch); 908 $self->child->configure (0, 0, $w, $h);
763 $self->update; 909 $self->update;
910
911 1
764} 912}
765 913
766sub set_offset { 914sub set_offset {
767 my ($self, $x, $y) = @_; 915 my ($self, $x, $y) = @_;
768 916
… …
801} 949}
802 950
803sub _render { 951sub _render {
804 my ($self) = @_; 952 my ($self) = @_;
805 953
954 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
955 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
956
806 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 957 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
807 958
808 $self->SUPER::_render; 959 $self->SUPER::_render;
809} 960}
810 961
… …
813package CFClient::UI::ScrolledWindow; 964package CFClient::UI::ScrolledWindow;
814 965
815our @ISA = CFClient::UI::HBox::; 966our @ISA = CFClient::UI::HBox::;
816 967
817sub new { 968sub new {
818 my $class = shift; 969 my ($class, %arg) = @_;
970
971 my $child = delete $arg{child};
819 972
820 my $self; 973 my $self;
821 974
822 my $slider = new CFClient::UI::Slider 975 my $slider = new CFClient::UI::Slider
823 vertical => 1, 976 vertical => 1,
824 range => [0, 0, 1, 0.01], # HACK fix 977 range => [0, 0, 1, 0.01], # HACK fix
825 connect_changed => sub { 978 on_changed => sub {
826 $self->{vp}->set_offset (0, $_[1]); 979 $self->{vp}->set_offset (0, $_[1]);
827 }, 980 },
828 ; 981 ;
829 982
830 $self = $class->SUPER::new ( 983 $self = $class->SUPER::new (
831 vp => (new CFClient::UI::ViewPort expand => 1), 984 vp => (new CFClient::UI::ViewPort expand => 1),
832 slider => $slider, 985 slider => $slider,
833 @_, 986 %arg,
834 ); 987 );
835 988
836 $self->{vp}->add ($self->{scrolled});
837 $self->add ($self->{vp});
838 $self->add ($self->{slider}); 989 $self->SUPER::add ($self->{vp}, $self->{slider});
990 $self->add ($child) if $child;
839 991
840 $self 992 $self
841} 993}
842 994
995#TODO# update range on size_allocate depending on child
996
997sub add {
998 my ($self, $widget) = @_;
999
1000 $self->{vp}->add ($self->{child} = $widget);
1001}
1002
1003sub invoke_button_up {
1004 my ($self, $ev) = @_;
1005
1006 warn "button up $ev->{button}\n";#d#
1007
1008 0
1009}
1010
1011sub update_slider {
1012 my ($self) = @_;
1013
1014 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1015}
1016
1017sub update {
1018 my ($self) = @_;
1019
1020 $self->SUPER::update;
1021
1022 $self->update_slider;
1023}
1024
843sub size_allocate { 1025sub invoke_size_allocate {
844 my ($self, $w, $h) = @_; 1026 my ($self, $w, $h) = @_;
845 1027
1028 $self->update_slider;
1029
846 $self->SUPER::size_allocate ($w, $h); 1030 $self->SUPER::invoke_size_allocate ($w, $h)
847
848 my $child = $self->{vp}->child;
849 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
850} 1031}
851
852#TODO# update range on size_allocate depending on child
853# update viewport offset on scroll
854 1032
855############################################################################# 1033#############################################################################
856 1034
857package CFClient::UI::Frame; 1035package CFClient::UI::Frame;
858 1036
… …
874 1052
875 if ($self->{bg}) { 1053 if ($self->{bg}) {
876 my ($w, $h) = @$self{qw(w h)}; 1054 my ($w, $h) = @$self{qw(w h)};
877 1055
878 glEnable GL_BLEND; 1056 glEnable GL_BLEND;
879 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1057 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
880 glColor @{ $self->{bg} }; 1058 glColor_premultiply @{ $self->{bg} };
881 1059
882 glBegin GL_QUADS; 1060 glBegin GL_QUADS;
883 glVertex 0 , 0; 1061 glVertex 0 , 0;
884 glVertex 0 , $h; 1062 glVertex 0 , $h;
885 glVertex $w, $h; 1063 glVertex $w, $h;
… …
898 1076
899our @ISA = CFClient::UI::Bin::; 1077our @ISA = CFClient::UI::Bin::;
900 1078
901use CFClient::OpenGL; 1079use CFClient::OpenGL;
902 1080
903my @tex = 1081my $bg =
1082 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1083 mipmap => 1, wrap => 1;
1084
1085my @border =
904 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1086 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
905 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1087 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
906 1088
907sub new { 1089sub new {
908 my $class = shift; 1090 my ($class, %arg) = @_;
909
910 # TODO: user_x, user_y, overwrite moveto?
911 1091
912 my $self = $class->SUPER::new ( 1092 my $self = $class->SUPER::new (
913 bg => [1, 1, 1, 1], 1093 bg => [1, 1, 1, 1],
914 border_bg => [1, 1, 1, 1], 1094 border_bg => [1, 1, 1, 1],
915 border => 0.6, 1095 border => 0.6,
916 is_toplevel => 1,
917 can_events => 1, 1096 can_events => 1,
918 @_ 1097 min_w => 64,
1098 min_h => 32,
1099 %arg,
919 ); 1100 );
920 1101
921 $self->{title} &&= new CFClient::UI::Label 1102 $self->{title_widget} = new CFClient::UI::Label
922 align => 0, 1103 align => 0,
923 valign => 1, 1104 valign => 1,
924 text => $self->{title}, 1105 text => $self->{title},
925 fontsize => $self->{border}; 1106 fontsize => $self->{border},
1107 if exists $self->{title};
1108
1109 if ($self->{has_close_button}) {
1110 $self->{close_button} =
1111 new CFClient::UI::ImageButton
1112 path => 'x1_close.png',
1113 on_activate => sub { $self->emit ("delete") };
1114
1115 $self->CFClient::UI::Container::add ($self->{close_button});
1116 }
926 1117
927 $self 1118 $self
1119}
1120
1121sub add {
1122 my ($self, @widgets) = @_;
1123
1124 $self->SUPER::add (@widgets);
1125 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1126 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
928} 1127}
929 1128
930sub border { 1129sub border {
931 int $_[0]{border} * $::FONTSIZE 1130 int $_[0]{border} * $::FONTSIZE
932} 1131}
933 1132
934sub size_request { 1133sub size_request {
935 my ($self) = @_; 1134 my ($self) = @_;
1135
1136 $self->{title_widget}->size_request
1137 if $self->{title_widget};
1138
1139 $self->{close_button}->size_request
1140 if $self->{close_button};
936 1141
937 my ($w, $h) = $self->SUPER::size_request; 1142 my ($w, $h) = $self->SUPER::size_request;
938 1143
939 ( 1144 (
940 $w + $self->border * 2, 1145 $w + $self->border * 2,
941 $h + $self->border * 2, 1146 $h + $self->border * 2,
942 ) 1147 )
943} 1148}
944 1149
945sub size_allocate { 1150sub invoke_size_allocate {
946 my ($self, $w, $h) = @_; 1151 my ($self, $w, $h) = @_;
947 1152
1153 if ($self->{title_widget}) {
1154 $self->{title_widget}{w} = $w;
1155 $self->{title_widget}{h} = $h;
1156 $self->{title_widget}->invoke_size_allocate ($w, $h);
1157 }
1158
1159 my $border = $self->border;
1160
948 $h -= List::Util::max 0, $self->border * 2; 1161 $h -= List::Util::max 0, $border * 2;
949 $w -= List::Util::max 0, $self->border * 2; 1162 $w -= List::Util::max 0, $border * 2;
950 1163
951 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
952 if $self->{title};
953
954 $self->child->configure ($self->border, $self->border, $w, $h); 1164 $self->child->configure ($border, $border, $w, $h);
955}
956 1165
1166 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1167 if $self->{close_button};
1168
1169 1
1170}
1171
1172sub invoke_delete {
1173 my ($self) = @_;
1174
1175 $self->hide;
1176
1177 1
1178}
1179
957sub button_down { 1180sub invoke_button_down {
958 my ($self, $ev, $x, $y) = @_; 1181 my ($self, $ev, $x, $y) = @_;
959 1182
960 my ($w, $h) = @$self{qw(w h)}; 1183 my ($w, $h) = @$self{qw(w h)};
961 my $border = $self->border; 1184 my $border = $self->border;
962 1185
… …
975 my ($ev, $x, $y) = @_; 1198 my ($ev, $x, $y) = @_;
976 1199
977 my $dx = $ev->{x} - $ox; 1200 my $dx = $ev->{x} - $ox;
978 my $dy = $ev->{y} - $oy; 1201 my $dy = $ev->{y} - $oy;
979 1202
980 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1203 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
981 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1204 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1205
982 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1206 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
983 $self->check_size; 1207 $self->realloc;
984 }; 1208 };
985 1209
986 } elsif ($lr ^ $td) { 1210 } elsif ($lr ^ $td) {
987 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1211 my ($ox, $oy) = ($ev->{x}, $ev->{y});
988 my ($bx, $by) = ($self->{x}, $self->{y}); 1212 my ($bx, $by) = ($self->{x}, $self->{y});
… …
990 $self->{motion} = sub { 1214 $self->{motion} = sub {
991 my ($ev, $x, $y) = @_; 1215 my ($ev, $x, $y) = @_;
992 1216
993 ($x, $y) = ($ev->{x}, $ev->{y}); 1217 ($x, $y) = ($ev->{x}, $ev->{y});
994 1218
995 $self->move ($bx + $x - $ox, $by + $y - $oy); 1219 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
996 $self->update; 1220 # HACK: the next line is required to enforce placement
1221 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
997 }; 1222 };
1223 } else {
1224 return 0;
1225 }
1226
998 } 1227 1
999} 1228}
1000 1229
1001sub button_up { 1230sub invoke_button_up {
1002 my ($self, $ev, $x, $y) = @_; 1231 my ($self, $ev, $x, $y) = @_;
1003 1232
1004 delete $self->{motion}; 1233 ! ! delete $self->{motion}
1005} 1234}
1006 1235
1007sub mouse_motion { 1236sub invoke_mouse_motion {
1008 my ($self, $ev, $x, $y) = @_; 1237 my ($self, $ev, $x, $y) = @_;
1009 1238
1010 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1239 $self->{motion}->($ev, $x, $y) if $self->{motion};
1240
1241 ! ! $self->{motion}
1011} 1242}
1012 1243
1013sub _draw { 1244sub _draw {
1014 my ($self) = @_; 1245 my ($self) = @_;
1015 1246
1247 my $child = $self->{children}[0];
1248
1016 my ($w, $h ) = ($self->{w}, $self->{h}); 1249 my ($w, $h ) = ($self->{w}, $self->{h});
1017 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1250 my ($cw, $ch) = ($child->{w}, $child->{h});
1018 1251
1019 glEnable GL_TEXTURE_2D; 1252 glEnable GL_TEXTURE_2D;
1020 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1253 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1021 1254
1022 my $border = $self->border; 1255 my $border = $self->border;
1023 1256
1024 glColor @{ $self->{border_bg} }; 1257 glColor @{ $self->{border_bg} };
1025 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1258 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1026 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1259 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1027 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1260 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1028 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1261 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1029 1262
1030 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1263 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1031 my $bg = $tex[0]; 1264 glColor @{ $self->{bg} };
1032 1265
1033 # TODO: repeat texture not scale 1266 # TODO: repeat texture not scale
1267 # solve this better(?)
1034 my $rep_x = $cw / $bg->{w}; 1268 $bg->{s} = $cw / $bg->{w};
1035 my $rep_y = $ch / $bg->{h}; 1269 $bg->{t} = $ch / $bg->{h};
1036
1037 glColor @{ $self->{bg} };
1038
1039 $bg->{s} = $rep_x;
1040 $bg->{t} = $rep_y;
1041 $bg->{wrap_mode} = 1;
1042 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1270 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1043 } 1271 }
1044 1272
1045 glDisable GL_TEXTURE_2D; 1273 glDisable GL_TEXTURE_2D;
1046 1274
1047 $self->{title}->draw if $self->{title};
1048
1049 $self->child->draw; 1275 $child->draw;
1276
1277 if ($self->{title_widget}) {
1278 glTranslate 0, $border - $self->{h};
1279 $self->{title_widget}->_draw;
1280
1281 glTranslate 0, - ($border - $self->{h});
1282 }
1283
1284 $self->{close_button}->draw
1285 if $self->{close_button};
1050} 1286}
1051 1287
1052############################################################################# 1288#############################################################################
1053 1289
1054package CFClient::UI::Table; 1290package CFClient::UI::Table;
… …
1062sub new { 1298sub new {
1063 my $class = shift; 1299 my $class = shift;
1064 1300
1065 $class->SUPER::new ( 1301 $class->SUPER::new (
1066 col_expand => [], 1302 col_expand => [],
1067 @_ 1303 @_,
1068 ) 1304 )
1305}
1306
1307sub children {
1308 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1069} 1309}
1070 1310
1071sub add { 1311sub add {
1072 my ($self, $x, $y, $child) = @_; 1312 my ($self, $x, $y, $child) = @_;
1073 1313
1074 $child->set_parent ($self); 1314 $child->set_parent ($self);
1075 $self->{children}[$y][$x] = $child; 1315 $self->{children}[$y][$x] = $child;
1076 1316
1077 $child->check_size; 1317 $self->realloc;
1078} 1318}
1079 1319
1080sub children { 1320sub remove {
1081 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1321 my ($self, $child) = @_;
1082}
1083 1322
1323 # TODO: not yet implemented
1324}
1325
1084# TODO: move to container class maybe? send childs a signal on removal? 1326# TODO: move to container class maybe? send children a signal on removal?
1085sub clear { 1327sub clear {
1086 my ($self) = @_; 1328 my ($self) = @_;
1087 1329
1088 my @children = $self->children; 1330 my @children = $self->children;
1089 delete $self->{children}; 1331 delete $self->{children};
… …
1091 for (@children) { 1333 for (@children) {
1092 delete $_->{parent}; 1334 delete $_->{parent};
1093 $_->hide; 1335 $_->hide;
1094 } 1336 }
1095 1337
1096 $self->update; 1338 $self->realloc;
1097} 1339}
1098 1340
1099sub get_wh { 1341sub get_wh {
1100 my ($self) = @_; 1342 my ($self) = @_;
1101 1343
… …
1127 (sum @$ws), 1369 (sum @$ws),
1128 (sum @$hs), 1370 (sum @$hs),
1129 ) 1371 )
1130} 1372}
1131 1373
1132sub size_allocate { 1374sub invoke_size_allocate {
1133 my ($self, $w, $h) = @_; 1375 my ($self, $w, $h) = @_;
1134 1376
1135 my ($ws, $hs) = $self->get_wh; 1377 my ($ws, $hs) = $self->get_wh;
1136 1378
1137 my $req_w = sum @$ws; 1379 my $req_w = (sum @$ws) || 1;
1138 my $req_h = sum @$hs; 1380 my $req_h = (sum @$hs) || 1;
1139 1381
1140 # TODO: nicer code && do row_expand 1382 # TODO: nicer code && do row_expand
1141 my @col_expand = @{$self->{col_expand}}; 1383 my @col_expand = @{$self->{col_expand}};
1142 @col_expand = (1) x @$ws unless @col_expand; 1384 @col_expand = (1) x @$ws unless @col_expand;
1143 my $col_expand = (sum @col_expand) || 1; 1385 my $col_expand = (sum @col_expand) || 1;
… …
1169 } 1411 }
1170 1412
1171 $y += $row_h; 1413 $y += $row_h;
1172 } 1414 }
1173 1415
1416 1
1174} 1417}
1175 1418
1176sub find_widget { 1419sub find_widget {
1177 my ($self, $x, $y) = @_; 1420 my ($self, $x, $y) = @_;
1178 1421
… …
1197 } 1440 }
1198} 1441}
1199 1442
1200############################################################################# 1443#############################################################################
1201 1444
1445package CFClient::UI::Box;
1446
1447our @ISA = CFClient::UI::Container::;
1448
1449sub size_request {
1450 my ($self) = @_;
1451
1452 $self->{vertical}
1453 ? (
1454 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1455 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1456 )
1457 : (
1458 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1459 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1460 )
1461}
1462
1463sub invoke_size_allocate {
1464 my ($self, $w, $h) = @_;
1465
1466 my $space = $self->{vertical} ? $h : $w;
1467 my @children = $self->visible_children;
1468
1469 my @req;
1470
1471 if ($self->{homogeneous}) {
1472 @req = ($space / (@children || 1)) x @children;
1473 } else {
1474 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1475 my $req = List::Util::sum @req;
1476
1477 if ($req > $space) {
1478 # ah well, not enough space
1479 $_ *= $space / $req for @req;
1480 } else {
1481 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1482
1483 $space = ($space - $req) / $expand; # remaining space to give away
1484
1485 $req[$_] += $space * $children[$_]{expand}
1486 for 0 .. $#children;
1487 }
1488 }
1489
1490 CFClient::UI::harmonize \@req;
1491
1492 my $pos = 0;
1493 for (0 .. $#children) {
1494 my $alloc = $req[$_];
1495 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1496
1497 $pos += $alloc;
1498 }
1499
1500 1
1501}
1502
1503#############################################################################
1504
1202package CFClient::UI::HBox; 1505package CFClient::UI::HBox;
1203 1506
1204# TODO: wrap into common Box base class
1205
1206our @ISA = CFClient::UI::Container::; 1507our @ISA = CFClient::UI::Box::;
1207 1508
1208sub size_request { 1509sub new {
1209 my ($self) = @_; 1510 my $class = shift;
1210 1511
1211 my @alloc = map [$_->size_request], @{$self->{children}}; 1512 $class->SUPER::new (
1212 1513 vertical => 0,
1213 ( 1514 @_,
1214 (List::Util::sum map $_->[0], @alloc),
1215 (List::Util::max map $_->[1], @alloc),
1216 ) 1515 )
1217} 1516}
1218 1517
1219sub size_allocate {
1220 my ($self, $w, $h) = @_;
1221
1222 ($h, $w) = ($w, $h);
1223
1224 my $children = $self->{children};
1225
1226 my @h = map $_->{req_w}, @$children;
1227
1228 my $req_h = List::Util::sum @h;
1229
1230 if ($req_h > $h) {
1231 # ah well, not enough space
1232 $_ *= $h / $req_h for @h;
1233 } else {
1234 my $exp = List::Util::sum map $_->{expand}, @$children;
1235 $exp ||= 1;
1236
1237 for (0 .. $#$children) {
1238 my $child = $children->[$_];
1239
1240 my $alloc_h = $h[$_];
1241 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1242 $h[$_] = $alloc_h;
1243 }
1244 }
1245
1246 CFClient::UI::harmonize \@h;
1247
1248 my $y = 0;
1249 for (0 .. $#$children) {
1250 my $child = $children->[$_];
1251 my $h = $h[$_];
1252 $child->configure ($y, 0, $h, $w);
1253
1254 $y += $h;
1255 }
1256
1257 1
1258}
1259
1260############################################################################# 1518#############################################################################
1261 1519
1262package CFClient::UI::VBox; 1520package CFClient::UI::VBox;
1263 1521
1264# TODO: wrap into common Box base class
1265
1266our @ISA = CFClient::UI::Container::; 1522our @ISA = CFClient::UI::Box::;
1267 1523
1268sub size_request { 1524sub new {
1269 my ($self) = @_; 1525 my $class = shift;
1270 1526
1271 my @alloc = map [$_->size_request], @{$self->{children}}; 1527 $class->SUPER::new (
1272 1528 vertical => 1,
1273 ( 1529 @_,
1274 (List::Util::max map $_->[0], @alloc),
1275 (List::Util::sum map $_->[1], @alloc),
1276 ) 1530 )
1277}
1278
1279sub size_allocate {
1280 my ($self, $w, $h) = @_;
1281
1282 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1283
1284 my $children = $self->{children};
1285
1286 my @h = map $_->{req_h}, @$children;
1287
1288 my $req_h = List::Util::sum @h;
1289
1290 if ($req_h > $h) {
1291 # ah well, not enough space
1292 $_ *= $h / $req_h for @h;
1293 } else {
1294 my $exp = List::Util::sum map $_->{expand}, @$children;
1295 $exp ||= 1;
1296
1297 for (0 .. $#$children) {
1298 my $child = $children->[$_];
1299
1300 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1301 }
1302 }
1303
1304 CFClient::UI::harmonize \@h;
1305
1306 my $y = 0;
1307 for (0 .. $#$children) {
1308 my $child = $children->[$_];
1309 my $h = $h[$_];
1310 $child->configure (0, $y, $w, $h);
1311
1312 $y += $h;
1313 }
1314
1315 1
1316} 1531}
1317 1532
1318############################################################################# 1533#############################################################################
1319 1534
1320package CFClient::UI::Label; 1535package CFClient::UI::Label;
… …
1337 ellipsise => 3, # end 1552 ellipsise => 3, # end
1338 layout => (new CFClient::Layout), 1553 layout => (new CFClient::Layout),
1339 fontsize => 1, 1554 fontsize => 1,
1340 align => -1, 1555 align => -1,
1341 valign => -1, 1556 valign => -1,
1342 padding => 2, 1557 padding_x => 2,
1558 padding_y => 2,
1343 can_events => 0, 1559 can_events => 0,
1344 %arg 1560 %arg
1345 ); 1561 );
1346 1562
1347 if (exists $self->{template}) { 1563 if (exists $self->{template}) {
… …
1374 1590
1375 delete $self->{texture}; 1591 delete $self->{texture};
1376 $self->SUPER::update; 1592 $self->SUPER::update;
1377} 1593}
1378 1594
1595sub realloc {
1596 my ($self) = @_;
1597
1598 delete $self->{ox};
1599 $self->SUPER::realloc;
1600}
1601
1379sub set_text { 1602sub set_text {
1380 my ($self, $text) = @_; 1603 my ($self, $text) = @_;
1381 1604
1382 return if $self->{text} eq "T$text"; 1605 return if $self->{text} eq "T$text";
1383 $self->{text} = "T$text"; 1606 $self->{text} = "T$text";
1384 1607
1385 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1386 $self->{layout}->set_text ($text); 1608 $self->{layout}->set_text ($text);
1387 1609
1610 delete $self->{size_req};
1611 $self->realloc;
1388 $self->update; 1612 $self->update;
1389 $self->check_size;
1390} 1613}
1391 1614
1392sub set_markup { 1615sub set_markup {
1393 my ($self, $markup) = @_; 1616 my ($self, $markup) = @_;
1394 1617
1395 return if $self->{text} eq "M$markup"; 1618 return if $self->{text} eq "M$markup";
1396 $self->{text} = "M$markup"; 1619 $self->{text} = "M$markup";
1397 1620
1398 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1621 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1399 1622
1400 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1401 $self->{layout}->set_markup ($markup); 1623 $self->{layout}->set_markup ($markup);
1402 1624
1625 delete $self->{size_req};
1626 $self->realloc;
1403 $self->update; 1627 $self->update;
1404 $self->check_size;
1405} 1628}
1406 1629
1407sub size_request { 1630sub size_request {
1408 my ($self) = @_; 1631 my ($self) = @_;
1409 1632
1633 $self->{size_req} ||= do {
1410 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1634 $self->{layout}->set_font ($self->{font}) if $self->{font};
1411 $self->{layout}->set_width ($self->{max_w} || -1); 1635 $self->{layout}->set_width ($self->{max_w} || -1);
1412 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1413 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1414 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1415 1639
1416 my ($w, $h) = $self->{layout}->size; 1640 my ($w, $h) = $self->{layout}->size;
1417 1641
1418 if (exists $self->{template}) { 1642 if (exists $self->{template}) {
1419 $self->{template}->set_font ($self->{font}) if $self->{font}; 1643 $self->{template}->set_font ($self->{font}) if $self->{font};
1644 $self->{template}->set_width ($self->{max_w} || -1);
1420 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1645 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1421 1646
1422 my ($w2, $h2) = $self->{template}->size; 1647 my ($w2, $h2) = $self->{template}->size;
1423 1648
1424 $w = List::Util::max $w, $w2; 1649 $w = List::Util::max $w, $w2;
1425 $h = List::Util::max $h, $h2; 1650 $h = List::Util::max $h, $h2;
1651 }
1652
1653 [$w, $h]
1426 } 1654 };
1427 1655
1428 ( 1656 @{ $self->{size_req} }
1429 $w + $self->{padding} * 2,
1430 $h + $self->{padding} * 2,
1431 )
1432} 1657}
1433 1658
1659sub baseline_shift {
1660 $_[0]{layout}->descent
1661}
1662
1434sub size_allocate { 1663sub invoke_size_allocate {
1435 my ($self, $w, $h) = @_; 1664 my ($self, $w, $h) = @_;
1436 1665
1666 delete $self->{ox};
1667
1437 delete $self->{texture}; 1668 delete $self->{texture}
1669 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1670
1671 1
1438} 1672}
1439 1673
1440sub set_fontsize { 1674sub set_fontsize {
1441 my ($self, $fontsize) = @_; 1675 my ($self, $fontsize) = @_;
1442 1676
1443 $self->{fontsize} = $fontsize; 1677 $self->{fontsize} = $fontsize;
1678 delete $self->{size_req};
1444 delete $self->{texture}; 1679 delete $self->{texture};
1445 1680
1446 $self->update; 1681 $self->realloc;
1447 $self->check_size; 1682}
1683
1684sub reconfigure {
1685 my ($self) = @_;
1686
1687 delete $self->{size_req};
1688 delete $self->{texture};
1689
1690 $self->SUPER::reconfigure;
1448} 1691}
1449 1692
1450sub _draw { 1693sub _draw {
1451 my ($self) = @_; 1694 my ($self) = @_;
1452 1695
1453 $self->SUPER::_draw; # draw background, if applicable 1696 $self->SUPER::_draw; # draw background, if applicable
1454 1697
1455 my $tex = $self->{texture} ||= do { 1698 my $size = $self->{texture} ||= do {
1456 $self->{layout}->set_foreground (@{$self->{fg}}); 1699 $self->{layout}->set_foreground (@{$self->{fg}});
1457 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1700 $self->{layout}->set_font ($self->{font}) if $self->{font};
1458 $self->{layout}->set_width ($self->{w}); 1701 $self->{layout}->set_width ($self->{w});
1459 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1702 $self->{layout}->set_ellipsise ($self->{ellipsise});
1460 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1703 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1461 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1704 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1462 1705
1463 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1706 [$self->{layout}->size]
1464
1465 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1466 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1467 : ($self->{w} - $tex->{w}) * 0.5);
1468
1469 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1470 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1471 : ($self->{h} - $tex->{h}) * 0.5);
1472
1473 $tex
1474 }; 1707 };
1475 1708
1476 glEnable GL_TEXTURE_2D; 1709 unless (exists $self->{ox}) {
1477 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1710 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1711 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1712 : ($self->{w} - $size->[0]) * 0.5);
1478 1713
1479 if ($tex->{format} == GL_ALPHA) { 1714 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1480 glColor @{$self->{fg}}; 1715 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1481 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1716 : ($self->{h} - $size->[1]) * 0.5);
1482 } else {
1483 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1484 } 1717 };
1485 1718
1486 glDisable GL_TEXTURE_2D; 1719 my $w = List::Util::min $self->{w} + 4, $size->[0];
1720 my $h = List::Util::min $self->{h} + 2, $size->[1];
1721
1722 $self->{layout}->render ($self->{ox}, $self->{oy});
1487} 1723}
1488 1724
1489############################################################################# 1725#############################################################################
1490 1726
1491package CFClient::UI::EntryBase; 1727package CFClient::UI::EntryBase;
… …
1505 can_hover => 1, 1741 can_hover => 1,
1506 can_focus => 1, 1742 can_focus => 1,
1507 valign => 0, 1743 valign => 0,
1508 can_events => 1, 1744 can_events => 1,
1509 #text => ... 1745 #text => ...
1746 #hidden => "*",
1510 @_ 1747 @_
1511 ) 1748 )
1512} 1749}
1513 1750
1514sub _set_text { 1751sub _set_text {
… …
1516 1753
1517 delete $self->{cur_h}; 1754 delete $self->{cur_h};
1518 1755
1519 return if $self->{text} eq $text; 1756 return if $self->{text} eq $text;
1520 1757
1521 delete $self->{texture};
1522
1523 $self->{last_activity} = $::NOW; 1758 $self->{last_activity} = $::NOW;
1524 $self->{text} = $text; 1759 $self->{text} = $text;
1525 1760
1526 $text =~ s/./*/g if $self->{hidden}; 1761 $text =~ s/./*/g if $self->{hidden};
1527 $self->{layout}->set_text ("$text "); 1762 $self->{layout}->set_text ("$text ");
1763 delete $self->{size_req};
1528 1764
1529 $self->emit (changed => $self->{text}); 1765 $self->emit (changed => $self->{text});
1766
1767 $self->realloc;
1768 $self->update;
1530} 1769}
1531 1770
1532sub set_text { 1771sub set_text {
1533 my ($self, $text) = @_; 1772 my ($self, $text) = @_;
1534 1773
1535 $self->{cursor} = length $text; 1774 $self->{cursor} = length $text;
1536 $self->_set_text ($text); 1775 $self->_set_text ($text);
1537 $self->update;
1538 $self->check_size;
1539} 1776}
1540 1777
1541sub get_text { 1778sub get_text {
1542 $_[0]{text} 1779 $_[0]{text}
1543} 1780}
… …
1548 my ($w, $h) = $self->SUPER::size_request; 1785 my ($w, $h) = $self->SUPER::size_request;
1549 1786
1550 ($w + 1, $h) # add 1 for cursor 1787 ($w + 1, $h) # add 1 for cursor
1551} 1788}
1552 1789
1553sub size_allocate {
1554 my ($self, $w, $h) = @_;
1555
1556 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1557}
1558
1559sub key_down { 1790sub invoke_key_down {
1560 my ($self, $ev) = @_; 1791 my ($self, $ev) = @_;
1561 1792
1562 my $mod = $ev->{mod}; 1793 my $mod = $ev->{mod};
1563 my $sym = $ev->{sym}; 1794 my $sym = $ev->{sym};
1564 my $uni = $ev->{unicode}; 1795 my $uni = $ev->{unicode};
… …
1579 $self->{cursor} = length $text; 1810 $self->{cursor} = length $text;
1580 } elsif ($uni == 27) { 1811 } elsif ($uni == 27) {
1581 $self->emit ('escape'); 1812 $self->emit ('escape');
1582 } elsif ($uni) { 1813 } elsif ($uni) {
1583 substr $text, $self->{cursor}++, 0, chr $uni; 1814 substr $text, $self->{cursor}++, 0, chr $uni;
1815 } else {
1816 return 0;
1584 } 1817 }
1585 1818
1586 $self->_set_text ($text); 1819 $self->_set_text ($text);
1587 $self->update;
1588 $self->check_size;
1589}
1590 1820
1821 $self->realloc;
1822
1823 1
1824}
1825
1591sub focus_in { 1826sub invoke_focus_in {
1592 my ($self) = @_; 1827 my ($self) = @_;
1593 1828
1594 $self->{last_activity} = $::NOW; 1829 $self->{last_activity} = $::NOW;
1595 1830
1596 $self->SUPER::focus_in; 1831 $self->SUPER::invoke_focus_in
1597} 1832}
1598 1833
1599sub button_down { 1834sub invoke_button_down {
1600 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1601 1836
1602 $self->SUPER::button_down ($ev, $x, $y); 1837 $self->SUPER::invoke_button_down ($ev, $x, $y);
1603 1838
1604 my $idx = $self->{layout}->xy_to_index ($x, $y); 1839 my $idx = $self->{layout}->xy_to_index ($x, $y);
1605 1840
1606 # byte-index to char-index 1841 # byte-index to char-index
1607 my $text = $self->{text}; 1842 my $text = $self->{text};
1608 utf8::encode $text; 1843 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1609 $self->{cursor} = length substr $text, 0, $idx; 1844 $self->{cursor} = length $text;
1610 1845
1611 $self->_set_text ($self->{text}); 1846 $self->_set_text ($self->{text});
1612 $self->update; 1847 $self->update;
1848
1849 1
1613} 1850}
1614 1851
1615sub mouse_motion { 1852sub invoke_mouse_motion {
1616 my ($self, $ev, $x, $y) = @_; 1853 my ($self, $ev, $x, $y) = @_;
1617# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1854# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1855
1856 1
1618} 1857}
1619 1858
1620sub _draw { 1859sub _draw {
1621 my ($self) = @_; 1860 my ($self) = @_;
1622 1861
1623 local $self->{fg} = $self->{fg}; 1862 local $self->{fg} = $self->{fg};
1624 1863
1625 if ($FOCUS == $self) { 1864 if ($FOCUS == $self) {
1626 glColor @{$self->{active_bg}}; 1865 glColor_premultiply @{$self->{active_bg}};
1627 $self->{fg} = $self->{active_fg}; 1866 $self->{fg} = $self->{active_fg};
1628 } else { 1867 } else {
1629 glColor @{$self->{bg}}; 1868 glColor_premultiply @{$self->{bg}};
1630 } 1869 }
1631 1870
1632 glEnable GL_BLEND; 1871 glEnable GL_BLEND;
1633 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1872 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1634 glBegin GL_QUADS; 1873 glBegin GL_QUADS;
1635 glVertex 0 , 0; 1874 glVertex 0 , 0;
1636 glVertex 0 , $self->{h}; 1875 glVertex 0 , $self->{h};
1637 glVertex $self->{w}, $self->{h}; 1876 glVertex $self->{w}, $self->{h};
1638 glVertex $self->{w}, 0; 1877 glVertex $self->{w}, 0;
… …
1663 1902
1664our @ISA = CFClient::UI::EntryBase::; 1903our @ISA = CFClient::UI::EntryBase::;
1665 1904
1666use CFClient::OpenGL; 1905use CFClient::OpenGL;
1667 1906
1668sub key_down { 1907sub invoke_key_down {
1669 my ($self, $ev) = @_; 1908 my ($self, $ev) = @_;
1670 1909
1671 my $sym = $ev->{sym}; 1910 my $sym = $ev->{sym};
1672 1911
1673 if ($sym == 13) { 1912 if ($sym == 13) {
1674 unshift @{$self->{history}}, 1913 unshift @{$self->{history}},
1675 my $txt = $self->get_text; 1914 my $txt = $self->get_text;
1915
1676 $self->{history_pointer} = -1; 1916 $self->{history_pointer} = -1;
1677 $self->{history_saveback} = ''; 1917 $self->{history_saveback} = '';
1678 $self->emit (activate => $txt); 1918 $self->emit (activate => $txt);
1679 $self->update; 1919 $self->update;
1680 1920
… …
1699 } else { 1939 } else {
1700 $self->set_text ($self->{history_saveback}); 1940 $self->set_text ($self->{history_saveback});
1701 } 1941 }
1702 1942
1703 } else { 1943 } else {
1704 $self->SUPER::key_down ($ev); 1944 return $self->SUPER::invoke_key_down ($ev)
1945 }
1946
1705 } 1947 1
1706
1707} 1948}
1708 1949
1709############################################################################# 1950#############################################################################
1710 1951
1711package CFClient::UI::Button; 1952package CFClient::UI::Button;
… …
1720 1961
1721sub new { 1962sub new {
1722 my $class = shift; 1963 my $class = shift;
1723 1964
1724 $class->SUPER::new ( 1965 $class->SUPER::new (
1725 padding => 4, 1966 padding_x => 4,
1967 padding_y => 4,
1726 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1727 active_fg => [0, 0, 1], 1969 active_fg => [0, 0, 1],
1728 can_hover => 1, 1970 can_hover => 1,
1729 align => 0, 1971 align => 0,
1730 valign => 0, 1972 valign => 0,
1731 can_events => 1, 1973 can_events => 1,
1732 @_ 1974 @_
1733 ) 1975 )
1734} 1976}
1735 1977
1736sub button_up { 1978sub invoke_button_up {
1737 my ($self, $ev, $x, $y) = @_; 1979 my ($self, $ev, $x, $y) = @_;
1738 1980
1981 $self->emit ("activate")
1739 if ($x >= 0 && $x < $self->{w} 1982 if $x >= 0 && $x < $self->{w}
1740 && $y >= 0 && $y < $self->{h}) { 1983 && $y >= 0 && $y < $self->{h};
1741 $self->emit ("activate"); 1984
1742 } 1985 1
1743} 1986}
1744 1987
1745sub _draw { 1988sub _draw {
1746 my ($self) = @_; 1989 my ($self) = @_;
1747 1990
1748 local $self->{fg} = $self->{fg}; 1991 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1749
1750 if ($GRAB == $self) {
1751 $self->{fg} = $self->{active_fg};
1752 }
1753 1992
1754 glEnable GL_TEXTURE_2D; 1993 glEnable GL_TEXTURE_2D;
1755 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1756 glColor 0, 0, 0, 1; 1995 glColor 0, 0, 0, 1;
1757 1996
… …
1762 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
1763} 2002}
1764 2003
1765############################################################################# 2004#############################################################################
1766 2005
2006package CFClient::UI::ImageButton;
2007
2008our @ISA = CFClient::UI::Image::;
2009
2010use CFClient::OpenGL;
2011
2012my %textures;
2013
2014sub new {
2015 my $class = shift;
2016
2017 my $self = $class->SUPER::new (
2018 padding_x => 4,
2019 padding_y => 4,
2020 fg => [1, 1, 1],
2021 active_fg => [0, 0, 1],
2022 can_hover => 1,
2023 align => 0,
2024 valign => 0,
2025 can_events => 1,
2026 @_
2027 );
2028}
2029
2030sub invoke_button_up {
2031 my ($self, $ev, $x, $y) = @_;
2032
2033 $self->emit ("activate")
2034 if $x >= 0 && $x < $self->{w}
2035 && $y >= 0 && $y < $self->{h};
2036
2037 1
2038}
2039
2040#############################################################################
2041
1767package CFClient::UI::CheckBox; 2042package CFClient::UI::CheckBox;
1768 2043
1769our @ISA = CFClient::UI::DrawBG::; 2044our @ISA = CFClient::UI::DrawBG::;
1770 2045
1771my @tex = 2046my @tex =
… …
1776 2051
1777sub new { 2052sub new {
1778 my $class = shift; 2053 my $class = shift;
1779 2054
1780 $class->SUPER::new ( 2055 $class->SUPER::new (
1781 padding => 2, 2056 padding_x => 2,
2057 padding_y => 2,
1782 fg => [1, 1, 1], 2058 fg => [1, 1, 1],
1783 active_fg => [1, 1, 0], 2059 active_fg => [1, 1, 0],
1784 bg => [0, 0, 0, 0.2], 2060 bg => [0, 0, 0, 0.2],
1785 active_bg => [1, 1, 1, 0.5], 2061 active_bg => [1, 1, 1, 0.5],
1786 state => 0, 2062 state => 0,
… …
1790} 2066}
1791 2067
1792sub size_request { 2068sub size_request {
1793 my ($self) = @_; 2069 my ($self) = @_;
1794 2070
1795 ($self->{padding} * 2 + 6) x 2 2071 (6) x 2
1796} 2072}
1797 2073
2074sub toggle {
2075 my ($self) = @_;
2076
2077 $self->{state} = !$self->{state};
2078 $self->emit (changed => $self->{state});
2079 $self->update;
2080}
2081
1798sub button_down { 2082sub invoke_button_down {
1799 my ($self, $ev, $x, $y) = @_; 2083 my ($self, $ev, $x, $y) = @_;
1800 2084
1801 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2085 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1802 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2086 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1803 $self->{state} = !$self->{state}; 2087 $self->toggle;
1804 $self->emit (changed => $self->{state}); 2088 } else {
2089 return 0
2090 }
2091
1805 } 2092 1
1806} 2093}
1807 2094
1808sub _draw { 2095sub _draw {
1809 my ($self) = @_; 2096 my ($self) = @_;
1810 2097
1811 $self->SUPER::_draw; 2098 $self->SUPER::_draw;
1812 2099
1813 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2100 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1814 2101
1815 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2102 my ($w, $h) = @$self{qw(w h)};
2103
2104 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1816 2105
1817 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2106 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1818 2107
1819 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2108 my $tex = $self->{state} ? $tex[1] : $tex[0];
1820 2109
… …
1828package CFClient::UI::Image; 2117package CFClient::UI::Image;
1829 2118
1830our @ISA = CFClient::UI::Base::; 2119our @ISA = CFClient::UI::Base::;
1831 2120
1832use CFClient::OpenGL; 2121use CFClient::OpenGL;
1833use Carp qw/confess/;
1834 2122
1835our %loaded_images; 2123our %texture_cache;
1836 2124
1837sub new { 2125sub new {
1838 my $class = shift; 2126 my $class = shift;
1839 2127
1840 my $self = $class->SUPER::new (can_events => 0, @_); 2128 my $self = $class->SUPER::new (
2129 can_events => 0,
2130 @_,
2131 );
1841 2132
1842 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2133 $self->{path} || $self->{tex}
2134 or Carp::croak "'path' or 'tex' attributes required";
1843 2135
1844 $loaded_images{$self->{image}} ||= 2136 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1845 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2137 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1846 2138
1847 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2139 Scalar::Util::weaken $texture_cache{$self->{path}};
1848 2140
1849 Scalar::Util::weaken $loaded_images{$self->{image}}; 2141 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1850
1851 $self->{aspect} = $tex->{w} / $tex->{h};
1852 2142
1853 $self 2143 $self
1854} 2144}
1855 2145
1856sub size_request { 2146sub size_request {
1857 my ($self) = @_; 2147 my ($self) = @_;
1858 2148
1859 ($self->{tex}->{w}, $self->{tex}->{h}) 2149 ($self->{tex}{w}, $self->{tex}{h})
1860} 2150}
1861 2151
1862sub _draw { 2152sub _draw {
1863 my ($self) = @_; 2153 my ($self) = @_;
1864 2154
… …
1973 my $ycut1 = max 0, min 1, $ycut; 2263 my $ycut1 = max 0, min 1, $ycut;
1974 my $ycut2 = max 0, min 1, $ycut - 1; 2264 my $ycut2 = max 0, min 1, $ycut - 1;
1975 2265
1976 my $h1 = $self->{h} * (1 - $ycut1); 2266 my $h1 = $self->{h} * (1 - $ycut1);
1977 my $h2 = $self->{h} * (1 - $ycut2); 2267 my $h2 = $self->{h} * (1 - $ycut2);
2268 my $h3 = $self->{h};
2269
2270 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1978 2271
1979 glEnable GL_BLEND; 2272 glEnable GL_BLEND;
1980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2273 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2274 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1981 glEnable GL_TEXTURE_2D; 2275 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2276 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983 2277
1984 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2278 glBindTexture GL_TEXTURE_2D, $t1->{name};
1985 glBegin GL_QUADS; 2279 glBegin GL_QUADS;
… …
2000 2294
2001 if ($t3) { 2295 if ($t3) {
2002 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2296 glBindTexture GL_TEXTURE_2D, $t3->{name};
2003 glBegin GL_QUADS; 2297 glBegin GL_QUADS;
2004 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2298 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2005 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2299 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2006 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2300 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2007 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2301 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2008 glEnd; 2302 glEnd;
2009 } 2303 }
2010 2304
2011 glDisable GL_BLEND; 2305 glDisable GL_BLEND;
… …
2085 fg => [1, 1, 1], 2379 fg => [1, 1, 1],
2086 active_fg => [0, 0, 0], 2380 active_fg => [0, 0, 0],
2087 bg => [0, 0, 0, 0.2], 2381 bg => [0, 0, 0, 0.2],
2088 active_bg => [1, 1, 1, 0.5], 2382 active_bg => [1, 1, 1, 0.5],
2089 range => [0, 0, 100, 10, 0], 2383 range => [0, 0, 100, 10, 0],
2090 req_w => $::WIDTH / 80, 2384 min_w => $::WIDTH / 80,
2091 req_h => $::WIDTH / 80, 2385 min_h => $::WIDTH / 80,
2092 vertical => 0, 2386 vertical => 0,
2093 can_hover => 1, 2387 can_hover => 1,
2094 inner_pad => 0.02, 2388 inner_pad => 0.02,
2095 @_ 2389 @_
2096 ); 2390 );
… …
2102} 2396}
2103 2397
2104sub set_range { 2398sub set_range {
2105 my ($self, $range) = @_; 2399 my ($self, $range) = @_;
2106 2400
2107 $self->{range} = $range; 2401 ($range, $self->{range}) = ($self->{range}, $range);
2108 2402
2403 if ("@$range" ne "@{$self->{range}}") {
2109 $self->update; 2404 $self->update;
2405 $self->set_value ($self->{range}[0]);
2406 }
2110} 2407}
2111 2408
2112sub set_value { 2409sub set_value {
2113 my ($self, $value) = @_; 2410 my ($self, $value) = @_;
2114 2411
… …
2133} 2430}
2134 2431
2135sub size_request { 2432sub size_request {
2136 my ($self) = @_; 2433 my ($self) = @_;
2137 2434
2138 my $w = $self->{req_w}; 2435 ($self->{req_w}, $self->{req_h})
2139 my $h = $self->{req_h};
2140
2141 $self->{vertical} ? ($h, $w) : ($w, $h)
2142} 2436}
2143 2437
2144sub button_down { 2438sub invoke_button_down {
2145 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2146 2440
2147 $self->SUPER::button_down ($ev, $x, $y); 2441 $self->SUPER::invoke_button_down ($ev, $x, $y);
2148 2442
2149 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2443 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2150 2444
2151 $self->mouse_motion ($ev, $x, $y); 2445 $self->invoke_mouse_motion ($ev, $x, $y)
2152} 2446}
2153 2447
2154sub mouse_motion { 2448sub invoke_mouse_motion {
2155 my ($self, $ev, $x, $y) = @_; 2449 my ($self, $ev, $x, $y) = @_;
2156 2450
2157 if ($GRAB == $self) { 2451 if ($GRAB == $self) {
2158 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2452 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2159 2453
2160 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2454 my (undef, $lo, $hi, $page) = @{$self->{range}};
2161 2455
2162 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2456 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2163 2457
2164 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2458 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2459 } else {
2460 return 0;
2461 }
2462
2165 } 2463 1
2166} 2464}
2167 2465
2168sub update { 2466sub update {
2169 my ($self) = @_; 2467 my ($self) = @_;
2170 2468
2171 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2469 delete $self->{knob_w};
2470 $self->SUPER::update;
2471}
2472
2473sub _draw {
2474 my ($self) = @_;
2475
2476 unless ($self->{knob_w}) {
2172 $self->set_value ($self->{range}[0]); 2477 $self->set_value ($self->{range}[0]);
2173 2478
2174 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2479 my ($value, $lo, $hi, $page) = @{$self->{range}};
2175 my $range = ($hi - $page - $lo) || 1e-100; 2480 my $range = ($hi - $page - $lo) || 1e-100;
2176 2481
… …
2182 $value = ($value - $lo) / $range; 2487 $value = ($value - $lo) / $range;
2183 $value = $value * $self->{scale} + $self->{offset}; 2488 $value = $value * $self->{scale} + $self->{offset};
2184 2489
2185 $self->{knob_x} = $value - $knob_w * 0.5; 2490 $self->{knob_x} = $value - $knob_w * 0.5;
2186 $self->{knob_w} = $knob_w; 2491 $self->{knob_w} = $knob_w;
2187 }); 2492 }
2188
2189 $self->SUPER::update;
2190}
2191
2192sub _draw {
2193 my ($self) = @_;
2194 2493
2195 $self->SUPER::_draw (); 2494 $self->SUPER::_draw ();
2196 2495
2197 glScale $self->{w}, $self->{h}; 2496 glScale $self->{w}, $self->{h};
2198 2497
… …
2259sub set_range { shift->{slider}->set_range (@_) } 2558sub set_range { shift->{slider}->set_range (@_) }
2260sub set_value { shift->{slider}->set_value (@_) } 2559sub set_value { shift->{slider}->set_value (@_) }
2261 2560
2262############################################################################# 2561#############################################################################
2263 2562
2264package CFClient::UI::TextView; 2563package CFClient::UI::TextScroller;
2265 2564
2266our @ISA = CFClient::UI::HBox::; 2565our @ISA = CFClient::UI::HBox::;
2267 2566
2268use CFClient::OpenGL; 2567use CFClient::OpenGL;
2269 2568
… …
2271 my $class = shift; 2570 my $class = shift;
2272 2571
2273 my $self = $class->SUPER::new ( 2572 my $self = $class->SUPER::new (
2274 fontsize => 1, 2573 fontsize => 1,
2275 can_events => 0, 2574 can_events => 0,
2575 indent => 0,
2276 #font => default_font 2576 #font => default_font
2277 @_, 2577 @_,
2278 2578
2279 layout => (new CFClient::Layout 1), 2579 layout => (new CFClient::Layout),
2280 par => [], 2580 par => [],
2281 height => 0, 2581 height => 0,
2282 children => [ 2582 children => [
2283 (new CFClient::UI::Empty expand => 1), 2583 (new CFClient::UI::Empty expand => 1),
2284 (new CFClient::UI::Slider vertical => 1), 2584 (new CFClient::UI::Slider vertical => 1),
… …
2295 2595
2296 $self->{fontsize} = $fontsize; 2596 $self->{fontsize} = $fontsize;
2297 $self->reflow; 2597 $self->reflow;
2298} 2598}
2299 2599
2600sub size_request {
2601 my ($self) = @_;
2602
2603 my ($empty, $slider) = @{ $self->{children} };
2604
2605 local $self->{children} = [$empty, $slider];
2606 $self->SUPER::size_request
2607}
2608
2300sub size_allocate { 2609sub invoke_size_allocate {
2301 my ($self, $w, $h) = @_; 2610 my ($self, $w, $h) = @_;
2302 2611
2303 $self->SUPER::size_allocate ($w, $h); 2612 my ($empty, $slider, @other) = @{ $self->{children} };
2613 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2304 2614
2305 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2615 $self->{layout}->set_font ($self->{font}) if $self->{font};
2306 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2307 $self->{layout}->set_width ($self->{children}[0]{w}); 2617 $self->{layout}->set_width ($empty->{w});
2618 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2308 2619
2309 $self->reflow; 2620 $self->reflow;
2310}
2311 2621
2312sub text_size { 2622 local $self->{children} = [$empty, $slider];
2313 my ($self, $text, $indent) = @_; 2623 $self->SUPER::invoke_size_allocate ($w, $h)
2624}
2625
2626sub get_layout {
2627 my ($self, $para) = @_;
2314 2628
2315 my $layout = $self->{layout}; 2629 my $layout = $self->{layout};
2316 2630
2631 $layout->set_font ($self->{font}) if $self->{font};
2632 $layout->set_foreground (@{$para->{fg}});
2317 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2633 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2318 $layout->set_width ($self->{children}[0]{w} - $indent); 2634 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2635 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2319 $layout->set_markup ($text); 2636 $layout->set_markup ($para->{markup});
2637
2638 $layout->set_shapes (
2639 map
2640 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2641 @{$para->{widget}}
2320 2642 );
2643
2321 $layout->size 2644 $layout
2322} 2645}
2323 2646
2324sub reflow { 2647sub reflow {
2325 my ($self) = @_; 2648 my ($self) = @_;
2326 2649
… …
2335 $self->{children}[1]->set_value ($offset); 2658 $self->{children}[1]->set_value ($offset);
2336} 2659}
2337 2660
2338sub clear { 2661sub clear {
2339 my ($self) = @_; 2662 my ($self) = @_;
2663
2664 my (undef, undef, @other) = @{ $self->{children} };
2665 $self->remove ($_) for @other;
2340 2666
2341 $self->{par} = []; 2667 $self->{par} = [];
2342 $self->{height} = 0; 2668 $self->{height} = 0;
2343 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2669 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2344} 2670}
2345 2671
2346sub add_paragraph { 2672sub add_paragraph {
2347 my ($self, $color, $text, $indent) = @_; 2673 my ($self, $color, $para, $indent) = @_;
2348 2674
2349 for my $line (split /\n/, $text) { 2675 my ($text, @w) = ref $para ? @$para : $para;
2350 my ($w, $h) = $self->text_size ($line); 2676
2351 $self->{height} += $h; 2677 $para = {
2352 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2678 w => 1e10,
2679 wrapped => 1,
2680 fg => $color,
2681 indent => $indent,
2682 markup => $text,
2683 widget => \@w,
2353 } 2684 };
2354 2685
2355 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2686 $self->add (@w) if @w;
2687 push @{$self->{par}}, $para;
2688
2689 $self->{need_reflow}++;
2690 $self->update;
2691}
2692
2693sub scroll_to_bottom {
2694 my ($self) = @_;
2695
2696 $self->{scroll_to_bottom} = 1;
2697 $self->update;
2356} 2698}
2357 2699
2358sub update { 2700sub update {
2359 my ($self) = @_; 2701 my ($self) = @_;
2360 2702
… …
2362 2704
2363 return unless $self->{h} > 0; 2705 return unless $self->{h} > 0;
2364 2706
2365 delete $self->{texture}; 2707 delete $self->{texture};
2366 2708
2367 $ROOT->on_post_alloc ($self, sub { 2709 $ROOT->on_post_alloc ($self => sub {
2368 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2710 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2369 2711
2370 if (delete $self->{need_reflow}) { 2712 if (delete $self->{need_reflow}) {
2371 my $height = 0; 2713 my $height = 0;
2372 2714
2373 my $layout = $self->{layout};
2374
2375 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2376
2377 for (@{$self->{par}}) { 2715 for my $para (@{$self->{par}}) {
2378 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2716 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2379 $layout->set_width ($W - $_->[3]); 2717 my $layout = $self->get_layout ($para);
2380 $layout->set_markup ($_->[4]);
2381 my ($w, $h) = $layout->size; 2718 my ($w, $h) = $layout->size;
2382 $_->[0] = $w + $_->[3]; 2719
2383 $_->[1] = $h; 2720 $para->{w} = $w + $para->{indent};
2721 $para->{h} = $h;
2722 $para->{wrapped} = $layout->has_wrapped;
2384 } 2723 }
2385 2724
2386 $height += $_->[1]; 2725 $height += $para->{h};
2387 } 2726 }
2388 2727
2389 $self->{height} = $height; 2728 $self->{height} = $height;
2390 2729
2391 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2730 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2392 2731
2393 delete $self->{texture}; 2732 delete $self->{texture};
2394 } 2733 }
2395 2734
2735 if (delete $self->{scroll_to_bottom}) {
2736 $self->{children}[1]->set_value (1e10);
2737 }
2738
2396 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2739 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2397 glClearColor 0.5, 0.5, 0.5, 0; 2740 glClearColor 0, 0, 0, 0;
2398 glClear GL_COLOR_BUFFER_BIT; 2741 glClear GL_COLOR_BUFFER_BIT;
2399 2742
2400 my $top = int $self->{children}[1]{range}[0]; 2743 my $top = int $self->{children}[1]{range}[0];
2401 2744
2402 my $y0 = $top; 2745 my $y0 = $top;
2403 my $y1 = $top + $H; 2746 my $y1 = $top + $H;
2404 2747
2405 my $y = 0; 2748 my $y = 0;
2406 2749
2407 my $layout = $self->{layout};
2408
2409 $layout->set_font ($self->{font}) if $self->{font};
2410
2411 glEnable GL_BLEND;
2412 #TODO# not correct in windows where rgba is forced off
2413 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2414
2415 for my $par (@{$self->{par}}) { 2750 for my $para (@{$self->{par}}) {
2416 my $h = $par->[1]; 2751 my $h = $para->{h};
2417 2752
2418 if ($y0 < $y + $h && $y < $y1) { 2753 if ($y0 < $y + $h && $y < $y1) {
2419 $layout->set_foreground (@{ $par->[2] });
2420 $layout->set_width ($W - $par->[3]);
2421 $layout->set_markup ($par->[4]);
2422 2754
2423 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2755 my $layout = $self->get_layout ($para);
2424 2756
2425 glRasterPos $par->[3], $y - $y0; 2757 $layout->render ($para->{indent}, $y - $y0);
2426 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2758
2759 if (my @w = @{ $para->{widget} }) {
2760 my @s = $layout->get_shapes;
2761
2762 for (@w) {
2763 my ($dx, $dy) = splice @s, 0, 2, ();
2764
2765 $_->{x} = $dx + $para->{indent};
2766 $_->{y} = $dy + $y - $y0;
2767
2768 $_->draw;
2769 }
2770 }
2427 } 2771 }
2428 2772
2429 $y += $h; 2773 $y += $h;
2430 } 2774 }
2431
2432 glDisable GL_BLEND;
2433 }; 2775 };
2434 }); 2776 });
2435} 2777}
2436 2778
2779sub reconfigure {
2780 my ($self) = @_;
2781
2782 $self->SUPER::reconfigure;
2783
2784 $_->{w} = 1e10 for @{ $self->{par} };
2785 $self->reflow;
2786}
2787
2437sub _draw { 2788sub _draw {
2438 my ($self) = @_; 2789 my ($self) = @_;
2439 2790
2440 glEnable GL_TEXTURE_2D; 2791 glEnable GL_TEXTURE_2D;
2441 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2442 glColor 1, 1, 1, 1; 2793 glColor 0, 0, 0, 1;
2443 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2794 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2444 glDisable GL_TEXTURE_2D; 2795 glDisable GL_TEXTURE_2D;
2445 2796
2446 $self->{children}[1]->draw; 2797 $self->{children}[1]->draw;
2447
2448} 2798}
2449 2799
2450############################################################################# 2800#############################################################################
2451 2801
2452package CFClient::UI::Animator; 2802package CFClient::UI::Animator;
… …
2497 2847
2498sub new { 2848sub new {
2499 my $class = shift; 2849 my $class = shift;
2500 2850
2501 my $self = $class->SUPER::new ( 2851 my $self = $class->SUPER::new (
2502 state => 0, 2852 state => 0,
2503 connect_activate => \&toggle_flopper, 2853 on_activate => \&toggle_flopper,
2504 @_ 2854 @_
2505 ); 2855 );
2506 2856
2507 if ($self->{state}) {
2508 $self->{state} = 0;
2509 $self->toggle_flopper;
2510 }
2511
2512 $self 2857 $self
2513} 2858}
2514 2859
2515sub toggle_flopper { 2860sub toggle_flopper {
2516 my ($self) = @_; 2861 my ($self) = @_;
2517 2862
2518 # TODO: use animation 2863 $self->{other}->toggle_visibility;
2519 if ($self->{state} = !$self->{state}) {
2520 $CFClient::UI::ROOT->add ($self->{other});
2521 $self->{other}->move ($self->coord2global (0, $self->{h}));
2522 $self->emit ("open");
2523 } else {
2524 $CFClient::UI::ROOT->remove ($self->{other});
2525 $self->emit ("close");
2526 }
2527
2528 $self->emit (changed => $self->{state});
2529} 2864}
2530 2865
2531############################################################################# 2866#############################################################################
2532 2867
2533package CFClient::UI::Tooltip; 2868package CFClient::UI::Tooltip;
… …
2546} 2881}
2547 2882
2548sub set_tooltip_from { 2883sub set_tooltip_from {
2549 my ($self, $widget) = @_; 2884 my ($self, $widget) = @_;
2550 2885
2886 my $tooltip = $widget->{tooltip};
2887
2888 if ($ENV{CFPLUS_DEBUG} & 2) {
2889 $tooltip .= "\n\n" . (ref $widget) . "\n"
2890 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2891 . "req $widget->{req_w} $widget->{req_h}\n"
2892 . "visible $widget->{visible}";
2893 }
2894
2895 $tooltip =~ s/^\n+//;
2896 $tooltip =~ s/\n+$//;
2897
2551 $self->add (new CFClient::UI::Label 2898 $self->add (new CFClient::UI::Label
2552 markup => $widget->{tooltip}, 2899 markup => $tooltip,
2553 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2900 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2554 fontsize => 0.8, 2901 fontsize => 0.8,
2555 fg => [0, 0, 0, 1], 2902 fg => [0, 0, 0, 1],
2556 ellipsise => 0, 2903 ellipsise => 0,
2557 font => ($widget->{tooltip_font} || $::FONT_PROP), 2904 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2564 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2911 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2565 2912
2566 ($w + 4, $h + 4) 2913 ($w + 4, $h + 4)
2567} 2914}
2568 2915
2569sub size_allocate { 2916sub invoke_size_allocate {
2570 my ($self, $w, $h) = @_; 2917 my ($self, $w, $h) = @_;
2571 2918
2572 $self->SUPER::size_allocate ($w - 4, $h - 4); 2919 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2920}
2921
2922sub invoke_visibility_change {
2923 my ($self, $visible) = @_;
2924
2925 return unless $visible;
2926
2927 $self->{root}->on_post_alloc ("move_$self" => sub {
2928 my $widget = $self->{owner}
2929 or return;
2930
2931 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2932
2933 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2934 if $x + $self->{w} > $self->{root}{w};
2935
2936 $self->move_abs ($x, $y);
2937 });
2573} 2938}
2574 2939
2575sub _draw { 2940sub _draw {
2576 my ($self) = @_; 2941 my ($self) = @_;
2577 2942
… …
2594 glVertex $w, $h; 2959 glVertex $w, $h;
2595 glVertex $w, 0; 2960 glVertex $w, 0;
2596 glEnd; 2961 glEnd;
2597 2962
2598 glTranslate 2 - 0.375, 2 - 0.375; 2963 glTranslate 2 - 0.375, 2 - 0.375;
2964
2599 $self->SUPER::_draw; 2965 $self->SUPER::_draw;
2600} 2966}
2601 2967
2602############################################################################# 2968#############################################################################
2603 2969
… …
2609 2975
2610sub new { 2976sub new {
2611 my $class = shift; 2977 my $class = shift;
2612 2978
2613 my $self = $class->SUPER::new ( 2979 my $self = $class->SUPER::new (
2614 aspect => 1, 2980 aspect => 1,
2981 can_events => 0,
2615 @_, 2982 @_,
2616 ); 2983 );
2617 2984
2618 if ($self->{anim} && $self->{animspeed}) { 2985 if ($self->{anim} && $self->{animspeed}) {
2619 Scalar::Util::weaken (my $widget = $self); 2986 Scalar::Util::weaken (my $widget = $self);
… …
2661 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3028 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2662 3029
2663 if ($tex) { 3030 if ($tex) {
2664 glEnable GL_TEXTURE_2D; 3031 glEnable GL_TEXTURE_2D;
2665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3032 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2666 glColor 1, 1, 1, 1; 3033 glColor 0, 0, 0, 1;
2667 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3034 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2668 glDisable GL_TEXTURE_2D; 3035 glDisable GL_TEXTURE_2D;
2669 } 3036 }
2670} 3037}
2671 3038
2672sub DESTROY { 3039sub destroy {
2673 my ($self) = @_; 3040 my ($self) = @_;
2674 3041
2675 $self->{timer}->cancel 3042 $self->{timer}->cancel
2676 if $self->{timer}; 3043 if $self->{timer};
2677 3044
2678 $self->SUPER::DESTROY; 3045 $self->SUPER::destroy;
2679} 3046}
2680 3047
2681############################################################################# 3048#############################################################################
2682 3049
2683package CFClient::UI::InventoryItem; 3050package CFClient::UI::Buttonbar;
2684 3051
2685our @ISA = CFClient::UI::HBox::; 3052our @ISA = CFClient::UI::HBox::;
2686 3053
2687sub _item_to_desc { 3054# TODO: should actualyl wrap buttons and other goodies.
2688 my ($item) = @_;
2689
2690 my $desc =
2691 $item->{nrof} < 2
2692 ? $item->{name}
2693 : "$item->{nrof} × $item->{name_pl}";
2694
2695 $item->{flags} & Crossfire::Protocol::F_OPEN
2696 and $desc .= " (open)";
2697 $item->{flags} & Crossfire::Protocol::F_APPLIED
2698 and $desc .= " (applied)";
2699 $item->{flags} & Crossfire::Protocol::F_UNPAID
2700 and $desc .= " (unpaid)";
2701 $item->{flags} & Crossfire::Protocol::F_MAGIC
2702 and $desc .= " (magic)";
2703 $item->{flags} & Crossfire::Protocol::F_CURSED
2704 and $desc .= " (cursed)";
2705 $item->{flags} & Crossfire::Protocol::F_DAMNED
2706 and $desc .= " (damned)";
2707 $item->{flags} & Crossfire::Protocol::F_LOCKED
2708 and $desc .= " *";
2709
2710 $desc
2711}
2712
2713sub new {
2714 my $class = shift;
2715
2716 my %args = @_;
2717
2718 my $item = delete $args{item};
2719
2720 my $desc = _item_to_desc ($item);
2721
2722 my $self = $class->SUPER::new (
2723 can_hover => 1,
2724 can_events => 1,
2725 tooltip => ((CFClient::UI::Label::escape $desc)
2726 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2727 connect_button_down => sub {
2728 my ($self, $ev, $x, $y) = @_;
2729
2730 # todo: maybe put examine on 1? but should just be a tooltip :(
2731 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2732 my $targ = $::CONN->{player}{tag};
2733
2734 if ($item->{container} == $::CONN->{player}{tag}) {
2735 $targ = $main::OPENCONT;
2736 }
2737
2738 $::CONN->send ("move $targ $item->{tag} 0");
2739 } elsif ($ev->{button} == 1) {
2740 $::CONN->send ("examine $item->{tag}");
2741 } elsif ($ev->{button} == 2) {
2742 $::CONN->send ("apply $item->{tag}");
2743 } elsif ($ev->{button} == 3) {
2744 my @menu_items = (
2745 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2746 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2747 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2748 (
2749 $item->{flags} & Crossfire::Protocol::F_LOCKED
2750 ? (
2751 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2752 )
2753 : (
2754 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2755 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2756 )
2757 ),
2758 );
2759
2760 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2761 }
2762
2763 1
2764 },
2765 %args
2766 );
2767
2768
2769 $self->add (new CFClient::UI::Face
2770 can_events => 0,
2771 face => $item->{face},
2772 anim => $item->{anim},
2773 animspeed => $item->{animspeed},
2774 );
2775
2776 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2777
2778 $self->{item} = $item;
2779
2780 $self->update_item;
2781
2782 $self
2783}
2784
2785sub update_item {
2786 my ($self) = @_;
2787
2788 my $desc = _item_to_desc ($self->{item});
2789
2790 $self->{name_lbl}->set_text ($desc);
2791}
2792
2793#############################################################################
2794
2795package CFClient::UI::Inventory;
2796
2797our @ISA = CFClient::UI::ScrolledWindow::;
2798
2799sub new {
2800 my $class = shift;
2801
2802 my $self = $class->SUPER::new (
2803 scrolled => (new CFClient::UI::Table),
2804 @_,
2805 );
2806
2807 $self
2808}
2809
2810sub set_items {
2811 my ($self, $items) = @_;
2812
2813 $self->{scrolled}->clear;
2814 return unless $items;
2815
2816 my @items = sort {
2817 ($a->{type} <=> $b->{type})
2818 or ($a->{name} cmp $b->{name})
2819 } @$items;
2820
2821 $self->{real_items} = \@items;
2822
2823 for my $item (@items) {
2824 $item->{item} = $item;
2825 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2826 $item->update_item ();
2827 }
2828
2829 my $i = 0;
2830 for (@items) {
2831 $self->{scrolled}->add (0, $i, $_);
2832 my $nrof = $_->{item}->{nrof} || 1;
2833 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2834 }
2835
2836# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2837}
2838
2839sub size_request {
2840 my ($self) = @_;
2841 ($self->{req_w}, $self->{req_h});
2842}
2843 3055
2844############################################################################# 3056#############################################################################
2845 3057
2846package CFClient::UI::Menu; 3058package CFClient::UI::Menu;
2847 3059
… …
2859 ); 3071 );
2860 3072
2861 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3073 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2862 3074
2863 for my $item (@{ $self->{items} }) { 3075 for my $item (@{ $self->{items} }) {
2864 my ($widget, $cb) = @$item; 3076 my ($widget, $cb, $tooltip) = @$item;
2865 3077
2866 # handle various types of items, only text for now 3078 # handle various types of items, only text for now
2867 if (!ref $widget) { 3079 if (!ref $widget) {
3080 if ($widget =~ /\t/) {
3081 my ($left, $right) = split /\t/, $widget, 2;
3082
3083 $widget = new CFClient::UI::HBox
3084 can_hover => 1,
3085 can_events => 1,
3086 tooltip => $tooltip,
3087 children => [
3088 (new CFClient::UI::Label markup => $left, expand => 1),
3089 (new CFClient::UI::Label markup => $right, align => +1),
3090 ],
3091 ;
3092
3093 } else {
2868 $widget = new CFClient::UI::Label 3094 $widget = new CFClient::UI::Label
2869 can_hover => 1, 3095 can_hover => 1,
2870 can_events => 1, 3096 can_events => 1,
2871 text => $widget; 3097 markup => $widget,
3098 tooltip => $tooltip;
3099 }
2872 } 3100 }
2873 3101
2874 $self->{item}{$widget} = $item; 3102 $self->{item}{$widget} = $item;
2875 3103
2876 $self->{vbox}->add ($widget); 3104 $self->{vbox}->add ($widget);
… …
2888 # maybe save $GRAB? must be careful about events... 3116 # maybe save $GRAB? must be careful about events...
2889 $GRAB = $self; 3117 $GRAB = $self;
2890 $self->{button} = $ev->{button}; 3118 $self->{button} = $ev->{button};
2891 3119
2892 $self->show; 3120 $self->show;
2893 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3121 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2894} 3122}
2895 3123
2896sub mouse_motion { 3124sub invoke_mouse_motion {
2897 my ($self, $ev, $x, $y) = @_; 3125 my ($self, $ev, $x, $y) = @_;
2898 3126
2899 # TODO: should use vbox->find_widget or so 3127 # TODO: should use vbox->find_widget or so
2900 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3128 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2901 $self->{hover} = $self->{item}{$HOVER}; 3129 $self->{hover} = $self->{item}{$HOVER};
2902}
2903 3130
3131 0
3132}
3133
2904sub button_up { 3134sub invoke_button_up {
2905 my ($self, $ev, $x, $y) = @_; 3135 my ($self, $ev, $x, $y) = @_;
2906 3136
2907 if ($ev->{button} == $self->{button}) { 3137 if ($ev->{button} == $self->{button}) {
2908 undef $GRAB; 3138 undef $GRAB;
2909 $self->hide; 3139 $self->hide;
2910 3140
2911 $self->emit ("popdown"); 3141 $self->emit ("popdown");
2912 $self->{hover}[1]->() if $self->{hover}; 3142 $self->{hover}[1]->() if $self->{hover};
3143 } else {
3144 return 0
3145 }
3146
2913 } 3147 1
2914} 3148}
2915 3149
2916############################################################################# 3150#############################################################################
2917 3151
2918package CFClient::UI::Statusbox; 3152package CFClient::UI::Multiplexer;
2919 3153
2920our @ISA = CFClient::UI::VBox::; 3154our @ISA = CFClient::UI::Container::;
2921 3155
2922sub new { 3156sub new {
2923 my $class = shift; 3157 my $class = shift;
2924 3158
2925 $class->SUPER::new ( 3159 my $self = $class->SUPER::new (
3160 @_,
3161 );
3162
3163 $self->{current} = $self->{children}[0]
3164 if @{ $self->{children} };
3165
3166 $self
3167}
3168
3169sub add {
3170 my ($self, @widgets) = @_;
3171
3172 $self->SUPER::add (@widgets);
3173
3174 $self->{current} = $self->{children}[0]
3175 if @{ $self->{children} };
3176}
3177
3178sub get_current_page {
3179 my ($self) = @_;
3180
3181 $self->{current}
3182}
3183
3184sub set_current_page {
3185 my ($self, $page_or_widget) = @_;
3186
3187 my $widget = ref $page_or_widget
3188 ? $page_or_widget
3189 : $self->{children}[$page_or_widget];
3190
3191 $self->{current} = $widget;
3192 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3193
3194 $self->emit (page_changed => $self->{current});
3195
3196 $self->realloc;
3197}
3198
3199sub visible_children {
3200 $_[0]{current}
3201}
3202
3203sub size_request {
3204 my ($self) = @_;
3205
3206 $self->{current}->size_request
3207}
3208
3209sub invoke_size_allocate {
3210 my ($self, $w, $h) = @_;
3211
3212 $self->{current}->configure (0, 0, $w, $h);
3213
3214 1
3215}
3216
3217sub _draw {
3218 my ($self) = @_;
3219
3220 $self->{current}->draw;
3221}
3222
3223#############################################################################
3224
3225package CFClient::UI::Notebook;
3226
3227our @ISA = CFClient::UI::VBox::;
3228
3229sub new {
3230 my $class = shift;
3231
3232 my $self = $class->SUPER::new (
3233 buttonbar => (new CFClient::UI::Buttonbar),
3234 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3235 # filter => # will be put between multiplexer and $self
3236 @_,
3237 );
3238
3239 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3240 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3241
3242 $self
3243}
3244
3245sub add {
3246 my ($self, $title, $widget, $tooltip) = @_;
3247
3248 Scalar::Util::weaken $self;
3249
3250 $self->{buttonbar}->add (new CFClient::UI::Button
3251 markup => $title,
3252 tooltip => $tooltip,
3253 on_activate => sub { $self->set_current_page ($widget) },
3254 );
3255
3256 $self->{multiplexer}->add ($widget);
3257}
3258
3259sub get_current_page {
3260 my ($self) = @_;
3261
3262 $self->{multiplexer}->get_current_page
3263}
3264
3265sub set_current_page {
3266 my ($self, $page) = @_;
3267
3268 $self->{multiplexer}->set_current_page ($page);
3269 $self->emit (page_changed => $self->{multiplexer}{current});
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::Combobox;
3275
3276use utf8;
3277
3278our @ISA = CFClient::UI::Button::;
3279
3280sub new {
3281 my $class = shift;
3282
3283 my $self = $class->SUPER::new (
3284 options => [], # [value, title, longdesc], ...
3285 value => undef,
3286 @_,
3287 );
3288
3289 $self->_set_value ($self->{value});
3290
3291 $self
3292}
3293
3294sub invoke_button_down {
3295 my ($self, $ev) = @_;
3296
3297 my @menu_items;
3298
3299 for (@{ $self->{options} }) {
3300 my ($value, $title, $tooltip) = @$_;
3301
3302 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3303 }
3304
3305 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3306}
3307
3308sub _set_value {
3309 my ($self, $value) = @_;
3310
3311 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3312 or return;
3313
3314 $self->{value} = $item->[0];
3315 $self->set_markup ("$item->[1] ⇓");
3316 $self->set_tooltip ($item->[2]);
3317}
3318
3319sub set_value {
3320 my ($self, $value) = @_;
3321
3322 return unless $self->{value} ne $value;
3323
3324 $self->_set_value ($value);
3325 $self->emit (changed => $value);
3326}
3327
3328#############################################################################
3329
3330package CFClient::UI::Statusbox;
3331
3332our @ISA = CFClient::UI::VBox::;
3333
3334sub new {
3335 my $class = shift;
3336
3337 my $self = $class->SUPER::new (
2926 fontsize => 0.8, 3338 fontsize => 0.8,
2927 @_, 3339 @_,
2928 ) 3340 );
3341
3342 Scalar::Util::weaken (my $this = $self);
3343
3344 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3345
3346 $self
2929} 3347}
2930 3348
2931sub reorder { 3349sub reorder {
2932 my ($self) = @_; 3350 my ($self) = @_;
2933 my $NOW = time; 3351 my $NOW = Time::HiRes::time;
3352
3353 # freeze display when hovering over any label
3354 return if $CFClient::UI::TOOLTIP->{owner}
3355 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3356 values %{ $self->{item} };
2934 3357
2935 while (my ($k, $v) = each %{ $self->{item} }) { 3358 while (my ($k, $v) = each %{ $self->{item} }) {
2936 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3359 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2937 } 3360 }
2938 3361
… …
2941 my @items = sort { 3364 my @items = sort {
2942 $a->{pri} <=> $b->{pri} 3365 $a->{pri} <=> $b->{pri}
2943 or $b->{id} <=> $a->{id} 3366 or $b->{id} <=> $a->{id}
2944 } values %{ $self->{item} }; 3367 } values %{ $self->{item} };
2945 3368
3369 $self->{timer}->interval (1);
3370
2946 my $count = 10 + 1; 3371 my $count = 10 + 1;
2947 for my $item (@items) { 3372 for my $item (@items) {
2948 last unless --$count; 3373 last unless --$count;
2949 3374
2950 push @widgets, $item->{label} ||= do { 3375 my $label = $item->{label} ||= do {
2951 # TODO: doesn't handle markup well (read as: at all) 3376 # TODO: doesn't handle markup well (read as: at all)
2952 my $short = $item->{count} > 1 3377 my $short = $item->{count} > 1
2953 ? "<b>$item->{count} ×</b> $item->{text}" 3378 ? "<b>$item->{count} ×</b> $item->{text}"
2954 : $item->{text}; 3379 : $item->{text};
2955 3380
… …
2963 tooltip => $item->{tooltip}, 3388 tooltip => $item->{tooltip},
2964 tooltip_font => $::FONT_PROP, 3389 tooltip_font => $::FONT_PROP,
2965 tooltip_width => 0.67, 3390 tooltip_width => 0.67,
2966 fontsize => $item->{fontsize} || $self->{fontsize}, 3391 fontsize => $item->{fontsize} || $self->{fontsize},
2967 max_w => $::WIDTH * 0.44, 3392 max_w => $::WIDTH * 0.44,
2968 fg => $item->{fg}, 3393 fg => [@{ $item->{fg} }],
2969 can_events => 1, 3394 can_events => 1,
2970 can_hover => 1 3395 can_hover => 1
2971 }; 3396 };
3397
3398 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3399 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3400 $label->update;
3401 $label->set_max_size (undef, $label->{req_h} * $diff)
3402 if $diff < 1;
3403 $self->{timer}->interval (1/30);
3404 } else {
3405 $label->{fg}[3] = $item->{fg}[3] || 1;
3406 }
3407
3408 push @widgets, $label;
2972 } 3409 }
2973 3410
2974 $self->clear; 3411 $self->clear;
2975 $self->SUPER::add (reverse @widgets); 3412 $self->SUPER::add (reverse @widgets);
2976} 3413}
… …
2979 my ($self, $text, %arg) = @_; 3416 my ($self, $text, %arg) = @_;
2980 3417
2981 $text =~ s/^\s+//; 3418 $text =~ s/^\s+//;
2982 $text =~ s/\s+$//; 3419 $text =~ s/\s+$//;
2983 3420
3421 return unless $text;
3422
2984 my $timeout = time + ((delete $arg{timeout}) || 60); 3423 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2985 3424
2986 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3425 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2987 3426
2988 if (my $item = $self->{item}{$group}) { 3427 if (my $item = $self->{item}{$group}) {
2989 if ($item->{text} eq $text) { 3428 if ($item->{text} eq $text) {
2990 $item->{count}++; 3429 $item->{count}++;
2991 } else { 3430 } else {
2992 $item->{count} = 1; 3431 $item->{count} = 1;
2993 $item->{text} = $item->{tooltip} = $text; 3432 $item->{text} = $item->{tooltip} = $text;
2994 } 3433 }
2995 $item->{id} = ++$self->{id}; 3434 $item->{id} += 0.2;#d#
2996 $item->{timeout} = $timeout; 3435 $item->{timeout} = $timeout;
2997 delete $item->{label}; 3436 delete $item->{label};
2998 } else { 3437 } else {
2999 $self->{item}{$group} = { 3438 $self->{item}{$group} = {
3000 id => ++$self->{id}, 3439 id => ++$self->{id},
… …
3006 count => 1, 3445 count => 1,
3007 %arg, 3446 %arg,
3008 }; 3447 };
3009 } 3448 }
3010 3449
3450 $ROOT->on_refresh (reorder => sub {
3011 $self->reorder; 3451 $self->reorder;
3452 });
3012} 3453}
3013 3454
3014sub reconfigure { 3455sub reconfigure {
3015 my ($self) = @_; 3456 my ($self) = @_;
3016 3457
… …
3019 3460
3020 $self->reorder; 3461 $self->reorder;
3021 $self->SUPER::reconfigure; 3462 $self->SUPER::reconfigure;
3022} 3463}
3023 3464
3465sub destroy {
3466 my ($self) = @_;
3467
3468 $self->{timer}->cancel;
3469
3470 $self->SUPER::destroy;
3471}
3472
3024############################################################################# 3473#############################################################################
3025 3474
3026package CFClient::UI::Root; 3475package CFClient::UI::Inventory;
3027 3476
3028our @ISA = CFClient::UI::Container::; 3477our @ISA = CFClient::UI::Table::;
3029
3030use CFClient::OpenGL;
3031 3478
3032sub new { 3479sub new {
3033 my $class = shift; 3480 my $class = shift;
3034 3481
3035 $class->SUPER::new ( 3482 my $self = $class->SUPER::new (
3483 col_expand => [0, 1, 0],
3484 @_,
3485 );
3486
3487 $self
3488}
3489
3490sub set_items {
3491 my ($self, $items) = @_;
3492
3493 $self->clear;
3494 return unless $items;
3495
3496 my @items = sort {
3497 ($a->{type} <=> $b->{type})
3498 or ($a->{name} cmp $b->{name})
3499 } values %$items;
3500
3501 $self->{real_items} = \@items;
3502
3503 my $row = 0;
3504 for my $item (@items) {
3505 CFClient::Item::update_widgets $item;
3506
3507 $self->add (0, $row, $item->{face_widget});
3508 $self->add (1, $row, $item->{desc_widget});
3509 $self->add (2, $row, $item->{weight_widget});
3510
3511 $row++;
3512 }
3513}
3514
3515#############################################################################
3516
3517package CFClient::UI::SpellList;
3518
3519our @ISA = CFClient::UI::Table::;
3520
3521sub new {
3522 my $class = shift;
3523
3524 my $self = $class->SUPER::new (
3525 binding => [],
3526 commands => [],
3036 @_, 3527 @_,
3037 ) 3528 )
3038} 3529}
3039 3530
3040sub configure { 3531my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3041 my ($self, $x, $y, $w, $h) = @_;
3042 3532
3043 $self->{w} = $w; 3533my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3044 $self->{h} = $h; 3534 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3045} 3535my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3537my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3539my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3541my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3046 3543
3047sub check_size { 3544sub rebuild_spell_list {
3545 my ($self) = @_;
3546
3547 $CFClient::UI::ROOT->on_refresh ($self => sub {
3548 $self->clear;
3549
3550 return unless $::CONN;
3551
3552 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3553 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3554 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3555 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3556 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3557
3558 my $row = 0;
3559
3560 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3561 my $spell = $self->{spell}{$_};
3562
3563 $row++;
3564
3565 my $spell_cb = sub {
3566 my ($widget, $ev) = @_;
3567
3568 if ($ev->{button} == 1) {
3569 $::CONN->user_send ("cast $spell->{name}");
3570 } elsif ($ev->{button} == 2) {
3571 $::CONN->user_send ("invoke $spell->{name}");
3572 } elsif ($ev->{button} == 3) {
3573 (new CFClient::UI::Menu
3574 items => [
3575 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3576 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3577 ],
3578 )->popup ($ev);
3579 } else {
3580 return 0;
3581 }
3582
3583 1
3584 };
3585
3586 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3587
3588 #TODO: add path info to tooltip
3589 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3590
3591 $self->add (0, $row, new CFClient::UI::Face
3592 face => $spell->{face},
3593 can_hover => 1,
3594 can_events => 1,
3595 tooltip => $tooltip,
3596 on_button_down => $spell_cb,
3597 );
3598
3599 $self->add (1, $row, new CFClient::UI::Label
3600 expand => 1,
3601 text => $spell->{name},
3602 can_hover => 1,
3603 can_events => 1,
3604 tooltip => $tooltip,
3605 on_button_down => $spell_cb,
3606 );
3607
3608 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3609 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3610 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3611 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3612 }
3613 });
3614}
3615
3616sub add_spell {
3048 my ($self) = @_; 3617 my ($self, $spell) = @_;
3049 3618
3050 $self->size_allocate ($self->{w}, $self->{h}) 3619 $self->{spell}->{$spell->{name}} = $spell;
3051 if $self->{w}; 3620 $self->rebuild_spell_list;
3621}
3622
3623sub remove_spell {
3624 my ($self, $spell) = @_;
3625
3626 delete $self->{spell}->{$spell->{name}};
3627 $self->rebuild_spell_list;
3628}
3629
3630sub clear_spells {
3631 my ($self) = @_;
3632
3633 $self->{spell} = {};
3634 $self->rebuild_spell_list;
3635}
3636
3637#############################################################################
3638
3639package CFClient::UI::Root;
3640
3641our @ISA = CFClient::UI::Container::;
3642
3643use List::Util qw(min max);
3644
3645use CFClient::OpenGL;
3646
3647sub new {
3648 my $class = shift;
3649
3650 my $self = $class->SUPER::new (
3651 visible => 1,
3652 @_,
3653 );
3654
3655 Scalar::Util::weaken ($self->{root} = $self);
3656
3657 $self
3052} 3658}
3053 3659
3054sub size_request { 3660sub size_request {
3055 my ($self) = @_; 3661 my ($self) = @_;
3056 3662
3057 ($self->{w}, $self->{h}) 3663 ($self->{w}, $self->{h})
3058} 3664}
3059 3665
3666sub _to_pixel {
3667 my ($coord, $size, $max) = @_;
3668
3669 $coord =
3670 $coord eq "center" ? ($max - $size) * 0.5
3671 : $coord eq "max" ? $max
3672 : $coord;
3673
3674 $coord = 0 if $coord < 0;
3675 $coord = $max - $size if $coord > $max - $size;
3676
3677 int $coord + 0.5
3678}
3679
3060sub size_allocate { 3680sub invoke_size_allocate {
3061 my ($self, $w, $h) = @_; 3681 my ($self, $w, $h) = @_;
3062 3682
3063 for my $child ($self->children) { 3683 for my $child ($self->children) {
3064 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3684 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3065 3685
3066 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3686 $X = $child->{force_x} if exists $child->{force_x};
3067 if exists $child->{req_x}; 3687 $Y = $child->{force_y} if exists $child->{force_y};
3068 3688
3069 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3689 $X = _to_pixel $X, $W, $self->{w};
3070 if exists $child->{req_y}; 3690 $Y = _to_pixel $Y, $H, $self->{h};
3071
3072 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3073 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3074 3691
3075 $child->configure ($X, $Y, $W, $H); 3692 $child->configure ($X, $Y, $W, $H);
3076 } 3693 }
3694
3695 1
3077} 3696}
3078 3697
3079sub coord2local { 3698sub coord2local {
3080 my ($self, $x, $y) = @_; 3699 my ($self, $x, $y) = @_;
3081 3700
… …
3089} 3708}
3090 3709
3091sub update { 3710sub update {
3092 my ($self) = @_; 3711 my ($self) = @_;
3093 3712
3094 $self->check_size;
3095 $::WANT_REFRESH++; 3713 $::WANT_REFRESH++;
3096} 3714}
3097 3715
3098sub add { 3716sub add {
3099 my ($self, @children) = @_; 3717 my ($self, @children) = @_;
3100 3718
3101 for (my @widgets = @children; my $w = pop @widgets; ) {
3102 push @widgets, $w->children;
3103 $w->{root} = $self;
3104 $w->{visible} = 1;
3105 }
3106
3107 for my $child (@children) {
3108 $child->{is_toplevel} = 1; 3719 $_->{is_toplevel} = 1
3109 3720 for @children;
3110 # integerise window positions
3111 $child->{x} = int $child->{x};
3112 $child->{y} = int $child->{y};
3113 }
3114 3721
3115 $self->SUPER::add (@children); 3722 $self->SUPER::add (@children);
3116} 3723}
3117 3724
3118sub remove { 3725sub remove {
3119 my ($self, @children) = @_; 3726 my ($self, @children) = @_;
3120 3727
3121 $self->SUPER::remove (@children); 3728 $self->SUPER::remove (@children);
3729
3730 delete $self->{is_toplevel}
3731 for @children;
3122 3732
3123 while (@children) { 3733 while (@children) {
3124 my $w = pop @children; 3734 my $w = pop @children;
3125 push @children, $w->children; 3735 push @children, $w->children;
3126 delete $w->{visible}; 3736 $w->set_invisible;
3127 } 3737 }
3128} 3738}
3129 3739
3130sub on_refresh { 3740sub on_refresh {
3131 my ($self, $id, $cb) = @_; 3741 my ($self, $id, $cb) = @_;
… …
3145 while ($self->{refresh_hook}) { 3755 while ($self->{refresh_hook}) {
3146 $_->() 3756 $_->()
3147 for values %{delete $self->{refresh_hook}}; 3757 for values %{delete $self->{refresh_hook}};
3148 } 3758 }
3149 3759
3150 if ($self->{check_size}) { 3760 if ($self->{realloc}) {
3151 my @queue = ([], []); 3761 my %queue;
3762 my @queue;
3763 my $widget;
3152 3764
3153 for (;;) { 3765 outer:
3154 if ($self->{check_size}) { 3766 while () {
3155 # heuristic: check containers last 3767 if (my $realloc = delete $self->{realloc}) {
3156 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3768 for $widget (values %$realloc) {
3157 for values %{delete $self->{check_size}} 3769 $widget->{visible} or next; # do not resize invisible widgets
3770
3771 $queue{$widget+0}++ and next; # duplicates are common
3772
3773 push @{ $queue[$widget->{visible}] }, $widget;
3774 }
3158 } 3775 }
3159 3776
3160 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3777 while () {
3778 @queue or last outer;
3161 3779
3162 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3780 $widget = pop @{ $queue[-1] || [] }
3163 ? @$widget{qw(user_w user_h)} 3781 and last;
3164 : $widget->size_request;
3165
3166 if (delete $widget->{force_alloc}
3167 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3168 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3169 3782
3783 pop @queue;
3784 }
3785
3786 delete $queue{$widget+0};
3787
3788 my ($w, $h) = $widget->size_request;
3789
3790 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3791 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3792
3793 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3794 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3795
3796 $w = $widget->{force_w} if exists $widget->{force_w};
3797 $h = $widget->{force_h} if exists $widget->{force_h};
3798
3799 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3800 || delete $widget->{force_realloc}) {
3170 $widget->{req_w} = $w; 3801 $widget->{req_w} = $w;
3171 $widget->{req_h} = $h; 3802 $widget->{req_h} = $h;
3172 3803
3173 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3804 $self->{size_alloc}{$widget+0} = $widget;
3174 3805
3175 $widget->{parent}->check_size
3176 if $widget->{parent}; 3806 if (my $parent = $widget->{parent}) {
3807 $self->{realloc}{$parent+0} = $parent
3808 unless $queue{$parent+0};
3809
3810 $parent->{force_size_alloc} = 1;
3811 $self->{size_alloc}{$parent+0} = $parent;
3812 }
3177 } 3813 }
3814
3815 delete $self->{realloc}{$widget+0};
3178 } 3816 }
3179 } 3817 }
3180 3818
3181 while ($self->{size_alloc}) { 3819 while (my $size_alloc = delete $self->{size_alloc}) {
3182 for (values %{delete $self->{size_alloc}}) { 3820 my @queue = sort { $b->{visible} <=> $a->{visible} }
3183 my ($widget, $w, $h) = @$_; 3821 values %$size_alloc;
3822
3823 while () {
3824 my $widget = pop @queue || last;
3825
3826 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3184 3827
3185 $w = 0 if $w < 0; 3828 $w = 0 if $w < 0;
3186 $h = 0 if $h < 0; 3829 $h = 0 if $h < 0;
3187 3830
3831 $w = max $widget->{min_w}, $w;
3832 $h = max $widget->{min_h}, $h;
3833
3834 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3836
3837 $w = int $w + 0.5;
3838 $h = int $h + 0.5;
3839
3840 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3841 $widget->{old_w} = $widget->{w};
3842 $widget->{old_h} = $widget->{h};
3843
3188 $widget->{w} = $w; 3844 $widget->{w} = $w;
3189 $widget->{h} = $h; 3845 $widget->{h} = $h;
3190 $widget->size_allocate ($w, $h); 3846
3191 $widget->emit (size_allocate => $w, $h); 3847 $widget->emit (size_allocate => $w, $h);
3848 }
3192 } 3849 }
3193 } 3850 }
3194 3851
3195 while ($self->{post_alloc_hook}) { 3852 while ($self->{post_alloc_hook}) {
3196 $_->() 3853 $_->()
3197 for values %{delete $self->{post_alloc_hook}}; 3854 for values %{delete $self->{post_alloc_hook}};
3198 } 3855 }
3856
3199 3857
3200 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3858 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3859 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3202 glClear GL_COLOR_BUFFER_BIT; 3860 glClear GL_COLOR_BUFFER_BIT;
3203 3861
… …
3205 glLoadIdentity; 3863 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3864 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 3865 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 3866 glLoadIdentity;
3209 3867
3868 {
3869 package CFClient::UI::Base;
3870
3871 ($draw_x, $draw_y, $draw_w, $draw_h) =
3872 (0, 0, $self->{w}, $self->{h});
3873 }
3874
3210 $self->_draw; 3875 $self->_draw;
3211} 3876}
3212 3877
3213############################################################################# 3878#############################################################################
3214 3879

Diff Legend

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