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.216 by root, Fri May 19 16:43:57 2006 UTC vs.
Revision 1.316 by root, Sun Jul 2 13:57:58 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
102 118
103 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
104 } 120 }
105} 121}
106 122
107sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
108 my ($ev) = @_; 124 my ($ev) = @_;
… …
114 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
115 131
116 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 $TOOLTIP_WATCHER->start;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
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 my $focus = $FOCUS; $FOCUS = $self;
322 429
323 $self->emit (focus_in => $focus);
324
325 $focus->update if $focus; 430 $focus->update if $focus;
326 $FOCUS->update; 431 $FOCUS->update;
327}
328 432
433 0
434}
435
329sub focus_out { 436sub invoke_focus_out {
330 my ($self) = @_; 437 my ($self) = @_;
331 438
332 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
333 440
334 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
335 442
336 $self->emit (focus_out => $focus);
337
338 $focus->update if $focus; #? 443 $focus->update if $focus; #?
339}
340 444
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
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 }; 849 };
697} 850}
698 851
699sub _draw { 852sub _draw {
700 my ($self) = @_; 853 my ($self) = @_;
701 854
702 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
703 856
704 my $tex = $self->{texture} 857 my $tex = $self->{texture}
705 or return; 858 or return;
706 859
707 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
709 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
710 863
711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
712 865
713 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
714} 867}
… …
717 870
718package CFClient::UI::ViewPort; 871package CFClient::UI::ViewPort;
719 872
720our @ISA = CFClient::UI::Window::; 873our @ISA = CFClient::UI::Window::;
721 874
875sub new {
876 my $class = shift;
877
878 $class->SUPER::new (
879 scroll_x => 0,
880 scroll_y => 1,
881 @_,
882 )
883}
884
722sub size_request { 885sub size_request {
723 my ($self) = @_; 886 my ($self) = @_;
724 887
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 889
728 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
729} 891 $h = 10 if $self->{scroll_y};
730 892
893 ($w, $h)
894}
895
731sub size_allocate { 896sub invoke_size_allocate {
732 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
733 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);
734 $self->update; 905 $self->update;
906
907 1
735} 908}
736 909
737sub set_offset { 910sub set_offset {
738 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
739 912
… …
772} 945}
773 946
774sub _render { 947sub _render {
775 my ($self) = @_; 948 my ($self) = @_;
776 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
777 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
778 954
779 $self->SUPER::_render; 955 $self->SUPER::_render;
780} 956}
781 957
… …
784package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
785 961
786our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
787 963
788sub new { 964sub new {
789 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
790 968
791 my $self; 969 my $self;
792 970
793 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
794 vertical => 1, 972 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 974 on_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 975 $self->{vp}->set_offset (0, $_[1]);
798 }, 976 },
799 ; 977 ;
800 978
801 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort), 980 vp => (new CFClient::UI::ViewPort expand => 1),
803 slider => $slider, 981 slider => $slider,
804 @_, 982 %arg,
805 ); 983 );
806 984
807 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp});
809 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
810 987
811 $self 988 $self
812} 989}
813 990
814#TODO# update range on size_allocate depending on child 991#TODO# update range on size_allocate depending on child
815# 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}
816 1020
817############################################################################# 1021#############################################################################
818 1022
819package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
820 1024
… …
836 1040
837 if ($self->{bg}) { 1041 if ($self->{bg}) {
838 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
839 1043
840 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
842 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
843 1047
844 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
845 glVertex 0 , 0; 1049 glVertex 0 , 0;
846 glVertex 0 , $h; 1050 glVertex 0 , $h;
847 glVertex $w, $h; 1051 glVertex $w, $h;
… …
860 1064
861our @ISA = CFClient::UI::Bin::; 1065our @ISA = CFClient::UI::Bin::;
862 1066
863use CFClient::OpenGL; 1067use CFClient::OpenGL;
864 1068
865my @tex = 1069my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1;
1072
1073my @border =
866 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
867 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);
868 1076
869sub new { 1077sub new {
870 my $class = shift; 1078 my ($class, %arg) = @_;
871
872 # TODO: user_x, user_y, overwrite moveto?
873 1079
874 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
875 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
876 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
877 border => 0.6, 1083 border => 0.6,
878 toplevel => 1,
879 can_events => 1, 1084 can_events => 1,
880 @_ 1085 min_w => 16,
1086 min_h => 16,
1087 %arg,
881 ); 1088 );
882 1089
883 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
884 align => 0, 1091 align => 0,
885 valign => 1, 1092 valign => 1,
886 text => $self->{title}, 1093 text => $self->{title},
887 fontsize => $self->{border}; 1094 fontsize => $self->{border},
1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->hide };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
888 1105
889 $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};
890} 1115}
891 1116
892sub border { 1117sub border {
893 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
894} 1119}
895 1120
896sub size_request { 1121sub size_request {
897 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};
898 1129
899 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
900 1131
901 ( 1132 (
902 $w + $self->border * 2, 1133 $w + $self->border * 2,
903 $h + $self->border * 2, 1134 $h + $self->border * 2,
904 ) 1135 )
905} 1136}
906 1137
907sub size_allocate { 1138sub invoke_size_allocate {
908 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
909 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
910 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
911 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
912 1151
913 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
914 if $self->{title};
915
916 $self->child->configure ($self->border, $self->border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
917}
918 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
919sub button_down { 1160sub invoke_button_down {
920 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
921 1162
922 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
923 my $border = $self->border; 1164 my $border = $self->border;
924 1165
… …
937 my ($ev, $x, $y) = @_; 1178 my ($ev, $x, $y) = @_;
938 1179
939 my $dx = $ev->{x} - $ox; 1180 my $dx = $ev->{x} - $ox;
940 my $dy = $ev->{y} - $oy; 1181 my $dy = $ev->{y} - $oy;
941 1182
942 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1183 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
943 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1184 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1185
944 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1186 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
945 $self->check_size; 1187 $self->realloc;
946 }; 1188 };
947 1189
948 } elsif ($lr ^ $td) { 1190 } elsif ($lr ^ $td) {
949 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1191 my ($ox, $oy) = ($ev->{x}, $ev->{y});
950 my ($bx, $by) = ($self->{x}, $self->{y}); 1192 my ($bx, $by) = ($self->{x}, $self->{y});
… …
952 $self->{motion} = sub { 1194 $self->{motion} = sub {
953 my ($ev, $x, $y) = @_; 1195 my ($ev, $x, $y) = @_;
954 1196
955 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
956 1198
957 $self->move ($bx + $x - $ox, $by + $y - $oy); 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
958 $self->update; 1200 # HACK: the next line is required to enforce placement
1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
959 }; 1202 };
1203 } else {
1204 return 0;
1205 }
1206
960 } 1207 1
961} 1208}
962 1209
963sub button_up { 1210sub invoke_button_up {
964 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
965 1212
966 delete $self->{motion}; 1213 ! ! delete $self->{motion}
967} 1214}
968 1215
969sub mouse_motion { 1216sub invoke_mouse_motion {
970 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
971 1218
972 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220
1221 ! ! $self->{motion}
973} 1222}
974 1223
975sub _draw { 1224sub _draw {
976 my ($self) = @_; 1225 my ($self) = @_;
977 1226
1227 my $child = $self->{children}[0];
1228
978 my ($w, $h ) = ($self->{w}, $self->{h}); 1229 my ($w, $h ) = ($self->{w}, $self->{h});
979 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1230 my ($cw, $ch) = ($child->{w}, $child->{h});
980 1231
981 glEnable GL_TEXTURE_2D; 1232 glEnable GL_TEXTURE_2D;
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 1234
984 my $border = $self->border; 1235 my $border = $self->border;
985 1236
986 glColor @{ $self->{border_bg} }; 1237 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1238 $border[0]->draw_quad_alpha (0, 0, $w, $border);
988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1239 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1240 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1241 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
991 1242
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1243 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 1244 glColor @{ $self->{bg} };
994 1245
995 # TODO: repeat texture not scale 1246 # TODO: repeat texture not scale
1247 # solve this better(?)
996 my $rep_x = $cw / $bg->{w}; 1248 $bg->{s} = $cw / $bg->{w};
997 my $rep_y = $ch / $bg->{h}; 1249 $bg->{t} = $ch / $bg->{h};
998
999 glColor @{ $self->{bg} };
1000
1001 $bg->{s} = $rep_x;
1002 $bg->{t} = $rep_y;
1003 $bg->{wrap_mode} = 1;
1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1250 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 } 1251 }
1006 1252
1007 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1008 1254
1009 $self->{title}->draw if $self->{title};
1010
1011 $self->child->draw; 1255 $child->draw;
1256
1257 if ($self->{title_widget}) {
1258 glTranslate 0, $border - $self->{h};
1259 $self->{title_widget}->_draw;
1260
1261 glTranslate 0, - ($border - $self->{h});
1262 }
1263
1264 $self->{close_button}->draw
1265 if $self->{close_button};
1012} 1266}
1013 1267
1014############################################################################# 1268#############################################################################
1015 1269
1016package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
1024sub new { 1278sub new {
1025 my $class = shift; 1279 my $class = shift;
1026 1280
1027 $class->SUPER::new ( 1281 $class->SUPER::new (
1028 col_expand => [], 1282 col_expand => [],
1029 @_ 1283 @_,
1030 ) 1284 )
1285}
1286
1287sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031} 1289}
1032 1290
1033sub add { 1291sub add {
1034 my ($self, $x, $y, $child) = @_; 1292 my ($self, $x, $y, $child) = @_;
1035 1293
1036 $child->set_parent ($self); 1294 $child->set_parent ($self);
1037 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1038 1296
1039 $child->check_size; 1297 $self->realloc;
1040} 1298}
1041 1299
1042sub children { 1300sub remove {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1301 my ($self, $child) = @_;
1044}
1045 1302
1303 # TODO: not yet implemented
1304}
1305
1046# TODO: move to container class maybe? send childs a signal on removal? 1306# TODO: move to container class maybe? send children a signal on removal?
1047sub clear { 1307sub clear {
1048 my ($self) = @_; 1308 my ($self) = @_;
1049 1309
1050 my @children = $self->children; 1310 my @children = $self->children;
1051 delete $self->{children}; 1311 delete $self->{children};
… …
1053 for (@children) { 1313 for (@children) {
1054 delete $_->{parent}; 1314 delete $_->{parent};
1055 $_->hide; 1315 $_->hide;
1056 } 1316 }
1057 1317
1058 $self->update; 1318 $self->realloc;
1059} 1319}
1060 1320
1061sub get_wh { 1321sub get_wh {
1062 my ($self) = @_; 1322 my ($self) = @_;
1063 1323
… …
1089 (sum @$ws), 1349 (sum @$ws),
1090 (sum @$hs), 1350 (sum @$hs),
1091 ) 1351 )
1092} 1352}
1093 1353
1094sub size_allocate { 1354sub invoke_size_allocate {
1095 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1096 1356
1097 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1098 1358
1099 my $req_w = sum @$ws; 1359 my $req_w = (sum @$ws) || 1;
1100 my $req_h = sum @$hs; 1360 my $req_h = (sum @$hs) || 1;
1101 1361
1102 # TODO: nicer code && do row_expand 1362 # TODO: nicer code && do row_expand
1103 my @col_expand = @{$self->{col_expand}}; 1363 my @col_expand = @{$self->{col_expand}};
1104 @col_expand = (1) x @$ws unless @col_expand; 1364 @col_expand = (1) x @$ws unless @col_expand;
1105 my $col_expand = (sum @col_expand) || 1; 1365 my $col_expand = (sum @col_expand) || 1;
… …
1131 } 1391 }
1132 1392
1133 $y += $row_h; 1393 $y += $row_h;
1134 } 1394 }
1135 1395
1396 1
1136} 1397}
1137 1398
1138sub find_widget { 1399sub find_widget {
1139 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1140 1401
… …
1159 } 1420 }
1160} 1421}
1161 1422
1162############################################################################# 1423#############################################################################
1163 1424
1425package CFClient::UI::Box;
1426
1427our @ISA = CFClient::UI::Container::;
1428
1429sub size_request {
1430 my ($self) = @_;
1431
1432 $self->{vertical}
1433 ? (
1434 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1435 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1436 )
1437 : (
1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1440 )
1441}
1442
1443sub invoke_size_allocate {
1444 my ($self, $w, $h) = @_;
1445
1446 my $space = $self->{vertical} ? $h : $w;
1447 my @children = $self->visible_children;
1448
1449 my @req;
1450
1451 if ($self->{homogeneous}) {
1452 @req = ($space / (@children || 1)) x @children;
1453 } else {
1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1455 my $req = List::Util::sum @req;
1456
1457 if ($req > $space) {
1458 # ah well, not enough space
1459 $_ *= $space / $req for @req;
1460 } else {
1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1462
1463 $space = ($space - $req) / $expand; # remaining space to give away
1464
1465 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children;
1467 }
1468 }
1469
1470 CFClient::UI::harmonize \@req;
1471
1472 my $pos = 0;
1473 for (0 .. $#children) {
1474 my $alloc = $req[$_];
1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1476
1477 $pos += $alloc;
1478 }
1479
1480 1
1481}
1482
1483#############################################################################
1484
1164package CFClient::UI::HBox; 1485package CFClient::UI::HBox;
1165 1486
1166# TODO: wrap into common Box base class
1167
1168our @ISA = CFClient::UI::Container::; 1487our @ISA = CFClient::UI::Box::;
1169 1488
1170sub size_request { 1489sub new {
1171 my ($self) = @_; 1490 my $class = shift;
1172 1491
1173 my @alloc = map [$_->size_request], @{$self->{children}}; 1492 $class->SUPER::new (
1174 1493 vertical => 0,
1175 ( 1494 @_,
1176 (List::Util::sum map $_->[0], @alloc),
1177 (List::Util::max map $_->[1], @alloc),
1178 ) 1495 )
1179} 1496}
1180 1497
1181sub size_allocate {
1182 my ($self, $w, $h) = @_;
1183
1184 ($h, $w) = ($w, $h);
1185
1186 my $children = $self->{children};
1187
1188 my @h = map $_->{req_w}, @$children;
1189
1190 my $req_h = List::Util::sum @h;
1191
1192 if ($req_h > $h) {
1193 # ah well, not enough space
1194 $_ *= $h / $req_h for @h;
1195 } else {
1196 my $exp = List::Util::sum map $_->{expand}, @$children;
1197 $exp ||= 1;
1198
1199 for (0 .. $#$children) {
1200 my $child = $children->[$_];
1201
1202 my $alloc_h = $h[$_];
1203 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1204 $h[$_] = $alloc_h;
1205 }
1206 }
1207
1208 CFClient::UI::harmonize \@h;
1209
1210 my $y = 0;
1211 for (0 .. $#$children) {
1212 my $child = $children->[$_];
1213 my $h = $h[$_];
1214 $child->configure ($y, 0, $h, $w);
1215
1216 $y += $h;
1217 }
1218
1219 1
1220}
1221
1222############################################################################# 1498#############################################################################
1223 1499
1224package CFClient::UI::VBox; 1500package CFClient::UI::VBox;
1225 1501
1226# TODO: wrap into common Box base class
1227
1228our @ISA = CFClient::UI::Container::; 1502our @ISA = CFClient::UI::Box::;
1229 1503
1230sub size_request { 1504sub new {
1231 my ($self) = @_; 1505 my $class = shift;
1232 1506
1233 my @alloc = map [$_->size_request], @{$self->{children}}; 1507 $class->SUPER::new (
1234 1508 vertical => 1,
1235 ( 1509 @_,
1236 (List::Util::max map $_->[0], @alloc),
1237 (List::Util::sum map $_->[1], @alloc),
1238 ) 1510 )
1239}
1240
1241sub size_allocate {
1242 my ($self, $w, $h) = @_;
1243
1244 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1246 my $children = $self->{children};
1247
1248 my @h = map $_->{req_h}, @$children;
1249
1250 my $req_h = List::Util::sum @h;
1251
1252 if ($req_h > $h) {
1253 # ah well, not enough space
1254 $_ *= $h / $req_h for @h;
1255 } else {
1256 my $exp = List::Util::sum map $_->{expand}, @$children;
1257 $exp ||= 1;
1258
1259 for (0 .. $#$children) {
1260 my $child = $children->[$_];
1261
1262 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1263 }
1264 }
1265
1266 CFClient::UI::harmonize \@h;
1267
1268 my $y = 0;
1269 for (0 .. $#$children) {
1270 my $child = $children->[$_];
1271 my $h = $h[$_];
1272 $child->configure (0, $y, $w, $h);
1273
1274 $y += $h;
1275 }
1276
1277 1
1278} 1511}
1279 1512
1280############################################################################# 1513#############################################################################
1281 1514
1282package CFClient::UI::Label; 1515package CFClient::UI::Label;
… …
1299 ellipsise => 3, # end 1532 ellipsise => 3, # end
1300 layout => (new CFClient::Layout), 1533 layout => (new CFClient::Layout),
1301 fontsize => 1, 1534 fontsize => 1,
1302 align => -1, 1535 align => -1,
1303 valign => -1, 1536 valign => -1,
1304 padding => 2, 1537 padding_x => 2,
1538 padding_y => 2,
1305 can_events => 0, 1539 can_events => 0,
1306 %arg 1540 %arg
1307 ); 1541 );
1308 1542
1309 if (exists $self->{template}) { 1543 if (exists $self->{template}) {
… …
1336 1570
1337 delete $self->{texture}; 1571 delete $self->{texture};
1338 $self->SUPER::update; 1572 $self->SUPER::update;
1339} 1573}
1340 1574
1575sub realloc {
1576 my ($self) = @_;
1577
1578 delete $self->{ox};
1579 $self->SUPER::realloc;
1580}
1581
1341sub set_text { 1582sub set_text {
1342 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1343 1584
1344 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1345 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1346 1587
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1348 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1349 1590
1591 delete $self->{size_req};
1592 $self->realloc;
1350 $self->update; 1593 $self->update;
1351 $self->check_size;
1352} 1594}
1353 1595
1354sub set_markup { 1596sub set_markup {
1355 my ($self, $markup) = @_; 1597 my ($self, $markup) = @_;
1356 1598
… …
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361 1603
1362 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1363 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1364 1606
1607 delete $self->{size_req};
1608 $self->realloc;
1365 $self->update; 1609 $self->update;
1366 $self->check_size;
1367} 1610}
1368 1611
1369sub size_request { 1612sub size_request {
1370 my ($self) = @_; 1613 my ($self) = @_;
1371 1614
1615 $self->{size_req} ||= do {
1372 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1373 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1374 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1375 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1621
1378 my ($w, $h) = $self->{layout}->size; 1622 my ($w, $h) = $self->{layout}->size;
1379 1623
1380 if (exists $self->{template}) { 1624 if (exists $self->{template}) {
1381 $self->{template}->set_font ($self->{font}) if $self->{font}; 1625 $self->{template}->set_font ($self->{font}) if $self->{font};
1382 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1383 1627
1384 my ($w2, $h2) = $self->{template}->size; 1628 my ($w2, $h2) = $self->{template}->size;
1385 1629
1386 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1632 }
1633
1634 [$w, $h]
1388 } 1635 };
1389 1636
1390 ( 1637 @{ $self->{size_req} }
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1638}
1395 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1396sub size_allocate { 1644sub invoke_size_allocate {
1397 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1398 1646
1647 delete $self->{ox};
1648
1399 delete $self->{texture}; 1649 delete $self->{texture}
1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1400} 1653}
1401 1654
1402sub set_fontsize { 1655sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1404 1657
1405 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1659 delete $self->{size_req};
1406 delete $self->{texture}; 1660 delete $self->{texture};
1407 1661
1408 $self->update; 1662 $self->realloc;
1409 $self->check_size; 1663}
1664
1665sub reconfigure {
1666 my ($self) = @_;
1667
1668 delete $self->{size_req};
1669
1670 $self->SUPER::reconfigure;
1410} 1671}
1411 1672
1412sub _draw { 1673sub _draw {
1413 my ($self) = @_; 1674 my ($self) = @_;
1414 1675
… …
1420 $self->{layout}->set_width ($self->{w}); 1681 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1682 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1683 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1684 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424 1685
1425 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1686 new_from_layout CFClient::Texture $self->{layout}
1687 };
1426 1688
1689 unless (exists $self->{ox}) {
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1690 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1691 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1429 : ($self->{w} - $tex->{w}) * 0.5); 1692 : ($self->{w} - $tex->{w}) * 0.5);
1430 1693
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1694 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1695 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1433 : ($self->{h} - $tex->{h}) * 0.5); 1696 : ($self->{h} - $tex->{h}) * 0.5);
1434
1435 $tex
1436 }; 1697 };
1437 1698
1438 glEnable GL_TEXTURE_2D; 1699 glEnable GL_TEXTURE_2D;
1439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1700
1701 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1702 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1440 1703
1441 if ($tex->{format} == GL_ALPHA) { 1704 if ($tex->{format} == GL_ALPHA) {
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1442 glColor @{$self->{fg}}; 1706 glColor @{$self->{fg}};
1443 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1707 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1444 } else { 1708 } else {
1709 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1445 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1710 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1446 } 1711 }
1447 1712
1448 glDisable GL_TEXTURE_2D; 1713 glDisable GL_TEXTURE_2D;
1449} 1714}
1450 1715
… …
1466 active_fg => [0, 0, 0], 1731 active_fg => [0, 0, 0],
1467 can_hover => 1, 1732 can_hover => 1,
1468 can_focus => 1, 1733 can_focus => 1,
1469 valign => 0, 1734 valign => 0,
1470 can_events => 1, 1735 can_events => 1,
1736 #text => ...
1737 #hidden => "*",
1471 @_ 1738 @_
1472 ) 1739 )
1473} 1740}
1474 1741
1475sub _set_text { 1742sub _set_text {
… …
1477 1744
1478 delete $self->{cur_h}; 1745 delete $self->{cur_h};
1479 1746
1480 return if $self->{text} eq $text; 1747 return if $self->{text} eq $text;
1481 1748
1482 delete $self->{texture};
1483
1484 $self->{last_activity} = $::NOW; 1749 $self->{last_activity} = $::NOW;
1485 $self->{text} = $text; 1750 $self->{text} = $text;
1486 1751
1487 $text =~ s/./*/g if $self->{hidden}; 1752 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 1753 $self->{layout}->set_text ("$text ");
1754 delete $self->{size_req};
1489 1755
1490 $self->emit (changed => $self->{text}); 1756 $self->emit (changed => $self->{text});
1757
1758 $self->realloc;
1759 $self->update;
1491} 1760}
1492 1761
1493sub set_text { 1762sub set_text {
1494 my ($self, $text) = @_; 1763 my ($self, $text) = @_;
1495 1764
1496 $self->{cursor} = length $text; 1765 $self->{cursor} = length $text;
1497 $self->_set_text ($text); 1766 $self->_set_text ($text);
1498 $self->update;
1499 $self->check_size;
1500} 1767}
1501 1768
1502sub get_text { 1769sub get_text {
1503 $_[0]{text} 1770 $_[0]{text}
1504} 1771}
… …
1509 my ($w, $h) = $self->SUPER::size_request; 1776 my ($w, $h) = $self->SUPER::size_request;
1510 1777
1511 ($w + 1, $h) # add 1 for cursor 1778 ($w + 1, $h) # add 1 for cursor
1512} 1779}
1513 1780
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518}
1519
1520sub key_down { 1781sub invoke_key_down {
1521 my ($self, $ev) = @_; 1782 my ($self, $ev) = @_;
1522 1783
1523 my $mod = $ev->{mod}; 1784 my $mod = $ev->{mod};
1524 my $sym = $ev->{sym}; 1785 my $sym = $ev->{sym};
1525 my $uni = $ev->{unicode}; 1786 my $uni = $ev->{unicode};
… …
1540 $self->{cursor} = length $text; 1801 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 1802 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 1803 $self->emit ('escape');
1543 } elsif ($uni) { 1804 } elsif ($uni) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 1805 substr $text, $self->{cursor}++, 0, chr $uni;
1806 } else {
1807 return 0;
1545 } 1808 }
1546 1809
1547 $self->_set_text ($text); 1810 $self->_set_text ($text);
1548 $self->update;
1549 $self->check_size;
1550}
1551 1811
1812 $self->realloc;
1813
1814 1
1815}
1816
1552sub focus_in { 1817sub invoke_focus_in {
1553 my ($self) = @_; 1818 my ($self) = @_;
1554 1819
1555 $self->{last_activity} = $::NOW; 1820 $self->{last_activity} = $::NOW;
1556 1821
1557 $self->SUPER::focus_in; 1822 $self->SUPER::invoke_focus_in
1558} 1823}
1559 1824
1560sub button_down { 1825sub invoke_button_down {
1561 my ($self, $ev, $x, $y) = @_; 1826 my ($self, $ev, $x, $y) = @_;
1562 1827
1563 $self->SUPER::button_down ($ev, $x, $y); 1828 $self->SUPER::invoke_button_down ($ev, $x, $y);
1564 1829
1565 my $idx = $self->{layout}->xy_to_index ($x, $y); 1830 my $idx = $self->{layout}->xy_to_index ($x, $y);
1566 1831
1567 # byte-index to char-index 1832 # byte-index to char-index
1568 my $text = $self->{text}; 1833 my $text = $self->{text};
1569 utf8::encode $text; 1834 utf8::encode $text;
1570 $self->{cursor} = length substr $text, 0, $idx; 1835 $self->{cursor} = length substr $text, 0, $idx;
1571 1836
1572 $self->_set_text ($self->{text}); 1837 $self->_set_text ($self->{text});
1573 $self->update; 1838 $self->update;
1839
1840 1
1574} 1841}
1575 1842
1576sub mouse_motion { 1843sub invoke_mouse_motion {
1577 my ($self, $ev, $x, $y) = @_; 1844 my ($self, $ev, $x, $y) = @_;
1578# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1845# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1846
1847 1
1579} 1848}
1580 1849
1581sub _draw { 1850sub _draw {
1582 my ($self) = @_; 1851 my ($self) = @_;
1583 1852
1584 local $self->{fg} = $self->{fg}; 1853 local $self->{fg} = $self->{fg};
1585 1854
1586 if ($FOCUS == $self) { 1855 if ($FOCUS == $self) {
1587 glColor @{$self->{active_bg}}; 1856 glColor_premultiply @{$self->{active_bg}};
1588 $self->{fg} = $self->{active_fg}; 1857 $self->{fg} = $self->{active_fg};
1589 } else { 1858 } else {
1590 glColor @{$self->{bg}}; 1859 glColor_premultiply @{$self->{bg}};
1591 } 1860 }
1592 1861
1593 glEnable GL_BLEND; 1862 glEnable GL_BLEND;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1863 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1595 glBegin GL_QUADS; 1864 glBegin GL_QUADS;
1596 glVertex 0 , 0; 1865 glVertex 0 , 0;
1597 glVertex 0 , $self->{h}; 1866 glVertex 0 , $self->{h};
1598 glVertex $self->{w}, $self->{h}; 1867 glVertex $self->{w}, $self->{h};
1599 glVertex $self->{w}, 0; 1868 glVertex $self->{w}, 0;
… …
1624 1893
1625our @ISA = CFClient::UI::EntryBase::; 1894our @ISA = CFClient::UI::EntryBase::;
1626 1895
1627use CFClient::OpenGL; 1896use CFClient::OpenGL;
1628 1897
1629sub key_down { 1898sub invoke_key_down {
1630 my ($self, $ev) = @_; 1899 my ($self, $ev) = @_;
1631 1900
1632 my $sym = $ev->{sym}; 1901 my $sym = $ev->{sym};
1633 1902
1634 if ($sym == 13) { 1903 if ($sym == 13) {
1635 unshift @{$self->{history}}, 1904 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 1905 my $txt = $self->get_text;
1906
1637 $self->{history_pointer} = -1; 1907 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 1908 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 1909 $self->emit (activate => $txt);
1640 $self->update; 1910 $self->update;
1641 1911
… …
1660 } else { 1930 } else {
1661 $self->set_text ($self->{history_saveback}); 1931 $self->set_text ($self->{history_saveback});
1662 } 1932 }
1663 1933
1664 } else { 1934 } else {
1665 $self->SUPER::key_down ($ev); 1935 return $self->SUPER::invoke_key_down ($ev)
1936 }
1937
1666 } 1938 1
1667
1668} 1939}
1669 1940
1670############################################################################# 1941#############################################################################
1671 1942
1672package CFClient::UI::Button; 1943package CFClient::UI::Button;
… …
1681 1952
1682sub new { 1953sub new {
1683 my $class = shift; 1954 my $class = shift;
1684 1955
1685 $class->SUPER::new ( 1956 $class->SUPER::new (
1686 padding => 4, 1957 padding_x => 4,
1958 padding_y => 4,
1687 fg => [1, 1, 1], 1959 fg => [1, 1, 1],
1688 active_fg => [0, 0, 1], 1960 active_fg => [0, 0, 1],
1689 can_hover => 1, 1961 can_hover => 1,
1690 align => 0, 1962 align => 0,
1691 valign => 0, 1963 valign => 0,
1692 can_events => 1, 1964 can_events => 1,
1693 @_ 1965 @_
1694 ) 1966 )
1695} 1967}
1696 1968
1697sub button_up { 1969sub invoke_button_up {
1698 my ($self, $ev, $x, $y) = @_; 1970 my ($self, $ev, $x, $y) = @_;
1699 1971
1972 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 1973 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 1974 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate"); 1975
1703 } 1976 1
1704} 1977}
1705 1978
1706sub _draw { 1979sub _draw {
1707 my ($self) = @_; 1980 my ($self) = @_;
1708 1981
1709 local $self->{fg} = $self->{fg}; 1982 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1710
1711 if ($GRAB == $self) {
1712 $self->{fg} = $self->{active_fg};
1713 }
1714 1983
1715 glEnable GL_TEXTURE_2D; 1984 glEnable GL_TEXTURE_2D;
1716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1717 glColor 0, 0, 0, 1; 1986 glColor 0, 0, 0, 1;
1718 1987
… …
1723 $self->SUPER::_draw; 1992 $self->SUPER::_draw;
1724} 1993}
1725 1994
1726############################################################################# 1995#############################################################################
1727 1996
1997package CFClient::UI::ImageButton;
1998
1999our @ISA = CFClient::UI::Image::;
2000
2001use CFClient::OpenGL;
2002
2003my %textures;
2004
2005sub new {
2006 my $class = shift;
2007
2008 my $self = $class->SUPER::new (
2009 padding_x => 4,
2010 padding_y => 4,
2011 fg => [1, 1, 1],
2012 active_fg => [0, 0, 1],
2013 can_hover => 1,
2014 align => 0,
2015 valign => 0,
2016 can_events => 1,
2017 @_
2018 );
2019}
2020
2021sub invoke_button_up {
2022 my ($self, $ev, $x, $y) = @_;
2023
2024 $self->emit ("activate")
2025 if $x >= 0 && $x < $self->{w}
2026 && $y >= 0 && $y < $self->{h};
2027
2028 1
2029}
2030
2031#############################################################################
2032
1728package CFClient::UI::CheckBox; 2033package CFClient::UI::CheckBox;
1729 2034
1730our @ISA = CFClient::UI::DrawBG::; 2035our @ISA = CFClient::UI::DrawBG::;
1731 2036
1732my @tex = 2037my @tex =
… …
1737 2042
1738sub new { 2043sub new {
1739 my $class = shift; 2044 my $class = shift;
1740 2045
1741 $class->SUPER::new ( 2046 $class->SUPER::new (
1742 padding => 2, 2047 padding_x => 2,
2048 padding_y => 2,
1743 fg => [1, 1, 1], 2049 fg => [1, 1, 1],
1744 active_fg => [1, 1, 0], 2050 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2], 2051 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5], 2052 active_bg => [1, 1, 1, 0.5],
1747 state => 0, 2053 state => 0,
… …
1751} 2057}
1752 2058
1753sub size_request { 2059sub size_request {
1754 my ($self) = @_; 2060 my ($self) = @_;
1755 2061
1756 ($self->{padding} * 2 + 6) x 2 2062 (6) x 2
1757} 2063}
1758 2064
1759sub button_down { 2065sub invoke_button_down {
1760 my ($self, $ev, $x, $y) = @_; 2066 my ($self, $ev, $x, $y) = @_;
1761 2067
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2068 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2069 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1764 $self->{state} = !$self->{state}; 2070 $self->{state} = !$self->{state};
1765 $self->emit (changed => $self->{state}); 2071 $self->emit (changed => $self->{state});
2072 } else {
2073 return 0
2074 }
2075
1766 } 2076 1
1767} 2077}
1768 2078
1769sub _draw { 2079sub _draw {
1770 my ($self) = @_; 2080 my ($self) = @_;
1771 2081
1772 $self->SUPER::_draw; 2082 $self->SUPER::_draw;
1773 2083
1774 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2084 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1775 2085
1776 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2086 my ($w, $h) = @$self{qw(w h)};
2087
2088 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1777 2089
1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2090 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1779 2091
1780 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2092 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781 2093
… …
1789package CFClient::UI::Image; 2101package CFClient::UI::Image;
1790 2102
1791our @ISA = CFClient::UI::Base::; 2103our @ISA = CFClient::UI::Base::;
1792 2104
1793use CFClient::OpenGL; 2105use CFClient::OpenGL;
1794use Carp qw/confess/;
1795 2106
1796our %loaded_images; 2107our %texture_cache;
1797 2108
1798sub new { 2109sub new {
1799 my $class = shift; 2110 my $class = shift;
1800 2111
1801 my $self = $class->SUPER::new (can_events => 0, @_); 2112 my $self = $class->SUPER::new (
2113 can_events => 0,
2114 @_,
2115 );
1802 2116
1803 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2117 $self->{path}
2118 or Carp::croak "required attribute 'path' not set";
1804 2119
1805 $loaded_images{$self->{image}} ||= 2120 $self->{tex} = $texture_cache{$self->{path}} ||=
1806 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2121 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1807 2122
1808 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2123 Scalar::Util::weaken $texture_cache{$self->{path}};
1809 2124
1810 Scalar::Util::weaken $loaded_images{$self->{image}}; 2125 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1811
1812 $self->{aspect} = $tex->{w} / $tex->{h};
1813 2126
1814 $self 2127 $self
1815} 2128}
1816 2129
1817sub size_request { 2130sub size_request {
1818 my ($self) = @_; 2131 my ($self) = @_;
1819 2132
1820 ($self->{tex}->{w}, $self->{tex}->{h}) 2133 ($self->{tex}{w}, $self->{tex}{h})
1821} 2134}
1822 2135
1823sub _draw { 2136sub _draw {
1824 my ($self) = @_; 2137 my ($self) = @_;
1825 2138
… …
1936 2249
1937 my $h1 = $self->{h} * (1 - $ycut1); 2250 my $h1 = $self->{h} * (1 - $ycut1);
1938 my $h2 = $self->{h} * (1 - $ycut2); 2251 my $h2 = $self->{h} * (1 - $ycut2);
1939 2252
1940 glEnable GL_BLEND; 2253 glEnable GL_BLEND;
1941 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2254 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1942 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
1943 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1944 2258
1945 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2259 glBindTexture GL_TEXTURE_2D, $t1->{name};
1946 glBegin GL_QUADS; 2260 glBegin GL_QUADS;
… …
2045 my $self = $class->SUPER::new ( 2359 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2360 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2361 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2362 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2363 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2364 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2365 min_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2366 min_h => $::WIDTH / 80,
2053 vertical => 0, 2367 vertical => 0,
2054 can_hover => 1, 2368 can_hover => 1,
2055 inner_pad => .05, 2369 inner_pad => 0.02,
2056 @_ 2370 @_
2057 ); 2371 );
2058 2372
2059 $self->set_value ($self->{range}[0]); 2373 $self->set_value ($self->{range}[0]);
2060 $self->update; 2374 $self->update;
2061 2375
2062 $self 2376 $self
2063} 2377}
2064 2378
2379sub set_range {
2380 my ($self, $range) = @_;
2381
2382 ($range, $self->{range}) = ($self->{range}, $range);
2383
2384 if ("@$range" ne "@{$self->{range}}") {
2385 $self->update;
2386 $self->set_value ($self->{range}[0]);
2387 }
2388}
2389
2065sub set_value { 2390sub set_value {
2066 my ($self, $value) = @_; 2391 my ($self, $value) = @_;
2067 2392
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2393 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2394
2070 $hi = $lo + 1 if $hi <= $lo; 2395 $hi = $lo + 1 if $hi <= $lo;
2071 2396
2397 $page = $hi - $lo if $page > $hi - $lo;
2398
2072 $value = $lo if $value < $lo; 2399 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2400 $value = $hi - $page if $value > $hi - $page;
2074 2401
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2402 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2403 if $unit;
2077
2078 $page = $hi - $lo if $page > $hi - $lo;
2079 2404
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2405 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2406
2082 if ($value != $old_value) { 2407 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2408 $self->emit (changed => $value);
… …
2086} 2411}
2087 2412
2088sub size_request { 2413sub size_request {
2089 my ($self) = @_; 2414 my ($self) = @_;
2090 2415
2091 my $w = $self->{req_w}; 2416 ($self->{req_w}, $self->{req_h})
2092 my $h = $self->{req_h};
2093
2094 $self->{vertical} ? ($h, $w) : ($w, $h)
2095} 2417}
2096 2418
2097sub button_down { 2419sub invoke_button_down {
2098 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2099 2421
2100 $self->SUPER::button_down ($ev, $x, $y); 2422 $self->SUPER::invoke_button_down ($ev, $x, $y);
2423
2424 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2425
2101 $self->mouse_motion ($ev, $x, $y); 2426 $self->invoke_mouse_motion ($ev, $x, $y)
2102} 2427}
2103 2428
2104sub mouse_motion { 2429sub invoke_mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2430 my ($self, $ev, $x, $y) = @_;
2106 2431
2107 if ($GRAB == $self) { 2432 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2433 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2434
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2435 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2436
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2437 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2438
2114 $self->set_value ($x * ($hi - $lo) + $lo); 2439 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2440 } else {
2441 return 0;
2442 }
2443
2115 } 2444 1
2116} 2445}
2117 2446
2118sub update { 2447sub update {
2119 my ($self) = @_; 2448 my ($self) = @_;
2120 2449
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2450 delete $self->{knob_w};
2451 $self->SUPER::update;
2452}
2453
2454sub _draw {
2455 my ($self) = @_;
2456
2457 unless ($self->{knob_w}) {
2122 $self->set_value ($self->{range}[0]); 2458 $self->set_value ($self->{range}[0]);
2123 2459
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2460 my ($value, $lo, $hi, $page) = @{$self->{range}};
2461 my $range = ($hi - $page - $lo) || 1e-100;
2125 2462
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2463 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2464
2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2465 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2466 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2129 2467
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2468 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2469 $value = $value * $self->{scale} + $self->{offset};
2132 2470
2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value; 2471 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2472 $self->{knob_w} = $knob_w;
2140 }); 2473 }
2141
2142 $self->SUPER::update;
2143}
2144
2145sub _draw {
2146 my ($self) = @_;
2147 2474
2148 $self->SUPER::_draw (); 2475 $self->SUPER::_draw ();
2149 2476
2150 glScale $self->{w}, $self->{h}; 2477 glScale $self->{w}, $self->{h};
2151 2478
… …
2171 glDisable GL_TEXTURE_2D; 2498 glDisable GL_TEXTURE_2D;
2172} 2499}
2173 2500
2174############################################################################# 2501#############################################################################
2175 2502
2503package CFClient::UI::ValSlider;
2504
2505our @ISA = CFClient::UI::HBox::;
2506
2507sub new {
2508 my ($class, %arg) = @_;
2509
2510 my $range = delete $arg{range};
2511
2512 my $self = $class->SUPER::new (
2513 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2514 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2515 to_value => sub { shift },
2516 from_value => sub { shift },
2517 %arg,
2518 );
2519
2520 $self->{slider}->connect (changed => sub {
2521 my ($self, $value) = @_;
2522 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2523 $self->{parent}->emit (changed => $value);
2524 });
2525
2526# $self->{entry}->connect (changed => sub {
2527# my ($self, $value) = @_;
2528# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2529# $self->{parent}->emit (changed => $value);
2530# });
2531
2532 $self->add ($self->{slider}, $self->{entry});
2533
2534 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2535
2536 $self
2537}
2538
2539sub set_range { shift->{slider}->set_range (@_) }
2540sub set_value { shift->{slider}->set_value (@_) }
2541
2542#############################################################################
2543
2176package CFClient::UI::TextView; 2544package CFClient::UI::TextScroller;
2177 2545
2178our @ISA = CFClient::UI::HBox::; 2546our @ISA = CFClient::UI::HBox::;
2179 2547
2180use CFClient::OpenGL; 2548use CFClient::OpenGL;
2181 2549
… …
2183 my $class = shift; 2551 my $class = shift;
2184 2552
2185 my $self = $class->SUPER::new ( 2553 my $self = $class->SUPER::new (
2186 fontsize => 1, 2554 fontsize => 1,
2187 can_events => 0, 2555 can_events => 0,
2556 indent => 0,
2188 #font => default_font 2557 #font => default_font
2189 @_, 2558 @_,
2190 2559
2191 layout => (new CFClient::Layout 1), 2560 layout => (new CFClient::Layout 1),
2192 par => [], 2561 par => [],
… …
2207 2576
2208 $self->{fontsize} = $fontsize; 2577 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2578 $self->reflow;
2210} 2579}
2211 2580
2212sub text_height { 2581sub size_request {
2582 my ($self) = @_;
2583
2584 my ($empty, $slider) = @{ $self->{children} };
2585
2586 local $self->{children} = [$empty, $slider];
2587 $self->SUPER::size_request
2588}
2589
2590sub invoke_size_allocate {
2591 my ($self, $w, $h) = @_;
2592
2593 my ($empty, $slider, @other) = @{ $self->{children} };
2594 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2595
2596 $self->{layout}->set_font ($self->{font}) if $self->{font};
2597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2598 $self->{layout}->set_width ($empty->{w});
2599 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2600
2601 $self->reflow;
2602
2603 local $self->{children} = [$empty, $slider];
2604 $self->SUPER::invoke_size_allocate ($w, $h)
2605}
2606
2607sub get_layout {
2213 my ($self, $text) = @_; 2608 my ($self, $para) = @_;
2214 2609
2215 my $layout = $self->{layout}; 2610 my $layout = $self->{layout};
2216 2611
2612 $layout->set_font ($self->{font}) if $self->{font};
2613 $layout->set_foreground (@{$para->{fg}});
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2614 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w}); 2615 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2616 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2219 $layout->set_markup ($text); 2617 $layout->set_markup ($para->{markup});
2618
2619 $layout->set_shapes (
2620 map
2621 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2622 @{$para->{widget}}
2220 2623 );
2221 ($layout->size)[1] 2624
2625 $layout
2222} 2626}
2223 2627
2224sub reflow { 2628sub reflow {
2225 my ($self) = @_; 2629 my ($self) = @_;
2226 2630
2227 $self->{need_reflow}++; 2631 $self->{need_reflow}++;
2228 $self->update; 2632 $self->update;
2229} 2633}
2230 2634
2231sub size_allocate { 2635sub set_offset {
2636 my ($self, $offset) = @_;
2637
2638 # todo: base offset on lines or so, not on pixels
2639 $self->{children}[1]->set_value ($offset);
2640}
2641
2642sub clear {
2232 my ($self, $w, $h) = @_; 2643 my ($self) = @_;
2233 2644
2234 $self->SUPER::size_allocate ($w, $h); 2645 my (undef, undef, @other) = @{ $self->{children} };
2646 $self->remove ($_) for @other;
2235 2647
2236 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2648 $self->{par} = [];
2237 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2649 $self->{height} = 0;
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 2650 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2239
2240 $self->reflow;
2241} 2651}
2242 2652
2243sub add_paragraph { 2653sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2654 my ($self, $color, $para, $indent) = @_;
2245 2655
2246 #TODO: intelligently "reformat" paragraph 2656 my ($text, @w) = ref $para ? @$para : $para;
2247 2657
2248 my $height = $self->text_height ($text); 2658 $para = {
2659 w => 1e10,
2660 wrapped => 1,
2661 fg => $color,
2662 indent => $indent,
2663 markup => $text,
2664 widget => \@w,
2665 };
2249 2666
2250 $self->{height} += $height; 2667 $self->add (@w) if @w;
2668 push @{$self->{par}}, $para;
2251 2669
2252 push @{$self->{par}}, [$height, $color, $text]; 2670 $self->{need_reflow}++;
2671 $self->update;
2672}
2253 2673
2254 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2674sub scroll_to_bottom {
2255 $self->{children}[1]->update; 2675 my ($self) = @_;
2676
2677 $self->{scroll_to_bottom} = 1;
2678 $self->update;
2256} 2679}
2257 2680
2258sub update { 2681sub update {
2259 my ($self) = @_; 2682 my ($self) = @_;
2260 2683
… …
2262 2685
2263 return unless $self->{h} > 0; 2686 return unless $self->{h} > 0;
2264 2687
2265 delete $self->{texture}; 2688 delete $self->{texture};
2266 2689
2267 $ROOT->on_post_alloc ($self, sub { 2690 $ROOT->on_post_alloc ($self => sub {
2691 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2692
2268 if (delete $self->{need_reflow}) { 2693 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2694 my $height = 0;
2270 2695
2271 $height += $_->[0] = $self->text_height ($_->[2])
2272 for @{$self->{par}}; 2696 for my $para (@{$self->{par}}) {
2697 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2698 my $layout = $self->get_layout ($para);
2699 my ($w, $h) = $layout->size;
2700
2701 $para->{w} = $w + $para->{indent};
2702 $para->{h} = $h;
2703 $para->{wrapped} = $layout->has_wrapped;
2704 }
2705
2706 $height += $para->{h};
2707 }
2273 2708
2274 $self->{height} = $height; 2709 $self->{height} = $height;
2275 2710
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2711 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2277 2712
2278 delete $self->{texture}; 2713 delete $self->{texture};
2279 } 2714 }
2280 2715
2716 if (delete $self->{scroll_to_bottom}) {
2717 $self->{children}[1]->set_value (1e10);
2718 }
2719
2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2720 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2721 glClearColor 0, 0, 0, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2722 glClear GL_COLOR_BUFFER_BIT;
2284 2723
2285 glEnable GL_TEXTURE_2D;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288 my $top = int $self->{children}[1]{range}[0]; 2724 my $top = int $self->{children}[1]{range}[0];
2289 2725
2290 my $y0 = $top; 2726 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2727 my $y1 = $top + $H;
2292 2728
2293 my $y = 0; 2729 my $y = 0;
2294 2730
2295 my $layout = $self->{layout}; 2731 glEnable GL_BLEND;
2732 #TODO# not correct in windows where rgba is forced off
2733 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2296 2734
2297 $layout->set_font ($self->{font}) if $self->{font};
2298
2299 for my $par (@{$self->{par}}) { 2735 for my $para (@{$self->{par}}) {
2300 my $h = $par->[0]; 2736 my $h = $para->{h};
2301 2737
2302 if ($y0 < $y + $h && $y < $y1) { 2738 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] });
2304 $layout->set_markup ($par->[2]);
2305 2739
2306 my ($W, $H) = $layout->size; 2740 my $layout = $self->get_layout ($para);
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2741
2742 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2743
2744 glRasterPos $para->{indent}, $y - $y0;
2745 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746
2747 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes;
2749
2750 glDisable GL_BLEND;
2751 for (@w) {
2752 my ($dx, $dy) = splice @s, 0, 2, ();
2753
2754 $_->{x} = $dx + $para->{indent};
2755 $_->{y} = $dy + $y - $y0;
2756
2757 $_->draw;
2758 }
2759 glEnable GL_BLEND;
2760 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761 }
2308 } 2762 }
2309 2763
2310 $y += $h; 2764 $y += $h;
2311 } 2765 }
2312 2766
2313 glDisable GL_TEXTURE_2D; 2767 glDisable GL_BLEND;
2314 }; 2768 };
2315 }); 2769 });
2316} 2770}
2317 2771
2772sub reconfigure {
2773 my ($self) = @_;
2774
2775 $self->SUPER::reconfigure;
2776
2777 $_->{w} = 1e10 for @{ $self->{par} };
2778 $self->reflow;
2779}
2780
2318sub _draw { 2781sub _draw {
2319 my ($self) = @_; 2782 my ($self) = @_;
2320 2783
2321 glEnable GL_TEXTURE_2D; 2784 glEnable GL_TEXTURE_2D;
2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2323 glColor 1, 1, 1, 1; 2786 glColor 0, 0, 0, 1;
2324 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2787 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2325 glDisable GL_TEXTURE_2D; 2788 glDisable GL_TEXTURE_2D;
2326 2789
2327 $self->{children}[1]->draw; 2790 $self->{children}[1]->draw;
2328
2329} 2791}
2330 2792
2331############################################################################# 2793#############################################################################
2332 2794
2333package CFClient::UI::Animator; 2795package CFClient::UI::Animator;
… …
2378 2840
2379sub new { 2841sub new {
2380 my $class = shift; 2842 my $class = shift;
2381 2843
2382 my $self = $class->SUPER::new ( 2844 my $self = $class->SUPER::new (
2383 state => 0, 2845 state => 0,
2384 connect_activate => \&toggle_flopper, 2846 on_activate => \&toggle_flopper,
2385 @_ 2847 @_
2386 ); 2848 );
2387 2849
2388 if ($self->{state}) {
2389 $self->{state} = 0;
2390 $self->toggle_flopper;
2391 }
2392
2393 $self 2850 $self
2394} 2851}
2395 2852
2396sub toggle_flopper { 2853sub toggle_flopper {
2397 my ($self) = @_; 2854 my ($self) = @_;
2398 2855
2399 # TODO: use animation 2856 $self->{other}->toggle_visibility;
2400 if ($self->{state} = !$self->{state}) {
2401 $CFClient::UI::ROOT->add ($self->{other});
2402 $self->{other}->move ($self->coord2global (0, $self->{h}));
2403 $self->emit ("open");
2404 } else {
2405 $CFClient::UI::ROOT->remove ($self->{other});
2406 $self->emit ("close");
2407 }
2408
2409 $self->emit (changed => $self->{state});
2410} 2857}
2411 2858
2412############################################################################# 2859#############################################################################
2413 2860
2414package CFClient::UI::Tooltip; 2861package CFClient::UI::Tooltip;
… …
2427} 2874}
2428 2875
2429sub set_tooltip_from { 2876sub set_tooltip_from {
2430 my ($self, $widget) = @_; 2877 my ($self, $widget) = @_;
2431 2878
2879 my $tooltip = $widget->{tooltip};
2880
2881 if ($ENV{CFPLUS_DEBUG} & 2) {
2882 $tooltip .= "\n\n" . (ref $widget) . "\n"
2883 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2884 . "req $widget->{req_w} $widget->{req_h}\n"
2885 . "visible $widget->{visible}";
2886 }
2887
2888 $tooltip =~ s/^\n+//;
2889 $tooltip =~ s/\n+$//;
2890
2432 $self->add (new CFClient::UI::Label 2891 $self->add (new CFClient::UI::Label
2433 markup => $widget->{tooltip}, 2892 markup => $tooltip,
2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2893 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8, 2894 fontsize => 0.8,
2436 fg => [0, 0, 0, 1], 2895 fg => [0, 0, 0, 1],
2437 ellipsise => 0, 2896 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP), 2897 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2445 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2904 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2446 2905
2447 ($w + 4, $h + 4) 2906 ($w + 4, $h + 4)
2448} 2907}
2449 2908
2450sub size_allocate { 2909sub invoke_size_allocate {
2451 my ($self, $w, $h) = @_; 2910 my ($self, $w, $h) = @_;
2452 2911
2453 $self->SUPER::size_allocate ($w - 4, $h - 4); 2912 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2913}
2914
2915sub invoke_visibility_change {
2916 my ($self, $visible) = @_;
2917
2918 return unless $visible;
2919
2920 $self->{root}->on_post_alloc ("move_$self" => sub {
2921 my $widget = $self->{owner}
2922 or return;
2923
2924 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2925
2926 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2927 if $x + $self->{w} > $self->{root}{w};
2928
2929 $self->move_abs ($x, $y);
2930 });
2454} 2931}
2455 2932
2456sub _draw { 2933sub _draw {
2457 my ($self) = @_; 2934 my ($self) = @_;
2458 2935
… …
2475 glVertex $w, $h; 2952 glVertex $w, $h;
2476 glVertex $w, 0; 2953 glVertex $w, 0;
2477 glEnd; 2954 glEnd;
2478 2955
2479 glTranslate 2 - 0.375, 2 - 0.375; 2956 glTranslate 2 - 0.375, 2 - 0.375;
2957
2480 $self->SUPER::_draw; 2958 $self->SUPER::_draw;
2481} 2959}
2482 2960
2483############################################################################# 2961#############################################################################
2484 2962
… …
2489use CFClient::OpenGL; 2967use CFClient::OpenGL;
2490 2968
2491sub new { 2969sub new {
2492 my $class = shift; 2970 my $class = shift;
2493 2971
2494 $class->SUPER::new ( 2972 my $self = $class->SUPER::new (
2495 aspect => 1, 2973 aspect => 1,
2974 can_events => 0,
2496 @_, 2975 @_,
2497 ) 2976 );
2977
2978 if ($self->{anim} && $self->{animspeed}) {
2979 Scalar::Util::weaken (my $widget = $self);
2980
2981 $self->{timer} = Event->timer (
2982 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2983 hard => 1,
2984 interval => $self->{animspeed},
2985 cb => sub {
2986 ++$widget->{frame};
2987 $widget->update;
2988 },
2989 );
2990 }
2991
2992 $self
2498} 2993}
2499 2994
2500sub size_request { 2995sub size_request {
2501 (32, 8) 2996 (32, 8)
2502} 2997}
2503 2998
2999sub update {
3000 my ($self) = @_;
3001
3002 return unless $self->{visible};
3003
3004 $self->SUPER::update;
3005}
3006
2504sub _draw { 3007sub _draw {
2505 my ($self) = @_; 3008 my ($self) = @_;
2506 3009
2507 return unless $::CONN;#d# manage and cache textures differently 3010 return unless $::CONN;
3011
3012 my $face;
3013
3014 if ($self->{frame}) {
3015 my $anim = $::CONN->{anim}[$self->{anim}];
3016
3017 $face = $anim->[ $self->{frame} % @$anim ]
3018 if $anim && @$anim;
3019 }
3020
2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3021 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2509 3022
2510 # TODO animation
2511 if ($tex) { 3023 if ($tex) {
2512 glEnable GL_TEXTURE_2D; 3024 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 3026 glColor 0, 0, 0, 1;
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3027 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516 glDisable GL_TEXTURE_2D; 3028 glDisable GL_TEXTURE_2D;
2517 } 3029 }
2518} 3030}
2519 3031
3032sub destroy {
3033 my ($self) = @_;
3034
3035 $self->{timer}->cancel
3036 if $self->{timer};
3037
3038 $self->SUPER::destroy;
3039}
3040
2520############################################################################# 3041#############################################################################
2521 3042
2522package CFClient::UI::InventoryItem; 3043package CFClient::UI::Buttonbar;
2523 3044
2524our @ISA = CFClient::UI::HBox::; 3045our @ISA = CFClient::UI::HBox::;
2525 3046
2526sub _item_to_desc { 3047# TODO: should actualyl wrap buttons and other goodies.
2527 my ($item) = @_;
2528
2529 my $desc =
2530 $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 $desc
2550}
2551
2552sub new {
2553 my $class = shift;
2554
2555 my %args = @_;
2556
2557 my $item = delete $args{item};
2558
2559 my $desc = _item_to_desc ($item);
2560
2561 my $self = $class->SUPER::new (
2562 can_hover => 1,
2563 can_events => 1,
2564 tooltip => ((CFClient::UI::Label::escape $desc)
2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2566 connect_button_down => sub {
2567 my ($self, $ev, $x, $y) = @_;
2568
2569 # todo: maybe put examine on 1? but should just be a tooltip :(
2570 if ($ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag};
2572
2573 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT;
2575 }
2576
2577 $::CONN->send ("move $targ $item->{tag} 0");
2578 } elsif ($ev->{button} == 2) {
2579 $::CONN->send ("apply $item->{tag}");
2580 } elsif ($ev->{button} == 3) {
2581 my @menu_items = (
2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586 [
2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588 sub { $::CONN->send ("lock $item->{tag}") },
2589 ],
2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593 }
2594
2595 1
2596 },
2597 %args
2598 );
2599
2600
2601 $self->add (new CFClient::UI::Face
2602 can_events => 0,
2603 face => $item->{face},
2604 anim => $item->{anim},
2605 animspeed => $item->{animspeed},
2606 );
2607
2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2609
2610 $self->{item} = $item;
2611
2612 $self->update_item;
2613
2614 $self
2615}
2616
2617sub update_item {
2618 my ($self) = @_;
2619
2620 my $desc = _item_to_desc ($self->{item});
2621
2622 $self->{name_lbl}->set_text ($desc);
2623}
2624
2625#############################################################################
2626
2627package CFClient::UI::Inventory;
2628
2629our @ISA = CFClient::UI::ScrolledWindow::;
2630
2631sub new {
2632 my $class = shift;
2633
2634 my $self = $class->SUPER::new (
2635 scrolled => (new CFClient::UI::VBox),
2636 @_,
2637 );
2638
2639 $self
2640}
2641
2642sub set_items {
2643 my ($self, $items) = @_;
2644
2645 $self->{scrolled}->clear;
2646 return unless $items;
2647
2648 my @items = sort {
2649 ($a->{type} <=> $b->{type})
2650 or ($a->{name} cmp $b->{name})
2651 } @$items;
2652
2653 $self->{real_items} = \@items;
2654
2655 for my $item (@items) {
2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2657 $item->update_item ();
2658 }
2659
2660 $self->{scrolled}->add (@items);
2661
2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2663}
2664
2665sub size_request {
2666 my ($self) = @_;
2667 ($self->{req_w}, $self->{req_h});
2668}
2669 3048
2670############################################################################# 3049#############################################################################
2671 3050
2672package CFClient::UI::Menu; 3051package CFClient::UI::Menu;
2673 3052
… …
2685 ); 3064 );
2686 3065
2687 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3066 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2688 3067
2689 for my $item (@{ $self->{items} }) { 3068 for my $item (@{ $self->{items} }) {
2690 my ($widget, $cb) = @$item; 3069 my ($widget, $cb, $tooltip) = @$item;
2691 3070
2692 # handle various types of items, only text for now 3071 # handle various types of items, only text for now
2693 if (!ref $widget) { 3072 if (!ref $widget) {
2694 $widget = new CFClient::UI::Label 3073 $widget = new CFClient::UI::Label
2695 can_hover => 1, 3074 can_hover => 1,
2696 can_events => 1, 3075 can_events => 1,
2697 text => $widget; 3076 markup => $widget,
3077 tooltip => $tooltip
2698 } 3078 }
2699 3079
2700 $self->{item}{$widget} = $item; 3080 $self->{item}{$widget} = $item;
2701 3081
2702 $self->{vbox}->add ($widget); 3082 $self->{vbox}->add ($widget);
… …
2714 # maybe save $GRAB? must be careful about events... 3094 # maybe save $GRAB? must be careful about events...
2715 $GRAB = $self; 3095 $GRAB = $self;
2716 $self->{button} = $ev->{button}; 3096 $self->{button} = $ev->{button};
2717 3097
2718 $self->show; 3098 $self->show;
2719 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3099 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2720} 3100}
2721 3101
2722sub mouse_motion { 3102sub invoke_mouse_motion {
2723 my ($self, $ev, $x, $y) = @_; 3103 my ($self, $ev, $x, $y) = @_;
2724 3104
2725 # TODO: should use vbox->find_widget or so 3105 # TODO: should use vbox->find_widget or so
2726 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3106 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2727 $self->{hover} = $self->{item}{$HOVER}; 3107 $self->{hover} = $self->{item}{$HOVER};
2728}
2729 3108
3109 0
3110}
3111
2730sub button_up { 3112sub invoke_button_up {
2731 my ($self, $ev, $x, $y) = @_; 3113 my ($self, $ev, $x, $y) = @_;
2732 3114
2733 if ($ev->{button} == $self->{button}) { 3115 if ($ev->{button} == $self->{button}) {
2734 undef $GRAB; 3116 undef $GRAB;
2735 $self->hide; 3117 $self->hide;
2736 3118
2737 $self->emit ("popdown"); 3119 $self->emit ("popdown");
2738 $self->{hover}[1]->() if $self->{hover}; 3120 $self->{hover}[1]->() if $self->{hover};
3121 } else {
3122 return 0
3123 }
3124
2739 } 3125 1
2740} 3126}
2741 3127
2742############################################################################# 3128#############################################################################
2743 3129
2744package CFClient::UI::Statusbox; 3130package CFClient::UI::Multiplexer;
2745 3131
2746our @ISA = CFClient::UI::VBox::; 3132our @ISA = CFClient::UI::Container::;
2747 3133
2748sub new { 3134sub new {
2749 my $class = shift; 3135 my $class = shift;
2750 3136
2751 $class->SUPER::new ( 3137 my $self = $class->SUPER::new (
3138 @_,
3139 );
3140
3141 $self->{current} = $self->{children}[0]
3142 if @{ $self->{children} };
3143
3144 $self
3145}
3146
3147sub add {
3148 my ($self, @widgets) = @_;
3149
3150 $self->SUPER::add (@widgets);
3151
3152 $self->{current} = $self->{children}[0]
3153 if @{ $self->{children} };
3154}
3155
3156sub set_current_page {
3157 my ($self, $page_or_widget) = @_;
3158
3159 my $widget = ref $page_or_widget
3160 ? $page_or_widget
3161 : $self->{children}[$page_or_widget];
3162
3163 $self->{current} = $widget;
3164 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3165
3166 $self->emit (page_changed => $self->{current});
3167
3168 $self->realloc;
3169}
3170
3171sub visible_children {
3172 $_[0]{current}
3173}
3174
3175sub size_request {
3176 my ($self) = @_;
3177
3178 $self->{current}->size_request
3179}
3180
3181sub invoke_size_allocate {
3182 my ($self, $w, $h) = @_;
3183
3184 $self->{current}->configure (0, 0, $w, $h);
3185
3186 1
3187}
3188
3189sub _draw {
3190 my ($self) = @_;
3191
3192 $self->{current}->draw;
3193}
3194
3195#############################################################################
3196
3197package CFClient::UI::Notebook;
3198
3199our @ISA = CFClient::UI::VBox::;
3200
3201sub new {
3202 my $class = shift;
3203
3204 my $self = $class->SUPER::new (
3205 buttonbar => (new CFClient::UI::Buttonbar),
3206 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3207 # filter => # will be put between multiplexer and $self
3208 @_,
3209 );
3210
3211 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3212 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3213
3214 $self
3215}
3216
3217sub add {
3218 my ($self, $title, $widget, $tooltip) = @_;
3219
3220 Scalar::Util::weaken $self;
3221
3222 $self->{buttonbar}->add (new CFClient::UI::Button
3223 markup => $title,
3224 tooltip => $tooltip,
3225 on_activate => sub { $self->set_current_page ($widget) },
3226 );
3227
3228 $self->{multiplexer}->add ($widget);
3229}
3230
3231sub set_current_page {
3232 my ($self, $page) = @_;
3233
3234 $self->{multiplexer}->set_current_page ($page);
3235 $self->emit (page_changed => $self->{multiplexer}{current});
3236}
3237
3238#############################################################################
3239
3240package CFClient::UI::Combobox;
3241
3242use utf8;
3243
3244our @ISA = CFClient::UI::Button::;
3245
3246sub new {
3247 my $class = shift;
3248
3249 my $self = $class->SUPER::new (
3250 options => [], # [value, title, longdesc], ...
3251 value => undef,
3252 @_,
3253 );
3254
3255 $self->_set_value ($self->{value});
3256
3257 $self
3258}
3259
3260sub invoke_button_down {
3261 my ($self, $ev) = @_;
3262
3263 my @menu_items;
3264
3265 for (@{ $self->{options} }) {
3266 my ($value, $title, $tooltip) = @$_;
3267
3268 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3269 }
3270
3271 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3272}
3273
3274sub _set_value {
3275 my ($self, $value) = @_;
3276
3277 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3278 or return;
3279
3280 $self->{value} = $item->[0];
3281 $self->set_markup ("$item->[1] ⇓");
3282 $self->set_tooltip ($item->[2]);
3283}
3284
3285sub set_value {
3286 my ($self, $value) = @_;
3287
3288 return unless $self->{value} ne $value;
3289
3290 $self->_set_value ($value);
3291 $self->emit (changed => $value);
3292}
3293
3294#############################################################################
3295
3296package CFClient::UI::Statusbox;
3297
3298our @ISA = CFClient::UI::VBox::;
3299
3300sub new {
3301 my $class = shift;
3302
3303 my $self = $class->SUPER::new (
2752 fontsize => 0.8, 3304 fontsize => 0.8,
2753 @_, 3305 @_,
2754 ) 3306 );
3307
3308 Scalar::Util::weaken (my $this = $self);
3309
3310 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3311
3312 $self
2755} 3313}
2756 3314
2757sub reorder { 3315sub reorder {
2758 my ($self) = @_; 3316 my ($self) = @_;
2759 my $NOW = time; 3317 my $NOW = Time::HiRes::time;
3318
3319 # freeze display when hovering over any label
3320 return if $CFClient::UI::TOOLTIP->{owner}
3321 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3322 values %{ $self->{item} };
2760 3323
2761 while (my ($k, $v) = each %{ $self->{item} }) { 3324 while (my ($k, $v) = each %{ $self->{item} }) {
2762 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3325 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2763 } 3326 }
2764 3327
… …
2767 my @items = sort { 3330 my @items = sort {
2768 $a->{pri} <=> $b->{pri} 3331 $a->{pri} <=> $b->{pri}
2769 or $b->{id} <=> $a->{id} 3332 or $b->{id} <=> $a->{id}
2770 } values %{ $self->{item} }; 3333 } values %{ $self->{item} };
2771 3334
3335 $self->{timer}->interval (1);
3336
2772 my $count = 10 + 1; 3337 my $count = 10 + 1;
2773 for my $item (@items) { 3338 for my $item (@items) {
2774 last unless --$count; 3339 last unless --$count;
2775 3340
2776 push @widgets, $item->{label} ||= do { 3341 my $label = $item->{label} ||= do {
2777 # TODO: doesn't handle markup well (read as: at all) 3342 # TODO: doesn't handle markup well (read as: at all)
2778 my $short = $item->{count} > 1 3343 my $short = $item->{count} > 1
2779 ? "<b>$item->{count} ×</b> $item->{text}" 3344 ? "<b>$item->{count} ×</b> $item->{text}"
2780 : $item->{text}; 3345 : $item->{text};
2781 3346
… …
2789 tooltip => $item->{tooltip}, 3354 tooltip => $item->{tooltip},
2790 tooltip_font => $::FONT_PROP, 3355 tooltip_font => $::FONT_PROP,
2791 tooltip_width => 0.67, 3356 tooltip_width => 0.67,
2792 fontsize => $item->{fontsize} || $self->{fontsize}, 3357 fontsize => $item->{fontsize} || $self->{fontsize},
2793 max_w => $::WIDTH * 0.44, 3358 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg}, 3359 fg => [@{ $item->{fg} }],
2795 can_events => 1, 3360 can_events => 1,
2796 can_hover => 1 3361 can_hover => 1
2797 }; 3362 };
3363
3364 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3365 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3366 $label->update;
3367 $label->set_max_size (undef, $label->{req_h} * $diff)
3368 if $diff < 1;
3369 $self->{timer}->interval (1/30);
3370 } else {
3371 $label->{fg}[3] = $item->{fg}[3] || 1;
3372 }
3373
3374 push @widgets, $label;
2798 } 3375 }
2799 3376
2800 $self->clear; 3377 $self->clear;
2801 $self->SUPER::add (reverse @widgets); 3378 $self->SUPER::add (reverse @widgets);
2802} 3379}
… …
2805 my ($self, $text, %arg) = @_; 3382 my ($self, $text, %arg) = @_;
2806 3383
2807 $text =~ s/^\s+//; 3384 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 3385 $text =~ s/\s+$//;
2809 3386
3387 return unless $text;
3388
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 3389 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2811 3390
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3391 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 3392
2814 if (my $item = $self->{item}{$group}) { 3393 if (my $item = $self->{item}{$group}) {
2815 if ($item->{text} eq $text) { 3394 if ($item->{text} eq $text) {
2816 $item->{count}++; 3395 $item->{count}++;
2817 } else { 3396 } else {
2818 $item->{count} = 1; 3397 $item->{count} = 1;
2819 $item->{text} = $item->{tooltip} = $text; 3398 $item->{text} = $item->{tooltip} = $text;
2820 } 3399 }
2821 $item->{id} = ++$self->{id}; 3400 $item->{id} += 0.2;#d#
2822 $item->{timeout} = $timeout; 3401 $item->{timeout} = $timeout;
2823 delete $item->{label}; 3402 delete $item->{label};
2824 } else { 3403 } else {
2825 $self->{item}{$group} = { 3404 $self->{item}{$group} = {
2826 id => ++$self->{id}, 3405 id => ++$self->{id},
… …
2832 count => 1, 3411 count => 1,
2833 %arg, 3412 %arg,
2834 }; 3413 };
2835 } 3414 }
2836 3415
3416 $ROOT->on_refresh (reorder => sub {
2837 $self->reorder; 3417 $self->reorder;
3418 });
2838} 3419}
2839 3420
2840sub reconfigure { 3421sub reconfigure {
2841 my ($self) = @_; 3422 my ($self) = @_;
2842 3423
… …
2845 3426
2846 $self->reorder; 3427 $self->reorder;
2847 $self->SUPER::reconfigure; 3428 $self->SUPER::reconfigure;
2848} 3429}
2849 3430
3431sub destroy {
3432 my ($self) = @_;
3433
3434 $self->{timer}->cancel;
3435
3436 $self->SUPER::destroy;
3437}
3438
2850############################################################################# 3439#############################################################################
2851 3440
2852package CFClient::UI::Root; 3441package CFClient::UI::Inventory;
2853 3442
2854our @ISA = CFClient::UI::Container::; 3443our @ISA = CFClient::UI::ScrolledWindow::;
2855
2856use CFClient::OpenGL;
2857 3444
2858sub new { 3445sub new {
2859 my $class = shift; 3446 my $class = shift;
2860 3447
2861 $class->SUPER::new ( 3448 my $self = $class->SUPER::new (
3449 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3450 @_,
3451 );
3452
3453 $self
3454}
3455
3456sub set_items {
3457 my ($self, $items) = @_;
3458
3459 $self->{child}->clear;
3460 return unless $items;
3461
3462 my @items = sort {
3463 ($a->{type} <=> $b->{type})
3464 or ($a->{name} cmp $b->{name})
3465 } values %$items;
3466
3467 $self->{real_items} = \@items;
3468
3469 my $row = 0;
3470 for my $item (@items) {
3471 CFClient::Item::update_widgets $item;
3472
3473 $self->{child}->add (0, $row, $item->{face_widget});
3474 $self->{child}->add (1, $row, $item->{desc_widget});
3475 $self->{child}->add (2, $row, $item->{weight_widget});
3476
3477 $row++;
3478 }
3479}
3480
3481#############################################################################
3482
3483package CFClient::UI::SpellList;
3484
3485our @ISA = CFClient::UI::Table::;
3486
3487sub new {
3488 my $class = shift;
3489
3490 my $self = $class->SUPER::new (
3491 binding => [],
3492 commands => [],
2862 @_, 3493 @_,
2863 ) 3494 )
2864} 3495}
2865 3496
2866sub configure { 3497my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2867 my ($self, $x, $y, $w, $h) = @_;
2868 3498
2869 $self->{w} = $w; 3499my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2870 $self->{h} = $h; 3500 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2871} 3501my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3502 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3503my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3504 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3505my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3506 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3507my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3508 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
2872 3509
2873sub check_size { 3510sub rebuild_spell_list {
3511 my ($self) = @_;
3512
3513 $CFClient::UI::ROOT->on_refresh ($self => sub {
3514 $self->clear;
3515
3516 return unless $::CONN;
3517
3518 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3519 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3520 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3521 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3522 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3523
3524 my $row = 0;
3525
3526 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3527 my $spell = $self->{spell}{$_};
3528
3529 $row++;
3530
3531 my $spell_cb = sub {
3532 my ($widget, $ev) = @_;
3533
3534 if ($ev->{button} == 1) {
3535 $::CONN->user_send ("cast $spell->{name}");
3536 } elsif ($ev->{button} == 2) {
3537 $::CONN->user_send ("invoke $spell->{name}");
3538 } elsif ($ev->{button} == 3) {
3539 (new CFClient::UI::Menu
3540 items => [
3541 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3542 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3543 ],
3544 )->popup ($ev);
3545 } else {
3546 return 0;
3547 }
3548
3549 1
3550 };
3551
3552 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3553
3554 #TODO: add path info to tooltip
3555 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3556
3557 $self->add (0, $row, new CFClient::UI::Face
3558 face => $spell->{face},
3559 can_hover => 1,
3560 can_events => 1,
3561 tooltip => $tooltip,
3562 on_button_down => $spell_cb,
3563 );
3564
3565 $self->add (1, $row, new CFClient::UI::Label
3566 expand => 1,
3567 text => $spell->{name},
3568 can_hover => 1,
3569 can_events => 1,
3570 tooltip => $tooltip,
3571 on_button_down => $spell_cb,
3572 );
3573
3574 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3575 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3576 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3577 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3578 }
3579 });
3580}
3581
3582sub add_spell {
2874 my ($self) = @_; 3583 my ($self, $spell) = @_;
2875 3584
2876 $self->size_allocate ($self->{w}, $self->{h}) 3585 $self->{spell}->{$spell->{name}} = $spell;
2877 if $self->{w}; 3586 $self->rebuild_spell_list;
3587}
3588
3589sub remove_spell {
3590 my ($self, $spell) = @_;
3591
3592 delete $self->{spell}->{$spell->{name}};
3593 $self->rebuild_spell_list;
3594}
3595
3596sub clear_spells {
3597 my ($self) = @_;
3598
3599 $self->{spell} = {};
3600 $self->rebuild_spell_list;
3601}
3602
3603#############################################################################
3604
3605package CFClient::UI::Root;
3606
3607our @ISA = CFClient::UI::Container::;
3608
3609use List::Util qw(min max);
3610
3611use CFClient::OpenGL;
3612
3613sub new {
3614 my $class = shift;
3615
3616 my $self = $class->SUPER::new (
3617 visible => 1,
3618 @_,
3619 );
3620
3621 Scalar::Util::weaken ($self->{root} = $self);
3622
3623 $self
2878} 3624}
2879 3625
2880sub size_request { 3626sub size_request {
2881 my ($self) = @_; 3627 my ($self) = @_;
2882 3628
2883 ($self->{w}, $self->{h}) 3629 ($self->{w}, $self->{h})
2884} 3630}
2885 3631
3632sub _to_pixel {
3633 my ($coord, $size, $max) = @_;
3634
3635 $coord =
3636 $coord eq "center" ? ($max - $size) * 0.5
3637 : $coord eq "max" ? $max
3638 : $coord;
3639
3640 $coord = 0 if $coord < 0;
3641 $coord = $max - $size if $coord > $max - $size;
3642
3643 int $coord + 0.5
3644}
3645
2886sub size_allocate { 3646sub invoke_size_allocate {
2887 my ($self, $w, $h) = @_; 3647 my ($self, $w, $h) = @_;
2888
2889 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2890 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2891
2892 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2893 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2894 3648
2895 for my $child ($self->children) { 3649 for my $child ($self->children) {
2896 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3650 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2897 3651
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3652 $X = $child->{force_x} if exists $child->{force_x};
2899 if exists $child->{req_x}; 3653 $Y = $child->{force_y} if exists $child->{force_y};
2900 3654
2901 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3655 $X = _to_pixel $X, $W, $self->{w};
2902 if exists $child->{req_y}; 3656 $Y = _to_pixel $Y, $H, $self->{h};
2903
2904 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2905 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906 3657
2907 $child->configure ($X, $Y, $W, $H); 3658 $child->configure ($X, $Y, $W, $H);
2908 } 3659 }
3660
3661 1
2909} 3662}
2910 3663
2911sub coord2local { 3664sub coord2local {
2912 my ($self, $x, $y) = @_; 3665 my ($self, $x, $y) = @_;
2913 3666
… …
2921} 3674}
2922 3675
2923sub update { 3676sub update {
2924 my ($self) = @_; 3677 my ($self) = @_;
2925 3678
2926 $self->check_size;
2927 $::WANT_REFRESH++; 3679 $::WANT_REFRESH++;
2928} 3680}
2929 3681
2930sub add { 3682sub add {
2931 my ($self, @children) = @_; 3683 my ($self, @children) = @_;
2932 3684
2933 for my $child (@children) {
2934 $child->{toplevel} = 1; 3685 $_->{is_toplevel} = 1
2935 3686 for @children;
2936 # integerise window positions
2937 $child->{x} = int $child->{x};
2938 $child->{y} = int $child->{y};
2939 }
2940 3687
2941 $self->SUPER::add (@children); 3688 $self->SUPER::add (@children);
3689}
3690
3691sub remove {
3692 my ($self, @children) = @_;
3693
3694 $self->SUPER::remove (@children);
3695
3696 delete $self->{is_toplevel}
3697 for @children;
3698
3699 while (@children) {
3700 my $w = pop @children;
3701 push @children, $w->children;
3702 $w->set_invisible;
3703 }
2942} 3704}
2943 3705
2944sub on_refresh { 3706sub on_refresh {
2945 my ($self, $id, $cb) = @_; 3707 my ($self, $id, $cb) = @_;
2946 3708
… …
2959 while ($self->{refresh_hook}) { 3721 while ($self->{refresh_hook}) {
2960 $_->() 3722 $_->()
2961 for values %{delete $self->{refresh_hook}}; 3723 for values %{delete $self->{refresh_hook}};
2962 } 3724 }
2963 3725
2964 if ($self->{check_size}) { 3726 if ($self->{realloc}) {
2965 my @queue = ([], []); 3727 my %queue;
3728 my @queue;
3729 my $widget;
2966 3730
2967 for (;;) { 3731 outer:
2968 if ($self->{check_size}) { 3732 while () {
2969 # heuristic: check containers last 3733 if (my $realloc = delete $self->{realloc}) {
2970 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3734 for $widget (values %$realloc) {
2971 for values %{delete $self->{check_size}} 3735 $widget->{visible} or next; # do not resize invisible widgets
3736
3737 $queue{$widget+0}++ and next; # duplicates are common
3738
3739 push @{ $queue[$widget->{visible}] }, $widget;
3740 }
2972 } 3741 }
2973 3742
2974 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3743 while () {
3744 @queue or last outer;
2975 3745
2976 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3746 $widget = pop @{ $queue[-1] || [] }
2977 ? @$widget{qw(user_w user_h)} 3747 and last;
2978 : $widget->size_request;
2979
2980 if (delete $widget->{force_alloc}
2981 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2982 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2983 3748
3749 pop @queue;
3750 }
3751
3752 delete $queue{$widget+0};
3753
3754 my ($w, $h) = $widget->size_request;
3755
3756 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3757 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3758
3759 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3760 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3761
3762 $w = $widget->{force_w} if exists $widget->{force_w};
3763 $h = $widget->{force_h} if exists $widget->{force_h};
3764
3765 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3766 || delete $widget->{force_realloc}) {
2984 $widget->{req_w} = $w; 3767 $widget->{req_w} = $w;
2985 $widget->{req_h} = $h; 3768 $widget->{req_h} = $h;
2986 3769
2987 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3770 $self->{size_alloc}{$widget+0} = $widget;
2988 3771
2989 $widget->{parent}->check_size
2990 if $widget->{parent}; 3772 if (my $parent = $widget->{parent}) {
3773 $self->{realloc}{$parent+0} = $parent
3774 unless $queue{$parent+0};
3775
3776 $parent->{force_size_alloc} = 1;
3777 $self->{size_alloc}{$parent+0} = $parent;
3778 }
2991 } 3779 }
3780
3781 delete $self->{realloc}{$widget+0};
2992 } 3782 }
2993 } 3783 }
2994 3784
2995 while ($self->{size_alloc}) { 3785 while (my $size_alloc = delete $self->{size_alloc}) {
2996 for (values %{delete $self->{size_alloc}}) { 3786 my @queue = sort { $b->{visible} <=> $a->{visible} }
2997 my ($widget, $w, $h) = @$_; 3787 values %$size_alloc;
3788
3789 while () {
3790 my $widget = pop @queue || last;
3791
3792 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2998 3793
2999 $w = 0 if $w < 0; 3794 $w = 0 if $w < 0;
3000 $h = 0 if $h < 0; 3795 $h = 0 if $h < 0;
3001 3796
3797 $w = int $w + 0.5;
3798 $h = int $h + 0.5;
3799
3800 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3801 $widget->{old_w} = $widget->{w};
3802 $widget->{old_h} = $widget->{h};
3803
3002 $widget->{w} = $w; 3804 $widget->{w} = $w;
3003 $widget->{h} = $h; 3805 $widget->{h} = $h;
3004 $widget->size_allocate ($w, $h); 3806
3005 $widget->emit (size_allocate => $w, $h); 3807 $widget->emit (size_allocate => $w, $h);
3808 }
3006 } 3809 }
3007 } 3810 }
3008 3811
3009 while ($self->{post_alloc_hook}) { 3812 while ($self->{post_alloc_hook}) {
3010 $_->() 3813 $_->()
3011 for values %{delete $self->{post_alloc_hook}}; 3814 for values %{delete $self->{post_alloc_hook}};
3012 } 3815 }
3013 3816
3817
3014 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3818 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3819 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016 glClear GL_COLOR_BUFFER_BIT; 3820 glClear GL_COLOR_BUFFER_BIT;
3017 3821
3018 glMatrixMode GL_PROJECTION; 3822 glMatrixMode GL_PROJECTION;
3019 glLoadIdentity; 3823 glLoadIdentity;
3020 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3824 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021 glMatrixMode GL_MODELVIEW; 3825 glMatrixMode GL_MODELVIEW;
3022 glLoadIdentity; 3826 glLoadIdentity;
3023 3827
3828 {
3829 package CFClient::UI::Base;
3830
3831 ($draw_x, $draw_y, $draw_w, $draw_h) =
3832 (0, 0, $self->{w}, $self->{h});
3833 }
3834
3024 $self->_draw; 3835 $self->_draw;
3025} 3836}
3026 3837
3027############################################################################# 3838#############################################################################
3028 3839

Diff Legend

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