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.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.284 by root, Mon Jun 5 03:06:04 2006 UTC

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

Diff Legend

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