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.188 by root, Mon May 8 21:16:09 2006 UTC vs.
Revision 1.269 by root, Fri Jun 2 06:22:55 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#############################################################################
… …
542 $self->{children} = [ 686 $self->{children} = [
543 sort { $a->{z} <=> $b->{z} } 687 sort { $a->{z} <=> $b->{z} }
544 @{$self->{children}}, @widgets 688 @{$self->{children}}, @widgets
545 ]; 689 ];
546 690
547 $_->check_size 691 $self->realloc;
548 for @widgets;
549
550 $self->update;
551} 692}
552 693
553sub children { 694sub children {
554 @{ $_[0]{children} } 695 @{ $_[0]{children} }
555} 696}
… …
560 delete $child->{parent}; 701 delete $child->{parent};
561 $child->hide; 702 $child->hide;
562 703
563 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 704 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
564 705
565 $self->check_size; 706 $self->realloc;
566 $self->update;
567} 707}
568 708
569sub clear { 709sub clear {
570 my ($self) = @_; 710 my ($self) = @_;
571 711
… …
575 for (@$children) { 715 for (@$children) {
576 delete $_->{parent}; 716 delete $_->{parent};
577 $_->hide; 717 $_->hide;
578 } 718 }
579 719
580 $self->check_size; 720 $self->realloc;
581 $self->update;
582} 721}
583 722
584sub find_widget { 723sub find_widget {
585 my ($self, $x, $y) = @_; 724 my ($self, $x, $y) = @_;
586 725
… …
661} 800}
662 801
663sub update { 802sub update {
664 my ($self) = @_; 803 my ($self) = @_;
665 804
666 $ROOT->on_refresh ($self => sub { $self->render_child }); 805 $ROOT->on_post_alloc ($self => sub { $self->render_child });
667 $self->SUPER::update; 806 $self->SUPER::update;
668} 807}
669 808
670sub size_allocate { 809sub size_allocate {
671 my ($self, $w, $h) = @_; 810 my ($self, $w, $h) = @_;
… …
673 $self->SUPER::size_allocate ($w, $h); 812 $self->SUPER::size_allocate ($w, $h);
674 $self->update; 813 $self->update;
675} 814}
676 815
677sub _render { 816sub _render {
817 my ($self) = @_;
818
678 $_[0]{children}[0]->draw; 819 $self->{children}[0]->draw;
679} 820}
680 821
681sub render_child { 822sub render_child {
682 my ($self) = @_; 823 my ($self) = @_;
683 824
684 $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 {
685 glClearColor 0, 0, 0, 0; 826 glClearColor 0, 0, 0, 0;
686 glClear GL_COLOR_BUFFER_BIT; 827 glClear GL_COLOR_BUFFER_BIT;
687 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
688 $self->_render; 836 $self->_render;
689# glColorMask 1, 1, 1, 0;
690# glEnable GL_BLEND;
691# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
692# glRasterPos 0, 0;
693# glCopyPixels 0, 0, $self->{w}, $self->{h};
694# glDisable GL_BLEND;
695# glColorMask 1, 1, 1, 1;
696 }; 837 };
697} 838}
698 839
699sub _draw { 840sub _draw {
700 my ($self) = @_; 841 my ($self) = @_;
701 842
702 my ($w, $h) = ($self->w, $self->h); 843 my ($w, $h) = @$self{qw(w h)};
703 844
704 my $tex = $self->{texture} 845 my $tex = $self->{texture}
705 or return; 846 or return;
706 847
707 glEnable GL_BLEND;
708 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
709 glEnable GL_TEXTURE_2D; 848 glEnable GL_TEXTURE_2D;
710 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
711 glColor 0, 0, 0, 1; 850 glColor 1, 1, 1, 1;
712 851
713 $tex->draw_quad (0, 0, $w, $h); 852 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
714 853
715 glDisable GL_BLEND;
716 glDisable GL_TEXTURE_2D; 854 glDisable GL_TEXTURE_2D;
717} 855}
718 856
719############################################################################# 857#############################################################################
720 858
721package CFClient::UI::ViewPort; 859package CFClient::UI::ViewPort;
722 860
723our @ISA = CFClient::UI::Window::; 861our @ISA = CFClient::UI::Window::;
724 862
863sub new {
864 my $class = shift;
865
866 $class->SUPER::new (
867 scroll_x => 0,
868 scroll_y => 1,
869 @_,
870 )
871}
872
725sub size_request { 873sub size_request {
726 my ($self) = @_; 874 my ($self) = @_;
727 875
728 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 876 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
729 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
730 877
731 @$self{qw(child_w child_h)} 878 $w = 10 if $self->{scroll_x};
879 $h = 10 if $self->{scroll_y};
880
881 ($w, $h)
732} 882}
733 883
734sub size_allocate { 884sub size_allocate {
735 my ($self, $w, $h) = @_; 885 my ($self, $w, $h) = @_;
736 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);
737 $self->update; 893 $self->update;
738} 894}
739 895
740sub set_offset { 896sub set_offset {
741 my ($self, $x, $y) = @_; 897 my ($self, $x, $y) = @_;
… …
744 $self->{view_y} = int $y; 900 $self->{view_y} = int $y;
745 901
746 $self->update; 902 $self->update;
747} 903}
748 904
749# 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
750sub _topleft { 906sub coord2local {
751 my ($self, $x, $y) = @_; 907 my ($self, $x, $y) = @_;
752 908
753 $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)
754} 919}
755 920
756sub find_widget { 921sub find_widget {
757 my ($self, $x, $y) = @_; 922 my ($self, $x, $y) = @_;
758 923
… …
766} 931}
767 932
768sub _render { 933sub _render {
769 my ($self) = @_; 934 my ($self) = @_;
770 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
771 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 939 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
772 940
773 $self->SUPER::_render; 941 $self->SUPER::_render;
774} 942}
775 943
… …
783 my $class = shift; 951 my $class = shift;
784 952
785 my $self; 953 my $self;
786 954
787 my $slider = new CFClient::UI::Slider 955 my $slider = new CFClient::UI::Slider
788 vertical => 1, 956 vertical => 1,
789 range => [0, 0, 1, 0.01], # HACK fix 957 range => [0, 0, 1, 0.01], # HACK fix
790 connect_changed => sub { 958 on_changed => sub {
791 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 959 $self->{vp}->set_offset (0, $_[1]);
792 }, 960 },
793 ; 961 ;
794 962
795 $self = $class->SUPER::new ( 963 $self = $class->SUPER::new (
796 vp => (new CFClient::UI::ViewPort), 964 vp => (new CFClient::UI::ViewPort expand => 1),
797 slider => $slider, 965 slider => $slider,
798 @_, 966 @_,
799 ); 967 );
800 968
801 $self->{vp}->add ($self->{scrolled}); 969 $self->{vp}->add ($self->{scrolled});
… …
803 $self->add ($self->{slider}); 971 $self->add ($self->{slider});
804 972
805 $self 973 $self
806} 974}
807 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
808#TODO# update range on size_allocate depeneing on child 995#TODO# update range on size_allocate depending on child
809# update viewport offset on scroll 996# update viewport offset on scroll
810 997
811############################################################################# 998#############################################################################
812 999
813package CFClient::UI::Frame; 1000package CFClient::UI::Frame;
… …
817use CFClient::OpenGL; 1004use CFClient::OpenGL;
818 1005
819sub new { 1006sub new {
820 my $class = shift; 1007 my $class = shift;
821 1008
1009 $class->SUPER::new (
1010 bg => undef,
1011 @_,
1012 )
1013}
1014
1015sub _draw {
1016 my ($self) = @_;
1017
1018 if ($self->{bg}) {
1019 my ($w, $h) = @$self{qw(w h)};
1020
1021 glEnable GL_BLEND;
1022 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1023 glColor @{ $self->{bg} };
1024
1025 glBegin GL_QUADS;
1026 glVertex 0 , 0;
1027 glVertex 0 , $h;
1028 glVertex $w, $h;
1029 glVertex $w, 0;
1030 glEnd;
1031
1032 glDisable GL_BLEND;
1033 }
1034
1035 $self->SUPER::_draw;
1036}
1037
1038#############################################################################
1039
1040package CFClient::UI::FancyFrame;
1041
1042our @ISA = CFClient::UI::Bin::;
1043
1044use CFClient::OpenGL;
1045
1046my $bg =
1047 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1048 mipmap => 1, wrap => 1;
1049
1050my @border =
1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1053
1054sub new {
1055 my ($class, %arg) = @_;
1056
1057 my $title = delete $arg{title};
1058
822 my $self = $class->SUPER::new ( 1059 my $self = $class->SUPER::new (
823 bg => [1, 1, 1, 1], 1060 bg => [1, 1, 1, 1],
824 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
825 border => 0.8, 1062 border => 0.6,
826 @_ 1063 can_events => 1,
1064 min_w => 16,
1065 min_h => 16,
1066 %arg,
827 ); 1067 );
828 1068
829 $self
830}
831
832sub _draw {
833 my ($self) = @_;
834
835 my ($w, $h) = ($self->{w}, $self->{h});
836
837 glEnable GL_BLEND;
838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
839 glEnable GL_TEXTURE_2D;
840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
841
842# glBegin GL_QUADS;
843# glColor 0, 0, 0, 0;
844# glVertex 0 , 0;
845# glVertex 0 , $h;
846# glVertex $w, $h;
847# glVertex $w, 0;
848# glEnd;
849
850
851 $self->child->draw;
852 glDisable GL_BLEND;
853 glDisable GL_TEXTURE_2D;
854}
855
856#############################################################################
857
858package CFClient::UI::FancyFrame;
859
860our @ISA = CFClient::UI::Bin::;
861
862use CFClient::OpenGL;
863
864my @tex =
865 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
866 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
867
868sub new {
869 my $class = shift;
870
871 # TODO: user_x, user_y, overwrite moveto?
872
873 my $self = $class->SUPER::new (
874 bg => [1, 1, 1, 1],
875 border_bg => [1, 1, 1, 1],
876 border => 0.6,
877 can_events => 1,
878 @_
879 );
880
881 $self->{title} &&= new CFClient::UI::Label 1069 $self->{title} = new CFClient::UI::Label
882 align => 0, 1070 align => 0,
883 valign => 1, 1071 valign => 1,
884 text => $self->{title}, 1072 text => $title,
885 fontsize => $self->{border}; 1073 fontsize => $self->{border}
1074 if defined $title;
886 1075
887 $self 1076 $self
1077}
1078
1079sub add {
1080 my ($self, @widgets) = @_;
1081
1082 $self->SUPER::add (@widgets);
1083 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
888} 1084}
889 1085
890sub border { 1086sub border {
891 int $_[0]{border} * $::FONTSIZE 1087 int $_[0]{border} * $::FONTSIZE
892} 1088}
893 1089
894sub size_request { 1090sub size_request {
895 my ($self) = @_; 1091 my ($self) = @_;
1092
1093 $self->{title}->size_request
1094 if $self->{title};
896 1095
897 my ($w, $h) = $self->SUPER::size_request; 1096 my ($w, $h) = $self->SUPER::size_request;
898 1097
899 ( 1098 (
900 $w + $self->border * 2, 1099 $w + $self->border * 2,
… …
903} 1102}
904 1103
905sub size_allocate { 1104sub size_allocate {
906 my ($self, $w, $h) = @_; 1105 my ($self, $w, $h) = @_;
907 1106
1107 if ($self->{title}) {
1108 $self->{title}{w} = $w;
1109 $self->{title}{h} = $h;
1110 $self->{title}->size_allocate ($w, $h);
1111 }
1112
1113 my $border = $self->border;
1114
908 $h -= List::Util::max 0, $self->border * 2; 1115 $h -= List::Util::max 0, $border * 2;
909 $w -= List::Util::max 0, $self->border * 2; 1116 $w -= List::Util::max 0, $border * 2;
910 1117
911 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
912 if $self->{title};
913
914 $self->child->configure ($self->border, $self->border, $w, $h); 1118 $self->child->configure ($border, $border, $w, $h);
915} 1119}
916 1120
917sub button_down { 1121sub button_down {
918 my ($self, $ev, $x, $y) = @_; 1122 my ($self, $ev, $x, $y) = @_;
919 1123
… …
935 my ($ev, $x, $y) = @_; 1139 my ($ev, $x, $y) = @_;
936 1140
937 my $dx = $ev->{x} - $ox; 1141 my $dx = $ev->{x} - $ox;
938 my $dy = $ev->{y} - $oy; 1142 my $dy = $ev->{y} - $oy;
939 1143
940 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
941 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146
1147 $self->realloc;
942 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
943 $self->check_size;
944 }; 1149 };
945 1150
946 } elsif ($lr ^ $td) { 1151 } elsif ($lr ^ $td) {
947 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1152 my ($ox, $oy) = ($ev->{x}, $ev->{y});
948 my ($bx, $by) = ($self->{x}, $self->{y}); 1153 my ($bx, $by) = ($self->{x}, $self->{y});
… …
950 $self->{motion} = sub { 1155 $self->{motion} = sub {
951 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
952 1157
953 ($x, $y) = ($ev->{x}, $ev->{y}); 1158 ($x, $y) = ($ev->{x}, $ev->{y});
954 1159
955 $self->move ($bx + $x - $ox, $by + $y - $oy); 1160 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
956 $self->update;
957 }; 1161 };
958 } 1162 }
959} 1163}
960 1164
961sub button_up { 1165sub button_up {
… …
971} 1175}
972 1176
973sub _draw { 1177sub _draw {
974 my ($self) = @_; 1178 my ($self) = @_;
975 1179
1180 my $child = $self->{children}[0];
1181
976 my ($w, $h ) = ($self->{w}, $self->{h}); 1182 my ($w, $h ) = ($self->{w}, $self->{h});
977 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1183 my ($cw, $ch) = ($child->{w}, $child->{h});
978 1184
979 glEnable GL_BLEND;
980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
981 glEnable GL_TEXTURE_2D; 1185 glEnable GL_TEXTURE_2D;
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1186 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 1187
984 my $border = $self->border; 1188 my $border = $self->border;
985 1189
986 glColor @{ $self->{border_bg} }; 1190 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad (0, 0, $w, $border); 1191 $border[0]->draw_quad_alpha (0, 0, $w, $border);
988 $tex[3]->draw_quad (0, $border, $border, $ch); 1192 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
989 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1193 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1194 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
991 1195
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1196 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 1197 glColor @{ $self->{bg} };
994 1198
995 # TODO: repeat texture not scale 1199 # TODO: repeat texture not scale
1200 # solve this better(?)
996 my $rep_x = $cw / $bg->{w}; 1201 $bg->{s} = $cw / $bg->{w};
997 my $rep_y = $ch / $bg->{h}; 1202 $bg->{t} = $ch / $bg->{h};
998
999 glColor @{ $self->{bg} };
1000
1001 $bg->{s} = $rep_x;
1002 $bg->{t} = $rep_y;
1003 $bg->{wrap_mode} = 1;
1004 $bg->draw_quad ($border, $border, $cw, $ch); 1203 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1204 }
1005 1205
1006 glDisable GL_TEXTURE_2D; 1206 glDisable GL_TEXTURE_2D;
1007 glDisable GL_BLEND;
1008 }
1009 1207
1010 $self->{title}->draw if $self->{title};
1011
1012 $self->child->draw; 1208 $child->draw;
1209
1210 if ($self->{title}) {
1211 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw;
1213 }
1013} 1214}
1014 1215
1015############################################################################# 1216#############################################################################
1016 1217
1017package CFClient::UI::Table; 1218package CFClient::UI::Table;
… …
1025sub new { 1226sub new {
1026 my $class = shift; 1227 my $class = shift;
1027 1228
1028 $class->SUPER::new ( 1229 $class->SUPER::new (
1029 col_expand => [], 1230 col_expand => [],
1030 @_ 1231 @_,
1031 ) 1232 )
1233}
1234
1235sub children {
1236 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032} 1237}
1033 1238
1034sub add { 1239sub add {
1035 my ($self, $x, $y, $child) = @_; 1240 my ($self, $x, $y, $child) = @_;
1036 1241
1037 $child->set_parent ($self); 1242 $child->set_parent ($self);
1038 $self->{children}[$y][$x] = $child; 1243 $self->{children}[$y][$x] = $child;
1039 1244
1040 $child->check_size; 1245 $self->realloc;
1041} 1246}
1042 1247
1043sub children {
1044 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1045}
1046
1047# TODO: move to container class maybe? send childs a signal on removal? 1248# TODO: move to container class maybe? send children a signal on removal?
1048sub clear { 1249sub clear {
1049 my ($self) = @_; 1250 my ($self) = @_;
1050 1251
1051 my @children = $self->children; 1252 my @children = $self->children;
1052 delete $self->{children}; 1253 delete $self->{children};
… …
1054 for (@children) { 1255 for (@children) {
1055 delete $_->{parent}; 1256 delete $_->{parent};
1056 $_->hide; 1257 $_->hide;
1057 } 1258 }
1058 1259
1059 $self->update; 1260 $self->realloc;
1060} 1261}
1061 1262
1062sub get_wh { 1263sub get_wh {
1063 my ($self) = @_; 1264 my ($self) = @_;
1064 1265
… …
1095sub size_allocate { 1296sub size_allocate {
1096 my ($self, $w, $h) = @_; 1297 my ($self, $w, $h) = @_;
1097 1298
1098 my ($ws, $hs) = $self->get_wh; 1299 my ($ws, $hs) = $self->get_wh;
1099 1300
1100 my $req_w = sum @$ws; 1301 my $req_w = (sum @$ws) || 1;
1101 my $req_h = sum @$hs; 1302 my $req_h = (sum @$hs) || 1;
1102 1303
1103 # TODO: nicer code && do row_expand 1304 # TODO: nicer code && do row_expand
1104 my @col_expand = @{$self->{col_expand}}; 1305 my @col_expand = @{$self->{col_expand}};
1105 @col_expand = (1) x @$ws unless @col_expand; 1306 @col_expand = (1) x @$ws unless @col_expand;
1106 my $col_expand = (sum @col_expand) || 1; 1307 my $col_expand = (sum @col_expand) || 1;
… …
1160 } 1361 }
1161} 1362}
1162 1363
1163############################################################################# 1364#############################################################################
1164 1365
1165package CFClient::UI::HBox; 1366package CFClient::UI::Box;
1166
1167# TODO: wrap into common Box base class
1168 1367
1169our @ISA = CFClient::UI::Container::; 1368our @ISA = CFClient::UI::Container::;
1170 1369
1171sub size_request { 1370sub size_request {
1172 my ($self) = @_; 1371 my ($self) = @_;
1173 1372
1174 my @alloc = map [$_->size_request], @{$self->{children}}; 1373 $self->{vertical}
1175 1374 ? (
1176 ( 1375 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1177 (List::Util::sum map $_->[0], @alloc), 1376 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1178 (List::Util::max map $_->[1], @alloc), 1377 )
1179 ) 1378 : (
1379 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1380 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1381 )
1180} 1382}
1181 1383
1182sub size_allocate { 1384sub size_allocate {
1183 my ($self, $w, $h) = @_; 1385 my ($self, $w, $h) = @_;
1184 1386
1185 ($h, $w) = ($w, $h); 1387 my $space = $self->{vertical} ? $h : $w;
1186
1187 my $children = $self->{children}; 1388 my $children = $self->{children};
1188 1389
1189 my @h = map $_->{req_w}, @$children; 1390 my @req;
1190 1391
1191 my $req_h = List::Util::sum @h; 1392 if ($self->{homogeneous}) {
1192 1393 @req = ($space / (@$children || 1)) x @$children;
1193 if ($req_h > $h) {
1194 # ah well, not enough space
1195 $_ *= $h / $req_h for @h;
1196 } else { 1394 } else {
1395 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1396 my $req = List::Util::sum @req;
1397
1398 if ($req > $space) {
1399 # ah well, not enough space
1400 $_ *= $space / $req for @req;
1401 } else {
1197 my $exp = List::Util::sum map $_->{expand}, @$children; 1402 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1198 $exp ||= 1;
1199 1403
1404 $space = ($space - $req) / $expand; # remaining space to give away
1405
1406 $req[$_] += $space * $children->[$_]{expand}
1200 for (0 .. $#$children) { 1407 for 0 .. $#$children;
1201 my $child = $children->[$_];
1202
1203 my $alloc_h = $h[$_];
1204 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1205 $h[$_] = $alloc_h;
1206 } 1408 }
1207 } 1409 }
1208 1410
1209 CFClient::UI::harmonize \@h; 1411 CFClient::UI::harmonize \@req;
1210 1412
1211 my $y = 0; 1413 my $pos = 0;
1212 for (0 .. $#$children) { 1414 for (0 .. $#$children) {
1213 my $child = $children->[$_];
1214 my $h = $h[$_]; 1415 my $alloc = $req[$_];
1215 $child->configure ($y, 0, $h, $w); 1416 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1216 1417
1217 $y += $h; 1418 $pos += $alloc;
1218 } 1419 }
1219 1420
1220 1 1421 1
1221} 1422}
1222 1423
1223############################################################################# 1424#############################################################################
1224 1425
1426package CFClient::UI::HBox;
1427
1428our @ISA = CFClient::UI::Box::;
1429
1430sub new {
1431 my $class = shift;
1432
1433 $class->SUPER::new (
1434 vertical => 0,
1435 @_,
1436 )
1437}
1438
1439#############################################################################
1440
1225package CFClient::UI::VBox; 1441package CFClient::UI::VBox;
1226 1442
1227# TODO: wrap into common Box base class
1228
1229our @ISA = CFClient::UI::Container::; 1443our @ISA = CFClient::UI::Box::;
1230 1444
1231sub size_request { 1445sub new {
1232 my ($self) = @_; 1446 my $class = shift;
1233 1447
1234 my @alloc = map [$_->size_request], @{$self->{children}}; 1448 $class->SUPER::new (
1235 1449 vertical => 1,
1236 ( 1450 @_,
1237 (List::Util::max map $_->[0], @alloc),
1238 (List::Util::sum map $_->[1], @alloc),
1239 ) 1451 )
1240} 1452}
1241 1453
1242sub size_allocate {
1243 my ($self, $w, $h) = @_;
1244
1245 my $children = $self->{children};
1246
1247 my @h = map $_->{req_h}, @$children;
1248
1249 my $req_h = List::Util::sum @h;
1250
1251 if ($req_h > $h) {
1252 # ah well, not enough space
1253 $_ *= $h / $req_h for @h;
1254 } else {
1255 my $exp = List::Util::sum map $_->{expand}, @$children;
1256 $exp ||= 1;
1257
1258 for (0 .. $#$children) {
1259 my $child = $children->[$_];
1260
1261 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1262 }
1263 }
1264
1265 CFClient::UI::harmonize \@h;
1266
1267 my $y = 0;
1268 for (0 .. $#$children) {
1269 my $child = $children->[$_];
1270 my $h = $h[$_];
1271 $child->configure (0, $y, $w, $h);
1272
1273 $y += $h;
1274 }
1275
1276 1
1277}
1278
1279############################################################################# 1454#############################################################################
1280 1455
1281package CFClient::UI::Label; 1456package CFClient::UI::Label;
1282 1457
1283our @ISA = CFClient::UI::Base::; 1458our @ISA = CFClient::UI::DrawBG::;
1284 1459
1285use CFClient::OpenGL; 1460use CFClient::OpenGL;
1286 1461
1287sub new { 1462sub new {
1288 my ($class, %arg) = @_; 1463 my ($class, %arg) = @_;
1289 1464
1290 my $self = $class->SUPER::new ( 1465 my $self = $class->SUPER::new (
1291 fg => [1, 1, 1], 1466 fg => [1, 1, 1],
1467 #bg => none
1468 #active_bg => none
1292 #font => default_font 1469 #font => default_font
1470 #text => initial text
1471 #markup => initial narkup
1472 #max_w => maximum pixel width
1473 ellipsise => 3, # end
1474 layout => (new CFClient::Layout),
1293 fontsize => 1, 1475 fontsize => 1,
1294 text => "",
1295 align => -1, 1476 align => -1,
1296 valign => -1, 1477 valign => -1,
1297 padding => 2, 1478 padding_x => 2,
1298 layout => new CFClient::Layout, 1479 padding_y => 2,
1299 can_events => 0, 1480 can_events => 0,
1300 %arg 1481 %arg
1301 ); 1482 );
1302 1483
1303 if (exists $self->{template}) { 1484 if (exists $self->{template}) {
1304 my $layout = new CFClient::Layout; 1485 my $layout = new CFClient::Layout;
1305 $layout->set_text (delete $self->{template}); 1486 $layout->set_text (delete $self->{template});
1306 $self->{template} = $layout; 1487 $self->{template} = $layout;
1307 } 1488 }
1308 1489
1309 $self->set_text (delete $self->{text}) if exists $self->{text}; 1490 if (exists $self->{markup}) {
1310 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1491 $self->set_markup (delete $self->{markup});
1492 } else {
1493 $self->set_text (delete $self->{text});
1494 }
1311 1495
1312 $self 1496 $self
1313} 1497}
1314 1498
1315sub escape { 1499sub escape($) {
1316 local $_ = $_[1]; 1500 local $_ = $_[0];
1317 1501
1318 s/&/&amp;/g; 1502 s/&/&amp;/g;
1319 s/>/&gt;/g; 1503 s/>/&gt;/g;
1320 s/</&lt;/g; 1504 s/</&lt;/g;
1321 1505
1322 $_[1] 1506 $_
1323} 1507}
1324 1508
1325sub update { 1509sub update {
1326 my ($self) = @_; 1510 my ($self) = @_;
1327 1511
… …
1333 my ($self, $text) = @_; 1517 my ($self, $text) = @_;
1334 1518
1335 return if $self->{text} eq "T$text"; 1519 return if $self->{text} eq "T$text";
1336 $self->{text} = "T$text"; 1520 $self->{text} = "T$text";
1337 1521
1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1338 $self->{layout}->set_text ($text); 1523 $self->{layout}->set_text ($text);
1339 1524
1340 delete $self->{texture}; 1525 $self->realloc;
1341 $self->update; 1526 $self->update;
1342 $self->check_size;
1343} 1527}
1344 1528
1345sub set_markup { 1529sub set_markup {
1346 my ($self, $markup) = @_; 1530 my ($self, $markup) = @_;
1347 1531
1348 return if $self->{text} eq "M$markup"; 1532 return if $self->{text} eq "M$markup";
1349 $self->{text} = "M$markup"; 1533 $self->{text} = "M$markup";
1350 1534
1535 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1536
1537 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1351 $self->{layout}->set_markup ($markup); 1538 $self->{layout}->set_markup ($markup);
1352 1539
1353 delete $self->{texture}; 1540 $self->realloc;
1354 $self->update; 1541 $self->update;
1355 $self->check_size;
1356} 1542}
1357 1543
1358sub size_request { 1544sub size_request {
1359 my ($self) = @_; 1545 my ($self) = @_;
1360 1546
1361 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1547 $self->{layout}->set_font ($self->{font}) if $self->{font};
1362 $self->{layout}->set_width ($self->{max_w} || -1); 1548 $self->{layout}->set_width ($self->{max_w} || -1);
1549 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1363 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1364 1552
1365 my ($w, $h) = $self->{layout}->size; 1553 my ($w, $h) = $self->{layout}->size;
1366 1554
1367 if (exists $self->{template}) { 1555 if (exists $self->{template}) {
… …
1372 1560
1373 $w = List::Util::max $w, $w2; 1561 $w = List::Util::max $w, $w2;
1374 $h = List::Util::max $h, $h2; 1562 $h = List::Util::max $h, $h2;
1375 } 1563 }
1376 1564
1377 ( 1565 ($w, $h)
1378 $w + $self->{padding} * 2,
1379 $h + $self->{padding} * 2,
1380 )
1381} 1566}
1382 1567
1383sub size_allocate { 1568sub size_allocate {
1384 my ($self, $w, $h) = @_; 1569 my ($self, $w, $h) = @_;
1385 1570
1571 delete $self->{ox};
1572
1386 delete $self->{texture}; 1573 delete $self->{texture}
1574 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1387} 1575}
1388 1576
1389sub set_fontsize { 1577sub set_fontsize {
1390 my ($self, $fontsize) = @_; 1578 my ($self, $fontsize) = @_;
1391 1579
1392 $self->{fontsize} = $fontsize; 1580 $self->{fontsize} = $fontsize;
1393 delete $self->{texture}; 1581 delete $self->{texture};
1394 1582
1395 $self->update; 1583 $self->realloc;
1396 $self->check_size;
1397} 1584}
1398 1585
1399sub _draw { 1586sub _draw {
1400 my ($self) = @_; 1587 my ($self) = @_;
1401 1588
1589 $self->SUPER::_draw; # draw background, if applicable
1590
1402 my $tex = $self->{texture} ||= do { 1591 my $tex = $self->{texture} ||= do {
1592 $self->{layout}->set_foreground (@{$self->{fg}});
1403 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1593 $self->{layout}->set_font ($self->{font}) if $self->{font};
1404 $self->{layout}->set_width ($self->{w}); 1594 $self->{layout}->set_width ($self->{w});
1595 $self->{layout}->set_ellipsise ($self->{ellipsise});
1596 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1405 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1598
1406 new_from_layout CFClient::Texture $self->{layout} 1599 new_from_layout CFClient::Texture $self->{layout}
1407 }; 1600 };
1408 1601
1409 glEnable GL_BLEND; 1602 unless (exists $self->{ox}) {
1410 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1603 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1604 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1605 : ($self->{w} - $tex->{w}) * 0.5);
1606
1607 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1608 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1609 : ($self->{h} - $tex->{h}) * 0.5);
1610 };
1611
1411 glEnable GL_TEXTURE_2D; 1612 glEnable GL_TEXTURE_2D;
1412 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1413 1614
1615 if ($tex->{format} == GL_ALPHA) {
1414 glColor @{$self->{fg}}; 1616 glColor @{$self->{fg}};
1415
1416 $self->{ox} = int (
1417 $self->{align} < 0 ? $self->{padding}
1418 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1419 : ($self->{w} - $tex->{w}) * 0.5
1420 );
1421
1422 $self->{oy} = int (
1423 $self->{valign} < 0 ? $self->{padding}
1424 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1425 : ($self->{h} - $tex->{h}) * 0.5
1426 );
1427
1428 $tex->draw_quad ($self->{ox}, $self->{oy}); 1617 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1618 } else {
1619 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1620 }
1429 1621
1430 glDisable GL_TEXTURE_2D; 1622 glDisable GL_TEXTURE_2D;
1431 glDisable GL_BLEND;
1432} 1623}
1433 1624
1434############################################################################# 1625#############################################################################
1435 1626
1436package CFClient::UI::EntryBase; 1627package CFClient::UI::EntryBase;
… …
1449 active_fg => [0, 0, 0], 1640 active_fg => [0, 0, 0],
1450 can_hover => 1, 1641 can_hover => 1,
1451 can_focus => 1, 1642 can_focus => 1,
1452 valign => 0, 1643 valign => 0,
1453 can_events => 1, 1644 can_events => 1,
1645 #text => ...
1454 @_ 1646 @_
1455 ) 1647 )
1456} 1648}
1457 1649
1458sub _set_text { 1650sub _set_text {
… …
1468 $self->{text} = $text; 1660 $self->{text} = $text;
1469 1661
1470 $text =~ s/./*/g if $self->{hidden}; 1662 $text =~ s/./*/g if $self->{hidden};
1471 $self->{layout}->set_text ("$text "); 1663 $self->{layout}->set_text ("$text ");
1472 1664
1473 $self->emit (changed => $self->{text}); 1665 $self->_emit (changed => $self->{text});
1666}
1667
1668sub set_text {
1669 my ($self, $text) = @_;
1670
1671 $self->{cursor} = length $text;
1672 $self->_set_text ($text);
1673
1674 $self->realloc;
1474} 1675}
1475 1676
1476sub get_text { 1677sub get_text {
1477 $_[0]{text} 1678 $_[0]{text}
1478} 1679}
… …
1481 my ($self) = @_; 1682 my ($self) = @_;
1482 1683
1483 my ($w, $h) = $self->SUPER::size_request; 1684 my ($w, $h) = $self->SUPER::size_request;
1484 1685
1485 ($w + 1, $h) # add 1 for cursor 1686 ($w + 1, $h) # add 1 for cursor
1486}
1487
1488sub size_allocate {
1489 my ($self, $w, $h) = @_;
1490
1491 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1492}
1493
1494sub set_text {
1495 my ($self, $text) = @_;
1496
1497 $self->{cursor} = length $text;
1498 $self->_set_text ($text);
1499 $self->update;
1500} 1687}
1501 1688
1502sub key_down { 1689sub key_down {
1503 my ($self, $ev) = @_; 1690 my ($self, $ev) = @_;
1504 1691
… …
1506 my $sym = $ev->{sym}; 1693 my $sym = $ev->{sym};
1507 my $uni = $ev->{unicode}; 1694 my $uni = $ev->{unicode};
1508 1695
1509 my $text = $self->get_text; 1696 my $text = $self->get_text;
1510 1697
1511 if ($sym == 8) { 1698 if ($uni == 8) {
1512 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1699 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1513 } elsif ($sym == 127) { 1700 } elsif ($uni == 127) {
1514 substr $text, $self->{cursor}, 1, ""; 1701 substr $text, $self->{cursor}, 1, "";
1515 } elsif ($sym == CFClient::SDLK_LEFT) { 1702 } elsif ($sym == CFClient::SDLK_LEFT) {
1516 --$self->{cursor} if $self->{cursor}; 1703 --$self->{cursor} if $self->{cursor};
1517 } elsif ($sym == CFClient::SDLK_RIGHT) { 1704 } elsif ($sym == CFClient::SDLK_RIGHT) {
1518 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1705 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1519 } elsif ($sym == CFClient::SDLK_HOME) { 1706 } elsif ($sym == CFClient::SDLK_HOME) {
1520 $self->{cursor} = 0; 1707 $self->{cursor} = 0;
1521 } elsif ($sym == CFClient::SDLK_END) { 1708 } elsif ($sym == CFClient::SDLK_END) {
1522 $self->{cursor} = length $text; 1709 $self->{cursor} = length $text;
1523 } elsif ($sym == 27) { 1710 } elsif ($uni == 27) {
1524 $self->emit ('escape'); 1711 $self->_emit ('escape');
1525 } elsif ($uni) { 1712 } elsif ($uni) {
1526 substr $text, $self->{cursor}++, 0, chr $uni; 1713 substr $text, $self->{cursor}++, 0, chr $uni;
1527 } 1714 }
1528 1715
1529 $self->_set_text ($text); 1716 $self->_set_text ($text);
1530 $self->update; 1717
1718 $self->realloc;
1531} 1719}
1532 1720
1533sub focus_in { 1721sub focus_in {
1534 my ($self) = @_; 1722 my ($self) = @_;
1535 1723
… …
1615 if ($sym == 13) { 1803 if ($sym == 13) {
1616 unshift @{$self->{history}}, 1804 unshift @{$self->{history}},
1617 my $txt = $self->get_text; 1805 my $txt = $self->get_text;
1618 $self->{history_pointer} = -1; 1806 $self->{history_pointer} = -1;
1619 $self->{history_saveback} = ''; 1807 $self->{history_saveback} = '';
1620 $self->emit (activate => $txt); 1808 $self->_emit (activate => $txt);
1621 $self->update; 1809 $self->update;
1622 1810
1623 } elsif ($sym == CFClient::SDLK_UP) { 1811 } elsif ($sym == CFClient::SDLK_UP) {
1624 if ($self->{history_pointer} < 0) { 1812 if ($self->{history_pointer} < 0) {
1625 $self->{history_saveback} = $self->get_text; 1813 $self->{history_saveback} = $self->get_text;
… …
1662 1850
1663sub new { 1851sub new {
1664 my $class = shift; 1852 my $class = shift;
1665 1853
1666 $class->SUPER::new ( 1854 $class->SUPER::new (
1667 padding => 4, 1855 padding_x => 4,
1856 padding_y => 4,
1668 fg => [1, 1, 1], 1857 fg => [1, 1, 1],
1669 bg => [1, 1, 1, 0.2],
1670 active_fg => [0, 0, 1], 1858 active_fg => [0, 0, 1],
1671 can_hover => 1, 1859 can_hover => 1,
1672 align => 0, 1860 align => 0,
1673 valign => 0, 1861 valign => 0,
1674 can_events => 1, 1862 can_events => 1,
1675 @_ 1863 @_
1676 ) 1864 )
1677} 1865}
1678 1866
1867sub activate { }
1868
1679sub button_up { 1869sub button_up {
1680 my ($self, $ev, $x, $y) = @_; 1870 my ($self, $ev, $x, $y) = @_;
1681 1871
1872 $self->emit ("activate")
1682 if ($x >= 0 && $x < $self->{w} 1873 if $x >= 0 && $x < $self->{w}
1683 && $y >= 0 && $y < $self->{h}) { 1874 && $y >= 0 && $y < $self->{h};
1684 $self->emit ("activate");
1685 }
1686} 1875}
1687 1876
1688sub _draw { 1877sub _draw {
1689 my ($self) = @_; 1878 my ($self) = @_;
1690 1879
… …
1692 1881
1693 if ($GRAB == $self) { 1882 if ($GRAB == $self) {
1694 $self->{fg} = $self->{active_fg}; 1883 $self->{fg} = $self->{active_fg};
1695 } 1884 }
1696 1885
1697 glEnable GL_BLEND;
1698 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1699 glEnable GL_TEXTURE_2D; 1886 glEnable GL_TEXTURE_2D;
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 glColor 0, 0, 0, 1; 1888 glColor 0, 0, 0, 1;
1702 1889
1703 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1890 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1704 1891
1705 glDisable GL_TEXTURE_2D; 1892 glDisable GL_TEXTURE_2D;
1706 glDisable GL_BLEND;
1707 1893
1708 $self->SUPER::_draw; 1894 $self->SUPER::_draw;
1709} 1895}
1710 1896
1711############################################################################# 1897#############################################################################
… …
1722 1908
1723sub new { 1909sub new {
1724 my $class = shift; 1910 my $class = shift;
1725 1911
1726 $class->SUPER::new ( 1912 $class->SUPER::new (
1727 padding => 2, 1913 padding_x => 2,
1914 padding_y => 2,
1728 fg => [1, 1, 1], 1915 fg => [1, 1, 1],
1729 active_fg => [1, 1, 0], 1916 active_fg => [1, 1, 0],
1917 bg => [0, 0, 0, 0.2],
1918 active_bg => [1, 1, 1, 0.5],
1730 state => 0, 1919 state => 0,
1731 can_hover => 1, 1920 can_hover => 1,
1732 @_ 1921 @_
1733 ) 1922 )
1734} 1923}
1735 1924
1736sub size_request { 1925sub size_request {
1737 my ($self) = @_; 1926 my ($self) = @_;
1738 1927
1739 ($self->{padding} * 2 + 6) x 2 1928 (6) x 2
1740} 1929}
1741 1930
1742sub button_down { 1931sub button_down {
1743 my ($self, $ev, $x, $y) = @_; 1932 my ($self, $ev, $x, $y) = @_;
1744 1933
1745 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1746 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1747 $self->{state} = !$self->{state}; 1936 $self->{state} = !$self->{state};
1748 $self->emit (changed => $self->{state}); 1937 $self->_emit (changed => $self->{state});
1749 } 1938 }
1750} 1939}
1751 1940
1752sub _draw { 1941sub _draw {
1753 my ($self) = @_; 1942 my ($self) = @_;
1754 1943
1755 $self->SUPER::_draw; 1944 $self->SUPER::_draw;
1756 1945
1757 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1946 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1758 1947
1759 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1948 my ($w, $h) = @$self{qw(w h)};
1949
1950 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1760 1951
1761 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1952 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1762 1953
1763 glEnable GL_BLEND; 1954 my $tex = $self->{state} ? $tex[1] : $tex[0];
1955
1764 glEnable GL_TEXTURE_2D; 1956 glEnable GL_TEXTURE_2D;
1765 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1766
1767 my $tex = $self->{state} ? $tex[1] : $tex[0];
1768
1769 $tex->draw_quad (0, 0, $s, $s); 1957 $tex->draw_quad_alpha (0, 0, $s, $s);
1770
1771 glDisable GL_TEXTURE_2D; 1958 glDisable GL_TEXTURE_2D;
1772 glDisable GL_BLEND;
1773} 1959}
1774 1960
1775############################################################################# 1961#############################################################################
1776 1962
1777package CFClient::UI::Image; 1963package CFClient::UI::Image;
… …
1820 glTranslate 0, -$self->{w}, 0; 2006 glTranslate 0, -$self->{w}, 0;
1821 2007
1822 ($w, $h) = ($h, $w); 2008 ($w, $h) = ($h, $w);
1823 } 2009 }
1824 2010
1825 glEnable GL_BLEND;
1826 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1827 glEnable GL_TEXTURE_2D; 2011 glEnable GL_TEXTURE_2D;
1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829 2013
1830 $tex->draw_quad (0, 0, $w, $h); 2014 $tex->draw_quad_alpha (0, 0, $w, $h);
1831 2015
1832 glDisable GL_BLEND;
1833 glDisable GL_TEXTURE_2D; 2016 glDisable GL_TEXTURE_2D;
1834} 2017}
1835 2018
1836############################################################################# 2019#############################################################################
1837 2020
… …
2026 qw(s1_slider.png s1_slider_bg.png); 2209 qw(s1_slider.png s1_slider_bg.png);
2027 2210
2028sub new { 2211sub new {
2029 my $class = shift; 2212 my $class = shift;
2030 2213
2031 # range [value, low, high, page] 2214 # range [value, low, high, page, unit]
2032 2215
2033 # TODO: 0-width page 2216 # TODO: 0-width page
2034 # TODO: req_w/h are wrong with vertical 2217 # TODO: req_w/h are wrong with vertical
2035 # TODO: calculations are off 2218 # TODO: calculations are off
2036 my $self = $class->SUPER::new ( 2219 my $self = $class->SUPER::new (
2037 fg => [1, 1, 1], 2220 fg => [1, 1, 1],
2038 active_fg => [0, 0, 0], 2221 active_fg => [0, 0, 0],
2222 bg => [0, 0, 0, 0.2],
2223 active_bg => [1, 1, 1, 0.5],
2039 range => [0, 0, 100, 10], 2224 range => [0, 0, 100, 10, 0],
2040 req_w => $::WIDTH / 80, 2225 min_w => $::WIDTH / 80,
2041 req_h => $::WIDTH / 80, 2226 min_h => $::WIDTH / 80,
2042 vertical => 0, 2227 vertical => 0,
2043 can_hover => 1, 2228 can_hover => 1,
2044 inner_pad => 5, 2229 inner_pad => 0.02,
2045 @_ 2230 @_
2046 ); 2231 );
2047 2232
2233 $self->set_value ($self->{range}[0]);
2234 $self->update;
2235
2048 $self 2236 $self
2049} 2237}
2050 2238
2239sub changed { }
2240
2241sub set_range {
2242 my ($self, $range) = @_;
2243
2244 ($range, $self->{range}) = ($self->{range}, $range);
2245
2246 $self->update
2247 if "@$range" ne "@{$self->{range}}";
2248}
2249
2250sub set_value {
2251 my ($self, $value) = @_;
2252
2253 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2254
2255 $hi = $lo + 1 if $hi <= $lo;
2256
2257 $page = $hi - $lo if $page > $hi - $lo;
2258
2259 $value = $lo if $value < $lo;
2260 $value = $hi - $page if $value > $hi - $page;
2261
2262 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2263 if $unit;
2264
2265 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2266
2267 if ($value != $old_value) {
2268 $self->_emit (changed => $value);
2269 $self->update;
2270 }
2271}
2272
2051sub size_request { 2273sub size_request {
2052 my ($self) = @_; 2274 my ($self) = @_;
2053 2275
2054 my $w = $self->{req_w}; 2276 ($self->{req_w}, $self->{req_h})
2055 my $h = $self->{req_h};
2056
2057 $self->{vertical} ? ($h, $w) : ($w, $h)
2058} 2277}
2059 2278
2060sub button_down { 2279sub button_down {
2061 my ($self, $ev, $x, $y) = @_; 2280 my ($self, $ev, $x, $y) = @_;
2062 2281
2063 $self->SUPER::button_down ($ev, $x, $y); 2282 $self->SUPER::button_down ($ev, $x, $y);
2283
2284 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285
2064 $self->mouse_motion ($ev, $x, $y); 2286 $self->mouse_motion ($ev, $x, $y);
2065} 2287}
2066 2288
2067sub mouse_motion { 2289sub mouse_motion {
2068 my ($self, $ev, $x, $y) = @_; 2290 my ($self, $ev, $x, $y) = @_;
2069 2291
2070 if ($GRAB == $self) { 2292 if ($GRAB == $self) {
2293 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2294
2295 my (undef, $lo, $hi, $page) = @{$self->{range}};
2296
2297 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298
2299 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2300 }
2301}
2302
2303sub update {
2304 my ($self) = @_;
2305
2306 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2307 $self->set_value ($self->{range}[0]);
2308
2071 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2309 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100;
2072 2311
2073 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2312 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2074 2313
2075 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2314 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2076 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2315 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2077 2316
2078 $x -= $inner_pad_px; # substract the padding 2317 $value = ($value - $lo) / $range;
2079 $x = $x * ($hi - $lo) / $inner_w + $lo; 2318 $value = $value * $self->{scale} + $self->{offset};
2080 $x = $lo if $x < $lo;
2081 $x = $hi - $page if $x > $hi - $page;
2082 $self->{range}[0] = $x;
2083 2319
2084 $self->emit (changed => $x); 2320 $self->{knob_x} = $value - $knob_w * 0.5;
2085 $self->update; 2321 $self->{knob_w} = $knob_w;
2086 } 2322 });
2087}
2088 2323
2089# the inner_* stuff is for generating a padding for the slider handle, 2324 $self->SUPER::update;
2090# so that the handle doesn't leave the texture. This calculation isn't 100%
2091# correct propably, but it does the job for now
2092sub _calc_inner_pad_px {
2093 my ($self, $w) = @_;
2094 ($w / 100) * $self->{inner_pad} # % to pixels
2095} 2325}
2096 2326
2097sub _draw { 2327sub _draw {
2098 my ($self) = @_; 2328 my ($self) = @_;
2099 2329
2100 $self->SUPER::_draw (); 2330 $self->SUPER::_draw ();
2101 2331
2102 my ($w, $h) = @$self{qw(w h)}; 2332 glScale $self->{w}, $self->{h};
2103 2333
2104 if ($self->{vertical}) { 2334 if ($self->{vertical}) {
2105 # draw a vertical slider like a rotated horizontal slider 2335 # draw a vertical slider like a rotated horizontal slider
2106 2336
2337 glTranslate 1, 0, 0;
2107 glRotate 90, 0, 0, 1; 2338 glRotate 90, 0, 0, 1;
2108 glTranslate 0, -$self->{w}, 0;
2109
2110 ($w, $h) = ($h, $w);
2111 } 2339 }
2112 2340
2113 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2341 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2114 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2342 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2115 2343
2116 my ($value, $lo, $hi, $page) = @{$self->{range}};
2117
2118 $hi = $value + 1 if $lo == $hi;
2119
2120 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2121 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2122
2123 $page = int $page * $inner_w / ($hi - $lo);
2124 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2125
2126 $w -= $page;
2127 $page &= ~1;
2128 glTranslate $page * 0.5, 0, 0;
2129 $page ||= 2;
2130
2131 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2132 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2133
2134 glEnable GL_BLEND;
2135 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2136 glEnable GL_TEXTURE_2D; 2344 glEnable GL_TEXTURE_2D;
2137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2345 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2138 2346
2139 # draw background 2347 # draw background
2140 $tex[1]->draw_quad (0, 0, $w, $h); 2348 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2141 2349
2142 # draw handle 2350 # draw handle
2143 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2351 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2144 2352
2145 glDisable GL_BLEND;
2146 glDisable GL_TEXTURE_2D; 2353 glDisable GL_TEXTURE_2D;
2147} 2354}
2355
2356#############################################################################
2357
2358package CFClient::UI::ValSlider;
2359
2360our @ISA = CFClient::UI::HBox::;
2361
2362sub new {
2363 my ($class, %arg) = @_;
2364
2365 my $range = delete $arg{range};
2366
2367 my $self = $class->SUPER::new (
2368 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2369 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2370 to_value => sub { shift },
2371 from_value => sub { shift },
2372 %arg,
2373 );
2374
2375 $self->{slider}->connect (changed => sub {
2376 my ($self, $value) = @_;
2377 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2378 $self->{parent}->emit (changed => $value);
2379 });
2380
2381# $self->{entry}->connect (changed => sub {
2382# my ($self, $value) = @_;
2383# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2384# $self->{parent}->emit (changed => $value);
2385# });
2386
2387 $self->add ($self->{slider}, $self->{entry});
2388
2389 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2390
2391 $self
2392}
2393
2394sub set_range { shift->{slider}->set_range (@_) }
2395sub set_value { shift->{slider}->set_value (@_) }
2148 2396
2149############################################################################# 2397#############################################################################
2150 2398
2151package CFClient::UI::TextView; 2399package CFClient::UI::TextView;
2152 2400
… …
2161 fontsize => 1, 2409 fontsize => 1,
2162 can_events => 0, 2410 can_events => 0,
2163 #font => default_font 2411 #font => default_font
2164 @_, 2412 @_,
2165 2413
2166 layout => (new CFClient::Layout), 2414 layout => (new CFClient::Layout 1),
2167 par => [], 2415 par => [],
2168 height => 0, 2416 height => 0,
2169 children => [ 2417 children => [
2170 (new CFClient::UI::Empty expand => 1), 2418 (new CFClient::UI::Empty expand => 1),
2171 (new CFClient::UI::Slider vertical => 1), 2419 (new CFClient::UI::Slider vertical => 1),
… …
2182 2430
2183 $self->{fontsize} = $fontsize; 2431 $self->{fontsize} = $fontsize;
2184 $self->reflow; 2432 $self->reflow;
2185} 2433}
2186 2434
2187sub text_height {
2188 my ($self, $text) = @_;
2189
2190 my $layout = $self->{layout};
2191
2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2193 $layout->set_width ($self->{children}[0]{w});
2194 $layout->set_text ($text);
2195
2196 ($layout->size)[1]
2197}
2198
2199sub reflow {
2200 my ($self) = @_;
2201
2202 $self->{need_reflow}++;
2203 $self->update;
2204}
2205
2206sub size_allocate { 2435sub size_allocate {
2207 my ($self, $w, $h) = @_; 2436 my ($self, $w, $h) = @_;
2208 2437
2209 $self->SUPER::size_allocate ($w, $h); 2438 $self->SUPER::size_allocate ($w, $h);
2210 2439
… …
2213 $self->{layout}->set_width ($self->{children}[0]{w}); 2442 $self->{layout}->set_width ($self->{children}[0]{w});
2214 2443
2215 $self->reflow; 2444 $self->reflow;
2216} 2445}
2217 2446
2447sub text_size {
2448 my ($self, $text, $indent) = @_;
2449
2450 my $layout = $self->{layout};
2451
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453 $layout->set_width ($self->{children}[0]{w} - $indent);
2454 $layout->set_markup ($text);
2455
2456 $layout->size
2457}
2458
2459sub reflow {
2460 my ($self) = @_;
2461
2462 $self->{need_reflow}++;
2463 $self->update;
2464}
2465
2466sub set_offset {
2467 my ($self, $offset) = @_;
2468
2469 # todo: base offset on lines or so, not on pixels
2470 $self->{children}[1]->set_value ($offset);
2471}
2472
2473sub clear {
2474 my ($self) = @_;
2475
2476 $self->{par} = [];
2477 $self->{height} = 0;
2478 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2479}
2480
2218sub add_paragraph { 2481sub add_paragraph {
2219 my ($self, $color, $text) = @_; 2482 my ($self, $color, $text, $indent) = @_;
2220 2483
2221 #TODO: intelligently "reformat" paragraph 2484 for my $line (split /\n/, $text) {
2222 2485 my ($w, $h) = $self->text_size ($line);
2223 my $height = $self->text_height ($text);
2224
2225 $self->{height} += $height; 2486 $self->{height} += $h;
2487 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2488 }
2226 2489
2227 push @{$self->{par}}, [$height, $color, $text];
2228
2229 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2490 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2230 $self->{children}[1]->update;
2231} 2491}
2232 2492
2233sub update { 2493sub update {
2234 my ($self) = @_; 2494 my ($self) = @_;
2235 2495
… …
2237 2497
2238 return unless $self->{h} > 0; 2498 return unless $self->{h} > 0;
2239 2499
2240 delete $self->{texture}; 2500 delete $self->{texture};
2241 2501
2242 $ROOT->on_refresh ($self, sub { 2502 $ROOT->on_post_alloc ($self, sub {
2503 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504
2243 if (delete $self->{need_reflow}) { 2505 if (delete $self->{need_reflow}) {
2244 my $height = 0; 2506 my $height = 0;
2245 2507
2246 $height += $_->[0] = $self->text_height ($_->[2]) 2508 my $layout = $self->{layout};
2509
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511
2247 for @{$self->{par}}; 2512 for (@{$self->{par}}) {
2513 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2514 $layout->set_width ($W - $_->[3]);
2515 $layout->set_markup ($_->[4]);
2516 my ($w, $h) = $layout->size;
2517 $_->[0] = $w + $_->[3];
2518 $_->[1] = $h;
2519 }
2520
2521 $height += $_->[1];
2522 }
2248 2523
2249 $self->{height} = $height; 2524 $self->{height} = $height;
2250 2525
2251 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2526 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2252 2527
2253 delete $self->{texture}; 2528 delete $self->{texture};
2254 } 2529 }
2255 2530
2256 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2531 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2257 glClearColor 0, 0, 0, 0; 2532 glClearColor 0.5, 0.5, 0.5, 0;
2258 glClear GL_COLOR_BUFFER_BIT; 2533 glClear GL_COLOR_BUFFER_BIT;
2259 2534
2535 my $top = int $self->{children}[1]{range}[0];
2536
2537 my $y0 = $top;
2538 my $y1 = $top + $H;
2539
2540 my $y = 0;
2541
2542 my $layout = $self->{layout};
2543
2544 $layout->set_font ($self->{font}) if $self->{font};
2545
2260 glEnable GL_BLEND; 2546 glEnable GL_BLEND;
2547 #TODO# not correct in windows where rgba is forced off
2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2548 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2262 glEnable GL_TEXTURE_2D;
2263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2264
2265 my $top = int $self->{children}[1]{range}[0];
2266
2267 my $y0 = $top;
2268 my $y1 = $top + $self->{h};
2269
2270 my $y = 0;
2271
2272 my $layout = $self->{layout};
2273
2274 $layout->set_font ($self->{font}) if $self->{font};
2275 2549
2276 for my $par (@{$self->{par}}) { 2550 for my $par (@{$self->{par}}) {
2277 my $h = $par->[0]; 2551 my $h = $par->[1];
2278 2552
2279 if ($y0 < $y + $h && $y < $y1) { 2553 if ($y0 < $y + $h && $y < $y1) {
2554 $layout->set_foreground (@{ $par->[2] });
2555 $layout->set_width ($W - $par->[3]);
2280 $layout->set_text ($par->[2]); 2556 $layout->set_markup ($par->[4]);
2281 2557
2282 glColor @{ $par->[1] }; 2558 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2283 my ($W, $H) = $layout->size; 2559
2284 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2560 glRasterPos $par->[3], $y - $y0;
2561 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2285 } 2562 }
2286 2563
2287 $y += $h; 2564 $y += $h;
2288 } 2565 }
2289 2566
2290 glDisable GL_TEXTURE_2D;
2291 glDisable GL_BLEND; 2567 glDisable GL_BLEND;
2292 }; 2568 };
2293 }); 2569 });
2294} 2570}
2295 2571
2296sub _draw { 2572sub _draw {
2297 my ($self) = @_; 2573 my ($self) = @_;
2298 2574
2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2301 glEnable GL_TEXTURE_2D; 2575 glEnable GL_TEXTURE_2D;
2302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2576 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303 glColor 1, 1, 1, 1; 2577 glColor 1, 1, 1, 1;
2304 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2578 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2305 glDisable GL_TEXTURE_2D; 2579 glDisable GL_TEXTURE_2D;
2306 glDisable GL_BLEND;
2307 2580
2308 $self->{children}[1]->draw; 2581 $self->{children}[1]->draw;
2309 2582
2310} 2583}
2311 2584
… …
2359 2632
2360sub new { 2633sub new {
2361 my $class = shift; 2634 my $class = shift;
2362 2635
2363 my $self = $class->SUPER::new ( 2636 my $self = $class->SUPER::new (
2364 state => 0, 2637 state => 0,
2365 connect_activate => \&toggle_flopper, 2638 on_activate => \&toggle_flopper,
2366 @_ 2639 @_
2367 ); 2640 );
2368 2641
2369 if ($self->{state}) {
2370 $self->{state} = 0;
2371 $self->toggle_flopper;
2372 }
2373
2374 $self 2642 $self
2375} 2643}
2376 2644
2377sub toggle_flopper { 2645sub toggle_flopper {
2378 my ($self) = @_; 2646 my ($self) = @_;
2379 2647
2380 # TODO: use animation 2648 $self->{other}->toggle_visibility;
2381 if ($self->{state} = !$self->{state}) {
2382 $CFClient::UI::ROOT->add ($self->{other});
2383 $self->{other}->move ($self->coord2global (0, $self->{h}));
2384 $self->emit ("open");
2385 } else {
2386 $CFClient::UI::ROOT->remove ($self->{other});
2387 $self->emit ("close");
2388 }
2389
2390 $self->emit (changed => $self->{state});
2391} 2649}
2392 2650
2393############################################################################# 2651#############################################################################
2394 2652
2395package CFClient::UI::Tooltip; 2653package CFClient::UI::Tooltip;
… …
2405 @_, 2663 @_,
2406 can_events => 0, 2664 can_events => 0,
2407 ) 2665 )
2408} 2666}
2409 2667
2410sub set_markup { 2668sub set_tooltip_from {
2411 my ($self, $text) = @_; 2669 my ($self, $widget) = @_;
2412 2670
2413 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2671 my $tooltip = $widget->{tooltip};
2414 $self->{label}->set_markup ($text); 2672
2415 $self->add ($self->{label}); 2673 if ($ENV{CFPLUS_DEBUG} & 2) {
2674 $tooltip .= "\n\n" . (ref $widget) . "\n"
2675 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676 . "req $widget->{req_w} $widget->{req_h}\n"
2677 . "visible $widget->{visible}";
2678 }
2679
2680 $self->add (new CFClient::UI::Label
2681 markup => $tooltip,
2682 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2683 fontsize => 0.8,
2684 fg => [0, 0, 0, 1],
2685 ellipsise => 0,
2686 font => ($widget->{tooltip_font} || $::FONT_PROP),
2687 );
2416} 2688}
2417 2689
2418sub size_request { 2690sub size_request {
2419 my ($self) = @_; 2691 my ($self) = @_;
2420
2421 $self->child->set_max_size ($::WIDTH * 0.3);
2422 2692
2423 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2693 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2424 2694
2425 ($w + 4, $h + 4) 2695 ($w + 4, $h + 4)
2426} 2696}
… …
2429 my ($self, $w, $h) = @_; 2699 my ($self, $w, $h) = @_;
2430 2700
2431 $self->SUPER::size_allocate ($w - 4, $h - 4); 2701 $self->SUPER::size_allocate ($w - 4, $h - 4);
2432} 2702}
2433 2703
2704sub visibility_change {
2705 my ($self, $visible) = @_;
2706
2707 return unless $visible;
2708
2709 $self->{root}->on_post_alloc ("move_$self" => sub {
2710 my $widget = $self->{owner}
2711 or return;
2712
2713 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714
2715 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716 if $x + $self->{w} > $::WIDTH;
2717
2718 $self->move_abs ($x, $y);
2719 });
2720}
2721
2434sub _draw { 2722sub _draw {
2435 my ($self) = @_; 2723 my ($self) = @_;
2436 2724
2437 glPushMatrix;
2438 glTranslate 0.375, 0.375; 2725 glTranslate 0.375, 0.375;
2439 2726
2440 my ($w, $h) = @$self{qw(w h)}; 2727 my ($w, $h) = @$self{qw(w h)};
2441 2728
2442 glColor 1, 0.8, 0.4; 2729 glColor 1, 0.8, 0.4;
… …
2453 glVertex 0 , $h; 2740 glVertex 0 , $h;
2454 glVertex $w, $h; 2741 glVertex $w, $h;
2455 glVertex $w, 0; 2742 glVertex $w, 0;
2456 glEnd; 2743 glEnd;
2457 2744
2458 glPopMatrix; 2745 glTranslate 2 - 0.375, 2 - 0.375;
2459 2746
2460 glTranslate 2, 2;
2461 $self->SUPER::_draw; 2747 $self->SUPER::_draw;
2462} 2748}
2463 2749
2464############################################################################# 2750#############################################################################
2465 2751
… …
2470use CFClient::OpenGL; 2756use CFClient::OpenGL;
2471 2757
2472sub new { 2758sub new {
2473 my $class = shift; 2759 my $class = shift;
2474 2760
2475 $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2476 aspect => 1, 2762 aspect => 1,
2763 can_events => 0,
2477 @_, 2764 @_,
2478 ) 2765 );
2766
2767 if ($self->{anim} && $self->{animspeed}) {
2768 Scalar::Util::weaken (my $widget = $self);
2769
2770 $self->{timer} = Event->timer (
2771 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2772 hard => 1,
2773 interval => $self->{animspeed},
2774 cb => sub {
2775 ++$widget->{frame};
2776 $widget->update;
2777 },
2778 );
2779 }
2780
2781 $self
2479} 2782}
2480 2783
2481sub size_request { 2784sub size_request {
2482 (32, 8) 2785 (32, 8)
2483} 2786}
2484 2787
2788sub update {
2789 my ($self) = @_;
2790
2791 return unless $self->{visible};
2792
2793 $self->SUPER::update;
2794}
2795
2485sub _draw { 2796sub _draw {
2486 my ($self) = @_; 2797 my ($self) = @_;
2487 2798
2488 return unless $::CONN;#d# manage and cache textures differently 2799 return unless $::CONN;
2800
2801 my $face;
2802
2803 if ($self->{frame}) {
2804 my $anim = $::CONN->{anim}[$self->{anim}];
2805
2806 $face = $anim->[ $self->{frame} % @$anim ]
2807 if $anim && @$anim;
2808 }
2809
2489 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2810 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2490 2811
2491 # TODO animation
2492 if ($tex) { 2812 if ($tex) {
2493 glEnable GL_BLEND;
2494 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2495 glEnable GL_TEXTURE_2D; 2813 glEnable GL_TEXTURE_2D;
2496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2497 glColor 1, 1, 1, 1; 2815 glColor 1, 1, 1, 1;
2498 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2816 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2499 glDisable GL_TEXTURE_2D; 2817 glDisable GL_TEXTURE_2D;
2500 glDisable GL_BLEND;
2501 } 2818 }
2502} 2819}
2503 2820
2504############################################################################# 2821sub DESTROY {
2505
2506package CFClient::UI::InventoryItem;
2507
2508our @ISA = CFClient::UI::HBox::;
2509
2510sub new {
2511 my $class = shift;
2512
2513 my %args = @_;
2514
2515 my $item = $args{item};
2516
2517 my $desc = $item->{nrof} < 2
2518 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}";
2520
2521
2522 my $self = $class->SUPER::new (
2523 can_hover => 1,
2524 can_events => 1,
2525 tooltip => (CFClient::UI::Label->escape ($desc)
2526 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2527 connect_button_down => sub {
2528 my ($self, $ev, $x, $y) = @_;
2529
2530 # todo: maybe put examine on 1? but should just be a tooltip :(
2531 if ($ev->{button} == 1) {
2532 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2533 } elsif ($ev->{button} == 2) {
2534 $::CONN->send ("apply $item->{tag}");
2535 } elsif ($ev->{button} == 3) {
2536 CFClient::UI::Menu->new (
2537 items => [
2538 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2539 [
2540 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2541 sub { $::CONN->send ("lock $item->{tag}") },
2542 ],
2543 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2544 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2545 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2546 ],
2547 )->popup ($ev);
2548 }
2549
2550 1
2551 },
2552 %args
2553 );
2554 $self->add(new CFClient::UI::Face
2555 can_events => 0,
2556 face => $item->{face},
2557 anim => $item->{anim},
2558 animspeed => $item->{animspeed});
2559 $self->add(new CFClient::UI::Label
2560 can_events => 0,
2561 text => $desc);
2562
2563 $self
2564}
2565
2566#############################################################################
2567
2568package CFClient::UI::Inventory;
2569
2570our @ISA = CFClient::UI::ScrolledWindow::;
2571
2572sub new {
2573 my $class = shift;
2574
2575 my $self = $class->SUPER::new (
2576 scrolled => (new CFClient::UI::VBox),
2577 @_,
2578 );
2579
2580 $self
2581}
2582
2583sub set_items {
2584 my ($self, $items) = @_; 2822 my ($self) = @_;
2585 2823
2586 $self->{scrolled}->clear; 2824 $self->{timer}->cancel
2587 return unless $items; 2825 if $self->{timer};
2588 2826
2589 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2827 $self->SUPER::DESTROY;
2590
2591 $self->{real_items} = \@items;
2592
2593 for my $item (@items) {
2594 my $desc = $item->{nrof} < 2
2595 ? $item->{name}
2596 : "$item->{nrof} $item->{name_pl}";
2597
2598 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2599 }
2600
2601# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2602}
2603
2604sub size_request {
2605 my ($self) = @_;
2606 ($self->{req_w}, $self->{req_h});
2607} 2828}
2608 2829
2609############################################################################# 2830#############################################################################
2610 2831
2611package CFClient::UI::Menu; 2832package CFClient::UI::Menu;
… …
2646 2867
2647# popup given the event (must be a mouse button down event currently) 2868# popup given the event (must be a mouse button down event currently)
2648sub popup { 2869sub popup {
2649 my ($self, $ev) = @_; 2870 my ($self, $ev) = @_;
2650 2871
2651 $self->emit ("popdown"); 2872 $self->_emit ("popdown");
2652 2873
2653 # maybe save $GRAB? must be careful about events... 2874 # maybe save $GRAB? must be careful about events...
2654 $GRAB = $self; 2875 $GRAB = $self;
2655 $self->{button} = $ev->{button}; 2876 $self->{button} = $ev->{button};
2656 2877
2657 $self->show; 2878 $self->show;
2658 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2879 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2659} 2880}
2660 2881
2661sub mouse_motion { 2882sub mouse_motion {
2662 my ($self, $ev, $x, $y) = @_; 2883 my ($self, $ev, $x, $y) = @_;
2663 2884
… …
2671 2892
2672 if ($ev->{button} == $self->{button}) { 2893 if ($ev->{button} == $self->{button}) {
2673 undef $GRAB; 2894 undef $GRAB;
2674 $self->hide; 2895 $self->hide;
2675 2896
2676 $self->emit ("popdown"); 2897 $self->_emit ("popdown");
2677 $self->{hover}[1]->() if $self->{hover}; 2898 $self->{hover}[1]->() if $self->{hover};
2678 } 2899 }
2679} 2900}
2680 2901
2681############################################################################# 2902#############################################################################
2682 2903
2904package CFClient::UI::Statusbox;
2905
2906our @ISA = CFClient::UI::VBox::;
2907
2908sub new {
2909 my $class = shift;
2910
2911 $class->SUPER::new (
2912 fontsize => 0.8,
2913 @_,
2914 )
2915}
2916
2917sub reorder {
2918 my ($self) = @_;
2919 my $NOW = time;
2920
2921 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 }
2924
2925 my @widgets;
2926
2927 my @items = sort {
2928 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} };
2931
2932 my $count = 10 + 1;
2933 for my $item (@items) {
2934 last unless --$count;
2935
2936 push @widgets, $item->{label} ||= do {
2937 # TODO: doesn't handle markup well (read as: at all)
2938 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text};
2941
2942 for ($short) {
2943 s/^\s+//;
2944 s/\s+/ /g;
2945 }
2946
2947 new CFClient::UI::Label
2948 markup => $short,
2949 tooltip => $item->{tooltip},
2950 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg},
2955 can_events => 1,
2956 can_hover => 1
2957 };
2958 }
2959
2960 $self->clear;
2961 $self->SUPER::add (reverse @widgets);
2962}
2963
2964sub add {
2965 my ($self, $text, %arg) = @_;
2966
2967 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//;
2969
2970 return unless $text;
2971
2972 my $timeout = time + ((delete $arg{timeout}) || 60);
2973
2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2975
2976 if (my $item = $self->{item}{$group}) {
2977 if ($item->{text} eq $text) {
2978 $item->{count}++;
2979 } else {
2980 $item->{count} = 1;
2981 $item->{text} = $item->{tooltip} = $text;
2982 }
2983 $item->{id} = ++$self->{id};
2984 $item->{timeout} = $timeout;
2985 delete $item->{label};
2986 } else {
2987 $self->{item}{$group} = {
2988 id => ++$self->{id},
2989 text => $text,
2990 timeout => $timeout,
2991 tooltip => $text,
2992 fg => [0.8, 0.8, 0.8, 0.8],
2993 pri => 0,
2994 count => 1,
2995 %arg,
2996 };
2997 }
2998
2999 $self->reorder;
3000}
3001
3002sub reconfigure {
3003 my ($self) = @_;
3004
3005 delete $_->{label}
3006 for values %{ $self->{item} || {} };
3007
3008 $self->reorder;
3009 $self->SUPER::reconfigure;
3010}
3011
3012#############################################################################
3013
3014package CFClient::UI::Inventory;
3015
3016our @ISA = CFClient::UI::ScrolledWindow::;
3017
3018sub new {
3019 my $class = shift;
3020
3021 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3023 @_,
3024 );
3025
3026 $self
3027}
3028
3029sub set_items {
3030 my ($self, $items) = @_;
3031
3032 $self->{scrolled}->clear;
3033 return unless $items;
3034
3035 my @items = sort {
3036 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name})
3038 } @$items;
3039
3040 $self->{real_items} = \@items;
3041
3042 my $row = 0;
3043 for my $item (@items) {
3044 CFClient::Item::update_widgets $item;
3045
3046 $self->{scrolled}->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3049
3050 $row++;
3051 }
3052}
3053
3054#############################################################################
3055
3056package CFClient::UI::BindEditor;
3057
3058our @ISA = CFClient::UI::FancyFrame::;
3059
3060sub new {
3061 my $class = shift;
3062
3063 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3064
3065 $self->add (my $vb = new CFClient::UI::VBox);
3066
3067
3068 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3069 text => "start recording",
3070 tooltip => "Start/Stops recording of actions."
3071 ."All subsequent actions after the recording started will be captured."
3072 ."The actions are displayed after the record was stopped."
3073 ."To bind the action you have to click on the 'Bind' button",
3074 on_activate => sub {
3075 unless ($self->{recording}) {
3076 $self->start;
3077 } else {
3078 $self->stop;
3079 }
3080 });
3081
3082 $vb->add (new CFClient::UI::Label text => "Actions:");
3083 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3084
3085 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3086 $vb->add (my $hb = new CFClient::UI::HBox);
3087 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3088 $hb->add (new CFClient::UI::Button
3089 text => "bind",
3090 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3091 on_activate => sub {
3092 $self->ask_for_bind;
3093 });
3094
3095 $vb->add (my $hb = new CFClient::UI::HBox);
3096 $hb->add (new CFClient::UI::Button
3097 text => "ok",
3098 expand => 1,
3099 tooltip => "This closes the binding editor and saves the binding",
3100 on_activate => sub {
3101 $self->hide;
3102 $self->commit;
3103 });
3104
3105 $hb->add (new CFClient::UI::Button
3106 text => "cancel",
3107 expand => 1,
3108 tooltip => "This closes the binding editor without saving",
3109 on_activate => sub {
3110 $self->hide;
3111 $self->{binding_cancel}->()
3112 if $self->{binding_cancel};
3113 });
3114
3115 $self->update_binding_widgets;
3116
3117 $self
3118}
3119
3120sub commit {
3121 my ($self) = @_;
3122 my ($mod, $sym, $cmds) = $self->get_binding;
3123 if ($sym != 0 && @$cmds > 0) {
3124 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3125 ."'. Don't forget 'Save Config'!");
3126 $self->{binding_change}->($mod, $sym, $cmds)
3127 if $self->{binding_change};
3128 } else {
3129 $::STATUSBOX->add ("No action bound, no key or action specified!");
3130 $self->{binding_cancel}->()
3131 if $self->{binding_cancel};
3132 }
3133}
3134
3135sub start {
3136 my ($self) = @_;
3137
3138 $self->{rec_btn}->set_text ("stop recording");
3139 $self->{recording} = 1;
3140 $self->clear_command_list;
3141 $::CONN->start_record if $::CONN;
3142}
3143
3144sub stop {
3145 my ($self) = @_;
3146
3147 $self->{rec_btn}->set_text ("start recording");
3148 $self->{recording} = 0;
3149
3150 my $rec;
3151 $rec = $::CONN->stop_record if $::CONN;
3152 return unless ref $rec eq 'ARRAY';
3153 $self->set_command_list ($rec);
3154}
3155
3156# if $commit is true, the binding will be set after the user entered a key combo
3157sub ask_for_bind {
3158 my ($self, $commit) = @_;
3159
3160 CFClient::Binder::open_binding_dialog (sub {
3161 my ($mod, $sym) = @_;
3162 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3163 $self->update_binding_widgets;
3164 $self->commit if $commit;
3165 });
3166}
3167
3168# $mod and $sym are the modifiers and key symbol
3169# $cmds is a array ref of strings (the commands)
3170# $cb is the callback that is executed on OK
3171# $ccb is the callback that is executed on CANCEL and
3172# when the binding was unsuccessful on OK
3173sub set_binding {
3174 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3175
3176 $self->clear_command_list;
3177 $self->{recording} = 0;
3178 $self->{rec_btn}->set_text ("start recording");
3179
3180 $self->{binding} = [$mod, $sym];
3181 $self->{commands} = $cmds;
3182
3183 $self->{binding_change} = $cb;
3184 $self->{binding_cancel} = $ccb;
3185
3186 $self->update_binding_widgets;
3187}
3188
3189# this is a shortcut method that asks for a binding
3190# and then just binds it.
3191sub do_quick_binding {
3192 my ($self, $cmds) = @_;
3193 $self->set_binding (undef, undef, $cmds, sub {
3194 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3195 });
3196 $self->ask_for_bind (1);
3197}
3198
3199sub update_binding_widgets {
3200 my ($self) = @_;
3201 my ($mod, $sym, $cmds) = $self->get_binding;
3202 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3203 $self->set_command_list ($cmds);
3204}
3205
3206sub get_binding {
3207 my ($self) = @_;
3208 return (
3209 $self->{binding}->[0],
3210 $self->{binding}->[1],
3211 [ grep { defined $_ } @{$self->{commands}} ]
3212 );
3213}
3214
3215sub clear_command_list {
3216 my ($self) = @_;
3217 $self->{cmdbox}->clear ();
3218}
3219
3220sub set_command_list {
3221 my ($self, $cmds) = @_;
3222
3223 $self->{cmdbox}->clear ();
3224 $self->{commands} = $cmds;
3225
3226 my $idx = 0;
3227
3228 for (@$cmds) {
3229 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3230
3231 my $i = $idx;
3232 $hb->add (new CFClient::UI::Label text => $_);
3233 $hb->add (new CFClient::UI::Button
3234 text => "delete",
3235 tooltip => "Deletes the action from the record",
3236 on_activate => sub {
3237 $self->{cmdbox}->remove ($hb);
3238 $cmds->[$i] = undef;
3239 });
3240
3241
3242 $idx++
3243 }
3244}
3245
3246#############################################################################
3247
3248package CFClient::UI::SpellList;
3249
3250our @ISA = CFClient::UI::FancyFrame::;
3251
3252sub new {
3253 my $class = shift;
3254
3255 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3256
3257 $self->add (new CFClient::UI::ScrolledWindow
3258 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3259
3260 $self;
3261}
3262
3263# XXX: Do sorting? Argl...
3264sub add_spell {
3265 my ($self, $spell) = @_;
3266 $self->{spells}->{$spell->{name}} = $spell;
3267
3268 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3269 face => $spell->{face},
3270 can_hover => 1,
3271 can_events => 1,
3272 tooltip => $spell->{message});
3273
3274 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3275 text => $spell->{name},
3276 can_hover => 1,
3277 can_events => 1,
3278 tooltip => $spell->{message},
3279 expand => 1);
3280
3281 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3282 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3283 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3284 expand => 1);
3285
3286 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3287 text => "bind to key",
3288 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3289}
3290
3291sub rebuild_spell_list {
3292 my ($self) = @_;
3293 $self->{tbl_idx} = 0;
3294 $self->add_spell ($_) for values %{$self->{spells}};
3295}
3296
3297sub remove_spell {
3298 my ($self, $spell) = @_;
3299 delete $self->{spells}->{$spell->{name}};
3300 $self->rebuild_spell_list;
3301}
3302
3303#############################################################################
3304
2683package CFClient::UI::Root; 3305package CFClient::UI::Root;
2684 3306
2685our @ISA = CFClient::UI::Container::; 3307our @ISA = CFClient::UI::Container::;
2686 3308
2687use CFClient::OpenGL; 3309use CFClient::OpenGL;
2688 3310
2689sub check_size { 3311sub new {
2690 my ($self) = @_; 3312 my $class = shift;
2691 3313
2692 $self->configure (0, 0, $self->{w}, $self->{h}); 3314 my $self = $class->SUPER::new (
3315 visible => 1,
3316 @_,
3317 );
3318
3319 Scalar::Util::weaken ($self->{root} = $self);
3320
3321 $self
2693} 3322}
2694 3323
2695sub size_request { 3324sub size_request {
2696 my ($self) = @_; 3325 my ($self) = @_;
2697 3326
2698 ($self->{w}, $self->{h}) 3327 ($self->{w}, $self->{h})
3328}
3329
3330sub _to_pixel {
3331 my ($coord, $size, $max) = @_;
3332
3333 $coord =
3334 $coord eq "center" ? ($max - $size) * 0.5
3335 : $coord eq "max" ? $max
3336 : $coord;
3337
3338 $coord = 0 if $coord < 0;
3339 $coord = $max - $size if $coord > $max - $size;
3340
3341 int $coord + 0.5
2699} 3342}
2700 3343
2701sub size_allocate { 3344sub size_allocate {
2702 my ($self, $w, $h) = @_; 3345 my ($self, $w, $h) = @_;
2703 3346
2704 my $old_w = $self->{old_w};
2705 my $old_h = $self->{old_h};
2706
2707 if ($old_w && $old_h) {
2708 for my $child ($self->children) {
2709 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2710 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2711 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2712 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2713 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2714 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2715 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2716 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2717 }
2718 }
2719
2720 $self->{old_w} = $w;
2721 $self->{old_h} = $h;
2722}
2723
2724sub configure {
2725 my ($self, $x, $y, $w, $h) = @_;
2726
2727 $self->SUPER::configure ($x, $y, $w, $h);
2728
2729 for my $child ($self->children) { 3347 for my $child ($self->children) {
2730 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3348 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2731 3349
2732 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3350 $X = $child->{force_x} if exists $child->{force_x};
2733 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3351 $Y = $child->{force_y} if exists $child->{force_y};
3352
3353 $X = _to_pixel $X, $W, $self->{w};
3354 $Y = _to_pixel $Y, $H, $self->{h};
3355
2734 $child->configure ($X, $Y, $W, $H); 3356 $child->configure ($X, $Y, $W, $H);
2735 } 3357 }
2736} 3358}
2737 3359
2738sub _topleft { 3360sub coord2local {
2739 my ($self, $x, $y) = @_; 3361 my ($self, $x, $y) = @_;
2740 3362
2741 ($x, $y) 3363 ($x, $y)
2742} 3364}
2743 3365
3366sub coord2global {
3367 my ($self, $x, $y) = @_;
3368
3369 ($x, $y)
3370}
3371
2744sub update { 3372sub update {
2745 my ($self) = @_; 3373 my ($self) = @_;
2746 3374
2747 $self->check_size; 3375 $::WANT_REFRESH++;
2748 ::refresh ();
2749} 3376}
2750 3377
2751sub add { 3378sub add {
2752 my ($self, $child) = @_; 3379 my ($self, @children) = @_;
2753 3380
2754 # integerize window positions 3381 $_->{is_toplevel} = 1
2755 $child->{x} = int $child->{x}; 3382 for @children;
2756 $child->{y} = int $child->{y};
2757 3383
2758 $self->SUPER::add ($child); 3384 $self->SUPER::add (@children);
3385}
3386
3387sub remove {
3388 my ($self, @children) = @_;
3389
3390 $self->SUPER::remove (@children);
3391
3392 delete $self->{is_toplevel}
3393 for @children;
3394
3395 while (@children) {
3396 my $w = pop @children;
3397 push @children, $w->children;
3398 $w->set_invisible;
3399 }
2759} 3400}
2760 3401
2761sub on_refresh { 3402sub on_refresh {
2762 my ($self, $id, $cb) = @_; 3403 my ($self, $id, $cb) = @_;
2763 3404
2764 $self->{refresh_hook}{$id} = $cb; 3405 $self->{refresh_hook}{$id} = $cb;
2765} 3406}
2766 3407
3408sub on_post_alloc {
3409 my ($self, $id, $cb) = @_;
3410
3411 $self->{post_alloc_hook}{$id} = $cb;
3412}
3413
2767sub draw { 3414sub draw {
2768 my ($self) = @_; 3415 my ($self) = @_;
2769 3416
2770 while (my $rcb = delete $self->{refresh_hook}) { 3417 while ($self->{refresh_hook}) {
2771 $_->() for values %$rcb; 3418 $_->()
3419 for values %{delete $self->{refresh_hook}};
2772 } 3420 }
3421
3422 if ($self->{realloc}) {
3423 my %queue;
3424 my @queue;
3425 my $widget;
3426
3427 outer:
3428 while () {
3429 if (my $realloc = delete $self->{realloc}) {
3430 for $widget (values %$realloc) {
3431 $widget->{visible} or next; # do not resize invisible widgets
3432
3433 $queue{$widget+0}++ and next; # duplicates are common
3434
3435 push @{ $queue[$widget->{visible}] }, $widget;
3436 }
3437 }
3438
3439 while () {
3440 @queue or last outer;
3441
3442 $widget = pop @{ $queue[-1] || [] }
3443 and last;
3444
3445 pop @queue;
3446 }
3447
3448 delete $queue{$widget+0};
3449
3450 my ($w, $h) = $widget->size_request;
3451
3452 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3453 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3454
3455 $w = $widget->{force_w} if exists $widget->{force_w};
3456 $h = $widget->{force_h} if exists $widget->{force_h};
3457
3458 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3459 || delete $widget->{force_realloc}) {
3460 $widget->{req_w} = $w;
3461 $widget->{req_h} = $h;
3462
3463 $self->{size_alloc}{$widget+0} = $widget;
3464
3465 if (my $parent = $widget->{parent}) {
3466 $self->{realloc}{$parent+0} = $parent
3467 unless $queue{$parent+0};
3468
3469 $parent->{force_size_alloc} = 1;
3470 $self->{size_alloc}{$parent+0} = $parent;
3471 }
3472 }
3473
3474 delete $self->{realloc}{$widget+0};
3475 }
3476 }
3477
3478 while (my $size_alloc = delete $self->{size_alloc}) {
3479 my @queue = sort { $b->{visible} <=> $a->{visible} }
3480 values %$size_alloc;
3481
3482 while () {
3483 my $widget = pop @queue || last;
3484
3485 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3486
3487 $w = 0 if $w < 0;
3488 $h = 0 if $h < 0;
3489
3490 $w = int $w + 0.5;
3491 $h = int $h + 0.5;
3492
3493 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3494 $widget->{old_w} = $widget->{w};
3495 $widget->{old_h} = $widget->{h};
3496
3497 $widget->{w} = $w;
3498 $widget->{h} = $h;
3499
3500 $widget->emit (size_allocate => $w, $h);
3501 }
3502 }
3503 }
3504
3505 while ($self->{post_alloc_hook}) {
3506 $_->()
3507 for values %{delete $self->{post_alloc_hook}};
3508 }
3509
2773 3510
2774 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3511 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2775 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3512 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2776 glClear GL_COLOR_BUFFER_BIT; 3513 glClear GL_COLOR_BUFFER_BIT;
2777 3514
2778 glMatrixMode GL_PROJECTION; 3515 glMatrixMode GL_PROJECTION;
2779 glLoadIdentity; 3516 glLoadIdentity;
2780 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3517 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2781 glMatrixMode GL_MODELVIEW; 3518 glMatrixMode GL_MODELVIEW;
2782 glLoadIdentity; 3519 glLoadIdentity;
2783 3520
3521 {
3522 package CFClient::UI::Base;
3523
3524 ($draw_x, $draw_y, $draw_w, $draw_h) =
3525 (0, 0, $self->{w}, $self->{h});
3526 }
3527
2784 $self->_draw; 3528 $self->_draw;
2785} 3529}
2786 3530
2787############################################################################# 3531#############################################################################
2788 3532
2789package CFClient::UI; 3533package CFClient::UI;
2790 3534
2791$ROOT = new CFClient::UI::Root; 3535$ROOT = new CFClient::UI::Root;
2792$TOOLTIP = new CFClient::UI::Tooltip; 3536$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2793 3537
27941 35381
2795 3539

Diff Legend

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