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.179 by elmex, Fri Apr 28 05:17:21 2006 UTC vs.
Revision 1.277 by root, Sun Jun 4 00:21:52 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 } 368 }
243} 369}
244 370
245sub size_allocate { 371sub size_allocate {
246 # nothing to be done 372 # nothing to be done
247} 373}
248 374
249sub children { 375sub children {
376 # nop
250} 377}
251 378
252# call when resoltuion changes etc. 379sub visible_children {
253sub reconfigure { 380 $_[0]->children
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260} 381}
261 382
262sub set_max_size { 383sub set_max_size {
263 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
264 385
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
267} 388}
268 389
269# return top left coordinates 390sub set_tooltip {
270sub _topleft {
271 my ($self, $x, $y) = @_; 391 my ($self, $tooltip) = @_;
272 392
273 $self->{parent} 393 $tooltip =~ s/^\s+//;
274 or Carp::confess "no parent widget in _topleft\n";#d# 394 $tooltip =~ s/\s+$//;
275 395
276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 396 return if $self->{tooltip} eq $tooltip;
397
398 $self->{tooltip} = $tooltip;
399
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip;
403 }
277} 404}
278 405
279# translate global coordinates to local coordinate system 406# translate global coordinates to local coordinate system
280sub coord2local { 407sub coord2local {
281 my ($self, $x, $y) = @_; 408 my ($self, $x, $y) = @_;
282 409
283 my ($X, $Y) = $self->_topleft; 410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 411}
286 412
287# translate local coordinates to global coordinate system 413# translate local coordinates to global coordinate system
288sub coord2global { 414sub coord2global {
289 my ($self, $x, $y) = @_; 415 my ($self, $x, $y) = @_;
290 416
291 my ($X, $Y) = $self->_topleft; 417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 418}
294 419
295sub focus_in { 420sub focus_in {
296 my ($self) = @_; 421 my ($self) = @_;
297 422
298 return if $FOCUS == $self; 423 return if $FOCUS == $self;
299 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
300 425
301 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
302 427
303 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
304 429
305 $focus->update if $focus; 430 $focus->update if $focus;
306 $FOCUS->update; 431 $FOCUS->update;
307} 432}
308 433
… …
311 436
312 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
313 438
314 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
315 440
316 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
317 442
318 $focus->update if $focus; #? 443 $focus->update if $focus; #?
319}
320 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
321sub mouse_motion { } 449sub mouse_motion { 0 }
322sub button_up { } 450sub button_up { 0 }
323sub key_down { } 451sub key_down { 0 }
324sub key_up { } 452sub key_up { 0 }
325 453
326sub button_down { 454sub button_down {
327 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
328 456
329 $self->focus_in; 457 $self->focus_in;
330}
331 458
332sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
333sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
334sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
335sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
336sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
337 535
338sub draw { 536sub draw {
339 my ($self) = @_; 537 my ($self) = @_;
340 538
341 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
342 550
343 glPushMatrix; 551 glPushMatrix;
344 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
345 $self->_draw; 553 $self->_draw;
346 glPopMatrix; 554 glPopMatrix;
… …
358 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
359 glEnd; 567 glEnd;
360 glDisable GL_BLEND; 568 glDisable GL_BLEND;
361 } 569 }
362 570
363 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
364 glPushMatrix; 572 glPushMatrix;
365 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
366 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
367 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
368 glVertex 0 , 0; 576 glVertex 0 , 0;
369 glVertex $self->{w}, 0; 577 glVertex $self->{w} - 1, 0;
370 glVertex $self->{w}, $self->{h}; 578 glVertex $self->{w} - 1, $self->{h} - 1;
371 glVertex 0 , $self->{h}; 579 glVertex 0 , $self->{h} - 1;
372 glEnd; 580 glEnd;
373 glPopMatrix; 581 glPopMatrix;
374 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
375 } 583 }
376} 584}
377 585
378sub _draw { 586sub _draw {
379 my ($self) = @_; 587 my ($self) = @_;
380 588
381 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
382} 590}
383 591
384sub find_widget {
385 my ($self, $x, $y) = @_;
386
387 return () unless $self->{can_events};
388
389 return $self
390 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
391 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
392
393 ()
394}
395
396sub set_parent {
397 my ($self, $parent) = @_;
398
399 Scalar::Util::weaken ($self->{parent} = $parent);
400}
401
402sub check_size {
403 my ($self) = @_;
404
405 $self->{parent}
406 or return 1;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
426}
427
428sub update {
429 my ($self) = @_;
430
431 $self->{parent}->update
432 if $self->{parent};
433}
434
435sub connect {
436 my ($self, $signal, $cb) = @_;
437
438 push @{ $self->{signal_cb}{$signal} }, $cb;
439}
440
441sub emit {
442 my ($self, $signal, @args) = @_;
443
444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
445}
446
447sub DESTROY { 592sub DESTROY {
448 my ($self) = @_; 593 my ($self) = @_;
449 594
595 delete $WIDGET{$self+0};
450 #$self->deactivate; 596 #$self->deactivate;
451} 597}
452 598
453############################################################################# 599#############################################################################
454 600
… …
463 my $class = shift; 609 my $class = shift;
464 610
465 # range [value, low, high, page] 611 # range [value, low, high, page]
466 612
467 $class->SUPER::new ( 613 $class->SUPER::new (
468 bg => [0, 0, 0, 0.2], 614 #bg => [0, 0, 0, 0.2],
469 active_bg => [1, 1, 1, 0.5], 615 #active_bg => [1, 1, 1, 0.5],
470 @_ 616 @_
471 ) 617 )
472} 618}
473 619
474sub _draw { 620sub _draw {
475 my ($self) = @_; 621 my ($self) = @_;
476 622
623 my $color = $FOCUS == $self && $self->{active_bg}
624 ? $self->{active_bg}
625 : $self->{bg};
626
627 if ($color && (@$color < 4 || $color->[3])) {
477 my ($w, $h) = @$self{qw(w h)}; 628 my ($w, $h) = @$self{qw(w h)};
478 629
479 glEnable GL_BLEND; 630 glEnable GL_BLEND;
480 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
481 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 632 glColor @$color;
482 633
483 glBegin GL_QUADS; 634 glBegin GL_QUADS;
484 glVertex 0 , 0; 635 glVertex 0 , 0;
485 glVertex 0 , $h; 636 glVertex 0 , $h;
486 glVertex $w, $h; 637 glVertex $w, $h;
487 glVertex $w, 0; 638 glVertex $w, 0;
488 glEnd; 639 glEnd;
489 640
490 glDisable GL_BLEND; 641 glDisable GL_BLEND;
642 }
491} 643}
492 644
493############################################################################# 645#############################################################################
494 646
495package CFClient::UI::Empty; 647package CFClient::UI::Empty;
… …
500 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
501 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
502} 654}
503 655
504sub size_request { 656sub size_request {
505 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
506} 660}
507 661
508sub draw { } 662sub draw { }
509 663
510############################################################################# 664#############################################################################
… …
514our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
515 669
516sub new { 670sub new {
517 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
518 672
519 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
520 674
521 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
522 children => [], 676 children => [],
523 can_events => 0, 677 can_events => 0,
524 %arg, 678 %arg,
525 ); 679 );
680
526 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
527 683
528 $self 684 $self
529} 685}
530 686
531sub add { 687sub add {
532 my ($self, $child) = @_; 688 my ($self, @widgets) = @_;
533 689
534 $child->set_parent ($self); 690 $_->set_parent ($self)
691 for @widgets;
535 692
536 use sort 'stable'; 693 use sort 'stable';
537 694
538 $self->{children} = [ 695 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 697 @{$self->{children}}, @widgets
541 ]; 698 ];
542 699
543 $child->check_size; 700 $self->realloc;
544} 701}
545 702
546sub children { 703sub children {
547 @{ $_[0]{children} } 704 @{ $_[0]{children} }
548} 705}
… …
553 delete $child->{parent}; 710 delete $child->{parent};
554 $child->hide; 711 $child->hide;
555 712
556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
557 714
558 $self->check_size; 715 $self->realloc;
559 $self->update;
560} 716}
561 717
562sub clear { 718sub clear {
563 my ($self) = @_; 719 my ($self) = @_;
564 720
… …
567 723
568 for (@$children) { 724 for (@$children) {
569 delete $_->{parent}; 725 delete $_->{parent};
570 $_->hide; 726 $_->hide;
571 } 727 }
728
729 $self->realloc;
572} 730}
573 731
574sub find_widget { 732sub find_widget {
575 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
576 734
577 $x -= $self->{x}; 735 $x -= $self->{x};
578 $y -= $self->{y}; 736 $y -= $self->{y};
579 737
580 my $res; 738 my $res;
581 739
582 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
583 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
584 and return $res; 742 and return $res;
585 } 743 }
586 744
587 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
636 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
637} 795}
638 796
639############################################################################# 797#############################################################################
640 798
799# back-buffered drawing area
800
641package CFClient::UI::Window; 801package CFClient::UI::Window;
642 802
643our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
644 804
645use CFClient::OpenGL; 805use CFClient::OpenGL;
… …
651} 811}
652 812
653sub update { 813sub update {
654 my ($self) = @_; 814 my ($self) = @_;
655 815
656 $ROOT->on_refresh ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
657 $self->SUPER::update; 817 $self->SUPER::update;
658} 818}
659 819
660sub size_allocate { 820sub size_allocate {
661 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
662 822
663 $self->SUPER::size_allocate ($w, $h); 823 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 824 $self->update;
825}
826
827sub _render {
828 my ($self) = @_;
829
830 $self->{children}[0]->draw;
665} 831}
666 832
667sub render_child { 833sub render_child {
668 my ($self) = @_; 834 my ($self) = @_;
669 835
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 836 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 837 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 838 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 839
674# glColorMask 1, 1, 1, 0; 840 {
675# glEnable GL_BLEND; 841 package CFClient::UI::Base;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO; 842
677# glRasterPos 0, 0; 843 ($draw_x, $draw_y, $draw_w, $draw_h) =
678# glCopyPixels 0, 0, $self->{w}, $self->{h}; 844 (0, 0, $self->{w}, $self->{h});
679# glDisable GL_BLEND; 845 }
680# glColorMask 1, 1, 1, 1; 846
847 $self->_render;
681 }; 848 };
682} 849}
683 850
684sub _draw { 851sub _draw {
685 my ($self) = @_; 852 my ($self) = @_;
686 853
687 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
688 855
689 my $tex = $self->{texture} 856 my $tex = $self->{texture}
690 or return; 857 or return;
691 858
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 861 glColor 1, 1, 1, 1;
697 862
698 $tex->draw_quad (0, 0, $w, $h); 863 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 864
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D; 865 glDisable GL_TEXTURE_2D;
702} 866}
703 867
704############################################################################# 868#############################################################################
705 869
706package CFClient::UI::ViewPort; 870package CFClient::UI::ViewPort;
707 871
708our @ISA = CFClient::UI::Window::; 872our @ISA = CFClient::UI::Window::;
709
710sub new { die }
711
712sub size_request {
713 my ($self) = @_;
714
715 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
717
718 @$self{qw(child_w child_h)}
719}
720
721sub _draw {
722 my ($self) = @_;
723
724 $self->{children}[1]->draw;
725}
726
727
728#############################################################################
729
730package CFClient::UI::Frame;
731
732our @ISA = CFClient::UI::Bin::;
733
734use CFClient::OpenGL;
735 873
736sub new { 874sub new {
737 my $class = shift; 875 my $class = shift;
738 876
877 $class->SUPER::new (
878 scroll_x => 0,
879 scroll_y => 1,
880 @_,
881 )
882}
883
884sub size_request {
885 my ($self) = @_;
886
887 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
888
889 $w = 10 if $self->{scroll_x};
890 $h = 10 if $self->{scroll_y};
891
892 ($w, $h)
893}
894
895sub size_allocate {
896 my ($self, $w, $h) = @_;
897
898 my $child = $self->child;
899
900 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
901 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
902
903 $self->child->configure (0, 0, $w, $h);
904 $self->update;
905}
906
907sub set_offset {
908 my ($self, $x, $y) = @_;
909
910 $self->{view_x} = int $x;
911 $self->{view_y} = int $y;
912
913 $self->update;
914}
915
916# hmm, this does not work for topleft of $self... but we should not ask for that
917sub coord2local {
918 my ($self, $x, $y) = @_;
919
920 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
921}
922
923sub coord2global {
924 my ($self, $x, $y) = @_;
925
926 $x = List::Util::min $self->{w}, $x - $self->{view_x};
927 $y = List::Util::min $self->{h}, $y - $self->{view_y};
928
929 $self->SUPER::coord2global ($x, $y)
930}
931
932sub find_widget {
933 my ($self, $x, $y) = @_;
934
935 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
936 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
937 ) {
938 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
939 } else {
940 $self->CFClient::UI::Base::find_widget ($x, $y)
941 }
942}
943
944sub _render {
945 my ($self) = @_;
946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
951
952 $self->SUPER::_render;
953}
954
955#############################################################################
956
957package CFClient::UI::ScrolledWindow;
958
959our @ISA = CFClient::UI::HBox::;
960
961sub new {
962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
965
966 my $self;
967
968 my $slider = new CFClient::UI::Slider
969 vertical => 1,
970 range => [0, 0, 1, 0.01], # HACK fix
971 on_changed => sub {
972 $self->{vp}->set_offset (0, $_[1]);
973 },
974 ;
975
739 my $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
740 bg => [1, 1, 1, 1], 977 vp => (new CFClient::UI::ViewPort expand => 1),
741 border_bg => [1, 1, 1, 1], 978 slider => $slider,
742 border => 0.8, 979 %arg,
743 @_
744 ); 980 );
745 981
982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
984
746 $self 985 $self
747} 986}
748 987
749sub _draw { 988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
992}
993
994sub update {
995 my ($self) = @_;
996
997 $self->SUPER::update;
998
999 # todo: overwrite size_allocate of child
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002}
1003
1004sub size_allocate {
750 my ($self) = @_; 1005 my ($self, $w, $h) = @_;
751 1006
752 my ($w, $h) = ($self->{w}, $self->{h}); 1007 $self->SUPER::size_allocate ($w, $h);
753 1008
754 glEnable GL_BLEND; 1009 my $child = $self->{vp}->child;
755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1010 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
756 glEnable GL_TEXTURE_2D;
757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758
759# glBegin GL_QUADS;
760# glColor 0, 0, 0, 0;
761# glVertex 0 , 0;
762# glVertex 0 , $h;
763# glVertex $w, $h;
764# glVertex $w, 0;
765# glEnd;
766
767
768 $self->child->draw;
769 glDisable GL_BLEND;
770 glDisable GL_TEXTURE_2D;
771} 1011}
1012
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
772 1015
773############################################################################# 1016#############################################################################
774 1017
775package CFClient::UI::FancyFrame; 1018package CFClient::UI::Frame;
776 1019
777our @ISA = CFClient::UI::Bin::; 1020our @ISA = CFClient::UI::Bin::;
778 1021
779use CFClient::OpenGL; 1022use CFClient::OpenGL;
780
781my @tex =
782 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
783 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
784 1023
785sub new { 1024sub new {
786 my $class = shift; 1025 my $class = shift;
787 1026
788 # TODO: user_x, user_y, overwrite moveto? 1027 $class->SUPER::new (
1028 bg => undef,
1029 @_,
1030 )
1031}
1032
1033sub _draw {
1034 my ($self) = @_;
1035
1036 if ($self->{bg}) {
1037 my ($w, $h) = @$self{qw(w h)};
1038
1039 glEnable GL_BLEND;
1040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1041 glColor @{ $self->{bg} };
1042
1043 glBegin GL_QUADS;
1044 glVertex 0 , 0;
1045 glVertex 0 , $h;
1046 glVertex $w, $h;
1047 glVertex $w, 0;
1048 glEnd;
1049
1050 glDisable GL_BLEND;
1051 }
1052
1053 $self->SUPER::_draw;
1054}
1055
1056#############################################################################
1057
1058package CFClient::UI::FancyFrame;
1059
1060our @ISA = CFClient::UI::Bin::;
1061
1062use CFClient::OpenGL;
1063
1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1071
1072sub new {
1073 my ($class, %arg) = @_;
1074
1075 my $title = delete $arg{title};
789 1076
790 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
793 border => 0.6, 1080 border => 0.6,
794 can_events => 1, 1081 can_events => 1,
795 @_ 1082 min_w => 16,
1083 min_h => 16,
1084 %arg,
796 ); 1085 );
797 1086
798 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
799 align => 0, 1088 align => 0,
800 valign => 1, 1089 valign => 1,
801 text => $self->{title}, 1090 text => $title,
802 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
803 1093
804 $self 1094 $self
1095}
1096
1097sub add {
1098 my ($self, @widgets) = @_;
1099
1100 $self->SUPER::add (@widgets);
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
805} 1102}
806 1103
807sub border { 1104sub border {
808 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
809} 1106}
810 1107
811sub size_request { 1108sub size_request {
812 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
813 1113
814 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
815 1115
816 ( 1116 (
817 $w + $self->border * 2, 1117 $w + $self->border * 2,
… …
820} 1120}
821 1121
822sub size_allocate { 1122sub size_allocate {
823 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
824 1124
1125 if ($self->{title}) {
1126 $self->{title}{w} = $w;
1127 $self->{title}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h);
1129 }
1130
1131 my $border = $self->border;
1132
825 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
826 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
827 1135
828 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
829 if $self->{title};
830
831 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
832} 1137}
833 1138
834sub button_down { 1139sub button_down {
835 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
836 1141
… …
852 my ($ev, $x, $y) = @_; 1157 my ($ev, $x, $y) = @_;
853 1158
854 my $dx = $ev->{x} - $ox; 1159 my $dx = $ev->{x} - $ox;
855 my $dy = $ev->{y} - $oy; 1160 my $dy = $ev->{y} - $oy;
856 1161
857 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
858 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164
859 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1165 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
860 $self->check_size; 1166 $self->realloc;
861 }; 1167 };
862 1168
863 } elsif ($lr ^ $td) { 1169 } elsif ($lr ^ $td) {
864 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
865 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
… …
867 $self->{motion} = sub { 1173 $self->{motion} = sub {
868 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
869 1175
870 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
871 1177
872 $self->move ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
873 $self->update; 1179 # HACK: the next line is required to enforce placement
1180 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
874 }; 1181 };
1182 } else {
1183 return 0;
1184 }
1185
875 } 1186 1
876} 1187}
877 1188
878sub button_up { 1189sub button_up {
879 my ($self, $ev, $x, $y) = @_; 1190 my ($self, $ev, $x, $y) = @_;
880 1191
881 delete $self->{motion}; 1192 !!delete $self->{motion}
882} 1193}
883 1194
884sub mouse_motion { 1195sub mouse_motion {
885 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
886 1197
887 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1198 $self->{motion}->($ev, $x, $y) if $self->{motion};
1199
1200 !!$self->{motion}
888} 1201}
889 1202
890sub _draw { 1203sub _draw {
891 my ($self) = @_; 1204 my ($self) = @_;
892 1205
1206 my $child = $self->{children}[0];
1207
893 my ($w, $h ) = ($self->{w}, $self->{h}); 1208 my ($w, $h ) = ($self->{w}, $self->{h});
894 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1209 my ($cw, $ch) = ($child->{w}, $child->{h});
895 1210
896 glEnable GL_BLEND;
897 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
898 glEnable GL_TEXTURE_2D; 1211 glEnable GL_TEXTURE_2D;
899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
900 1213
901 my $border = $self->border; 1214 my $border = $self->border;
902 1215
903 glColor @{ $self->{border_bg} }; 1216 glColor @{ $self->{border_bg} };
904 $tex[1]->draw_quad (0, 0, $w, $border); 1217 $border[0]->draw_quad_alpha (0, 0, $w, $border);
905 $tex[3]->draw_quad (0, $border, $border, $ch); 1218 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1219 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
907 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1220 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
908 1221
909 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1222 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
910 my $bg = $tex[0]; 1223 glColor @{ $self->{bg} };
911 1224
912 # TODO: repeat texture not scale 1225 # TODO: repeat texture not scale
1226 # solve this better(?)
913 my $rep_x = $cw / $bg->{w}; 1227 $bg->{s} = $cw / $bg->{w};
914 my $rep_y = $ch / $bg->{h}; 1228 $bg->{t} = $ch / $bg->{h};
915
916 glColor @{ $self->{bg} };
917
918 $bg->{s} = $rep_x;
919 $bg->{t} = $rep_y;
920 $bg->{wrap_mode} = 1;
921 $bg->draw_quad ($border, $border, $cw, $ch); 1229 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1230 }
922 1231
923 glDisable GL_TEXTURE_2D; 1232 glDisable GL_TEXTURE_2D;
924 glDisable GL_BLEND;
925 }
926 1233
927 $self->{title}->draw if $self->{title};
928
929 $self->child->draw; 1234 $child->draw;
1235
1236 if ($self->{title}) {
1237 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw;
1239 }
930} 1240}
931 1241
932############################################################################# 1242#############################################################################
933 1243
934package CFClient::UI::Table; 1244package CFClient::UI::Table;
… …
942sub new { 1252sub new {
943 my $class = shift; 1253 my $class = shift;
944 1254
945 $class->SUPER::new ( 1255 $class->SUPER::new (
946 col_expand => [], 1256 col_expand => [],
947 @_ 1257 @_,
948 ) 1258 )
1259}
1260
1261sub children {
1262 grep $_, map @$_, grep $_, @{ $_[0]{children} }
949} 1263}
950 1264
951sub add { 1265sub add {
952 my ($self, $x, $y, $child) = @_; 1266 my ($self, $x, $y, $child) = @_;
953 1267
954 $child->set_parent ($self); 1268 $child->set_parent ($self);
955 $self->{children}[$y][$x] = $child; 1269 $self->{children}[$y][$x] = $child;
956 1270
957 $child->check_size; 1271 $self->realloc;
958} 1272}
959 1273
960sub children {
961 grep $_, map @$_, grep $_, @{ $_[0]{children} }
962}
963
964# TODO: move to container class maybe? send childs a signal on removal? 1274# TODO: move to container class maybe? send children a signal on removal?
965sub clear { 1275sub clear {
966 my ($self) = @_; 1276 my ($self) = @_;
967 1277
968 my @children = $self->children; 1278 my @children = $self->children;
969 delete $self->{children}; 1279 delete $self->{children};
… …
971 for (@children) { 1281 for (@children) {
972 delete $_->{parent}; 1282 delete $_->{parent};
973 $_->hide; 1283 $_->hide;
974 } 1284 }
975 1285
976 $self->update; 1286 $self->realloc;
977} 1287}
978 1288
979sub get_wh { 1289sub get_wh {
980 my ($self) = @_; 1290 my ($self) = @_;
981 1291
… …
1012sub size_allocate { 1322sub size_allocate {
1013 my ($self, $w, $h) = @_; 1323 my ($self, $w, $h) = @_;
1014 1324
1015 my ($ws, $hs) = $self->get_wh; 1325 my ($ws, $hs) = $self->get_wh;
1016 1326
1017 my $req_w = sum @$ws; 1327 my $req_w = (sum @$ws) || 1;
1018 my $req_h = sum @$hs; 1328 my $req_h = (sum @$hs) || 1;
1019 1329
1020 # TODO: nicer code && do row_expand 1330 # TODO: nicer code && do row_expand
1021 my @col_expand = @{$self->{col_expand}}; 1331 my @col_expand = @{$self->{col_expand}};
1022 @col_expand = (1) x @$ws unless @col_expand; 1332 @col_expand = (1) x @$ws unless @col_expand;
1023 my $col_expand = (sum @col_expand) || 1; 1333 my $col_expand = (sum @col_expand) || 1;
… …
1077 } 1387 }
1078} 1388}
1079 1389
1080############################################################################# 1390#############################################################################
1081 1391
1082package CFClient::UI::HBox; 1392package CFClient::UI::Box;
1083
1084# TODO: wrap into common Box base class
1085 1393
1086our @ISA = CFClient::UI::Container::; 1394our @ISA = CFClient::UI::Container::;
1087 1395
1088sub size_request { 1396sub size_request {
1089 my ($self) = @_; 1397 my ($self) = @_;
1090 1398
1091 my @alloc = map [$_->size_request], @{$self->{children}}; 1399 $self->{vertical}
1092 1400 ? (
1093 ( 1401 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1094 (List::Util::sum map $_->[0], @alloc), 1402 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1095 (List::Util::max map $_->[1], @alloc), 1403 )
1096 ) 1404 : (
1405 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1406 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1407 )
1097} 1408}
1098 1409
1099sub size_allocate { 1410sub size_allocate {
1100 my ($self, $w, $h) = @_; 1411 my ($self, $w, $h) = @_;
1101 1412
1102 ($h, $w) = ($w, $h); 1413 my $space = $self->{vertical} ? $h : $w;
1103
1104 my $children = $self->{children}; 1414 my $children = $self->{children};
1105 1415
1106 my @h = map $_->{req_w}, @$children; 1416 my @req;
1107 1417
1108 my $req_h = List::Util::sum @h; 1418 if ($self->{homogeneous}) {
1109 1419 @req = ($space / (@$children || 1)) x @$children;
1110 if ($req_h > $h) {
1111 # ah well, not enough space
1112 $_ *= $h / $req_h for @h;
1113 } else { 1420 } else {
1421 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1422 my $req = List::Util::sum @req;
1423
1424 if ($req > $space) {
1425 # ah well, not enough space
1426 $_ *= $space / $req for @req;
1427 } else {
1114 my $exp = List::Util::sum map $_->{expand}, @$children; 1428 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1115 $exp ||= 1;
1116 1429
1430 $space = ($space - $req) / $expand; # remaining space to give away
1431
1432 $req[$_] += $space * $children->[$_]{expand}
1117 for (0 .. $#$children) { 1433 for 0 .. $#$children;
1118 my $child = $children->[$_];
1119
1120 my $alloc_h = $h[$_];
1121 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1122 $h[$_] = $alloc_h;
1123 } 1434 }
1124 } 1435 }
1125 1436
1126 CFClient::UI::harmonize \@h; 1437 CFClient::UI::harmonize \@req;
1127 1438
1128 my $y = 0; 1439 my $pos = 0;
1129 for (0 .. $#$children) { 1440 for (0 .. $#$children) {
1130 my $child = $children->[$_];
1131 my $h = $h[$_]; 1441 my $alloc = $req[$_];
1132 $child->configure ($y, 0, $h, $w); 1442 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1133 1443
1134 $y += $h; 1444 $pos += $alloc;
1135 } 1445 }
1136 1446
1137 1 1447 1
1138} 1448}
1139 1449
1140############################################################################# 1450#############################################################################
1141 1451
1452package CFClient::UI::HBox;
1453
1454our @ISA = CFClient::UI::Box::;
1455
1456sub new {
1457 my $class = shift;
1458
1459 $class->SUPER::new (
1460 vertical => 0,
1461 @_,
1462 )
1463}
1464
1465#############################################################################
1466
1142package CFClient::UI::VBox; 1467package CFClient::UI::VBox;
1143 1468
1144# TODO: wrap into common Box base class
1145
1146our @ISA = CFClient::UI::Container::; 1469our @ISA = CFClient::UI::Box::;
1147 1470
1148sub size_request { 1471sub new {
1149 my ($self) = @_; 1472 my $class = shift;
1150 1473
1151 my @alloc = map [$_->size_request], @{$self->{children}}; 1474 $class->SUPER::new (
1152 1475 vertical => 1,
1153 ( 1476 @_,
1154 (List::Util::max map $_->[0], @alloc),
1155 (List::Util::sum map $_->[1], @alloc),
1156 ) 1477 )
1157} 1478}
1158 1479
1159sub size_allocate {
1160 my ($self, $w, $h) = @_;
1161
1162 my $children = $self->{children};
1163
1164 my @h = map $_->{req_h}, @$children;
1165
1166 my $req_h = List::Util::sum @h;
1167
1168 if ($req_h > $h) {
1169 # ah well, not enough space
1170 $_ *= $h / $req_h for @h;
1171 } else {
1172 my $exp = List::Util::sum map $_->{expand}, @$children;
1173 $exp ||= 1;
1174
1175 for (0 .. $#$children) {
1176 my $child = $children->[$_];
1177
1178 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1179 }
1180 }
1181
1182 CFClient::UI::harmonize \@h;
1183
1184 my $y = 0;
1185 for (0 .. $#$children) {
1186 my $child = $children->[$_];
1187 my $h = $h[$_];
1188 $child->configure (0, $y, $w, $h);
1189
1190 $y += $h;
1191 }
1192
1193 1
1194}
1195
1196############################################################################# 1480#############################################################################
1197 1481
1198package CFClient::UI::Label; 1482package CFClient::UI::Label;
1199 1483
1200our @ISA = CFClient::UI::Base::; 1484our @ISA = CFClient::UI::DrawBG::;
1201 1485
1202use CFClient::OpenGL; 1486use CFClient::OpenGL;
1203 1487
1204sub new { 1488sub new {
1205 my ($class, %arg) = @_; 1489 my ($class, %arg) = @_;
1206 1490
1207 my $self = $class->SUPER::new ( 1491 my $self = $class->SUPER::new (
1208 fg => [1, 1, 1], 1492 fg => [1, 1, 1],
1493 #bg => none
1494 #active_bg => none
1209 #font => default_font 1495 #font => default_font
1496 #text => initial text
1497 #markup => initial narkup
1498 #max_w => maximum pixel width
1499 ellipsise => 3, # end
1500 layout => (new CFClient::Layout),
1210 fontsize => 1, 1501 fontsize => 1,
1211 text => "",
1212 align => -1, 1502 align => -1,
1213 valign => -1, 1503 valign => -1,
1214 padding => 2, 1504 padding_x => 2,
1215 layout => new CFClient::Layout, 1505 padding_y => 2,
1216 can_events => 0, 1506 can_events => 0,
1217 %arg 1507 %arg
1218 ); 1508 );
1219 1509
1220 if (exists $self->{template}) { 1510 if (exists $self->{template}) {
1221 my $layout = new CFClient::Layout; 1511 my $layout = new CFClient::Layout;
1222 $layout->set_text (delete $self->{template}); 1512 $layout->set_text (delete $self->{template});
1223 $self->{template} = $layout; 1513 $self->{template} = $layout;
1224 } 1514 }
1225 1515
1226 $self->set_text (delete $self->{text}) if exists $self->{text}; 1516 if (exists $self->{markup}) {
1227 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1517 $self->set_markup (delete $self->{markup});
1518 } else {
1519 $self->set_text (delete $self->{text});
1520 }
1228 1521
1229 $self 1522 $self
1230} 1523}
1231 1524
1232sub escape { 1525sub escape($) {
1233 local $_ = $_[1]; 1526 local $_ = $_[0];
1234 1527
1235 s/&/&amp;/g; 1528 s/&/&amp;/g;
1236 s/>/&gt;/g; 1529 s/>/&gt;/g;
1237 s/</&lt;/g; 1530 s/</&lt;/g;
1238 1531
1239 $_[1] 1532 $_
1240} 1533}
1241 1534
1242sub update { 1535sub update {
1243 my ($self) = @_; 1536 my ($self) = @_;
1244 1537
1245 delete $self->{texture}; 1538 delete $self->{texture};
1246 $self->SUPER::update; 1539 $self->SUPER::update;
1247} 1540}
1248 1541
1249sub reconfigure {
1250 my ($self) = @_;
1251
1252 delete $self->{texture};
1253}
1254
1255sub set_text { 1542sub set_text {
1256 my ($self, $text) = @_; 1543 my ($self, $text) = @_;
1257 1544
1258 return if $self->{text} eq "T$text"; 1545 return if $self->{text} eq "T$text";
1259 $self->{text} = "T$text"; 1546 $self->{text} = "T$text";
1260 1547
1548 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1261 $self->{layout}->set_text ($text); 1549 $self->{layout}->set_text ($text);
1262 1550
1263 delete $self->{texture}; 1551 $self->realloc;
1264 $self->update; 1552 $self->update;
1265 $self->check_size;
1266} 1553}
1267 1554
1268sub set_markup { 1555sub set_markup {
1269 my ($self, $markup) = @_; 1556 my ($self, $markup) = @_;
1270 1557
1271 return if $self->{text} eq "M$markup"; 1558 return if $self->{text} eq "M$markup";
1272 $self->{text} = "M$markup"; 1559 $self->{text} = "M$markup";
1273 1560
1561 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1562
1563 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1274 $self->{layout}->set_markup ($markup); 1564 $self->{layout}->set_markup ($markup);
1275 1565
1276 delete $self->{texture}; 1566 $self->realloc;
1277 $self->update; 1567 $self->update;
1278 $self->check_size;
1279} 1568}
1280 1569
1281sub size_request { 1570sub size_request {
1282 my ($self) = @_; 1571 my ($self) = @_;
1283 1572
1284 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1573 $self->{layout}->set_font ($self->{font}) if $self->{font};
1285 $self->{layout}->set_width ($self->{max_w} || -1); 1574 $self->{layout}->set_width ($self->{max_w} || -1);
1575 $self->{layout}->set_ellipsise ($self->{ellipsise});
1576 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1286 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1577 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1287 1578
1288 my ($w, $h) = $self->{layout}->size; 1579 my ($w, $h) = $self->{layout}->size;
1289 1580
1290 if (exists $self->{template}) { 1581 if (exists $self->{template}) {
… …
1295 1586
1296 $w = List::Util::max $w, $w2; 1587 $w = List::Util::max $w, $w2;
1297 $h = List::Util::max $h, $h2; 1588 $h = List::Util::max $h, $h2;
1298 } 1589 }
1299 1590
1300 ( 1591 ($w, $h)
1301 $w + $self->{padding} * 2,
1302 $h + $self->{padding} * 2,
1303 )
1304} 1592}
1305 1593
1306sub size_allocate { 1594sub size_allocate {
1307 my ($self, $w, $h) = @_; 1595 my ($self, $w, $h) = @_;
1308 1596
1597 delete $self->{ox};
1598
1309 delete $self->{texture}; 1599 delete $self->{texture}
1600 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1310} 1601}
1311 1602
1312sub set_fontsize { 1603sub set_fontsize {
1313 my ($self, $fontsize) = @_; 1604 my ($self, $fontsize) = @_;
1314 1605
1315 $self->{fontsize} = $fontsize; 1606 $self->{fontsize} = $fontsize;
1316 delete $self->{texture}; 1607 delete $self->{texture};
1317 $self->check_size; 1608
1318 $self->update; 1609 $self->realloc;
1319} 1610}
1320 1611
1321sub _draw { 1612sub _draw {
1322 my ($self) = @_; 1613 my ($self) = @_;
1323 1614
1615 $self->SUPER::_draw; # draw background, if applicable
1616
1324 my $tex = $self->{texture} ||= do { 1617 my $tex = $self->{texture} ||= do {
1618 $self->{layout}->set_foreground (@{$self->{fg}});
1325 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1619 $self->{layout}->set_font ($self->{font}) if $self->{font};
1326 $self->{layout}->set_width ($self->{w}); 1620 $self->{layout}->set_width ($self->{w});
1621 $self->{layout}->set_ellipsise ($self->{ellipsise});
1622 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1327 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1623 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1624
1328 new_from_layout CFClient::Texture $self->{layout} 1625 new_from_layout CFClient::Texture $self->{layout}
1329 }; 1626 };
1330 1627
1331 glEnable GL_BLEND; 1628 unless (exists $self->{ox}) {
1332 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1629 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1630 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1631 : ($self->{w} - $tex->{w}) * 0.5);
1632
1633 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1635 : ($self->{h} - $tex->{h}) * 0.5);
1636 };
1637
1333 glEnable GL_TEXTURE_2D; 1638 glEnable GL_TEXTURE_2D;
1334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1335 1640
1641 if ($tex->{format} == GL_ALPHA) {
1336 glColor @{$self->{fg}}; 1642 glColor @{$self->{fg}};
1337
1338 $self->{ox} = int (
1339 $self->{align} < 0 ? $self->{padding}
1340 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1341 : ($self->{w} - $tex->{w}) * 0.5
1342 );
1343
1344 $self->{oy} = int (
1345 $self->{valign} < 0 ? $self->{padding}
1346 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1347 : ($self->{h} - $tex->{h}) * 0.5
1348 );
1349
1350 $tex->draw_quad ($self->{ox}, $self->{oy}); 1643 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1644 } else {
1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1646 }
1351 1647
1352 glDisable GL_TEXTURE_2D; 1648 glDisable GL_TEXTURE_2D;
1353 glDisable GL_BLEND;
1354} 1649}
1355 1650
1356############################################################################# 1651#############################################################################
1357 1652
1358package CFClient::UI::EntryBase; 1653package CFClient::UI::EntryBase;
… …
1371 active_fg => [0, 0, 0], 1666 active_fg => [0, 0, 0],
1372 can_hover => 1, 1667 can_hover => 1,
1373 can_focus => 1, 1668 can_focus => 1,
1374 valign => 0, 1669 valign => 0,
1375 can_events => 1, 1670 can_events => 1,
1671 #text => ...
1376 @_ 1672 @_
1377 ) 1673 )
1378} 1674}
1379 1675
1380sub _set_text { 1676sub _set_text {
… …
1382 1678
1383 delete $self->{cur_h}; 1679 delete $self->{cur_h};
1384 1680
1385 return if $self->{text} eq $text; 1681 return if $self->{text} eq $text;
1386 1682
1387 delete $self->{texture};
1388
1389 $self->{last_activity} = $::NOW; 1683 $self->{last_activity} = $::NOW;
1390 $self->{text} = $text; 1684 $self->{text} = $text;
1391 1685
1392 $text =~ s/./*/g if $self->{hidden}; 1686 $text =~ s/./*/g if $self->{hidden};
1393 $self->{layout}->set_text ("$text "); 1687 $self->{layout}->set_text ("$text ");
1394 1688
1395 $self->emit (changed => $self->{text}); 1689 $self->_emit (changed => $self->{text});
1690 $self->update;
1691}
1692
1693sub set_text {
1694 my ($self, $text) = @_;
1695
1696 $self->{cursor} = length $text;
1697 $self->_set_text ($text);
1698
1699 $self->realloc;
1396} 1700}
1397 1701
1398sub get_text { 1702sub get_text {
1399 $_[0]{text} 1703 $_[0]{text}
1400} 1704}
… …
1403 my ($self) = @_; 1707 my ($self) = @_;
1404 1708
1405 my ($w, $h) = $self->SUPER::size_request; 1709 my ($w, $h) = $self->SUPER::size_request;
1406 1710
1407 ($w + 1, $h) # add 1 for cursor 1711 ($w + 1, $h) # add 1 for cursor
1408}
1409
1410sub size_allocate {
1411 my ($self, $w, $h) = @_;
1412
1413 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1414}
1415
1416sub set_text {
1417 my ($self, $text) = @_;
1418
1419 $self->{cursor} = length $text;
1420 $self->_set_text ($text);
1421 $self->update;
1422} 1712}
1423 1713
1424sub key_down { 1714sub key_down {
1425 my ($self, $ev) = @_; 1715 my ($self, $ev) = @_;
1426 1716
… …
1428 my $sym = $ev->{sym}; 1718 my $sym = $ev->{sym};
1429 my $uni = $ev->{unicode}; 1719 my $uni = $ev->{unicode};
1430 1720
1431 my $text = $self->get_text; 1721 my $text = $self->get_text;
1432 1722
1433 if ($sym == 8) { 1723 if ($uni == 8) {
1434 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1724 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1435 } elsif ($sym == 127) { 1725 } elsif ($uni == 127) {
1436 substr $text, $self->{cursor}, 1, ""; 1726 substr $text, $self->{cursor}, 1, "";
1437 } elsif ($sym == CFClient::SDLK_LEFT) { 1727 } elsif ($sym == CFClient::SDLK_LEFT) {
1438 --$self->{cursor} if $self->{cursor}; 1728 --$self->{cursor} if $self->{cursor};
1439 } elsif ($sym == CFClient::SDLK_RIGHT) { 1729 } elsif ($sym == CFClient::SDLK_RIGHT) {
1440 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1730 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1441 } elsif ($sym == CFClient::SDLK_HOME) { 1731 } elsif ($sym == CFClient::SDLK_HOME) {
1442 $self->{cursor} = 0; 1732 $self->{cursor} = 0;
1443 } elsif ($sym == CFClient::SDLK_END) { 1733 } elsif ($sym == CFClient::SDLK_END) {
1444 $self->{cursor} = length $text; 1734 $self->{cursor} = length $text;
1445 } elsif ($sym == 27) { 1735 } elsif ($uni == 27) {
1446 $self->emit ('escape'); 1736 $self->_emit ('escape');
1447 } elsif ($uni) { 1737 } elsif ($uni) {
1448 substr $text, $self->{cursor}++, 0, chr $uni; 1738 substr $text, $self->{cursor}++, 0, chr $uni;
1739 } else {
1740 return 0;
1449 } 1741 }
1450 1742
1451 $self->_set_text ($text); 1743 $self->_set_text ($text);
1452 $self->update; 1744
1745 $self->realloc;
1746
1747 1
1453} 1748}
1454 1749
1455sub focus_in { 1750sub focus_in {
1456 my ($self) = @_; 1751 my ($self) = @_;
1457 1752
… …
1472 utf8::encode $text; 1767 utf8::encode $text;
1473 $self->{cursor} = length substr $text, 0, $idx; 1768 $self->{cursor} = length substr $text, 0, $idx;
1474 1769
1475 $self->_set_text ($self->{text}); 1770 $self->_set_text ($self->{text});
1476 $self->update; 1771 $self->update;
1772
1773 1
1477} 1774}
1478 1775
1479sub mouse_motion { 1776sub mouse_motion {
1480 my ($self, $ev, $x, $y) = @_; 1777 my ($self, $ev, $x, $y) = @_;
1481# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1778# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1779
1780 0
1482} 1781}
1483 1782
1484sub _draw { 1783sub _draw {
1485 my ($self) = @_; 1784 my ($self) = @_;
1486 1785
… …
1537 if ($sym == 13) { 1836 if ($sym == 13) {
1538 unshift @{$self->{history}}, 1837 unshift @{$self->{history}},
1539 my $txt = $self->get_text; 1838 my $txt = $self->get_text;
1540 $self->{history_pointer} = -1; 1839 $self->{history_pointer} = -1;
1541 $self->{history_saveback} = ''; 1840 $self->{history_saveback} = '';
1542 $self->emit (activate => $txt); 1841 $self->_emit (activate => $txt);
1543 $self->update; 1842 $self->update;
1544 1843
1545 } elsif ($sym == CFClient::SDLK_UP) { 1844 } elsif ($sym == CFClient::SDLK_UP) {
1546 if ($self->{history_pointer} < 0) { 1845 if ($self->{history_pointer} < 0) {
1547 $self->{history_saveback} = $self->get_text; 1846 $self->{history_saveback} = $self->get_text;
… …
1563 } else { 1862 } else {
1564 $self->set_text ($self->{history_saveback}); 1863 $self->set_text ($self->{history_saveback});
1565 } 1864 }
1566 1865
1567 } else { 1866 } else {
1568 $self->SUPER::key_down ($ev); 1867 return $self->SUPER::key_down ($ev)
1868 }
1869
1569 } 1870 1
1570
1571} 1871}
1572 1872
1573############################################################################# 1873#############################################################################
1574 1874
1575package CFClient::UI::Button; 1875package CFClient::UI::Button;
… …
1584 1884
1585sub new { 1885sub new {
1586 my $class = shift; 1886 my $class = shift;
1587 1887
1588 $class->SUPER::new ( 1888 $class->SUPER::new (
1589 padding => 4, 1889 padding_x => 4,
1890 padding_y => 4,
1590 fg => [1, 1, 1], 1891 fg => [1, 1, 1],
1591 bg => [1, 1, 1, 0.2],
1592 active_fg => [0, 0, 1], 1892 active_fg => [0, 0, 1],
1593 can_hover => 1, 1893 can_hover => 1,
1594 align => 0, 1894 align => 0,
1595 valign => 0, 1895 valign => 0,
1596 can_events => 1, 1896 can_events => 1,
1597 @_ 1897 @_
1598 ) 1898 )
1599} 1899}
1600 1900
1901sub activate { }
1902
1601sub button_up { 1903sub button_up {
1602 my ($self, $ev, $x, $y) = @_; 1904 my ($self, $ev, $x, $y) = @_;
1603 1905
1906 $self->emit ("activate")
1604 if ($x >= 0 && $x < $self->{w} 1907 if $x >= 0 && $x < $self->{w}
1605 && $y >= 0 && $y < $self->{h}) { 1908 && $y >= 0 && $y < $self->{h};
1606 $self->emit ("activate"); 1909
1607 } 1910 1
1608} 1911}
1609 1912
1610sub _draw { 1913sub _draw {
1611 my ($self) = @_; 1914 my ($self) = @_;
1612 1915
… …
1614 1917
1615 if ($GRAB == $self) { 1918 if ($GRAB == $self) {
1616 $self->{fg} = $self->{active_fg}; 1919 $self->{fg} = $self->{active_fg};
1617 } 1920 }
1618 1921
1619 glEnable GL_BLEND;
1620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621 glEnable GL_TEXTURE_2D; 1922 glEnable GL_TEXTURE_2D;
1622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1923 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623 glColor 0, 0, 0, 1; 1924 glColor 0, 0, 0, 1;
1624 1925
1625 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1926 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1626 1927
1627 glDisable GL_TEXTURE_2D; 1928 glDisable GL_TEXTURE_2D;
1628 glDisable GL_BLEND;
1629 1929
1630 $self->SUPER::_draw; 1930 $self->SUPER::_draw;
1631} 1931}
1632 1932
1633############################################################################# 1933#############################################################################
… …
1644 1944
1645sub new { 1945sub new {
1646 my $class = shift; 1946 my $class = shift;
1647 1947
1648 $class->SUPER::new ( 1948 $class->SUPER::new (
1649 padding => 2, 1949 padding_x => 2,
1950 padding_y => 2,
1650 fg => [1, 1, 1], 1951 fg => [1, 1, 1],
1651 active_fg => [1, 1, 0], 1952 active_fg => [1, 1, 0],
1953 bg => [0, 0, 0, 0.2],
1954 active_bg => [1, 1, 1, 0.5],
1652 state => 0, 1955 state => 0,
1653 can_hover => 1, 1956 can_hover => 1,
1654 @_ 1957 @_
1655 ) 1958 )
1656} 1959}
1657 1960
1658sub size_request { 1961sub size_request {
1659 my ($self) = @_; 1962 my ($self) = @_;
1660 1963
1661 ($self->{padding} * 2 + 6) x 2 1964 (6) x 2
1662} 1965}
1663 1966
1664sub button_down { 1967sub button_down {
1665 my ($self, $ev, $x, $y) = @_; 1968 my ($self, $ev, $x, $y) = @_;
1666 1969
1667 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1970 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1668 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1971 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1669 $self->{state} = !$self->{state}; 1972 $self->{state} = !$self->{state};
1670 $self->emit (changed => $self->{state}); 1973 $self->_emit (changed => $self->{state});
1974 } else {
1975 return 0
1976 }
1977
1671 } 1978 1
1672} 1979}
1673 1980
1674sub _draw { 1981sub _draw {
1675 my ($self) = @_; 1982 my ($self) = @_;
1676 1983
1677 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1678 1985
1679 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1986 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1680 1987
1681 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1988 my ($w, $h) = @$self{qw(w h)};
1989
1990 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1682 1991
1683 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1992 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1684 1993
1685 glEnable GL_BLEND; 1994 my $tex = $self->{state} ? $tex[1] : $tex[0];
1995
1686 glEnable GL_TEXTURE_2D; 1996 glEnable GL_TEXTURE_2D;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688
1689 my $tex = $self->{state} ? $tex[1] : $tex[0];
1690
1691 $tex->draw_quad (0, 0, $s, $s); 1997 $tex->draw_quad_alpha (0, 0, $s, $s);
1692
1693 glDisable GL_TEXTURE_2D; 1998 glDisable GL_TEXTURE_2D;
1694 glDisable GL_BLEND;
1695} 1999}
1696 2000
1697############################################################################# 2001#############################################################################
1698 2002
1699package CFClient::UI::Image; 2003package CFClient::UI::Image;
… …
1742 glTranslate 0, -$self->{w}, 0; 2046 glTranslate 0, -$self->{w}, 0;
1743 2047
1744 ($w, $h) = ($h, $w); 2048 ($w, $h) = ($h, $w);
1745 } 2049 }
1746 2050
1747 glEnable GL_BLEND;
1748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1749 glEnable GL_TEXTURE_2D; 2051 glEnable GL_TEXTURE_2D;
1750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2052 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1751 2053
1752 $tex->draw_quad (0, 0, $w, $h); 2054 $tex->draw_quad_alpha (0, 0, $w, $h);
1753 2055
1754 glDisable GL_BLEND;
1755 glDisable GL_TEXTURE_2D; 2056 glDisable GL_TEXTURE_2D;
1756} 2057}
1757 2058
1758############################################################################# 2059#############################################################################
1759 2060
… …
1948 qw(s1_slider.png s1_slider_bg.png); 2249 qw(s1_slider.png s1_slider_bg.png);
1949 2250
1950sub new { 2251sub new {
1951 my $class = shift; 2252 my $class = shift;
1952 2253
1953 # range [value, low, high, page] 2254 # range [value, low, high, page, unit]
1954 2255
1955 # TODO: 0-width page 2256 # TODO: 0-width page
1956 # TODO: req_w/h are wrong with vertical 2257 # TODO: req_w/h are wrong with vertical
1957 # TODO: calculations are off 2258 # TODO: calculations are off
1958 my $self = $class->SUPER::new ( 2259 my $self = $class->SUPER::new (
1959 fg => [1, 1, 1], 2260 fg => [1, 1, 1],
1960 active_fg => [0, 0, 0], 2261 active_fg => [0, 0, 0],
2262 bg => [0, 0, 0, 0.2],
2263 active_bg => [1, 1, 1, 0.5],
1961 range => [0, 0, 100, 10], 2264 range => [0, 0, 100, 10, 0],
1962 req_w => 20, 2265 min_w => $::WIDTH / 80,
1963 req_h => 20, 2266 min_h => $::WIDTH / 80,
1964 vertical => 0, 2267 vertical => 0,
1965 can_hover => 1, 2268 can_hover => 1,
1966 inner_pad => 5, 2269 inner_pad => 0.02,
1967 @_ 2270 @_
1968 ); 2271 );
1969 2272
2273 $self->set_value ($self->{range}[0]);
2274 $self->update;
2275
1970 $self 2276 $self
1971} 2277}
1972 2278
2279sub changed { }
2280
2281sub set_range {
2282 my ($self, $range) = @_;
2283
2284 ($range, $self->{range}) = ($self->{range}, $range);
2285
2286 $self->update
2287 if "@$range" ne "@{$self->{range}}";
2288}
2289
2290sub set_value {
2291 my ($self, $value) = @_;
2292
2293 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2294
2295 $hi = $lo + 1 if $hi <= $lo;
2296
2297 $page = $hi - $lo if $page > $hi - $lo;
2298
2299 $value = $lo if $value < $lo;
2300 $value = $hi - $page if $value > $hi - $page;
2301
2302 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2303 if $unit;
2304
2305 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2306
2307 if ($value != $old_value) {
2308 $self->_emit (changed => $value);
2309 $self->update;
2310 }
2311}
2312
1973sub size_request { 2313sub size_request {
1974 my ($self) = @_; 2314 my ($self) = @_;
1975 2315
1976 my $w = $self->{req_w}; 2316 ($self->{req_w}, $self->{req_h})
1977 my $h = $self->{req_h};
1978
1979 $self->{vertical} ? ($h, $w) : ($w, $h)
1980} 2317}
1981 2318
1982sub button_down { 2319sub button_down {
1983 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
1984 2321
1985 $self->SUPER::button_down ($ev, $x, $y); 2322 $self->SUPER::button_down ($ev, $x, $y);
2323
2324 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2325
1986 $self->mouse_motion ($ev, $x, $y); 2326 $self->mouse_motion ($ev, $x, $y)
1987} 2327}
1988 2328
1989sub mouse_motion { 2329sub mouse_motion {
1990 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
1991 2331
1992 if ($GRAB == $self) { 2332 if ($GRAB == $self) {
2333 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2334
2335 my (undef, $lo, $hi, $page) = @{$self->{range}};
2336
2337 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2338
2339 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2340 } else {
2341 return 0;
2342 }
2343
2344 1
2345}
2346
2347sub update {
2348 my ($self) = @_;
2349
2350 delete $self->{knob_w};
2351 $self->SUPER::update;
2352}
2353
2354sub _draw {
2355 my ($self) = @_;
2356
2357 unless ($self->{knob_w}) {
2358 $self->set_value ($self->{range}[0]);
2359
1993 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2360 my ($value, $lo, $hi, $page) = @{$self->{range}};
2361 my $range = ($hi - $page - $lo) || 1e-100;
1994 2362
1995 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2363 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1996 2364
1997 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2365 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1998 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2366 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1999 2367
2000 $x -= $inner_pad_px; # substract the padding 2368 $value = ($value - $lo) / $range;
2001 $x = $x * ($hi - $lo) / $inner_w + $lo; 2369 $value = $value * $self->{scale} + $self->{offset};
2002 $x = $lo if $x < $lo;
2003 $x = $hi - $page if $x > $hi - $page;
2004 $self->{range}[0] = $x;
2005 2370
2006 $self->emit (changed => $x); 2371 $self->{knob_x} = $value - $knob_w * 0.5;
2007 $self->update; 2372 $self->{knob_w} = $knob_w;
2008 } 2373 }
2009}
2010
2011# the inner_* stuff is for generating a padding for the slider handle,
2012# so that the handle doesn't leave the texture. This calculation isn't 100%
2013# correct propably, but it does the job for now
2014sub _calc_inner_pad_px {
2015 my ($self, $w) = @_;
2016 ($w / 100) * $self->{inner_pad} # % to pixels
2017}
2018
2019sub _draw {
2020 my ($self) = @_;
2021 2374
2022 $self->SUPER::_draw (); 2375 $self->SUPER::_draw ();
2023 2376
2024 my ($w, $h) = @$self{qw(w h)}; 2377 glScale $self->{w}, $self->{h};
2025 2378
2026 if ($self->{vertical}) { 2379 if ($self->{vertical}) {
2027 # draw a vertical slider like a rotated horizontal slider 2380 # draw a vertical slider like a rotated horizontal slider
2028 2381
2382 glTranslate 1, 0, 0;
2029 glRotate 90, 0, 0, 1; 2383 glRotate 90, 0, 0, 1;
2030 glTranslate 0, -$self->{w}, 0;
2031
2032 ($w, $h) = ($h, $w);
2033 } 2384 }
2034 2385
2035 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2386 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2036 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2387 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2037 2388
2038 my ($value, $lo, $hi, $page) = @{$self->{range}};
2039
2040 $hi = $value + 1 if $lo == $hi;
2041
2042 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2043 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2044
2045 $page = int $page * $inner_w / ($hi - $lo);
2046 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2047
2048 $w -= $page;
2049 $page &= ~1;
2050 glTranslate $page * 0.5, 0, 0;
2051 $page ||= 2;
2052
2053 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2054 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2055
2056 glEnable GL_BLEND;
2057 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2058 glEnable GL_TEXTURE_2D; 2389 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2390 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 2391
2061 # draw background 2392 # draw background
2062 $tex[1]->draw_quad (0, 0, $w, $h); 2393 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2063 2394
2064 # draw handle 2395 # draw handle
2065 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2396 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2066 2397
2067 glDisable GL_BLEND;
2068 glDisable GL_TEXTURE_2D; 2398 glDisable GL_TEXTURE_2D;
2069} 2399}
2400
2401#############################################################################
2402
2403package CFClient::UI::ValSlider;
2404
2405our @ISA = CFClient::UI::HBox::;
2406
2407sub new {
2408 my ($class, %arg) = @_;
2409
2410 my $range = delete $arg{range};
2411
2412 my $self = $class->SUPER::new (
2413 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2414 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2415 to_value => sub { shift },
2416 from_value => sub { shift },
2417 %arg,
2418 );
2419
2420 $self->{slider}->connect (changed => sub {
2421 my ($self, $value) = @_;
2422 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2423 $self->{parent}->emit (changed => $value);
2424 });
2425
2426# $self->{entry}->connect (changed => sub {
2427# my ($self, $value) = @_;
2428# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2429# $self->{parent}->emit (changed => $value);
2430# });
2431
2432 $self->add ($self->{slider}, $self->{entry});
2433
2434 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2435
2436 $self
2437}
2438
2439sub set_range { shift->{slider}->set_range (@_) }
2440sub set_value { shift->{slider}->set_value (@_) }
2070 2441
2071############################################################################# 2442#############################################################################
2072 2443
2073package CFClient::UI::TextView; 2444package CFClient::UI::TextView;
2074 2445
… …
2083 fontsize => 1, 2454 fontsize => 1,
2084 can_events => 0, 2455 can_events => 0,
2085 #font => default_font 2456 #font => default_font
2086 @_, 2457 @_,
2087 2458
2088 layout => (new CFClient::Layout), 2459 layout => (new CFClient::Layout 1),
2089 par => [], 2460 par => [],
2090 height => 0, 2461 height => 0,
2091 children => [ 2462 children => [
2092 (new CFClient::UI::Empty expand => 1), 2463 (new CFClient::UI::Empty expand => 1),
2093 (new CFClient::UI::Slider vertical => 1), 2464 (new CFClient::UI::Slider vertical => 1),
… …
2104 2475
2105 $self->{fontsize} = $fontsize; 2476 $self->{fontsize} = $fontsize;
2106 $self->reflow; 2477 $self->reflow;
2107} 2478}
2108 2479
2109sub text_height {
2110 my ($self, $text) = @_;
2111
2112 my $layout = $self->{layout};
2113
2114 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2115 $layout->set_width ($self->{children}[0]{w});
2116 $layout->set_text ($text);
2117
2118 ($layout->size)[1]
2119}
2120
2121sub reflow {
2122 my ($self) = @_;
2123
2124 $self->{need_reflow}++;
2125 $self->update;
2126}
2127
2128sub size_allocate { 2480sub size_allocate {
2129 my ($self, $w, $h) = @_; 2481 my ($self, $w, $h) = @_;
2130 2482
2131 $self->SUPER::size_allocate ($w, $h); 2483 $self->SUPER::size_allocate ($w, $h);
2132 2484
… …
2135 $self->{layout}->set_width ($self->{children}[0]{w}); 2487 $self->{layout}->set_width ($self->{children}[0]{w});
2136 2488
2137 $self->reflow; 2489 $self->reflow;
2138} 2490}
2139 2491
2492sub text_size {
2493 my ($self, $text, $indent) = @_;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2498 $layout->set_width ($self->{children}[0]{w} - $indent);
2499 $layout->set_markup ($text);
2500
2501 $layout->size
2502}
2503
2504sub reflow {
2505 my ($self) = @_;
2506
2507 $self->{need_reflow}++;
2508 $self->update;
2509}
2510
2511sub set_offset {
2512 my ($self, $offset) = @_;
2513
2514 # todo: base offset on lines or so, not on pixels
2515 $self->{children}[1]->set_value ($offset);
2516}
2517
2518sub clear {
2519 my ($self) = @_;
2520
2521 $self->{par} = [];
2522 $self->{height} = 0;
2523 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2524}
2525
2140sub add_paragraph { 2526sub add_paragraph {
2141 my ($self, $color, $text) = @_; 2527 my ($self, $color, $text, $indent) = @_;
2142 2528
2143 #TODO: intelligently "reformat" paragraph 2529 for my $line (split /\n/, $text) {
2144 2530 my ($w, $h) = $self->text_size ($line);
2145 my $height = $self->text_height ($text);
2146
2147 $self->{height} += $height; 2531 $self->{height} += $h;
2532 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2533 }
2148 2534
2149 push @{$self->{par}}, [$height, $color, $text];
2150
2151 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2535 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2152 $self->{children}[1]->update;
2153} 2536}
2154 2537
2155sub update { 2538sub update {
2156 my ($self) = @_; 2539 my ($self) = @_;
2157 2540
… …
2159 2542
2160 return unless $self->{h} > 0; 2543 return unless $self->{h} > 0;
2161 2544
2162 delete $self->{texture}; 2545 delete $self->{texture};
2163 2546
2164 $ROOT->on_refresh ($self, sub { 2547 $ROOT->on_post_alloc ($self, sub {
2548 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2549
2165 if (delete $self->{need_reflow}) { 2550 if (delete $self->{need_reflow}) {
2166 my $height = 0; 2551 my $height = 0;
2167 2552
2168 $height += $_->[0] = $self->text_height ($_->[2]) 2553 my $layout = $self->{layout};
2554
2555 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2556
2169 for @{$self->{par}}; 2557 for (@{$self->{par}}) {
2558 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2559 $layout->set_width ($W - $_->[3]);
2560 $layout->set_markup ($_->[4]);
2561 my ($w, $h) = $layout->size;
2562 $_->[0] = $w + $_->[3];
2563 $_->[1] = $h;
2564 }
2565
2566 $height += $_->[1];
2567 }
2170 2568
2171 $self->{height} = $height; 2569 $self->{height} = $height;
2172 2570
2173 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2571 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2174 2572
2175 delete $self->{texture}; 2573 delete $self->{texture};
2176 } 2574 }
2177 2575
2178 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2576 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2179 glClearColor 0, 0, 0, 0; 2577 glClearColor 0.5, 0.5, 0.5, 0;
2180 glClear GL_COLOR_BUFFER_BIT; 2578 glClear GL_COLOR_BUFFER_BIT;
2181 2579
2580 my $top = int $self->{children}[1]{range}[0];
2581
2582 my $y0 = $top;
2583 my $y1 = $top + $H;
2584
2585 my $y = 0;
2586
2587 my $layout = $self->{layout};
2588
2589 $layout->set_font ($self->{font}) if $self->{font};
2590
2182 glEnable GL_BLEND; 2591 glEnable GL_BLEND;
2592 #TODO# not correct in windows where rgba is forced off
2183 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2593 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2184 glEnable GL_TEXTURE_2D;
2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2186
2187 my $top = int $self->{children}[1]{range}[0];
2188
2189 my $y0 = $top;
2190 my $y1 = $top + $self->{h};
2191
2192 my $y = 0;
2193
2194 my $layout = $self->{layout};
2195
2196 $layout->set_font ($self->{font}) if $self->{font};
2197 2594
2198 for my $par (@{$self->{par}}) { 2595 for my $par (@{$self->{par}}) {
2199 my $h = $par->[0]; 2596 my $h = $par->[1];
2200 2597
2201 if ($y0 < $y + $h && $y < $y1) { 2598 if ($y0 < $y + $h && $y < $y1) {
2599 $layout->set_foreground (@{ $par->[2] });
2600 $layout->set_width ($W - $par->[3]);
2202 $layout->set_text ($par->[2]); 2601 $layout->set_markup ($par->[4]);
2203 2602
2204 glColor @{ $par->[1] }; 2603 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2205 my ($W, $H) = $layout->size; 2604
2206 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2605 glRasterPos $par->[3], $y - $y0;
2606 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2207 } 2607 }
2208 2608
2209 $y += $h; 2609 $y += $h;
2210 } 2610 }
2211 2611
2212 glDisable GL_TEXTURE_2D;
2213 glDisable GL_BLEND; 2612 glDisable GL_BLEND;
2214 }; 2613 };
2215 }); 2614 });
2216} 2615}
2217 2616
2218sub _draw { 2617sub _draw {
2219 my ($self) = @_; 2618 my ($self) = @_;
2220 2619
2221 glEnable GL_BLEND;
2222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2223 glEnable GL_TEXTURE_2D; 2620 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 1, 1, 1, 1; 2622 glColor 1, 1, 1, 1;
2226 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2623 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2227 glDisable GL_TEXTURE_2D; 2624 glDisable GL_TEXTURE_2D;
2228 glDisable GL_BLEND;
2229 2625
2230 $self->{children}[1]->draw; 2626 $self->{children}[1]->draw;
2231 2627
2232} 2628}
2233 2629
… …
2281 2677
2282sub new { 2678sub new {
2283 my $class = shift; 2679 my $class = shift;
2284 2680
2285 my $self = $class->SUPER::new ( 2681 my $self = $class->SUPER::new (
2286 state => 0, 2682 state => 0,
2287 connect_activate => \&toggle_flopper, 2683 on_activate => \&toggle_flopper,
2288 @_ 2684 @_
2289 ); 2685 );
2290 2686
2291 if ($self->{state}) {
2292 $self->{state} = 0;
2293 $self->toggle_flopper;
2294 }
2295
2296 $self 2687 $self
2297} 2688}
2298 2689
2299sub toggle_flopper { 2690sub toggle_flopper {
2300 my ($self) = @_; 2691 my ($self) = @_;
2301 2692
2302 # TODO: use animation 2693 $self->{other}->toggle_visibility;
2303 if ($self->{state} = !$self->{state}) {
2304 $CFClient::UI::ROOT->add ($self->{other});
2305 $self->{other}->move ($self->coord2global (0, $self->{h}));
2306 $self->emit ("open");
2307 } else {
2308 $CFClient::UI::ROOT->remove ($self->{other});
2309 $self->emit ("close");
2310 }
2311
2312 $self->emit (changed => $self->{state});
2313} 2694}
2314 2695
2315############################################################################# 2696#############################################################################
2316 2697
2317package CFClient::UI::Tooltip; 2698package CFClient::UI::Tooltip;
… …
2327 @_, 2708 @_,
2328 can_events => 0, 2709 can_events => 0,
2329 ) 2710 )
2330} 2711}
2331 2712
2332sub set_markup { 2713sub set_tooltip_from {
2333 my ($self, $text) = @_; 2714 my ($self, $widget) = @_;
2334 2715
2335 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2716 my $tooltip = $widget->{tooltip};
2336 $self->{label}->set_markup ($text); 2717
2337 $self->add ($self->{label}); 2718 if ($ENV{CFPLUS_DEBUG} & 2) {
2719 $tooltip .= "\n\n" . (ref $widget) . "\n"
2720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2721 . "req $widget->{req_w} $widget->{req_h}\n"
2722 . "visible $widget->{visible}";
2723 }
2724
2725 $self->add (new CFClient::UI::Label
2726 markup => $tooltip,
2727 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2728 fontsize => 0.8,
2729 fg => [0, 0, 0, 1],
2730 ellipsise => 0,
2731 font => ($widget->{tooltip_font} || $::FONT_PROP),
2732 );
2338} 2733}
2339 2734
2340sub size_request { 2735sub size_request {
2341 my ($self) = @_; 2736 my ($self) = @_;
2342
2343 $self->child->set_max_size ($::WIDTH * 0.3);
2344 2737
2345 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2738 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2346 2739
2347 ($w + 4, $h + 4) 2740 ($w + 4, $h + 4)
2348} 2741}
… …
2351 my ($self, $w, $h) = @_; 2744 my ($self, $w, $h) = @_;
2352 2745
2353 $self->SUPER::size_allocate ($w - 4, $h - 4); 2746 $self->SUPER::size_allocate ($w - 4, $h - 4);
2354} 2747}
2355 2748
2749sub visibility_change {
2750 my ($self, $visible) = @_;
2751
2752 return unless $visible;
2753
2754 $self->{root}->on_post_alloc ("move_$self" => sub {
2755 my $widget = $self->{owner}
2756 or return;
2757
2758 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2759
2760 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2761 if $x + $self->{w} > $::WIDTH;
2762
2763 $self->move_abs ($x, $y);
2764 });
2765}
2766
2356sub _draw { 2767sub _draw {
2357 my ($self) = @_; 2768 my ($self) = @_;
2358 2769
2359 glPushMatrix;
2360 glTranslate 0.375, 0.375; 2770 glTranslate 0.375, 0.375;
2361 2771
2362 my ($w, $h) = @$self{qw(w h)}; 2772 my ($w, $h) = @$self{qw(w h)};
2363 2773
2364 glColor 1, 0.8, 0.4; 2774 glColor 1, 0.8, 0.4;
… …
2375 glVertex 0 , $h; 2785 glVertex 0 , $h;
2376 glVertex $w, $h; 2786 glVertex $w, $h;
2377 glVertex $w, 0; 2787 glVertex $w, 0;
2378 glEnd; 2788 glEnd;
2379 2789
2380 glPopMatrix; 2790 glTranslate 2 - 0.375, 2 - 0.375;
2381 2791
2382 glTranslate 2, 2;
2383 $self->SUPER::_draw; 2792 $self->SUPER::_draw;
2384} 2793}
2385 2794
2386############################################################################# 2795#############################################################################
2387 2796
… …
2392use CFClient::OpenGL; 2801use CFClient::OpenGL;
2393 2802
2394sub new { 2803sub new {
2395 my $class = shift; 2804 my $class = shift;
2396 2805
2397 $class->SUPER::new ( 2806 my $self = $class->SUPER::new (
2398 aspect => 1, 2807 aspect => 1,
2808 can_events => 0,
2399 @_, 2809 @_,
2400 ) 2810 );
2811
2812 if ($self->{anim} && $self->{animspeed}) {
2813 Scalar::Util::weaken (my $widget = $self);
2814
2815 $self->{timer} = Event->timer (
2816 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2817 hard => 1,
2818 interval => $self->{animspeed},
2819 cb => sub {
2820 ++$widget->{frame};
2821 $widget->update;
2822 },
2823 );
2824 }
2825
2826 $self
2401} 2827}
2402 2828
2403sub size_request { 2829sub size_request {
2404 (32, 8) 2830 (32, 8)
2405} 2831}
2406 2832
2833sub update {
2834 my ($self) = @_;
2835
2836 return unless $self->{visible};
2837
2838 $self->SUPER::update;
2839}
2840
2407sub _draw { 2841sub _draw {
2408 my ($self) = @_; 2842 my ($self) = @_;
2409 2843
2844 return unless $::CONN;
2845
2846 my $face;
2847
2848 if ($self->{frame}) {
2849 my $anim = $::CONN->{anim}[$self->{anim}];
2850
2851 $face = $anim->[ $self->{frame} % @$anim ]
2852 if $anim && @$anim;
2853 }
2854
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2855 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 2856
2412 # TODO animation
2413 if ($tex) { 2857 if ($tex) {
2414 glEnable GL_BLEND;
2415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2416 glEnable GL_TEXTURE_2D; 2858 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418 glColor 1, 1, 1, 1; 2860 glColor 1, 1, 1, 1;
2419 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2861 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2420 glDisable GL_TEXTURE_2D; 2862 glDisable GL_TEXTURE_2D;
2421 glDisable GL_BLEND;
2422 } 2863 }
2423} 2864}
2865
2866sub DESTROY {
2867 my ($self) = @_;
2868
2869 $self->{timer}->cancel
2870 if $self->{timer};
2871
2872 $self->SUPER::DESTROY;
2873}
2874
2875#############################################################################
2876
2877package CFClient::UI::Buttonbar;
2878
2879our @ISA = CFClient::UI::HBox::;
2880
2881# TODO: should actualyl wrap buttons and other goodies.
2424 2882
2425############################################################################# 2883#############################################################################
2426 2884
2427package CFClient::UI::Menu; 2885package CFClient::UI::Menu;
2428 2886
… …
2462 2920
2463# popup given the event (must be a mouse button down event currently) 2921# popup given the event (must be a mouse button down event currently)
2464sub popup { 2922sub popup {
2465 my ($self, $ev) = @_; 2923 my ($self, $ev) = @_;
2466 2924
2467 $self->emit ("popdown"); 2925 $self->_emit ("popdown");
2468 2926
2469 # maybe save $GRAB? must be careful about events... 2927 # maybe save $GRAB? must be careful about events...
2470 $GRAB = $self; 2928 $GRAB = $self;
2471 $self->{button} = $ev->{button}; 2929 $self->{button} = $ev->{button};
2472 2930
2473 $self->show; 2931 $self->show;
2474 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2932 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2475} 2933}
2476 2934
2477sub mouse_motion { 2935sub mouse_motion {
2478 my ($self, $ev, $x, $y) = @_; 2936 my ($self, $ev, $x, $y) = @_;
2479 2937
2480 # TODO: should use vbox->fdind_widget or so 2938 # TODO: should use vbox->find_widget or so
2481 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2939 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482 $self->{hover} = $self->{item}{$HOVER}; 2940 $self->{hover} = $self->{item}{$HOVER};
2941
2942 0
2483} 2943}
2484 2944
2485sub button_up { 2945sub button_up {
2486 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2487 2947
2488 if ($ev->{button} == $self->{button}) { 2948 if ($ev->{button} == $self->{button}) {
2489 undef $GRAB; 2949 undef $GRAB;
2490 $self->hide; 2950 $self->hide;
2491 2951
2492 $self->emit ("popdown"); 2952 $self->_emit ("popdown");
2493 $self->{hover}[1]->() if $self->{hover}; 2953 $self->{hover}[1]->() if $self->{hover};
2954 } else {
2955 return 0
2956 }
2957
2494 } 2958 1
2495} 2959}
2496 2960
2497############################################################################# 2961#############################################################################
2498 2962
2963package CFClient::UI::Multiplexer;
2964
2965our @ISA = CFClient::UI::Container::;
2966
2967sub new {
2968 my $class = shift;
2969
2970 my $self = $class->SUPER::new (
2971 @_,
2972 );
2973
2974 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} };
2976
2977 $self
2978}
2979
2980sub add {
2981 my ($self, @widgets) = @_;
2982
2983 $self->SUPER::add (@widgets);
2984
2985 $self->{current} = $self->{children}[0]
2986 if @{ $self->{children} };
2987}
2988
2989sub set_current_page {
2990 my ($self, $page_or_widget) = @_;
2991
2992 my $widget = ref $page_or_widget
2993 ? $page_or_widget
2994 : $self->{children}[$page_or_widget];
2995
2996 $self->{current} = $widget;
2997 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2998
2999 $self->_emit (page_changed => $self->{current});
3000
3001 $self->realloc;
3002}
3003
3004sub visible_children {
3005 $_[0]{current}
3006}
3007
3008sub size_request {
3009 my ($self) = @_;
3010
3011 $self->{current}->size_request
3012}
3013
3014sub size_allocate {
3015 my ($self, $w, $h) = @_;
3016
3017 $self->{current}->configure (0, 0, $w, $h);
3018}
3019
3020sub _draw {
3021 my ($self) = @_;
3022
3023 $self->{current}->draw;
3024}
3025
3026#############################################################################
3027
3028package CFClient::UI::Notebook;
3029
3030our @ISA = CFClient::UI::VBox::;
3031
3032sub new {
3033 my $class = shift;
3034
3035 my $self = $class->SUPER::new (
3036 buttonbar => (new CFClient::UI::Buttonbar),
3037 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3038 # filter => # will be put between multiplexer and $self
3039 @_,
3040 );
3041
3042 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3043 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3044
3045 $self
3046}
3047
3048sub add {
3049 my ($self, $title, $widget, $tooltip) = @_;
3050
3051 Scalar::Util::weaken $self;
3052
3053 $self->{buttonbar}->add (new CFClient::UI::Button
3054 markup => $title,
3055 tooltip => $tooltip,
3056 on_activate => sub { $self->set_current_page ($widget) },
3057 );
3058
3059 $self->{multiplexer}->add ($widget);
3060}
3061
3062sub set_current_page {
3063 my ($self, $page) = @_;
3064
3065 $self->{multiplexer}->set_current_page ($page);
3066 $self->_emit (page_changed => $self->{multiplexer}{current});
3067}
3068
3069#############################################################################
3070
3071package CFClient::UI::Statusbox;
3072
3073our @ISA = CFClient::UI::VBox::;
3074
3075sub new {
3076 my $class = shift;
3077
3078 $class->SUPER::new (
3079 fontsize => 0.8,
3080 @_,
3081 )
3082}
3083
3084sub reorder {
3085 my ($self) = @_;
3086 my $NOW = time;
3087
3088 while (my ($k, $v) = each %{ $self->{item} }) {
3089 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3090 }
3091
3092 my @widgets;
3093
3094 my @items = sort {
3095 $a->{pri} <=> $b->{pri}
3096 or $b->{id} <=> $a->{id}
3097 } values %{ $self->{item} };
3098
3099 my $count = 10 + 1;
3100 for my $item (@items) {
3101 last unless --$count;
3102
3103 push @widgets, $item->{label} ||= do {
3104 # TODO: doesn't handle markup well (read as: at all)
3105 my $short = $item->{count} > 1
3106 ? "<b>$item->{count} ×</b> $item->{text}"
3107 : $item->{text};
3108
3109 for ($short) {
3110 s/^\s+//;
3111 s/\s+/ /g;
3112 }
3113
3114 new CFClient::UI::Label
3115 markup => $short,
3116 tooltip => $item->{tooltip},
3117 tooltip_font => $::FONT_PROP,
3118 tooltip_width => 0.67,
3119 fontsize => $item->{fontsize} || $self->{fontsize},
3120 max_w => $::WIDTH * 0.44,
3121 fg => $item->{fg},
3122 can_events => 1,
3123 can_hover => 1
3124 };
3125 }
3126
3127 $self->clear;
3128 $self->SUPER::add (reverse @widgets);
3129}
3130
3131sub add {
3132 my ($self, $text, %arg) = @_;
3133
3134 $text =~ s/^\s+//;
3135 $text =~ s/\s+$//;
3136
3137 return unless $text;
3138
3139 my $timeout = time + ((delete $arg{timeout}) || 60);
3140
3141 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3142
3143 if (my $item = $self->{item}{$group}) {
3144 if ($item->{text} eq $text) {
3145 $item->{count}++;
3146 } else {
3147 $item->{count} = 1;
3148 $item->{text} = $item->{tooltip} = $text;
3149 }
3150 $item->{id} = ++$self->{id};
3151 $item->{timeout} = $timeout;
3152 delete $item->{label};
3153 } else {
3154 $self->{item}{$group} = {
3155 id => ++$self->{id},
3156 text => $text,
3157 timeout => $timeout,
3158 tooltip => $text,
3159 fg => [0.8, 0.8, 0.8, 0.8],
3160 pri => 0,
3161 count => 1,
3162 %arg,
3163 };
3164 }
3165
3166 $self->reorder;
3167}
3168
3169sub reconfigure {
3170 my ($self) = @_;
3171
3172 delete $_->{label}
3173 for values %{ $self->{item} || {} };
3174
3175 $self->reorder;
3176 $self->SUPER::reconfigure;
3177}
3178
3179#############################################################################
3180
3181package CFClient::UI::Inventory;
3182
3183our @ISA = CFClient::UI::ScrolledWindow::;
3184
3185sub new {
3186 my $class = shift;
3187
3188 my $self = $class->SUPER::new (
3189 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3190 @_,
3191 );
3192
3193 $self
3194}
3195
3196sub set_items {
3197 my ($self, $items) = @_;
3198
3199 $self->{child}->clear;
3200 return unless $items;
3201
3202 my @items = sort {
3203 ($a->{type} <=> $b->{type})
3204 or ($a->{name} cmp $b->{name})
3205 } @$items;
3206
3207 $self->{real_items} = \@items;
3208
3209 my $row = 0;
3210 for my $item (@items) {
3211 CFClient::Item::update_widgets $item;
3212
3213 $self->{child}->add (0, $row, $item->{face_widget});
3214 $self->{child}->add (1, $row, $item->{desc_widget});
3215 $self->{child}->add (2, $row, $item->{weight_widget});
3216
3217 $row++;
3218 }
3219}
3220
3221#############################################################################
3222
3223package CFClient::UI::BindEditor;
3224
3225our @ISA = CFClient::UI::FancyFrame::;
3226
3227sub new {
3228 my $class = shift;
3229
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232 $self->add (my $vb = new CFClient::UI::VBox);
3233
3234
3235 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3236 text => "start recording",
3237 tooltip => "Start/Stops recording of actions."
3238 ."All subsequent actions after the recording started will be captured."
3239 ."The actions are displayed after the record was stopped."
3240 ."To bind the action you have to click on the 'Bind' button",
3241 on_activate => sub {
3242 unless ($self->{recording}) {
3243 $self->start;
3244 } else {
3245 $self->stop;
3246 }
3247 });
3248
3249 $vb->add (new CFClient::UI::Label text => "Actions:");
3250 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3251
3252 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3253 $vb->add (my $hb = new CFClient::UI::HBox);
3254 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3255 $hb->add (new CFClient::UI::Button
3256 text => "bind",
3257 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3258 on_activate => sub {
3259 $self->ask_for_bind;
3260 });
3261
3262 $vb->add (my $hb = new CFClient::UI::HBox);
3263 $hb->add (new CFClient::UI::Button
3264 text => "ok",
3265 expand => 1,
3266 tooltip => "This closes the binding editor and saves the binding",
3267 on_activate => sub {
3268 $self->hide;
3269 $self->commit;
3270 });
3271
3272 $hb->add (new CFClient::UI::Button
3273 text => "cancel",
3274 expand => 1,
3275 tooltip => "This closes the binding editor without saving",
3276 on_activate => sub {
3277 $self->hide;
3278 $self->{binding_cancel}->()
3279 if $self->{binding_cancel};
3280 });
3281
3282 $self->update_binding_widgets;
3283
3284 $self
3285}
3286
3287sub commit {
3288 my ($self) = @_;
3289 my ($mod, $sym, $cmds) = $self->get_binding;
3290 if ($sym != 0 && @$cmds > 0) {
3291 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3292 ."'. Don't forget 'Save Config'!");
3293 $self->{binding_change}->($mod, $sym, $cmds)
3294 if $self->{binding_change};
3295 } else {
3296 $::STATUSBOX->add ("No action bound, no key or action specified!");
3297 $self->{binding_cancel}->()
3298 if $self->{binding_cancel};
3299 }
3300}
3301
3302sub start {
3303 my ($self) = @_;
3304
3305 $self->{rec_btn}->set_text ("stop recording");
3306 $self->{recording} = 1;
3307 $self->clear_command_list;
3308 $::CONN->start_record if $::CONN;
3309}
3310
3311sub stop {
3312 my ($self) = @_;
3313
3314 $self->{rec_btn}->set_text ("start recording");
3315 $self->{recording} = 0;
3316
3317 my $rec;
3318 $rec = $::CONN->stop_record if $::CONN;
3319 return unless ref $rec eq 'ARRAY';
3320 $self->set_command_list ($rec);
3321}
3322
3323
3324sub ask_for_bind_and_commit {
3325 my ($self) = @_;
3326 $self->ask_for_bind (1);
3327}
3328
3329sub ask_for_bind {
3330 my ($self, $commit) = @_;
3331
3332 CFClient::Binder::open_binding_dialog (sub {
3333 my ($mod, $sym) = @_;
3334 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3335 $self->update_binding_widgets;
3336 $self->commit if $commit;
3337 });
3338}
3339
3340# $mod and $sym are the modifiers and key symbol
3341# $cmds is a array ref of strings (the commands)
3342# $cb is the callback that is executed on OK
3343# $ccb is the callback that is executed on CANCEL and
3344# when the binding was unsuccessful on OK
3345sub set_binding {
3346 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3347
3348 $self->clear_command_list;
3349 $self->{recording} = 0;
3350 $self->{rec_btn}->set_text ("start recording");
3351
3352 $self->{binding} = [$mod, $sym];
3353 $self->{commands} = $cmds;
3354
3355 $self->{binding_change} = $cb;
3356 $self->{binding_cancel} = $ccb;
3357
3358 $self->update_binding_widgets;
3359}
3360
3361# this is a shortcut method that asks for a binding
3362# and then just binds it.
3363sub do_quick_binding {
3364 my ($self, $cmds) = @_;
3365 $self->set_binding (undef, undef, $cmds, sub {
3366 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3367 });
3368 $self->ask_for_bind (1);
3369}
3370
3371sub update_binding_widgets {
3372 my ($self) = @_;
3373 my ($mod, $sym, $cmds) = $self->get_binding;
3374 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3375 $self->set_command_list ($cmds);
3376}
3377
3378sub get_binding {
3379 my ($self) = @_;
3380 return (
3381 $self->{binding}->[0],
3382 $self->{binding}->[1],
3383 [ grep { defined $_ } @{$self->{commands}} ]
3384 );
3385}
3386
3387sub clear_command_list {
3388 my ($self) = @_;
3389 $self->{cmdbox}->clear ();
3390}
3391
3392sub set_command_list {
3393 my ($self, $cmds) = @_;
3394
3395 $self->{cmdbox}->clear ();
3396 $self->{commands} = $cmds;
3397
3398 my $idx = 0;
3399
3400 for (@$cmds) {
3401 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3402
3403 my $i = $idx;
3404 $hb->add (new CFClient::UI::Label text => $_);
3405 $hb->add (new CFClient::UI::Button
3406 text => "delete",
3407 tooltip => "Deletes the action from the record",
3408 on_activate => sub {
3409 $self->{cmdbox}->remove ($hb);
3410 $cmds->[$i] = undef;
3411 });
3412
3413
3414 $idx++
3415 }
3416}
3417
3418#############################################################################
3419
3420package CFClient::UI::SpellList;
3421
3422our @ISA = CFClient::UI::Table::;
3423
3424sub new {
3425 my $class = shift;
3426
3427 my $self = $class->SUPER::new (
3428 binding => [],
3429 commands => [],
3430 @_,
3431 )
3432}
3433
3434# XXX: Do sorting? Argl...
3435sub add_spell {
3436 my ($self, $spell) = @_;
3437 $self->{spells}->{$spell->{name}} = $spell;
3438
3439 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3440 face => $spell->{face},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message});
3444
3445 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3446 text => $spell->{name},
3447 can_hover => 1,
3448 can_events => 1,
3449 tooltip => $spell->{message},
3450 expand => 1);
3451
3452 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3453 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3454 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3455 expand => 1);
3456
3457 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3458 text => "bind to key",
3459 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3460}
3461
3462sub rebuild_spell_list {
3463 my ($self) = @_;
3464 $self->{tbl_idx} = 0;
3465 $self->add_spell ($_) for values %{$self->{spells}};
3466}
3467
3468sub remove_spell {
3469 my ($self, $spell) = @_;
3470 delete $self->{spells}->{$spell->{name}};
3471 $self->rebuild_spell_list;
3472}
3473
3474#############################################################################
3475
2499package CFClient::UI::Root; 3476package CFClient::UI::Root;
2500 3477
2501our @ISA = CFClient::UI::Container::; 3478our @ISA = CFClient::UI::Container::;
2502 3479
2503use CFClient::OpenGL; 3480use CFClient::OpenGL;
2504 3481
2505sub check_size { 3482sub new {
2506 my ($self) = @_; 3483 my $class = shift;
2507 3484
2508 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3485 my $self = $class->SUPER::new (
3486 visible => 1,
3487 @_,
3488 );
3489
3490 Scalar::Util::weaken ($self->{root} = $self);
3491
3492 $self
2509} 3493}
2510 3494
2511sub size_request { 3495sub size_request {
2512 ($::WIDTH, $::HEIGHT) 3496 my ($self) = @_;
2513}
2514 3497
2515sub configure { 3498 ($self->{w}, $self->{h})
3499}
3500
3501sub _to_pixel {
3502 my ($coord, $size, $max) = @_;
3503
3504 $coord =
3505 $coord eq "center" ? ($max - $size) * 0.5
3506 : $coord eq "max" ? $max
3507 : $coord;
3508
3509 $coord = 0 if $coord < 0;
3510 $coord = $max - $size if $coord > $max - $size;
3511
3512 int $coord + 0.5
3513}
3514
3515sub size_allocate {
2516 my ($self, $x, $y, $w, $h) = @_; 3516 my ($self, $w, $h) = @_;
2517 3517
2518 $self->SUPER::configure ($x, $y, $w, $h);
2519
2520 for my $child (@{$self->{children}}) { 3518 for my $child ($self->children) {
2521 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3519 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2522 3520
2523 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3521 $X = $child->{force_x} if exists $child->{force_x};
2524 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3522 $Y = $child->{force_y} if exists $child->{force_y};
3523
3524 $X = _to_pixel $X, $W, $self->{w};
3525 $Y = _to_pixel $Y, $H, $self->{h};
3526
2525 $child->configure ($X, $Y, $W,$H); 3527 $child->configure ($X, $Y, $W, $H);
2526 } 3528 }
2527} 3529}
2528 3530
2529sub _topleft { 3531sub coord2local {
2530 my ($self, $x, $y) = @_; 3532 my ($self, $x, $y) = @_;
2531 3533
2532 ($x, $y) 3534 ($x, $y)
2533} 3535}
2534 3536
3537sub coord2global {
3538 my ($self, $x, $y) = @_;
3539
3540 ($x, $y)
3541}
3542
2535sub update { 3543sub update {
2536 my ($self) = @_; 3544 my ($self) = @_;
2537 3545
2538 $self->check_size; 3546 $::WANT_REFRESH++;
2539 ::refresh ();
2540} 3547}
2541 3548
2542sub add { 3549sub add {
2543 my ($self, $child) = @_; 3550 my ($self, @children) = @_;
2544 3551
2545 # integerize window positions 3552 $_->{is_toplevel} = 1
2546 $child->{x} = int $child->{x}; 3553 for @children;
2547 $child->{y} = int $child->{y};
2548 3554
2549 $self->SUPER::add ($child); 3555 $self->SUPER::add (@children);
3556}
3557
3558sub remove {
3559 my ($self, @children) = @_;
3560
3561 $self->SUPER::remove (@children);
3562
3563 delete $self->{is_toplevel}
3564 for @children;
3565
3566 while (@children) {
3567 my $w = pop @children;
3568 push @children, $w->children;
3569 $w->set_invisible;
3570 }
2550} 3571}
2551 3572
2552sub on_refresh { 3573sub on_refresh {
2553 my ($self, $id, $cb) = @_; 3574 my ($self, $id, $cb) = @_;
2554 3575
2555 $self->{refresh_hook}{$id} = $cb; 3576 $self->{refresh_hook}{$id} = $cb;
2556} 3577}
2557 3578
3579sub on_post_alloc {
3580 my ($self, $id, $cb) = @_;
3581
3582 $self->{post_alloc_hook}{$id} = $cb;
3583}
3584
2558sub draw { 3585sub draw {
2559 my ($self) = @_; 3586 my ($self) = @_;
2560 3587
2561 while (my $rcb = delete $self->{refresh_hook}) { 3588 while ($self->{refresh_hook}) {
2562 $_->() for values %$rcb; 3589 $_->()
3590 for values %{delete $self->{refresh_hook}};
2563 } 3591 }
3592
3593 if ($self->{realloc}) {
3594 my %queue;
3595 my @queue;
3596 my $widget;
3597
3598 outer:
3599 while () {
3600 if (my $realloc = delete $self->{realloc}) {
3601 for $widget (values %$realloc) {
3602 $widget->{visible} or next; # do not resize invisible widgets
3603
3604 $queue{$widget+0}++ and next; # duplicates are common
3605
3606 push @{ $queue[$widget->{visible}] }, $widget;
3607 }
3608 }
3609
3610 while () {
3611 @queue or last outer;
3612
3613 $widget = pop @{ $queue[-1] || [] }
3614 and last;
3615
3616 pop @queue;
3617 }
3618
3619 delete $queue{$widget+0};
3620
3621 my ($w, $h) = $widget->size_request;
3622
3623 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3624 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3625
3626 $w = $widget->{force_w} if exists $widget->{force_w};
3627 $h = $widget->{force_h} if exists $widget->{force_h};
3628
3629 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3630 || delete $widget->{force_realloc}) {
3631 $widget->{req_w} = $w;
3632 $widget->{req_h} = $h;
3633
3634 $self->{size_alloc}{$widget+0} = $widget;
3635
3636 if (my $parent = $widget->{parent}) {
3637 $self->{realloc}{$parent+0} = $parent
3638 unless $queue{$parent+0};
3639
3640 $parent->{force_size_alloc} = 1;
3641 $self->{size_alloc}{$parent+0} = $parent;
3642 }
3643 }
3644
3645 delete $self->{realloc}{$widget+0};
3646 }
3647 }
3648
3649 while (my $size_alloc = delete $self->{size_alloc}) {
3650 my @queue = sort { $b->{visible} <=> $a->{visible} }
3651 values %$size_alloc;
3652
3653 while () {
3654 my $widget = pop @queue || last;
3655
3656 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3657
3658 $w = 0 if $w < 0;
3659 $h = 0 if $h < 0;
3660
3661 $w = int $w + 0.5;
3662 $h = int $h + 0.5;
3663
3664 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3665 $widget->{old_w} = $widget->{w};
3666 $widget->{old_h} = $widget->{h};
3667
3668 $widget->{w} = $w;
3669 $widget->{h} = $h;
3670
3671 $widget->emit (size_allocate => $w, $h);
3672 }
3673 }
3674 }
3675
3676 while ($self->{post_alloc_hook}) {
3677 $_->()
3678 for values %{delete $self->{post_alloc_hook}};
3679 }
3680
2564 3681
2565 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3682 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2566 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3683 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2567 glClear GL_COLOR_BUFFER_BIT; 3684 glClear GL_COLOR_BUFFER_BIT;
2568 3685
2569 glMatrixMode GL_PROJECTION; 3686 glMatrixMode GL_PROJECTION;
2570 glLoadIdentity; 3687 glLoadIdentity;
2571 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3688 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2572 glMatrixMode GL_MODELVIEW; 3689 glMatrixMode GL_MODELVIEW;
2573 glLoadIdentity; 3690 glLoadIdentity;
2574 3691
3692 {
3693 package CFClient::UI::Base;
3694
3695 ($draw_x, $draw_y, $draw_w, $draw_h) =
3696 (0, 0, $self->{w}, $self->{h});
3697 }
3698
2575 $self->_draw; 3699 $self->_draw;
2576} 3700}
2577 3701
2578############################################################################# 3702#############################################################################
2579 3703
2580package CFClient::UI::Inventory;
2581
2582our @ISA = CFClient::UI::Container::;
2583
2584use CFClient::OpenGL;
2585
2586sub new {
2587 my $class = shift;
2588
2589 my $self = $class->SUPER::new (@_);
2590
2591 $self
2592}
2593
2594sub size_allocate {
2595 my ($self, $w, $h) = @_;
2596
2597 $self->{w} = $w;
2598 $self->{h} = $h;
2599
2600 $self->check_size;
2601}
2602
2603sub set_items {
2604 my ($self, $items) = @_;
2605 my @items = values %{$items};
2606 @items = sort { $a->{type} <=> $b->{type} } @items;
2607
2608 $self->{real_items} = \@items;
2609
2610 for my $item (@items) {
2611 my $desc = $item->{nrof} < 2
2612 ? $item->{name}
2613 : "$item->{nrof} $item->{name_pl}";
2614
2615 $self->add (my $hb = new CFClient::UI::HBox);
2616
2617 $hb->add (my $f = new CFClient::UI::Face
2618 can_events => 0,
2619 face => $item->{face},
2620 anim => $item->{anim},
2621 animspeed => $item->{animspeed},
2622 expand => 1
2623 );
2624 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2625 }
2626
2627 $self->{max_pos} = (scalar @items) - 1;
2628
2629 my $range = $self->{range};
2630 my $page = $self->{h} / 32; # waht information souce to use for face size?
2631 # it should be configurable i guess...
2632 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633 $range->update;
2634}
2635
2636sub size_request {
2637 my ($self) = @_;
2638 (100, 200)
2639}
2640
2641sub set_range {
2642 my ($self, $range) = @_;
2643
2644 $self->{range} = $range;
2645 $range->connect (changed => sub { $self->update });
2646
2647 my $page = $self->{h} / 32; # waht information souce to use for face size?
2648 # it should be configurable i guess...
2649
2650 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2651 $range->update;
2652
2653 $self->update;
2654}
2655
2656sub _draw {
2657 my ($self) = @_;
2658
2659 my ($w, $h) = ($self->{w}, $self->{h});
2660
2661 $self->{pos} = int $self->{range}{range}[0];
2662
2663 my $y = 0;
2664 my $cnt = 0;
2665 my $hrem = $self->{h}; # horiz. remaining space
2666
2667 for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) {
2668 my $chld = $self->{children}->[$i];
2669
2670 if ($hrem >= $chld->{h}) {
2671 $chld->configure (0, $y, $chld->{w}, $chld->{h});
2672
2673 $chld->show;
2674 $chld->draw;
2675
2676 $hrem -= $chld->{h};
2677 $y += $chld->{h};
2678 } else {
2679 last
2680 }
2681 }
2682}
2683
2684
2685#############################################################################
2686
2687package CFClient::UI; 3704package CFClient::UI;
2688 3705
2689$ROOT = new CFClient::UI::Root; 3706$ROOT = new CFClient::UI::Root;
2690$TOOLTIP = new CFClient::UI::Tooltip; 3707$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2691 3708
26921 37091
2693 3710

Diff Legend

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