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.190 by root, Mon May 8 22:17:38 2006 UTC vs.
Revision 1.277 by root, Sun Jun 4 00:21:52 2006 UTC

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

Diff Legend

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