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.167 by elmex, Mon Apr 24 08:44:23 2006 UTC vs.
Revision 1.378 by root, Mon Jul 16 20:22:39 2007 UTC

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

Diff Legend

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