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.184 by root, Wed May 3 19:56:05 2006 UTC vs.
Revision 1.276 by root, Sun Jun 4 00:16:01 2006 UTC

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

Diff Legend

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