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.307 by root, Sun Jun 18 19:13:20 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";
… …
267 339
268sub configure { 340sub configure {
269 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
270 342
271 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
272 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
273 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
274 348
275 # use alignment to adjust x, y 349 # use alignment to adjust x, y
276 350
277 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
278 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
279
280 ($w, $h) = ($w2, $h2);
281 } 353 }
282 354
283 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
284 $self->{x} = $x; 356 $self->{x} = $x;
285 $self->{y} = $y; 357 $self->{y} = $y;
286 $self->update; 358 $self->update;
287 } 359 }
288 360
289 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
290 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
291 }
292}
293 363
294sub size_allocate { 364 $self->{alloc_w} = $w;
295 # nothing to be done 365 $self->{alloc_h} = $h;
296}
297 366
298sub reconfigure { 367 $self->{root}{size_alloc}{$self+0} = $self;
299 my ($self) = @_; 368 }
300
301 $self->check_size (1);
302 $self->update;
303} 369}
304 370
305sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
306} 377}
307 378
308sub set_max_size { 379sub set_max_size {
309 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
310 381
311 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
312 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
313} 386}
314 387
315sub set_tooltip { 388sub set_tooltip {
316 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
317 390
391 $tooltip =~ s/^\s+//;
392 $tooltip =~ s/\s+$//;
393
394 return if $self->{tooltip} eq $tooltip;
395
318 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
319 397
320 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
321 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
322 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
323 } 401 }
324} 402}
325 403
326# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
327sub coord2local { 405sub coord2local {
… …
335 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
336 414
337 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
338} 416}
339 417
340sub focus_in { 418sub invoke_focus_in {
341 my ($self) = @_; 419 my ($self) = @_;
342 420
343 return if $FOCUS == $self; 421 return if $FOCUS == $self;
344 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
345 423
346 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
347 425
348 $self->emit (focus_in => $focus);
349
350 $focus->update if $focus; 426 $focus->update if $focus;
351 $FOCUS->update; 427 $FOCUS->update;
352}
353 428
429 0
430}
431
354sub focus_out { 432sub invoke_focus_out {
355 my ($self) = @_; 433 my ($self) = @_;
356 434
357 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
358 436
359 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
360 438
361 $self->emit (focus_out => $focus);
362
363 $focus->update if $focus; #? 439 $focus->update if $focus; #?
364}
365 440
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS;
443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
366sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
367sub button_up { } 454sub invoke_button_up { 1 }
368sub key_down { } 455sub invoke_key_down { 1 }
369sub key_up { } 456sub invoke_key_up { 1 }
370 457
371sub button_down { 458sub invoke_button_down {
372 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
373 460
374 $self->focus_in; 461 $self->grab_focus;
375}
376 462
377sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
378sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
379sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
380sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
381sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before
476 ($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
478}
479
480sub find_widget {
481 my ($self, $x, $y) = @_;
482
483 return () unless $self->{can_events};
484
485 return $self
486 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
487 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
488
489 ()
490}
491
492sub set_parent {
493 my ($self, $parent) = @_;
494
495 Scalar::Util::weaken ($self->{parent} = $parent);
496 $self->set_visible if $parent->{visible};
497}
498
499sub realloc {
500 my ($self) = @_;
501
502 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self+0};
504
505 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update;
507 } else {
508 delete $self->{req_w};
509 delete $self->{req_h};
510 }
511}
512
513sub update {
514 my ($self) = @_;
515
516 $self->{parent}->update
517 if $self->{parent};
518}
519
520sub reconfigure {
521 my ($self) = @_;
522
523 $self->realloc;
524 $self->update;
525}
526
527# using global variables seems a bit hacky, but passing through all drawing
528# functions seems pointless.
529our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
382 530
383sub draw { 531sub draw {
384 my ($self) = @_; 532 my ($self) = @_;
385 533
386 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
535
536 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541
542 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
387 545
388 glPushMatrix; 546 glPushMatrix;
389 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
390 $self->_draw;
391 glPopMatrix;
392 548
393 if ($self == $HOVER && $self->{can_hover}) { 549 if ($self == $HOVER && $self->{can_hover}) {
394 my ($x, $y) = @$self{qw(x y)};
395
396 glColor 1, 0.8, 0.5, 0.2; 550 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
397 glEnable GL_BLEND; 551 glEnable GL_BLEND;
398 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 552 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
399 glBegin GL_QUADS; 553 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; 554 glVertex 0 , 0;
414 glVertex $self->{w}, 0; 555 glVertex $self->{w}, 0;
415 glVertex $self->{w}, $self->{h}; 556 glVertex $self->{w}, $self->{h};
416 glVertex 0 , $self->{h}; 557 glVertex 0 , $self->{h};
417 glEnd; 558 glEnd;
559 glDisable GL_BLEND;
560 }
561
562 if ($ENV{CFPLUS_DEBUG} & 1) {
563 glPushMatrix;
564 glColor 1, 1, 0, 1;
565 glTranslate 0.375, 0.375;
566 glBegin GL_LINE_LOOP;
567 glVertex 0 , 0;
568 glVertex $self->{w} - 1, 0;
569 glVertex $self->{w} - 1, $self->{h} - 1;
570 glVertex 0 , $self->{h} - 1;
571 glEnd;
418 glPopMatrix; 572 glPopMatrix;
419 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 573 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
420 } 574 }
575
576 $self->_draw;
577 glPopMatrix;
421} 578}
422 579
423sub _draw { 580sub _draw {
424 my ($self) = @_; 581 my ($self) = @_;
425 582
426 warn "no draw defined for $self\n"; 583 warn "no draw defined for $self\n";
427} 584}
428 585
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 { 586sub DESTROY {
480 my ($self) = @_; 587 my ($self) = @_;
481 588
482 delete $WIDGET{$self+0}; 589 delete $WIDGET{$self+0};
483 #$self->deactivate; 590
591 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
484} 593}
485 594
486############################################################################# 595#############################################################################
487 596
488package CFClient::UI::DrawBG; 597package CFClient::UI::DrawBG;
… …
513 622
514 if ($color && (@$color < 4 || $color->[3])) { 623 if ($color && (@$color < 4 || $color->[3])) {
515 my ($w, $h) = @$self{qw(w h)}; 624 my ($w, $h) = @$self{qw(w h)};
516 625
517 glEnable GL_BLEND; 626 glEnable GL_BLEND;
518 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
519 glColor @$color; 628 glColor_premultiply @$color;
520 629
521 glBegin GL_QUADS; 630 glBegin GL_QUADS;
522 glVertex 0 , 0; 631 glVertex 0 , 0;
523 glVertex 0 , $h; 632 glVertex 0 , $h;
524 glVertex $w, $h; 633 glVertex $w, $h;
… …
539 my ($class, %arg) = @_; 648 my ($class, %arg) = @_;
540 $class->SUPER::new (can_events => 0, %arg); 649 $class->SUPER::new (can_events => 0, %arg);
541} 650}
542 651
543sub size_request { 652sub size_request {
544 (0, 0) 653 my ($self) = @_;
654
655 ($self->{w} + 0, $self->{h} + 0)
545} 656}
546 657
547sub draw { } 658sub draw { }
548 659
549############################################################################# 660#############################################################################
… …
553our @ISA = CFClient::UI::Base::; 664our @ISA = CFClient::UI::Base::;
554 665
555sub new { 666sub new {
556 my ($class, %arg) = @_; 667 my ($class, %arg) = @_;
557 668
558 my $children = delete $arg{children} || []; 669 my $children = delete $arg{children};
559 670
560 my $self = $class->SUPER::new ( 671 my $self = $class->SUPER::new (
561 children => [], 672 children => [],
562 can_events => 0, 673 can_events => 0,
563 %arg, 674 %arg,
564 ); 675 );
676
565 $self->add ($_) for @$children; 677 $self->add (@$children)
678 if $children;
566 679
567 $self 680 $self
568} 681}
569 682
570sub add { 683sub add {
… …
578 $self->{children} = [ 691 $self->{children} = [
579 sort { $a->{z} <=> $b->{z} } 692 sort { $a->{z} <=> $b->{z} }
580 @{$self->{children}}, @widgets 693 @{$self->{children}}, @widgets
581 ]; 694 ];
582 695
583 $self->check_size (1); 696 $self->realloc;
584 $self->update;
585} 697}
586 698
587sub children { 699sub children {
588 @{ $_[0]{children} } 700 @{ $_[0]{children} }
589} 701}
… …
594 delete $child->{parent}; 706 delete $child->{parent};
595 $child->hide; 707 $child->hide;
596 708
597 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 709 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
598 710
599 $self->check_size; 711 $self->realloc;
600 $self->update;
601} 712}
602 713
603sub clear { 714sub clear {
604 my ($self) = @_; 715 my ($self) = @_;
605 716
… …
609 for (@$children) { 720 for (@$children) {
610 delete $_->{parent}; 721 delete $_->{parent};
611 $_->hide; 722 $_->hide;
612 } 723 }
613 724
614 $self->check_size; 725 $self->realloc;
615 $self->update;
616} 726}
617 727
618sub find_widget { 728sub find_widget {
619 my ($self, $x, $y) = @_; 729 my ($self, $x, $y) = @_;
620 730
621 $x -= $self->{x}; 731 $x -= $self->{x};
622 $y -= $self->{y}; 732 $y -= $self->{y};
623 733
624 my $res; 734 my $res;
625 735
626 for (reverse @{ $self->{children} }) { 736 for (reverse $self->visible_children) {
627 $res = $_->find_widget ($x, $y) 737 $res = $_->find_widget ($x, $y)
628 and return $res; 738 and return $res;
629 } 739 }
630 740
631 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 741 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
652} 762}
653 763
654sub add { 764sub add {
655 my ($self, $child) = @_; 765 my ($self, $child) = @_;
656 766
657 $self->{children} = []; 767 $self->SUPER::remove ($_) for @{ $self->{children} };
658
659 $self->SUPER::add ($child); 768 $self->SUPER::add ($child);
660} 769}
661 770
662sub remove { 771sub remove {
663 my ($self, $widget) = @_; 772 my ($self, $widget) = @_;
… …
672 781
673sub size_request { 782sub size_request {
674 $_[0]{children}[0]->size_request 783 $_[0]{children}[0]->size_request
675} 784}
676 785
677sub size_allocate { 786sub invoke_size_allocate {
678 my ($self, $w, $h) = @_; 787 my ($self, $w, $h) = @_;
679 788
680 $self->{children}[0]->configure (0, 0, $w, $h); 789 $self->{children}[0]->configure (0, 0, $w, $h);
790
791 1
681} 792}
682 793
683############################################################################# 794#############################################################################
795
796# back-buffered drawing area
684 797
685package CFClient::UI::Window; 798package CFClient::UI::Window;
686 799
687our @ISA = CFClient::UI::Bin::; 800our @ISA = CFClient::UI::Bin::;
688 801
… …
699 812
700 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 813 $ROOT->on_post_alloc ($self => sub { $self->render_child });
701 $self->SUPER::update; 814 $self->SUPER::update;
702} 815}
703 816
704sub size_allocate { 817sub invoke_size_allocate {
705 my ($self, $w, $h) = @_; 818 my ($self, $w, $h) = @_;
706 819
707 $self->SUPER::size_allocate ($w, $h);
708 $self->update; 820 $self->update;
821
822 $self->SUPER::invoke_size_allocate ($w, $h)
709} 823}
710 824
711sub _render { 825sub _render {
826 my ($self) = @_;
827
712 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
713} 829}
714 830
715sub render_child { 831sub render_child {
716 my ($self) = @_; 832 my ($self) = @_;
717 833
718 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
719 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
720 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
721 837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
722 $self->_render; 845 $self->_render;
723 }; 846 };
724} 847}
725 848
726sub _draw { 849sub _draw {
727 my ($self) = @_; 850 my ($self) = @_;
728 851
729 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
730 853
731 my $tex = $self->{texture} 854 my $tex = $self->{texture}
732 or return; 855 or return;
733 856
734 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
735 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
736 glColor 1, 1, 1, 1; 859 glColor 0, 0, 0, 1;
737 860
738 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
739 862
740 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
741} 864}
… …
744 867
745package CFClient::UI::ViewPort; 868package CFClient::UI::ViewPort;
746 869
747our @ISA = CFClient::UI::Window::; 870our @ISA = CFClient::UI::Window::;
748 871
872sub new {
873 my $class = shift;
874
875 $class->SUPER::new (
876 scroll_x => 0,
877 scroll_y => 1,
878 @_,
879 )
880}
881
749sub size_request { 882sub size_request {
750 my ($self) = @_; 883 my ($self) = @_;
751 884
752 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
753 886
754 @$self{qw(child_w child_h)} 887 $w = 10 if $self->{scroll_x};
755} 888 $h = 10 if $self->{scroll_y};
756 889
890 ($w, $h)
891}
892
757sub size_allocate { 893sub invoke_size_allocate {
758 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
759 895
760 my ($cw, $ch) = @$self{qw(child_w child_h)}; 896 my $child = $self->child;
761# $w = $self->{w}; 897
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900
762 $self->child->configure (0, 0, $cw, $ch); 901 $self->child->configure (0, 0, $w, $h);
763 $self->update; 902 $self->update;
903
904 1
764} 905}
765 906
766sub set_offset { 907sub set_offset {
767 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
768 909
… …
801} 942}
802 943
803sub _render { 944sub _render {
804 my ($self) = @_; 945 my ($self) = @_;
805 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
806 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
807 951
808 $self->SUPER::_render; 952 $self->SUPER::_render;
809} 953}
810 954
… …
813package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
814 958
815our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
816 960
817sub new { 961sub new {
818 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
819 965
820 my $self; 966 my $self;
821 967
822 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
823 vertical => 1, 969 vertical => 1,
824 range => [0, 0, 1, 0.01], # HACK fix 970 range => [0, 0, 1, 0.01], # HACK fix
825 connect_changed => sub { 971 on_changed => sub {
826 $self->{vp}->set_offset (0, $_[1]); 972 $self->{vp}->set_offset (0, $_[1]);
827 }, 973 },
828 ; 974 ;
829 975
830 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
831 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
832 slider => $slider, 978 slider => $slider,
833 @_, 979 %arg,
834 ); 980 );
835 981
836 $self->{vp}->add ($self->{scrolled});
837 $self->add ($self->{vp});
838 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
839 984
840 $self 985 $self
841} 986}
842 987
843sub size_allocate { 988sub add {
844 my ($self, $w, $h) = @_; 989 my ($self, $widget) = @_;
845 990
846 $self->SUPER::size_allocate ($w, $h); 991 $self->{vp}->add ($self->{child} = $widget);
992}
847 993
994sub update {
995 my ($self) = @_;
996
997 $self->SUPER::update;
998
999 # todo: overwrite size_allocate of child
848 my $child = $self->{vp}->child; 1000 my $child = $self->{vp}->child;
849 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002}
1003
1004sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_;
1006
1007 my $child = $self->{vp}->child;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009
1010 $self->SUPER::invoke_size_allocate ($w, $h)
850} 1011}
851 1012
852#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
853# update viewport offset on scroll 1014# update viewport offset on scroll
854 1015
… …
874 1035
875 if ($self->{bg}) { 1036 if ($self->{bg}) {
876 my ($w, $h) = @$self{qw(w h)}; 1037 my ($w, $h) = @$self{qw(w h)};
877 1038
878 glEnable GL_BLEND; 1039 glEnable GL_BLEND;
879 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1040 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
880 glColor @{ $self->{bg} }; 1041 glColor_premultiply @{ $self->{bg} };
881 1042
882 glBegin GL_QUADS; 1043 glBegin GL_QUADS;
883 glVertex 0 , 0; 1044 glVertex 0 , 0;
884 glVertex 0 , $h; 1045 glVertex 0 , $h;
885 glVertex $w, $h; 1046 glVertex $w, $h;
… …
898 1059
899our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
900 1061
901use CFClient::OpenGL; 1062use CFClient::OpenGL;
902 1063
903my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
904 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 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); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
906 1071
907sub new { 1072sub new {
908 my $class = shift; 1073 my ($class, %arg) = @_;
909
910 # TODO: user_x, user_y, overwrite moveto?
911 1074
912 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
913 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
914 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
915 border => 0.6, 1078 border => 0.6,
916 is_toplevel => 1,
917 can_events => 1, 1079 can_events => 1,
918 @_ 1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
919 ); 1083 );
920 1084
921 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title_widget} = new CFClient::UI::Label
922 align => 0, 1086 align => 0,
923 valign => 1, 1087 valign => 1,
924 text => $self->{title}, 1088 text => $self->{title},
925 fontsize => $self->{border}; 1089 fontsize => $self->{border},
1090 if exists $self->{title};
1091
1092 if ($self->{has_close_button}) {
1093 $self->{close_button} =
1094 new CFClient::UI::ImageButton
1095 image => 'x1_close.png',
1096 on_activate => sub { $self->hide };
1097
1098 $self->CFClient::UI::Container::add ($self->{close_button});
1099 }
926 1100
927 $self 1101 $self
1102}
1103
1104sub add {
1105 my ($self, @widgets) = @_;
1106
1107 $self->SUPER::add (@widgets);
1108 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1109 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
928} 1110}
929 1111
930sub border { 1112sub border {
931 int $_[0]{border} * $::FONTSIZE 1113 int $_[0]{border} * $::FONTSIZE
932} 1114}
933 1115
934sub size_request { 1116sub size_request {
935 my ($self) = @_; 1117 my ($self) = @_;
1118
1119 $self->{title_widget}->size_request
1120 if $self->{title_widget};
1121
1122 $self->{close_button}->size_request
1123 if $self->{close_button};
936 1124
937 my ($w, $h) = $self->SUPER::size_request; 1125 my ($w, $h) = $self->SUPER::size_request;
938 1126
939 ( 1127 (
940 $w + $self->border * 2, 1128 $w + $self->border * 2,
941 $h + $self->border * 2, 1129 $h + $self->border * 2,
942 ) 1130 )
943} 1131}
944 1132
945sub size_allocate { 1133sub invoke_size_allocate {
946 my ($self, $w, $h) = @_; 1134 my ($self, $w, $h) = @_;
947 1135
1136 if ($self->{title_widget}) {
1137 $self->{title_widget}{w} = $w;
1138 $self->{title_widget}{h} = $h;
1139 $self->{title_widget}->invoke_size_allocate ($w, $h);
1140 }
1141
1142 my $border = $self->border;
1143
948 $h -= List::Util::max 0, $self->border * 2; 1144 $h -= List::Util::max 0, $border * 2;
949 $w -= List::Util::max 0, $self->border * 2; 1145 $w -= List::Util::max 0, $border * 2;
950 1146
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); 1147 $self->child->configure ($border, $border, $w, $h);
955}
956 1148
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button};
1151
1152 1
1153}
1154
957sub button_down { 1155sub invoke_button_down {
958 my ($self, $ev, $x, $y) = @_; 1156 my ($self, $ev, $x, $y) = @_;
959 1157
960 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
961 my $border = $self->border; 1159 my $border = $self->border;
962 1160
… …
975 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
976 1174
977 my $dx = $ev->{x} - $ox; 1175 my $dx = $ev->{x} - $ox;
978 my $dy = $ev->{y} - $oy; 1176 my $dy = $ev->{y} - $oy;
979 1177
980 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1178 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
981 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1179 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1180
982 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1181 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
983 $self->check_size; 1182 $self->realloc;
984 }; 1183 };
985 1184
986 } elsif ($lr ^ $td) { 1185 } elsif ($lr ^ $td) {
987 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1186 my ($ox, $oy) = ($ev->{x}, $ev->{y});
988 my ($bx, $by) = ($self->{x}, $self->{y}); 1187 my ($bx, $by) = ($self->{x}, $self->{y});
… …
990 $self->{motion} = sub { 1189 $self->{motion} = sub {
991 my ($ev, $x, $y) = @_; 1190 my ($ev, $x, $y) = @_;
992 1191
993 ($x, $y) = ($ev->{x}, $ev->{y}); 1192 ($x, $y) = ($ev->{x}, $ev->{y});
994 1193
995 $self->move ($bx + $x - $ox, $by + $y - $oy); 1194 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
996 $self->update; 1195 # HACK: the next line is required to enforce placement
1196 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
997 }; 1197 };
1198 } else {
1199 return 0;
1200 }
1201
998 } 1202 1
999} 1203}
1000 1204
1001sub button_up { 1205sub invoke_button_up {
1002 my ($self, $ev, $x, $y) = @_; 1206 my ($self, $ev, $x, $y) = @_;
1003 1207
1004 delete $self->{motion}; 1208 ! ! delete $self->{motion}
1005} 1209}
1006 1210
1007sub mouse_motion { 1211sub invoke_mouse_motion {
1008 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1009 1213
1010 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1214 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215
1216 ! ! $self->{motion}
1011} 1217}
1012 1218
1013sub _draw { 1219sub _draw {
1014 my ($self) = @_; 1220 my ($self) = @_;
1015 1221
1222 my $child = $self->{children}[0];
1223
1016 my ($w, $h ) = ($self->{w}, $self->{h}); 1224 my ($w, $h ) = ($self->{w}, $self->{h});
1017 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1225 my ($cw, $ch) = ($child->{w}, $child->{h});
1018 1226
1019 glEnable GL_TEXTURE_2D; 1227 glEnable GL_TEXTURE_2D;
1020 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1021 1229
1022 my $border = $self->border; 1230 my $border = $self->border;
1023 1231
1024 glColor @{ $self->{border_bg} }; 1232 glColor @{ $self->{border_bg} };
1025 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1233 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1026 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1234 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1027 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1235 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1028 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1236 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1029 1237
1030 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1238 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1031 my $bg = $tex[0]; 1239 glColor @{ $self->{bg} };
1032 1240
1033 # TODO: repeat texture not scale 1241 # TODO: repeat texture not scale
1242 # solve this better(?)
1034 my $rep_x = $cw / $bg->{w}; 1243 $bg->{s} = $cw / $bg->{w};
1035 my $rep_y = $ch / $bg->{h}; 1244 $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); 1245 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1043 } 1246 }
1044 1247
1045 glDisable GL_TEXTURE_2D; 1248 glDisable GL_TEXTURE_2D;
1046 1249
1047 $self->{title}->draw if $self->{title};
1048
1049 $self->child->draw; 1250 $child->draw;
1251
1252 if ($self->{title_widget}) {
1253 glTranslate 0, $border - $self->{h};
1254 $self->{title_widget}->_draw;
1255
1256 glTranslate 0, - ($border - $self->{h});
1257 }
1258
1259 $self->{close_button}->draw
1260 if $self->{close_button};
1050} 1261}
1051 1262
1052############################################################################# 1263#############################################################################
1053 1264
1054package CFClient::UI::Table; 1265package CFClient::UI::Table;
… …
1062sub new { 1273sub new {
1063 my $class = shift; 1274 my $class = shift;
1064 1275
1065 $class->SUPER::new ( 1276 $class->SUPER::new (
1066 col_expand => [], 1277 col_expand => [],
1067 @_ 1278 @_,
1068 ) 1279 )
1280}
1281
1282sub children {
1283 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1069} 1284}
1070 1285
1071sub add { 1286sub add {
1072 my ($self, $x, $y, $child) = @_; 1287 my ($self, $x, $y, $child) = @_;
1073 1288
1074 $child->set_parent ($self); 1289 $child->set_parent ($self);
1075 $self->{children}[$y][$x] = $child; 1290 $self->{children}[$y][$x] = $child;
1076 1291
1077 $child->check_size; 1292 $self->realloc;
1078} 1293}
1079 1294
1080sub children { 1295sub remove {
1081 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1296 my ($self, $child) = @_;
1082}
1083 1297
1298 # TODO: not yet implemented
1299}
1300
1084# TODO: move to container class maybe? send childs a signal on removal? 1301# TODO: move to container class maybe? send children a signal on removal?
1085sub clear { 1302sub clear {
1086 my ($self) = @_; 1303 my ($self) = @_;
1087 1304
1088 my @children = $self->children; 1305 my @children = $self->children;
1089 delete $self->{children}; 1306 delete $self->{children};
… …
1091 for (@children) { 1308 for (@children) {
1092 delete $_->{parent}; 1309 delete $_->{parent};
1093 $_->hide; 1310 $_->hide;
1094 } 1311 }
1095 1312
1096 $self->update; 1313 $self->realloc;
1097} 1314}
1098 1315
1099sub get_wh { 1316sub get_wh {
1100 my ($self) = @_; 1317 my ($self) = @_;
1101 1318
… …
1127 (sum @$ws), 1344 (sum @$ws),
1128 (sum @$hs), 1345 (sum @$hs),
1129 ) 1346 )
1130} 1347}
1131 1348
1132sub size_allocate { 1349sub invoke_size_allocate {
1133 my ($self, $w, $h) = @_; 1350 my ($self, $w, $h) = @_;
1134 1351
1135 my ($ws, $hs) = $self->get_wh; 1352 my ($ws, $hs) = $self->get_wh;
1136 1353
1137 my $req_w = sum @$ws; 1354 my $req_w = (sum @$ws) || 1;
1138 my $req_h = sum @$hs; 1355 my $req_h = (sum @$hs) || 1;
1139 1356
1140 # TODO: nicer code && do row_expand 1357 # TODO: nicer code && do row_expand
1141 my @col_expand = @{$self->{col_expand}}; 1358 my @col_expand = @{$self->{col_expand}};
1142 @col_expand = (1) x @$ws unless @col_expand; 1359 @col_expand = (1) x @$ws unless @col_expand;
1143 my $col_expand = (sum @col_expand) || 1; 1360 my $col_expand = (sum @col_expand) || 1;
… …
1169 } 1386 }
1170 1387
1171 $y += $row_h; 1388 $y += $row_h;
1172 } 1389 }
1173 1390
1391 1
1174} 1392}
1175 1393
1176sub find_widget { 1394sub find_widget {
1177 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1178 1396
… …
1197 } 1415 }
1198} 1416}
1199 1417
1200############################################################################# 1418#############################################################################
1201 1419
1420package CFClient::UI::Box;
1421
1422our @ISA = CFClient::UI::Container::;
1423
1424sub size_request {
1425 my ($self) = @_;
1426
1427 $self->{vertical}
1428 ? (
1429 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1430 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1431 )
1432 : (
1433 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1434 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1435 )
1436}
1437
1438sub invoke_size_allocate {
1439 my ($self, $w, $h) = @_;
1440
1441 my $space = $self->{vertical} ? $h : $w;
1442 my $children = $self->{children};
1443
1444 my @req;
1445
1446 if ($self->{homogeneous}) {
1447 @req = ($space / (@$children || 1)) x @$children;
1448 } else {
1449 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1450 my $req = List::Util::sum @req;
1451
1452 if ($req > $space) {
1453 # ah well, not enough space
1454 $_ *= $space / $req for @req;
1455 } else {
1456 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1457
1458 $space = ($space - $req) / $expand; # remaining space to give away
1459
1460 $req[$_] += $space * $children->[$_]{expand}
1461 for 0 .. $#$children;
1462 }
1463 }
1464
1465 CFClient::UI::harmonize \@req;
1466
1467 my $pos = 0;
1468 for (0 .. $#$children) {
1469 my $alloc = $req[$_];
1470 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471
1472 $pos += $alloc;
1473 }
1474
1475 1
1476}
1477
1478#############################################################################
1479
1202package CFClient::UI::HBox; 1480package CFClient::UI::HBox;
1203 1481
1204# TODO: wrap into common Box base class
1205
1206our @ISA = CFClient::UI::Container::; 1482our @ISA = CFClient::UI::Box::;
1207 1483
1208sub size_request { 1484sub new {
1209 my ($self) = @_; 1485 my $class = shift;
1210 1486
1211 my @alloc = map [$_->size_request], @{$self->{children}}; 1487 $class->SUPER::new (
1212 1488 vertical => 0,
1213 ( 1489 @_,
1214 (List::Util::sum map $_->[0], @alloc),
1215 (List::Util::max map $_->[1], @alloc),
1216 ) 1490 )
1217} 1491}
1218 1492
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############################################################################# 1493#############################################################################
1261 1494
1262package CFClient::UI::VBox; 1495package CFClient::UI::VBox;
1263 1496
1264# TODO: wrap into common Box base class
1265
1266our @ISA = CFClient::UI::Container::; 1497our @ISA = CFClient::UI::Box::;
1267 1498
1268sub size_request { 1499sub new {
1269 my ($self) = @_; 1500 my $class = shift;
1270 1501
1271 my @alloc = map [$_->size_request], @{$self->{children}}; 1502 $class->SUPER::new (
1272 1503 vertical => 1,
1273 ( 1504 @_,
1274 (List::Util::max map $_->[0], @alloc),
1275 (List::Util::sum map $_->[1], @alloc),
1276 ) 1505 )
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} 1506}
1317 1507
1318############################################################################# 1508#############################################################################
1319 1509
1320package CFClient::UI::Label; 1510package CFClient::UI::Label;
… …
1337 ellipsise => 3, # end 1527 ellipsise => 3, # end
1338 layout => (new CFClient::Layout), 1528 layout => (new CFClient::Layout),
1339 fontsize => 1, 1529 fontsize => 1,
1340 align => -1, 1530 align => -1,
1341 valign => -1, 1531 valign => -1,
1342 padding => 2, 1532 padding_x => 2,
1533 padding_y => 2,
1343 can_events => 0, 1534 can_events => 0,
1344 %arg 1535 %arg
1345 ); 1536 );
1346 1537
1347 if (exists $self->{template}) { 1538 if (exists $self->{template}) {
… …
1374 1565
1375 delete $self->{texture}; 1566 delete $self->{texture};
1376 $self->SUPER::update; 1567 $self->SUPER::update;
1377} 1568}
1378 1569
1570sub realloc {
1571 my ($self) = @_;
1572
1573 delete $self->{ox};
1574 $self->SUPER::realloc;
1575}
1576
1379sub set_text { 1577sub set_text {
1380 my ($self, $text) = @_; 1578 my ($self, $text) = @_;
1381 1579
1382 return if $self->{text} eq "T$text"; 1580 return if $self->{text} eq "T$text";
1383 $self->{text} = "T$text"; 1581 $self->{text} = "T$text";
1384 1582
1385 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1386 $self->{layout}->set_text ($text); 1584 $self->{layout}->set_text ($text);
1387 1585
1586 delete $self->{size_req};
1587 $self->realloc;
1388 $self->update; 1588 $self->update;
1389 $self->check_size;
1390} 1589}
1391 1590
1392sub set_markup { 1591sub set_markup {
1393 my ($self, $markup) = @_; 1592 my ($self, $markup) = @_;
1394 1593
… …
1398 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1597 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1399 1598
1400 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1401 $self->{layout}->set_markup ($markup); 1600 $self->{layout}->set_markup ($markup);
1402 1601
1602 delete $self->{size_req};
1603 $self->realloc;
1403 $self->update; 1604 $self->update;
1404 $self->check_size;
1405} 1605}
1406 1606
1407sub size_request { 1607sub size_request {
1408 my ($self) = @_; 1608 my ($self) = @_;
1409 1609
1610 $self->{size_req} ||= do {
1410 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1611 $self->{layout}->set_font ($self->{font}) if $self->{font};
1411 $self->{layout}->set_width ($self->{max_w} || -1); 1612 $self->{layout}->set_width ($self->{max_w} || -1);
1412 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1613 $self->{layout}->set_ellipsise ($self->{ellipsise});
1413 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1614 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1414 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1415 1616
1416 my ($w, $h) = $self->{layout}->size; 1617 my ($w, $h) = $self->{layout}->size;
1417 1618
1418 if (exists $self->{template}) { 1619 if (exists $self->{template}) {
1419 $self->{template}->set_font ($self->{font}) if $self->{font}; 1620 $self->{template}->set_font ($self->{font}) if $self->{font};
1420 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1421 1622
1422 my ($w2, $h2) = $self->{template}->size; 1623 my ($w2, $h2) = $self->{template}->size;
1423 1624
1424 $w = List::Util::max $w, $w2; 1625 $w = List::Util::max $w, $w2;
1425 $h = List::Util::max $h, $h2; 1626 $h = List::Util::max $h, $h2;
1627 }
1628
1629 [$w, $h]
1426 } 1630 };
1427 1631
1428 ( 1632 @{ $self->{size_req} }
1429 $w + $self->{padding} * 2,
1430 $h + $self->{padding} * 2,
1431 )
1432} 1633}
1433 1634
1434sub size_allocate { 1635sub invoke_size_allocate {
1435 my ($self, $w, $h) = @_; 1636 my ($self, $w, $h) = @_;
1436 1637
1638 delete $self->{ox};
1639
1437 delete $self->{texture}; 1640 delete $self->{texture}
1641 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1642
1643 1
1438} 1644}
1439 1645
1440sub set_fontsize { 1646sub set_fontsize {
1441 my ($self, $fontsize) = @_; 1647 my ($self, $fontsize) = @_;
1442 1648
1443 $self->{fontsize} = $fontsize; 1649 $self->{fontsize} = $fontsize;
1444 delete $self->{texture}; 1650 delete $self->{texture};
1445 1651
1446 $self->update; 1652 $self->realloc;
1447 $self->check_size; 1653}
1654
1655sub reconfigure {
1656 my ($self) = @_;
1657
1658 delete $self->{size_req};
1659
1660 $self->SUPER::reconfigure;
1448} 1661}
1449 1662
1450sub _draw { 1663sub _draw {
1451 my ($self) = @_; 1664 my ($self) = @_;
1452 1665
… …
1458 $self->{layout}->set_width ($self->{w}); 1671 $self->{layout}->set_width ($self->{w});
1459 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1672 $self->{layout}->set_ellipsise ($self->{ellipsise});
1460 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1461 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1462 1675
1463 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1676 new_from_layout CFClient::Texture $self->{layout}
1677 };
1464 1678
1679 unless (exists $self->{ox}) {
1465 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1466 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1467 : ($self->{w} - $tex->{w}) * 0.5); 1682 : ($self->{w} - $tex->{w}) * 0.5);
1468 1683
1469 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1470 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1471 : ($self->{h} - $tex->{h}) * 0.5); 1686 : ($self->{h} - $tex->{h}) * 0.5);
1472
1473 $tex
1474 }; 1687 };
1475 1688
1476 glEnable GL_TEXTURE_2D; 1689 glEnable GL_TEXTURE_2D;
1477 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1478 1693
1479 if ($tex->{format} == GL_ALPHA) { 1694 if ($tex->{format} == GL_ALPHA) {
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1480 glColor @{$self->{fg}}; 1696 glColor @{$self->{fg}};
1481 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1482 } else { 1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1483 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1484 } 1701 }
1485 1702
1486 glDisable GL_TEXTURE_2D; 1703 glDisable GL_TEXTURE_2D;
1487} 1704}
1488 1705
… …
1505 can_hover => 1, 1722 can_hover => 1,
1506 can_focus => 1, 1723 can_focus => 1,
1507 valign => 0, 1724 valign => 0,
1508 can_events => 1, 1725 can_events => 1,
1509 #text => ... 1726 #text => ...
1727 #hidden => "*",
1510 @_ 1728 @_
1511 ) 1729 )
1512} 1730}
1513 1731
1514sub _set_text { 1732sub _set_text {
… …
1516 1734
1517 delete $self->{cur_h}; 1735 delete $self->{cur_h};
1518 1736
1519 return if $self->{text} eq $text; 1737 return if $self->{text} eq $text;
1520 1738
1521 delete $self->{texture};
1522
1523 $self->{last_activity} = $::NOW; 1739 $self->{last_activity} = $::NOW;
1524 $self->{text} = $text; 1740 $self->{text} = $text;
1525 1741
1526 $text =~ s/./*/g if $self->{hidden}; 1742 $text =~ s/./*/g if $self->{hidden};
1527 $self->{layout}->set_text ("$text "); 1743 $self->{layout}->set_text ("$text ");
1744 delete $self->{size_req};
1528 1745
1529 $self->emit (changed => $self->{text}); 1746 $self->emit (changed => $self->{text});
1747
1748 $self->realloc;
1749 $self->update;
1530} 1750}
1531 1751
1532sub set_text { 1752sub set_text {
1533 my ($self, $text) = @_; 1753 my ($self, $text) = @_;
1534 1754
1535 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1536 $self->_set_text ($text); 1756 $self->_set_text ($text);
1537 $self->update;
1538 $self->check_size;
1539} 1757}
1540 1758
1541sub get_text { 1759sub get_text {
1542 $_[0]{text} 1760 $_[0]{text}
1543} 1761}
… …
1548 my ($w, $h) = $self->SUPER::size_request; 1766 my ($w, $h) = $self->SUPER::size_request;
1549 1767
1550 ($w + 1, $h) # add 1 for cursor 1768 ($w + 1, $h) # add 1 for cursor
1551} 1769}
1552 1770
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 { 1771sub invoke_key_down {
1560 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1561 1773
1562 my $mod = $ev->{mod}; 1774 my $mod = $ev->{mod};
1563 my $sym = $ev->{sym}; 1775 my $sym = $ev->{sym};
1564 my $uni = $ev->{unicode}; 1776 my $uni = $ev->{unicode};
… …
1579 $self->{cursor} = length $text; 1791 $self->{cursor} = length $text;
1580 } elsif ($uni == 27) { 1792 } elsif ($uni == 27) {
1581 $self->emit ('escape'); 1793 $self->emit ('escape');
1582 } elsif ($uni) { 1794 } elsif ($uni) {
1583 substr $text, $self->{cursor}++, 0, chr $uni; 1795 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else {
1797 return 0;
1584 } 1798 }
1585 1799
1586 $self->_set_text ($text); 1800 $self->_set_text ($text);
1587 $self->update;
1588 $self->check_size;
1589}
1590 1801
1802 $self->realloc;
1803
1804 1
1805}
1806
1591sub focus_in { 1807sub invoke_focus_in {
1592 my ($self) = @_; 1808 my ($self) = @_;
1593 1809
1594 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1595 1811
1596 $self->SUPER::focus_in; 1812 $self->SUPER::invoke_focus_in
1597} 1813}
1598 1814
1599sub button_down { 1815sub invoke_button_down {
1600 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1601 1817
1602 $self->SUPER::button_down ($ev, $x, $y); 1818 $self->SUPER::invoke_button_down ($ev, $x, $y);
1603 1819
1604 my $idx = $self->{layout}->xy_to_index ($x, $y); 1820 my $idx = $self->{layout}->xy_to_index ($x, $y);
1605 1821
1606 # byte-index to char-index 1822 # byte-index to char-index
1607 my $text = $self->{text}; 1823 my $text = $self->{text};
1608 utf8::encode $text; 1824 utf8::encode $text;
1609 $self->{cursor} = length substr $text, 0, $idx; 1825 $self->{cursor} = length substr $text, 0, $idx;
1610 1826
1611 $self->_set_text ($self->{text}); 1827 $self->_set_text ($self->{text});
1612 $self->update; 1828 $self->update;
1829
1830 1
1613} 1831}
1614 1832
1615sub mouse_motion { 1833sub invoke_mouse_motion {
1616 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1617# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1835# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1836
1837 1
1618} 1838}
1619 1839
1620sub _draw { 1840sub _draw {
1621 my ($self) = @_; 1841 my ($self) = @_;
1622 1842
1623 local $self->{fg} = $self->{fg}; 1843 local $self->{fg} = $self->{fg};
1624 1844
1625 if ($FOCUS == $self) { 1845 if ($FOCUS == $self) {
1626 glColor @{$self->{active_bg}}; 1846 glColor_premultiply @{$self->{active_bg}};
1627 $self->{fg} = $self->{active_fg}; 1847 $self->{fg} = $self->{active_fg};
1628 } else { 1848 } else {
1629 glColor @{$self->{bg}}; 1849 glColor_premultiply @{$self->{bg}};
1630 } 1850 }
1631 1851
1632 glEnable GL_BLEND; 1852 glEnable GL_BLEND;
1633 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1853 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1634 glBegin GL_QUADS; 1854 glBegin GL_QUADS;
1635 glVertex 0 , 0; 1855 glVertex 0 , 0;
1636 glVertex 0 , $self->{h}; 1856 glVertex 0 , $self->{h};
1637 glVertex $self->{w}, $self->{h}; 1857 glVertex $self->{w}, $self->{h};
1638 glVertex $self->{w}, 0; 1858 glVertex $self->{w}, 0;
… …
1663 1883
1664our @ISA = CFClient::UI::EntryBase::; 1884our @ISA = CFClient::UI::EntryBase::;
1665 1885
1666use CFClient::OpenGL; 1886use CFClient::OpenGL;
1667 1887
1668sub key_down { 1888sub invoke_key_down {
1669 my ($self, $ev) = @_; 1889 my ($self, $ev) = @_;
1670 1890
1671 my $sym = $ev->{sym}; 1891 my $sym = $ev->{sym};
1672 1892
1673 if ($sym == 13) { 1893 if ($sym == 13) {
1674 unshift @{$self->{history}}, 1894 unshift @{$self->{history}},
1675 my $txt = $self->get_text; 1895 my $txt = $self->get_text;
1896
1676 $self->{history_pointer} = -1; 1897 $self->{history_pointer} = -1;
1677 $self->{history_saveback} = ''; 1898 $self->{history_saveback} = '';
1678 $self->emit (activate => $txt); 1899 $self->emit (activate => $txt);
1679 $self->update; 1900 $self->update;
1680 1901
… …
1699 } else { 1920 } else {
1700 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1701 } 1922 }
1702 1923
1703 } else { 1924 } else {
1704 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::invoke_key_down ($ev)
1926 }
1927
1705 } 1928 1
1706
1707} 1929}
1708 1930
1709############################################################################# 1931#############################################################################
1710 1932
1711package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1720 1942
1721sub new { 1943sub new {
1722 my $class = shift; 1944 my $class = shift;
1723 1945
1724 $class->SUPER::new ( 1946 $class->SUPER::new (
1725 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1726 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1727 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1728 can_hover => 1, 1951 can_hover => 1,
1729 align => 0, 1952 align => 0,
1730 valign => 0, 1953 valign => 0,
1731 can_events => 1, 1954 can_events => 1,
1732 @_ 1955 @_
1733 ) 1956 )
1734} 1957}
1735 1958
1736sub button_up { 1959sub invoke_button_up {
1737 my ($self, $ev, $x, $y) = @_; 1960 my ($self, $ev, $x, $y) = @_;
1738 1961
1962 $self->emit ("activate")
1739 if ($x >= 0 && $x < $self->{w} 1963 if $x >= 0 && $x < $self->{w}
1740 && $y >= 0 && $y < $self->{h}) { 1964 && $y >= 0 && $y < $self->{h};
1741 $self->emit ("activate"); 1965
1742 } 1966 1
1743} 1967}
1744 1968
1745sub _draw { 1969sub _draw {
1746 my ($self) = @_; 1970 my ($self) = @_;
1747 1971
1748 local $self->{fg} = $self->{fg}; 1972 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1749
1750 if ($GRAB == $self) {
1751 $self->{fg} = $self->{active_fg};
1752 }
1753 1973
1754 glEnable GL_TEXTURE_2D; 1974 glEnable GL_TEXTURE_2D;
1755 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1975 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1756 glColor 0, 0, 0, 1; 1976 glColor 0, 0, 0, 1;
1757 1977
… …
1762 $self->SUPER::_draw; 1982 $self->SUPER::_draw;
1763} 1983}
1764 1984
1765############################################################################# 1985#############################################################################
1766 1986
1987package CFClient::UI::ImageButton;
1988
1989our @ISA = CFClient::UI::Image::;
1990
1991use CFClient::OpenGL;
1992
1993my %textures;
1994
1995sub new {
1996 my $class = shift;
1997
1998 my $self = $class->SUPER::new (
1999 padding_x => 4,
2000 padding_y => 4,
2001 fg => [1, 1, 1],
2002 active_fg => [0, 0, 1],
2003 can_hover => 1,
2004 align => 0,
2005 valign => 0,
2006 can_events => 1,
2007 @_
2008 );
2009}
2010
2011sub invoke_button_up {
2012 my ($self, $ev, $x, $y) = @_;
2013
2014 $self->emit ("activate")
2015 if $x >= 0 && $x < $self->{w}
2016 && $y >= 0 && $y < $self->{h};
2017
2018 1
2019}
2020
2021#############################################################################
2022
1767package CFClient::UI::CheckBox; 2023package CFClient::UI::CheckBox;
1768 2024
1769our @ISA = CFClient::UI::DrawBG::; 2025our @ISA = CFClient::UI::DrawBG::;
1770 2026
1771my @tex = 2027my @tex =
… …
1776 2032
1777sub new { 2033sub new {
1778 my $class = shift; 2034 my $class = shift;
1779 2035
1780 $class->SUPER::new ( 2036 $class->SUPER::new (
1781 padding => 2, 2037 padding_x => 2,
2038 padding_y => 2,
1782 fg => [1, 1, 1], 2039 fg => [1, 1, 1],
1783 active_fg => [1, 1, 0], 2040 active_fg => [1, 1, 0],
1784 bg => [0, 0, 0, 0.2], 2041 bg => [0, 0, 0, 0.2],
1785 active_bg => [1, 1, 1, 0.5], 2042 active_bg => [1, 1, 1, 0.5],
1786 state => 0, 2043 state => 0,
… …
1790} 2047}
1791 2048
1792sub size_request { 2049sub size_request {
1793 my ($self) = @_; 2050 my ($self) = @_;
1794 2051
1795 ($self->{padding} * 2 + 6) x 2 2052 (6) x 2
1796} 2053}
1797 2054
1798sub button_down { 2055sub invoke_button_down {
1799 my ($self, $ev, $x, $y) = @_; 2056 my ($self, $ev, $x, $y) = @_;
1800 2057
1801 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2058 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1802 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2059 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1803 $self->{state} = !$self->{state}; 2060 $self->{state} = !$self->{state};
1804 $self->emit (changed => $self->{state}); 2061 $self->emit (changed => $self->{state});
2062 } else {
2063 return 0
2064 }
2065
1805 } 2066 1
1806} 2067}
1807 2068
1808sub _draw { 2069sub _draw {
1809 my ($self) = @_; 2070 my ($self) = @_;
1810 2071
1811 $self->SUPER::_draw; 2072 $self->SUPER::_draw;
1812 2073
1813 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2074 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1814 2075
1815 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2076 my ($w, $h) = @$self{qw(w h)};
2077
2078 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1816 2079
1817 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2080 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1818 2081
1819 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2082 my $tex = $self->{state} ? $tex[1] : $tex[0];
1820 2083
… …
1975 2238
1976 my $h1 = $self->{h} * (1 - $ycut1); 2239 my $h1 = $self->{h} * (1 - $ycut1);
1977 my $h2 = $self->{h} * (1 - $ycut2); 2240 my $h2 = $self->{h} * (1 - $ycut2);
1978 2241
1979 glEnable GL_BLEND; 2242 glEnable GL_BLEND;
1980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2243 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2244 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1981 glEnable GL_TEXTURE_2D; 2245 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2246 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983 2247
1984 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2248 glBindTexture GL_TEXTURE_2D, $t1->{name};
1985 glBegin GL_QUADS; 2249 glBegin GL_QUADS;
… …
2085 fg => [1, 1, 1], 2349 fg => [1, 1, 1],
2086 active_fg => [0, 0, 0], 2350 active_fg => [0, 0, 0],
2087 bg => [0, 0, 0, 0.2], 2351 bg => [0, 0, 0, 0.2],
2088 active_bg => [1, 1, 1, 0.5], 2352 active_bg => [1, 1, 1, 0.5],
2089 range => [0, 0, 100, 10, 0], 2353 range => [0, 0, 100, 10, 0],
2090 req_w => $::WIDTH / 80, 2354 min_w => $::WIDTH / 80,
2091 req_h => $::WIDTH / 80, 2355 min_h => $::WIDTH / 80,
2092 vertical => 0, 2356 vertical => 0,
2093 can_hover => 1, 2357 can_hover => 1,
2094 inner_pad => 0.02, 2358 inner_pad => 0.02,
2095 @_ 2359 @_
2096 ); 2360 );
… …
2102} 2366}
2103 2367
2104sub set_range { 2368sub set_range {
2105 my ($self, $range) = @_; 2369 my ($self, $range) = @_;
2106 2370
2107 $self->{range} = $range; 2371 ($range, $self->{range}) = ($self->{range}, $range);
2108 2372
2373 if ("@$range" ne "@{$self->{range}}") {
2109 $self->update; 2374 $self->update;
2375 $self->set_value ($self->{range}[0]);
2376 }
2110} 2377}
2111 2378
2112sub set_value { 2379sub set_value {
2113 my ($self, $value) = @_; 2380 my ($self, $value) = @_;
2114 2381
… …
2133} 2400}
2134 2401
2135sub size_request { 2402sub size_request {
2136 my ($self) = @_; 2403 my ($self) = @_;
2137 2404
2138 my $w = $self->{req_w}; 2405 ($self->{req_w}, $self->{req_h})
2139 my $h = $self->{req_h};
2140
2141 $self->{vertical} ? ($h, $w) : ($w, $h)
2142} 2406}
2143 2407
2144sub button_down { 2408sub invoke_button_down {
2145 my ($self, $ev, $x, $y) = @_; 2409 my ($self, $ev, $x, $y) = @_;
2146 2410
2147 $self->SUPER::button_down ($ev, $x, $y); 2411 $self->SUPER::invoke_button_down ($ev, $x, $y);
2148 2412
2149 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2413 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2150 2414
2151 $self->mouse_motion ($ev, $x, $y); 2415 $self->invoke_mouse_motion ($ev, $x, $y)
2152} 2416}
2153 2417
2154sub mouse_motion { 2418sub invoke_mouse_motion {
2155 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2156 2420
2157 if ($GRAB == $self) { 2421 if ($GRAB == $self) {
2158 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2422 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2159 2423
2160 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2424 my (undef, $lo, $hi, $page) = @{$self->{range}};
2161 2425
2162 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2426 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2163 2427
2164 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2428 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2429 } else {
2430 return 0;
2431 }
2432
2165 } 2433 1
2166} 2434}
2167 2435
2168sub update { 2436sub update {
2169 my ($self) = @_; 2437 my ($self) = @_;
2170 2438
2171 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2439 delete $self->{knob_w};
2440 $self->SUPER::update;
2441}
2442
2443sub _draw {
2444 my ($self) = @_;
2445
2446 unless ($self->{knob_w}) {
2172 $self->set_value ($self->{range}[0]); 2447 $self->set_value ($self->{range}[0]);
2173 2448
2174 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2449 my ($value, $lo, $hi, $page) = @{$self->{range}};
2175 my $range = ($hi - $page - $lo) || 1e-100; 2450 my $range = ($hi - $page - $lo) || 1e-100;
2176 2451
… …
2182 $value = ($value - $lo) / $range; 2457 $value = ($value - $lo) / $range;
2183 $value = $value * $self->{scale} + $self->{offset}; 2458 $value = $value * $self->{scale} + $self->{offset};
2184 2459
2185 $self->{knob_x} = $value - $knob_w * 0.5; 2460 $self->{knob_x} = $value - $knob_w * 0.5;
2186 $self->{knob_w} = $knob_w; 2461 $self->{knob_w} = $knob_w;
2187 }); 2462 }
2188
2189 $self->SUPER::update;
2190}
2191
2192sub _draw {
2193 my ($self) = @_;
2194 2463
2195 $self->SUPER::_draw (); 2464 $self->SUPER::_draw ();
2196 2465
2197 glScale $self->{w}, $self->{h}; 2466 glScale $self->{w}, $self->{h};
2198 2467
… …
2259sub set_range { shift->{slider}->set_range (@_) } 2528sub set_range { shift->{slider}->set_range (@_) }
2260sub set_value { shift->{slider}->set_value (@_) } 2529sub set_value { shift->{slider}->set_value (@_) }
2261 2530
2262############################################################################# 2531#############################################################################
2263 2532
2264package CFClient::UI::TextView; 2533package CFClient::UI::TextScroller;
2265 2534
2266our @ISA = CFClient::UI::HBox::; 2535our @ISA = CFClient::UI::HBox::;
2267 2536
2268use CFClient::OpenGL; 2537use CFClient::OpenGL;
2269 2538
… …
2271 my $class = shift; 2540 my $class = shift;
2272 2541
2273 my $self = $class->SUPER::new ( 2542 my $self = $class->SUPER::new (
2274 fontsize => 1, 2543 fontsize => 1,
2275 can_events => 0, 2544 can_events => 0,
2545 indent => 0,
2276 #font => default_font 2546 #font => default_font
2277 @_, 2547 @_,
2278 2548
2279 layout => (new CFClient::Layout 1), 2549 layout => (new CFClient::Layout 1),
2280 par => [], 2550 par => [],
… …
2295 2565
2296 $self->{fontsize} = $fontsize; 2566 $self->{fontsize} = $fontsize;
2297 $self->reflow; 2567 $self->reflow;
2298} 2568}
2299 2569
2300sub size_allocate { 2570sub invoke_size_allocate {
2301 my ($self, $w, $h) = @_; 2571 my ($self, $w, $h) = @_;
2302
2303 $self->SUPER::size_allocate ($w, $h);
2304 2572
2305 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2573 $self->{layout}->set_font ($self->{font}) if $self->{font};
2306 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2574 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2307 $self->{layout}->set_width ($self->{children}[0]{w}); 2575 $self->{layout}->set_width ($self->{children}[0]{w});
2576 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2308 2577
2309 $self->reflow; 2578 $self->reflow;
2579
2580 $self->SUPER::invoke_size_allocate ($w, $h)
2310} 2581}
2311 2582
2312sub text_size { 2583sub text_size {
2313 my ($self, $text, $indent) = @_; 2584 my ($self, $text, $indent) = @_;
2314 2585
2315 my $layout = $self->{layout}; 2586 my $layout = $self->{layout};
2316 2587
2317 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2588 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2318 $layout->set_width ($self->{children}[0]{w} - $indent); 2589 $layout->set_width ($self->{children}[0]{w} - $indent);
2590 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2319 $layout->set_markup ($text); 2591 $layout->set_markup ($text);
2320 2592
2321 $layout->size 2593 $layout->size
2322} 2594}
2323 2595
… …
2362 2634
2363 return unless $self->{h} > 0; 2635 return unless $self->{h} > 0;
2364 2636
2365 delete $self->{texture}; 2637 delete $self->{texture};
2366 2638
2367 $ROOT->on_post_alloc ($self, sub { 2639 $ROOT->on_post_alloc ($self => sub {
2368 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2640 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2369 2641
2370 if (delete $self->{need_reflow}) { 2642 if (delete $self->{need_reflow}) {
2371 my $height = 0; 2643 my $height = 0;
2372 2644
… …
2375 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2647 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2376 2648
2377 for (@{$self->{par}}) { 2649 for (@{$self->{par}}) {
2378 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2650 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2379 $layout->set_width ($W - $_->[3]); 2651 $layout->set_width ($W - $_->[3]);
2652 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2380 $layout->set_markup ($_->[4]); 2653 $layout->set_markup ($_->[4]);
2381 my ($w, $h) = $layout->size; 2654 my ($w, $h) = $layout->size;
2382 $_->[0] = $w + $_->[3]; 2655 $_->[0] = $w + $_->[3];
2383 $_->[1] = $h; 2656 $_->[1] = $h;
2384 } 2657 }
… …
2387 } 2660 }
2388 2661
2389 $self->{height} = $height; 2662 $self->{height} = $height;
2390 2663
2391 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2664 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2392 2665
2393 delete $self->{texture}; 2666 delete $self->{texture};
2394 } 2667 }
2395 2668
2396 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2669 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2397 glClearColor 0.5, 0.5, 0.5, 0; 2670 glClearColor 0, 0, 0, 0;
2398 glClear GL_COLOR_BUFFER_BIT; 2671 glClear GL_COLOR_BUFFER_BIT;
2399 2672
2400 my $top = int $self->{children}[1]{range}[0]; 2673 my $top = int $self->{children}[1]{range}[0];
2401 2674
2402 my $y0 = $top; 2675 my $y0 = $top;
… …
2416 my $h = $par->[1]; 2689 my $h = $par->[1];
2417 2690
2418 if ($y0 < $y + $h && $y < $y1) { 2691 if ($y0 < $y + $h && $y < $y1) {
2419 $layout->set_foreground (@{ $par->[2] }); 2692 $layout->set_foreground (@{ $par->[2] });
2420 $layout->set_width ($W - $par->[3]); 2693 $layout->set_width ($W - $par->[3]);
2694 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2421 $layout->set_markup ($par->[4]); 2695 $layout->set_markup ($par->[4]);
2422 2696
2423 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2697 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2424 2698
2425 glRasterPos $par->[3], $y - $y0; 2699 glRasterPos $par->[3], $y - $y0;
… …
2437sub _draw { 2711sub _draw {
2438 my ($self) = @_; 2712 my ($self) = @_;
2439 2713
2440 glEnable GL_TEXTURE_2D; 2714 glEnable GL_TEXTURE_2D;
2441 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2442 glColor 1, 1, 1, 1; 2716 glColor 0, 0, 0, 1;
2443 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2717 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2444 glDisable GL_TEXTURE_2D; 2718 glDisable GL_TEXTURE_2D;
2445 2719
2446 $self->{children}[1]->draw; 2720 $self->{children}[1]->draw;
2447 2721
2448} 2722}
… …
2497 2771
2498sub new { 2772sub new {
2499 my $class = shift; 2773 my $class = shift;
2500 2774
2501 my $self = $class->SUPER::new ( 2775 my $self = $class->SUPER::new (
2502 state => 0, 2776 state => 0,
2503 connect_activate => \&toggle_flopper, 2777 on_activate => \&toggle_flopper,
2504 @_ 2778 @_
2505 ); 2779 );
2506 2780
2507 if ($self->{state}) {
2508 $self->{state} = 0;
2509 $self->toggle_flopper;
2510 }
2511
2512 $self 2781 $self
2513} 2782}
2514 2783
2515sub toggle_flopper { 2784sub toggle_flopper {
2516 my ($self) = @_; 2785 my ($self) = @_;
2517 2786
2518 # TODO: use animation 2787 $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} 2788}
2530 2789
2531############################################################################# 2790#############################################################################
2532 2791
2533package CFClient::UI::Tooltip; 2792package CFClient::UI::Tooltip;
… …
2546} 2805}
2547 2806
2548sub set_tooltip_from { 2807sub set_tooltip_from {
2549 my ($self, $widget) = @_; 2808 my ($self, $widget) = @_;
2550 2809
2810 my $tooltip = $widget->{tooltip};
2811
2812 if ($ENV{CFPLUS_DEBUG} & 2) {
2813 $tooltip .= "\n\n" . (ref $widget) . "\n"
2814 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2815 . "req $widget->{req_w} $widget->{req_h}\n"
2816 . "visible $widget->{visible}";
2817 }
2818
2819 $tooltip =~ s/^\n+//;
2820 $tooltip =~ s/\n+$//;
2821
2551 $self->add (new CFClient::UI::Label 2822 $self->add (new CFClient::UI::Label
2552 markup => $widget->{tooltip}, 2823 markup => $tooltip,
2553 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2824 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2554 fontsize => 0.8, 2825 fontsize => 0.8,
2555 fg => [0, 0, 0, 1], 2826 fg => [0, 0, 0, 1],
2556 ellipsise => 0, 2827 ellipsise => 0,
2557 font => ($widget->{tooltip_font} || $::FONT_PROP), 2828 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2564 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2835 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2565 2836
2566 ($w + 4, $h + 4) 2837 ($w + 4, $h + 4)
2567} 2838}
2568 2839
2569sub size_allocate { 2840sub invoke_size_allocate {
2570 my ($self, $w, $h) = @_; 2841 my ($self, $w, $h) = @_;
2571 2842
2572 $self->SUPER::size_allocate ($w - 4, $h - 4); 2843 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2844}
2845
2846sub invoke_visibility_change {
2847 my ($self, $visible) = @_;
2848
2849 return unless $visible;
2850
2851 $self->{root}->on_post_alloc ("move_$self" => sub {
2852 my $widget = $self->{owner}
2853 or return;
2854
2855 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2856
2857 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2858 if $x + $self->{w} > $self->{root}{w};
2859
2860 $self->move_abs ($x, $y);
2861 });
2573} 2862}
2574 2863
2575sub _draw { 2864sub _draw {
2576 my ($self) = @_; 2865 my ($self) = @_;
2577 2866
… …
2594 glVertex $w, $h; 2883 glVertex $w, $h;
2595 glVertex $w, 0; 2884 glVertex $w, 0;
2596 glEnd; 2885 glEnd;
2597 2886
2598 glTranslate 2 - 0.375, 2 - 0.375; 2887 glTranslate 2 - 0.375, 2 - 0.375;
2888
2599 $self->SUPER::_draw; 2889 $self->SUPER::_draw;
2600} 2890}
2601 2891
2602############################################################################# 2892#############################################################################
2603 2893
… …
2609 2899
2610sub new { 2900sub new {
2611 my $class = shift; 2901 my $class = shift;
2612 2902
2613 my $self = $class->SUPER::new ( 2903 my $self = $class->SUPER::new (
2614 aspect => 1, 2904 aspect => 1,
2905 can_events => 0,
2615 @_, 2906 @_,
2616 ); 2907 );
2617 2908
2618 if ($self->{anim} && $self->{animspeed}) { 2909 if ($self->{anim} && $self->{animspeed}) {
2619 Scalar::Util::weaken (my $widget = $self); 2910 Scalar::Util::weaken (my $widget = $self);
… …
2661 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2952 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2662 2953
2663 if ($tex) { 2954 if ($tex) {
2664 glEnable GL_TEXTURE_2D; 2955 glEnable GL_TEXTURE_2D;
2665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2666 glColor 1, 1, 1, 1; 2957 glColor 0, 0, 0, 1;
2667 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2958 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2668 glDisable GL_TEXTURE_2D; 2959 glDisable GL_TEXTURE_2D;
2669 } 2960 }
2670} 2961}
2671 2962
2672sub DESTROY { 2963sub destroy {
2673 my ($self) = @_; 2964 my ($self) = @_;
2674 2965
2675 $self->{timer}->cancel 2966 $self->{timer}->cancel
2676 if $self->{timer}; 2967 if $self->{timer};
2677 2968
2678 $self->SUPER::DESTROY; 2969 $self->SUPER::destroy;
2679} 2970}
2680 2971
2681############################################################################# 2972#############################################################################
2682 2973
2683package CFClient::UI::InventoryItem; 2974package CFClient::UI::Buttonbar;
2684 2975
2685our @ISA = CFClient::UI::HBox::; 2976our @ISA = CFClient::UI::HBox::;
2686 2977
2687sub _item_to_desc { 2978# 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 2979
2844############################################################################# 2980#############################################################################
2845 2981
2846package CFClient::UI::Menu; 2982package CFClient::UI::Menu;
2847 2983
… …
2859 ); 2995 );
2860 2996
2861 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2997 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2862 2998
2863 for my $item (@{ $self->{items} }) { 2999 for my $item (@{ $self->{items} }) {
2864 my ($widget, $cb) = @$item; 3000 my ($widget, $cb, $tooltip) = @$item;
2865 3001
2866 # handle various types of items, only text for now 3002 # handle various types of items, only text for now
2867 if (!ref $widget) { 3003 if (!ref $widget) {
2868 $widget = new CFClient::UI::Label 3004 $widget = new CFClient::UI::Label
2869 can_hover => 1, 3005 can_hover => 1,
2870 can_events => 1, 3006 can_events => 1,
2871 text => $widget; 3007 markup => $widget,
3008 tooltip => $tooltip
2872 } 3009 }
2873 3010
2874 $self->{item}{$widget} = $item; 3011 $self->{item}{$widget} = $item;
2875 3012
2876 $self->{vbox}->add ($widget); 3013 $self->{vbox}->add ($widget);
… …
2888 # maybe save $GRAB? must be careful about events... 3025 # maybe save $GRAB? must be careful about events...
2889 $GRAB = $self; 3026 $GRAB = $self;
2890 $self->{button} = $ev->{button}; 3027 $self->{button} = $ev->{button};
2891 3028
2892 $self->show; 3029 $self->show;
2893 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3030 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2894} 3031}
2895 3032
2896sub mouse_motion { 3033sub invoke_mouse_motion {
2897 my ($self, $ev, $x, $y) = @_; 3034 my ($self, $ev, $x, $y) = @_;
2898 3035
2899 # TODO: should use vbox->find_widget or so 3036 # TODO: should use vbox->find_widget or so
2900 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3037 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2901 $self->{hover} = $self->{item}{$HOVER}; 3038 $self->{hover} = $self->{item}{$HOVER};
2902}
2903 3039
3040 0
3041}
3042
2904sub button_up { 3043sub invoke_button_up {
2905 my ($self, $ev, $x, $y) = @_; 3044 my ($self, $ev, $x, $y) = @_;
2906 3045
2907 if ($ev->{button} == $self->{button}) { 3046 if ($ev->{button} == $self->{button}) {
2908 undef $GRAB; 3047 undef $GRAB;
2909 $self->hide; 3048 $self->hide;
2910 3049
2911 $self->emit ("popdown"); 3050 $self->emit ("popdown");
2912 $self->{hover}[1]->() if $self->{hover}; 3051 $self->{hover}[1]->() if $self->{hover};
3052 } else {
3053 return 0
3054 }
3055
2913 } 3056 1
2914} 3057}
2915 3058
2916############################################################################# 3059#############################################################################
2917 3060
2918package CFClient::UI::Statusbox; 3061package CFClient::UI::Multiplexer;
2919 3062
2920our @ISA = CFClient::UI::VBox::; 3063our @ISA = CFClient::UI::Container::;
2921 3064
2922sub new { 3065sub new {
2923 my $class = shift; 3066 my $class = shift;
2924 3067
2925 $class->SUPER::new ( 3068 my $self = $class->SUPER::new (
3069 @_,
3070 );
3071
3072 $self->{current} = $self->{children}[0]
3073 if @{ $self->{children} };
3074
3075 $self
3076}
3077
3078sub add {
3079 my ($self, @widgets) = @_;
3080
3081 $self->SUPER::add (@widgets);
3082
3083 $self->{current} = $self->{children}[0]
3084 if @{ $self->{children} };
3085}
3086
3087sub set_current_page {
3088 my ($self, $page_or_widget) = @_;
3089
3090 my $widget = ref $page_or_widget
3091 ? $page_or_widget
3092 : $self->{children}[$page_or_widget];
3093
3094 $self->{current} = $widget;
3095 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3096
3097 $self->emit (page_changed => $self->{current});
3098
3099 $self->realloc;
3100}
3101
3102sub visible_children {
3103 $_[0]{current}
3104}
3105
3106sub size_request {
3107 my ($self) = @_;
3108
3109 $self->{current}->size_request
3110}
3111
3112sub invoke_size_allocate {
3113 my ($self, $w, $h) = @_;
3114
3115 $self->{current}->configure (0, 0, $w, $h);
3116
3117 1
3118}
3119
3120sub _draw {
3121 my ($self) = @_;
3122
3123 $self->{current}->draw;
3124}
3125
3126#############################################################################
3127
3128package CFClient::UI::Notebook;
3129
3130our @ISA = CFClient::UI::VBox::;
3131
3132sub new {
3133 my $class = shift;
3134
3135 my $self = $class->SUPER::new (
3136 buttonbar => (new CFClient::UI::Buttonbar),
3137 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3138 # filter => # will be put between multiplexer and $self
3139 @_,
3140 );
3141
3142 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3143 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3144
3145 $self
3146}
3147
3148sub add {
3149 my ($self, $title, $widget, $tooltip) = @_;
3150
3151 Scalar::Util::weaken $self;
3152
3153 $self->{buttonbar}->add (new CFClient::UI::Button
3154 markup => $title,
3155 tooltip => $tooltip,
3156 on_activate => sub { $self->set_current_page ($widget) },
3157 );
3158
3159 $self->{multiplexer}->add ($widget);
3160}
3161
3162sub set_current_page {
3163 my ($self, $page) = @_;
3164
3165 $self->{multiplexer}->set_current_page ($page);
3166 $self->emit (page_changed => $self->{multiplexer}{current});
3167}
3168
3169#############################################################################
3170
3171package CFClient::UI::Combobox;
3172
3173use utf8;
3174
3175our @ISA = CFClient::UI::Button::;
3176
3177sub new {
3178 my $class = shift;
3179
3180 my $self = $class->SUPER::new (
3181 options => [], # [value, title, longdesc], ...
3182 value => undef,
3183 @_,
3184 );
3185
3186 $self->_set_value ($self->{value});
3187
3188 $self
3189}
3190
3191sub invoke_button_down {
3192 my ($self, $ev) = @_;
3193
3194 my @menu_items;
3195
3196 for (@{ $self->{options} }) {
3197 my ($value, $title, $tooltip) = @$_;
3198
3199 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3200 }
3201
3202 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3203}
3204
3205sub _set_value {
3206 my ($self, $value) = @_;
3207
3208 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3209 or return;
3210
3211 $self->{value} = $item->[0];
3212 $self->set_markup ("$item->[1] ⇓");
3213 $self->set_tooltip ($item->[2]);
3214}
3215
3216sub set_value {
3217 my ($self, $value) = @_;
3218
3219 return unless $self->{value} ne $value;
3220
3221 $self->_set_value ($value);
3222 $self->emit (changed => $value);
3223}
3224
3225#############################################################################
3226
3227package CFClient::UI::Statusbox;
3228
3229our @ISA = CFClient::UI::VBox::;
3230
3231sub new {
3232 my $class = shift;
3233
3234 my $self = $class->SUPER::new (
2926 fontsize => 0.8, 3235 fontsize => 0.8,
2927 @_, 3236 @_,
2928 ) 3237 );
3238
3239 Scalar::Util::weaken (my $this = $self);
3240
3241 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3242
3243 $self
2929} 3244}
2930 3245
2931sub reorder { 3246sub reorder {
2932 my ($self) = @_; 3247 my ($self) = @_;
2933 my $NOW = time; 3248 my $NOW = Time::HiRes::time;
3249
3250 # freeze display when hovering over any label
3251 return if $CFClient::UI::TOOLTIP->{owner}
3252 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3253 values %{ $self->{item} };
2934 3254
2935 while (my ($k, $v) = each %{ $self->{item} }) { 3255 while (my ($k, $v) = each %{ $self->{item} }) {
2936 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3256 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2937 } 3257 }
2938 3258
… …
2941 my @items = sort { 3261 my @items = sort {
2942 $a->{pri} <=> $b->{pri} 3262 $a->{pri} <=> $b->{pri}
2943 or $b->{id} <=> $a->{id} 3263 or $b->{id} <=> $a->{id}
2944 } values %{ $self->{item} }; 3264 } values %{ $self->{item} };
2945 3265
3266 $self->{timer}->interval (1);
3267
2946 my $count = 10 + 1; 3268 my $count = 10 + 1;
2947 for my $item (@items) { 3269 for my $item (@items) {
2948 last unless --$count; 3270 last unless --$count;
2949 3271
2950 push @widgets, $item->{label} ||= do { 3272 my $label = $item->{label} ||= do {
2951 # TODO: doesn't handle markup well (read as: at all) 3273 # TODO: doesn't handle markup well (read as: at all)
2952 my $short = $item->{count} > 1 3274 my $short = $item->{count} > 1
2953 ? "<b>$item->{count} ×</b> $item->{text}" 3275 ? "<b>$item->{count} ×</b> $item->{text}"
2954 : $item->{text}; 3276 : $item->{text};
2955 3277
… …
2963 tooltip => $item->{tooltip}, 3285 tooltip => $item->{tooltip},
2964 tooltip_font => $::FONT_PROP, 3286 tooltip_font => $::FONT_PROP,
2965 tooltip_width => 0.67, 3287 tooltip_width => 0.67,
2966 fontsize => $item->{fontsize} || $self->{fontsize}, 3288 fontsize => $item->{fontsize} || $self->{fontsize},
2967 max_w => $::WIDTH * 0.44, 3289 max_w => $::WIDTH * 0.44,
2968 fg => $item->{fg}, 3290 fg => [@{ $item->{fg} }],
2969 can_events => 1, 3291 can_events => 1,
2970 can_hover => 1 3292 can_hover => 1
2971 }; 3293 };
3294
3295 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3296 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3297 $label->update;
3298 $label->set_max_size (undef, $label->{req_h} * $diff)
3299 if $diff < 1;
3300 $self->{timer}->interval (1/30);
3301 } else {
3302 $label->{fg}[3] = $item->{fg}[3] || 1;
3303 }
3304
3305 push @widgets, $label;
2972 } 3306 }
2973 3307
2974 $self->clear; 3308 $self->clear;
2975 $self->SUPER::add (reverse @widgets); 3309 $self->SUPER::add (reverse @widgets);
2976} 3310}
… …
2979 my ($self, $text, %arg) = @_; 3313 my ($self, $text, %arg) = @_;
2980 3314
2981 $text =~ s/^\s+//; 3315 $text =~ s/^\s+//;
2982 $text =~ s/\s+$//; 3316 $text =~ s/\s+$//;
2983 3317
3318 return unless $text;
3319
2984 my $timeout = time + ((delete $arg{timeout}) || 60); 3320 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2985 3321
2986 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3322 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2987 3323
2988 if (my $item = $self->{item}{$group}) { 3324 if (my $item = $self->{item}{$group}) {
2989 if ($item->{text} eq $text) { 3325 if ($item->{text} eq $text) {
2990 $item->{count}++; 3326 $item->{count}++;
2991 } else { 3327 } else {
2992 $item->{count} = 1; 3328 $item->{count} = 1;
2993 $item->{text} = $item->{tooltip} = $text; 3329 $item->{text} = $item->{tooltip} = $text;
2994 } 3330 }
2995 $item->{id} = ++$self->{id}; 3331 $item->{id} += 0.2;#d#
2996 $item->{timeout} = $timeout; 3332 $item->{timeout} = $timeout;
2997 delete $item->{label}; 3333 delete $item->{label};
2998 } else { 3334 } else {
2999 $self->{item}{$group} = { 3335 $self->{item}{$group} = {
3000 id => ++$self->{id}, 3336 id => ++$self->{id},
… …
3019 3355
3020 $self->reorder; 3356 $self->reorder;
3021 $self->SUPER::reconfigure; 3357 $self->SUPER::reconfigure;
3022} 3358}
3023 3359
3360sub destroy {
3361 my ($self) = @_;
3362
3363 $self->{timer}->cancel;
3364
3365 $self->SUPER::destroy;
3366}
3367
3024############################################################################# 3368#############################################################################
3025 3369
3026package CFClient::UI::Root; 3370package CFClient::UI::Inventory;
3027 3371
3028our @ISA = CFClient::UI::Container::; 3372our @ISA = CFClient::UI::ScrolledWindow::;
3029
3030use CFClient::OpenGL;
3031 3373
3032sub new { 3374sub new {
3033 my $class = shift; 3375 my $class = shift;
3034 3376
3035 $class->SUPER::new ( 3377 my $self = $class->SUPER::new (
3378 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3379 @_,
3380 );
3381
3382 $self
3383}
3384
3385sub set_items {
3386 my ($self, $items) = @_;
3387
3388 $self->{child}->clear;
3389 return unless $items;
3390
3391 my @items = sort {
3392 ($a->{type} <=> $b->{type})
3393 or ($a->{name} cmp $b->{name})
3394 } @$items;
3395
3396 $self->{real_items} = \@items;
3397
3398 my $row = 0;
3399 for my $item (@items) {
3400 CFClient::Item::update_widgets $item;
3401
3402 $self->{child}->add (0, $row, $item->{face_widget});
3403 $self->{child}->add (1, $row, $item->{desc_widget});
3404 $self->{child}->add (2, $row, $item->{weight_widget});
3405
3406 $row++;
3407 }
3408}
3409
3410#############################################################################
3411
3412package CFClient::UI::BindEditor;
3413
3414our @ISA = CFClient::UI::FancyFrame::;
3415
3416sub new {
3417 my $class = shift;
3418
3419 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3420
3421 $self->add (my $vb = new CFClient::UI::VBox);
3422
3423
3424 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3425 text => "start recording",
3426 tooltip => "Start/Stops recording of actions."
3427 ."All subsequent actions after the recording started will be captured."
3428 ."The actions are displayed after the record was stopped."
3429 ."To bind the action you have to click on the 'Bind' button",
3430 on_activate => sub {
3431 unless ($self->{recording}) {
3432 $self->start;
3433 } else {
3434 $self->stop;
3435 }
3436 });
3437
3438 $vb->add (new CFClient::UI::Label text => "Actions:");
3439 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3440
3441 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3442 $vb->add (my $hb = new CFClient::UI::HBox);
3443 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3444 $hb->add (new CFClient::UI::Button
3445 text => "bind",
3446 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3447 on_activate => sub {
3448 $self->ask_for_bind;
3449 });
3450
3451 $vb->add (my $hb = new CFClient::UI::HBox);
3452 $hb->add (new CFClient::UI::Button
3453 text => "ok",
3454 expand => 1,
3455 tooltip => "This closes the binding editor and saves the binding",
3456 on_activate => sub {
3457 $self->hide;
3458 $self->commit;
3459 });
3460
3461 $hb->add (new CFClient::UI::Button
3462 text => "cancel",
3463 expand => 1,
3464 tooltip => "This closes the binding editor without saving",
3465 on_activate => sub {
3466 $self->hide;
3467 $self->{binding_cancel}->()
3468 if $self->{binding_cancel};
3469 });
3470
3471 $self->update_binding_widgets;
3472
3473 $self
3474}
3475
3476sub commit {
3477 my ($self) = @_;
3478 my ($mod, $sym, $cmds) = $self->get_binding;
3479 if ($sym != 0 && @$cmds > 0) {
3480 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3481 ."'. Don't forget 'Save Config'!");
3482 $self->{binding_change}->($mod, $sym, $cmds)
3483 if $self->{binding_change};
3484 } else {
3485 $::STATUSBOX->add ("No action bound, no key or action specified!");
3486 $self->{binding_cancel}->()
3487 if $self->{binding_cancel};
3488 }
3489}
3490
3491sub start {
3492 my ($self) = @_;
3493
3494 $self->{rec_btn}->set_text ("stop recording");
3495 $self->{recording} = 1;
3496 $self->clear_command_list;
3497 $::CONN->start_record if $::CONN;
3498}
3499
3500sub stop {
3501 my ($self) = @_;
3502
3503 $self->{rec_btn}->set_text ("start recording");
3504 $self->{recording} = 0;
3505
3506 my $rec;
3507 $rec = $::CONN->stop_record if $::CONN;
3508 return unless ref $rec eq 'ARRAY';
3509 $self->set_command_list ($rec);
3510}
3511
3512
3513sub ask_for_bind_and_commit {
3514 my ($self) = @_;
3515 $self->ask_for_bind (1);
3516}
3517
3518sub ask_for_bind {
3519 my ($self, $commit, $end_cb) = @_;
3520
3521 CFClient::Binder::open_binding_dialog (sub {
3522 my ($mod, $sym) = @_;
3523 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3524 $self->update_binding_widgets;
3525 $self->commit if $commit;
3526 $end_cb->() if $end_cb;
3527 });
3528}
3529
3530# $mod and $sym are the modifiers and key symbol
3531# $cmds is a array ref of strings (the commands)
3532# $cb is the callback that is executed on OK
3533# $ccb is the callback that is executed on CANCEL and
3534# when the binding was unsuccessful on OK
3535sub set_binding {
3536 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3537
3538 $self->clear_command_list;
3539 $self->{recording} = 0;
3540 $self->{rec_btn}->set_text ("start recording");
3541
3542 $self->{binding} = [$mod, $sym];
3543 $self->{commands} = $cmds;
3544
3545 $self->{binding_change} = $cb;
3546 $self->{binding_cancel} = $ccb;
3547
3548 $self->update_binding_widgets;
3549}
3550
3551# this is a shortcut method that asks for a binding
3552# and then just binds it.
3553sub do_quick_binding {
3554 my ($self, $cmds, $end_cb) = @_;
3555 $self->set_binding (undef, undef, $cmds, sub {
3556 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3557 });
3558 $self->ask_for_bind (1, $end_cb);
3559}
3560
3561sub update_binding_widgets {
3562 my ($self) = @_;
3563 my ($mod, $sym, $cmds) = $self->get_binding;
3564 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3565 $self->set_command_list ($cmds);
3566}
3567
3568sub get_binding {
3569 my ($self) = @_;
3570 return (
3571 $self->{binding}->[0],
3572 $self->{binding}->[1],
3573 [ grep { defined $_ } @{$self->{commands}} ]
3574 );
3575}
3576
3577sub clear_command_list {
3578 my ($self) = @_;
3579 $self->{cmdbox}->clear ();
3580}
3581
3582sub set_command_list {
3583 my ($self, $cmds) = @_;
3584
3585 $self->{cmdbox}->clear ();
3586 $self->{commands} = $cmds;
3587
3588 my $idx = 0;
3589
3590 for (@$cmds) {
3591 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3592
3593 my $i = $idx;
3594 $hb->add (new CFClient::UI::Label text => $_);
3595 $hb->add (new CFClient::UI::Button
3596 text => "delete",
3597 tooltip => "Deletes the action from the record",
3598 on_activate => sub {
3599 $self->{cmdbox}->remove ($hb);
3600 $cmds->[$i] = undef;
3601 });
3602
3603
3604 $idx++
3605 }
3606}
3607
3608#############################################################################
3609
3610package CFClient::UI::SpellList;
3611
3612our @ISA = CFClient::UI::Table::;
3613
3614sub new {
3615 my $class = shift;
3616
3617 my $self = $class->SUPER::new (
3618 binding => [],
3619 commands => [],
3036 @_, 3620 @_,
3037 ) 3621 )
3038} 3622}
3039 3623
3040sub configure { 3624my $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 3625
3043 $self->{w} = $w; 3626my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3044 $self->{h} = $h; 3627 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3045} 3628my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3629 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3630my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3631 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3632my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3634my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3046 3636
3047sub check_size { 3637sub rebuild_spell_list {
3638 my ($self) = @_;
3639
3640 $CFClient::UI::ROOT->on_refresh ($self => sub {
3641 $self->clear;
3642
3643 return unless $::CONN;
3644
3645 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3646 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3647 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3648 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3649 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3650
3651 my $row = 0;
3652
3653 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3654 my $spell = $self->{spell}{$_};
3655
3656 $row++;
3657
3658 my $spell_cb = sub {
3659 my ($widget, $ev) = @_;
3660
3661 if ($ev->{button} == 1) {
3662 $::CONN->user_send ("cast $spell->{name}");
3663 } elsif ($ev->{button} == 2) {
3664 $::CONN->user_send ("invoke $spell->{name}");
3665 } elsif ($ev->{button} == 3) {
3666 (new CFClient::UI::Menu
3667 items => [
3668 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3669 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3670 ],
3671 )->popup ($ev);
3672 } else {
3673 return 0;
3674 }
3675
3676 1
3677 };
3678
3679 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3680
3681 #TODO: add path info to tooltip
3682 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3683
3684 $self->add (0, $row, new CFClient::UI::Face
3685 face => $spell->{face},
3686 can_hover => 1,
3687 can_events => 1,
3688 tooltip => $tooltip,
3689 on_button_down => $spell_cb,
3690 );
3691
3692 $self->add (1, $row, new CFClient::UI::Label
3693 expand => 1,
3694 text => $spell->{name},
3695 can_hover => 1,
3696 can_events => 1,
3697 tooltip => $tooltip,
3698 on_button_down => $spell_cb,
3699 );
3700
3701 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3702 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3703 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3704 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3705 }
3706 });
3707}
3708
3709sub add_spell {
3048 my ($self) = @_; 3710 my ($self, $spell) = @_;
3049 3711
3050 $self->size_allocate ($self->{w}, $self->{h}) 3712 $self->{spell}->{$spell->{name}} = $spell;
3051 if $self->{w}; 3713 $self->rebuild_spell_list;
3714}
3715
3716sub remove_spell {
3717 my ($self, $spell) = @_;
3718
3719 delete $self->{spell}->{$spell->{name}};
3720 $self->rebuild_spell_list;
3721}
3722
3723sub clear_spells {
3724 my ($self) = @_;
3725
3726 $self->{spell} = {};
3727 $self->rebuild_spell_list;
3728}
3729
3730#############################################################################
3731
3732package CFClient::UI::Root;
3733
3734our @ISA = CFClient::UI::Container::;
3735
3736use List::Util qw(min max);
3737
3738use CFClient::OpenGL;
3739
3740sub new {
3741 my $class = shift;
3742
3743 my $self = $class->SUPER::new (
3744 visible => 1,
3745 @_,
3746 );
3747
3748 Scalar::Util::weaken ($self->{root} = $self);
3749
3750 $self
3052} 3751}
3053 3752
3054sub size_request { 3753sub size_request {
3055 my ($self) = @_; 3754 my ($self) = @_;
3056 3755
3057 ($self->{w}, $self->{h}) 3756 ($self->{w}, $self->{h})
3058} 3757}
3059 3758
3759sub _to_pixel {
3760 my ($coord, $size, $max) = @_;
3761
3762 $coord =
3763 $coord eq "center" ? ($max - $size) * 0.5
3764 : $coord eq "max" ? $max
3765 : $coord;
3766
3767 $coord = 0 if $coord < 0;
3768 $coord = $max - $size if $coord > $max - $size;
3769
3770 int $coord + 0.5
3771}
3772
3060sub size_allocate { 3773sub invoke_size_allocate {
3061 my ($self, $w, $h) = @_; 3774 my ($self, $w, $h) = @_;
3062 3775
3063 for my $child ($self->children) { 3776 for my $child ($self->children) {
3064 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3777 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3065 3778
3066 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3779 $X = $child->{force_x} if exists $child->{force_x};
3067 if exists $child->{req_x}; 3780 $Y = $child->{force_y} if exists $child->{force_y};
3068 3781
3069 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3782 $X = _to_pixel $X, $W, $self->{w};
3070 if exists $child->{req_y}; 3783 $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 3784
3075 $child->configure ($X, $Y, $W, $H); 3785 $child->configure ($X, $Y, $W, $H);
3076 } 3786 }
3787
3788 1
3077} 3789}
3078 3790
3079sub coord2local { 3791sub coord2local {
3080 my ($self, $x, $y) = @_; 3792 my ($self, $x, $y) = @_;
3081 3793
… …
3089} 3801}
3090 3802
3091sub update { 3803sub update {
3092 my ($self) = @_; 3804 my ($self) = @_;
3093 3805
3094 $self->check_size;
3095 $::WANT_REFRESH++; 3806 $::WANT_REFRESH++;
3096} 3807}
3097 3808
3098sub add { 3809sub add {
3099 my ($self, @children) = @_; 3810 my ($self, @children) = @_;
3100 3811
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; 3812 $_->{is_toplevel} = 1
3109 3813 for @children;
3110 # integerise window positions
3111 $child->{x} = int $child->{x};
3112 $child->{y} = int $child->{y};
3113 }
3114 3814
3115 $self->SUPER::add (@children); 3815 $self->SUPER::add (@children);
3116} 3816}
3117 3817
3118sub remove { 3818sub remove {
3119 my ($self, @children) = @_; 3819 my ($self, @children) = @_;
3120 3820
3121 $self->SUPER::remove (@children); 3821 $self->SUPER::remove (@children);
3822
3823 delete $self->{is_toplevel}
3824 for @children;
3122 3825
3123 while (@children) { 3826 while (@children) {
3124 my $w = pop @children; 3827 my $w = pop @children;
3125 push @children, $w->children; 3828 push @children, $w->children;
3126 delete $w->{visible}; 3829 $w->set_invisible;
3127 } 3830 }
3128} 3831}
3129 3832
3130sub on_refresh { 3833sub on_refresh {
3131 my ($self, $id, $cb) = @_; 3834 my ($self, $id, $cb) = @_;
… …
3145 while ($self->{refresh_hook}) { 3848 while ($self->{refresh_hook}) {
3146 $_->() 3849 $_->()
3147 for values %{delete $self->{refresh_hook}}; 3850 for values %{delete $self->{refresh_hook}};
3148 } 3851 }
3149 3852
3150 if ($self->{check_size}) { 3853 if ($self->{realloc}) {
3151 my @queue = ([], []); 3854 my %queue;
3855 my @queue;
3856 my $widget;
3152 3857
3153 for (;;) { 3858 outer:
3154 if ($self->{check_size}) { 3859 while () {
3155 # heuristic: check containers last 3860 if (my $realloc = delete $self->{realloc}) {
3156 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3861 for $widget (values %$realloc) {
3157 for values %{delete $self->{check_size}} 3862 $widget->{visible} or next; # do not resize invisible widgets
3863
3864 $queue{$widget+0}++ and next; # duplicates are common
3865
3866 push @{ $queue[$widget->{visible}] }, $widget;
3867 }
3158 } 3868 }
3159 3869
3160 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3870 while () {
3871 @queue or last outer;
3161 3872
3162 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3873 $widget = pop @{ $queue[-1] || [] }
3163 ? @$widget{qw(user_w user_h)} 3874 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 3875
3876 pop @queue;
3877 }
3878
3879 delete $queue{$widget+0};
3880
3881 my ($w, $h) = $widget->size_request;
3882
3883 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3884 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3885
3886 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3887 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3888
3889 $w = $widget->{force_w} if exists $widget->{force_w};
3890 $h = $widget->{force_h} if exists $widget->{force_h};
3891
3892 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3893 || delete $widget->{force_realloc}) {
3170 $widget->{req_w} = $w; 3894 $widget->{req_w} = $w;
3171 $widget->{req_h} = $h; 3895 $widget->{req_h} = $h;
3172 3896
3173 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3897 $self->{size_alloc}{$widget+0} = $widget;
3174 3898
3175 $widget->{parent}->check_size
3176 if $widget->{parent}; 3899 if (my $parent = $widget->{parent}) {
3900 $self->{realloc}{$parent+0} = $parent
3901 unless $queue{$parent+0};
3902
3903 $parent->{force_size_alloc} = 1;
3904 $self->{size_alloc}{$parent+0} = $parent;
3905 }
3177 } 3906 }
3907
3908 delete $self->{realloc}{$widget+0};
3178 } 3909 }
3179 } 3910 }
3180 3911
3181 while ($self->{size_alloc}) { 3912 while (my $size_alloc = delete $self->{size_alloc}) {
3182 for (values %{delete $self->{size_alloc}}) { 3913 my @queue = sort { $b->{visible} <=> $a->{visible} }
3183 my ($widget, $w, $h) = @$_; 3914 values %$size_alloc;
3915
3916 while () {
3917 my $widget = pop @queue || last;
3918
3919 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3184 3920
3185 $w = 0 if $w < 0; 3921 $w = 0 if $w < 0;
3186 $h = 0 if $h < 0; 3922 $h = 0 if $h < 0;
3187 3923
3924 $w = int $w + 0.5;
3925 $h = int $h + 0.5;
3926
3927 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3928 $widget->{old_w} = $widget->{w};
3929 $widget->{old_h} = $widget->{h};
3930
3188 $widget->{w} = $w; 3931 $widget->{w} = $w;
3189 $widget->{h} = $h; 3932 $widget->{h} = $h;
3190 $widget->size_allocate ($w, $h); 3933
3191 $widget->emit (size_allocate => $w, $h); 3934 $widget->emit (size_allocate => $w, $h);
3935 }
3192 } 3936 }
3193 } 3937 }
3194 3938
3195 while ($self->{post_alloc_hook}) { 3939 while ($self->{post_alloc_hook}) {
3196 $_->() 3940 $_->()
3197 for values %{delete $self->{post_alloc_hook}}; 3941 for values %{delete $self->{post_alloc_hook}};
3198 } 3942 }
3943
3199 3944
3200 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3945 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3946 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3202 glClear GL_COLOR_BUFFER_BIT; 3947 glClear GL_COLOR_BUFFER_BIT;
3203 3948
… …
3205 glLoadIdentity; 3950 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3951 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 3952 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 3953 glLoadIdentity;
3209 3954
3955 {
3956 package CFClient::UI::Base;
3957
3958 ($draw_x, $draw_y, $draw_w, $draw_h) =
3959 (0, 0, $self->{w}, $self->{h});
3960 }
3961
3210 $self->_draw; 3962 $self->_draw;
3211} 3963}
3212 3964
3213############################################################################# 3965#############################################################################
3214 3966

Diff Legend

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