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

Diff Legend

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