ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.196 by root, Fri May 12 00:16:34 2006 UTC vs.
Revision 1.298 by root, Wed Jun 7 07:00:30 2006 UTC

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

Diff Legend

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