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.182 by root, Sun Apr 30 11:17:08 2006 UTC vs.
Revision 1.266 by root, Thu Jun 1 03:42:58 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
15 18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
16sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
17 if (!$GRAB) { 47 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
22 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
23 54
24 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
25 56
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 58
28 $TOOLTIP->set_markup ($widget->{tooltip}); 59 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 60 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 } 61 }
40 62
41 return; 63 return;
42 } 64 }
43 } 65 }
… …
47 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
48} 70}
49 71
50# class methods for events 72# class methods for events
51sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 75 if $FOCUS;
54} 76}
55 77
56sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 80 if $FOCUS;
59} 81}
60 82
61sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
62 my ($ev) = @_; 84 my ($ev) = @_;
… …
71 check_tooltip; 93 check_tooltip;
72 } 94 }
73 95
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 97
76 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 100}
81 101
82sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
83 my ($ev) = @_; 103 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
85 105
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 107
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 109
90 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 112
95 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 115 $grab->update if $grab;
98 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 133
116 check_tooltip; 134 check_tooltip;
117 } 135 }
118 136
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 138 if $HOVER;
123} 139}
124 140
125# convert position array to integers 141# convert position array to integers
126sub harmonize { 142sub harmonize {
127 my ($vals) = @_; 143 my ($vals) = @_;
… …
133 $rem += $_ - $i; 149 $rem += $_ - $i;
134 $_ = $i; 150 $_ = $i;
135 } 151 }
136} 152}
137 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) {
176 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
189 }
190 }
191
192 reconfigure_widgets;
193}
194
138############################################################################# 195#############################################################################
139 196
140package CFClient::UI::Base; 197package CFClient::UI::Base;
141 198
142use strict; 199use strict;
… …
145 202
146sub new { 203sub new {
147 my $class = shift; 204 my $class = shift;
148 205
149 my $self = bless { 206 my $self = bless {
150 x => 0, 207 x => "center",
151 y => 0, 208 y => "center",
152 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
153 can_events => 1, 212 can_events => 1,
154 @_ 213 @_
155 }, $class; 214 }, $class;
156 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
157 for (keys %$self) { 218 for (keys %$self) {
158 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
160 } 221 }
161 } 222 }
162 223
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
235
163 $self 236 $self
164} 237}
165 238
166sub destroy { 239sub destroy {
167 my ($self) = @_; 240 my ($self) = @_;
… …
176 return if $self->{parent}; 249 return if $self->{parent};
177 250
178 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
179} 252}
180 253
181sub hide { 254sub set_visible {
182 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
183 278
184 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
186 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
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
187 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
188 if $self->{parent}; 313 if $self->{parent};
189} 314}
190 315
191sub move { 316sub move_abs {
192 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
193 318
194 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
195 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
196 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
197 322
198 $self->update; 323 $self->update;
199} 324}
200 325
201sub set_size { 326sub set_size {
202 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
203 328
204 $self->{user_w} = $w; 329 $self->{force_w} = $w;
205 $self->{user_h} = $h; 330 $self->{force_h} = $h;
206 331
207 $self->check_size; 332 $self->realloc;
208} 333}
209 334
210sub size_request { 335sub size_request {
211 require Carp; 336 require Carp;
212 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
214 339
215sub configure { 340sub configure {
216 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
217 342
218 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
219 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
221 348
222 # use alignment to adjust x, y 349 # use alignment to adjust x, y
223 350
224 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
225 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
226
227 ($w, $h) = ($w2, $h2);
228 } 353 }
229 354
230 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
231 $self->{x} = $x; 356 $self->{x} = $x;
232 $self->{y} = $y; 357 $self->{y} = $y;
233 $self->update; 358 $self->update;
234 } 359 }
235 360
236 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
362 return unless $self->{visible};
363
237 $self->{w} = $w; 364 $self->{alloc_w} = $w;
238 $self->{h} = $h; 365 $self->{alloc_h} = $h;
239 366
240 $self->size_allocate ($w, $h); 367 $self->{root}{size_alloc}{$self+0} = $self;
241 $self->update;
242 $self->emit (size_allocate => $w, $h);
243 } 368 }
244} 369}
245 370
246sub size_allocate { 371sub size_allocate {
247 # nothing to be done 372 # nothing to be done
248} 373}
249 374
250sub children { 375sub children {
251} 376}
252 377
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $_->check_size;
261}
262
263sub set_max_size { 378sub set_max_size {
264 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
265 380
266 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
267 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
268} 383}
269 384
270# return top left coordinates 385sub set_tooltip {
271sub _topleft {
272 my ($self, $x, $y) = @_; 386 my ($self, $tooltip) = @_;
273 387
274 $self->{parent} 388 $tooltip =~ s/^\s+//;
275 or Carp::confess "no parent widget in _topleft\n";#d# 389 $tooltip =~ s/\s+$//;
276 390
277 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 391 return if $self->{tooltip} eq $tooltip;
392
393 $self->{tooltip} = $tooltip;
394
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip;
398 }
278} 399}
279 400
280# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
281sub coord2local { 402sub coord2local {
282 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
283 404
284 my ($X, $Y) = $self->_topleft; 405 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285 ($x - $X, $y - $Y)
286} 406}
287 407
288# translate local coordinates to global coordinate system 408# translate local coordinates to global coordinate system
289sub coord2global { 409sub coord2global {
290 my ($self, $x, $y) = @_; 410 my ($self, $x, $y) = @_;
291 411
292 my ($X, $Y) = $self->_topleft; 412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293 ($x + $X, $y + $Y)
294} 413}
295 414
296sub focus_in { 415sub focus_in {
297 my ($self) = @_; 416 my ($self) = @_;
298 417
299 return if $FOCUS == $self; 418 return if $FOCUS == $self;
300 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
301 420
302 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
303 422
304 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
305 424
306 $focus->update if $focus; 425 $focus->update if $focus;
307 $FOCUS->update; 426 $FOCUS->update;
308} 427}
309 428
… …
312 431
313 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
314 433
315 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
316 435
317 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
318 437
319 $focus->update if $focus; #? 438 $focus->update if $focus; #?
439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
320} 442}
321 443
322sub mouse_motion { } 444sub mouse_motion { }
323sub button_up { } 445sub button_up { }
324sub key_down { } 446sub key_down { }
325sub key_up { } 447sub key_up { }
326 448
327sub button_down { 449sub button_down {
328 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
329 451
330 $self->focus_in; 452 $self->focus_in;
… …
333sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
334sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
335sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
336sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
337sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 459sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
460
461sub find_widget {
462 my ($self, $x, $y) = @_;
463
464 return () unless $self->{can_events};
465
466 return $self
467 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
468 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
469
470 ()
471}
472
473sub set_parent {
474 my ($self, $parent) = @_;
475
476 Scalar::Util::weaken ($self->{parent} = $parent);
477 $self->set_visible if $parent->{visible};
478}
479
480sub connect {
481 my ($self, $signal, $cb) = @_;
482
483 push @{ $self->{signal_cb}{$signal} }, $cb;
484}
485
486sub _emit {
487 my ($self, $signal, @args) = @_;
488
489 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
490}
491
492sub emit {
493 my ($self, $signal, @args) = @_;
494
495 $self->_emit ($signal, @args)
496 || $self->$signal (@args);
497}
498
499sub visibility_change {
500 #my ($self, $visible) = @_;
501}
502
503sub realloc {
504 my ($self) = @_;
505
506 if ($self->{visible}) {
507 return if $self->{root}{realloc}{$self+0};
508
509 $self->{root}{realloc}{$self+0} = $self;
510 $self->{root}->update;
511 } else {
512 delete $self->{req_w};
513 delete $self->{req_h};
514 }
515}
516
517sub update {
518 my ($self) = @_;
519
520 $self->{parent}->update
521 if $self->{parent};
522}
523
524sub reconfigure {
525 my ($self) = @_;
526
527 $self->realloc;
528 $self->update;
529}
338 530
339sub draw { 531sub draw {
340 my ($self) = @_; 532 my ($self) = @_;
341 533
342 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
… …
359 glVertex $x , $y + $self->{h}; 551 glVertex $x , $y + $self->{h};
360 glEnd; 552 glEnd;
361 glDisable GL_BLEND; 553 glDisable GL_BLEND;
362 } 554 }
363 555
364 if ($ENV{PCLIENT_DEBUG}) { 556 if ($ENV{CFPLUS_DEBUG} & 1) {
365 glPushMatrix; 557 glPushMatrix;
366 glColor 1, 1, 0, 1; 558 glColor 1, 1, 0, 1;
367 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 559 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
368 glBegin GL_LINE_LOOP; 560 glBegin GL_LINE_LOOP;
369 glVertex 0 , 0; 561 glVertex 0 , 0;
370 glVertex $self->{w}, 0; 562 glVertex $self->{w} - 1, 0;
371 glVertex $self->{w}, $self->{h}; 563 glVertex $self->{w} - 1, $self->{h} - 1;
372 glVertex 0 , $self->{h}; 564 glVertex 0 , $self->{h} - 1;
373 glEnd; 565 glEnd;
374 glPopMatrix; 566 glPopMatrix;
375 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 567 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
376 } 568 }
377} 569}
378 570
379sub _draw { 571sub _draw {
380 my ($self) = @_; 572 my ($self) = @_;
381 573
382 warn "no draw defined for $self\n"; 574 warn "no draw defined for $self\n";
383} 575}
384 576
385sub find_widget {
386 my ($self, $x, $y) = @_;
387
388 return () unless $self->{can_events};
389
390 return $self
391 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
392 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
393
394 ()
395}
396
397sub set_parent {
398 my ($self, $parent) = @_;
399
400 Scalar::Util::weaken ($self->{parent} = $parent);
401}
402
403sub check_size {
404 my ($self) = @_;
405
406 $self->{parent}
407 or return 1;
408
409 my ($w, $h) = $self->{user_w} && $self->{user_h}
410 ? @$self{qw(user_w user_h)}
411 : $self->size_request;
412
413 if ($w != $self->{req_w} || $h != $self->{req_h}) {
414 $self->{req_w} = $w;
415 $self->{req_h} = $h;
416
417 $self->{parent}->check_size
418 or $self->size_allocate (
419 (List::Util::max $self->{w}, $w),
420 (List::Util::max $self->{h}, $h),
421 );
422
423 1
424 } else {
425 0
426 }
427}
428
429sub update {
430 my ($self) = @_;
431
432 $self->{parent}->update
433 if $self->{parent};
434}
435
436sub connect {
437 my ($self, $signal, $cb) = @_;
438
439 push @{ $self->{signal_cb}{$signal} }, $cb;
440}
441
442sub emit {
443 my ($self, $signal, @args) = @_;
444
445 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
446}
447
448sub DESTROY { 577sub DESTROY {
449 my ($self) = @_; 578 my ($self) = @_;
450 579
580 delete $WIDGET{$self+0};
451 #$self->deactivate; 581 #$self->deactivate;
452} 582}
453 583
454############################################################################# 584#############################################################################
455 585
… …
464 my $class = shift; 594 my $class = shift;
465 595
466 # range [value, low, high, page] 596 # range [value, low, high, page]
467 597
468 $class->SUPER::new ( 598 $class->SUPER::new (
469 bg => [0, 0, 0, 0.2], 599 #bg => [0, 0, 0, 0.2],
470 active_bg => [1, 1, 1, 0.5], 600 #active_bg => [1, 1, 1, 0.5],
471 @_ 601 @_
472 ) 602 )
473} 603}
474 604
475sub _draw { 605sub _draw {
476 my ($self) = @_; 606 my ($self) = @_;
477 607
608 my $color = $FOCUS == $self && $self->{active_bg}
609 ? $self->{active_bg}
610 : $self->{bg};
611
612 if ($color && (@$color < 4 || $color->[3])) {
478 my ($w, $h) = @$self{qw(w h)}; 613 my ($w, $h) = @$self{qw(w h)};
479 614
480 glEnable GL_BLEND; 615 glEnable GL_BLEND;
481 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 616 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
482 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 617 glColor @$color;
483 618
484 glBegin GL_QUADS; 619 glBegin GL_QUADS;
485 glVertex 0 , 0; 620 glVertex 0 , 0;
486 glVertex 0 , $h; 621 glVertex 0 , $h;
487 glVertex $w, $h; 622 glVertex $w, $h;
488 glVertex $w, 0; 623 glVertex $w, 0;
489 glEnd; 624 glEnd;
490 625
491 glDisable GL_BLEND; 626 glDisable GL_BLEND;
627 }
492} 628}
493 629
494############################################################################# 630#############################################################################
495 631
496package CFClient::UI::Empty; 632package CFClient::UI::Empty;
… …
501 my ($class, %arg) = @_; 637 my ($class, %arg) = @_;
502 $class->SUPER::new (can_events => 0, %arg); 638 $class->SUPER::new (can_events => 0, %arg);
503} 639}
504 640
505sub size_request { 641sub size_request {
506 (0, 0) 642 my ($self) = @_;
643
644 ($self->{w} + 0, $self->{h} + 0)
507} 645}
508 646
509sub draw { } 647sub draw { }
510 648
511############################################################################# 649#############################################################################
… …
528 666
529 $self 667 $self
530} 668}
531 669
532sub add { 670sub add {
533 my ($self, $child) = @_; 671 my ($self, @widgets) = @_;
534 672
535 $child->set_parent ($self); 673 $_->set_parent ($self)
674 for @widgets;
536 675
537 use sort 'stable'; 676 use sort 'stable';
538 677
539 $self->{children} = [ 678 $self->{children} = [
540 sort { $a->{z} <=> $b->{z} } 679 sort { $a->{z} <=> $b->{z} }
541 @{$self->{children}}, $child 680 @{$self->{children}}, @widgets
542 ]; 681 ];
543 682
544 $child->check_size; 683 $self->realloc;
545 $self->update;
546} 684}
547 685
548sub children { 686sub children {
549 @{ $_[0]{children} } 687 @{ $_[0]{children} }
550} 688}
… …
555 delete $child->{parent}; 693 delete $child->{parent};
556 $child->hide; 694 $child->hide;
557 695
558 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 696 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
559 697
560 $self->check_size; 698 $self->realloc;
561 $self->update;
562} 699}
563 700
564sub clear { 701sub clear {
565 my ($self) = @_; 702 my ($self) = @_;
566 703
… …
570 for (@$children) { 707 for (@$children) {
571 delete $_->{parent}; 708 delete $_->{parent};
572 $_->hide; 709 $_->hide;
573 } 710 }
574 711
575 $self->check_size; 712 $self->realloc;
576 $self->update;
577} 713}
578 714
579sub find_widget { 715sub find_widget {
580 my ($self, $x, $y) = @_; 716 my ($self, $x, $y) = @_;
581 717
… …
656} 792}
657 793
658sub update { 794sub update {
659 my ($self) = @_; 795 my ($self) = @_;
660 796
661 $ROOT->on_refresh ($self => sub { $self->render_child }); 797 $ROOT->on_post_alloc ($self => sub { $self->render_child });
662 $self->SUPER::update; 798 $self->SUPER::update;
663} 799}
664 800
665sub size_allocate { 801sub size_allocate {
666 my ($self, $w, $h) = @_; 802 my ($self, $w, $h) = @_;
… …
679 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 815 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
680 glClearColor 0, 0, 0, 0; 816 glClearColor 0, 0, 0, 0;
681 glClear GL_COLOR_BUFFER_BIT; 817 glClear GL_COLOR_BUFFER_BIT;
682 818
683 $self->_render; 819 $self->_render;
684# glColorMask 1, 1, 1, 0;
685# glEnable GL_BLEND;
686# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
687# glRasterPos 0, 0;
688# glCopyPixels 0, 0, $self->{w}, $self->{h};
689# glDisable GL_BLEND;
690# glColorMask 1, 1, 1, 1;
691 }; 820 };
692} 821}
693 822
694sub _draw { 823sub _draw {
695 my ($self) = @_; 824 my ($self) = @_;
… …
697 my ($w, $h) = ($self->w, $self->h); 826 my ($w, $h) = ($self->w, $self->h);
698 827
699 my $tex = $self->{texture} 828 my $tex = $self->{texture}
700 or return; 829 or return;
701 830
702 glEnable GL_BLEND;
703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704 glEnable GL_TEXTURE_2D; 831 glEnable GL_TEXTURE_2D;
705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 832 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1; 833 glColor 1, 1, 1, 1;
707 834
708 $tex->draw_quad (0, 0, $w, $h); 835 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709 836
710 glDisable GL_BLEND;
711 glDisable GL_TEXTURE_2D; 837 glDisable GL_TEXTURE_2D;
712} 838}
713 839
714############################################################################# 840#############################################################################
715 841
716package CFClient::UI::ViewPort; 842package CFClient::UI::ViewPort;
717 843
718our @ISA = CFClient::UI::Window::; 844our @ISA = CFClient::UI::Window::;
719 845
846sub new {
847 my $class = shift;
848
849 $class->SUPER::new (
850 scroll_x => 0,
851 scroll_y => 1,
852 @_,
853 )
854}
855
720sub size_request { 856sub size_request {
721 my ($self) = @_; 857 my ($self) = @_;
722 858
723 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 859 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
724 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
725 860
726 @$self{qw(child_w child_h)} 861 $w = 10 if $self->{scroll_x};
862 $h = 10 if $self->{scroll_y};
863
864 ($w, $h)
727} 865}
728 866
729sub size_allocate { 867sub size_allocate {
730 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
731 869
870 my $child = $self->child;
871
872 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
873 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
874
875 $self->child->configure (0, 0, $w, $h);
732 $self->update; 876 $self->update;
733} 877}
734 878
735sub set_offset { 879sub set_offset {
736 my ($self, $x, $y) = @_; 880 my ($self, $x, $y) = @_;
… …
739 $self->{view_y} = int $y; 883 $self->{view_y} = int $y;
740 884
741 $self->update; 885 $self->update;
742} 886}
743 887
888# hmm, this does not work for topleft of $self... but we should not ask for that
889sub coord2local {
890 my ($self, $x, $y) = @_;
891
892 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
893}
894
895sub coord2global {
896 my ($self, $x, $y) = @_;
897
898 $x = List::Util::min $self->{w}, $x - $self->{view_x};
899 $y = List::Util::min $self->{h}, $y - $self->{view_y};
900
901 $self->SUPER::coord2global ($x, $y)
902}
903
904sub find_widget {
905 my ($self, $x, $y) = @_;
906
907 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
908 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
909 ) {
910 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
911 } else {
912 $self->CFClient::UI::Base::find_widget ($x, $y)
913 }
914}
915
744sub _render { 916sub _render {
745 my ($self) = @_; 917 my ($self) = @_;
746 918
747 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 919 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
748 920
… …
759 my $class = shift; 931 my $class = shift;
760 932
761 my $self; 933 my $self;
762 934
763 my $slider = new CFClient::UI::Slider 935 my $slider = new CFClient::UI::Slider
764 vertical => 1, 936 vertical => 1,
765 range => [0, 0, 1, 0.01], # HACK fix 937 range => [0, 0, 1, 0.01], # HACK fix
766 connect_changed => sub { 938 on_changed => sub {
767 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 939 $self->{vp}->set_offset (0, $_[1]);
768 }, 940 },
769 ; 941 ;
770 942
771 $self = $class->SUPER::new ( 943 $self = $class->SUPER::new (
772 vp => (new CFClient::UI::ViewPort), 944 vp => (new CFClient::UI::ViewPort expand => 1),
773 slider => $slider, 945 slider => $slider,
774 @_, 946 @_,
775 ); 947 );
776 948
777 $self->{vp}->add ($self->{scrolled}); 949 $self->{vp}->add ($self->{scrolled});
… …
779 $self->add ($self->{slider}); 951 $self->add ($self->{slider});
780 952
781 $self 953 $self
782} 954}
783 955
956sub update {
957 my ($self) = @_;
958
959 $self->SUPER::update;
960
961 # todo: overwrite size_allocate of child
962 my $child = $self->{vp}->child;
963 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
964}
965
966sub size_allocate {
967 my ($self, $w, $h) = @_;
968
969 $self->SUPER::size_allocate ($w, $h);
970
971 my $child = $self->{vp}->child;
972 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
973}
974
784#TODO# update range on size_allocate depeneing on child 975#TODO# update range on size_allocate depending on child
785# update viewport offset on scroll 976# update viewport offset on scroll
786 977
787############################################################################# 978#############################################################################
788 979
789package CFClient::UI::Frame; 980package CFClient::UI::Frame;
… …
793use CFClient::OpenGL; 984use CFClient::OpenGL;
794 985
795sub new { 986sub new {
796 my $class = shift; 987 my $class = shift;
797 988
798 my $self = $class->SUPER::new ( 989 $class->SUPER::new (
799 bg => [1, 1, 1, 1], 990 bg => undef,
800 border_bg => [1, 1, 1, 1],
801 border => 0.8,
802 @_ 991 @_,
803 ); 992 )
804
805 $self
806} 993}
807 994
808sub _draw { 995sub _draw {
809 my ($self) = @_; 996 my ($self) = @_;
810 997
811 my ($w, $h) = ($self->{w}, $self->{h}); 998 if ($self->{bg}) {
999 my ($w, $h) = @$self{qw(w h)};
812 1000
813 glEnable GL_BLEND; 1001 glEnable GL_BLEND;
814 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1002 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
815 glEnable GL_TEXTURE_2D; 1003 glColor @{ $self->{bg} };
816 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
817 1004
818# glBegin GL_QUADS; 1005 glBegin GL_QUADS;
819# glColor 0, 0, 0, 0;
820# glVertex 0 , 0; 1006 glVertex 0 , 0;
821# glVertex 0 , $h; 1007 glVertex 0 , $h;
822# glVertex $w, $h; 1008 glVertex $w, $h;
823# glVertex $w, 0; 1009 glVertex $w, 0;
824# glEnd; 1010 glEnd;
825 1011
826
827 $self->child->draw;
828 glDisable GL_BLEND; 1012 glDisable GL_BLEND;
829 glDisable GL_TEXTURE_2D; 1013 }
1014
1015 $self->SUPER::_draw;
830} 1016}
831 1017
832############################################################################# 1018#############################################################################
833 1019
834package CFClient::UI::FancyFrame; 1020package CFClient::UI::FancyFrame;
835 1021
836our @ISA = CFClient::UI::Bin::; 1022our @ISA = CFClient::UI::Bin::;
837 1023
838use CFClient::OpenGL; 1024use CFClient::OpenGL;
839 1025
840my @tex = 1026my $bg =
1027 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1028 mipmap => 1, wrap => 1;
1029
1030my @border =
841 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1031 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
842 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1032 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
843 1033
844sub new { 1034sub new {
845 my $class = shift; 1035 my $class = shift;
846 1036
847 # TODO: user_x, user_y, overwrite moveto?
848
849 my $self = $class->SUPER::new ( 1037 my $self = $class->SUPER::new (
850 bg => [1, 1, 1, 1], 1038 bg => [1, 1, 1, 1],
851 border_bg => [1, 1, 1, 1], 1039 border_bg => [1, 1, 1, 1],
852 border => 0.6, 1040 border => 0.6,
853 can_events => 1, 1041 can_events => 1,
1042 min_w => 16,
1043 min_h => 16,
854 @_ 1044 @_
855 ); 1045 );
856 1046
857 $self->{title} &&= new CFClient::UI::Label 1047 $self->{title} &&= new CFClient::UI::Label
858 align => 0, 1048 align => 0,
… …
882 my ($self, $w, $h) = @_; 1072 my ($self, $w, $h) = @_;
883 1073
884 $h -= List::Util::max 0, $self->border * 2; 1074 $h -= List::Util::max 0, $self->border * 2;
885 $w -= List::Util::max 0, $self->border * 2; 1075 $w -= List::Util::max 0, $self->border * 2;
886 1076
887 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1077 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
888 if $self->{title}; 1078 if $self->{title};
889 1079
890 $self->child->configure ($self->border, $self->border, $w, $h); 1080 $self->child->configure ($self->border, $self->border, $w, $h);
891} 1081}
892 1082
… …
911 my ($ev, $x, $y) = @_; 1101 my ($ev, $x, $y) = @_;
912 1102
913 my $dx = $ev->{x} - $ox; 1103 my $dx = $ev->{x} - $ox;
914 my $dy = $ev->{y} - $oy; 1104 my $dy = $ev->{y} - $oy;
915 1105
916 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1106 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
917 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1107 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1108
1109 $self->realloc;
918 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1110 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
919 $self->check_size;
920 }; 1111 };
921 1112
922 } elsif ($lr ^ $td) { 1113 } elsif ($lr ^ $td) {
923 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1114 my ($ox, $oy) = ($ev->{x}, $ev->{y});
924 my ($bx, $by) = ($self->{x}, $self->{y}); 1115 my ($bx, $by) = ($self->{x}, $self->{y});
… …
926 $self->{motion} = sub { 1117 $self->{motion} = sub {
927 my ($ev, $x, $y) = @_; 1118 my ($ev, $x, $y) = @_;
928 1119
929 ($x, $y) = ($ev->{x}, $ev->{y}); 1120 ($x, $y) = ($ev->{x}, $ev->{y});
930 1121
931 $self->move ($bx + $x - $ox, $by + $y - $oy); 1122 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
932 $self->update;
933 }; 1123 };
934 } 1124 }
935} 1125}
936 1126
937sub button_up { 1127sub button_up {
… …
950 my ($self) = @_; 1140 my ($self) = @_;
951 1141
952 my ($w, $h ) = ($self->{w}, $self->{h}); 1142 my ($w, $h ) = ($self->{w}, $self->{h});
953 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1143 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
954 1144
955 glEnable GL_BLEND;
956 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
957 glEnable GL_TEXTURE_2D; 1145 glEnable GL_TEXTURE_2D;
958 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1146 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
959 1147
960 my $border = $self->border; 1148 my $border = $self->border;
961 1149
962 glColor @{ $self->{border_bg} }; 1150 glColor @{ $self->{border_bg} };
963 $tex[1]->draw_quad (0, 0, $w, $border); 1151 $border[0]->draw_quad_alpha (0, 0, $w, $border);
964 $tex[3]->draw_quad (0, $border, $border, $ch); 1152 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
965 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1153 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
966 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1154 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
967 1155
968 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1156 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
969 my $bg = $tex[0]; 1157 glColor @{ $self->{bg} };
970 1158
971 # TODO: repeat texture not scale 1159 # TODO: repeat texture not scale
1160 # solve this better(?)
972 my $rep_x = $cw / $bg->{w}; 1161 $bg->{s} = $cw / $bg->{w};
973 my $rep_y = $ch / $bg->{h}; 1162 $bg->{t} = $ch / $bg->{h};
974
975 glColor @{ $self->{bg} };
976
977 $bg->{s} = $rep_x;
978 $bg->{t} = $rep_y;
979 $bg->{wrap_mode} = 1;
980 $bg->draw_quad ($border, $border, $cw, $ch); 1163 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1164 }
981 1165
982 glDisable GL_TEXTURE_2D; 1166 glDisable GL_TEXTURE_2D;
983 glDisable GL_BLEND;
984 }
985 1167
986 $self->{title}->draw if $self->{title}; 1168 $self->{title}->draw if $self->{title};
987 1169
988 $self->child->draw; 1170 $self->child->draw;
989} 1171}
… …
1001sub new { 1183sub new {
1002 my $class = shift; 1184 my $class = shift;
1003 1185
1004 $class->SUPER::new ( 1186 $class->SUPER::new (
1005 col_expand => [], 1187 col_expand => [],
1006 @_ 1188 @_,
1007 ) 1189 )
1190}
1191
1192sub children {
1193 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1008} 1194}
1009 1195
1010sub add { 1196sub add {
1011 my ($self, $x, $y, $child) = @_; 1197 my ($self, $x, $y, $child) = @_;
1012 1198
1013 $child->set_parent ($self); 1199 $child->set_parent ($self);
1014 $self->{children}[$y][$x] = $child; 1200 $self->{children}[$y][$x] = $child;
1015 1201
1016 $child->check_size; 1202 $self->realloc;
1017} 1203}
1018 1204
1019sub children {
1020 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1021}
1022
1023# TODO: move to container class maybe? send childs a signal on removal? 1205# TODO: move to container class maybe? send children a signal on removal?
1024sub clear { 1206sub clear {
1025 my ($self) = @_; 1207 my ($self) = @_;
1026 1208
1027 my @children = $self->children; 1209 my @children = $self->children;
1028 delete $self->{children}; 1210 delete $self->{children};
… …
1030 for (@children) { 1212 for (@children) {
1031 delete $_->{parent}; 1213 delete $_->{parent};
1032 $_->hide; 1214 $_->hide;
1033 } 1215 }
1034 1216
1035 $self->update; 1217 $self->realloc;
1036} 1218}
1037 1219
1038sub get_wh { 1220sub get_wh {
1039 my ($self) = @_; 1221 my ($self) = @_;
1040 1222
… …
1071sub size_allocate { 1253sub size_allocate {
1072 my ($self, $w, $h) = @_; 1254 my ($self, $w, $h) = @_;
1073 1255
1074 my ($ws, $hs) = $self->get_wh; 1256 my ($ws, $hs) = $self->get_wh;
1075 1257
1076 my $req_w = sum @$ws; 1258 my $req_w = (sum @$ws) || 1;
1077 my $req_h = sum @$hs; 1259 my $req_h = (sum @$hs) || 1;
1078 1260
1079 # TODO: nicer code && do row_expand 1261 # TODO: nicer code && do row_expand
1080 my @col_expand = @{$self->{col_expand}}; 1262 my @col_expand = @{$self->{col_expand}};
1081 @col_expand = (1) x @$ws unless @col_expand; 1263 @col_expand = (1) x @$ws unless @col_expand;
1082 my $col_expand = (sum @col_expand) || 1; 1264 my $col_expand = (sum @col_expand) || 1;
… …
1136 } 1318 }
1137} 1319}
1138 1320
1139############################################################################# 1321#############################################################################
1140 1322
1141package CFClient::UI::HBox; 1323package CFClient::UI::Box;
1142
1143# TODO: wrap into common Box base class
1144 1324
1145our @ISA = CFClient::UI::Container::; 1325our @ISA = CFClient::UI::Container::;
1146 1326
1147sub size_request { 1327sub size_request {
1148 my ($self) = @_; 1328 my ($self) = @_;
1149 1329
1150 my @alloc = map [$_->size_request], @{$self->{children}}; 1330 $self->{vertical}
1151 1331 ? (
1152 ( 1332 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1153 (List::Util::sum map $_->[0], @alloc), 1333 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1154 (List::Util::max map $_->[1], @alloc), 1334 )
1155 ) 1335 : (
1336 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1337 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1338 )
1156} 1339}
1157 1340
1158sub size_allocate { 1341sub size_allocate {
1159 my ($self, $w, $h) = @_; 1342 my ($self, $w, $h) = @_;
1160 1343
1161 ($h, $w) = ($w, $h); 1344 my $space = $self->{vertical} ? $h : $w;
1162
1163 my $children = $self->{children}; 1345 my $children = $self->{children};
1164 1346
1165 my @h = map $_->{req_w}, @$children; 1347 my @req;
1166 1348
1167 my $req_h = List::Util::sum @h; 1349 if ($self->{homogeneous}) {
1168 1350 @req = ($space / (@$children || 1)) x @$children;
1169 if ($req_h > $h) {
1170 # ah well, not enough space
1171 $_ *= $h / $req_h for @h;
1172 } else { 1351 } else {
1352 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1353 my $req = List::Util::sum @req;
1354
1355 if ($req > $space) {
1356 # ah well, not enough space
1357 $_ *= $space / $req for @req;
1358 } else {
1173 my $exp = List::Util::sum map $_->{expand}, @$children; 1359 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1174 $exp ||= 1;
1175 1360
1361 $space = ($space - $req) / $expand; # remaining space to give away
1362
1363 $req[$_] += $space * $children->[$_]{expand}
1176 for (0 .. $#$children) { 1364 for 0 .. $#$children;
1177 my $child = $children->[$_];
1178
1179 my $alloc_h = $h[$_];
1180 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1181 $h[$_] = $alloc_h;
1182 } 1365 }
1183 } 1366 }
1184 1367
1185 CFClient::UI::harmonize \@h; 1368 CFClient::UI::harmonize \@req;
1186 1369
1187 my $y = 0; 1370 my $pos = 0;
1188 for (0 .. $#$children) { 1371 for (0 .. $#$children) {
1189 my $child = $children->[$_];
1190 my $h = $h[$_]; 1372 my $alloc = $req[$_];
1191 $child->configure ($y, 0, $h, $w); 1373 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1192 1374
1193 $y += $h; 1375 $pos += $alloc;
1194 } 1376 }
1195 1377
1196 1 1378 1
1197} 1379}
1198 1380
1199############################################################################# 1381#############################################################################
1200 1382
1383package CFClient::UI::HBox;
1384
1385our @ISA = CFClient::UI::Box::;
1386
1387sub new {
1388 my $class = shift;
1389
1390 $class->SUPER::new (
1391 vertical => 0,
1392 @_,
1393 )
1394}
1395
1396#############################################################################
1397
1201package CFClient::UI::VBox; 1398package CFClient::UI::VBox;
1202 1399
1203# TODO: wrap into common Box base class
1204
1205our @ISA = CFClient::UI::Container::; 1400our @ISA = CFClient::UI::Box::;
1206 1401
1207sub size_request { 1402sub new {
1208 my ($self) = @_; 1403 my $class = shift;
1209 1404
1210 my @alloc = map [$_->size_request], @{$self->{children}}; 1405 $class->SUPER::new (
1211 1406 vertical => 1,
1212 ( 1407 @_,
1213 (List::Util::max map $_->[0], @alloc),
1214 (List::Util::sum map $_->[1], @alloc),
1215 ) 1408 )
1216} 1409}
1217 1410
1218sub size_allocate {
1219 my ($self, $w, $h) = @_;
1220
1221 my $children = $self->{children};
1222
1223 my @h = map $_->{req_h}, @$children;
1224
1225 my $req_h = List::Util::sum @h;
1226
1227 if ($req_h > $h) {
1228 # ah well, not enough space
1229 $_ *= $h / $req_h for @h;
1230 } else {
1231 my $exp = List::Util::sum map $_->{expand}, @$children;
1232 $exp ||= 1;
1233
1234 for (0 .. $#$children) {
1235 my $child = $children->[$_];
1236
1237 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1238 }
1239 }
1240
1241 CFClient::UI::harmonize \@h;
1242
1243 my $y = 0;
1244 for (0 .. $#$children) {
1245 my $child = $children->[$_];
1246 my $h = $h[$_];
1247 $child->configure (0, $y, $w, $h);
1248
1249 $y += $h;
1250 }
1251
1252 1
1253}
1254
1255############################################################################# 1411#############################################################################
1256 1412
1257package CFClient::UI::Label; 1413package CFClient::UI::Label;
1258 1414
1259our @ISA = CFClient::UI::Base::; 1415our @ISA = CFClient::UI::DrawBG::;
1260 1416
1261use CFClient::OpenGL; 1417use CFClient::OpenGL;
1262 1418
1263sub new { 1419sub new {
1264 my ($class, %arg) = @_; 1420 my ($class, %arg) = @_;
1265 1421
1266 my $self = $class->SUPER::new ( 1422 my $self = $class->SUPER::new (
1267 fg => [1, 1, 1], 1423 fg => [1, 1, 1],
1424 #bg => none
1425 #active_bg => none
1268 #font => default_font 1426 #font => default_font
1427 #text => initial text
1428 #markup => initial narkup
1429 #max_w => maximum pixel width
1430 ellipsise => 3, # end
1431 layout => (new CFClient::Layout),
1269 fontsize => 1, 1432 fontsize => 1,
1270 text => "",
1271 align => -1, 1433 align => -1,
1272 valign => -1, 1434 valign => -1,
1273 padding => 2, 1435 padding_x => 2,
1274 layout => new CFClient::Layout, 1436 padding_y => 2,
1275 can_events => 0, 1437 can_events => 0,
1276 %arg 1438 %arg
1277 ); 1439 );
1278 1440
1279 if (exists $self->{template}) { 1441 if (exists $self->{template}) {
1280 my $layout = new CFClient::Layout; 1442 my $layout = new CFClient::Layout;
1281 $layout->set_text (delete $self->{template}); 1443 $layout->set_text (delete $self->{template});
1282 $self->{template} = $layout; 1444 $self->{template} = $layout;
1283 } 1445 }
1284 1446
1285 $self->set_text (delete $self->{text}) if exists $self->{text}; 1447 if (exists $self->{markup}) {
1286 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1448 $self->set_markup (delete $self->{markup});
1449 } else {
1450 $self->set_text (delete $self->{text});
1451 }
1287 1452
1288 $self 1453 $self
1289} 1454}
1290 1455
1291sub escape { 1456sub escape($) {
1292 local $_ = $_[1]; 1457 local $_ = $_[0];
1293 1458
1294 s/&/&amp;/g; 1459 s/&/&amp;/g;
1295 s/>/&gt;/g; 1460 s/>/&gt;/g;
1296 s/</&lt;/g; 1461 s/</&lt;/g;
1297 1462
1298 $_[1] 1463 $_
1299} 1464}
1300 1465
1301sub update { 1466sub update {
1302 my ($self) = @_; 1467 my ($self) = @_;
1303 1468
1304 delete $self->{texture}; 1469 delete $self->{texture};
1305 $self->SUPER::update; 1470 $self->SUPER::update;
1306} 1471}
1307 1472
1308sub reconfigure {
1309 my ($self) = @_;
1310
1311 delete $self->{texture};
1312}
1313
1314sub set_text { 1473sub set_text {
1315 my ($self, $text) = @_; 1474 my ($self, $text) = @_;
1316 1475
1317 return if $self->{text} eq "T$text"; 1476 return if $self->{text} eq "T$text";
1318 $self->{text} = "T$text"; 1477 $self->{text} = "T$text";
1319 1478
1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1320 $self->{layout}->set_text ($text); 1480 $self->{layout}->set_text ($text);
1321 1481
1322 delete $self->{texture}; 1482 $self->realloc;
1323 $self->update; 1483 $self->update;
1324 $self->check_size;
1325} 1484}
1326 1485
1327sub set_markup { 1486sub set_markup {
1328 my ($self, $markup) = @_; 1487 my ($self, $markup) = @_;
1329 1488
1330 return if $self->{text} eq "M$markup"; 1489 return if $self->{text} eq "M$markup";
1331 $self->{text} = "M$markup"; 1490 $self->{text} = "M$markup";
1332 1491
1492 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493
1494 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1333 $self->{layout}->set_markup ($markup); 1495 $self->{layout}->set_markup ($markup);
1334 1496
1335 delete $self->{texture}; 1497 $self->realloc;
1336 $self->update; 1498 $self->update;
1337 $self->check_size;
1338} 1499}
1339 1500
1340sub size_request { 1501sub size_request {
1341 my ($self) = @_; 1502 my ($self) = @_;
1342 1503
1343 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1504 $self->{layout}->set_font ($self->{font}) if $self->{font};
1344 $self->{layout}->set_width ($self->{max_w} || -1); 1505 $self->{layout}->set_width ($self->{max_w} || -1);
1506 $self->{layout}->set_ellipsise ($self->{ellipsise});
1507 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1345 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1346 1509
1347 my ($w, $h) = $self->{layout}->size; 1510 my ($w, $h) = $self->{layout}->size;
1348 1511
1349 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1354 1517
1355 $w = List::Util::max $w, $w2; 1518 $w = List::Util::max $w, $w2;
1356 $h = List::Util::max $h, $h2; 1519 $h = List::Util::max $h, $h2;
1357 } 1520 }
1358 1521
1359 ( 1522 ($w, $h)
1360 $w + $self->{padding} * 2,
1361 $h + $self->{padding} * 2,
1362 )
1363} 1523}
1364 1524
1365sub size_allocate { 1525sub size_allocate {
1366 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1367 1527
1368 delete $self->{texture}; 1528 delete $self->{texture}
1529 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1369} 1530}
1370 1531
1371sub set_fontsize { 1532sub set_fontsize {
1372 my ($self, $fontsize) = @_; 1533 my ($self, $fontsize) = @_;
1373 1534
1374 $self->{fontsize} = $fontsize; 1535 $self->{fontsize} = $fontsize;
1375 delete $self->{texture}; 1536 delete $self->{texture};
1376 $self->check_size; 1537
1377 $self->update; 1538 $self->realloc;
1378} 1539}
1379 1540
1380sub _draw { 1541sub _draw {
1381 my ($self) = @_; 1542 my ($self) = @_;
1382 1543
1544 $self->SUPER::_draw; # draw background, if applicable
1545
1383 my $tex = $self->{texture} ||= do { 1546 my $tex = $self->{texture} ||= do {
1547 $self->{layout}->set_foreground (@{$self->{fg}});
1384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1548 $self->{layout}->set_font ($self->{font}) if $self->{font};
1385 $self->{layout}->set_width ($self->{w}); 1549 $self->{layout}->set_width ($self->{w});
1550 $self->{layout}->set_ellipsise ($self->{ellipsise});
1551 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1386 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1552 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1553
1387 new_from_layout CFClient::Texture $self->{layout} 1554 my $tex = new_from_layout CFClient::Texture $self->{layout};
1555
1556 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1557 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1558 : ($self->{w} - $tex->{w}) * 0.5);
1559
1560 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1561 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1562 : ($self->{h} - $tex->{h}) * 0.5);
1563
1564 $tex
1388 }; 1565 };
1389 1566
1390 glEnable GL_BLEND;
1391 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1392 glEnable GL_TEXTURE_2D; 1567 glEnable GL_TEXTURE_2D;
1393 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1568 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1394 1569
1570 if ($tex->{format} == GL_ALPHA) {
1395 glColor @{$self->{fg}}; 1571 glColor @{$self->{fg}};
1396
1397 $self->{ox} = int (
1398 $self->{align} < 0 ? $self->{padding}
1399 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1400 : ($self->{w} - $tex->{w}) * 0.5
1401 );
1402
1403 $self->{oy} = int (
1404 $self->{valign} < 0 ? $self->{padding}
1405 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1406 : ($self->{h} - $tex->{h}) * 0.5
1407 );
1408
1409 $tex->draw_quad ($self->{ox}, $self->{oy}); 1572 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1573 } else {
1574 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1575 }
1410 1576
1411 glDisable GL_TEXTURE_2D; 1577 glDisable GL_TEXTURE_2D;
1412 glDisable GL_BLEND;
1413} 1578}
1414 1579
1415############################################################################# 1580#############################################################################
1416 1581
1417package CFClient::UI::EntryBase; 1582package CFClient::UI::EntryBase;
… …
1430 active_fg => [0, 0, 0], 1595 active_fg => [0, 0, 0],
1431 can_hover => 1, 1596 can_hover => 1,
1432 can_focus => 1, 1597 can_focus => 1,
1433 valign => 0, 1598 valign => 0,
1434 can_events => 1, 1599 can_events => 1,
1600 #text => ...
1435 @_ 1601 @_
1436 ) 1602 )
1437} 1603}
1438 1604
1439sub _set_text { 1605sub _set_text {
… …
1449 $self->{text} = $text; 1615 $self->{text} = $text;
1450 1616
1451 $text =~ s/./*/g if $self->{hidden}; 1617 $text =~ s/./*/g if $self->{hidden};
1452 $self->{layout}->set_text ("$text "); 1618 $self->{layout}->set_text ("$text ");
1453 1619
1454 $self->emit (changed => $self->{text}); 1620 $self->_emit (changed => $self->{text});
1621}
1622
1623sub set_text {
1624 my ($self, $text) = @_;
1625
1626 $self->{cursor} = length $text;
1627 $self->_set_text ($text);
1628
1629 $self->realloc;
1455} 1630}
1456 1631
1457sub get_text { 1632sub get_text {
1458 $_[0]{text} 1633 $_[0]{text}
1459} 1634}
… …
1462 my ($self) = @_; 1637 my ($self) = @_;
1463 1638
1464 my ($w, $h) = $self->SUPER::size_request; 1639 my ($w, $h) = $self->SUPER::size_request;
1465 1640
1466 ($w + 1, $h) # add 1 for cursor 1641 ($w + 1, $h) # add 1 for cursor
1467}
1468
1469sub size_allocate {
1470 my ($self, $w, $h) = @_;
1471
1472 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1473}
1474
1475sub set_text {
1476 my ($self, $text) = @_;
1477
1478 $self->{cursor} = length $text;
1479 $self->_set_text ($text);
1480 $self->update;
1481} 1642}
1482 1643
1483sub key_down { 1644sub key_down {
1484 my ($self, $ev) = @_; 1645 my ($self, $ev) = @_;
1485 1646
… …
1487 my $sym = $ev->{sym}; 1648 my $sym = $ev->{sym};
1488 my $uni = $ev->{unicode}; 1649 my $uni = $ev->{unicode};
1489 1650
1490 my $text = $self->get_text; 1651 my $text = $self->get_text;
1491 1652
1492 if ($sym == 8) { 1653 if ($uni == 8) {
1493 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1654 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1494 } elsif ($sym == 127) { 1655 } elsif ($uni == 127) {
1495 substr $text, $self->{cursor}, 1, ""; 1656 substr $text, $self->{cursor}, 1, "";
1496 } elsif ($sym == CFClient::SDLK_LEFT) { 1657 } elsif ($sym == CFClient::SDLK_LEFT) {
1497 --$self->{cursor} if $self->{cursor}; 1658 --$self->{cursor} if $self->{cursor};
1498 } elsif ($sym == CFClient::SDLK_RIGHT) { 1659 } elsif ($sym == CFClient::SDLK_RIGHT) {
1499 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1660 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1500 } elsif ($sym == CFClient::SDLK_HOME) { 1661 } elsif ($sym == CFClient::SDLK_HOME) {
1501 $self->{cursor} = 0; 1662 $self->{cursor} = 0;
1502 } elsif ($sym == CFClient::SDLK_END) { 1663 } elsif ($sym == CFClient::SDLK_END) {
1503 $self->{cursor} = length $text; 1664 $self->{cursor} = length $text;
1504 } elsif ($sym == 27) { 1665 } elsif ($uni == 27) {
1505 $self->emit ('escape'); 1666 $self->_emit ('escape');
1506 } elsif ($uni) { 1667 } elsif ($uni) {
1507 substr $text, $self->{cursor}++, 0, chr $uni; 1668 substr $text, $self->{cursor}++, 0, chr $uni;
1508 } 1669 }
1509 1670
1510 $self->_set_text ($text); 1671 $self->_set_text ($text);
1511 $self->update; 1672
1673 $self->realloc;
1512} 1674}
1513 1675
1514sub focus_in { 1676sub focus_in {
1515 my ($self) = @_; 1677 my ($self) = @_;
1516 1678
… …
1596 if ($sym == 13) { 1758 if ($sym == 13) {
1597 unshift @{$self->{history}}, 1759 unshift @{$self->{history}},
1598 my $txt = $self->get_text; 1760 my $txt = $self->get_text;
1599 $self->{history_pointer} = -1; 1761 $self->{history_pointer} = -1;
1600 $self->{history_saveback} = ''; 1762 $self->{history_saveback} = '';
1601 $self->emit (activate => $txt); 1763 $self->_emit (activate => $txt);
1602 $self->update; 1764 $self->update;
1603 1765
1604 } elsif ($sym == CFClient::SDLK_UP) { 1766 } elsif ($sym == CFClient::SDLK_UP) {
1605 if ($self->{history_pointer} < 0) { 1767 if ($self->{history_pointer} < 0) {
1606 $self->{history_saveback} = $self->get_text; 1768 $self->{history_saveback} = $self->get_text;
… …
1643 1805
1644sub new { 1806sub new {
1645 my $class = shift; 1807 my $class = shift;
1646 1808
1647 $class->SUPER::new ( 1809 $class->SUPER::new (
1648 padding => 4, 1810 padding_x => 4,
1811 padding_y => 4,
1649 fg => [1, 1, 1], 1812 fg => [1, 1, 1],
1650 bg => [1, 1, 1, 0.2],
1651 active_fg => [0, 0, 1], 1813 active_fg => [0, 0, 1],
1652 can_hover => 1, 1814 can_hover => 1,
1653 align => 0, 1815 align => 0,
1654 valign => 0, 1816 valign => 0,
1655 can_events => 1, 1817 can_events => 1,
1656 @_ 1818 @_
1657 ) 1819 )
1658} 1820}
1659 1821
1822sub activate { }
1823
1660sub button_up { 1824sub button_up {
1661 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1662 1826
1827 $self->emit ("activate")
1663 if ($x >= 0 && $x < $self->{w} 1828 if $x >= 0 && $x < $self->{w}
1664 && $y >= 0 && $y < $self->{h}) { 1829 && $y >= 0 && $y < $self->{h};
1665 $self->emit ("activate");
1666 }
1667} 1830}
1668 1831
1669sub _draw { 1832sub _draw {
1670 my ($self) = @_; 1833 my ($self) = @_;
1671 1834
… …
1673 1836
1674 if ($GRAB == $self) { 1837 if ($GRAB == $self) {
1675 $self->{fg} = $self->{active_fg}; 1838 $self->{fg} = $self->{active_fg};
1676 } 1839 }
1677 1840
1678 glEnable GL_BLEND;
1679 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1680 glEnable GL_TEXTURE_2D; 1841 glEnable GL_TEXTURE_2D;
1681 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1842 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1682 glColor 0, 0, 0, 1; 1843 glColor 0, 0, 0, 1;
1683 1844
1684 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1845 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1685 1846
1686 glDisable GL_TEXTURE_2D; 1847 glDisable GL_TEXTURE_2D;
1687 glDisable GL_BLEND;
1688 1848
1689 $self->SUPER::_draw; 1849 $self->SUPER::_draw;
1690} 1850}
1691 1851
1692############################################################################# 1852#############################################################################
… …
1703 1863
1704sub new { 1864sub new {
1705 my $class = shift; 1865 my $class = shift;
1706 1866
1707 $class->SUPER::new ( 1867 $class->SUPER::new (
1708 padding => 2, 1868 padding_x => 2,
1869 padding_y => 2,
1709 fg => [1, 1, 1], 1870 fg => [1, 1, 1],
1710 active_fg => [1, 1, 0], 1871 active_fg => [1, 1, 0],
1872 bg => [0, 0, 0, 0.2],
1873 active_bg => [1, 1, 1, 0.5],
1711 state => 0, 1874 state => 0,
1712 can_hover => 1, 1875 can_hover => 1,
1713 @_ 1876 @_
1714 ) 1877 )
1715} 1878}
1716 1879
1717sub size_request { 1880sub size_request {
1718 my ($self) = @_; 1881 my ($self) = @_;
1719 1882
1720 ($self->{padding} * 2 + 6) x 2 1883 (6) x 2
1721} 1884}
1722 1885
1723sub button_down { 1886sub button_down {
1724 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1725 1888
1726 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1889 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1727 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1890 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1728 $self->{state} = !$self->{state}; 1891 $self->{state} = !$self->{state};
1729 $self->emit (changed => $self->{state}); 1892 $self->_emit (changed => $self->{state});
1730 } 1893 }
1731} 1894}
1732 1895
1733sub _draw { 1896sub _draw {
1734 my ($self) = @_; 1897 my ($self) = @_;
1735 1898
1736 $self->SUPER::_draw; 1899 $self->SUPER::_draw;
1737 1900
1738 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1901 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1739 1902
1740 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1903 my ($w, $h) = @$self{qw(w h)};
1904
1905 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1741 1906
1742 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1907 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1743 1908
1744 glEnable GL_BLEND; 1909 my $tex = $self->{state} ? $tex[1] : $tex[0];
1910
1745 glEnable GL_TEXTURE_2D; 1911 glEnable GL_TEXTURE_2D;
1746 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1747
1748 my $tex = $self->{state} ? $tex[1] : $tex[0];
1749
1750 $tex->draw_quad (0, 0, $s, $s); 1912 $tex->draw_quad_alpha (0, 0, $s, $s);
1751
1752 glDisable GL_TEXTURE_2D; 1913 glDisable GL_TEXTURE_2D;
1753 glDisable GL_BLEND;
1754} 1914}
1755 1915
1756############################################################################# 1916#############################################################################
1757 1917
1758package CFClient::UI::Image; 1918package CFClient::UI::Image;
… …
1801 glTranslate 0, -$self->{w}, 0; 1961 glTranslate 0, -$self->{w}, 0;
1802 1962
1803 ($w, $h) = ($h, $w); 1963 ($w, $h) = ($h, $w);
1804 } 1964 }
1805 1965
1806 glEnable GL_BLEND;
1807 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1808 glEnable GL_TEXTURE_2D; 1966 glEnable GL_TEXTURE_2D;
1809 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1967 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1810 1968
1811 $tex->draw_quad (0, 0, $w, $h); 1969 $tex->draw_quad_alpha (0, 0, $w, $h);
1812 1970
1813 glDisable GL_BLEND;
1814 glDisable GL_TEXTURE_2D; 1971 glDisable GL_TEXTURE_2D;
1815} 1972}
1816 1973
1817############################################################################# 1974#############################################################################
1818 1975
… …
2007 qw(s1_slider.png s1_slider_bg.png); 2164 qw(s1_slider.png s1_slider_bg.png);
2008 2165
2009sub new { 2166sub new {
2010 my $class = shift; 2167 my $class = shift;
2011 2168
2012 # range [value, low, high, page] 2169 # range [value, low, high, page, unit]
2013 2170
2014 # TODO: 0-width page 2171 # TODO: 0-width page
2015 # TODO: req_w/h are wrong with vertical 2172 # TODO: req_w/h are wrong with vertical
2016 # TODO: calculations are off 2173 # TODO: calculations are off
2017 my $self = $class->SUPER::new ( 2174 my $self = $class->SUPER::new (
2018 fg => [1, 1, 1], 2175 fg => [1, 1, 1],
2019 active_fg => [0, 0, 0], 2176 active_fg => [0, 0, 0],
2177 bg => [0, 0, 0, 0.2],
2178 active_bg => [1, 1, 1, 0.5],
2020 range => [0, 0, 100, 10], 2179 range => [0, 0, 100, 10, 0],
2021 req_w => $::WIDTH / 80, 2180 min_w => $::WIDTH / 80,
2022 req_h => $::WIDTH / 80, 2181 min_h => $::WIDTH / 80,
2023 vertical => 0, 2182 vertical => 0,
2024 can_hover => 1, 2183 can_hover => 1,
2025 inner_pad => 5, 2184 inner_pad => 0.02,
2026 @_ 2185 @_
2027 ); 2186 );
2028 2187
2188 $self->set_value ($self->{range}[0]);
2189 $self->update;
2190
2029 $self 2191 $self
2030} 2192}
2031 2193
2194sub changed { }
2195
2196sub set_range {
2197 my ($self, $range) = @_;
2198
2199 ($range, $self->{range}) = ($self->{range}, $range);
2200
2201 $self->update
2202 if "@$range" ne "@{$self->{range}}";
2203}
2204
2205sub set_value {
2206 my ($self, $value) = @_;
2207
2208 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2209
2210 $hi = $lo + 1 if $hi <= $lo;
2211
2212 $page = $hi - $lo if $page > $hi - $lo;
2213
2214 $value = $lo if $value < $lo;
2215 $value = $hi - $page if $value > $hi - $page;
2216
2217 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2218 if $unit;
2219
2220 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2221
2222 if ($value != $old_value) {
2223 $self->_emit (changed => $value);
2224 $self->update;
2225 }
2226}
2227
2032sub size_request { 2228sub size_request {
2033 my ($self) = @_; 2229 my ($self) = @_;
2034 2230
2035 my $w = $self->{req_w}; 2231 ($self->{req_w}, $self->{req_h})
2036 my $h = $self->{req_h};
2037
2038 $self->{vertical} ? ($h, $w) : ($w, $h)
2039} 2232}
2040 2233
2041sub button_down { 2234sub button_down {
2042 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
2043 2236
2044 $self->SUPER::button_down ($ev, $x, $y); 2237 $self->SUPER::button_down ($ev, $x, $y);
2238
2239 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240
2045 $self->mouse_motion ($ev, $x, $y); 2241 $self->mouse_motion ($ev, $x, $y);
2046} 2242}
2047 2243
2048sub mouse_motion { 2244sub mouse_motion {
2049 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
2050 2246
2051 if ($GRAB == $self) { 2247 if ($GRAB == $self) {
2248 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2249
2250 my (undef, $lo, $hi, $page) = @{$self->{range}};
2251
2252 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253
2254 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2255 }
2256}
2257
2258sub update {
2259 my ($self) = @_;
2260
2261 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2262 $self->set_value ($self->{range}[0]);
2263
2052 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2264 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100;
2053 2266
2054 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2267 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2055 2268
2056 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2269 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2057 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2270 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2058 2271
2059 $x -= $inner_pad_px; # substract the padding 2272 $value = ($value - $lo) / $range;
2060 $x = $x * ($hi - $lo) / $inner_w + $lo; 2273 $value = $value * $self->{scale} + $self->{offset};
2061 $x = $lo if $x < $lo;
2062 $x = $hi - $page if $x > $hi - $page;
2063 $self->{range}[0] = $x;
2064 2274
2065 $self->emit (changed => $x); 2275 $self->{knob_x} = $value - $knob_w * 0.5;
2066 $self->update; 2276 $self->{knob_w} = $knob_w;
2067 } 2277 });
2068}
2069 2278
2070# the inner_* stuff is for generating a padding for the slider handle, 2279 $self->SUPER::update;
2071# so that the handle doesn't leave the texture. This calculation isn't 100%
2072# correct propably, but it does the job for now
2073sub _calc_inner_pad_px {
2074 my ($self, $w) = @_;
2075 ($w / 100) * $self->{inner_pad} # % to pixels
2076} 2280}
2077 2281
2078sub _draw { 2282sub _draw {
2079 my ($self) = @_; 2283 my ($self) = @_;
2080 2284
2081 $self->SUPER::_draw (); 2285 $self->SUPER::_draw ();
2082 2286
2083 my ($w, $h) = @$self{qw(w h)}; 2287 glScale $self->{w}, $self->{h};
2084 2288
2085 if ($self->{vertical}) { 2289 if ($self->{vertical}) {
2086 # draw a vertical slider like a rotated horizontal slider 2290 # draw a vertical slider like a rotated horizontal slider
2087 2291
2292 glTranslate 1, 0, 0;
2088 glRotate 90, 0, 0, 1; 2293 glRotate 90, 0, 0, 1;
2089 glTranslate 0, -$self->{w}, 0;
2090
2091 ($w, $h) = ($h, $w);
2092 } 2294 }
2093 2295
2094 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2296 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2095 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2297 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2096 2298
2097 my ($value, $lo, $hi, $page) = @{$self->{range}};
2098
2099 $hi = $value + 1 if $lo == $hi;
2100
2101 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2102 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2103
2104 $page = int $page * $inner_w / ($hi - $lo);
2105 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2106
2107 $w -= $page;
2108 $page &= ~1;
2109 glTranslate $page * 0.5, 0, 0;
2110 $page ||= 2;
2111
2112 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2113 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2114
2115 glEnable GL_BLEND;
2116 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2117 glEnable GL_TEXTURE_2D; 2299 glEnable GL_TEXTURE_2D;
2118 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2300 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2119 2301
2120 # draw background 2302 # draw background
2121 $tex[1]->draw_quad (0, 0, $w, $h); 2303 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2122 2304
2123 # draw handle 2305 # draw handle
2124 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2306 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2125 2307
2126 glDisable GL_BLEND;
2127 glDisable GL_TEXTURE_2D; 2308 glDisable GL_TEXTURE_2D;
2128} 2309}
2310
2311#############################################################################
2312
2313package CFClient::UI::ValSlider;
2314
2315our @ISA = CFClient::UI::HBox::;
2316
2317sub new {
2318 my ($class, %arg) = @_;
2319
2320 my $range = delete $arg{range};
2321
2322 my $self = $class->SUPER::new (
2323 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2324 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2325 to_value => sub { shift },
2326 from_value => sub { shift },
2327 %arg,
2328 );
2329
2330 $self->{slider}->connect (changed => sub {
2331 my ($self, $value) = @_;
2332 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2333 $self->{parent}->emit (changed => $value);
2334 });
2335
2336# $self->{entry}->connect (changed => sub {
2337# my ($self, $value) = @_;
2338# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2339# $self->{parent}->emit (changed => $value);
2340# });
2341
2342 $self->add ($self->{slider}, $self->{entry});
2343
2344 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2345
2346 $self
2347}
2348
2349sub set_range { shift->{slider}->set_range (@_) }
2350sub set_value { shift->{slider}->set_value (@_) }
2129 2351
2130############################################################################# 2352#############################################################################
2131 2353
2132package CFClient::UI::TextView; 2354package CFClient::UI::TextView;
2133 2355
… …
2142 fontsize => 1, 2364 fontsize => 1,
2143 can_events => 0, 2365 can_events => 0,
2144 #font => default_font 2366 #font => default_font
2145 @_, 2367 @_,
2146 2368
2147 layout => (new CFClient::Layout), 2369 layout => (new CFClient::Layout 1),
2148 par => [], 2370 par => [],
2149 height => 0, 2371 height => 0,
2150 children => [ 2372 children => [
2151 (new CFClient::UI::Empty expand => 1), 2373 (new CFClient::UI::Empty expand => 1),
2152 (new CFClient::UI::Slider vertical => 1), 2374 (new CFClient::UI::Slider vertical => 1),
… …
2163 2385
2164 $self->{fontsize} = $fontsize; 2386 $self->{fontsize} = $fontsize;
2165 $self->reflow; 2387 $self->reflow;
2166} 2388}
2167 2389
2168sub text_height {
2169 my ($self, $text) = @_;
2170
2171 my $layout = $self->{layout};
2172
2173 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2174 $layout->set_width ($self->{children}[0]{w});
2175 $layout->set_text ($text);
2176
2177 ($layout->size)[1]
2178}
2179
2180sub reflow {
2181 my ($self) = @_;
2182
2183 $self->{need_reflow}++;
2184 $self->update;
2185}
2186
2187sub size_allocate { 2390sub size_allocate {
2188 my ($self, $w, $h) = @_; 2391 my ($self, $w, $h) = @_;
2189 2392
2190 $self->SUPER::size_allocate ($w, $h); 2393 $self->SUPER::size_allocate ($w, $h);
2191 2394
… …
2194 $self->{layout}->set_width ($self->{children}[0]{w}); 2397 $self->{layout}->set_width ($self->{children}[0]{w});
2195 2398
2196 $self->reflow; 2399 $self->reflow;
2197} 2400}
2198 2401
2402sub text_size {
2403 my ($self, $text, $indent) = @_;
2404
2405 my $layout = $self->{layout};
2406
2407 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2408 $layout->set_width ($self->{children}[0]{w} - $indent);
2409 $layout->set_markup ($text);
2410
2411 $layout->size
2412}
2413
2414sub reflow {
2415 my ($self) = @_;
2416
2417 $self->{need_reflow}++;
2418 $self->update;
2419}
2420
2421sub set_offset {
2422 my ($self, $offset) = @_;
2423
2424 # todo: base offset on lines or so, not on pixels
2425 $self->{children}[1]->set_value ($offset);
2426}
2427
2428sub clear {
2429 my ($self) = @_;
2430
2431 $self->{par} = [];
2432 $self->{height} = 0;
2433 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2434}
2435
2199sub add_paragraph { 2436sub add_paragraph {
2200 my ($self, $color, $text) = @_; 2437 my ($self, $color, $text, $indent) = @_;
2201 2438
2202 #TODO: intelligently "reformat" paragraph 2439 for my $line (split /\n/, $text) {
2203 2440 my ($w, $h) = $self->text_size ($line);
2204 my $height = $self->text_height ($text);
2205
2206 $self->{height} += $height; 2441 $self->{height} += $h;
2442 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2443 }
2207 2444
2208 push @{$self->{par}}, [$height, $color, $text];
2209
2210 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2445 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2211 $self->{children}[1]->update;
2212} 2446}
2213 2447
2214sub update { 2448sub update {
2215 my ($self) = @_; 2449 my ($self) = @_;
2216 2450
… …
2218 2452
2219 return unless $self->{h} > 0; 2453 return unless $self->{h} > 0;
2220 2454
2221 delete $self->{texture}; 2455 delete $self->{texture};
2222 2456
2223 $ROOT->on_refresh ($self, sub { 2457 $ROOT->on_post_alloc ($self, sub {
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459
2224 if (delete $self->{need_reflow}) { 2460 if (delete $self->{need_reflow}) {
2225 my $height = 0; 2461 my $height = 0;
2226 2462
2227 $height += $_->[0] = $self->text_height ($_->[2]) 2463 my $layout = $self->{layout};
2464
2465 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2466
2228 for @{$self->{par}}; 2467 for (@{$self->{par}}) {
2468 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2469 $layout->set_width ($W - $_->[3]);
2470 $layout->set_markup ($_->[4]);
2471 my ($w, $h) = $layout->size;
2472 $_->[0] = $w + $_->[3];
2473 $_->[1] = $h;
2474 }
2475
2476 $height += $_->[1];
2477 }
2229 2478
2230 $self->{height} = $height; 2479 $self->{height} = $height;
2231 2480
2232 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2481 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2233 2482
2234 delete $self->{texture}; 2483 delete $self->{texture};
2235 } 2484 }
2236 2485
2237 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2486 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2238 glClearColor 0, 0, 0, 0; 2487 glClearColor 0.5, 0.5, 0.5, 0;
2239 glClear GL_COLOR_BUFFER_BIT; 2488 glClear GL_COLOR_BUFFER_BIT;
2240 2489
2490 my $top = int $self->{children}[1]{range}[0];
2491
2492 my $y0 = $top;
2493 my $y1 = $top + $H;
2494
2495 my $y = 0;
2496
2497 my $layout = $self->{layout};
2498
2499 $layout->set_font ($self->{font}) if $self->{font};
2500
2241 glEnable GL_BLEND; 2501 glEnable GL_BLEND;
2502 #TODO# not correct in windows where rgba is forced off
2242 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2503 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2243 glEnable GL_TEXTURE_2D;
2244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2245
2246 my $top = int $self->{children}[1]{range}[0];
2247
2248 my $y0 = $top;
2249 my $y1 = $top + $self->{h};
2250
2251 my $y = 0;
2252
2253 my $layout = $self->{layout};
2254
2255 $layout->set_font ($self->{font}) if $self->{font};
2256 2504
2257 for my $par (@{$self->{par}}) { 2505 for my $par (@{$self->{par}}) {
2258 my $h = $par->[0]; 2506 my $h = $par->[1];
2259 2507
2260 if ($y0 < $y + $h && $y < $y1) { 2508 if ($y0 < $y + $h && $y < $y1) {
2509 $layout->set_foreground (@{ $par->[2] });
2510 $layout->set_width ($W - $par->[3]);
2261 $layout->set_text ($par->[2]); 2511 $layout->set_markup ($par->[4]);
2262 2512
2263 glColor @{ $par->[1] }; 2513 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264 my ($W, $H) = $layout->size; 2514
2265 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2515 glRasterPos $par->[3], $y - $y0;
2516 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2266 } 2517 }
2267 2518
2268 $y += $h; 2519 $y += $h;
2269 } 2520 }
2270 2521
2271 glDisable GL_TEXTURE_2D;
2272 glDisable GL_BLEND; 2522 glDisable GL_BLEND;
2273 }; 2523 };
2274 }); 2524 });
2275} 2525}
2276 2526
2277sub _draw { 2527sub _draw {
2278 my ($self) = @_; 2528 my ($self) = @_;
2279 2529
2280 glEnable GL_BLEND;
2281 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2282 glEnable GL_TEXTURE_2D; 2530 glEnable GL_TEXTURE_2D;
2283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2284 glColor 1, 1, 1, 1; 2532 glColor 1, 1, 1, 1;
2285 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2533 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2286 glDisable GL_TEXTURE_2D; 2534 glDisable GL_TEXTURE_2D;
2287 glDisable GL_BLEND;
2288 2535
2289 $self->{children}[1]->draw; 2536 $self->{children}[1]->draw;
2290 2537
2291} 2538}
2292 2539
… …
2340 2587
2341sub new { 2588sub new {
2342 my $class = shift; 2589 my $class = shift;
2343 2590
2344 my $self = $class->SUPER::new ( 2591 my $self = $class->SUPER::new (
2345 state => 0, 2592 state => 0,
2346 connect_activate => \&toggle_flopper, 2593 on_activate => \&toggle_flopper,
2347 @_ 2594 @_
2348 ); 2595 );
2349 2596
2350 if ($self->{state}) {
2351 $self->{state} = 0;
2352 $self->toggle_flopper;
2353 }
2354
2355 $self 2597 $self
2356} 2598}
2357 2599
2358sub toggle_flopper { 2600sub toggle_flopper {
2359 my ($self) = @_; 2601 my ($self) = @_;
2360 2602
2361 # TODO: use animation 2603 $self->{other}->toggle_visibility;
2362 if ($self->{state} = !$self->{state}) {
2363 $CFClient::UI::ROOT->add ($self->{other});
2364 $self->{other}->move ($self->coord2global (0, $self->{h}));
2365 $self->emit ("open");
2366 } else {
2367 $CFClient::UI::ROOT->remove ($self->{other});
2368 $self->emit ("close");
2369 }
2370
2371 $self->emit (changed => $self->{state});
2372} 2604}
2373 2605
2374############################################################################# 2606#############################################################################
2375 2607
2376package CFClient::UI::Tooltip; 2608package CFClient::UI::Tooltip;
… …
2386 @_, 2618 @_,
2387 can_events => 0, 2619 can_events => 0,
2388 ) 2620 )
2389} 2621}
2390 2622
2391sub set_markup { 2623sub set_tooltip_from {
2392 my ($self, $text) = @_; 2624 my ($self, $widget) = @_;
2393 2625
2394 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2626 my $tooltip = $widget->{tooltip};
2395 $self->{label}->set_markup ($text); 2627
2396 $self->add ($self->{label}); 2628 if ($ENV{CFPLUS_DEBUG} & 2) {
2629 $tooltip .= "\n\n" . (ref $widget) . "\n"
2630 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2631 . "req $widget->{req_w} $widget->{req_h}\n"
2632 . "visible $widget->{visible}";
2633 }
2634
2635 $self->add (new CFClient::UI::Label
2636 markup => $tooltip,
2637 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2638 fontsize => 0.8,
2639 fg => [0, 0, 0, 1],
2640 ellipsise => 0,
2641 font => ($widget->{tooltip_font} || $::FONT_PROP),
2642 );
2397} 2643}
2398 2644
2399sub size_request { 2645sub size_request {
2400 my ($self) = @_; 2646 my ($self) = @_;
2401
2402 $self->child->set_max_size ($::WIDTH * 0.3);
2403 2647
2404 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2648 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2405 2649
2406 ($w + 4, $h + 4) 2650 ($w + 4, $h + 4)
2407} 2651}
… …
2410 my ($self, $w, $h) = @_; 2654 my ($self, $w, $h) = @_;
2411 2655
2412 $self->SUPER::size_allocate ($w - 4, $h - 4); 2656 $self->SUPER::size_allocate ($w - 4, $h - 4);
2413} 2657}
2414 2658
2659sub visibility_change {
2660 my ($self, $visible) = @_;
2661
2662 return unless $visible;
2663
2664 $self->{root}->on_post_alloc ("move_$self" => sub {
2665 my $widget = $self->{owner}
2666 or return;
2667
2668 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2669
2670 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2671 if $x + $self->{w} > $::WIDTH;
2672
2673 $self->move_abs ($x, $y);
2674 });
2675}
2676
2415sub _draw { 2677sub _draw {
2416 my ($self) = @_; 2678 my ($self) = @_;
2417 2679
2418 glPushMatrix;
2419 glTranslate 0.375, 0.375; 2680 glTranslate 0.375, 0.375;
2420 2681
2421 my ($w, $h) = @$self{qw(w h)}; 2682 my ($w, $h) = @$self{qw(w h)};
2422 2683
2423 glColor 1, 0.8, 0.4; 2684 glColor 1, 0.8, 0.4;
… …
2434 glVertex 0 , $h; 2695 glVertex 0 , $h;
2435 glVertex $w, $h; 2696 glVertex $w, $h;
2436 glVertex $w, 0; 2697 glVertex $w, 0;
2437 glEnd; 2698 glEnd;
2438 2699
2439 glPopMatrix; 2700 glTranslate 2 - 0.375, 2 - 0.375;
2440 2701
2441 glTranslate 2, 2;
2442 $self->SUPER::_draw; 2702 $self->SUPER::_draw;
2443} 2703}
2444 2704
2445############################################################################# 2705#############################################################################
2446 2706
… …
2451use CFClient::OpenGL; 2711use CFClient::OpenGL;
2452 2712
2453sub new { 2713sub new {
2454 my $class = shift; 2714 my $class = shift;
2455 2715
2456 $class->SUPER::new ( 2716 my $self = $class->SUPER::new (
2457 aspect => 1, 2717 aspect => 1,
2718 can_events => 0,
2458 @_, 2719 @_,
2459 ) 2720 );
2721
2722 if ($self->{anim} && $self->{animspeed}) {
2723 Scalar::Util::weaken (my $widget = $self);
2724
2725 $self->{timer} = Event->timer (
2726 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2727 hard => 1,
2728 interval => $self->{animspeed},
2729 cb => sub {
2730 ++$widget->{frame};
2731 $widget->update;
2732 },
2733 );
2734 }
2735
2736 $self
2460} 2737}
2461 2738
2462sub size_request { 2739sub size_request {
2463 (32, 8) 2740 (32, 8)
2464} 2741}
2465 2742
2743sub update {
2744 my ($self) = @_;
2745
2746 return unless $self->{visible};
2747
2748 $self->SUPER::update;
2749}
2750
2466sub _draw { 2751sub _draw {
2467 my ($self) = @_; 2752 my ($self) = @_;
2468 2753
2754 return unless $::CONN;
2755
2756 my $face;
2757
2758 if ($self->{frame}) {
2759 my $anim = $::CONN->{anim}[$self->{anim}];
2760
2761 $face = $anim->[ $self->{frame} % @$anim ]
2762 if $anim && @$anim;
2763 }
2764
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2765 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2470 2766
2471 # TODO animation
2472 if ($tex) { 2767 if ($tex) {
2473 glEnable GL_BLEND;
2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475 glEnable GL_TEXTURE_2D; 2768 glEnable GL_TEXTURE_2D;
2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477 glColor 1, 1, 1, 1; 2770 glColor 1, 1, 1, 1;
2478 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2771 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479 glDisable GL_TEXTURE_2D; 2772 glDisable GL_TEXTURE_2D;
2480 glDisable GL_BLEND;
2481 } 2773 }
2774}
2775
2776sub DESTROY {
2777 my ($self) = @_;
2778
2779 $self->{timer}->cancel
2780 if $self->{timer};
2781
2782 $self->SUPER::DESTROY;
2482} 2783}
2483 2784
2484############################################################################# 2785#############################################################################
2485 2786
2486package CFClient::UI::Menu; 2787package CFClient::UI::Menu;
… …
2521 2822
2522# popup given the event (must be a mouse button down event currently) 2823# popup given the event (must be a mouse button down event currently)
2523sub popup { 2824sub popup {
2524 my ($self, $ev) = @_; 2825 my ($self, $ev) = @_;
2525 2826
2526 $self->emit ("popdown"); 2827 $self->_emit ("popdown");
2527 2828
2528 # maybe save $GRAB? must be careful about events... 2829 # maybe save $GRAB? must be careful about events...
2529 $GRAB = $self; 2830 $GRAB = $self;
2530 $self->{button} = $ev->{button}; 2831 $self->{button} = $ev->{button};
2531 2832
2532 $self->show; 2833 $self->show;
2533 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2834 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2534} 2835}
2535 2836
2536sub mouse_motion { 2837sub mouse_motion {
2537 my ($self, $ev, $x, $y) = @_; 2838 my ($self, $ev, $x, $y) = @_;
2538 2839
… …
2546 2847
2547 if ($ev->{button} == $self->{button}) { 2848 if ($ev->{button} == $self->{button}) {
2548 undef $GRAB; 2849 undef $GRAB;
2549 $self->hide; 2850 $self->hide;
2550 2851
2551 $self->emit ("popdown"); 2852 $self->_emit ("popdown");
2552 $self->{hover}[1]->() if $self->{hover}; 2853 $self->{hover}[1]->() if $self->{hover};
2553 } 2854 }
2554} 2855}
2555 2856
2556############################################################################# 2857#############################################################################
2557 2858
2859package CFClient::UI::Statusbox;
2860
2861our @ISA = CFClient::UI::VBox::;
2862
2863sub new {
2864 my $class = shift;
2865
2866 $class->SUPER::new (
2867 fontsize => 0.8,
2868 @_,
2869 )
2870}
2871
2872sub reorder {
2873 my ($self) = @_;
2874 my $NOW = time;
2875
2876 while (my ($k, $v) = each %{ $self->{item} }) {
2877 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2878 }
2879
2880 my @widgets;
2881
2882 my @items = sort {
2883 $a->{pri} <=> $b->{pri}
2884 or $b->{id} <=> $a->{id}
2885 } values %{ $self->{item} };
2886
2887 my $count = 10 + 1;
2888 for my $item (@items) {
2889 last unless --$count;
2890
2891 push @widgets, $item->{label} ||= do {
2892 # TODO: doesn't handle markup well (read as: at all)
2893 my $short = $item->{count} > 1
2894 ? "<b>$item->{count} ×</b> $item->{text}"
2895 : $item->{text};
2896
2897 for ($short) {
2898 s/^\s+//;
2899 s/\s+/ /g;
2900 }
2901
2902 new CFClient::UI::Label
2903 markup => $short,
2904 tooltip => $item->{tooltip},
2905 tooltip_font => $::FONT_PROP,
2906 tooltip_width => 0.67,
2907 fontsize => $item->{fontsize} || $self->{fontsize},
2908 max_w => $::WIDTH * 0.44,
2909 fg => $item->{fg},
2910 can_events => 1,
2911 can_hover => 1
2912 };
2913 }
2914
2915 $self->clear;
2916 $self->SUPER::add (reverse @widgets);
2917}
2918
2919sub add {
2920 my ($self, $text, %arg) = @_;
2921
2922 $text =~ s/^\s+//;
2923 $text =~ s/\s+$//;
2924
2925 return unless $text;
2926
2927 my $timeout = time + ((delete $arg{timeout}) || 60);
2928
2929 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2930
2931 if (my $item = $self->{item}{$group}) {
2932 if ($item->{text} eq $text) {
2933 $item->{count}++;
2934 } else {
2935 $item->{count} = 1;
2936 $item->{text} = $item->{tooltip} = $text;
2937 }
2938 $item->{id} = ++$self->{id};
2939 $item->{timeout} = $timeout;
2940 delete $item->{label};
2941 } else {
2942 $self->{item}{$group} = {
2943 id => ++$self->{id},
2944 text => $text,
2945 timeout => $timeout,
2946 tooltip => $text,
2947 fg => [0.8, 0.8, 0.8, 0.8],
2948 pri => 0,
2949 count => 1,
2950 %arg,
2951 };
2952 }
2953
2954 $self->reorder;
2955}
2956
2957sub reconfigure {
2958 my ($self) = @_;
2959
2960 delete $_->{label}
2961 for values %{ $self->{item} || {} };
2962
2963 $self->reorder;
2964 $self->SUPER::reconfigure;
2965}
2966
2967#############################################################################
2968
2969package CFClient::UI::Inventory;
2970
2971our @ISA = CFClient::UI::ScrolledWindow::;
2972
2973sub new {
2974 my $class = shift;
2975
2976 my $self = $class->SUPER::new (
2977 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2978 @_,
2979 );
2980
2981 $self
2982}
2983
2984sub set_items {
2985 my ($self, $items) = @_;
2986
2987 $self->{scrolled}->clear;
2988 return unless $items;
2989
2990 my @items = sort {
2991 ($a->{type} <=> $b->{type})
2992 or ($a->{name} cmp $b->{name})
2993 } @$items;
2994
2995 $self->{real_items} = \@items;
2996
2997 my $row = 0;
2998 for my $item (@items) {
2999 CFClient::Item::update_widgets $item;
3000
3001 $self->{scrolled}->add (0, $row, $item->{face_widget});
3002 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3003 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3004
3005 $row++;
3006 }
3007}
3008
3009#############################################################################
3010
3011package CFClient::UI::BindEditor;
3012
3013our @ISA = CFClient::UI::FancyFrame::;
3014
3015sub new {
3016 my $class = shift;
3017
3018 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3019
3020 $self->add (my $vb = new CFClient::UI::VBox);
3021
3022
3023 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3024 text => "start recording",
3025 tooltip => "Start/Stops recording of actions."
3026 ."All subsequent actions after the recording started will be captured."
3027 ."The actions are displayed after the record was stopped."
3028 ."To bind the action you have to click on the 'Bind' button",
3029 on_activate => sub {
3030 unless ($self->{recording}) {
3031 $self->start;
3032 } else {
3033 $self->stop;
3034 }
3035 });
3036
3037 $vb->add (new CFClient::UI::Label text => "Actions:");
3038 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3039
3040 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3041 $vb->add (my $hb = new CFClient::UI::HBox);
3042 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3043 $hb->add (new CFClient::UI::Button
3044 text => "bind",
3045 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3046 on_activate => sub {
3047 $self->ask_for_bind;
3048 });
3049
3050 $vb->add (my $hb = new CFClient::UI::HBox);
3051 $hb->add (new CFClient::UI::Button
3052 text => "ok",
3053 expand => 1,
3054 tooltip => "This closes the binding editor and saves the binding",
3055 on_activate => sub {
3056 $self->hide;
3057 $self->commit;
3058 });
3059
3060 $hb->add (new CFClient::UI::Button
3061 text => "cancel",
3062 expand => 1,
3063 tooltip => "This closes the binding editor without saving",
3064 on_activate => sub {
3065 $self->hide;
3066 $self->{binding_cancel}->()
3067 if $self->{binding_cancel};
3068 });
3069
3070 $self->update_binding_widgets;
3071
3072 $self
3073}
3074
3075sub commit {
3076 my ($self) = @_;
3077 my ($mod, $sym, $cmds) = $self->get_binding;
3078 if ($sym != 0 && @$cmds > 0) {
3079 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3080 ."'. Don't forget 'Save Config'!");
3081 $self->{binding_change}->($mod, $sym, $cmds)
3082 if $self->{binding_change};
3083 } else {
3084 $::STATUSBOX->add ("No action bound, no key or action specified!");
3085 $self->{binding_cancel}->()
3086 if $self->{binding_cancel};
3087 }
3088}
3089
3090sub start {
3091 my ($self) = @_;
3092
3093 $self->{rec_btn}->set_text ("stop recording");
3094 $self->{recording} = 1;
3095 $self->clear_command_list;
3096 $::CONN->start_record if $::CONN;
3097}
3098
3099sub stop {
3100 my ($self) = @_;
3101
3102 $self->{rec_btn}->set_text ("start recording");
3103 $self->{recording} = 0;
3104
3105 my $rec;
3106 $rec = $::CONN->stop_record if $::CONN;
3107 return unless ref $rec eq 'ARRAY';
3108 $self->set_command_list ($rec);
3109}
3110
3111# if $commit is true, the binding will be set after the user entered a key combo
3112sub ask_for_bind {
3113 my ($self, $commit) = @_;
3114
3115 CFClient::Binder::open_binding_dialog (sub {
3116 my ($mod, $sym) = @_;
3117 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3118 $self->update_binding_widgets;
3119 $self->commit if $commit;
3120 });
3121}
3122
3123# $mod and $sym are the modifiers and key symbol
3124# $cmds is a array ref of strings (the commands)
3125# $cb is the callback that is executed on OK
3126# $ccb is the callback that is executed on CANCEL and
3127# when the binding was unsuccessful on OK
3128sub set_binding {
3129 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3130
3131 $self->clear_command_list;
3132 $self->{recording} = 0;
3133 $self->{rec_btn}->set_text ("start recording");
3134
3135 $self->{binding} = [$mod, $sym];
3136 $self->{commands} = $cmds;
3137
3138 $self->{binding_change} = $cb;
3139 $self->{binding_cancel} = $ccb;
3140
3141 $self->update_binding_widgets;
3142}
3143
3144# this is a shortcut method that asks for a binding
3145# and then just binds it.
3146sub do_quick_binding {
3147 my ($self, $cmds) = @_;
3148 $self->set_binding (undef, undef, $cmds, sub {
3149 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3150 });
3151 $self->ask_for_bind (1);
3152}
3153
3154sub update_binding_widgets {
3155 my ($self) = @_;
3156 my ($mod, $sym, $cmds) = $self->get_binding;
3157 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3158 $self->set_command_list ($cmds);
3159}
3160
3161sub get_binding {
3162 my ($self) = @_;
3163 return (
3164 $self->{binding}->[0],
3165 $self->{binding}->[1],
3166 [ grep { defined $_ } @{$self->{commands}} ]
3167 );
3168}
3169
3170sub clear_command_list {
3171 my ($self) = @_;
3172 $self->{cmdbox}->clear ();
3173}
3174
3175sub set_command_list {
3176 my ($self, $cmds) = @_;
3177
3178 $self->{cmdbox}->clear ();
3179 $self->{commands} = $cmds;
3180
3181 my $idx = 0;
3182
3183 for (@$cmds) {
3184 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3185
3186 my $i = $idx;
3187 $hb->add (new CFClient::UI::Label text => $_);
3188 $hb->add (new CFClient::UI::Button
3189 text => "delete",
3190 tooltip => "Deletes the action from the record",
3191 on_activate => sub {
3192 $self->{cmdbox}->remove ($hb);
3193 $cmds->[$i] = undef;
3194 });
3195
3196
3197 $idx++
3198 }
3199}
3200
3201#############################################################################
3202
3203package CFClient::UI::SpellList;
3204
3205our @ISA = CFClient::UI::FancyFrame::;
3206
3207sub new {
3208 my $class = shift;
3209
3210 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3211
3212 $self->add (new CFClient::UI::ScrolledWindow
3213 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3214
3215 $self;
3216}
3217
3218# XXX: Do sorting? Argl...
3219sub add_spell {
3220 my ($self, $spell) = @_;
3221 $self->{spells}->{$spell->{name}} = $spell;
3222
3223 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3224 face => $spell->{face},
3225 can_hover => 1,
3226 can_events => 1,
3227 tooltip => $spell->{message});
3228
3229 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3230 text => $spell->{name},
3231 can_hover => 1,
3232 can_events => 1,
3233 tooltip => $spell->{message},
3234 expand => 1);
3235
3236 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3237 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3238 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3239 expand => 1);
3240
3241 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3242 text => "bind to key",
3243 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3244}
3245
3246sub rebuild_spell_list {
3247 my ($self) = @_;
3248 $self->{tbl_idx} = 0;
3249 $self->add_spell ($_) for values %{$self->{spells}};
3250}
3251
3252sub remove_spell {
3253 my ($self, $spell) = @_;
3254 delete $self->{spells}->{$spell->{name}};
3255 $self->rebuild_spell_list;
3256}
3257
3258#############################################################################
3259
2558package CFClient::UI::Root; 3260package CFClient::UI::Root;
2559 3261
2560our @ISA = CFClient::UI::Container::; 3262our @ISA = CFClient::UI::Container::;
2561 3263
2562use CFClient::OpenGL; 3264use CFClient::OpenGL;
2563 3265
2564sub check_size { 3266sub new {
2565 my ($self) = @_; 3267 my $class = shift;
2566 3268
2567 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3269 my $self = $class->SUPER::new (
3270 visible => 1,
3271 @_,
3272 );
3273
3274 Scalar::Util::weaken ($self->{root} = $self);
3275
3276 $self
2568} 3277}
2569 3278
2570sub size_request { 3279sub size_request {
2571 ($::WIDTH, $::HEIGHT) 3280 my ($self) = @_;
2572}
2573 3281
2574sub configure { 3282 ($self->{w}, $self->{h})
3283}
3284
3285sub _to_pixel {
3286 my ($coord, $size, $max) = @_;
3287
3288 $coord =
3289 $coord eq "center" ? ($max - $size) * 0.5
3290 : $coord eq "max" ? $max
3291 : $coord;
3292
3293 $coord = 0 if $coord < 0;
3294 $coord = $max - $size if $coord > $max - $size;
3295
3296 int $coord + 0.5
3297}
3298
3299sub size_allocate {
2575 my ($self, $x, $y, $w, $h) = @_; 3300 my ($self, $w, $h) = @_;
2576 3301
2577 $self->SUPER::configure ($x, $y, $w, $h);
2578
2579 for my $child (@{$self->{children}}) { 3302 for my $child ($self->children) {
2580 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3303 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2581 3304
2582 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3305 $X = $child->{force_x} if exists $child->{force_x};
2583 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3306 $Y = $child->{force_y} if exists $child->{force_y};
3307
3308 $X = _to_pixel $X, $W, $self->{w};
3309 $Y = _to_pixel $Y, $H, $self->{h};
3310
2584 $child->configure ($X, $Y, $W,$H); 3311 $child->configure ($X, $Y, $W, $H);
2585 } 3312 }
2586} 3313}
2587 3314
2588sub _topleft { 3315sub coord2local {
2589 my ($self, $x, $y) = @_; 3316 my ($self, $x, $y) = @_;
2590 3317
2591 ($x, $y) 3318 ($x, $y)
2592} 3319}
2593 3320
3321sub coord2global {
3322 my ($self, $x, $y) = @_;
3323
3324 ($x, $y)
3325}
3326
2594sub update { 3327sub update {
2595 my ($self) = @_; 3328 my ($self) = @_;
2596 3329
2597 $self->check_size; 3330 $::WANT_REFRESH++;
2598 ::refresh ();
2599} 3331}
2600 3332
2601sub add { 3333sub add {
2602 my ($self, $child) = @_; 3334 my ($self, @children) = @_;
2603 3335
2604 # integerize window positions 3336 $_->{is_toplevel} = 1
2605 $child->{x} = int $child->{x}; 3337 for @children;
2606 $child->{y} = int $child->{y};
2607 3338
2608 $self->SUPER::add ($child); 3339 $self->SUPER::add (@children);
3340}
3341
3342sub remove {
3343 my ($self, @children) = @_;
3344
3345 $self->SUPER::remove (@children);
3346
3347 delete $self->{is_toplevel}
3348 for @children;
3349
3350 while (@children) {
3351 my $w = pop @children;
3352 push @children, $w->children;
3353 $w->set_invisible;
3354 }
2609} 3355}
2610 3356
2611sub on_refresh { 3357sub on_refresh {
2612 my ($self, $id, $cb) = @_; 3358 my ($self, $id, $cb) = @_;
2613 3359
2614 $self->{refresh_hook}{$id} = $cb; 3360 $self->{refresh_hook}{$id} = $cb;
2615} 3361}
2616 3362
3363sub on_post_alloc {
3364 my ($self, $id, $cb) = @_;
3365
3366 $self->{post_alloc_hook}{$id} = $cb;
3367}
3368
2617sub draw { 3369sub draw {
2618 my ($self) = @_; 3370 my ($self) = @_;
2619 3371
2620 while (my $rcb = delete $self->{refresh_hook}) { 3372 while ($self->{refresh_hook}) {
2621 $_->() for values %$rcb; 3373 $_->()
3374 for values %{delete $self->{refresh_hook}};
2622 } 3375 }
3376
3377 if ($self->{realloc}) {
3378 my %queue;
3379 my @queue;
3380 my $widget;
3381
3382 outer:
3383 while () {
3384 if (my $realloc = delete $self->{realloc}) {
3385 for $widget (values %$realloc) {
3386 $widget->{visible} or next; # do not resize invisible widgets
3387
3388 $queue{$widget+0}++ and next; # duplicates are common
3389
3390 push @{ $queue[$widget->{visible}] }, $widget;
3391 }
3392 }
3393
3394 while () {
3395 @queue or last outer;
3396
3397 $widget = pop @{ $queue[-1] || [] }
3398 and last;
3399
3400 pop @queue;
3401 }
3402
3403 delete $queue{$widget+0};
3404
3405 my ($w, $h) = $widget->size_request;
3406
3407 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3408 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3409
3410 $w = $widget->{force_w} if exists $widget->{force_w};
3411 $h = $widget->{force_h} if exists $widget->{force_h};
3412
3413 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3414 || delete $widget->{force_realloc}) {
3415 $widget->{req_w} = $w;
3416 $widget->{req_h} = $h;
3417
3418 $self->{size_alloc}{$widget+0} = $widget;
3419
3420 if (my $parent = $widget->{parent}) {
3421 $self->{realloc}{$parent+0} = $parent
3422 unless $queue{$parent+0};
3423
3424 $parent->{force_size_alloc} = 1;
3425 $self->{size_alloc}{$parent+0} = $parent;
3426 }
3427 }
3428
3429 delete $self->{realloc}{$widget+0};
3430 }
3431 }
3432
3433 while (my $size_alloc = delete $self->{size_alloc}) {
3434 my @queue = sort { $b->{visible} <=> $a->{visible} }
3435 values %$size_alloc;
3436
3437 while () {
3438 my $widget = pop @queue || last;
3439
3440 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3441
3442 $w = 0 if $w < 0;
3443 $h = 0 if $h < 0;
3444
3445 $w = int $w + 0.5;
3446 $h = int $h + 0.5;
3447
3448 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3449 $widget->{old_w} = $widget->{w};
3450 $widget->{old_h} = $widget->{h};
3451
3452 $widget->{w} = $w;
3453 $widget->{h} = $h;
3454
3455 $widget->emit (size_allocate => $w, $h);
3456 }
3457 }
3458 }
3459
3460 while ($self->{post_alloc_hook}) {
3461 $_->()
3462 for values %{delete $self->{post_alloc_hook}};
3463 }
3464
2623 3465
2624 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3466 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2625 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3467 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2626 glClear GL_COLOR_BUFFER_BIT; 3468 glClear GL_COLOR_BUFFER_BIT;
2627 3469
2628 glMatrixMode GL_PROJECTION; 3470 glMatrixMode GL_PROJECTION;
2629 glLoadIdentity; 3471 glLoadIdentity;
2630 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3472 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2631 glMatrixMode GL_MODELVIEW; 3473 glMatrixMode GL_MODELVIEW;
2632 glLoadIdentity; 3474 glLoadIdentity;
2633 3475
2634 $self->_draw; 3476 $self->_draw;
2635} 3477}
2636 3478
2637############################################################################# 3479#############################################################################
2638 3480
2639package CFClient::UI::Inventory;
2640
2641our @ISA = CFClient::UI::ScrolledWindow::;
2642
2643sub new {
2644 my $class = shift;
2645
2646 my $self = $class->SUPER::new (
2647 scrolled => (new CFClient::UI::VBox),
2648 @_,
2649 );
2650
2651 $self
2652}
2653
2654sub set_items {
2655 my ($self, $items) = @_;
2656
2657 $self->{scrolled}->clear;
2658 return unless $items;
2659
2660 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2661
2662 $self->{real_items} = \@items;
2663
2664 for my $item (@items) {
2665 my $desc = $item->{nrof} < 2
2666 ? $item->{name}
2667 : "$item->{nrof} $item->{name_pl}";
2668
2669 my $hb = new CFClient::UI::HBox;
2670
2671 $hb->add (my $f = new CFClient::UI::Face
2672 can_events => 0,
2673 face => $item->{face},
2674 anim => $item->{anim},
2675 animspeed => $item->{animspeed},
2676 expand => 1,
2677 );
2678 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2679 $self->{scrolled}->add ($hb);
2680 }
2681
2682# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2683}
2684
2685sub size_request {
2686 my ($self) = @_;
2687 (100, 200)
2688}
2689
2690#############################################################################
2691
2692package CFClient::UI; 3481package CFClient::UI;
2693 3482
2694$ROOT = new CFClient::UI::Root; 3483$ROOT = new CFClient::UI::Root;
2695$TOOLTIP = new CFClient::UI::Tooltip; 3484$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2696 3485
26971 34861
2698 3487

Diff Legend

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