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

Diff Legend

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