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.196 by root, Fri May 12 00:16:34 2006 UTC vs.
Revision 1.282 by root, Mon Jun 5 02:25:10 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines