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.187 by root, Mon May 8 20:40:31 2006 UTC vs.
Revision 1.268 by root, Thu Jun 1 05:04:41 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} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $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} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $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;
333} 453}
334 454
335sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
336sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
337sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
338sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
339sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 459
460 return $self
461 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
462 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
463
464 ()
465}
466
467sub set_parent {
468 my ($self, $parent) = @_;
469
470 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495}
496
497sub realloc {
498 my ($self) = @_;
499
500 if ($self->{visible}) {
501 return if $self->{root}{realloc}{$self+0};
502
503 $self->{root}{realloc}{$self+0} = $self;
504 $self->{root}->update;
505 } else {
506 delete $self->{req_w};
507 delete $self->{req_h};
508 }
509}
510
511sub update {
512 my ($self) = @_;
513
514 $self->{parent}->update
515 if $self->{parent};
516}
517
518sub reconfigure {
519 my ($self) = @_;
520
521 $self->realloc;
522 $self->update;
523}
524
525# using global variables seems a bit hacky, but passing through all drawing
526# functions seems pointless.
527our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
340 528
341sub draw { 529sub draw {
342 my ($self) = @_; 530 my ($self) = @_;
343 531
344 return unless $self->{h} && $self->{w}; 532 return unless $self->{h} && $self->{w};
533
534 # update screen rectangle
535 local $draw_x = $draw_x + $self->{x};
536 local $draw_y = $draw_y + $self->{y};
537 local $draw_w = $draw_x + $self->{w};
538 local $draw_h = $draw_y + $self->{h};
539
540 # skip widgets that are entirely outside the drawing area
541 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
345 543
346 glPushMatrix; 544 glPushMatrix;
347 glTranslate $self->{x}, $self->{y}, 0; 545 glTranslate $self->{x}, $self->{y}, 0;
348 $self->_draw; 546 $self->_draw;
349 glPopMatrix; 547 glPopMatrix;
… …
361 glVertex $x , $y + $self->{h}; 559 glVertex $x , $y + $self->{h};
362 glEnd; 560 glEnd;
363 glDisable GL_BLEND; 561 glDisable GL_BLEND;
364 } 562 }
365 563
366 if ($ENV{PCLIENT_DEBUG}) { 564 if ($ENV{CFPLUS_DEBUG} & 1) {
367 glPushMatrix; 565 glPushMatrix;
368 glColor 1, 1, 0, 1; 566 glColor 1, 1, 0, 1;
369 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
370 glBegin GL_LINE_LOOP; 568 glBegin GL_LINE_LOOP;
371 glVertex 0 , 0; 569 glVertex 0 , 0;
372 glVertex $self->{w}, 0; 570 glVertex $self->{w} - 1, 0;
373 glVertex $self->{w}, $self->{h}; 571 glVertex $self->{w} - 1, $self->{h} - 1;
374 glVertex 0 , $self->{h}; 572 glVertex 0 , $self->{h} - 1;
375 glEnd; 573 glEnd;
376 glPopMatrix; 574 glPopMatrix;
377 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 575 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378 } 576 }
379} 577}
380 578
381sub _draw { 579sub _draw {
382 my ($self) = @_; 580 my ($self) = @_;
383 581
384 warn "no draw defined for $self\n"; 582 warn "no draw defined for $self\n";
385} 583}
386 584
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 { 585sub DESTROY {
451 my ($self) = @_; 586 my ($self) = @_;
452 587
588 delete $WIDGET{$self+0};
453 #$self->deactivate; 589 #$self->deactivate;
454} 590}
455 591
456############################################################################# 592#############################################################################
457 593
… …
466 my $class = shift; 602 my $class = shift;
467 603
468 # range [value, low, high, page] 604 # range [value, low, high, page]
469 605
470 $class->SUPER::new ( 606 $class->SUPER::new (
471 bg => [0, 0, 0, 0.2], 607 #bg => [0, 0, 0, 0.2],
472 active_bg => [1, 1, 1, 0.5], 608 #active_bg => [1, 1, 1, 0.5],
473 @_ 609 @_
474 ) 610 )
475} 611}
476 612
477sub _draw { 613sub _draw {
478 my ($self) = @_; 614 my ($self) = @_;
479 615
616 my $color = $FOCUS == $self && $self->{active_bg}
617 ? $self->{active_bg}
618 : $self->{bg};
619
620 if ($color && (@$color < 4 || $color->[3])) {
480 my ($w, $h) = @$self{qw(w h)}; 621 my ($w, $h) = @$self{qw(w h)};
481 622
482 glEnable GL_BLEND; 623 glEnable GL_BLEND;
483 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 624 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
484 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 625 glColor @$color;
485 626
486 glBegin GL_QUADS; 627 glBegin GL_QUADS;
487 glVertex 0 , 0; 628 glVertex 0 , 0;
488 glVertex 0 , $h; 629 glVertex 0 , $h;
489 glVertex $w, $h; 630 glVertex $w, $h;
490 glVertex $w, 0; 631 glVertex $w, 0;
491 glEnd; 632 glEnd;
492 633
493 glDisable GL_BLEND; 634 glDisable GL_BLEND;
635 }
494} 636}
495 637
496############################################################################# 638#############################################################################
497 639
498package CFClient::UI::Empty; 640package CFClient::UI::Empty;
… …
503 my ($class, %arg) = @_; 645 my ($class, %arg) = @_;
504 $class->SUPER::new (can_events => 0, %arg); 646 $class->SUPER::new (can_events => 0, %arg);
505} 647}
506 648
507sub size_request { 649sub size_request {
508 (0, 0) 650 my ($self) = @_;
651
652 ($self->{w} + 0, $self->{h} + 0)
509} 653}
510 654
511sub draw { } 655sub draw { }
512 656
513############################################################################# 657#############################################################################
… …
530 674
531 $self 675 $self
532} 676}
533 677
534sub add { 678sub add {
535 my ($self, $child) = @_; 679 my ($self, @widgets) = @_;
536 680
537 $child->set_parent ($self); 681 $_->set_parent ($self)
682 for @widgets;
538 683
539 use sort 'stable'; 684 use sort 'stable';
540 685
541 $self->{children} = [ 686 $self->{children} = [
542 sort { $a->{z} <=> $b->{z} } 687 sort { $a->{z} <=> $b->{z} }
543 @{$self->{children}}, $child 688 @{$self->{children}}, @widgets
544 ]; 689 ];
545 690
546 $child->check_size; 691 $self->realloc;
547 $self->update;
548} 692}
549 693
550sub children { 694sub children {
551 @{ $_[0]{children} } 695 @{ $_[0]{children} }
552} 696}
… …
557 delete $child->{parent}; 701 delete $child->{parent};
558 $child->hide; 702 $child->hide;
559 703
560 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 704 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
561 705
562 $self->check_size; 706 $self->realloc;
563 $self->update;
564} 707}
565 708
566sub clear { 709sub clear {
567 my ($self) = @_; 710 my ($self) = @_;
568 711
… …
572 for (@$children) { 715 for (@$children) {
573 delete $_->{parent}; 716 delete $_->{parent};
574 $_->hide; 717 $_->hide;
575 } 718 }
576 719
577 $self->check_size; 720 $self->realloc;
578 $self->update;
579} 721}
580 722
581sub find_widget { 723sub find_widget {
582 my ($self, $x, $y) = @_; 724 my ($self, $x, $y) = @_;
583 725
… …
658} 800}
659 801
660sub update { 802sub update {
661 my ($self) = @_; 803 my ($self) = @_;
662 804
663 $ROOT->on_refresh ($self => sub { $self->render_child }); 805 $ROOT->on_post_alloc ($self => sub { $self->render_child });
664 $self->SUPER::update; 806 $self->SUPER::update;
665} 807}
666 808
667sub size_allocate { 809sub size_allocate {
668 my ($self, $w, $h) = @_; 810 my ($self, $w, $h) = @_;
… …
670 $self->SUPER::size_allocate ($w, $h); 812 $self->SUPER::size_allocate ($w, $h);
671 $self->update; 813 $self->update;
672} 814}
673 815
674sub _render { 816sub _render {
817 my ($self) = @_;
818
675 $_[0]{children}[0]->draw; 819 $self->{children}[0]->draw;
676} 820}
677 821
678sub render_child { 822sub render_child {
679 my ($self) = @_; 823 my ($self) = @_;
680 824
681 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 825 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
682 glClearColor 0, 0, 0, 0; 826 glClearColor 0, 0, 0, 0;
683 glClear GL_COLOR_BUFFER_BIT; 827 glClear GL_COLOR_BUFFER_BIT;
684 828
829 {
830 package CFClient::UI::Base;
831
832 ($draw_x, $draw_y, $draw_w, $draw_h) =
833 (0, 0, $self->{w}, $self->{h});
834 }
835
685 $self->_render; 836 $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 }; 837 };
694} 838}
695 839
696sub _draw { 840sub _draw {
697 my ($self) = @_; 841 my ($self) = @_;
698 842
699 my ($w, $h) = ($self->w, $self->h); 843 my ($w, $h) = @$self{qw(w h)};
700 844
701 my $tex = $self->{texture} 845 my $tex = $self->{texture}
702 or return; 846 or return;
703 847
704 glEnable GL_BLEND;
705 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
706 glEnable GL_TEXTURE_2D; 848 glEnable GL_TEXTURE_2D;
707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
708 glColor 0, 0, 0, 1; 850 glColor 1, 1, 1, 1;
709 851
710 $tex->draw_quad (0, 0, $w, $h); 852 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
711 853
712 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 854 glDisable GL_TEXTURE_2D;
714} 855}
715 856
716############################################################################# 857#############################################################################
717 858
718package CFClient::UI::ViewPort; 859package CFClient::UI::ViewPort;
719 860
720our @ISA = CFClient::UI::Window::; 861our @ISA = CFClient::UI::Window::;
721 862
863sub new {
864 my $class = shift;
865
866 $class->SUPER::new (
867 scroll_x => 0,
868 scroll_y => 1,
869 @_,
870 )
871}
872
722sub size_request { 873sub size_request {
723 my ($self) = @_; 874 my ($self) = @_;
724 875
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 876 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 877
728 @$self{qw(child_w child_h)} 878 $w = 10 if $self->{scroll_x};
879 $h = 10 if $self->{scroll_y};
880
881 ($w, $h)
729} 882}
730 883
731sub size_allocate { 884sub size_allocate {
732 my ($self, $w, $h) = @_; 885 my ($self, $w, $h) = @_;
733 886
887 my $child = $self->child;
888
889 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
890 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
891
892 $self->child->configure (0, 0, $w, $h);
734 $self->update; 893 $self->update;
735} 894}
736 895
737sub set_offset { 896sub set_offset {
738 my ($self, $x, $y) = @_; 897 my ($self, $x, $y) = @_;
… …
741 $self->{view_y} = int $y; 900 $self->{view_y} = int $y;
742 901
743 $self->update; 902 $self->update;
744} 903}
745 904
746# hmm, this does not work for topleft of $self... but we should not aks for that 905# hmm, this does not work for topleft of $self... but we should not ask for that
747sub _topleft { 906sub coord2local {
748 my ($self, $x, $y) = @_; 907 my ($self, $x, $y) = @_;
749 908
750 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 909 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
910}
911
912sub coord2global {
913 my ($self, $x, $y) = @_;
914
915 $x = List::Util::min $self->{w}, $x - $self->{view_x};
916 $y = List::Util::min $self->{h}, $y - $self->{view_y};
917
918 $self->SUPER::coord2global ($x, $y)
751} 919}
752 920
753sub find_widget { 921sub find_widget {
754 my ($self, $x, $y) = @_; 922 my ($self, $x, $y) = @_;
755 923
… …
763} 931}
764 932
765sub _render { 933sub _render {
766 my ($self) = @_; 934 my ($self) = @_;
767 935
936 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
937 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
938
768 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 939 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
769 940
770 $self->SUPER::_render; 941 $self->SUPER::_render;
771} 942}
772 943
… …
780 my $class = shift; 951 my $class = shift;
781 952
782 my $self; 953 my $self;
783 954
784 my $slider = new CFClient::UI::Slider 955 my $slider = new CFClient::UI::Slider
785 vertical => 1, 956 vertical => 1,
786 range => [0, 0, 1, 0.01], # HACK fix 957 range => [0, 0, 1, 0.01], # HACK fix
787 connect_changed => sub { 958 on_changed => sub {
788 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 959 $self->{vp}->set_offset (0, $_[1]);
789 }, 960 },
790 ; 961 ;
791 962
792 $self = $class->SUPER::new ( 963 $self = $class->SUPER::new (
793 vp => (new CFClient::UI::ViewPort), 964 vp => (new CFClient::UI::ViewPort expand => 1),
794 slider => $slider, 965 slider => $slider,
795 @_, 966 @_,
796 ); 967 );
797 968
798 $self->{vp}->add ($self->{scrolled}); 969 $self->{vp}->add ($self->{scrolled});
… …
800 $self->add ($self->{slider}); 971 $self->add ($self->{slider});
801 972
802 $self 973 $self
803} 974}
804 975
976sub update {
977 my ($self) = @_;
978
979 $self->SUPER::update;
980
981 # todo: overwrite size_allocate of child
982 my $child = $self->{vp}->child;
983 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
984}
985
986sub size_allocate {
987 my ($self, $w, $h) = @_;
988
989 $self->SUPER::size_allocate ($w, $h);
990
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
993}
994
805#TODO# update range on size_allocate depeneing on child 995#TODO# update range on size_allocate depending on child
806# update viewport offset on scroll 996# update viewport offset on scroll
807 997
808############################################################################# 998#############################################################################
809 999
810package CFClient::UI::Frame; 1000package CFClient::UI::Frame;
… …
814use CFClient::OpenGL; 1004use CFClient::OpenGL;
815 1005
816sub new { 1006sub new {
817 my $class = shift; 1007 my $class = shift;
818 1008
819 my $self = $class->SUPER::new ( 1009 $class->SUPER::new (
820 bg => [1, 1, 1, 1], 1010 bg => undef,
821 border_bg => [1, 1, 1, 1],
822 border => 0.8,
823 @_ 1011 @_,
824 ); 1012 )
825
826 $self
827} 1013}
828 1014
829sub _draw { 1015sub _draw {
830 my ($self) = @_; 1016 my ($self) = @_;
831 1017
832 my ($w, $h) = ($self->{w}, $self->{h}); 1018 if ($self->{bg}) {
1019 my ($w, $h) = @$self{qw(w h)};
833 1020
834 glEnable GL_BLEND; 1021 glEnable GL_BLEND;
835 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1022 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
836 glEnable GL_TEXTURE_2D; 1023 glColor @{ $self->{bg} };
837 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
838 1024
839# glBegin GL_QUADS; 1025 glBegin GL_QUADS;
840# glColor 0, 0, 0, 0;
841# glVertex 0 , 0; 1026 glVertex 0 , 0;
842# glVertex 0 , $h; 1027 glVertex 0 , $h;
843# glVertex $w, $h; 1028 glVertex $w, $h;
844# glVertex $w, 0; 1029 glVertex $w, 0;
845# glEnd; 1030 glEnd;
846 1031
847
848 $self->child->draw;
849 glDisable GL_BLEND; 1032 glDisable GL_BLEND;
850 glDisable GL_TEXTURE_2D; 1033 }
1034
1035 $self->SUPER::_draw;
851} 1036}
852 1037
853############################################################################# 1038#############################################################################
854 1039
855package CFClient::UI::FancyFrame; 1040package CFClient::UI::FancyFrame;
856 1041
857our @ISA = CFClient::UI::Bin::; 1042our @ISA = CFClient::UI::Bin::;
858 1043
859use CFClient::OpenGL; 1044use CFClient::OpenGL;
860 1045
861my @tex = 1046my $bg =
1047 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1048 mipmap => 1, wrap => 1;
1049
1050my @border =
862 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1051 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); 1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
864 1053
865sub new { 1054sub new {
866 my $class = shift; 1055 my $class = shift;
867 1056
868 # TODO: user_x, user_y, overwrite moveto?
869
870 my $self = $class->SUPER::new ( 1057 my $self = $class->SUPER::new (
871 bg => [1, 1, 1, 1], 1058 bg => [1, 1, 1, 1],
872 border_bg => [1, 1, 1, 1], 1059 border_bg => [1, 1, 1, 1],
873 border => 0.6, 1060 border => 0.6,
874 can_events => 1, 1061 can_events => 1,
1062 min_w => 16,
1063 min_h => 16,
875 @_ 1064 @_
876 ); 1065 );
877 1066
878 $self->{title} &&= new CFClient::UI::Label 1067 $self->{title} &&= new CFClient::UI::Label
879 align => 0, 1068 align => 0,
… …
903 my ($self, $w, $h) = @_; 1092 my ($self, $w, $h) = @_;
904 1093
905 $h -= List::Util::max 0, $self->border * 2; 1094 $h -= List::Util::max 0, $self->border * 2;
906 $w -= List::Util::max 0, $self->border * 2; 1095 $w -= List::Util::max 0, $self->border * 2;
907 1096
908 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1097 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
909 if $self->{title}; 1098 if $self->{title};
910 1099
911 $self->child->configure ($self->border, $self->border, $w, $h); 1100 $self->child->configure ($self->border, $self->border, $w, $h);
912} 1101}
913 1102
… …
932 my ($ev, $x, $y) = @_; 1121 my ($ev, $x, $y) = @_;
933 1122
934 my $dx = $ev->{x} - $ox; 1123 my $dx = $ev->{x} - $ox;
935 my $dy = $ev->{y} - $oy; 1124 my $dy = $ev->{y} - $oy;
936 1125
937 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1126 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
938 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1127 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1128
1129 $self->realloc;
939 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1130 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
940 $self->check_size;
941 }; 1131 };
942 1132
943 } elsif ($lr ^ $td) { 1133 } elsif ($lr ^ $td) {
944 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1134 my ($ox, $oy) = ($ev->{x}, $ev->{y});
945 my ($bx, $by) = ($self->{x}, $self->{y}); 1135 my ($bx, $by) = ($self->{x}, $self->{y});
… …
947 $self->{motion} = sub { 1137 $self->{motion} = sub {
948 my ($ev, $x, $y) = @_; 1138 my ($ev, $x, $y) = @_;
949 1139
950 ($x, $y) = ($ev->{x}, $ev->{y}); 1140 ($x, $y) = ($ev->{x}, $ev->{y});
951 1141
952 $self->move ($bx + $x - $ox, $by + $y - $oy); 1142 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
953 $self->update;
954 }; 1143 };
955 } 1144 }
956} 1145}
957 1146
958sub button_up { 1147sub button_up {
… …
971 my ($self) = @_; 1160 my ($self) = @_;
972 1161
973 my ($w, $h ) = ($self->{w}, $self->{h}); 1162 my ($w, $h ) = ($self->{w}, $self->{h});
974 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1163 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
975 1164
976 glEnable GL_BLEND;
977 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
978 glEnable GL_TEXTURE_2D; 1165 glEnable GL_TEXTURE_2D;
979 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
980 1167
981 my $border = $self->border; 1168 my $border = $self->border;
982 1169
983 glColor @{ $self->{border_bg} }; 1170 glColor @{ $self->{border_bg} };
984 $tex[1]->draw_quad (0, 0, $w, $border); 1171 $border[0]->draw_quad_alpha (0, 0, $w, $border);
985 $tex[3]->draw_quad (0, $border, $border, $ch); 1172 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
986 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1173 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
987 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1174 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
988 1175
989 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1176 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
990 my $bg = $tex[0]; 1177 glColor @{ $self->{bg} };
991 1178
992 # TODO: repeat texture not scale 1179 # TODO: repeat texture not scale
1180 # solve this better(?)
993 my $rep_x = $cw / $bg->{w}; 1181 $bg->{s} = $cw / $bg->{w};
994 my $rep_y = $ch / $bg->{h}; 1182 $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); 1183 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1184 }
1002 1185
1003 glDisable GL_TEXTURE_2D; 1186 glDisable GL_TEXTURE_2D;
1004 glDisable GL_BLEND;
1005 }
1006 1187
1007 $self->{title}->draw if $self->{title}; 1188 $self->{title}->draw if $self->{title};
1008 1189
1009 $self->child->draw; 1190 $self->child->draw;
1010} 1191}
… …
1022sub new { 1203sub new {
1023 my $class = shift; 1204 my $class = shift;
1024 1205
1025 $class->SUPER::new ( 1206 $class->SUPER::new (
1026 col_expand => [], 1207 col_expand => [],
1027 @_ 1208 @_,
1028 ) 1209 )
1210}
1211
1212sub children {
1213 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1029} 1214}
1030 1215
1031sub add { 1216sub add {
1032 my ($self, $x, $y, $child) = @_; 1217 my ($self, $x, $y, $child) = @_;
1033 1218
1034 $child->set_parent ($self); 1219 $child->set_parent ($self);
1035 $self->{children}[$y][$x] = $child; 1220 $self->{children}[$y][$x] = $child;
1036 1221
1037 $child->check_size; 1222 $self->realloc;
1038} 1223}
1039 1224
1040sub children {
1041 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1042}
1043
1044# TODO: move to container class maybe? send childs a signal on removal? 1225# TODO: move to container class maybe? send children a signal on removal?
1045sub clear { 1226sub clear {
1046 my ($self) = @_; 1227 my ($self) = @_;
1047 1228
1048 my @children = $self->children; 1229 my @children = $self->children;
1049 delete $self->{children}; 1230 delete $self->{children};
… …
1051 for (@children) { 1232 for (@children) {
1052 delete $_->{parent}; 1233 delete $_->{parent};
1053 $_->hide; 1234 $_->hide;
1054 } 1235 }
1055 1236
1056 $self->update; 1237 $self->realloc;
1057} 1238}
1058 1239
1059sub get_wh { 1240sub get_wh {
1060 my ($self) = @_; 1241 my ($self) = @_;
1061 1242
… …
1092sub size_allocate { 1273sub size_allocate {
1093 my ($self, $w, $h) = @_; 1274 my ($self, $w, $h) = @_;
1094 1275
1095 my ($ws, $hs) = $self->get_wh; 1276 my ($ws, $hs) = $self->get_wh;
1096 1277
1097 my $req_w = sum @$ws; 1278 my $req_w = (sum @$ws) || 1;
1098 my $req_h = sum @$hs; 1279 my $req_h = (sum @$hs) || 1;
1099 1280
1100 # TODO: nicer code && do row_expand 1281 # TODO: nicer code && do row_expand
1101 my @col_expand = @{$self->{col_expand}}; 1282 my @col_expand = @{$self->{col_expand}};
1102 @col_expand = (1) x @$ws unless @col_expand; 1283 @col_expand = (1) x @$ws unless @col_expand;
1103 my $col_expand = (sum @col_expand) || 1; 1284 my $col_expand = (sum @col_expand) || 1;
… …
1157 } 1338 }
1158} 1339}
1159 1340
1160############################################################################# 1341#############################################################################
1161 1342
1162package CFClient::UI::HBox; 1343package CFClient::UI::Box;
1163
1164# TODO: wrap into common Box base class
1165 1344
1166our @ISA = CFClient::UI::Container::; 1345our @ISA = CFClient::UI::Container::;
1167 1346
1168sub size_request { 1347sub size_request {
1169 my ($self) = @_; 1348 my ($self) = @_;
1170 1349
1171 my @alloc = map [$_->size_request], @{$self->{children}}; 1350 $self->{vertical}
1172 1351 ? (
1173 ( 1352 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1174 (List::Util::sum map $_->[0], @alloc), 1353 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1175 (List::Util::max map $_->[1], @alloc), 1354 )
1176 ) 1355 : (
1356 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1357 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1358 )
1177} 1359}
1178 1360
1179sub size_allocate { 1361sub size_allocate {
1180 my ($self, $w, $h) = @_; 1362 my ($self, $w, $h) = @_;
1181 1363
1182 ($h, $w) = ($w, $h); 1364 my $space = $self->{vertical} ? $h : $w;
1183
1184 my $children = $self->{children}; 1365 my $children = $self->{children};
1185 1366
1186 my @h = map $_->{req_w}, @$children; 1367 my @req;
1187 1368
1188 my $req_h = List::Util::sum @h; 1369 if ($self->{homogeneous}) {
1189 1370 @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 { 1371 } else {
1372 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1373 my $req = List::Util::sum @req;
1374
1375 if ($req > $space) {
1376 # ah well, not enough space
1377 $_ *= $space / $req for @req;
1378 } else {
1194 my $exp = List::Util::sum map $_->{expand}, @$children; 1379 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1195 $exp ||= 1;
1196 1380
1381 $space = ($space - $req) / $expand; # remaining space to give away
1382
1383 $req[$_] += $space * $children->[$_]{expand}
1197 for (0 .. $#$children) { 1384 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 } 1385 }
1204 } 1386 }
1205 1387
1206 CFClient::UI::harmonize \@h; 1388 CFClient::UI::harmonize \@req;
1207 1389
1208 my $y = 0; 1390 my $pos = 0;
1209 for (0 .. $#$children) { 1391 for (0 .. $#$children) {
1210 my $child = $children->[$_];
1211 my $h = $h[$_]; 1392 my $alloc = $req[$_];
1212 $child->configure ($y, 0, $h, $w); 1393 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1213 1394
1214 $y += $h; 1395 $pos += $alloc;
1215 } 1396 }
1216 1397
1217 1 1398 1
1218} 1399}
1219 1400
1220############################################################################# 1401#############################################################################
1221 1402
1403package CFClient::UI::HBox;
1404
1405our @ISA = CFClient::UI::Box::;
1406
1407sub new {
1408 my $class = shift;
1409
1410 $class->SUPER::new (
1411 vertical => 0,
1412 @_,
1413 )
1414}
1415
1416#############################################################################
1417
1222package CFClient::UI::VBox; 1418package CFClient::UI::VBox;
1223 1419
1224# TODO: wrap into common Box base class
1225
1226our @ISA = CFClient::UI::Container::; 1420our @ISA = CFClient::UI::Box::;
1227 1421
1228sub size_request { 1422sub new {
1229 my ($self) = @_; 1423 my $class = shift;
1230 1424
1231 my @alloc = map [$_->size_request], @{$self->{children}}; 1425 $class->SUPER::new (
1232 1426 vertical => 1,
1233 ( 1427 @_,
1234 (List::Util::max map $_->[0], @alloc),
1235 (List::Util::sum map $_->[1], @alloc),
1236 ) 1428 )
1237} 1429}
1238 1430
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############################################################################# 1431#############################################################################
1277 1432
1278package CFClient::UI::Label; 1433package CFClient::UI::Label;
1279 1434
1280our @ISA = CFClient::UI::Base::; 1435our @ISA = CFClient::UI::DrawBG::;
1281 1436
1282use CFClient::OpenGL; 1437use CFClient::OpenGL;
1283 1438
1284sub new { 1439sub new {
1285 my ($class, %arg) = @_; 1440 my ($class, %arg) = @_;
1286 1441
1287 my $self = $class->SUPER::new ( 1442 my $self = $class->SUPER::new (
1288 fg => [1, 1, 1], 1443 fg => [1, 1, 1],
1444 #bg => none
1445 #active_bg => none
1289 #font => default_font 1446 #font => default_font
1447 #text => initial text
1448 #markup => initial narkup
1449 #max_w => maximum pixel width
1450 ellipsise => 3, # end
1451 layout => (new CFClient::Layout),
1290 fontsize => 1, 1452 fontsize => 1,
1291 text => "",
1292 align => -1, 1453 align => -1,
1293 valign => -1, 1454 valign => -1,
1294 padding => 2, 1455 padding_x => 2,
1295 layout => new CFClient::Layout, 1456 padding_y => 2,
1296 can_events => 0, 1457 can_events => 0,
1297 %arg 1458 %arg
1298 ); 1459 );
1299 1460
1300 if (exists $self->{template}) { 1461 if (exists $self->{template}) {
1301 my $layout = new CFClient::Layout; 1462 my $layout = new CFClient::Layout;
1302 $layout->set_text (delete $self->{template}); 1463 $layout->set_text (delete $self->{template});
1303 $self->{template} = $layout; 1464 $self->{template} = $layout;
1304 } 1465 }
1305 1466
1306 $self->set_text (delete $self->{text}) if exists $self->{text}; 1467 if (exists $self->{markup}) {
1307 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1468 $self->set_markup (delete $self->{markup});
1469 } else {
1470 $self->set_text (delete $self->{text});
1471 }
1308 1472
1309 $self 1473 $self
1310} 1474}
1311 1475
1312sub escape { 1476sub escape($) {
1313 local $_ = $_[1]; 1477 local $_ = $_[0];
1314 1478
1315 s/&/&amp;/g; 1479 s/&/&amp;/g;
1316 s/>/&gt;/g; 1480 s/>/&gt;/g;
1317 s/</&lt;/g; 1481 s/</&lt;/g;
1318 1482
1319 $_[1] 1483 $_
1320} 1484}
1321 1485
1322sub update { 1486sub update {
1323 my ($self) = @_; 1487 my ($self) = @_;
1324 1488
… …
1330 my ($self, $text) = @_; 1494 my ($self, $text) = @_;
1331 1495
1332 return if $self->{text} eq "T$text"; 1496 return if $self->{text} eq "T$text";
1333 $self->{text} = "T$text"; 1497 $self->{text} = "T$text";
1334 1498
1499 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1335 $self->{layout}->set_text ($text); 1500 $self->{layout}->set_text ($text);
1336 1501
1337 delete $self->{texture}; 1502 $self->realloc;
1338 $self->update; 1503 $self->update;
1339 $self->check_size;
1340} 1504}
1341 1505
1342sub set_markup { 1506sub set_markup {
1343 my ($self, $markup) = @_; 1507 my ($self, $markup) = @_;
1344 1508
1345 return if $self->{text} eq "M$markup"; 1509 return if $self->{text} eq "M$markup";
1346 $self->{text} = "M$markup"; 1510 $self->{text} = "M$markup";
1347 1511
1512 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1513
1514 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1348 $self->{layout}->set_markup ($markup); 1515 $self->{layout}->set_markup ($markup);
1349 1516
1350 delete $self->{texture}; 1517 $self->realloc;
1351 $self->update; 1518 $self->update;
1352 $self->check_size;
1353} 1519}
1354 1520
1355sub size_request { 1521sub size_request {
1356 my ($self) = @_; 1522 my ($self) = @_;
1357 1523
1358 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1524 $self->{layout}->set_font ($self->{font}) if $self->{font};
1359 $self->{layout}->set_width ($self->{max_w} || -1); 1525 $self->{layout}->set_width ($self->{max_w} || -1);
1526 $self->{layout}->set_ellipsise ($self->{ellipsise});
1527 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1360 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1528 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1361 1529
1362 my ($w, $h) = $self->{layout}->size; 1530 my ($w, $h) = $self->{layout}->size;
1363 1531
1364 if (exists $self->{template}) { 1532 if (exists $self->{template}) {
… …
1369 1537
1370 $w = List::Util::max $w, $w2; 1538 $w = List::Util::max $w, $w2;
1371 $h = List::Util::max $h, $h2; 1539 $h = List::Util::max $h, $h2;
1372 } 1540 }
1373 1541
1374 ( 1542 ($w, $h)
1375 $w + $self->{padding} * 2,
1376 $h + $self->{padding} * 2,
1377 )
1378} 1543}
1379 1544
1380sub size_allocate { 1545sub size_allocate {
1381 my ($self, $w, $h) = @_; 1546 my ($self, $w, $h) = @_;
1382 1547
1383 delete $self->{texture}; 1548 delete $self->{texture}
1549 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1384} 1550}
1385 1551
1386sub set_fontsize { 1552sub set_fontsize {
1387 my ($self, $fontsize) = @_; 1553 my ($self, $fontsize) = @_;
1388 1554
1389 $self->{fontsize} = $fontsize; 1555 $self->{fontsize} = $fontsize;
1390 delete $self->{texture}; 1556 delete $self->{texture};
1391 1557
1392 $self->update; 1558 $self->realloc;
1393 $self->check_size;
1394} 1559}
1395 1560
1396sub _draw { 1561sub _draw {
1397 my ($self) = @_; 1562 my ($self) = @_;
1398 1563
1564 $self->SUPER::_draw; # draw background, if applicable
1565
1399 my $tex = $self->{texture} ||= do { 1566 my $tex = $self->{texture} ||= do {
1567 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1568 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $self->{layout}->set_width ($self->{w}); 1569 $self->{layout}->set_width ($self->{w});
1570 $self->{layout}->set_ellipsise ($self->{ellipsise});
1571 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1572 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1573
1403 new_from_layout CFClient::Texture $self->{layout} 1574 my $tex = new_from_layout CFClient::Texture $self->{layout};
1575
1576 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1577 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1578 : ($self->{w} - $tex->{w}) * 0.5);
1579
1580 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1581 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1582 : ($self->{h} - $tex->{h}) * 0.5);
1583
1584 $tex
1404 }; 1585 };
1405 1586
1406 glEnable GL_BLEND;
1407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1408 glEnable GL_TEXTURE_2D; 1587 glEnable GL_TEXTURE_2D;
1409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1588 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1410 1589
1590 if ($tex->{format} == GL_ALPHA) {
1411 glColor @{$self->{fg}}; 1591 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}); 1592 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1593 } else {
1594 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1595 }
1426 1596
1427 glDisable GL_TEXTURE_2D; 1597 glDisable GL_TEXTURE_2D;
1428 glDisable GL_BLEND;
1429} 1598}
1430 1599
1431############################################################################# 1600#############################################################################
1432 1601
1433package CFClient::UI::EntryBase; 1602package CFClient::UI::EntryBase;
… …
1446 active_fg => [0, 0, 0], 1615 active_fg => [0, 0, 0],
1447 can_hover => 1, 1616 can_hover => 1,
1448 can_focus => 1, 1617 can_focus => 1,
1449 valign => 0, 1618 valign => 0,
1450 can_events => 1, 1619 can_events => 1,
1620 #text => ...
1451 @_ 1621 @_
1452 ) 1622 )
1453} 1623}
1454 1624
1455sub _set_text { 1625sub _set_text {
… …
1465 $self->{text} = $text; 1635 $self->{text} = $text;
1466 1636
1467 $text =~ s/./*/g if $self->{hidden}; 1637 $text =~ s/./*/g if $self->{hidden};
1468 $self->{layout}->set_text ("$text "); 1638 $self->{layout}->set_text ("$text ");
1469 1639
1470 $self->emit (changed => $self->{text}); 1640 $self->_emit (changed => $self->{text});
1641}
1642
1643sub set_text {
1644 my ($self, $text) = @_;
1645
1646 $self->{cursor} = length $text;
1647 $self->_set_text ($text);
1648
1649 $self->realloc;
1471} 1650}
1472 1651
1473sub get_text { 1652sub get_text {
1474 $_[0]{text} 1653 $_[0]{text}
1475} 1654}
… …
1478 my ($self) = @_; 1657 my ($self) = @_;
1479 1658
1480 my ($w, $h) = $self->SUPER::size_request; 1659 my ($w, $h) = $self->SUPER::size_request;
1481 1660
1482 ($w + 1, $h) # add 1 for cursor 1661 ($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} 1662}
1498 1663
1499sub key_down { 1664sub key_down {
1500 my ($self, $ev) = @_; 1665 my ($self, $ev) = @_;
1501 1666
… …
1503 my $sym = $ev->{sym}; 1668 my $sym = $ev->{sym};
1504 my $uni = $ev->{unicode}; 1669 my $uni = $ev->{unicode};
1505 1670
1506 my $text = $self->get_text; 1671 my $text = $self->get_text;
1507 1672
1508 if ($sym == 8) { 1673 if ($uni == 8) {
1509 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1674 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1510 } elsif ($sym == 127) { 1675 } elsif ($uni == 127) {
1511 substr $text, $self->{cursor}, 1, ""; 1676 substr $text, $self->{cursor}, 1, "";
1512 } elsif ($sym == CFClient::SDLK_LEFT) { 1677 } elsif ($sym == CFClient::SDLK_LEFT) {
1513 --$self->{cursor} if $self->{cursor}; 1678 --$self->{cursor} if $self->{cursor};
1514 } elsif ($sym == CFClient::SDLK_RIGHT) { 1679 } elsif ($sym == CFClient::SDLK_RIGHT) {
1515 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1680 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1516 } elsif ($sym == CFClient::SDLK_HOME) { 1681 } elsif ($sym == CFClient::SDLK_HOME) {
1517 $self->{cursor} = 0; 1682 $self->{cursor} = 0;
1518 } elsif ($sym == CFClient::SDLK_END) { 1683 } elsif ($sym == CFClient::SDLK_END) {
1519 $self->{cursor} = length $text; 1684 $self->{cursor} = length $text;
1520 } elsif ($sym == 27) { 1685 } elsif ($uni == 27) {
1521 $self->emit ('escape'); 1686 $self->_emit ('escape');
1522 } elsif ($uni) { 1687 } elsif ($uni) {
1523 substr $text, $self->{cursor}++, 0, chr $uni; 1688 substr $text, $self->{cursor}++, 0, chr $uni;
1524 } 1689 }
1525 1690
1526 $self->_set_text ($text); 1691 $self->_set_text ($text);
1527 $self->update; 1692
1693 $self->realloc;
1528} 1694}
1529 1695
1530sub focus_in { 1696sub focus_in {
1531 my ($self) = @_; 1697 my ($self) = @_;
1532 1698
… …
1612 if ($sym == 13) { 1778 if ($sym == 13) {
1613 unshift @{$self->{history}}, 1779 unshift @{$self->{history}},
1614 my $txt = $self->get_text; 1780 my $txt = $self->get_text;
1615 $self->{history_pointer} = -1; 1781 $self->{history_pointer} = -1;
1616 $self->{history_saveback} = ''; 1782 $self->{history_saveback} = '';
1617 $self->emit (activate => $txt); 1783 $self->_emit (activate => $txt);
1618 $self->update; 1784 $self->update;
1619 1785
1620 } elsif ($sym == CFClient::SDLK_UP) { 1786 } elsif ($sym == CFClient::SDLK_UP) {
1621 if ($self->{history_pointer} < 0) { 1787 if ($self->{history_pointer} < 0) {
1622 $self->{history_saveback} = $self->get_text; 1788 $self->{history_saveback} = $self->get_text;
… …
1659 1825
1660sub new { 1826sub new {
1661 my $class = shift; 1827 my $class = shift;
1662 1828
1663 $class->SUPER::new ( 1829 $class->SUPER::new (
1664 padding => 4, 1830 padding_x => 4,
1831 padding_y => 4,
1665 fg => [1, 1, 1], 1832 fg => [1, 1, 1],
1666 bg => [1, 1, 1, 0.2],
1667 active_fg => [0, 0, 1], 1833 active_fg => [0, 0, 1],
1668 can_hover => 1, 1834 can_hover => 1,
1669 align => 0, 1835 align => 0,
1670 valign => 0, 1836 valign => 0,
1671 can_events => 1, 1837 can_events => 1,
1672 @_ 1838 @_
1673 ) 1839 )
1674} 1840}
1675 1841
1842sub activate { }
1843
1676sub button_up { 1844sub button_up {
1677 my ($self, $ev, $x, $y) = @_; 1845 my ($self, $ev, $x, $y) = @_;
1678 1846
1847 $self->emit ("activate")
1679 if ($x >= 0 && $x < $self->{w} 1848 if $x >= 0 && $x < $self->{w}
1680 && $y >= 0 && $y < $self->{h}) { 1849 && $y >= 0 && $y < $self->{h};
1681 $self->emit ("activate");
1682 }
1683} 1850}
1684 1851
1685sub _draw { 1852sub _draw {
1686 my ($self) = @_; 1853 my ($self) = @_;
1687 1854
… …
1689 1856
1690 if ($GRAB == $self) { 1857 if ($GRAB == $self) {
1691 $self->{fg} = $self->{active_fg}; 1858 $self->{fg} = $self->{active_fg};
1692 } 1859 }
1693 1860
1694 glEnable GL_BLEND;
1695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1696 glEnable GL_TEXTURE_2D; 1861 glEnable GL_TEXTURE_2D;
1697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1698 glColor 0, 0, 0, 1; 1863 glColor 0, 0, 0, 1;
1699 1864
1700 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1865 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1701 1866
1702 glDisable GL_TEXTURE_2D; 1867 glDisable GL_TEXTURE_2D;
1703 glDisable GL_BLEND;
1704 1868
1705 $self->SUPER::_draw; 1869 $self->SUPER::_draw;
1706} 1870}
1707 1871
1708############################################################################# 1872#############################################################################
… …
1719 1883
1720sub new { 1884sub new {
1721 my $class = shift; 1885 my $class = shift;
1722 1886
1723 $class->SUPER::new ( 1887 $class->SUPER::new (
1724 padding => 2, 1888 padding_x => 2,
1889 padding_y => 2,
1725 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1726 active_fg => [1, 1, 0], 1891 active_fg => [1, 1, 0],
1892 bg => [0, 0, 0, 0.2],
1893 active_bg => [1, 1, 1, 0.5],
1727 state => 0, 1894 state => 0,
1728 can_hover => 1, 1895 can_hover => 1,
1729 @_ 1896 @_
1730 ) 1897 )
1731} 1898}
1732 1899
1733sub size_request { 1900sub size_request {
1734 my ($self) = @_; 1901 my ($self) = @_;
1735 1902
1736 ($self->{padding} * 2 + 6) x 2 1903 (6) x 2
1737} 1904}
1738 1905
1739sub button_down { 1906sub button_down {
1740 my ($self, $ev, $x, $y) = @_; 1907 my ($self, $ev, $x, $y) = @_;
1741 1908
1742 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1909 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1743 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1910 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1744 $self->{state} = !$self->{state}; 1911 $self->{state} = !$self->{state};
1745 $self->emit (changed => $self->{state}); 1912 $self->_emit (changed => $self->{state});
1746 } 1913 }
1747} 1914}
1748 1915
1749sub _draw { 1916sub _draw {
1750 my ($self) = @_; 1917 my ($self) = @_;
1751 1918
1752 $self->SUPER::_draw; 1919 $self->SUPER::_draw;
1753 1920
1754 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1921 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1755 1922
1756 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1923 my ($w, $h) = @$self{qw(w h)};
1924
1925 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1757 1926
1758 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1927 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1759 1928
1760 glEnable GL_BLEND; 1929 my $tex = $self->{state} ? $tex[1] : $tex[0];
1930
1761 glEnable GL_TEXTURE_2D; 1931 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); 1932 $tex->draw_quad_alpha (0, 0, $s, $s);
1767
1768 glDisable GL_TEXTURE_2D; 1933 glDisable GL_TEXTURE_2D;
1769 glDisable GL_BLEND;
1770} 1934}
1771 1935
1772############################################################################# 1936#############################################################################
1773 1937
1774package CFClient::UI::Image; 1938package CFClient::UI::Image;
… …
1817 glTranslate 0, -$self->{w}, 0; 1981 glTranslate 0, -$self->{w}, 0;
1818 1982
1819 ($w, $h) = ($h, $w); 1983 ($w, $h) = ($h, $w);
1820 } 1984 }
1821 1985
1822 glEnable GL_BLEND;
1823 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1824 glEnable GL_TEXTURE_2D; 1986 glEnable GL_TEXTURE_2D;
1825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1987 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1826 1988
1827 $tex->draw_quad (0, 0, $w, $h); 1989 $tex->draw_quad_alpha (0, 0, $w, $h);
1828 1990
1829 glDisable GL_BLEND;
1830 glDisable GL_TEXTURE_2D; 1991 glDisable GL_TEXTURE_2D;
1831} 1992}
1832 1993
1833############################################################################# 1994#############################################################################
1834 1995
… …
2023 qw(s1_slider.png s1_slider_bg.png); 2184 qw(s1_slider.png s1_slider_bg.png);
2024 2185
2025sub new { 2186sub new {
2026 my $class = shift; 2187 my $class = shift;
2027 2188
2028 # range [value, low, high, page] 2189 # range [value, low, high, page, unit]
2029 2190
2030 # TODO: 0-width page 2191 # TODO: 0-width page
2031 # TODO: req_w/h are wrong with vertical 2192 # TODO: req_w/h are wrong with vertical
2032 # TODO: calculations are off 2193 # TODO: calculations are off
2033 my $self = $class->SUPER::new ( 2194 my $self = $class->SUPER::new (
2034 fg => [1, 1, 1], 2195 fg => [1, 1, 1],
2035 active_fg => [0, 0, 0], 2196 active_fg => [0, 0, 0],
2197 bg => [0, 0, 0, 0.2],
2198 active_bg => [1, 1, 1, 0.5],
2036 range => [0, 0, 100, 10], 2199 range => [0, 0, 100, 10, 0],
2037 req_w => $::WIDTH / 80, 2200 min_w => $::WIDTH / 80,
2038 req_h => $::WIDTH / 80, 2201 min_h => $::WIDTH / 80,
2039 vertical => 0, 2202 vertical => 0,
2040 can_hover => 1, 2203 can_hover => 1,
2041 inner_pad => 5, 2204 inner_pad => 0.02,
2042 @_ 2205 @_
2043 ); 2206 );
2044 2207
2208 $self->set_value ($self->{range}[0]);
2209 $self->update;
2210
2045 $self 2211 $self
2046} 2212}
2047 2213
2214sub changed { }
2215
2216sub set_range {
2217 my ($self, $range) = @_;
2218
2219 ($range, $self->{range}) = ($self->{range}, $range);
2220
2221 $self->update
2222 if "@$range" ne "@{$self->{range}}";
2223}
2224
2225sub set_value {
2226 my ($self, $value) = @_;
2227
2228 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2229
2230 $hi = $lo + 1 if $hi <= $lo;
2231
2232 $page = $hi - $lo if $page > $hi - $lo;
2233
2234 $value = $lo if $value < $lo;
2235 $value = $hi - $page if $value > $hi - $page;
2236
2237 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2238 if $unit;
2239
2240 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2241
2242 if ($value != $old_value) {
2243 $self->_emit (changed => $value);
2244 $self->update;
2245 }
2246}
2247
2048sub size_request { 2248sub size_request {
2049 my ($self) = @_; 2249 my ($self) = @_;
2050 2250
2051 my $w = $self->{req_w}; 2251 ($self->{req_w}, $self->{req_h})
2052 my $h = $self->{req_h};
2053
2054 $self->{vertical} ? ($h, $w) : ($w, $h)
2055} 2252}
2056 2253
2057sub button_down { 2254sub button_down {
2058 my ($self, $ev, $x, $y) = @_; 2255 my ($self, $ev, $x, $y) = @_;
2059 2256
2060 $self->SUPER::button_down ($ev, $x, $y); 2257 $self->SUPER::button_down ($ev, $x, $y);
2258
2259 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2260
2061 $self->mouse_motion ($ev, $x, $y); 2261 $self->mouse_motion ($ev, $x, $y);
2062} 2262}
2063 2263
2064sub mouse_motion { 2264sub mouse_motion {
2065 my ($self, $ev, $x, $y) = @_; 2265 my ($self, $ev, $x, $y) = @_;
2066 2266
2067 if ($GRAB == $self) { 2267 if ($GRAB == $self) {
2268 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2269
2270 my (undef, $lo, $hi, $page) = @{$self->{range}};
2271
2272 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2273
2274 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2275 }
2276}
2277
2278sub update {
2279 my ($self) = @_;
2280
2281 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2282 $self->set_value ($self->{range}[0]);
2283
2068 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2284 my ($value, $lo, $hi, $page) = @{$self->{range}};
2285 my $range = ($hi - $page - $lo) || 1e-100;
2069 2286
2070 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2287 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2071 2288
2072 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2289 $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 2290 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2074 2291
2075 $x -= $inner_pad_px; # substract the padding 2292 $value = ($value - $lo) / $range;
2076 $x = $x * ($hi - $lo) / $inner_w + $lo; 2293 $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 2294
2081 $self->emit (changed => $x); 2295 $self->{knob_x} = $value - $knob_w * 0.5;
2082 $self->update; 2296 $self->{knob_w} = $knob_w;
2083 } 2297 });
2084}
2085 2298
2086# the inner_* stuff is for generating a padding for the slider handle, 2299 $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} 2300}
2093 2301
2094sub _draw { 2302sub _draw {
2095 my ($self) = @_; 2303 my ($self) = @_;
2096 2304
2097 $self->SUPER::_draw (); 2305 $self->SUPER::_draw ();
2098 2306
2099 my ($w, $h) = @$self{qw(w h)}; 2307 glScale $self->{w}, $self->{h};
2100 2308
2101 if ($self->{vertical}) { 2309 if ($self->{vertical}) {
2102 # draw a vertical slider like a rotated horizontal slider 2310 # draw a vertical slider like a rotated horizontal slider
2103 2311
2312 glTranslate 1, 0, 0;
2104 glRotate 90, 0, 0, 1; 2313 glRotate 90, 0, 0, 1;
2105 glTranslate 0, -$self->{w}, 0;
2106
2107 ($w, $h) = ($h, $w);
2108 } 2314 }
2109 2315
2110 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2316 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2111 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2317 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2112 2318
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; 2319 glEnable GL_TEXTURE_2D;
2134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2135 2321
2136 # draw background 2322 # draw background
2137 $tex[1]->draw_quad (0, 0, $w, $h); 2323 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2138 2324
2139 # draw handle 2325 # draw handle
2140 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2326 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2141 2327
2142 glDisable GL_BLEND;
2143 glDisable GL_TEXTURE_2D; 2328 glDisable GL_TEXTURE_2D;
2144} 2329}
2330
2331#############################################################################
2332
2333package CFClient::UI::ValSlider;
2334
2335our @ISA = CFClient::UI::HBox::;
2336
2337sub new {
2338 my ($class, %arg) = @_;
2339
2340 my $range = delete $arg{range};
2341
2342 my $self = $class->SUPER::new (
2343 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2344 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2345 to_value => sub { shift },
2346 from_value => sub { shift },
2347 %arg,
2348 );
2349
2350 $self->{slider}->connect (changed => sub {
2351 my ($self, $value) = @_;
2352 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2353 $self->{parent}->emit (changed => $value);
2354 });
2355
2356# $self->{entry}->connect (changed => sub {
2357# my ($self, $value) = @_;
2358# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2359# $self->{parent}->emit (changed => $value);
2360# });
2361
2362 $self->add ($self->{slider}, $self->{entry});
2363
2364 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2365
2366 $self
2367}
2368
2369sub set_range { shift->{slider}->set_range (@_) }
2370sub set_value { shift->{slider}->set_value (@_) }
2145 2371
2146############################################################################# 2372#############################################################################
2147 2373
2148package CFClient::UI::TextView; 2374package CFClient::UI::TextView;
2149 2375
… …
2158 fontsize => 1, 2384 fontsize => 1,
2159 can_events => 0, 2385 can_events => 0,
2160 #font => default_font 2386 #font => default_font
2161 @_, 2387 @_,
2162 2388
2163 layout => (new CFClient::Layout), 2389 layout => (new CFClient::Layout 1),
2164 par => [], 2390 par => [],
2165 height => 0, 2391 height => 0,
2166 children => [ 2392 children => [
2167 (new CFClient::UI::Empty expand => 1), 2393 (new CFClient::UI::Empty expand => 1),
2168 (new CFClient::UI::Slider vertical => 1), 2394 (new CFClient::UI::Slider vertical => 1),
… …
2179 2405
2180 $self->{fontsize} = $fontsize; 2406 $self->{fontsize} = $fontsize;
2181 $self->reflow; 2407 $self->reflow;
2182} 2408}
2183 2409
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 { 2410sub size_allocate {
2204 my ($self, $w, $h) = @_; 2411 my ($self, $w, $h) = @_;
2205 2412
2206 $self->SUPER::size_allocate ($w, $h); 2413 $self->SUPER::size_allocate ($w, $h);
2207 2414
… …
2210 $self->{layout}->set_width ($self->{children}[0]{w}); 2417 $self->{layout}->set_width ($self->{children}[0]{w});
2211 2418
2212 $self->reflow; 2419 $self->reflow;
2213} 2420}
2214 2421
2422sub text_size {
2423 my ($self, $text, $indent) = @_;
2424
2425 my $layout = $self->{layout};
2426
2427 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2428 $layout->set_width ($self->{children}[0]{w} - $indent);
2429 $layout->set_markup ($text);
2430
2431 $layout->size
2432}
2433
2434sub reflow {
2435 my ($self) = @_;
2436
2437 $self->{need_reflow}++;
2438 $self->update;
2439}
2440
2441sub set_offset {
2442 my ($self, $offset) = @_;
2443
2444 # todo: base offset on lines or so, not on pixels
2445 $self->{children}[1]->set_value ($offset);
2446}
2447
2448sub clear {
2449 my ($self) = @_;
2450
2451 $self->{par} = [];
2452 $self->{height} = 0;
2453 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2454}
2455
2215sub add_paragraph { 2456sub add_paragraph {
2216 my ($self, $color, $text) = @_; 2457 my ($self, $color, $text, $indent) = @_;
2217 2458
2218 #TODO: intelligently "reformat" paragraph 2459 for my $line (split /\n/, $text) {
2219 2460 my ($w, $h) = $self->text_size ($line);
2220 my $height = $self->text_height ($text);
2221
2222 $self->{height} += $height; 2461 $self->{height} += $h;
2462 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2463 }
2223 2464
2224 push @{$self->{par}}, [$height, $color, $text];
2225
2226 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2465 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2227 $self->{children}[1]->update;
2228} 2466}
2229 2467
2230sub update { 2468sub update {
2231 my ($self) = @_; 2469 my ($self) = @_;
2232 2470
… …
2234 2472
2235 return unless $self->{h} > 0; 2473 return unless $self->{h} > 0;
2236 2474
2237 delete $self->{texture}; 2475 delete $self->{texture};
2238 2476
2239 $ROOT->on_refresh ($self, sub { 2477 $ROOT->on_post_alloc ($self, sub {
2478 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2479
2240 if (delete $self->{need_reflow}) { 2480 if (delete $self->{need_reflow}) {
2241 my $height = 0; 2481 my $height = 0;
2242 2482
2243 $height += $_->[0] = $self->text_height ($_->[2]) 2483 my $layout = $self->{layout};
2484
2485 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2486
2244 for @{$self->{par}}; 2487 for (@{$self->{par}}) {
2488 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2489 $layout->set_width ($W - $_->[3]);
2490 $layout->set_markup ($_->[4]);
2491 my ($w, $h) = $layout->size;
2492 $_->[0] = $w + $_->[3];
2493 $_->[1] = $h;
2494 }
2495
2496 $height += $_->[1];
2497 }
2245 2498
2246 $self->{height} = $height; 2499 $self->{height} = $height;
2247 2500
2248 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2501 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2249 2502
2250 delete $self->{texture}; 2503 delete $self->{texture};
2251 } 2504 }
2252 2505
2253 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2506 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2254 glClearColor 0, 0, 0, 0; 2507 glClearColor 0.5, 0.5, 0.5, 0;
2255 glClear GL_COLOR_BUFFER_BIT; 2508 glClear GL_COLOR_BUFFER_BIT;
2256 2509
2510 my $top = int $self->{children}[1]{range}[0];
2511
2512 my $y0 = $top;
2513 my $y1 = $top + $H;
2514
2515 my $y = 0;
2516
2517 my $layout = $self->{layout};
2518
2519 $layout->set_font ($self->{font}) if $self->{font};
2520
2257 glEnable GL_BLEND; 2521 glEnable GL_BLEND;
2522 #TODO# not correct in windows where rgba is forced off
2258 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2523 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 2524
2273 for my $par (@{$self->{par}}) { 2525 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2526 my $h = $par->[1];
2275 2527
2276 if ($y0 < $y + $h && $y < $y1) { 2528 if ($y0 < $y + $h && $y < $y1) {
2529 $layout->set_foreground (@{ $par->[2] });
2530 $layout->set_width ($W - $par->[3]);
2277 $layout->set_text ($par->[2]); 2531 $layout->set_markup ($par->[4]);
2278 2532
2279 glColor @{ $par->[1] }; 2533 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280 my ($W, $H) = $layout->size; 2534
2281 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2535 glRasterPos $par->[3], $y - $y0;
2536 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2282 } 2537 }
2283 2538
2284 $y += $h; 2539 $y += $h;
2285 } 2540 }
2286 2541
2287 glDisable GL_TEXTURE_2D;
2288 glDisable GL_BLEND; 2542 glDisable GL_BLEND;
2289 }; 2543 };
2290 }); 2544 });
2291} 2545}
2292 2546
2293sub _draw { 2547sub _draw {
2294 my ($self) = @_; 2548 my ($self) = @_;
2295 2549
2296 glEnable GL_BLEND;
2297 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2298 glEnable GL_TEXTURE_2D; 2550 glEnable GL_TEXTURE_2D;
2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2551 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2300 glColor 1, 1, 1, 1; 2552 glColor 1, 1, 1, 1;
2301 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2553 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2302 glDisable GL_TEXTURE_2D; 2554 glDisable GL_TEXTURE_2D;
2303 glDisable GL_BLEND;
2304 2555
2305 $self->{children}[1]->draw; 2556 $self->{children}[1]->draw;
2306 2557
2307} 2558}
2308 2559
… …
2356 2607
2357sub new { 2608sub new {
2358 my $class = shift; 2609 my $class = shift;
2359 2610
2360 my $self = $class->SUPER::new ( 2611 my $self = $class->SUPER::new (
2361 state => 0, 2612 state => 0,
2362 connect_activate => \&toggle_flopper, 2613 on_activate => \&toggle_flopper,
2363 @_ 2614 @_
2364 ); 2615 );
2365 2616
2366 if ($self->{state}) {
2367 $self->{state} = 0;
2368 $self->toggle_flopper;
2369 }
2370
2371 $self 2617 $self
2372} 2618}
2373 2619
2374sub toggle_flopper { 2620sub toggle_flopper {
2375 my ($self) = @_; 2621 my ($self) = @_;
2376 2622
2377 # TODO: use animation 2623 $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} 2624}
2389 2625
2390############################################################################# 2626#############################################################################
2391 2627
2392package CFClient::UI::Tooltip; 2628package CFClient::UI::Tooltip;
… …
2402 @_, 2638 @_,
2403 can_events => 0, 2639 can_events => 0,
2404 ) 2640 )
2405} 2641}
2406 2642
2407sub set_markup { 2643sub set_tooltip_from {
2408 my ($self, $text) = @_; 2644 my ($self, $widget) = @_;
2409 2645
2410 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2646 my $tooltip = $widget->{tooltip};
2411 $self->{label}->set_markup ($text); 2647
2412 $self->add ($self->{label}); 2648 if ($ENV{CFPLUS_DEBUG} & 2) {
2649 $tooltip .= "\n\n" . (ref $widget) . "\n"
2650 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2651 . "req $widget->{req_w} $widget->{req_h}\n"
2652 . "visible $widget->{visible}";
2653 }
2654
2655 $self->add (new CFClient::UI::Label
2656 markup => $tooltip,
2657 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2658 fontsize => 0.8,
2659 fg => [0, 0, 0, 1],
2660 ellipsise => 0,
2661 font => ($widget->{tooltip_font} || $::FONT_PROP),
2662 );
2413} 2663}
2414 2664
2415sub size_request { 2665sub size_request {
2416 my ($self) = @_; 2666 my ($self) = @_;
2417
2418 $self->child->set_max_size ($::WIDTH * 0.3);
2419 2667
2420 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2668 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2421 2669
2422 ($w + 4, $h + 4) 2670 ($w + 4, $h + 4)
2423} 2671}
… …
2426 my ($self, $w, $h) = @_; 2674 my ($self, $w, $h) = @_;
2427 2675
2428 $self->SUPER::size_allocate ($w - 4, $h - 4); 2676 $self->SUPER::size_allocate ($w - 4, $h - 4);
2429} 2677}
2430 2678
2679sub visibility_change {
2680 my ($self, $visible) = @_;
2681
2682 return unless $visible;
2683
2684 $self->{root}->on_post_alloc ("move_$self" => sub {
2685 my $widget = $self->{owner}
2686 or return;
2687
2688 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2689
2690 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2691 if $x + $self->{w} > $::WIDTH;
2692
2693 $self->move_abs ($x, $y);
2694 });
2695}
2696
2431sub _draw { 2697sub _draw {
2432 my ($self) = @_; 2698 my ($self) = @_;
2433 2699
2434 glPushMatrix;
2435 glTranslate 0.375, 0.375; 2700 glTranslate 0.375, 0.375;
2436 2701
2437 my ($w, $h) = @$self{qw(w h)}; 2702 my ($w, $h) = @$self{qw(w h)};
2438 2703
2439 glColor 1, 0.8, 0.4; 2704 glColor 1, 0.8, 0.4;
… …
2450 glVertex 0 , $h; 2715 glVertex 0 , $h;
2451 glVertex $w, $h; 2716 glVertex $w, $h;
2452 glVertex $w, 0; 2717 glVertex $w, 0;
2453 glEnd; 2718 glEnd;
2454 2719
2455 glPopMatrix; 2720 glTranslate 2 - 0.375, 2 - 0.375;
2456 2721
2457 glTranslate 2, 2;
2458 $self->SUPER::_draw; 2722 $self->SUPER::_draw;
2459} 2723}
2460 2724
2461############################################################################# 2725#############################################################################
2462 2726
… …
2467use CFClient::OpenGL; 2731use CFClient::OpenGL;
2468 2732
2469sub new { 2733sub new {
2470 my $class = shift; 2734 my $class = shift;
2471 2735
2472 $class->SUPER::new ( 2736 my $self = $class->SUPER::new (
2473 aspect => 1, 2737 aspect => 1,
2738 can_events => 0,
2474 @_, 2739 @_,
2475 ) 2740 );
2741
2742 if ($self->{anim} && $self->{animspeed}) {
2743 Scalar::Util::weaken (my $widget = $self);
2744
2745 $self->{timer} = Event->timer (
2746 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2747 hard => 1,
2748 interval => $self->{animspeed},
2749 cb => sub {
2750 ++$widget->{frame};
2751 $widget->update;
2752 },
2753 );
2754 }
2755
2756 $self
2476} 2757}
2477 2758
2478sub size_request { 2759sub size_request {
2479 (32, 8) 2760 (32, 8)
2480} 2761}
2481 2762
2763sub update {
2764 my ($self) = @_;
2765
2766 return unless $self->{visible};
2767
2768 $self->SUPER::update;
2769}
2770
2482sub _draw { 2771sub _draw {
2483 my ($self) = @_; 2772 my ($self) = @_;
2484 2773
2485 return unless $::CONN;#d# manage and cache textures differently 2774 return unless $::CONN;
2775
2776 my $face;
2777
2778 if ($self->{frame}) {
2779 my $anim = $::CONN->{anim}[$self->{anim}];
2780
2781 $face = $anim->[ $self->{frame} % @$anim ]
2782 if $anim && @$anim;
2783 }
2784
2486 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2785 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2487 2786
2488 # TODO animation
2489 if ($tex) { 2787 if ($tex) {
2490 glEnable GL_BLEND;
2491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2492 glEnable GL_TEXTURE_2D; 2788 glEnable GL_TEXTURE_2D;
2493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2494 glColor 1, 1, 1, 1; 2790 glColor 1, 1, 1, 1;
2495 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2791 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2496 glDisable GL_TEXTURE_2D; 2792 glDisable GL_TEXTURE_2D;
2497 glDisable GL_BLEND;
2498 } 2793 }
2499} 2794}
2500 2795
2501############################################################################# 2796sub 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) = @_; 2797 my ($self) = @_;
2582 2798
2583 $self->{scrolled}->clear; 2799 $self->{timer}->cancel
2584 return unless $items; 2800 if $self->{timer};
2585 2801
2586 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2802 $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} 2803}
2605 2804
2606############################################################################# 2805#############################################################################
2607 2806
2608package CFClient::UI::Menu; 2807package CFClient::UI::Menu;
… …
2643 2842
2644# popup given the event (must be a mouse button down event currently) 2843# popup given the event (must be a mouse button down event currently)
2645sub popup { 2844sub popup {
2646 my ($self, $ev) = @_; 2845 my ($self, $ev) = @_;
2647 2846
2648 $self->emit ("popdown"); 2847 $self->_emit ("popdown");
2649 2848
2650 # maybe save $GRAB? must be careful about events... 2849 # maybe save $GRAB? must be careful about events...
2651 $GRAB = $self; 2850 $GRAB = $self;
2652 $self->{button} = $ev->{button}; 2851 $self->{button} = $ev->{button};
2653 2852
2654 $self->show; 2853 $self->show;
2655 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2854 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2656} 2855}
2657 2856
2658sub mouse_motion { 2857sub mouse_motion {
2659 my ($self, $ev, $x, $y) = @_; 2858 my ($self, $ev, $x, $y) = @_;
2660 2859
… …
2668 2867
2669 if ($ev->{button} == $self->{button}) { 2868 if ($ev->{button} == $self->{button}) {
2670 undef $GRAB; 2869 undef $GRAB;
2671 $self->hide; 2870 $self->hide;
2672 2871
2673 $self->emit ("popdown"); 2872 $self->_emit ("popdown");
2674 $self->{hover}[1]->() if $self->{hover}; 2873 $self->{hover}[1]->() if $self->{hover};
2675 } 2874 }
2676} 2875}
2677 2876
2678############################################################################# 2877#############################################################################
2679 2878
2879package CFClient::UI::Statusbox;
2880
2881our @ISA = CFClient::UI::VBox::;
2882
2883sub new {
2884 my $class = shift;
2885
2886 $class->SUPER::new (
2887 fontsize => 0.8,
2888 @_,
2889 )
2890}
2891
2892sub reorder {
2893 my ($self) = @_;
2894 my $NOW = time;
2895
2896 while (my ($k, $v) = each %{ $self->{item} }) {
2897 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2898 }
2899
2900 my @widgets;
2901
2902 my @items = sort {
2903 $a->{pri} <=> $b->{pri}
2904 or $b->{id} <=> $a->{id}
2905 } values %{ $self->{item} };
2906
2907 my $count = 10 + 1;
2908 for my $item (@items) {
2909 last unless --$count;
2910
2911 push @widgets, $item->{label} ||= do {
2912 # TODO: doesn't handle markup well (read as: at all)
2913 my $short = $item->{count} > 1
2914 ? "<b>$item->{count} ×</b> $item->{text}"
2915 : $item->{text};
2916
2917 for ($short) {
2918 s/^\s+//;
2919 s/\s+/ /g;
2920 }
2921
2922 new CFClient::UI::Label
2923 markup => $short,
2924 tooltip => $item->{tooltip},
2925 tooltip_font => $::FONT_PROP,
2926 tooltip_width => 0.67,
2927 fontsize => $item->{fontsize} || $self->{fontsize},
2928 max_w => $::WIDTH * 0.44,
2929 fg => $item->{fg},
2930 can_events => 1,
2931 can_hover => 1
2932 };
2933 }
2934
2935 $self->clear;
2936 $self->SUPER::add (reverse @widgets);
2937}
2938
2939sub add {
2940 my ($self, $text, %arg) = @_;
2941
2942 $text =~ s/^\s+//;
2943 $text =~ s/\s+$//;
2944
2945 return unless $text;
2946
2947 my $timeout = time + ((delete $arg{timeout}) || 60);
2948
2949 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2950
2951 if (my $item = $self->{item}{$group}) {
2952 if ($item->{text} eq $text) {
2953 $item->{count}++;
2954 } else {
2955 $item->{count} = 1;
2956 $item->{text} = $item->{tooltip} = $text;
2957 }
2958 $item->{id} = ++$self->{id};
2959 $item->{timeout} = $timeout;
2960 delete $item->{label};
2961 } else {
2962 $self->{item}{$group} = {
2963 id => ++$self->{id},
2964 text => $text,
2965 timeout => $timeout,
2966 tooltip => $text,
2967 fg => [0.8, 0.8, 0.8, 0.8],
2968 pri => 0,
2969 count => 1,
2970 %arg,
2971 };
2972 }
2973
2974 $self->reorder;
2975}
2976
2977sub reconfigure {
2978 my ($self) = @_;
2979
2980 delete $_->{label}
2981 for values %{ $self->{item} || {} };
2982
2983 $self->reorder;
2984 $self->SUPER::reconfigure;
2985}
2986
2987#############################################################################
2988
2989package CFClient::UI::Inventory;
2990
2991our @ISA = CFClient::UI::ScrolledWindow::;
2992
2993sub new {
2994 my $class = shift;
2995
2996 my $self = $class->SUPER::new (
2997 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2998 @_,
2999 );
3000
3001 $self
3002}
3003
3004sub set_items {
3005 my ($self, $items) = @_;
3006
3007 $self->{scrolled}->clear;
3008 return unless $items;
3009
3010 my @items = sort {
3011 ($a->{type} <=> $b->{type})
3012 or ($a->{name} cmp $b->{name})
3013 } @$items;
3014
3015 $self->{real_items} = \@items;
3016
3017 my $row = 0;
3018 for my $item (@items) {
3019 CFClient::Item::update_widgets $item;
3020
3021 $self->{scrolled}->add (0, $row, $item->{face_widget});
3022 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3023 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3024
3025 $row++;
3026 }
3027}
3028
3029#############################################################################
3030
3031package CFClient::UI::BindEditor;
3032
3033our @ISA = CFClient::UI::FancyFrame::;
3034
3035sub new {
3036 my $class = shift;
3037
3038 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3039
3040 $self->add (my $vb = new CFClient::UI::VBox);
3041
3042
3043 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3044 text => "start recording",
3045 tooltip => "Start/Stops recording of actions."
3046 ."All subsequent actions after the recording started will be captured."
3047 ."The actions are displayed after the record was stopped."
3048 ."To bind the action you have to click on the 'Bind' button",
3049 on_activate => sub {
3050 unless ($self->{recording}) {
3051 $self->start;
3052 } else {
3053 $self->stop;
3054 }
3055 });
3056
3057 $vb->add (new CFClient::UI::Label text => "Actions:");
3058 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3059
3060 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3061 $vb->add (my $hb = new CFClient::UI::HBox);
3062 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3063 $hb->add (new CFClient::UI::Button
3064 text => "bind",
3065 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3066 on_activate => sub {
3067 $self->ask_for_bind;
3068 });
3069
3070 $vb->add (my $hb = new CFClient::UI::HBox);
3071 $hb->add (new CFClient::UI::Button
3072 text => "ok",
3073 expand => 1,
3074 tooltip => "This closes the binding editor and saves the binding",
3075 on_activate => sub {
3076 $self->hide;
3077 $self->commit;
3078 });
3079
3080 $hb->add (new CFClient::UI::Button
3081 text => "cancel",
3082 expand => 1,
3083 tooltip => "This closes the binding editor without saving",
3084 on_activate => sub {
3085 $self->hide;
3086 $self->{binding_cancel}->()
3087 if $self->{binding_cancel};
3088 });
3089
3090 $self->update_binding_widgets;
3091
3092 $self
3093}
3094
3095sub commit {
3096 my ($self) = @_;
3097 my ($mod, $sym, $cmds) = $self->get_binding;
3098 if ($sym != 0 && @$cmds > 0) {
3099 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3100 ."'. Don't forget 'Save Config'!");
3101 $self->{binding_change}->($mod, $sym, $cmds)
3102 if $self->{binding_change};
3103 } else {
3104 $::STATUSBOX->add ("No action bound, no key or action specified!");
3105 $self->{binding_cancel}->()
3106 if $self->{binding_cancel};
3107 }
3108}
3109
3110sub start {
3111 my ($self) = @_;
3112
3113 $self->{rec_btn}->set_text ("stop recording");
3114 $self->{recording} = 1;
3115 $self->clear_command_list;
3116 $::CONN->start_record if $::CONN;
3117}
3118
3119sub stop {
3120 my ($self) = @_;
3121
3122 $self->{rec_btn}->set_text ("start recording");
3123 $self->{recording} = 0;
3124
3125 my $rec;
3126 $rec = $::CONN->stop_record if $::CONN;
3127 return unless ref $rec eq 'ARRAY';
3128 $self->set_command_list ($rec);
3129}
3130
3131# if $commit is true, the binding will be set after the user entered a key combo
3132sub ask_for_bind {
3133 my ($self, $commit) = @_;
3134
3135 CFClient::Binder::open_binding_dialog (sub {
3136 my ($mod, $sym) = @_;
3137 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3138 $self->update_binding_widgets;
3139 $self->commit if $commit;
3140 });
3141}
3142
3143# $mod and $sym are the modifiers and key symbol
3144# $cmds is a array ref of strings (the commands)
3145# $cb is the callback that is executed on OK
3146# $ccb is the callback that is executed on CANCEL and
3147# when the binding was unsuccessful on OK
3148sub set_binding {
3149 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3150
3151 $self->clear_command_list;
3152 $self->{recording} = 0;
3153 $self->{rec_btn}->set_text ("start recording");
3154
3155 $self->{binding} = [$mod, $sym];
3156 $self->{commands} = $cmds;
3157
3158 $self->{binding_change} = $cb;
3159 $self->{binding_cancel} = $ccb;
3160
3161 $self->update_binding_widgets;
3162}
3163
3164# this is a shortcut method that asks for a binding
3165# and then just binds it.
3166sub do_quick_binding {
3167 my ($self, $cmds) = @_;
3168 $self->set_binding (undef, undef, $cmds, sub {
3169 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3170 });
3171 $self->ask_for_bind (1);
3172}
3173
3174sub update_binding_widgets {
3175 my ($self) = @_;
3176 my ($mod, $sym, $cmds) = $self->get_binding;
3177 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3178 $self->set_command_list ($cmds);
3179}
3180
3181sub get_binding {
3182 my ($self) = @_;
3183 return (
3184 $self->{binding}->[0],
3185 $self->{binding}->[1],
3186 [ grep { defined $_ } @{$self->{commands}} ]
3187 );
3188}
3189
3190sub clear_command_list {
3191 my ($self) = @_;
3192 $self->{cmdbox}->clear ();
3193}
3194
3195sub set_command_list {
3196 my ($self, $cmds) = @_;
3197
3198 $self->{cmdbox}->clear ();
3199 $self->{commands} = $cmds;
3200
3201 my $idx = 0;
3202
3203 for (@$cmds) {
3204 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3205
3206 my $i = $idx;
3207 $hb->add (new CFClient::UI::Label text => $_);
3208 $hb->add (new CFClient::UI::Button
3209 text => "delete",
3210 tooltip => "Deletes the action from the record",
3211 on_activate => sub {
3212 $self->{cmdbox}->remove ($hb);
3213 $cmds->[$i] = undef;
3214 });
3215
3216
3217 $idx++
3218 }
3219}
3220
3221#############################################################################
3222
3223package CFClient::UI::SpellList;
3224
3225our @ISA = CFClient::UI::FancyFrame::;
3226
3227sub new {
3228 my $class = shift;
3229
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232 $self->add (new CFClient::UI::ScrolledWindow
3233 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3234
3235 $self;
3236}
3237
3238# XXX: Do sorting? Argl...
3239sub add_spell {
3240 my ($self, $spell) = @_;
3241 $self->{spells}->{$spell->{name}} = $spell;
3242
3243 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3244 face => $spell->{face},
3245 can_hover => 1,
3246 can_events => 1,
3247 tooltip => $spell->{message});
3248
3249 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3250 text => $spell->{name},
3251 can_hover => 1,
3252 can_events => 1,
3253 tooltip => $spell->{message},
3254 expand => 1);
3255
3256 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3257 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3258 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3259 expand => 1);
3260
3261 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3262 text => "bind to key",
3263 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3264}
3265
3266sub rebuild_spell_list {
3267 my ($self) = @_;
3268 $self->{tbl_idx} = 0;
3269 $self->add_spell ($_) for values %{$self->{spells}};
3270}
3271
3272sub remove_spell {
3273 my ($self, $spell) = @_;
3274 delete $self->{spells}->{$spell->{name}};
3275 $self->rebuild_spell_list;
3276}
3277
3278#############################################################################
3279
2680package CFClient::UI::Root; 3280package CFClient::UI::Root;
2681 3281
2682our @ISA = CFClient::UI::Container::; 3282our @ISA = CFClient::UI::Container::;
2683 3283
2684use CFClient::OpenGL; 3284use CFClient::OpenGL;
2685 3285
2686sub check_size { 3286sub new {
2687 my ($self) = @_; 3287 my $class = shift;
2688 3288
2689 $self->configure (0, 0, $self->{w}, $self->{h}); 3289 my $self = $class->SUPER::new (
3290 visible => 1,
3291 @_,
3292 );
3293
3294 Scalar::Util::weaken ($self->{root} = $self);
3295
3296 $self
2690} 3297}
2691 3298
2692sub size_request { 3299sub size_request {
2693 my ($self) = @_; 3300 my ($self) = @_;
2694 3301
2695 ($self->{w}, $self->{h}) 3302 ($self->{w}, $self->{h})
3303}
3304
3305sub _to_pixel {
3306 my ($coord, $size, $max) = @_;
3307
3308 $coord =
3309 $coord eq "center" ? ($max - $size) * 0.5
3310 : $coord eq "max" ? $max
3311 : $coord;
3312
3313 $coord = 0 if $coord < 0;
3314 $coord = $max - $size if $coord > $max - $size;
3315
3316 int $coord + 0.5
2696} 3317}
2697 3318
2698sub size_allocate { 3319sub size_allocate {
2699 my ($self, $w, $h) = @_; 3320 my ($self, $w, $h) = @_;
2700 3321
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->{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) { 3322 for my $child ($self->children) {
2727 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3323 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2728 3324
2729 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3325 $X = $child->{force_x} if exists $child->{force_x};
2730 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3326 $Y = $child->{force_y} if exists $child->{force_y};
3327
3328 $X = _to_pixel $X, $W, $self->{w};
3329 $Y = _to_pixel $Y, $H, $self->{h};
3330
2731 $child->configure ($X, $Y, $W, $H); 3331 $child->configure ($X, $Y, $W, $H);
2732 } 3332 }
2733} 3333}
2734 3334
2735sub _topleft { 3335sub coord2local {
2736 my ($self, $x, $y) = @_; 3336 my ($self, $x, $y) = @_;
2737 3337
2738 ($x, $y) 3338 ($x, $y)
2739} 3339}
2740 3340
3341sub coord2global {
3342 my ($self, $x, $y) = @_;
3343
3344 ($x, $y)
3345}
3346
2741sub update { 3347sub update {
2742 my ($self) = @_; 3348 my ($self) = @_;
2743 3349
2744 $self->check_size; 3350 $::WANT_REFRESH++;
2745 ::refresh ();
2746} 3351}
2747 3352
2748sub add { 3353sub add {
2749 my ($self, $child) = @_; 3354 my ($self, @children) = @_;
2750 3355
2751 # integerize window positions 3356 $_->{is_toplevel} = 1
2752 $child->{x} = int $child->{x}; 3357 for @children;
2753 $child->{y} = int $child->{y};
2754 3358
2755 $self->SUPER::add ($child); 3359 $self->SUPER::add (@children);
3360}
3361
3362sub remove {
3363 my ($self, @children) = @_;
3364
3365 $self->SUPER::remove (@children);
3366
3367 delete $self->{is_toplevel}
3368 for @children;
3369
3370 while (@children) {
3371 my $w = pop @children;
3372 push @children, $w->children;
3373 $w->set_invisible;
3374 }
2756} 3375}
2757 3376
2758sub on_refresh { 3377sub on_refresh {
2759 my ($self, $id, $cb) = @_; 3378 my ($self, $id, $cb) = @_;
2760 3379
2761 $self->{refresh_hook}{$id} = $cb; 3380 $self->{refresh_hook}{$id} = $cb;
2762} 3381}
2763 3382
3383sub on_post_alloc {
3384 my ($self, $id, $cb) = @_;
3385
3386 $self->{post_alloc_hook}{$id} = $cb;
3387}
3388
2764sub draw { 3389sub draw {
2765 my ($self) = @_; 3390 my ($self) = @_;
2766 3391
2767 while (my $rcb = delete $self->{refresh_hook}) { 3392 while ($self->{refresh_hook}) {
2768 $_->() for values %$rcb; 3393 $_->()
3394 for values %{delete $self->{refresh_hook}};
2769 } 3395 }
3396
3397 if ($self->{realloc}) {
3398 my %queue;
3399 my @queue;
3400 my $widget;
3401
3402 outer:
3403 while () {
3404 if (my $realloc = delete $self->{realloc}) {
3405 for $widget (values %$realloc) {
3406 $widget->{visible} or next; # do not resize invisible widgets
3407
3408 $queue{$widget+0}++ and next; # duplicates are common
3409
3410 push @{ $queue[$widget->{visible}] }, $widget;
3411 }
3412 }
3413
3414 while () {
3415 @queue or last outer;
3416
3417 $widget = pop @{ $queue[-1] || [] }
3418 and last;
3419
3420 pop @queue;
3421 }
3422
3423 delete $queue{$widget+0};
3424
3425 my ($w, $h) = $widget->size_request;
3426
3427 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3428 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3429
3430 $w = $widget->{force_w} if exists $widget->{force_w};
3431 $h = $widget->{force_h} if exists $widget->{force_h};
3432
3433 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3434 || delete $widget->{force_realloc}) {
3435 $widget->{req_w} = $w;
3436 $widget->{req_h} = $h;
3437
3438 $self->{size_alloc}{$widget+0} = $widget;
3439
3440 if (my $parent = $widget->{parent}) {
3441 $self->{realloc}{$parent+0} = $parent
3442 unless $queue{$parent+0};
3443
3444 $parent->{force_size_alloc} = 1;
3445 $self->{size_alloc}{$parent+0} = $parent;
3446 }
3447 }
3448
3449 delete $self->{realloc}{$widget+0};
3450 }
3451 }
3452
3453 while (my $size_alloc = delete $self->{size_alloc}) {
3454 my @queue = sort { $b->{visible} <=> $a->{visible} }
3455 values %$size_alloc;
3456
3457 while () {
3458 my $widget = pop @queue || last;
3459
3460 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3461
3462 $w = 0 if $w < 0;
3463 $h = 0 if $h < 0;
3464
3465 $w = int $w + 0.5;
3466 $h = int $h + 0.5;
3467
3468 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3469 $widget->{old_w} = $widget->{w};
3470 $widget->{old_h} = $widget->{h};
3471
3472 $widget->{w} = $w;
3473 $widget->{h} = $h;
3474
3475 $widget->emit (size_allocate => $w, $h);
3476 }
3477 }
3478 }
3479
3480 while ($self->{post_alloc_hook}) {
3481 $_->()
3482 for values %{delete $self->{post_alloc_hook}};
3483 }
3484
2770 3485
2771 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3486 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2772 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3487 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2773 glClear GL_COLOR_BUFFER_BIT; 3488 glClear GL_COLOR_BUFFER_BIT;
2774 3489
2775 glMatrixMode GL_PROJECTION; 3490 glMatrixMode GL_PROJECTION;
2776 glLoadIdentity; 3491 glLoadIdentity;
2777 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3492 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2778 glMatrixMode GL_MODELVIEW; 3493 glMatrixMode GL_MODELVIEW;
2779 glLoadIdentity; 3494 glLoadIdentity;
2780 3495
3496 {
3497 package CFClient::UI::Base;
3498
3499 ($draw_x, $draw_y, $draw_w, $draw_h) =
3500 (0, 0, $self->{w}, $self->{h});
3501 }
3502
2781 $self->_draw; 3503 $self->_draw;
2782} 3504}
2783 3505
2784############################################################################# 3506#############################################################################
2785 3507
2786package CFClient::UI; 3508package CFClient::UI;
2787 3509
2788$ROOT = new CFClient::UI::Root; 3510$ROOT = new CFClient::UI::Root;
2789$TOOLTIP = new CFClient::UI::Tooltip; 3511$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2790 3512
27911 35131
2792 3514

Diff Legend

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