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.329 by root, Sun Jul 23 02:44:06 2006 UTC

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

Diff Legend

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