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

Diff Legend

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