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

Diff Legend

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