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

Diff Legend

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