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.212 by elmex, Wed May 17 14:55:14 2006 UTC vs.
Revision 1.288 by root, Mon Jun 5 21:14:40 2006 UTC

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

Diff Legend

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