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

Diff Legend

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