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.186 by root, Mon May 8 20:39:34 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 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h});
262 $self->update;
263}
264
265sub set_max_size { 378sub set_max_size {
266 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
267 380
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
270} 383}
271 384
272# return top left coordinates 385sub set_tooltip {
273sub _topleft {
274 my ($self, $x, $y) = @_; 386 my ($self, $tooltip) = @_;
275 387
276 $self->{parent} 388 $tooltip =~ s/^\s+//;
277 or Carp::confess "no parent widget in _topleft\n";#d# 389 $tooltip =~ s/\s+$//;
278 390
279 $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 }
280} 399}
281 400
282# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
283sub coord2local { 402sub coord2local {
284 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
285 404
286 my ($X, $Y) = $self->_topleft; 405 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 406}
289 407
290# translate local coordinates to global coordinate system 408# translate local coordinates to global coordinate system
291sub coord2global { 409sub coord2global {
292 my ($self, $x, $y) = @_; 410 my ($self, $x, $y) = @_;
293 411
294 my ($X, $Y) = $self->_topleft; 412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 413}
297 414
298sub focus_in { 415sub focus_in {
299 my ($self) = @_; 416 my ($self) = @_;
300 417
301 return if $FOCUS == $self; 418 return if $FOCUS == $self;
302 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
303 420
304 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
305 422
306 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
307 424
308 $focus->update if $focus; 425 $focus->update if $focus;
309 $FOCUS->update; 426 $FOCUS->update;
310} 427}
311 428
… …
314 431
315 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
316 433
317 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
318 435
319 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
320 437
321 $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;
322} 442}
323 443
324sub mouse_motion { } 444sub mouse_motion { }
325sub button_up { } 445sub button_up { }
326sub key_down { } 446sub key_down { }
327sub key_up { } 447sub key_up { }
328 448
329sub button_down { 449sub button_down {
330 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
331 451
332 $self->focus_in; 452 $self->focus_in;
… …
335sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
336sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
337sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
338sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
339sub 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}
340 530
341sub draw { 531sub draw {
342 my ($self) = @_; 532 my ($self) = @_;
343 533
344 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
… …
361 glVertex $x , $y + $self->{h}; 551 glVertex $x , $y + $self->{h};
362 glEnd; 552 glEnd;
363 glDisable GL_BLEND; 553 glDisable GL_BLEND;
364 } 554 }
365 555
366 if ($ENV{PCLIENT_DEBUG}) { 556 if ($ENV{CFPLUS_DEBUG} & 1) {
367 glPushMatrix; 557 glPushMatrix;
368 glColor 1, 1, 0, 1; 558 glColor 1, 1, 0, 1;
369 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 559 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
370 glBegin GL_LINE_LOOP; 560 glBegin GL_LINE_LOOP;
371 glVertex 0 , 0; 561 glVertex 0 , 0;
372 glVertex $self->{w}, 0; 562 glVertex $self->{w} - 1, 0;
373 glVertex $self->{w}, $self->{h}; 563 glVertex $self->{w} - 1, $self->{h} - 1;
374 glVertex 0 , $self->{h}; 564 glVertex 0 , $self->{h} - 1;
375 glEnd; 565 glEnd;
376 glPopMatrix; 566 glPopMatrix;
377 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;
378 } 568 }
379} 569}
380 570
381sub _draw { 571sub _draw {
382 my ($self) = @_; 572 my ($self) = @_;
383 573
384 warn "no draw defined for $self\n"; 574 warn "no draw defined for $self\n";
385} 575}
386 576
387sub find_widget {
388 my ($self, $x, $y) = @_;
389
390 return () unless $self->{can_events};
391
392 return $self
393 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
394 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
395
396 ()
397}
398
399sub set_parent {
400 my ($self, $parent) = @_;
401
402 Scalar::Util::weaken ($self->{parent} = $parent);
403}
404
405sub check_size {
406 my ($self) = @_;
407
408 $self->{parent}
409 or return 1;
410
411 my ($w, $h) = $self->{user_w} && $self->{user_h}
412 ? @$self{qw(user_w user_h)}
413 : $self->size_request;
414
415 if ($w != $self->{req_w} || $h != $self->{req_h}) {
416 $self->{req_w} = $w;
417 $self->{req_h} = $h;
418
419 $self->{parent}->check_size
420 or $self->size_allocate (
421 (List::Util::max $self->{w}, $w),
422 (List::Util::max $self->{h}, $h),
423 );
424
425 1
426 } else {
427 0
428 }
429}
430
431sub update {
432 my ($self) = @_;
433
434 $self->{parent}->update
435 if $self->{parent};
436}
437
438sub connect {
439 my ($self, $signal, $cb) = @_;
440
441 push @{ $self->{signal_cb}{$signal} }, $cb;
442}
443
444sub emit {
445 my ($self, $signal, @args) = @_;
446
447 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
448}
449
450sub DESTROY { 577sub DESTROY {
451 my ($self) = @_; 578 my ($self) = @_;
452 579
580 delete $WIDGET{$self+0};
453 #$self->deactivate; 581 #$self->deactivate;
454} 582}
455 583
456############################################################################# 584#############################################################################
457 585
… …
466 my $class = shift; 594 my $class = shift;
467 595
468 # range [value, low, high, page] 596 # range [value, low, high, page]
469 597
470 $class->SUPER::new ( 598 $class->SUPER::new (
471 bg => [0, 0, 0, 0.2], 599 #bg => [0, 0, 0, 0.2],
472 active_bg => [1, 1, 1, 0.5], 600 #active_bg => [1, 1, 1, 0.5],
473 @_ 601 @_
474 ) 602 )
475} 603}
476 604
477sub _draw { 605sub _draw {
478 my ($self) = @_; 606 my ($self) = @_;
479 607
608 my $color = $FOCUS == $self && $self->{active_bg}
609 ? $self->{active_bg}
610 : $self->{bg};
611
612 if ($color && (@$color < 4 || $color->[3])) {
480 my ($w, $h) = @$self{qw(w h)}; 613 my ($w, $h) = @$self{qw(w h)};
481 614
482 glEnable GL_BLEND; 615 glEnable GL_BLEND;
483 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 616 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
484 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 617 glColor @$color;
485 618
486 glBegin GL_QUADS; 619 glBegin GL_QUADS;
487 glVertex 0 , 0; 620 glVertex 0 , 0;
488 glVertex 0 , $h; 621 glVertex 0 , $h;
489 glVertex $w, $h; 622 glVertex $w, $h;
490 glVertex $w, 0; 623 glVertex $w, 0;
491 glEnd; 624 glEnd;
492 625
493 glDisable GL_BLEND; 626 glDisable GL_BLEND;
627 }
494} 628}
495 629
496############################################################################# 630#############################################################################
497 631
498package CFClient::UI::Empty; 632package CFClient::UI::Empty;
… …
503 my ($class, %arg) = @_; 637 my ($class, %arg) = @_;
504 $class->SUPER::new (can_events => 0, %arg); 638 $class->SUPER::new (can_events => 0, %arg);
505} 639}
506 640
507sub size_request { 641sub size_request {
508 (0, 0) 642 my ($self) = @_;
643
644 ($self->{w} + 0, $self->{h} + 0)
509} 645}
510 646
511sub draw { } 647sub draw { }
512 648
513############################################################################# 649#############################################################################
… …
530 666
531 $self 667 $self
532} 668}
533 669
534sub add { 670sub add {
535 my ($self, $child) = @_; 671 my ($self, @widgets) = @_;
536 672
537 $child->set_parent ($self); 673 $_->set_parent ($self)
674 for @widgets;
538 675
539 use sort 'stable'; 676 use sort 'stable';
540 677
541 $self->{children} = [ 678 $self->{children} = [
542 sort { $a->{z} <=> $b->{z} } 679 sort { $a->{z} <=> $b->{z} }
543 @{$self->{children}}, $child 680 @{$self->{children}}, @widgets
544 ]; 681 ];
545 682
546 $child->check_size; 683 $self->realloc;
547 $self->update;
548} 684}
549 685
550sub children { 686sub children {
551 @{ $_[0]{children} } 687 @{ $_[0]{children} }
552} 688}
… …
557 delete $child->{parent}; 693 delete $child->{parent};
558 $child->hide; 694 $child->hide;
559 695
560 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 696 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
561 697
562 $self->check_size; 698 $self->realloc;
563 $self->update;
564} 699}
565 700
566sub clear { 701sub clear {
567 my ($self) = @_; 702 my ($self) = @_;
568 703
… …
572 for (@$children) { 707 for (@$children) {
573 delete $_->{parent}; 708 delete $_->{parent};
574 $_->hide; 709 $_->hide;
575 } 710 }
576 711
577 $self->check_size; 712 $self->realloc;
578 $self->update;
579} 713}
580 714
581sub find_widget { 715sub find_widget {
582 my ($self, $x, $y) = @_; 716 my ($self, $x, $y) = @_;
583 717
… …
658} 792}
659 793
660sub update { 794sub update {
661 my ($self) = @_; 795 my ($self) = @_;
662 796
663 $ROOT->on_refresh ($self => sub { $self->render_child }); 797 $ROOT->on_post_alloc ($self => sub { $self->render_child });
664 $self->SUPER::update; 798 $self->SUPER::update;
665} 799}
666 800
667sub size_allocate { 801sub size_allocate {
668 my ($self, $w, $h) = @_; 802 my ($self, $w, $h) = @_;
… …
681 $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 {
682 glClearColor 0, 0, 0, 0; 816 glClearColor 0, 0, 0, 0;
683 glClear GL_COLOR_BUFFER_BIT; 817 glClear GL_COLOR_BUFFER_BIT;
684 818
685 $self->_render; 819 $self->_render;
686# glColorMask 1, 1, 1, 0;
687# glEnable GL_BLEND;
688# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
689# glRasterPos 0, 0;
690# glCopyPixels 0, 0, $self->{w}, $self->{h};
691# glDisable GL_BLEND;
692# glColorMask 1, 1, 1, 1;
693 }; 820 };
694} 821}
695 822
696sub _draw { 823sub _draw {
697 my ($self) = @_; 824 my ($self) = @_;
… …
699 my ($w, $h) = ($self->w, $self->h); 826 my ($w, $h) = ($self->w, $self->h);
700 827
701 my $tex = $self->{texture} 828 my $tex = $self->{texture}
702 or return; 829 or return;
703 830
704 glEnable GL_BLEND;
705 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
706 glEnable GL_TEXTURE_2D; 831 glEnable GL_TEXTURE_2D;
707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 832 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
708 glColor 0, 0, 0, 1; 833 glColor 1, 1, 1, 1;
709 834
710 $tex->draw_quad (0, 0, $w, $h); 835 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
711 836
712 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 837 glDisable GL_TEXTURE_2D;
714} 838}
715 839
716############################################################################# 840#############################################################################
717 841
718package CFClient::UI::ViewPort; 842package CFClient::UI::ViewPort;
719 843
720our @ISA = CFClient::UI::Window::; 844our @ISA = CFClient::UI::Window::;
721 845
846sub new {
847 my $class = shift;
848
849 $class->SUPER::new (
850 scroll_x => 0,
851 scroll_y => 1,
852 @_,
853 )
854}
855
722sub size_request { 856sub size_request {
723 my ($self) = @_; 857 my ($self) = @_;
724 858
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 859 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 860
728 @$self{qw(child_w child_h)} 861 $w = 10 if $self->{scroll_x};
862 $h = 10 if $self->{scroll_y};
863
864 ($w, $h)
729} 865}
730 866
731sub size_allocate { 867sub size_allocate {
732 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
733 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);
734 $self->update; 876 $self->update;
735} 877}
736 878
737sub set_offset { 879sub set_offset {
738 my ($self, $x, $y) = @_; 880 my ($self, $x, $y) = @_;
… …
741 $self->{view_y} = int $y; 883 $self->{view_y} = int $y;
742 884
743 $self->update; 885 $self->update;
744} 886}
745 887
746# hmm, this does not work for topleft of $self... but we should not aks for that 888# hmm, this does not work for topleft of $self... but we should not ask for that
747sub _topleft { 889sub coord2local {
748 my ($self, $x, $y) = @_; 890 my ($self, $x, $y) = @_;
749 891
750 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 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)
751} 902}
752 903
753sub find_widget { 904sub find_widget {
754 my ($self, $x, $y) = @_; 905 my ($self, $x, $y) = @_;
755 906
… …
780 my $class = shift; 931 my $class = shift;
781 932
782 my $self; 933 my $self;
783 934
784 my $slider = new CFClient::UI::Slider 935 my $slider = new CFClient::UI::Slider
785 vertical => 1, 936 vertical => 1,
786 range => [0, 0, 1, 0.01], # HACK fix 937 range => [0, 0, 1, 0.01], # HACK fix
787 connect_changed => sub { 938 on_changed => sub {
788 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 939 $self->{vp}->set_offset (0, $_[1]);
789 }, 940 },
790 ; 941 ;
791 942
792 $self = $class->SUPER::new ( 943 $self = $class->SUPER::new (
793 vp => (new CFClient::UI::ViewPort), 944 vp => (new CFClient::UI::ViewPort expand => 1),
794 slider => $slider, 945 slider => $slider,
795 @_, 946 @_,
796 ); 947 );
797 948
798 $self->{vp}->add ($self->{scrolled}); 949 $self->{vp}->add ($self->{scrolled});
… …
800 $self->add ($self->{slider}); 951 $self->add ($self->{slider});
801 952
802 $self 953 $self
803} 954}
804 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
805#TODO# update range on size_allocate depeneing on child 975#TODO# update range on size_allocate depending on child
806# update viewport offset on scroll 976# update viewport offset on scroll
807 977
808############################################################################# 978#############################################################################
809 979
810package CFClient::UI::Frame; 980package CFClient::UI::Frame;
… …
814use CFClient::OpenGL; 984use CFClient::OpenGL;
815 985
816sub new { 986sub new {
817 my $class = shift; 987 my $class = shift;
818 988
819 my $self = $class->SUPER::new ( 989 $class->SUPER::new (
820 bg => [1, 1, 1, 1], 990 bg => undef,
821 border_bg => [1, 1, 1, 1],
822 border => 0.8,
823 @_ 991 @_,
824 ); 992 )
825
826 $self
827} 993}
828 994
829sub _draw { 995sub _draw {
830 my ($self) = @_; 996 my ($self) = @_;
831 997
832 my ($w, $h) = ($self->{w}, $self->{h}); 998 if ($self->{bg}) {
999 my ($w, $h) = @$self{qw(w h)};
833 1000
834 glEnable GL_BLEND; 1001 glEnable GL_BLEND;
835 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1002 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
836 glEnable GL_TEXTURE_2D; 1003 glColor @{ $self->{bg} };
837 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
838 1004
839# glBegin GL_QUADS; 1005 glBegin GL_QUADS;
840# glColor 0, 0, 0, 0;
841# glVertex 0 , 0; 1006 glVertex 0 , 0;
842# glVertex 0 , $h; 1007 glVertex 0 , $h;
843# glVertex $w, $h; 1008 glVertex $w, $h;
844# glVertex $w, 0; 1009 glVertex $w, 0;
845# glEnd; 1010 glEnd;
846 1011
847
848 $self->child->draw;
849 glDisable GL_BLEND; 1012 glDisable GL_BLEND;
850 glDisable GL_TEXTURE_2D; 1013 }
1014
1015 $self->SUPER::_draw;
851} 1016}
852 1017
853############################################################################# 1018#############################################################################
854 1019
855package CFClient::UI::FancyFrame; 1020package CFClient::UI::FancyFrame;
856 1021
857our @ISA = CFClient::UI::Bin::; 1022our @ISA = CFClient::UI::Bin::;
858 1023
859use CFClient::OpenGL; 1024use CFClient::OpenGL;
860 1025
861my @tex = 1026my $bg =
1027 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1028 mipmap => 1, wrap => 1;
1029
1030my @border =
862 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1031 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
863 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);
864 1033
865sub new { 1034sub new {
866 my $class = shift; 1035 my $class = shift;
867 1036
868 # TODO: user_x, user_y, overwrite moveto?
869
870 my $self = $class->SUPER::new ( 1037 my $self = $class->SUPER::new (
871 bg => [1, 1, 1, 1], 1038 bg => [1, 1, 1, 1],
872 border_bg => [1, 1, 1, 1], 1039 border_bg => [1, 1, 1, 1],
873 border => 0.6, 1040 border => 0.6,
874 can_events => 1, 1041 can_events => 1,
1042 min_w => 16,
1043 min_h => 16,
875 @_ 1044 @_
876 ); 1045 );
877 1046
878 $self->{title} &&= new CFClient::UI::Label 1047 $self->{title} &&= new CFClient::UI::Label
879 align => 0, 1048 align => 0,
… …
903 my ($self, $w, $h) = @_; 1072 my ($self, $w, $h) = @_;
904 1073
905 $h -= List::Util::max 0, $self->border * 2; 1074 $h -= List::Util::max 0, $self->border * 2;
906 $w -= List::Util::max 0, $self->border * 2; 1075 $w -= List::Util::max 0, $self->border * 2;
907 1076
908 $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)
909 if $self->{title}; 1078 if $self->{title};
910 1079
911 $self->child->configure ($self->border, $self->border, $w, $h); 1080 $self->child->configure ($self->border, $self->border, $w, $h);
912} 1081}
913 1082
… …
932 my ($ev, $x, $y) = @_; 1101 my ($ev, $x, $y) = @_;
933 1102
934 my $dx = $ev->{x} - $ox; 1103 my $dx = $ev->{x} - $ox;
935 my $dy = $ev->{y} - $oy; 1104 my $dy = $ev->{y} - $oy;
936 1105
937 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1106 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
938 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1107 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1108
1109 $self->realloc;
939 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1110 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
940 $self->check_size;
941 }; 1111 };
942 1112
943 } elsif ($lr ^ $td) { 1113 } elsif ($lr ^ $td) {
944 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1114 my ($ox, $oy) = ($ev->{x}, $ev->{y});
945 my ($bx, $by) = ($self->{x}, $self->{y}); 1115 my ($bx, $by) = ($self->{x}, $self->{y});
… …
947 $self->{motion} = sub { 1117 $self->{motion} = sub {
948 my ($ev, $x, $y) = @_; 1118 my ($ev, $x, $y) = @_;
949 1119
950 ($x, $y) = ($ev->{x}, $ev->{y}); 1120 ($x, $y) = ($ev->{x}, $ev->{y});
951 1121
952 $self->move ($bx + $x - $ox, $by + $y - $oy); 1122 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
953 $self->update;
954 }; 1123 };
955 } 1124 }
956} 1125}
957 1126
958sub button_up { 1127sub button_up {
… …
971 my ($self) = @_; 1140 my ($self) = @_;
972 1141
973 my ($w, $h ) = ($self->{w}, $self->{h}); 1142 my ($w, $h ) = ($self->{w}, $self->{h});
974 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1143 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
975 1144
976 glEnable GL_BLEND;
977 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
978 glEnable GL_TEXTURE_2D; 1145 glEnable GL_TEXTURE_2D;
979 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1146 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
980 1147
981 my $border = $self->border; 1148 my $border = $self->border;
982 1149
983 glColor @{ $self->{border_bg} }; 1150 glColor @{ $self->{border_bg} };
984 $tex[1]->draw_quad (0, 0, $w, $border); 1151 $border[0]->draw_quad_alpha (0, 0, $w, $border);
985 $tex[3]->draw_quad (0, $border, $border, $ch); 1152 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
986 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1153 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
987 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1154 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
988 1155
989 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1156 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
990 my $bg = $tex[0]; 1157 glColor @{ $self->{bg} };
991 1158
992 # TODO: repeat texture not scale 1159 # TODO: repeat texture not scale
1160 # solve this better(?)
993 my $rep_x = $cw / $bg->{w}; 1161 $bg->{s} = $cw / $bg->{w};
994 my $rep_y = $ch / $bg->{h}; 1162 $bg->{t} = $ch / $bg->{h};
995
996 glColor @{ $self->{bg} };
997
998 $bg->{s} = $rep_x;
999 $bg->{t} = $rep_y;
1000 $bg->{wrap_mode} = 1;
1001 $bg->draw_quad ($border, $border, $cw, $ch); 1163 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1164 }
1002 1165
1003 glDisable GL_TEXTURE_2D; 1166 glDisable GL_TEXTURE_2D;
1004 glDisable GL_BLEND;
1005 }
1006 1167
1007 $self->{title}->draw if $self->{title}; 1168 $self->{title}->draw if $self->{title};
1008 1169
1009 $self->child->draw; 1170 $self->child->draw;
1010} 1171}
… …
1022sub new { 1183sub new {
1023 my $class = shift; 1184 my $class = shift;
1024 1185
1025 $class->SUPER::new ( 1186 $class->SUPER::new (
1026 col_expand => [], 1187 col_expand => [],
1027 @_ 1188 @_,
1028 ) 1189 )
1190}
1191
1192sub children {
1193 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1029} 1194}
1030 1195
1031sub add { 1196sub add {
1032 my ($self, $x, $y, $child) = @_; 1197 my ($self, $x, $y, $child) = @_;
1033 1198
1034 $child->set_parent ($self); 1199 $child->set_parent ($self);
1035 $self->{children}[$y][$x] = $child; 1200 $self->{children}[$y][$x] = $child;
1036 1201
1037 $child->check_size; 1202 $self->realloc;
1038} 1203}
1039 1204
1040sub children {
1041 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1042}
1043
1044# 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?
1045sub clear { 1206sub clear {
1046 my ($self) = @_; 1207 my ($self) = @_;
1047 1208
1048 my @children = $self->children; 1209 my @children = $self->children;
1049 delete $self->{children}; 1210 delete $self->{children};
… …
1051 for (@children) { 1212 for (@children) {
1052 delete $_->{parent}; 1213 delete $_->{parent};
1053 $_->hide; 1214 $_->hide;
1054 } 1215 }
1055 1216
1056 $self->update; 1217 $self->realloc;
1057} 1218}
1058 1219
1059sub get_wh { 1220sub get_wh {
1060 my ($self) = @_; 1221 my ($self) = @_;
1061 1222
… …
1092sub size_allocate { 1253sub size_allocate {
1093 my ($self, $w, $h) = @_; 1254 my ($self, $w, $h) = @_;
1094 1255
1095 my ($ws, $hs) = $self->get_wh; 1256 my ($ws, $hs) = $self->get_wh;
1096 1257
1097 my $req_w = sum @$ws; 1258 my $req_w = (sum @$ws) || 1;
1098 my $req_h = sum @$hs; 1259 my $req_h = (sum @$hs) || 1;
1099 1260
1100 # TODO: nicer code && do row_expand 1261 # TODO: nicer code && do row_expand
1101 my @col_expand = @{$self->{col_expand}}; 1262 my @col_expand = @{$self->{col_expand}};
1102 @col_expand = (1) x @$ws unless @col_expand; 1263 @col_expand = (1) x @$ws unless @col_expand;
1103 my $col_expand = (sum @col_expand) || 1; 1264 my $col_expand = (sum @col_expand) || 1;
… …
1157 } 1318 }
1158} 1319}
1159 1320
1160############################################################################# 1321#############################################################################
1161 1322
1162package CFClient::UI::HBox; 1323package CFClient::UI::Box;
1163
1164# TODO: wrap into common Box base class
1165 1324
1166our @ISA = CFClient::UI::Container::; 1325our @ISA = CFClient::UI::Container::;
1167 1326
1168sub size_request { 1327sub size_request {
1169 my ($self) = @_; 1328 my ($self) = @_;
1170 1329
1171 my @alloc = map [$_->size_request], @{$self->{children}}; 1330 $self->{vertical}
1172 1331 ? (
1173 ( 1332 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1174 (List::Util::sum map $_->[0], @alloc), 1333 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1175 (List::Util::max map $_->[1], @alloc), 1334 )
1176 ) 1335 : (
1336 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1337 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1338 )
1177} 1339}
1178 1340
1179sub size_allocate { 1341sub size_allocate {
1180 my ($self, $w, $h) = @_; 1342 my ($self, $w, $h) = @_;
1181 1343
1182 ($h, $w) = ($w, $h); 1344 my $space = $self->{vertical} ? $h : $w;
1183
1184 my $children = $self->{children}; 1345 my $children = $self->{children};
1185 1346
1186 my @h = map $_->{req_w}, @$children; 1347 my @req;
1187 1348
1188 my $req_h = List::Util::sum @h; 1349 if ($self->{homogeneous}) {
1189 1350 @req = ($space / (@$children || 1)) x @$children;
1190 if ($req_h > $h) {
1191 # ah well, not enough space
1192 $_ *= $h / $req_h for @h;
1193 } 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 {
1194 my $exp = List::Util::sum map $_->{expand}, @$children; 1359 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1195 $exp ||= 1;
1196 1360
1361 $space = ($space - $req) / $expand; # remaining space to give away
1362
1363 $req[$_] += $space * $children->[$_]{expand}
1197 for (0 .. $#$children) { 1364 for 0 .. $#$children;
1198 my $child = $children->[$_];
1199
1200 my $alloc_h = $h[$_];
1201 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1202 $h[$_] = $alloc_h;
1203 } 1365 }
1204 } 1366 }
1205 1367
1206 CFClient::UI::harmonize \@h; 1368 CFClient::UI::harmonize \@req;
1207 1369
1208 my $y = 0; 1370 my $pos = 0;
1209 for (0 .. $#$children) { 1371 for (0 .. $#$children) {
1210 my $child = $children->[$_];
1211 my $h = $h[$_]; 1372 my $alloc = $req[$_];
1212 $child->configure ($y, 0, $h, $w); 1373 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1213 1374
1214 $y += $h; 1375 $pos += $alloc;
1215 } 1376 }
1216 1377
1217 1 1378 1
1218} 1379}
1219 1380
1220############################################################################# 1381#############################################################################
1221 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
1222package CFClient::UI::VBox; 1398package CFClient::UI::VBox;
1223 1399
1224# TODO: wrap into common Box base class
1225
1226our @ISA = CFClient::UI::Container::; 1400our @ISA = CFClient::UI::Box::;
1227 1401
1228sub size_request { 1402sub new {
1229 my ($self) = @_; 1403 my $class = shift;
1230 1404
1231 my @alloc = map [$_->size_request], @{$self->{children}}; 1405 $class->SUPER::new (
1232 1406 vertical => 1,
1233 ( 1407 @_,
1234 (List::Util::max map $_->[0], @alloc),
1235 (List::Util::sum map $_->[1], @alloc),
1236 ) 1408 )
1237} 1409}
1238 1410
1239sub size_allocate {
1240 my ($self, $w, $h) = @_;
1241
1242 my $children = $self->{children};
1243
1244 my @h = map $_->{req_h}, @$children;
1245
1246 my $req_h = List::Util::sum @h;
1247
1248 if ($req_h > $h) {
1249 # ah well, not enough space
1250 $_ *= $h / $req_h for @h;
1251 } else {
1252 my $exp = List::Util::sum map $_->{expand}, @$children;
1253 $exp ||= 1;
1254
1255 for (0 .. $#$children) {
1256 my $child = $children->[$_];
1257
1258 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1259 }
1260 }
1261
1262 CFClient::UI::harmonize \@h;
1263
1264 my $y = 0;
1265 for (0 .. $#$children) {
1266 my $child = $children->[$_];
1267 my $h = $h[$_];
1268 $child->configure (0, $y, $w, $h);
1269
1270 $y += $h;
1271 }
1272
1273 1
1274}
1275
1276############################################################################# 1411#############################################################################
1277 1412
1278package CFClient::UI::Label; 1413package CFClient::UI::Label;
1279 1414
1280our @ISA = CFClient::UI::Base::; 1415our @ISA = CFClient::UI::DrawBG::;
1281 1416
1282use CFClient::OpenGL; 1417use CFClient::OpenGL;
1283 1418
1284sub new { 1419sub new {
1285 my ($class, %arg) = @_; 1420 my ($class, %arg) = @_;
1286 1421
1287 my $self = $class->SUPER::new ( 1422 my $self = $class->SUPER::new (
1288 fg => [1, 1, 1], 1423 fg => [1, 1, 1],
1424 #bg => none
1425 #active_bg => none
1289 #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),
1290 fontsize => 1, 1432 fontsize => 1,
1291 text => "",
1292 align => -1, 1433 align => -1,
1293 valign => -1, 1434 valign => -1,
1294 padding => 2, 1435 padding_x => 2,
1295 layout => new CFClient::Layout, 1436 padding_y => 2,
1296 can_events => 0, 1437 can_events => 0,
1297 %arg 1438 %arg
1298 ); 1439 );
1299 1440
1300 if (exists $self->{template}) { 1441 if (exists $self->{template}) {
1301 my $layout = new CFClient::Layout; 1442 my $layout = new CFClient::Layout;
1302 $layout->set_text (delete $self->{template}); 1443 $layout->set_text (delete $self->{template});
1303 $self->{template} = $layout; 1444 $self->{template} = $layout;
1304 } 1445 }
1305 1446
1306 $self->set_text (delete $self->{text}) if exists $self->{text}; 1447 if (exists $self->{markup}) {
1307 $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 }
1308 1452
1309 $self 1453 $self
1310} 1454}
1311 1455
1312sub escape { 1456sub escape($) {
1313 local $_ = $_[1]; 1457 local $_ = $_[0];
1314 1458
1315 s/&/&amp;/g; 1459 s/&/&amp;/g;
1316 s/>/&gt;/g; 1460 s/>/&gt;/g;
1317 s/</&lt;/g; 1461 s/</&lt;/g;
1318 1462
1319 $_[1] 1463 $_
1320} 1464}
1321 1465
1322sub update { 1466sub update {
1323 my ($self) = @_; 1467 my ($self) = @_;
1324 1468
… …
1330 my ($self, $text) = @_; 1474 my ($self, $text) = @_;
1331 1475
1332 return if $self->{text} eq "T$text"; 1476 return if $self->{text} eq "T$text";
1333 $self->{text} = "T$text"; 1477 $self->{text} = "T$text";
1334 1478
1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1335 $self->{layout}->set_text ($text); 1480 $self->{layout}->set_text ($text);
1336 1481
1337 delete $self->{texture}; 1482 $self->realloc;
1338 $self->update; 1483 $self->update;
1339 $self->check_size;
1340} 1484}
1341 1485
1342sub set_markup { 1486sub set_markup {
1343 my ($self, $markup) = @_; 1487 my ($self, $markup) = @_;
1344 1488
1345 return if $self->{text} eq "M$markup"; 1489 return if $self->{text} eq "M$markup";
1346 $self->{text} = "M$markup"; 1490 $self->{text} = "M$markup";
1347 1491
1492 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493
1494 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1348 $self->{layout}->set_markup ($markup); 1495 $self->{layout}->set_markup ($markup);
1349 1496
1350 delete $self->{texture}; 1497 $self->realloc;
1351 $self->update; 1498 $self->update;
1352 $self->check_size;
1353} 1499}
1354 1500
1355sub size_request { 1501sub size_request {
1356 my ($self) = @_; 1502 my ($self) = @_;
1357 1503
1358 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1504 $self->{layout}->set_font ($self->{font}) if $self->{font};
1359 $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});
1360 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1361 1509
1362 my ($w, $h) = $self->{layout}->size; 1510 my ($w, $h) = $self->{layout}->size;
1363 1511
1364 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1369 1517
1370 $w = List::Util::max $w, $w2; 1518 $w = List::Util::max $w, $w2;
1371 $h = List::Util::max $h, $h2; 1519 $h = List::Util::max $h, $h2;
1372 } 1520 }
1373 1521
1374 ( 1522 ($w, $h)
1375 $w + $self->{padding} * 2,
1376 $h + $self->{padding} * 2,
1377 )
1378} 1523}
1379 1524
1380sub size_allocate { 1525sub size_allocate {
1381 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1382 1527
1383 delete $self->{texture}; 1528 delete $self->{texture}
1529 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1384} 1530}
1385 1531
1386sub set_fontsize { 1532sub set_fontsize {
1387 my ($self, $fontsize) = @_; 1533 my ($self, $fontsize) = @_;
1388 1534
1389 $self->{fontsize} = $fontsize; 1535 $self->{fontsize} = $fontsize;
1390 delete $self->{texture}; 1536 delete $self->{texture};
1391 1537
1392 $self->update; 1538 $self->realloc;
1393 $self->check_size;
1394} 1539}
1395 1540
1396sub _draw { 1541sub _draw {
1397 my ($self) = @_; 1542 my ($self) = @_;
1398 1543
1544 $self->SUPER::_draw; # draw background, if applicable
1545
1399 my $tex = $self->{texture} ||= do { 1546 my $tex = $self->{texture} ||= do {
1547 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1548 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $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});
1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1552 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1553
1403 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
1404 }; 1565 };
1405 1566
1406 glEnable GL_BLEND;
1407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1408 glEnable GL_TEXTURE_2D; 1567 glEnable GL_TEXTURE_2D;
1409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1568 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1410 1569
1570 if ($tex->{format} == GL_ALPHA) {
1411 glColor @{$self->{fg}}; 1571 glColor @{$self->{fg}};
1412
1413 $self->{ox} = int (
1414 $self->{align} < 0 ? $self->{padding}
1415 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1416 : ($self->{w} - $tex->{w}) * 0.5
1417 );
1418
1419 $self->{oy} = int (
1420 $self->{valign} < 0 ? $self->{padding}
1421 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1422 : ($self->{h} - $tex->{h}) * 0.5
1423 );
1424
1425 $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 }
1426 1576
1427 glDisable GL_TEXTURE_2D; 1577 glDisable GL_TEXTURE_2D;
1428 glDisable GL_BLEND;
1429} 1578}
1430 1579
1431############################################################################# 1580#############################################################################
1432 1581
1433package CFClient::UI::EntryBase; 1582package CFClient::UI::EntryBase;
… …
1446 active_fg => [0, 0, 0], 1595 active_fg => [0, 0, 0],
1447 can_hover => 1, 1596 can_hover => 1,
1448 can_focus => 1, 1597 can_focus => 1,
1449 valign => 0, 1598 valign => 0,
1450 can_events => 1, 1599 can_events => 1,
1600 #text => ...
1451 @_ 1601 @_
1452 ) 1602 )
1453} 1603}
1454 1604
1455sub _set_text { 1605sub _set_text {
… …
1465 $self->{text} = $text; 1615 $self->{text} = $text;
1466 1616
1467 $text =~ s/./*/g if $self->{hidden}; 1617 $text =~ s/./*/g if $self->{hidden};
1468 $self->{layout}->set_text ("$text "); 1618 $self->{layout}->set_text ("$text ");
1469 1619
1470 $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;
1471} 1630}
1472 1631
1473sub get_text { 1632sub get_text {
1474 $_[0]{text} 1633 $_[0]{text}
1475} 1634}
… …
1478 my ($self) = @_; 1637 my ($self) = @_;
1479 1638
1480 my ($w, $h) = $self->SUPER::size_request; 1639 my ($w, $h) = $self->SUPER::size_request;
1481 1640
1482 ($w + 1, $h) # add 1 for cursor 1641 ($w + 1, $h) # add 1 for cursor
1483}
1484
1485sub size_allocate {
1486 my ($self, $w, $h) = @_;
1487
1488 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1489}
1490
1491sub set_text {
1492 my ($self, $text) = @_;
1493
1494 $self->{cursor} = length $text;
1495 $self->_set_text ($text);
1496 $self->update;
1497} 1642}
1498 1643
1499sub key_down { 1644sub key_down {
1500 my ($self, $ev) = @_; 1645 my ($self, $ev) = @_;
1501 1646
… …
1503 my $sym = $ev->{sym}; 1648 my $sym = $ev->{sym};
1504 my $uni = $ev->{unicode}; 1649 my $uni = $ev->{unicode};
1505 1650
1506 my $text = $self->get_text; 1651 my $text = $self->get_text;
1507 1652
1508 if ($sym == 8) { 1653 if ($uni == 8) {
1509 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1654 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1510 } elsif ($sym == 127) { 1655 } elsif ($uni == 127) {
1511 substr $text, $self->{cursor}, 1, ""; 1656 substr $text, $self->{cursor}, 1, "";
1512 } elsif ($sym == CFClient::SDLK_LEFT) { 1657 } elsif ($sym == CFClient::SDLK_LEFT) {
1513 --$self->{cursor} if $self->{cursor}; 1658 --$self->{cursor} if $self->{cursor};
1514 } elsif ($sym == CFClient::SDLK_RIGHT) { 1659 } elsif ($sym == CFClient::SDLK_RIGHT) {
1515 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1660 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1516 } elsif ($sym == CFClient::SDLK_HOME) { 1661 } elsif ($sym == CFClient::SDLK_HOME) {
1517 $self->{cursor} = 0; 1662 $self->{cursor} = 0;
1518 } elsif ($sym == CFClient::SDLK_END) { 1663 } elsif ($sym == CFClient::SDLK_END) {
1519 $self->{cursor} = length $text; 1664 $self->{cursor} = length $text;
1520 } elsif ($sym == 27) { 1665 } elsif ($uni == 27) {
1521 $self->emit ('escape'); 1666 $self->_emit ('escape');
1522 } elsif ($uni) { 1667 } elsif ($uni) {
1523 substr $text, $self->{cursor}++, 0, chr $uni; 1668 substr $text, $self->{cursor}++, 0, chr $uni;
1524 } 1669 }
1525 1670
1526 $self->_set_text ($text); 1671 $self->_set_text ($text);
1527 $self->update; 1672
1673 $self->realloc;
1528} 1674}
1529 1675
1530sub focus_in { 1676sub focus_in {
1531 my ($self) = @_; 1677 my ($self) = @_;
1532 1678
… …
1612 if ($sym == 13) { 1758 if ($sym == 13) {
1613 unshift @{$self->{history}}, 1759 unshift @{$self->{history}},
1614 my $txt = $self->get_text; 1760 my $txt = $self->get_text;
1615 $self->{history_pointer} = -1; 1761 $self->{history_pointer} = -1;
1616 $self->{history_saveback} = ''; 1762 $self->{history_saveback} = '';
1617 $self->emit (activate => $txt); 1763 $self->_emit (activate => $txt);
1618 $self->update; 1764 $self->update;
1619 1765
1620 } elsif ($sym == CFClient::SDLK_UP) { 1766 } elsif ($sym == CFClient::SDLK_UP) {
1621 if ($self->{history_pointer} < 0) { 1767 if ($self->{history_pointer} < 0) {
1622 $self->{history_saveback} = $self->get_text; 1768 $self->{history_saveback} = $self->get_text;
… …
1659 1805
1660sub new { 1806sub new {
1661 my $class = shift; 1807 my $class = shift;
1662 1808
1663 $class->SUPER::new ( 1809 $class->SUPER::new (
1664 padding => 4, 1810 padding_x => 4,
1811 padding_y => 4,
1665 fg => [1, 1, 1], 1812 fg => [1, 1, 1],
1666 bg => [1, 1, 1, 0.2],
1667 active_fg => [0, 0, 1], 1813 active_fg => [0, 0, 1],
1668 can_hover => 1, 1814 can_hover => 1,
1669 align => 0, 1815 align => 0,
1670 valign => 0, 1816 valign => 0,
1671 can_events => 1, 1817 can_events => 1,
1672 @_ 1818 @_
1673 ) 1819 )
1674} 1820}
1675 1821
1822sub activate { }
1823
1676sub button_up { 1824sub button_up {
1677 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1678 1826
1827 $self->emit ("activate")
1679 if ($x >= 0 && $x < $self->{w} 1828 if $x >= 0 && $x < $self->{w}
1680 && $y >= 0 && $y < $self->{h}) { 1829 && $y >= 0 && $y < $self->{h};
1681 $self->emit ("activate");
1682 }
1683} 1830}
1684 1831
1685sub _draw { 1832sub _draw {
1686 my ($self) = @_; 1833 my ($self) = @_;
1687 1834
… …
1689 1836
1690 if ($GRAB == $self) { 1837 if ($GRAB == $self) {
1691 $self->{fg} = $self->{active_fg}; 1838 $self->{fg} = $self->{active_fg};
1692 } 1839 }
1693 1840
1694 glEnable GL_BLEND;
1695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1696 glEnable GL_TEXTURE_2D; 1841 glEnable GL_TEXTURE_2D;
1697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1842 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1698 glColor 0, 0, 0, 1; 1843 glColor 0, 0, 0, 1;
1699 1844
1700 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1845 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1701 1846
1702 glDisable GL_TEXTURE_2D; 1847 glDisable GL_TEXTURE_2D;
1703 glDisable GL_BLEND;
1704 1848
1705 $self->SUPER::_draw; 1849 $self->SUPER::_draw;
1706} 1850}
1707 1851
1708############################################################################# 1852#############################################################################
… …
1719 1863
1720sub new { 1864sub new {
1721 my $class = shift; 1865 my $class = shift;
1722 1866
1723 $class->SUPER::new ( 1867 $class->SUPER::new (
1724 padding => 2, 1868 padding_x => 2,
1869 padding_y => 2,
1725 fg => [1, 1, 1], 1870 fg => [1, 1, 1],
1726 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],
1727 state => 0, 1874 state => 0,
1728 can_hover => 1, 1875 can_hover => 1,
1729 @_ 1876 @_
1730 ) 1877 )
1731} 1878}
1732 1879
1733sub size_request { 1880sub size_request {
1734 my ($self) = @_; 1881 my ($self) = @_;
1735 1882
1736 ($self->{padding} * 2 + 6) x 2 1883 (6) x 2
1737} 1884}
1738 1885
1739sub button_down { 1886sub button_down {
1740 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1741 1888
1742 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1889 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1743 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1890 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1744 $self->{state} = !$self->{state}; 1891 $self->{state} = !$self->{state};
1745 $self->emit (changed => $self->{state}); 1892 $self->_emit (changed => $self->{state});
1746 } 1893 }
1747} 1894}
1748 1895
1749sub _draw { 1896sub _draw {
1750 my ($self) = @_; 1897 my ($self) = @_;
1751 1898
1752 $self->SUPER::_draw; 1899 $self->SUPER::_draw;
1753 1900
1754 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1901 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1755 1902
1756 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;
1757 1906
1758 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1907 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1759 1908
1760 glEnable GL_BLEND; 1909 my $tex = $self->{state} ? $tex[1] : $tex[0];
1910
1761 glEnable GL_TEXTURE_2D; 1911 glEnable GL_TEXTURE_2D;
1762 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1763
1764 my $tex = $self->{state} ? $tex[1] : $tex[0];
1765
1766 $tex->draw_quad (0, 0, $s, $s); 1912 $tex->draw_quad_alpha (0, 0, $s, $s);
1767
1768 glDisable GL_TEXTURE_2D; 1913 glDisable GL_TEXTURE_2D;
1769 glDisable GL_BLEND;
1770} 1914}
1771 1915
1772############################################################################# 1916#############################################################################
1773 1917
1774package CFClient::UI::Image; 1918package CFClient::UI::Image;
… …
1817 glTranslate 0, -$self->{w}, 0; 1961 glTranslate 0, -$self->{w}, 0;
1818 1962
1819 ($w, $h) = ($h, $w); 1963 ($w, $h) = ($h, $w);
1820 } 1964 }
1821 1965
1822 glEnable GL_BLEND;
1823 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1824 glEnable GL_TEXTURE_2D; 1966 glEnable GL_TEXTURE_2D;
1825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1967 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1826 1968
1827 $tex->draw_quad (0, 0, $w, $h); 1969 $tex->draw_quad_alpha (0, 0, $w, $h);
1828 1970
1829 glDisable GL_BLEND;
1830 glDisable GL_TEXTURE_2D; 1971 glDisable GL_TEXTURE_2D;
1831} 1972}
1832 1973
1833############################################################################# 1974#############################################################################
1834 1975
… …
2023 qw(s1_slider.png s1_slider_bg.png); 2164 qw(s1_slider.png s1_slider_bg.png);
2024 2165
2025sub new { 2166sub new {
2026 my $class = shift; 2167 my $class = shift;
2027 2168
2028 # range [value, low, high, page] 2169 # range [value, low, high, page, unit]
2029 2170
2030 # TODO: 0-width page 2171 # TODO: 0-width page
2031 # TODO: req_w/h are wrong with vertical 2172 # TODO: req_w/h are wrong with vertical
2032 # TODO: calculations are off 2173 # TODO: calculations are off
2033 my $self = $class->SUPER::new ( 2174 my $self = $class->SUPER::new (
2034 fg => [1, 1, 1], 2175 fg => [1, 1, 1],
2035 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],
2036 range => [0, 0, 100, 10], 2179 range => [0, 0, 100, 10, 0],
2037 req_w => $::WIDTH / 80, 2180 min_w => $::WIDTH / 80,
2038 req_h => $::WIDTH / 80, 2181 min_h => $::WIDTH / 80,
2039 vertical => 0, 2182 vertical => 0,
2040 can_hover => 1, 2183 can_hover => 1,
2041 inner_pad => 5, 2184 inner_pad => 0.02,
2042 @_ 2185 @_
2043 ); 2186 );
2044 2187
2188 $self->set_value ($self->{range}[0]);
2189 $self->update;
2190
2045 $self 2191 $self
2046} 2192}
2047 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
2048sub size_request { 2228sub size_request {
2049 my ($self) = @_; 2229 my ($self) = @_;
2050 2230
2051 my $w = $self->{req_w}; 2231 ($self->{req_w}, $self->{req_h})
2052 my $h = $self->{req_h};
2053
2054 $self->{vertical} ? ($h, $w) : ($w, $h)
2055} 2232}
2056 2233
2057sub button_down { 2234sub button_down {
2058 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
2059 2236
2060 $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
2061 $self->mouse_motion ($ev, $x, $y); 2241 $self->mouse_motion ($ev, $x, $y);
2062} 2242}
2063 2243
2064sub mouse_motion { 2244sub mouse_motion {
2065 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
2066 2246
2067 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
2068 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2264 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100;
2069 2266
2070 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2267 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2071 2268
2072 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2269 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2073 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2270 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2074 2271
2075 $x -= $inner_pad_px; # substract the padding 2272 $value = ($value - $lo) / $range;
2076 $x = $x * ($hi - $lo) / $inner_w + $lo; 2273 $value = $value * $self->{scale} + $self->{offset};
2077 $x = $lo if $x < $lo;
2078 $x = $hi - $page if $x > $hi - $page;
2079 $self->{range}[0] = $x;
2080 2274
2081 $self->emit (changed => $x); 2275 $self->{knob_x} = $value - $knob_w * 0.5;
2082 $self->update; 2276 $self->{knob_w} = $knob_w;
2083 } 2277 });
2084}
2085 2278
2086# the inner_* stuff is for generating a padding for the slider handle, 2279 $self->SUPER::update;
2087# so that the handle doesn't leave the texture. This calculation isn't 100%
2088# correct propably, but it does the job for now
2089sub _calc_inner_pad_px {
2090 my ($self, $w) = @_;
2091 ($w / 100) * $self->{inner_pad} # % to pixels
2092} 2280}
2093 2281
2094sub _draw { 2282sub _draw {
2095 my ($self) = @_; 2283 my ($self) = @_;
2096 2284
2097 $self->SUPER::_draw (); 2285 $self->SUPER::_draw ();
2098 2286
2099 my ($w, $h) = @$self{qw(w h)}; 2287 glScale $self->{w}, $self->{h};
2100 2288
2101 if ($self->{vertical}) { 2289 if ($self->{vertical}) {
2102 # draw a vertical slider like a rotated horizontal slider 2290 # draw a vertical slider like a rotated horizontal slider
2103 2291
2292 glTranslate 1, 0, 0;
2104 glRotate 90, 0, 0, 1; 2293 glRotate 90, 0, 0, 1;
2105 glTranslate 0, -$self->{w}, 0;
2106
2107 ($w, $h) = ($h, $w);
2108 } 2294 }
2109 2295
2110 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2296 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2111 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2297 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2112 2298
2113 my ($value, $lo, $hi, $page) = @{$self->{range}};
2114
2115 $hi = $value + 1 if $lo == $hi;
2116
2117 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2118 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2119
2120 $page = int $page * $inner_w / ($hi - $lo);
2121 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2122
2123 $w -= $page;
2124 $page &= ~1;
2125 glTranslate $page * 0.5, 0, 0;
2126 $page ||= 2;
2127
2128 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2129 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2130
2131 glEnable GL_BLEND;
2132 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2133 glEnable GL_TEXTURE_2D; 2299 glEnable GL_TEXTURE_2D;
2134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2300 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2135 2301
2136 # draw background 2302 # draw background
2137 $tex[1]->draw_quad (0, 0, $w, $h); 2303 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2138 2304
2139 # draw handle 2305 # draw handle
2140 $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);
2141 2307
2142 glDisable GL_BLEND;
2143 glDisable GL_TEXTURE_2D; 2308 glDisable GL_TEXTURE_2D;
2144} 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 (@_) }
2145 2351
2146############################################################################# 2352#############################################################################
2147 2353
2148package CFClient::UI::TextView; 2354package CFClient::UI::TextView;
2149 2355
… …
2158 fontsize => 1, 2364 fontsize => 1,
2159 can_events => 0, 2365 can_events => 0,
2160 #font => default_font 2366 #font => default_font
2161 @_, 2367 @_,
2162 2368
2163 layout => (new CFClient::Layout), 2369 layout => (new CFClient::Layout 1),
2164 par => [], 2370 par => [],
2165 height => 0, 2371 height => 0,
2166 children => [ 2372 children => [
2167 (new CFClient::UI::Empty expand => 1), 2373 (new CFClient::UI::Empty expand => 1),
2168 (new CFClient::UI::Slider vertical => 1), 2374 (new CFClient::UI::Slider vertical => 1),
… …
2179 2385
2180 $self->{fontsize} = $fontsize; 2386 $self->{fontsize} = $fontsize;
2181 $self->reflow; 2387 $self->reflow;
2182} 2388}
2183 2389
2184sub text_height {
2185 my ($self, $text) = @_;
2186
2187 my $layout = $self->{layout};
2188
2189 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2190 $layout->set_width ($self->{children}[0]{w});
2191 $layout->set_text ($text);
2192
2193 ($layout->size)[1]
2194}
2195
2196sub reflow {
2197 my ($self) = @_;
2198
2199 $self->{need_reflow}++;
2200 $self->update;
2201}
2202
2203sub size_allocate { 2390sub size_allocate {
2204 my ($self, $w, $h) = @_; 2391 my ($self, $w, $h) = @_;
2205 2392
2206 $self->SUPER::size_allocate ($w, $h); 2393 $self->SUPER::size_allocate ($w, $h);
2207 2394
… …
2210 $self->{layout}->set_width ($self->{children}[0]{w}); 2397 $self->{layout}->set_width ($self->{children}[0]{w});
2211 2398
2212 $self->reflow; 2399 $self->reflow;
2213} 2400}
2214 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
2215sub add_paragraph { 2436sub add_paragraph {
2216 my ($self, $color, $text) = @_; 2437 my ($self, $color, $text, $indent) = @_;
2217 2438
2218 #TODO: intelligently "reformat" paragraph 2439 for my $line (split /\n/, $text) {
2219 2440 my ($w, $h) = $self->text_size ($line);
2220 my $height = $self->text_height ($text);
2221
2222 $self->{height} += $height; 2441 $self->{height} += $h;
2442 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2443 }
2223 2444
2224 push @{$self->{par}}, [$height, $color, $text];
2225
2226 $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]);
2227 $self->{children}[1]->update;
2228} 2446}
2229 2447
2230sub update { 2448sub update {
2231 my ($self) = @_; 2449 my ($self) = @_;
2232 2450
… …
2234 2452
2235 return unless $self->{h} > 0; 2453 return unless $self->{h} > 0;
2236 2454
2237 delete $self->{texture}; 2455 delete $self->{texture};
2238 2456
2239 $ROOT->on_refresh ($self, sub { 2457 $ROOT->on_post_alloc ($self, sub {
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459
2240 if (delete $self->{need_reflow}) { 2460 if (delete $self->{need_reflow}) {
2241 my $height = 0; 2461 my $height = 0;
2242 2462
2243 $height += $_->[0] = $self->text_height ($_->[2]) 2463 my $layout = $self->{layout};
2464
2465 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2466
2244 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 }
2245 2478
2246 $self->{height} = $height; 2479 $self->{height} = $height;
2247 2480
2248 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2481 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2249 2482
2250 delete $self->{texture}; 2483 delete $self->{texture};
2251 } 2484 }
2252 2485
2253 $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 {
2254 glClearColor 0, 0, 0, 0; 2487 glClearColor 0.5, 0.5, 0.5, 0;
2255 glClear GL_COLOR_BUFFER_BIT; 2488 glClear GL_COLOR_BUFFER_BIT;
2256 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
2257 glEnable GL_BLEND; 2501 glEnable GL_BLEND;
2502 #TODO# not correct in windows where rgba is forced off
2258 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2503 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2259 glEnable GL_TEXTURE_2D;
2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261
2262 my $top = int $self->{children}[1]{range}[0];
2263
2264 my $y0 = $top;
2265 my $y1 = $top + $self->{h};
2266
2267 my $y = 0;
2268
2269 my $layout = $self->{layout};
2270
2271 $layout->set_font ($self->{font}) if $self->{font};
2272 2504
2273 for my $par (@{$self->{par}}) { 2505 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2506 my $h = $par->[1];
2275 2507
2276 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]);
2277 $layout->set_text ($par->[2]); 2511 $layout->set_markup ($par->[4]);
2278 2512
2279 glColor @{ $par->[1] }; 2513 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280 my ($W, $H) = $layout->size; 2514
2281 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;
2282 } 2517 }
2283 2518
2284 $y += $h; 2519 $y += $h;
2285 } 2520 }
2286 2521
2287 glDisable GL_TEXTURE_2D;
2288 glDisable GL_BLEND; 2522 glDisable GL_BLEND;
2289 }; 2523 };
2290 }); 2524 });
2291} 2525}
2292 2526
2293sub _draw { 2527sub _draw {
2294 my ($self) = @_; 2528 my ($self) = @_;
2295 2529
2296 glEnable GL_BLEND;
2297 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2298 glEnable GL_TEXTURE_2D; 2530 glEnable GL_TEXTURE_2D;
2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2300 glColor 1, 1, 1, 1; 2532 glColor 1, 1, 1, 1;
2301 $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});
2302 glDisable GL_TEXTURE_2D; 2534 glDisable GL_TEXTURE_2D;
2303 glDisable GL_BLEND;
2304 2535
2305 $self->{children}[1]->draw; 2536 $self->{children}[1]->draw;
2306 2537
2307} 2538}
2308 2539
… …
2356 2587
2357sub new { 2588sub new {
2358 my $class = shift; 2589 my $class = shift;
2359 2590
2360 my $self = $class->SUPER::new ( 2591 my $self = $class->SUPER::new (
2361 state => 0, 2592 state => 0,
2362 connect_activate => \&toggle_flopper, 2593 on_activate => \&toggle_flopper,
2363 @_ 2594 @_
2364 ); 2595 );
2365 2596
2366 if ($self->{state}) {
2367 $self->{state} = 0;
2368 $self->toggle_flopper;
2369 }
2370
2371 $self 2597 $self
2372} 2598}
2373 2599
2374sub toggle_flopper { 2600sub toggle_flopper {
2375 my ($self) = @_; 2601 my ($self) = @_;
2376 2602
2377 # TODO: use animation 2603 $self->{other}->toggle_visibility;
2378 if ($self->{state} = !$self->{state}) {
2379 $CFClient::UI::ROOT->add ($self->{other});
2380 $self->{other}->move ($self->coord2global (0, $self->{h}));
2381 $self->emit ("open");
2382 } else {
2383 $CFClient::UI::ROOT->remove ($self->{other});
2384 $self->emit ("close");
2385 }
2386
2387 $self->emit (changed => $self->{state});
2388} 2604}
2389 2605
2390############################################################################# 2606#############################################################################
2391 2607
2392package CFClient::UI::Tooltip; 2608package CFClient::UI::Tooltip;
… …
2402 @_, 2618 @_,
2403 can_events => 0, 2619 can_events => 0,
2404 ) 2620 )
2405} 2621}
2406 2622
2407sub set_markup { 2623sub set_tooltip_from {
2408 my ($self, $text) = @_; 2624 my ($self, $widget) = @_;
2409 2625
2410 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2626 my $tooltip = $widget->{tooltip};
2411 $self->{label}->set_markup ($text); 2627
2412 $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 );
2413} 2643}
2414 2644
2415sub size_request { 2645sub size_request {
2416 my ($self) = @_; 2646 my ($self) = @_;
2417
2418 $self->child->set_max_size ($::WIDTH * 0.3);
2419 2647
2420 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2648 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2421 2649
2422 ($w + 4, $h + 4) 2650 ($w + 4, $h + 4)
2423} 2651}
… …
2426 my ($self, $w, $h) = @_; 2654 my ($self, $w, $h) = @_;
2427 2655
2428 $self->SUPER::size_allocate ($w - 4, $h - 4); 2656 $self->SUPER::size_allocate ($w - 4, $h - 4);
2429} 2657}
2430 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
2431sub _draw { 2677sub _draw {
2432 my ($self) = @_; 2678 my ($self) = @_;
2433 2679
2434 glPushMatrix;
2435 glTranslate 0.375, 0.375; 2680 glTranslate 0.375, 0.375;
2436 2681
2437 my ($w, $h) = @$self{qw(w h)}; 2682 my ($w, $h) = @$self{qw(w h)};
2438 2683
2439 glColor 1, 0.8, 0.4; 2684 glColor 1, 0.8, 0.4;
… …
2450 glVertex 0 , $h; 2695 glVertex 0 , $h;
2451 glVertex $w, $h; 2696 glVertex $w, $h;
2452 glVertex $w, 0; 2697 glVertex $w, 0;
2453 glEnd; 2698 glEnd;
2454 2699
2455 glPopMatrix; 2700 glTranslate 2 - 0.375, 2 - 0.375;
2456 2701
2457 glTranslate 2, 2;
2458 $self->SUPER::_draw; 2702 $self->SUPER::_draw;
2459} 2703}
2460 2704
2461############################################################################# 2705#############################################################################
2462 2706
… …
2467use CFClient::OpenGL; 2711use CFClient::OpenGL;
2468 2712
2469sub new { 2713sub new {
2470 my $class = shift; 2714 my $class = shift;
2471 2715
2472 $class->SUPER::new ( 2716 my $self = $class->SUPER::new (
2473 aspect => 1, 2717 aspect => 1,
2718 can_events => 0,
2474 @_, 2719 @_,
2475 ) 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
2476} 2737}
2477 2738
2478sub size_request { 2739sub size_request {
2479 (32, 8) 2740 (32, 8)
2480} 2741}
2481 2742
2743sub update {
2744 my ($self) = @_;
2745
2746 return unless $self->{visible};
2747
2748 $self->SUPER::update;
2749}
2750
2482sub _draw { 2751sub _draw {
2483 my ($self) = @_; 2752 my ($self) = @_;
2484 2753
2485 return unless $::CONN;#d# manage and cache textures differently 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
2486 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2765 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2487 2766
2488 # TODO animation
2489 if ($tex) { 2767 if ($tex) {
2490 glEnable GL_BLEND;
2491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2492 glEnable GL_TEXTURE_2D; 2768 glEnable GL_TEXTURE_2D;
2493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2494 glColor 1, 1, 1, 1; 2770 glColor 1, 1, 1, 1;
2495 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2771 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2496 glDisable GL_TEXTURE_2D; 2772 glDisable GL_TEXTURE_2D;
2497 glDisable GL_BLEND;
2498 } 2773 }
2499} 2774}
2500 2775
2501############################################################################# 2776sub DESTROY {
2502
2503package CFClient::UI::InventoryItem;
2504
2505our @ISA = CFClient::UI::HBox::;
2506
2507sub new {
2508 my $class = shift;
2509
2510 my %args = @_;
2511
2512 my $item = $args{item};
2513
2514 my $desc = $item->{nrof} < 2
2515 ? $item->{name}
2516 : "$item->{nrof} $item->{name_pl}";
2517
2518
2519 my $self = $class->SUPER::new (
2520 can_hover => 1,
2521 can_events => 1,
2522 tooltip => (CFClient::UI::Label->escape ($desc)
2523 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2524 connect_button_down => sub {
2525 my ($self, $ev, $x, $y) = @_;
2526
2527 # todo: maybe put examine on 1? but should just be a tooltip :(
2528 if ($ev->{button} == 1) {
2529 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2530 } elsif ($ev->{button} == 2) {
2531 $::CONN->send ("apply $item->{tag}");
2532 } elsif ($ev->{button} == 3) {
2533 CFClient::UI::Menu->new (
2534 items => [
2535 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2536 [
2537 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2538 sub { $::CONN->send ("lock $item->{tag}") },
2539 ],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2542 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2543 ],
2544 )->popup ($ev);
2545 }
2546
2547 1
2548 },
2549 %args
2550 );
2551 $self->add(new CFClient::UI::Face
2552 can_events => 0,
2553 face => $item->{face},
2554 anim => $item->{anim},
2555 animspeed => $item->{animspeed});
2556 $self->add(new CFClient::UI::Label
2557 can_events => 0,
2558 text => $desc);
2559
2560 $self
2561}
2562
2563#############################################################################
2564
2565package CFClient::UI::Inventory;
2566
2567our @ISA = CFClient::UI::ScrolledWindow::;
2568
2569sub new {
2570 my $class = shift;
2571
2572 my $self = $class->SUPER::new (
2573 scrolled => (new CFClient::UI::VBox),
2574 @_,
2575 );
2576
2577 $self
2578}
2579
2580sub set_items {
2581 my ($self, $items) = @_; 2777 my ($self) = @_;
2582 2778
2583 $self->{scrolled}->clear; 2779 $self->{timer}->cancel
2584 return unless $items; 2780 if $self->{timer};
2585 2781
2586 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2782 $self->SUPER::DESTROY;
2587
2588 $self->{real_items} = \@items;
2589
2590 for my $item (@items) {
2591 my $desc = $item->{nrof} < 2
2592 ? $item->{name}
2593 : "$item->{nrof} $item->{name_pl}";
2594
2595 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2596 }
2597
2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2599}
2600
2601sub size_request {
2602 my ($self) = @_;
2603 ($self->{req_w}, $self->{req_h});
2604} 2783}
2605 2784
2606############################################################################# 2785#############################################################################
2607 2786
2608package CFClient::UI::Menu; 2787package CFClient::UI::Menu;
… …
2643 2822
2644# 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)
2645sub popup { 2824sub popup {
2646 my ($self, $ev) = @_; 2825 my ($self, $ev) = @_;
2647 2826
2648 $self->emit ("popdown"); 2827 $self->_emit ("popdown");
2649 2828
2650 # maybe save $GRAB? must be careful about events... 2829 # maybe save $GRAB? must be careful about events...
2651 $GRAB = $self; 2830 $GRAB = $self;
2652 $self->{button} = $ev->{button}; 2831 $self->{button} = $ev->{button};
2653 2832
2654 $self->show; 2833 $self->show;
2655 $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);
2656} 2835}
2657 2836
2658sub mouse_motion { 2837sub mouse_motion {
2659 my ($self, $ev, $x, $y) = @_; 2838 my ($self, $ev, $x, $y) = @_;
2660 2839
… …
2668 2847
2669 if ($ev->{button} == $self->{button}) { 2848 if ($ev->{button} == $self->{button}) {
2670 undef $GRAB; 2849 undef $GRAB;
2671 $self->hide; 2850 $self->hide;
2672 2851
2673 $self->emit ("popdown"); 2852 $self->_emit ("popdown");
2674 $self->{hover}[1]->() if $self->{hover}; 2853 $self->{hover}[1]->() if $self->{hover};
2675 } 2854 }
2676} 2855}
2677 2856
2678############################################################################# 2857#############################################################################
2679 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
2680package CFClient::UI::Root; 3260package CFClient::UI::Root;
2681 3261
2682our @ISA = CFClient::UI::Container::; 3262our @ISA = CFClient::UI::Container::;
2683 3263
2684use CFClient::OpenGL; 3264use CFClient::OpenGL;
2685 3265
2686sub check_size { 3266sub new {
2687 my ($self) = @_; 3267 my $class = shift;
2688 3268
2689 $self->configure (0, 0, $self->{w}, $self->{h}); 3269 my $self = $class->SUPER::new (
3270 visible => 1,
3271 @_,
3272 );
3273
3274 Scalar::Util::weaken ($self->{root} = $self);
3275
3276 $self
2690} 3277}
2691 3278
2692sub size_request { 3279sub size_request {
2693 my ($self) = @_; 3280 my ($self) = @_;
2694 3281
2695 ($self->{w}, $self->{h}) 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
2696} 3297}
2697 3298
2698sub size_allocate { 3299sub size_allocate {
2699 my ($self, $w, $h) = @_; 3300 my ($self, $w, $h) = @_;
2700 3301
2701 my $old_w = $self->{old_w};
2702 my $old_h = $self->{old_h};
2703
2704 if ($old_w && $old_h) {
2705 for my $child ($self->children) {
2706 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2707 $child->{w} = int 0.5 + $child->{req_w} * $w / $old_w;
2708 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2709 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2710 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2711 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2712 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2713 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2714 }
2715 }
2716
2717 $self->{old_w} = $w;
2718 $self->{old_h} = $h;
2719}
2720
2721sub configure {
2722 my ($self, $x, $y, $w, $h) = @_;
2723
2724 $self->SUPER::configure ($x, $y, $w, $h);
2725
2726 for my $child ($self->children) { 3302 for my $child ($self->children) {
2727 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)};
2728 3304
2729 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3305 $X = $child->{force_x} if exists $child->{force_x};
2730 $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
2731 $child->configure ($X, $Y, $W, $H); 3311 $child->configure ($X, $Y, $W, $H);
2732 } 3312 }
2733} 3313}
2734 3314
2735sub _topleft { 3315sub coord2local {
2736 my ($self, $x, $y) = @_; 3316 my ($self, $x, $y) = @_;
2737 3317
2738 ($x, $y) 3318 ($x, $y)
2739} 3319}
2740 3320
3321sub coord2global {
3322 my ($self, $x, $y) = @_;
3323
3324 ($x, $y)
3325}
3326
2741sub update { 3327sub update {
2742 my ($self) = @_; 3328 my ($self) = @_;
2743 3329
2744 $self->check_size; 3330 $::WANT_REFRESH++;
2745 ::refresh ();
2746} 3331}
2747 3332
2748sub add { 3333sub add {
2749 my ($self, $child) = @_; 3334 my ($self, @children) = @_;
2750 3335
2751 # integerize window positions 3336 $_->{is_toplevel} = 1
2752 $child->{x} = int $child->{x}; 3337 for @children;
2753 $child->{y} = int $child->{y};
2754 3338
2755 $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 }
2756} 3355}
2757 3356
2758sub on_refresh { 3357sub on_refresh {
2759 my ($self, $id, $cb) = @_; 3358 my ($self, $id, $cb) = @_;
2760 3359
2761 $self->{refresh_hook}{$id} = $cb; 3360 $self->{refresh_hook}{$id} = $cb;
2762} 3361}
2763 3362
3363sub on_post_alloc {
3364 my ($self, $id, $cb) = @_;
3365
3366 $self->{post_alloc_hook}{$id} = $cb;
3367}
3368
2764sub draw { 3369sub draw {
2765 my ($self) = @_; 3370 my ($self) = @_;
2766 3371
2767 while (my $rcb = delete $self->{refresh_hook}) { 3372 while ($self->{refresh_hook}) {
2768 $_->() for values %$rcb; 3373 $_->()
3374 for values %{delete $self->{refresh_hook}};
2769 } 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
2770 3465
2771 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3466 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2772 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3467 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2773 glClear GL_COLOR_BUFFER_BIT; 3468 glClear GL_COLOR_BUFFER_BIT;
2774 3469
2775 glMatrixMode GL_PROJECTION; 3470 glMatrixMode GL_PROJECTION;
2776 glLoadIdentity; 3471 glLoadIdentity;
2777 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3472 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2778 glMatrixMode GL_MODELVIEW; 3473 glMatrixMode GL_MODELVIEW;
2779 glLoadIdentity; 3474 glLoadIdentity;
2780 3475
2781 $self->_draw; 3476 $self->_draw;
2782} 3477}
… …
2784############################################################################# 3479#############################################################################
2785 3480
2786package CFClient::UI; 3481package CFClient::UI;
2787 3482
2788$ROOT = new CFClient::UI::Root; 3483$ROOT = new CFClient::UI::Root;
2789$TOOLTIP = new CFClient::UI::Tooltip; 3484$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2790 3485
27911 34861
2792 3487

Diff Legend

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