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

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

Diff Legend

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