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.173 by root, Tue Apr 25 10:30:48 2006 UTC vs.
Revision 1.380 by root, Tue Jul 17 17:39:07 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}
236
237sub size_allocate {
238 # nothing to be done
239} 403}
240 404
241sub children { 405sub children {
406 # nop
242} 407}
243 408
244# call when resoltuion changes etc. 409sub visible_children {
245sub reconfigure { 410 $_[0]->children
246 my ($self) = @_;
247
248 $_->reconfigure
249 for $self->children;
250
251 $_->check_size;
252} 411}
253 412
254sub set_max_size { 413sub set_max_size {
255 my ($self, $w, $h) = @_; 414 my ($self, $w, $h) = @_;
256 415
257 delete $self->{max_w}; $self->{max_w} = $w if $w; 416 $self->{max_w} = int $w if defined $w;
258 delete $self->{max_h}; $self->{max_h} = $h if $h; 417 $self->{max_h} = int $h if defined $h;
259}
260 418
261# return top left coordinates 419 $self->realloc;
262sub _topleft { 420}
421
422sub set_tooltip {
263 my ($self, $x, $y) = @_; 423 my ($self, $tooltip) = @_;
264 424
265 $self->{parent} 425 $tooltip =~ s/^\s+//;
266 or Carp::confess "no parent widget in _topleft\n";#d# 426 $tooltip =~ s/\s+$//;
267 427
268 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 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 }
269} 436}
270 437
271# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
272sub coord2local { 439sub coord2local {
273 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
274 441
275 my ($X, $Y) = $self->_topleft; 442 Carp::confess unless $self->{parent};#d#
276 ($x - $X, $y - $Y) 443
444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
277} 445}
278 446
279# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
280sub coord2global { 448sub coord2global {
281 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
282 450
283 my ($X, $Y) = $self->_topleft; 451 Carp::confess unless $self->{parent};#d#
284 ($x + $X, $y + $Y)
285}
286 452
453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
454}
455
287sub focus_in { 456sub invoke_focus_in {
288 my ($self) = @_; 457 my ($self) = @_;
289 458
290 return if $FOCUS == $self; 459 return if $FOCUS == $self;
291 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
292 461
293 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
294 463
295 $self->emit (focus_in => $focus); 464 $self->update;
296 465
297 $focus->update if $focus; 466 0
298 $FOCUS->update;
299} 467}
300 468
301sub focus_out { 469sub invoke_focus_out {
302 my ($self) = @_; 470 my ($self) = @_;
303 471
304 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
305 473
306 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
307 475
308 $self->emit (focus_out => $focus); 476 $self->update;
309 477
310 $focus->update if $focus; #? 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
311} 479 unless $FOCUS;
312 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
313sub mouse_motion { } 491sub invoke_mouse_motion { 0 }
314sub button_up { } 492sub invoke_button_up { 0 }
315sub key_down { } 493sub invoke_key_down { 0 }
316sub key_up { } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
317 496
318sub button_down { 497sub invoke_button_down {
319 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
320 499
321 $self->focus_in; 500 $self->grab_focus;
322}
323 501
324sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 502 0
325sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 503}
326sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 504
327sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 505sub connect {
328sub 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
329 602
330sub draw { 603sub draw {
331 my ($self) = @_; 604 my ($self) = @_;
332 605
333 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);
334 615
335 glPushMatrix; 616 glPushMatrix;
336 glTranslate $self->{x}, $self->{y}, 0; 617 glTranslate $self->{x}, $self->{y}, 0;
337 $self->_draw;
338 glPopMatrix;
339 618
340 if ($self == $HOVER && $self->{can_hover}) { 619 if ($self == $HOVER && $self->{can_hover}) {
341 my ($x, $y) = @$self{qw(x y)};
342
343 glColor 1, 0.8, 0.5, 0.2; 620 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
344 glEnable GL_BLEND; 621 glEnable GL_BLEND;
345 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
346 glBegin GL_QUADS; 623 glBegin GL_QUADS;
347 glVertex $x , $y;
348 glVertex $x + $self->{w}, $y;
349 glVertex $x + $self->{w}, $y + $self->{h};
350 glVertex $x , $y + $self->{h};
351 glEnd;
352 glDisable GL_BLEND;
353 }
354
355 if ($ENV{PCLIENT_DEBUG}) {
356 glPushMatrix;
357 glColor 1, 1, 0, 1;
358 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
359 glBegin GL_LINE_LOOP;
360 glVertex 0 , 0; 624 glVertex 0 , 0;
361 glVertex $self->{w}, 0; 625 glVertex $self->{w}, 0;
362 glVertex $self->{w}, $self->{h}; 626 glVertex $self->{w}, $self->{h};
363 glVertex 0 , $self->{h}; 627 glVertex 0 , $self->{h};
364 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;
365 glPopMatrix; 642 glPopMatrix;
366 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;
367 } 644 }
645
646 $self->_draw;
647 glPopMatrix;
368} 648}
369 649
370sub _draw { 650sub _draw {
371 my ($self) = @_; 651 my ($self) = @_;
372 652
373 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
374} 654}
375 655
376sub find_widget { 656my $cntx;#d#
377 my ($self, $x, $y) = @_;
378
379 return () unless $self->{can_events};
380
381 return $self
382 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
383 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
384
385 ()
386}
387
388sub set_parent {
389 my ($self, $parent) = @_;
390
391 Scalar::Util::weaken ($self->{parent} = $parent);
392}
393
394sub check_size {
395 my ($self) = @_;
396
397 $self->{parent}
398 or return 1;
399
400 my ($w, $h) = $self->{user_w} && $self->{user_h}
401 ? @$self{qw(user_w user_h)}
402 : $self->size_request;
403
404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
405 $self->{req_w} = $w;
406 $self->{req_h} = $h;
407
408 $self->{parent}->check_size
409 or $self->size_allocate (
410 (List::Util::max $self->{w}, $w),
411 (List::Util::max $self->{h}, $h),
412 );
413
414 1
415 } else {
416 0
417 }
418}
419
420sub update {
421 my ($self) = @_;
422
423 $self->{parent}->update
424 if $self->{parent};
425}
426
427sub connect {
428 my ($self, $signal, $cb) = @_;
429
430 push @{ $self->{signal_cb}{$signal} }, $cb;
431}
432
433sub emit {
434 my ($self, $signal, @args) = @_;
435
436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
437}
438
439sub DESTROY { 657sub DESTROY {
440 my ($self) = @_; 658 my ($self) = @_;
441 659
442 #$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};
443} 666}
444 667
445############################################################################# 668#############################################################################
446 669
447package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
448 671
449our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
450 673
451use strict; 674use strict;
452use CFClient::OpenGL; 675use CFPlus::OpenGL;
453 676
454sub new { 677sub new {
455 my $class = shift; 678 my $class = shift;
456 679
457 # range [value, low, high, page] 680 # range [value, low, high, page]
458 681
459 $class->SUPER::new ( 682 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 683 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 684 #active_bg => [1, 1, 1, 0.5],
462 @_ 685 @_
463 ) 686 )
464} 687}
465 688
466sub _draw { 689sub _draw {
467 my ($self) = @_; 690 my ($self) = @_;
468 691
692 my $color = $FOCUS == $self && $self->{active_bg}
693 ? $self->{active_bg}
694 : $self->{bg};
695
696 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 697 my ($w, $h) = @$self{qw(w h)};
470 698
471 glEnable GL_BLEND; 699 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 701 glColor_premultiply @$color;
474 702
475 glBegin GL_QUADS; 703 glBegin GL_QUADS;
476 glVertex 0 , 0; 704 glVertex 0 , 0;
477 glVertex 0 , $h; 705 glVertex 0 , $h;
478 glVertex $w, $h; 706 glVertex $w, $h;
479 glVertex $w, 0; 707 glVertex $w, 0;
480 glEnd; 708 glEnd;
481 709
482 glDisable GL_BLEND; 710 glDisable GL_BLEND;
711 }
483} 712}
484 713
485############################################################################# 714#############################################################################
486 715
487package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
488 717
489our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
490 719
491sub new { 720sub new {
492 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
493 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
494} 723}
495 724
496sub size_request { 725sub size_request {
497 (0, 0) 726 my ($self) = @_;
727
728 ($self->{w} + 0, $self->{h} + 0)
498} 729}
499 730
500sub draw { } 731sub draw { }
501 732
502############################################################################# 733#############################################################################
503 734
504package CFClient::UI::Container; 735package CFPlus::UI::Container;
505 736
506our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
507 738
508sub new { 739sub new {
509 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
510 741
511 my $children = delete $arg{children} || []; 742 my $children = delete $arg{children};
512 743
513 my $self = $class->SUPER::new ( 744 my $self = $class->SUPER::new (
514 children => [], 745 children => [],
515 can_events => 0, 746 can_events => 0,
516 %arg, 747 %arg,
517 ); 748 );
749
518 $self->add ($_) for @$children; 750 $self->add (@$children)
751 if $children;
519 752
520 $self 753 $self
521} 754}
522 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
523sub add { 764sub add {
524 my ($self, $child) = @_; 765 my ($self, @widgets) = @_;
525 766
526 $child->set_parent ($self); 767 $_->set_parent ($self)
768 for @widgets;
527 769
528 use sort 'stable'; 770 use sort 'stable';
529 771
530 $self->{children} = [ 772 $self->{children} = [
531 sort { $a->{z} <=> $b->{z} } 773 sort { $a->{z} <=> $b->{z} }
532 @{$self->{children}}, $child 774 @{$self->{children}}, @widgets
533 ]; 775 ];
534 776
535 $child->check_size; 777 $self->realloc;
536} 778}
537 779
538sub children { 780sub children {
539 @{ $_[0]{children} } 781 @{ $_[0]{children} }
540} 782}
… …
545 delete $child->{parent}; 787 delete $child->{parent};
546 $child->hide; 788 $child->hide;
547 789
548 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
549 791
550 $self->check_size; 792 $self->realloc;
551 $self->update;
552} 793}
553 794
554sub clear { 795sub clear {
555 my ($self) = @_; 796 my ($self) = @_;
556 797
… …
559 800
560 for (@$children) { 801 for (@$children) {
561 delete $_->{parent}; 802 delete $_->{parent};
562 $_->hide; 803 $_->hide;
563 } 804 }
805
806 $self->realloc;
564} 807}
565 808
566sub find_widget { 809sub find_widget {
567 my ($self, $x, $y) = @_; 810 my ($self, $x, $y) = @_;
568 811
569 $x -= $self->{x}; 812 $x -= $self->{x};
570 $y -= $self->{y}; 813 $y -= $self->{y};
571 814
572 my $res; 815 my $res;
573 816
574 for (reverse @{ $self->{children} }) { 817 for (reverse $self->visible_children) {
575 $res = $_->find_widget ($x, $y) 818 $res = $_->find_widget ($x, $y)
576 and return $res; 819 and return $res;
577 } 820 }
578 821
579 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 822 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
585 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
586} 829}
587 830
588############################################################################# 831#############################################################################
589 832
590package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
591 834
592our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
593 836
594sub new { 837sub new {
595 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
596 839
597 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
598 841
599 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
600} 843}
601 844
602sub add { 845sub add {
603 my ($self, $child) = @_; 846 my ($self, $child) = @_;
604 847
605 $self->{children} = []; 848 $self->SUPER::remove ($_) for @{ $self->{children} };
606
607 $self->SUPER::add ($child); 849 $self->SUPER::add ($child);
608} 850}
609 851
610sub remove { 852sub remove {
611 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
612 854
613 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
614 856
615 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
616 unless @{$self->{children}}; 858 unless @{$self->{children}};
617} 859}
618 860
619sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
620 862
621sub size_request { 863sub size_request {
622 $_[0]{children}[0]->size_request 864 $_[0]{children}[0]->size_request
623} 865}
624 866
625sub size_allocate { 867sub invoke_size_allocate {
626 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
627 869
628 $self->{children}[0]->configure (0, 0, $w, $h); 870 $self->{children}[0]->configure (0, 0, $w, $h);
871
872 1
629} 873}
630 874
631############################################################################# 875#############################################################################
632 876
877# back-buffered drawing area
878
633package CFClient::UI::Window; 879package CFPlus::UI::Window;
634 880
635our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
636 882
637use CFClient::OpenGL; 883use CFPlus::OpenGL;
638 884
639sub new { 885sub new {
640 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
641 887
642 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
643} 889}
644 890
645sub update { 891sub update {
646 my ($self) = @_; 892 my ($self) = @_;
647 893
648 # we want to do this delayed... 894 $ROOT->on_post_alloc ($self => sub { $self->render_child });
649 $self->render_chld;
650 $self->SUPER::update; 895 $self->SUPER::update;
651} 896}
652 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
653sub render_chld { 912sub render_child {
654 my ($self) = @_; 913 my ($self) = @_;
655 914
656 $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 {
657 glClearColor 0, 0, 0, 1; 916 glClearColor 0, 0, 0, 0;
658 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
659 $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 }
660 }; 927 };
661} 928}
662 929
663sub size_allocate {
664 my ($self, $w, $h) = @_;
665
666 $self->child->configure (0, 0, $w, $h);
667
668 $self->render_chld;
669}
670
671sub _draw { 930sub _draw {
672 my ($self) = @_; 931 my ($self) = @_;
673
674 my ($w, $h) = ($self->w, $self->h);
675 932
676 my $tex = $self->{texture} 933 my $tex = $self->{texture}
677 or return; 934 or return;
678 935
679 glEnable GL_BLEND;
680 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
681 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
682 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;
683 939
684 $tex->draw_quad (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
685 941
686 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
688} 943}
689 944
690############################################################################# 945#############################################################################
691 946
692package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
693 948
949use List::Util qw(min max);
950
694our @ISA = CFClient::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
695
696sub new { die }
697
698sub size_request {
699 my ($self) = @_;
700
701 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
702 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
703
704 @$self{qw(child_w child_h)}
705}
706
707sub _draw {
708 my ($self) = @_;
709
710 $self->{children}[1]->draw;
711}
712
713
714#############################################################################
715
716package CFClient::UI::Frame;
717
718our @ISA = CFClient::UI::Bin::;
719
720use CFClient::OpenGL;
721 952
722sub new { 953sub new {
723 my $class = shift; 954 my $class = shift;
724 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
725 my $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
726 bg => [1, 1, 1, 1], 1074 scroll_x => 0,
727 border_bg => [1, 1, 1, 1], 1075 scroll_y => 1,
728 border => 0.8, 1076 can_events => 1,
729 @_ 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1081 %arg,
730 ); 1082 );
731 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
732 $self 1102 $self
733} 1103}
734 1104
735sub _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 {
736 my ($self) = @_; 1145 my ($self, $ev) = @_;
737 1146
738 my ($w, $h) = ($self->{w}, $self->{h}); 1147 return 0 unless $ev->{dy}; # only vertical movements for now
739 1148
740 glEnable GL_BLEND; 1149 $self->{vslider}->emit (mouse_wheel => $ev);
741 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
742 glEnable GL_TEXTURE_2D;
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744 1150
745# glBegin GL_QUADS; 1151 1
746# glColor 0, 0, 0, 0; 1152}
747# glVertex 0 , 0;
748# glVertex 0 , $h;
749# glVertex $w, $h;
750# glVertex $w, 0;
751# glEnd;
752 1153
1154sub invoke_button_down {
1155 my ($self, $ev, $x, $y) = @_;
753 1156
754 $self->child->draw; 1157 if ($ev->{button} == 2) {
755 glDisable GL_BLEND; 1158 $self->grab_focus;
756 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)
757} 1202}
758 1203
759############################################################################# 1204#############################################################################
760 1205
761package CFClient::UI::FancyFrame; 1206package CFPlus::UI::Frame;
762 1207
763our @ISA = CFClient::UI::Bin::; 1208our @ISA = CFPlus::UI::Bin::;
764 1209
765use CFClient::OpenGL; 1210use CFPlus::OpenGL;
766
767my @tex =
768 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
769 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
770 1211
771sub new { 1212sub new {
772 my $class = shift; 1213 my $class = shift;
773 1214
774 # 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 }
775 1262
776 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1264 # label => "",
777 bg => [1, 1, 1, 1], 1265 fg => [0.6, 0.3, 0.1],
778 border_bg => [1, 1, 1, 1],
779 border => 0.8, 1266 border => 0.8,
780 can_events => 1, 1267 style => 'single',
781 @_ 1268 %arg,
782 ); 1269 );
783 1270
784 $self->{title} &&= new CFClient::UI::Label
785 align => 0,
786 valign => 1,
787 text => $self->{title},
788 fontsize => 1;
789
790 $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};
791} 1279}
792 1280
793sub border { 1281sub border {
794 int $_[0]{border} * $::FONTSIZE 1282 int $_[0]{border} * $::FONTSIZE
795} 1283}
796 1284
797sub size_request { 1285sub size_request {
798 my ($self) = @_; 1286 my ($self) = @_;
1287
1288 ($self->{label_w}, undef) = $self->{label}->size_request
1289 if $self->{label};
799 1290
800 my ($w, $h) = $self->SUPER::size_request; 1291 my ($w, $h) = $self->SUPER::size_request;
801 1292
802 ( 1293 (
803 $w + $self->border * 2, 1294 $w + $self->border * 2,
804 $h + $self->border * 2, 1295 $h + $self->border * 2,
805 ) 1296 )
806} 1297}
807 1298
808sub size_allocate { 1299sub invoke_size_allocate {
809 my ($self, $w, $h) = @_; 1300 my ($self, $w, $h) = @_;
810 1301
811 $h -= List::Util::max 0, $self->border * 2; 1302 my $border = $self->border;
1303
812 $w -= List::Util::max 0, $self->border * 2; 1304 $w -= List::Util::max 0, $border * 2;
1305 $h -= List::Util::max 0, $border * 2;
813 1306
814 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1307 if (my $label = $self->{label}) {
815 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 }
816 1312
817 $self->child->configure ($self->border, $self->border, $w, $h); 1313 $self->child->configure ($border, $border, $w, $h);
818}
819 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
820sub button_down { 1451sub invoke_button_down {
821 my ($self, $ev, $x, $y) = @_; 1452 my ($self, $ev, $x, $y) = @_;
822 1453
1454 my ($w, $h) = @$self{qw(w h)};
823 my $border = $self->border; 1455 my $border = $self->border;
824 1456
825 if ($x < $self->{w} && $x >= $self->{w} - $border 1457 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
826 && $y < $self->{h} && $y >= $self->{h} - $border) { 1458 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
827 1459
1460 if ($lr & $td) {
1461 my ($wx, $wy) = ($self->{x}, $self->{y});
828 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1462 my ($ox, $oy) = ($ev->{x}, $ev->{y});
829 my ($bw, $bh) = ($self->{w}, $self->{h}); 1463 my ($bw, $bh) = ($self->{w}, $self->{h});
830 1464
1465 my $mx = $x < $border;
1466 my $my = $y < $border;
1467
831 $self->{motion} = sub { 1468 $self->{motion} = sub {
832 my ($ev, $x, $y) = @_; 1469 my ($ev, $x, $y) = @_;
833 1470
834 ($x, $y) = ($ev->{x}, $ev->{y}); 1471 my $dx = $ev->{x} - $ox;
1472 my $dy = $ev->{y} - $oy;
835 1473
836 $self->{user_w} = $bw + $x - $ox; 1474 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
837 $self->{user_h} = $bh + $y - $oy; 1475 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
838 $self->check_size; 1476
1477 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1478 $self->realloc;
839 }; 1479 };
840 1480
841 } elsif ($x >= 0 && $x < $self->{w} 1481 } elsif ($lr ^ $td) {
842 && $y >= 0 && $y < $border) {
843
844 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1482 my ($ox, $oy) = ($ev->{x}, $ev->{y});
845 my ($bx, $by) = ($self->{x}, $self->{y}); 1483 my ($bx, $by) = ($self->{x}, $self->{y});
846 1484
847 $self->{motion} = sub { 1485 $self->{motion} = sub {
848 my ($ev, $x, $y) = @_; 1486 my ($ev, $x, $y) = @_;
849 1487
850 ($x, $y) = ($ev->{x}, $ev->{y}); 1488 ($x, $y) = ($ev->{x}, $ev->{y});
851 1489
852 $self->move ($bx + $x - $ox, $by + $y - $oy); 1490 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
853 $self->update; 1491 # HACK: the next line is required to enforce placement
1492 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
854 }; 1493 };
1494 } else {
1495 return 0;
1496 }
1497
855 } 1498 1
856} 1499}
857 1500
858sub button_up { 1501sub invoke_button_up {
859 my ($self, $ev, $x, $y) = @_; 1502 my ($self, $ev, $x, $y) = @_;
860 1503
861 delete $self->{motion}; 1504 ! ! delete $self->{motion}
862} 1505}
863 1506
864sub mouse_motion { 1507sub invoke_mouse_motion {
865 my ($self, $ev, $x, $y) = @_; 1508 my ($self, $ev, $x, $y) = @_;
866 1509
867 $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
868} 1521}
869 1522
870sub _draw { 1523sub _draw {
871 my ($self) = @_; 1524 my ($self) = @_;
872 1525
1526 my $child = $self->{children}[0];
1527
873 my ($w, $h ) = ($self->{w}, $self->{h}); 1528 my ($w, $h ) = ($self->{w}, $self->{h});
874 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1529 my ($cw, $ch) = ($child->{w}, $child->{h});
875 1530
876 glEnable GL_BLEND;
877 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
878 glEnable GL_TEXTURE_2D; 1531 glEnable GL_TEXTURE_2D;
879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1532 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
880 1533
881 my $border = $self->border; 1534 my $border = $self->border;
882 1535
883 glColor @{ $self->{border_bg} }; 1536 glColor @{ $self->{border_bg} };
884 $tex[1]->draw_quad (0, 0, $w, $border); 1537 $border[0]->draw_quad_alpha (0, 0, $w, $border);
885 $tex[3]->draw_quad (0, $border, $border, $ch); 1538 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
886 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1539 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
887 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1540 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
888 1541
889 my $bg = $tex[0]; 1542 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1543 glColor @{ $self->{bg} };
890 1544
891 # TODO: repeat texture not scale 1545 # TODO: repeat texture not scale
892 my $rep_x = $cw / $bg->{w}; 1546 # solve this better(?)
893 my $rep_y = $ch / $bg->{h}; 1547 $bg->{s} = $cw / $bg->{w};
894 1548 $bg->{t} = $ch / $bg->{h};
895 glColor @{ $self->{bg} };
896
897 $bg->{s} = $rep_x;
898 $bg->{t} = $rep_y;
899 $bg->{wrap_mode} = 1;
900 $bg->draw_quad ($border, $border, $cw, $ch); 1549 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1550 }
901 1551
902 glDisable GL_TEXTURE_2D; 1552 glDisable GL_TEXTURE_2D;
903 glDisable GL_BLEND;
904 1553
905 $self->{title}->draw if $self->{title};
906 $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};
907} 1565}
908 1566
909############################################################################# 1567#############################################################################
910 1568
911package CFClient::UI::Table; 1569package CFPlus::UI::Table;
912 1570
913our @ISA = CFClient::UI::Base::; 1571our @ISA = CFPlus::UI::Base::;
914 1572
915use List::Util qw(max sum); 1573use List::Util qw(max sum);
916 1574
917use CFClient::OpenGL; 1575use CFPlus::OpenGL;
918 1576
919sub new { 1577sub new {
920 my $class = shift; 1578 my $class = shift;
921 1579
922 $class->SUPER::new ( 1580 $class->SUPER::new (
1581 children => [],
923 col_expand => [], 1582 col_expand => [],
1583 row_expand => [],
924 @_ 1584 @_,
925 ) 1585 )
926}
927
928sub add {
929 my ($self, $x, $y, $child) = @_;
930
931 $child->set_parent ($self);
932 $self->{children}[$y][$x] = $child;
933
934 $child->check_size;
935} 1586}
936 1587
937sub children { 1588sub children {
938 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1589 grep $_, map @$_, grep $_, @{ $_[0]{children} }
939} 1590}
940 1591
1592# TODO: store row/col info in child widget and use standard add/del
1593sub add {
1594 my ($self) = shift;
1595
1596 while (@_) {
1597 my ($x, $y, $child) = splice @_, 0, 3, ();
1598 $child->set_parent ($self);
1599 $self->{children}[$y][$x] = $child;
1600 }
1601
1602 $self->{force_realloc} = 1;
1603 $self->{force_size_alloc} = 1;
1604 $self->realloc;
1605}
1606
1607sub remove {
1608 my ($self, $child) = @_;
1609
1610 for (@{ $self->{children} }) {
1611 for (@{ $_ || [] }) {
1612 $_ = undef if $_ == $child;
1613 }
1614 }
1615}
1616
941# 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?
942sub clear { 1618sub clear {
943 my ($self) = @_; 1619 my ($self) = @_;
944 1620
945 my @children = $self->children; 1621 my @children = $self->children;
946 delete $self->{children}; 1622 delete $self->{children};
… …
948 for (@children) { 1624 for (@children) {
949 delete $_->{parent}; 1625 delete $_->{parent};
950 $_->hide; 1626 $_->hide;
951 } 1627 }
952 1628
953 $self->update; 1629 $self->realloc;
954} 1630}
955 1631
956sub get_wh { 1632sub get_wh {
957 my ($self) = @_; 1633 my ($self) = @_;
958 1634
… …
984 (sum @$ws), 1660 (sum @$ws),
985 (sum @$hs), 1661 (sum @$hs),
986 ) 1662 )
987} 1663}
988 1664
989sub size_allocate { 1665sub invoke_size_allocate {
990 my ($self, $w, $h) = @_; 1666 my ($self, $w, $h) = @_;
991 1667
992 my ($ws, $hs) = $self->get_wh; 1668 my ($ws, $hs) = $self->get_wh;
993 1669
994 my $req_w = sum @$ws; 1670 my $req_w = (sum @$ws) || 1;
995 my $req_h = sum @$hs; 1671 my $req_h = (sum @$hs) || 1;
996 1672
997 # TODO: nicer code && do row_expand 1673 # TODO: nicer code
998 my @col_expand = @{$self->{col_expand}}; 1674 my @col_expand = @{$self->{col_expand}};
999 @col_expand = (1) x @$ws unless @col_expand; 1675 @col_expand = (1) x @$ws unless @col_expand;
1000 my $col_expand = (sum @col_expand) || 1; 1676 my $col_expand = (sum @col_expand) || 1;
1001 1677
1002 # linearly scale sizes
1003 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1678 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1004 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1005 1679
1006 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
1007 CFClient::UI::harmonize $hs; 1688 CFPlus::UI::harmonize $hs;
1008 1689
1009 my $y; 1690 my $y;
1010 1691
1011 for my $r (0 .. $#{$self->{children}}) { 1692 for my $r (0 .. $#{$self->{children}}) {
1012 my $row = $self->{children}[$r] 1693 my $row = $self->{children}[$r]
… …
1026 } 1707 }
1027 1708
1028 $y += $row_h; 1709 $y += $row_h;
1029 } 1710 }
1030 1711
1712 1
1031} 1713}
1032 1714
1033sub find_widget { 1715sub find_widget {
1034 my ($self, $x, $y) = @_; 1716 my ($self, $x, $y) = @_;
1035 1717
… …
1054 } 1736 }
1055} 1737}
1056 1738
1057############################################################################# 1739#############################################################################
1058 1740
1059package CFClient::UI::HBox; 1741package CFPlus::UI::Fixed;
1060 1742
1061# TODO: wrap into common Box base class 1743use List::Util qw(min max);
1062 1744
1063our @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}
1064 1761
1065sub size_request { 1762sub size_request {
1066 my ($self) = @_; 1763 my ($self) = @_;
1067 1764
1068 my @alloc = map [$_->size_request], @{$self->{children}}; 1765 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1069 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 }
1070 ( 1778 }
1071 (List::Util::sum map $_->[0], @alloc), 1779
1072 (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 @_,
1073 ) 1893 )
1074} 1894}
1075 1895
1076sub size_allocate {
1077 my ($self, $w, $h) = @_;
1078
1079 ($h, $w) = ($w, $h);
1080
1081 my $children = $self->{children};
1082
1083 my @h = map $_->{req_w}, @$children;
1084
1085 my $req_h = List::Util::sum @h;
1086
1087 if ($req_h > $h) {
1088 # ah well, not enough space
1089 $_ *= $h / $req_h for @h;
1090 } else {
1091 my $exp = List::Util::sum map $_->{expand}, @$children;
1092 $exp ||= 1;
1093
1094 for (0 .. $#$children) {
1095 my $child = $children->[$_];
1096
1097 my $alloc_h = $h[$_];
1098 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1099 $h[$_] = $alloc_h;
1100 }
1101 }
1102
1103 CFClient::UI::harmonize \@h;
1104
1105 my $y = 0;
1106 for (0 .. $#$children) {
1107 my $child = $children->[$_];
1108 my $h = $h[$_];
1109 $child->configure ($y, 0, $h, $w);
1110
1111 $y += $h;
1112 }
1113
1114 1
1115}
1116
1117############################################################################# 1896#############################################################################
1118 1897
1119package CFClient::UI::VBox; 1898package CFPlus::UI::VBox;
1120 1899
1121# TODO: wrap into common Box base class 1900our @ISA = CFPlus::UI::Box::;
1122 1901
1123our @ISA = CFClient::UI::Container::; 1902sub new {
1903 my $class = shift;
1124 1904
1125sub size_request { 1905 $class->SUPER::new (
1126 my ($self) = @_; 1906 vertical => 1,
1127 1907 @_,
1128 my @alloc = map [$_->size_request], @{$self->{children}};
1129
1130 (
1131 (List::Util::max map $_->[0], @alloc),
1132 (List::Util::sum map $_->[1], @alloc),
1133 ) 1908 )
1134} 1909}
1135 1910
1136sub size_allocate {
1137 my ($self, $w, $h) = @_;
1138
1139 my $children = $self->{children};
1140
1141 my @h = map $_->{req_h}, @$children;
1142
1143 my $req_h = List::Util::sum @h;
1144
1145 if ($req_h > $h) {
1146 # ah well, not enough space
1147 $_ *= $h / $req_h for @h;
1148 } else {
1149 my $exp = List::Util::sum map $_->{expand}, @$children;
1150 $exp ||= 1;
1151
1152 for (0 .. $#$children) {
1153 my $child = $children->[$_];
1154
1155 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1156 }
1157 }
1158
1159 CFClient::UI::harmonize \@h;
1160
1161 my $y = 0;
1162 for (0 .. $#$children) {
1163 my $child = $children->[$_];
1164 my $h = $h[$_];
1165 $child->configure (0, $y, $w, $h);
1166
1167 $y += $h;
1168 }
1169
1170 1
1171}
1172
1173############################################################################# 1911#############################################################################
1174 1912
1175package CFClient::UI::Label; 1913package CFPlus::UI::Label;
1176 1914
1177our @ISA = CFClient::UI::Base::; 1915our @ISA = CFPlus::UI::DrawBG::;
1178 1916
1179use CFClient::OpenGL; 1917use CFPlus::OpenGL;
1180 1918
1181sub new { 1919sub new {
1182 my ($class, %arg) = @_; 1920 my ($class, %arg) = @_;
1183 1921
1184 my $self = $class->SUPER::new ( 1922 my $self = $class->SUPER::new (
1185 fg => [1, 1, 1], 1923 fg => [1, 1, 1],
1924 #bg => none
1925 #active_bg => none
1186 #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),
1187 fontsize => 1, 1933 fontsize => 1,
1188 text => "",
1189 align => -1, 1934 align => -1,
1190 valign => -1, 1935 valign => -1,
1191 padding => 2, 1936 padding_x => 2,
1192 layout => new CFClient::Layout, 1937 padding_y => 2,
1193 can_events => 0, 1938 can_events => 0,
1194 %arg 1939 %arg
1195 ); 1940 );
1196 1941
1197 if (exists $self->{template}) { 1942 if (exists $self->{template}) {
1198 my $layout = new CFClient::Layout; 1943 my $layout = new CFPlus::Layout;
1199 $layout->set_text (delete $self->{template}); 1944 $layout->set_text (delete $self->{template});
1200 $self->{template} = $layout; 1945 $self->{template} = $layout;
1201 } 1946 }
1202 1947
1203 $self->set_text (delete $self->{text}) if exists $self->{text}; 1948 if (exists $self->{markup}) {
1204 $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 }
1205 1953
1206 $self 1954 $self
1207}
1208
1209sub escape {
1210 local $_ = $_[1];
1211
1212 s/&/&amp;/g;
1213 s/>/&gt;/g;
1214 s/</&lt;/g;
1215
1216 $_[1]
1217} 1955}
1218 1956
1219sub update { 1957sub update {
1220 my ($self) = @_; 1958 my ($self) = @_;
1221 1959
1222 delete $self->{texture}; 1960 delete $self->{texture};
1223 $self->SUPER::update; 1961 $self->SUPER::update;
1224} 1962}
1225 1963
1226sub reconfigure { 1964sub realloc {
1227 my ($self) = @_; 1965 my ($self) = @_;
1228 1966
1229 delete $self->{texture}; 1967 delete $self->{ox};
1968 $self->SUPER::realloc;
1230} 1969}
1231 1970
1232sub set_text { 1971sub set_text {
1233 my ($self, $text) = @_; 1972 my ($self, $text) = @_;
1234 1973
1235 return if $self->{text} eq "T$text"; 1974 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text"; 1975 $self->{text} = "T$text";
1237 1976
1238 $self->{layout}->set_text ($text); 1977 $self->{layout}->set_text ($text);
1239 1978
1240 delete $self->{texture}; 1979 delete $self->{size_req};
1980 $self->realloc;
1241 $self->update; 1981 $self->update;
1242 $self->check_size;
1243} 1982}
1244 1983
1245sub set_markup { 1984sub set_markup {
1246 my ($self, $markup) = @_; 1985 my ($self, $markup) = @_;
1247 1986
1248 return if $self->{text} eq "M$markup"; 1987 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup"; 1988 $self->{text} = "M$markup";
1250 1989
1990 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1991
1251 $self->{layout}->set_markup ($markup); 1992 $self->{layout}->set_markup ($markup);
1252 1993
1253 delete $self->{texture}; 1994 delete $self->{size_req};
1995 $self->realloc;
1254 $self->update; 1996 $self->update;
1255 $self->check_size;
1256} 1997}
1257 1998
1258sub size_request { 1999sub size_request {
1259 my ($self) = @_; 2000 my ($self) = @_;
1260 2001
2002 $self->{size_req} ||= do {
1261 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2003 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $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});
1263 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2007 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1264 2008
1265 my ($w, $h) = $self->{layout}->size; 2009 my ($w, $h) = $self->{layout}->size;
1266 2010
1267 if (exists $self->{template}) { 2011 if (exists $self->{template}) {
1268 $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);
1269 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2014 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1270 2015
1271 my ($w2, $h2) = $self->{template}->size; 2016 my ($w2, $h2) = $self->{template}->size;
1272 2017
1273 $w = List::Util::max $w, $w2; 2018 $w = List::Util::max $w, $w2;
1274 $h = List::Util::max $h, $h2; 2019 $h = List::Util::max $h, $h2;
2020 }
2021
2022 [$w, $h]
1275 } 2023 };
1276 2024
1277 ( 2025 @{ $self->{size_req} }
1278 $w + $self->{padding} * 2,
1279 $h + $self->{padding} * 2,
1280 )
1281} 2026}
1282 2027
2028sub baseline_shift {
2029 $_[0]{layout}->descent
2030}
2031
1283sub size_allocate { 2032sub invoke_size_allocate {
1284 my ($self, $w, $h) = @_; 2033 my ($self, $w, $h) = @_;
1285 2034
2035 delete $self->{ox};
2036
1286 delete $self->{texture}; 2037 delete $self->{texture}
2038 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2039
2040 1
1287} 2041}
1288 2042
1289sub set_fontsize { 2043sub set_fontsize {
1290 my ($self, $fontsize) = @_; 2044 my ($self, $fontsize) = @_;
1291 2045
1292 $self->{fontsize} = $fontsize; 2046 $self->{fontsize} = $fontsize;
2047 delete $self->{size_req};
1293 delete $self->{texture}; 2048 delete $self->{texture};
1294 $self->check_size; 2049
1295 $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;
1296} 2060}
1297 2061
1298sub _draw { 2062sub _draw {
1299 my ($self) = @_; 2063 my ($self) = @_;
1300 2064
2065 $self->SUPER::_draw; # draw background, if applicable
2066
1301 my $tex = $self->{texture} ||= do { 2067 my $size = $self->{texture} ||= do {
2068 $self->{layout}->set_foreground (@{$self->{fg}});
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2069 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $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});
1304 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 2073 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1305 new_from_layout CFClient::Texture $self->{layout} 2074
2075 [$self->{layout}->size]
1306 }; 2076 };
1307 2077
1308 glEnable GL_BLEND; 2078 unless (exists $self->{ox}) {
1309 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1310 glEnable GL_TEXTURE_2D;
1311 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1312
1313 glColor @{$self->{fg}};
1314
1315 $self->{ox} = int (
1316 $self->{align} < 0 ? $self->{padding} 2079 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1317 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 2080 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1318 : ($self->{w} - $tex->{w}) * 0.5 2081 : ($self->{w} - $size->[0]) * 0.5);
1319 );
1320 2082
1321 $self->{oy} = int (
1322 $self->{valign} < 0 ? $self->{padding} 2083 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1323 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 2084 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1324 : ($self->{h} - $tex->{h}) * 0.5 2085 : ($self->{h} - $size->[1]) * 0.5);
1325 ); 2086 };
1326 2087
1327 $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];
1328 2090
1329 glDisable GL_TEXTURE_2D; 2091 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1330 glDisable GL_BLEND;
1331} 2092}
1332 2093
1333############################################################################# 2094#############################################################################
1334 2095
1335package CFClient::UI::EntryBase; 2096package CFPlus::UI::EntryBase;
1336 2097
1337our @ISA = CFClient::UI::Label::; 2098our @ISA = CFPlus::UI::Label::;
1338 2099
1339use CFClient::OpenGL; 2100use CFPlus::OpenGL;
1340 2101
1341sub new { 2102sub new {
1342 my $class = shift; 2103 my $class = shift;
1343 2104
1344 $class->SUPER::new ( 2105 $class->SUPER::new (
… …
1348 active_fg => [0, 0, 0], 2109 active_fg => [0, 0, 0],
1349 can_hover => 1, 2110 can_hover => 1,
1350 can_focus => 1, 2111 can_focus => 1,
1351 valign => 0, 2112 valign => 0,
1352 can_events => 1, 2113 can_events => 1,
2114 ellipsise => 0,
2115 #text => ...
2116 #hidden => "*",
1353 @_ 2117 @_
1354 ) 2118 )
1355} 2119}
1356 2120
1357sub _set_text { 2121sub _set_text {
… …
1359 2123
1360 delete $self->{cur_h}; 2124 delete $self->{cur_h};
1361 2125
1362 return if $self->{text} eq $text; 2126 return if $self->{text} eq $text;
1363 2127
1364 delete $self->{texture};
1365
1366 $self->{last_activity} = $::NOW; 2128 $self->{last_activity} = $::NOW;
1367 $self->{text} = $text; 2129 $self->{text} = $text;
1368 2130
1369 $text =~ s/./*/g if $self->{hidden}; 2131 $text =~ s/./*/g if $self->{hidden};
1370 $self->{layout}->set_text ("$text "); 2132 $self->{layout}->set_text ("$text ");
2133 delete $self->{size_req};
1371 2134
1372 $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);
1373} 2146}
1374 2147
1375sub get_text { 2148sub get_text {
1376 $_[0]{text} 2149 $_[0]{text}
1377} 2150}
… …
1382 my ($w, $h) = $self->SUPER::size_request; 2155 my ($w, $h) = $self->SUPER::size_request;
1383 2156
1384 ($w + 1, $h) # add 1 for cursor 2157 ($w + 1, $h) # add 1 for cursor
1385} 2158}
1386 2159
1387sub size_allocate {
1388 my ($self, $w, $h) = @_;
1389
1390 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1391}
1392
1393sub set_text {
1394 my ($self, $text) = @_;
1395
1396 $self->{cursor} = length $text;
1397 $self->_set_text ($text);
1398 $self->update;
1399}
1400
1401sub key_down { 2160sub invoke_key_down {
1402 my ($self, $ev) = @_; 2161 my ($self, $ev) = @_;
1403 2162
1404 my $mod = $ev->{mod}; 2163 my $mod = $ev->{mod};
1405 my $sym = $ev->{sym}; 2164 my $sym = $ev->{sym};
1406 my $uni = $ev->{unicode}; 2165 my $uni = $ev->{unicode};
1407 2166
1408 my $text = $self->get_text; 2167 my $text = $self->get_text;
1409 2168
2169 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2170
1410 if ($sym == 8) { 2171 if ($uni == 8) {
1411 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2172 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1412 } elsif ($sym == 127) { 2173 } elsif ($uni == 127) {
1413 substr $text, $self->{cursor}, 1, ""; 2174 substr $text, $self->{cursor}, 1, "";
1414 } elsif ($sym == CFClient::SDLK_LEFT) { 2175 } elsif ($sym == CFPlus::SDLK_LEFT) {
1415 --$self->{cursor} if $self->{cursor}; 2176 --$self->{cursor} if $self->{cursor};
1416 } elsif ($sym == CFClient::SDLK_RIGHT) { 2177 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1417 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2178 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1418 } 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 = "";
1419 $self->{cursor} = 0; 2193 $self->{cursor} = 0;
1420 } elsif ($sym == CFClient::SDLK_END) {
1421 $self->{cursor} = length $text;
1422 } elsif ($sym == 27) { 2194 } elsif ($uni == 27) {
1423 $self->emit ('escape'); 2195 $self->emit ('escape');
1424 } elsif ($uni) { 2196 } elsif ($uni == 0x0d) {
2197 substr $text, $self->{cursor}++, 0, "\012";
2198 } elsif ($uni >= 0x20) {
1425 substr $text, $self->{cursor}++, 0, chr $uni; 2199 substr $text, $self->{cursor}++, 0, chr $uni;
2200 } else {
2201 return 0;
1426 } 2202 }
1427 2203
1428 $self->_set_text ($text); 2204 $self->_set_text ($text);
2205
2206 $self->realloc;
1429 $self->update; 2207 $self->update;
1430}
1431 2208
2209 1
2210}
2211
1432sub focus_in { 2212sub invoke_focus_in {
1433 my ($self) = @_; 2213 my ($self) = @_;
1434 2214
1435 $self->{last_activity} = $::NOW; 2215 $self->{last_activity} = $::NOW;
1436 2216
1437 $self->SUPER::focus_in; 2217 $self->SUPER::invoke_focus_in
1438} 2218}
1439 2219
1440sub button_down { 2220sub invoke_button_down {
1441 my ($self, $ev, $x, $y) = @_; 2221 my ($self, $ev, $x, $y) = @_;
1442 2222
1443 $self->SUPER::button_down ($ev, $x, $y); 2223 $self->SUPER::invoke_button_down ($ev, $x, $y);
1444 2224
1445 my $idx = $self->{layout}->xy_to_index ($x, $y); 2225 my $idx = $self->{layout}->xy_to_index ($x, $y);
1446 2226
1447 # byte-index to char-index 2227 # byte-index to char-index
1448 my $text = $self->{text}; 2228 my $text = $self->{text};
1449 utf8::encode $text; 2229 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1450 $self->{cursor} = length substr $text, 0, $idx; 2230 $self->{cursor} = length $text;
1451 2231
1452 $self->_set_text ($self->{text}); 2232 $self->_set_text ($self->{text});
1453 $self->update; 2233 $self->update;
2234
2235 1
1454} 2236}
1455 2237
1456sub mouse_motion { 2238sub invoke_mouse_motion {
1457 my ($self, $ev, $x, $y) = @_; 2239 my ($self, $ev, $x, $y) = @_;
1458# 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
1459} 2243}
1460 2244
1461sub _draw { 2245sub _draw {
1462 my ($self) = @_; 2246 my ($self) = @_;
1463 2247
1464 local $self->{fg} = $self->{fg}; 2248 local $self->{fg} = $self->{fg};
1465 2249
1466 if ($FOCUS == $self) { 2250 if ($FOCUS == $self) {
1467 glColor @{$self->{active_bg}}; 2251 glColor_premultiply @{$self->{active_bg}};
1468 $self->{fg} = $self->{active_fg}; 2252 $self->{fg} = $self->{active_fg};
1469 } else { 2253 } else {
1470 glColor @{$self->{bg}}; 2254 glColor_premultiply @{$self->{bg}};
1471 } 2255 }
1472 2256
1473 glEnable GL_BLEND; 2257 glEnable GL_BLEND;
1474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2258 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1475 glBegin GL_QUADS; 2259 glBegin GL_QUADS;
1476 glVertex 0 , 0; 2260 glVertex 0 , 0;
1477 glVertex 0 , $self->{h}; 2261 glVertex 0 , $self->{h};
1478 glVertex $self->{w}, $self->{h}; 2262 glVertex $self->{w}, $self->{h};
1479 glVertex $self->{w}, 0; 2263 glVertex $self->{w}, 0;
… …
1490 utf8::encode $text; 2274 utf8::encode $text;
1491 2275
1492 @$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)
1493 } 2277 }
1494 2278
1495 glColor @{$self->{fg}};
1496 glBegin GL_LINES; 2279 glBegin GL_LINES;
1497 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};
1498 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};
1499 glEnd; 2282 glEnd;
1500 } 2283 }
1501} 2284}
1502 2285
2286#############################################################################
2287
1503package CFClient::UI::Entry; 2288package CFPlus::UI::Entry;
1504 2289
1505our @ISA = CFClient::UI::EntryBase::; 2290our @ISA = CFPlus::UI::EntryBase::;
1506 2291
1507use CFClient::OpenGL; 2292use CFPlus::OpenGL;
1508 2293
1509sub key_down { 2294sub invoke_key_down {
1510 my ($self, $ev) = @_; 2295 my ($self, $ev) = @_;
1511 2296
1512 my $sym = $ev->{sym}; 2297 my $sym = $ev->{sym};
1513 2298
1514 if ($sym == 13) { 2299 if ($ev->{uni} == 0x0d || $sym == 13) {
1515 unshift @{$self->{history}}, 2300 unshift @{$self->{history}},
1516 my $txt = $self->get_text; 2301 my $txt = $self->get_text;
2302
1517 $self->{history_pointer} = -1; 2303 $self->{history_pointer} = -1;
1518 $self->{history_saveback} = ''; 2304 $self->{history_saveback} = '';
1519 $self->emit (activate => $txt); 2305 $self->emit (activate => $txt);
1520 $self->update; 2306 $self->update;
1521 2307
1522 } elsif ($sym == CFClient::SDLK_UP) { 2308 } elsif ($sym == CFPlus::SDLK_UP) {
1523 if ($self->{history_pointer} < 0) { 2309 if ($self->{history_pointer} < 0) {
1524 $self->{history_saveback} = $self->get_text; 2310 $self->{history_saveback} = $self->get_text;
1525 } 2311 }
1526 if (@{$self->{history} || []} > 0) { 2312 if (@{$self->{history} || []} > 0) {
1527 $self->{history_pointer}++; 2313 $self->{history_pointer}++;
… …
1529 $self->{history_pointer} = @{$self->{history} || []} - 1; 2315 $self->{history_pointer} = @{$self->{history} || []} - 1;
1530 } 2316 }
1531 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2317 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1532 } 2318 }
1533 2319
1534 } elsif ($sym == CFClient::SDLK_DOWN) { 2320 } elsif ($sym == CFPlus::SDLK_DOWN) {
1535 $self->{history_pointer}--; 2321 $self->{history_pointer}--;
1536 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2322 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1537 2323
1538 if ($self->{history_pointer} >= 0) { 2324 if ($self->{history_pointer} >= 0) {
1539 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2325 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1540 } else { 2326 } else {
1541 $self->set_text ($self->{history_saveback}); 2327 $self->set_text ($self->{history_saveback});
1542 } 2328 }
1543 2329
1544 } else { 2330 } else {
1545 $self->SUPER::key_down ($ev); 2331 return $self->SUPER::invoke_key_down ($ev)
2332 }
2333
1546 } 2334 1
1547
1548} 2335}
1549 2336
1550############################################################################# 2337#############################################################################
1551 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
1552package CFClient::UI::Button; 2378package CFPlus::UI::Button;
1553 2379
1554our @ISA = CFClient::UI::Label::; 2380our @ISA = CFPlus::UI::Label::;
1555 2381
1556use CFClient::OpenGL; 2382use CFPlus::OpenGL;
1557 2383
1558my @tex = 2384my @tex =
1559 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1560 qw(b1_button_active.png); 2386 qw(b1_button_active.png);
1561 2387
1562sub new { 2388sub new {
1563 my $class = shift; 2389 my $class = shift;
1564 2390
1565 $class->SUPER::new ( 2391 $class->SUPER::new (
1566 padding => 4, 2392 padding_x => 4,
2393 padding_y => 4,
1567 fg => [1, 1, 1], 2394 fg => [1, 1, 1],
1568 bg => [1, 1, 1, 0.2],
1569 active_fg => [0, 0, 1], 2395 active_fg => [0, 0, 1],
1570 can_hover => 1, 2396 can_hover => 1,
1571 align => 0, 2397 align => 0,
1572 valign => 0, 2398 valign => 0,
1573 can_events => 1, 2399 can_events => 1,
1574 @_ 2400 @_
1575 ) 2401 )
1576} 2402}
1577 2403
1578sub button_up { 2404sub invoke_button_up {
1579 my ($self, $ev, $x, $y) = @_; 2405 my ($self, $ev, $x, $y) = @_;
1580 2406
2407 $self->emit ("activate")
1581 if ($x >= 0 && $x < $self->{w} 2408 if $x >= 0 && $x < $self->{w}
1582 && $y >= 0 && $y < $self->{h}) { 2409 && $y >= 0 && $y < $self->{h};
1583 $self->emit ("activate"); 2410
1584 } 2411 1
1585} 2412}
1586 2413
1587sub _draw { 2414sub _draw {
1588 my ($self) = @_; 2415 my ($self) = @_;
1589 2416
1590 local $self->{fg} = $self->{fg}; 2417 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1591 2418
1592 if ($GRAB == $self) {
1593 $self->{fg} = $self->{active_fg};
1594 }
1595
1596 glEnable GL_BLEND;
1597 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1598 glEnable GL_TEXTURE_2D; 2419 glEnable GL_TEXTURE_2D;
1599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2420 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1600 glColor 0, 0, 0, 1; 2421 glColor 0, 0, 0, 1;
1601 2422
1602 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 2423 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1603 2424
1604 glDisable GL_TEXTURE_2D; 2425 glDisable GL_TEXTURE_2D;
1605 glDisable GL_BLEND;
1606 2426
1607 $self->SUPER::_draw; 2427 $self->SUPER::_draw;
1608} 2428}
1609 2429
1610############################################################################# 2430#############################################################################
1611 2431
1612package CFClient::UI::CheckBox; 2432package CFPlus::UI::CheckBox;
1613 2433
1614our @ISA = CFClient::UI::DrawBG::; 2434our @ISA = CFPlus::UI::DrawBG::;
1615 2435
1616my @tex = 2436my @tex =
1617 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2437 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1618 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2438 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1619 2439
1620use CFClient::OpenGL; 2440use CFPlus::OpenGL;
1621 2441
1622sub new { 2442sub new {
1623 my $class = shift; 2443 my $class = shift;
1624 2444
1625 $class->SUPER::new ( 2445 $class->SUPER::new (
1626 padding => 2, 2446 padding_x => 2,
2447 padding_y => 2,
1627 fg => [1, 1, 1], 2448 fg => [1, 1, 1],
1628 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],
1629 state => 0, 2452 state => 0,
1630 can_hover => 1, 2453 can_hover => 1,
1631 @_ 2454 @_
1632 ) 2455 )
1633} 2456}
1634 2457
1635sub size_request { 2458sub size_request {
1636 my ($self) = @_; 2459 my ($self) = @_;
1637 2460
1638 ($self->{padding} * 2 + 6) x 2 2461 (6) x 2
1639} 2462}
1640 2463
2464sub toggle {
2465 my ($self) = @_;
2466
2467 $self->{state} = !$self->{state};
2468 $self->emit (changed => $self->{state});
2469 $self->update;
2470}
2471
1641sub button_down { 2472sub invoke_button_down {
1642 my ($self, $ev, $x, $y) = @_; 2473 my ($self, $ev, $x, $y) = @_;
1643 2474
1644 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2475 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1645 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2476 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1646 $self->{state} = !$self->{state}; 2477 $self->toggle;
1647 $self->emit (changed => $self->{state}); 2478 } else {
2479 return 0
2480 }
2481
1648 } 2482 1
1649} 2483}
1650 2484
1651sub _draw { 2485sub _draw {
1652 my ($self) = @_; 2486 my ($self) = @_;
1653 2487
1654 $self->SUPER::_draw; 2488 $self->SUPER::_draw;
1655 2489
1656 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2490 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1657 2491
1658 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;
1659 2495
1660 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2496 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1661 2497
1662 glEnable GL_BLEND; 2498 my $tex = $self->{state} ? $tex[1] : $tex[0];
2499
1663 glEnable GL_TEXTURE_2D; 2500 glEnable GL_TEXTURE_2D;
1664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1665
1666 my $tex = $self->{state} ? $tex[1] : $tex[0];
1667
1668 $tex->draw_quad (0, 0, $s, $s); 2501 $tex->draw_quad_alpha (0, 0, $s, $s);
1669
1670 glDisable GL_TEXTURE_2D; 2502 glDisable GL_TEXTURE_2D;
1671 glDisable GL_BLEND;
1672} 2503}
1673 2504
1674############################################################################# 2505#############################################################################
1675 2506
1676package CFClient::UI::Image; 2507package CFPlus::UI::Image;
1677 2508
1678our @ISA = CFClient::UI::Base::; 2509our @ISA = CFPlus::UI::Base::;
1679 2510
1680use CFClient::OpenGL; 2511use CFPlus::OpenGL;
1681use Carp qw/confess/;
1682 2512
1683our %loaded_images; 2513our %texture_cache;
1684 2514
1685sub new { 2515sub new {
1686 my $class = shift; 2516 my $class = shift;
1687 2517
1688 my $self = $class->SUPER::new (can_events => 0, @_); 2518 my $self = $class->SUPER::new (
2519 can_events => 0,
2520 @_,
2521 );
1689 2522
1690 $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";
1691 2525
1692 $loaded_images{$self->{image}} ||= 2526 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1693 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;
1694 2528
1695 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2529 CFPlus::weaken $texture_cache{$self->{path}};
1696 2530
1697 Scalar::Util::weaken $loaded_images{$self->{image}}; 2531 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1698
1699 $self->{aspect} = $tex->{w} / $tex->{h};
1700 2532
1701 $self 2533 $self
1702} 2534}
1703 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
1704sub size_request { 2551sub size_request {
1705 my ($self) = @_; 2552 my ($self) = @_;
1706 2553
1707 ($self->{tex}->{w}, $self->{tex}->{h}) 2554 ($self->{tex}{w}, $self->{tex}{h})
1708} 2555}
1709 2556
1710sub _draw { 2557sub _draw {
1711 my ($self) = @_; 2558 my ($self) = @_;
1712 2559
… …
1719 glTranslate 0, -$self->{w}, 0; 2566 glTranslate 0, -$self->{w}, 0;
1720 2567
1721 ($w, $h) = ($h, $w); 2568 ($w, $h) = ($h, $w);
1722 } 2569 }
1723 2570
1724 glEnable GL_BLEND;
1725 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1726 glEnable GL_TEXTURE_2D; 2571 glEnable GL_TEXTURE_2D;
1727 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2572 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1728 2573
1729 $tex->draw_quad (0, 0, $w, $h); 2574 $tex->draw_quad (0, 0, $w, $h);
1730 2575
1731 glDisable GL_BLEND;
1732 glDisable GL_TEXTURE_2D; 2576 glDisable GL_TEXTURE_2D;
1733} 2577}
1734 2578
1735############################################################################# 2579#############################################################################
1736 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
1737package CFClient::UI::VGauge; 2617package CFPlus::UI::VGauge;
1738 2618
1739our @ISA = CFClient::UI::Base::; 2619our @ISA = CFPlus::UI::Base::;
1740 2620
1741use List::Util qw(min max); 2621use List::Util qw(min max);
1742 2622
1743use CFClient::OpenGL; 2623use CFPlus::OpenGL;
1744 2624
1745my %tex = ( 2625my %tex = (
1746 food => [ 2626 food => [
1747 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2627 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1748 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2628 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1749 ], 2629 ],
1750 grace => [ 2630 grace => [
1751 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2631 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1752 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/
1753 ], 2633 ],
1754 hp => [ 2634 hp => [
1755 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2635 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1756 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2636 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1757 ], 2637 ],
1758 mana => [ 2638 mana => [
1759 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2639 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1760 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/
1761 ], 2641 ],
1762); 2642);
1763 2643
1764# eg. VGauge->new (gauge => 'food'), default gauge: food 2644# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
1824 my $ycut1 = max 0, min 1, $ycut; 2704 my $ycut1 = max 0, min 1, $ycut;
1825 my $ycut2 = max 0, min 1, $ycut - 1; 2705 my $ycut2 = max 0, min 1, $ycut - 1;
1826 2706
1827 my $h1 = $self->{h} * (1 - $ycut1); 2707 my $h1 = $self->{h} * (1 - $ycut1);
1828 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);
1829 2712
1830 glEnable GL_BLEND; 2713 glEnable GL_BLEND;
1831 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;
1832 glEnable GL_TEXTURE_2D; 2716 glEnable GL_TEXTURE_2D;
1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834 2718
1835 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2719 glBindTexture GL_TEXTURE_2D, $t1->{name};
1836 glBegin GL_QUADS; 2720 glBegin GL_QUADS;
… …
1851 2735
1852 if ($t3) { 2736 if ($t3) {
1853 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2737 glBindTexture GL_TEXTURE_2D, $t3->{name};
1854 glBegin GL_QUADS; 2738 glBegin GL_QUADS;
1855 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2739 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1856 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2740 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1857 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2741 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1858 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2742 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1859 glEnd; 2743 glEnd;
1860 } 2744 }
1861 2745
1862 glDisable GL_BLEND; 2746 glDisable GL_BLEND;
1863 glDisable GL_TEXTURE_2D; 2747 glDisable GL_TEXTURE_2D;
1864} 2748}
1865 2749
1866############################################################################# 2750#############################################################################
1867 2751
1868package CFClient::UI::Gauge; 2752package CFPlus::UI::Gauge;
1869 2753
1870our @ISA = CFClient::UI::VBox::; 2754our @ISA = CFPlus::UI::VBox::;
1871 2755
1872sub new { 2756sub new {
1873 my ($class, %arg) = @_; 2757 my ($class, %arg) = @_;
1874 2758
1875 my $self = $class->SUPER::new ( 2759 my $self = $class->SUPER::new (
… …
1877 can_hover => 1, 2761 can_hover => 1,
1878 can_events => 1, 2762 can_events => 1,
1879 %arg, 2763 %arg,
1880 ); 2764 );
1881 2765
1882 $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");
1883 $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);
1884 $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");
1885 2769
1886 $self 2770 $self
1887} 2771}
1888 2772
1889sub set_fontsize { 2773sub set_fontsize {
… …
1910 $self->{value}->set_text ($val); 2794 $self->{value}->set_text ($val);
1911} 2795}
1912 2796
1913############################################################################# 2797#############################################################################
1914 2798
1915package CFClient::UI::Slider; 2799package CFPlus::UI::Slider;
1916 2800
1917use strict; 2801use strict;
1918 2802
1919use CFClient::OpenGL; 2803use CFPlus::OpenGL;
1920 2804
1921our @ISA = CFClient::UI::DrawBG::; 2805our @ISA = CFPlus::UI::DrawBG::;
1922 2806
1923my @tex = 2807my @tex =
1924 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2808 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
1925 qw(s1_slider.png s1_slider_bg.png); 2809 qw(s1_slider.png s1_slider_bg.png);
1926 2810
1927sub new { 2811sub new {
1928 my $class = shift; 2812 my $class = shift;
1929 2813
1930 # range [value, low, high, page] 2814 # range [value, low, high, page, unit]
1931 2815
1932 # TODO: 0-width page 2816 # TODO: 0-width page
1933 # TODO: req_w/h are wrong with vertical 2817 # TODO: req_w/h are wrong with vertical
1934 # TODO: calculations are off 2818 # TODO: calculations are off
1935 my $self = $class->SUPER::new ( 2819 my $self = $class->SUPER::new (
1936 fg => [1, 1, 1], 2820 fg => [1, 1, 1],
1937 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],
1938 range => [0, 0, 100, 10], 2824 range => [0, 0, 100, 10, 0],
1939 req_w => 20, 2825 min_w => $::WIDTH / 80,
1940 req_h => 20, 2826 min_h => $::WIDTH / 80,
1941 vertical => 0, 2827 vertical => 0,
1942 can_hover => 1, 2828 can_hover => 1,
1943 inner_pad => 5, 2829 inner_pad => 0.02,
1944 @_ 2830 @_
1945 ); 2831 );
1946 2832
2833 $self->set_value ($self->{range}[0]);
2834 $self->update;
2835
1947 $self 2836 $self
1948} 2837}
1949 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
1950sub size_request { 2873sub size_request {
1951 my ($self) = @_; 2874 my ($self) = @_;
1952 2875
1953 my $w = $self->{req_w}; 2876 ($self->{req_w}, $self->{req_h})
1954 my $h = $self->{req_h};
1955
1956 $self->{vertical} ? ($h, $w) : ($w, $h)
1957} 2877}
1958 2878
1959sub button_down { 2879sub invoke_button_down {
1960 my ($self, $ev, $x, $y) = @_; 2880 my ($self, $ev, $x, $y) = @_;
1961 2881
1962 $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
1963 $self->mouse_motion ($ev, $x, $y); 2886 $self->invoke_mouse_motion ($ev, $x, $y)
1964} 2887}
1965 2888
1966sub mouse_motion { 2889sub invoke_mouse_motion {
1967 my ($self, $ev, $x, $y) = @_; 2890 my ($self, $ev, $x, $y) = @_;
1968 2891
1969 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
1970 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2932 my ($value, $lo, $hi, $page) = @{$self->{range}};
2933 my $range = ($hi - $page - $lo) || 1e-100;
1971 2934
1972 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2935 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1973 2936
1974 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2937 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1975 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2938 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1976 2939
1977 $x -= $inner_pad_px; # substract the padding 2940 $value = ($value - $lo) / $range;
1978 $x = $x * ($hi - $lo) / $inner_w + $lo; 2941 $value = $value * $self->{scale} + $self->{offset};
1979 $x = $lo if $x < $lo;
1980 $x = $hi - $page if $x > $hi - $page;
1981 $self->{range}[0] = $x;
1982 2942
1983 $self->emit (changed => $x); 2943 $self->{knob_x} = $value - $knob_w * 0.5;
1984 $self->update; 2944 $self->{knob_w} = $knob_w;
1985 } 2945 }
1986}
1987
1988# the inner_* stuff is for generating a padding for the slider handle,
1989# so that the handle doesn't leave the texture. This calculation isn't 100%
1990# correct propably, but it does the job for now
1991sub _calc_inner_pad_px {
1992 my ($self, $w) = @_;
1993 ($w / 100) * $self->{inner_pad} # % to pixels
1994}
1995
1996sub _draw {
1997 my ($self) = @_;
1998 2946
1999 $self->SUPER::_draw (); 2947 $self->SUPER::_draw ();
2000 2948
2001 my ($w, $h) = @$self{qw(w h)}; 2949 glScale $self->{w}, $self->{h};
2002 2950
2003 if ($self->{vertical}) { 2951 if ($self->{vertical}) {
2004 # draw a vertical slider like a rotated horizontal slider 2952 # draw a vertical slider like a rotated horizontal slider
2005 2953
2954 glTranslate 1, 0, 0;
2006 glRotate 90, 0, 0, 1; 2955 glRotate 90, 0, 0, 1;
2007 glTranslate 0, -$self->{w}, 0;
2008
2009 ($w, $h) = ($h, $w);
2010 } 2956 }
2011 2957
2012 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2958 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2013 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2959 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2014 2960
2015 my ($value, $lo, $hi, $page) = @{$self->{range}};
2016
2017 $hi = $value + 1 if $lo == $hi;
2018
2019 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2020 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2021
2022 $page = int $page * $inner_w / ($hi - $lo);
2023 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2024
2025 $w -= $page;
2026 $page &= ~1;
2027 glTranslate $page * 0.5, 0, 0;
2028 $page ||= 2;
2029
2030 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2031 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2032
2033 glEnable GL_BLEND;
2034 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2035 glEnable GL_TEXTURE_2D; 2961 glEnable GL_TEXTURE_2D;
2036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2037 2963
2038 # draw background 2964 # draw background
2039 $tex[1]->draw_quad (0, 0, $w, $h); 2965 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2040 2966
2041 # draw handle 2967 # draw handle
2042 $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);
2043 2969
2044 glDisable GL_BLEND;
2045 glDisable GL_TEXTURE_2D; 2970 glDisable GL_TEXTURE_2D;
2046} 2971}
2047 2972
2048############################################################################# 2973#############################################################################
2049 2974
2050package CFClient::UI::TextView; 2975package CFPlus::UI::ValSlider;
2051 2976
2052our @ISA = CFClient::UI::HBox::; 2977our @ISA = CFPlus::UI::HBox::;
2053 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
2054use CFClient::OpenGL; 3020use CFPlus::OpenGL;
2055 3021
2056sub new { 3022sub new {
2057 my $class = shift; 3023 my $class = shift;
2058 3024
2059 my $self = $class->SUPER::new ( 3025 my $self = $class->SUPER::new (
2060 fontsize => 1, 3026 fontsize => 1,
2061 can_events => 0, 3027 can_events => 1,
3028 indent => 0,
2062 #font => default_font 3029 #font => default_font
2063 @_, 3030 @_,
2064 3031
2065 layout => (new CFClient::Layout), 3032 layout => (new CFPlus::Layout),
2066 par => [], 3033 par => [],
3034 max_par => 0,
2067 height => 0, 3035 height => 0,
2068 children => [ 3036 children => [
2069 (new CFClient::UI::Empty expand => 1), 3037 (new CFPlus::UI::Empty expand => 1),
2070 (new CFClient::UI::Slider vertical => 1), 3038 (new CFPlus::UI::Slider vertical => 1),
2071 ], 3039 ],
2072 ); 3040 );
2073 3041
2074 $self->{children}[1]->connect (changed => sub { 3042 $self->{children}[1]->connect (changed => sub { $self->update });
2075 $self->update;
2076 });
2077 3043
2078 $self 3044 $self
2079} 3045}
2080 3046
2081sub set_fontsize { 3047sub set_fontsize {
… …
2083 3049
2084 $self->{fontsize} = $fontsize; 3050 $self->{fontsize} = $fontsize;
2085 $self->reflow; 3051 $self->reflow;
2086} 3052}
2087 3053
2088sub 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 {
2089 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) = @_;
2090 3092
2091 my $layout = $self->{layout}; 3093 my $layout = $self->{layout};
2092 3094
3095 $layout->set_font ($self->{font}) if $self->{font};
3096 $layout->set_foreground (@{$para->{fg}});
2093 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3097 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2094 $layout->set_width ($self->{w}); 3098 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2095 $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}}
2096 3106 );
2097 ($layout->size)[1] 3107
3108 $layout
2098} 3109}
2099 3110
2100sub reflow { 3111sub reflow {
2101 my ($self) = @_; 3112 my ($self) = @_;
2102 3113
2103 $self->{need_reflow}++; 3114 $self->{need_reflow}++;
2104 $self->update; 3115 $self->update;
2105} 3116}
2106 3117
2107sub 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 {
2108 my ($self, $w, $h) = @_; 3132 my ($self, $para) = @_;
2109 3133
2110 $self->SUPER::size_allocate ($w, $h); 3134 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2111 3135
2112 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3136 $self->{scroll_to} = $para;
2113 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3137 $self->update;
2114 $self->{layout}->set_width ($self->{children}[0]{w}); 3138}
2115 3139
2116 $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]);
2117} 3149}
2118 3150
2119sub add_paragraph { 3151sub add_paragraph {
2120 my ($self, $color, $text) = @_; 3152 my $self = shift;
2121 3153
2122 #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 };
2123 3164
2124 my $height = $self->text_height ($text); 3165 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3166 push @{$self->{par}}, $para;
3167 }
2125 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
2126 $self->{height} += $height; 3206 $self->{height} = $height;
3207 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2127 3208
2128 push @{$self->{par}}, [$height, $color, $text]; 3209 delete $self->{texture};
3210 }
2129 3211
2130 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 3212 if (my $paridx = delete $self->{scroll_to}) {
2131 $self->{children}[1]->update; 3213 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3214 }
2132} 3215}
2133 3216
2134sub update { 3217sub update {
2135 my ($self) = @_; 3218 my ($self) = @_;
2136 3219
… …
2138 3221
2139 return unless $self->{h} > 0; 3222 return unless $self->{h} > 0;
2140 3223
2141 delete $self->{texture}; 3224 delete $self->{texture};
2142 3225
2143 $ROOT->on_refresh ($self, sub { 3226 $ROOT->on_post_alloc ($self => sub {
2144 if (delete $self->{need_reflow}) { 3227 $self->force_uptodate;
2145 my $height = 0;
2146 3228
2147 $height += $_->[0] = $self->text_height ($_->[2]) 3229 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2148 for @{$self->{par}};
2149 3230
2150 $self->{height} = $height;
2151
2152 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2153
2154 delete $self->{texture};
2155 }
2156
2157 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 3231 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2158 glClearColor 0, 0, 0, 1; 3232 glClearColor 0, 0, 0, 0;
2159 glClear GL_COLOR_BUFFER_BIT; 3233 glClear GL_COLOR_BUFFER_BIT;
2160 3234
2161 glEnable GL_BLEND; 3235 package CFPlus::UI::Base;
2162 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 3236 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2163 glEnable GL_TEXTURE_2D; 3237 (0, 0, $self->{w}, $self->{h});
2164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2165 3238
2166 my $top = int $self->{children}[1]{range}[0]; 3239 my $top = int $self->{children}[1]{range}[0];
2167 3240
3241 my $paridx = 0;
3242 my $top_paragraph;
3243 my $top = int $self->{children}[1]{range}[0];
3244
2168 my $y0 = $top; 3245 my $y0 = $top;
2169 my $y1 = $top + $self->{h}; 3246 my $y1 = $top + $H;
2170 3247
2171 my $y = 0;
2172
2173 my $layout = $self->{layout};
2174
2175 $layout->set_font ($self->{font}) if $self->{font};
2176
2177 for my $par (@{$self->{par}}) { 3248 for my $para (@{$self->{par}}) {
2178 my $h = $par->[0]; 3249 my $h = $para->{h};
3250 my $y = $para->{y};
2179 3251
2180 if ($y0 < $y + $h && $y < $y1) { 3252 if ($y0 < $y + $h && $y < $y1) {
2181 $layout->set_text ($par->[2]); 3253 my $layout = $self->get_layout ($para);
2182 3254
2183 glColor @{ $par->[1] }; 3255 $layout->render ($para->{indent}, $y - $y0);
2184 my ($W, $H) = $layout->size; 3256
2185 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 }
2186 } 3269 }
2187 3270
2188 $y += $h; 3271 $paridx++;
3272 $top_paragraph ||= $paridx if $y >= $top;
2189 } 3273 }
2190 3274
2191 glDisable GL_TEXTURE_2D; 3275 $self->{top_paragraph} = $top_paragraph;
2192 glDisable GL_BLEND;
2193 }; 3276 };
2194 }); 3277 });
2195} 3278}
2196 3279
3280sub reconfigure {
3281 my ($self) = @_;
3282
3283 $self->SUPER::reconfigure;
3284
3285 $_->{w} = 1e10 for @{ $self->{par} };
3286 $self->reflow;
3287}
3288
2197sub _draw { 3289sub _draw {
2198 my ($self) = @_; 3290 my ($self) = @_;
2199 3291
2200 if ($self->{texture}) {
2201 glEnable GL_TEXTURE_2D; 3292 glEnable GL_TEXTURE_2D;
2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3293 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203 glColor 1, 1, 1, 1; 3294 glColor 0, 0, 0, 1;
2204 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 3295 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2205 glDisable GL_TEXTURE_2D; 3296 glDisable GL_TEXTURE_2D;
2206 }
2207 3297
2208 $self->{children}[1]->draw; 3298 $self->{children}[1]->draw;
2209
2210} 3299}
2211 3300
2212############################################################################# 3301#############################################################################
2213 3302
2214package CFClient::UI::Animator; 3303package CFPlus::UI::Animator;
2215 3304
2216use CFClient::OpenGL; 3305use CFPlus::OpenGL;
2217 3306
2218our @ISA = CFClient::UI::Bin::; 3307our @ISA = CFPlus::UI::Bin::;
2219 3308
2220sub moveto { 3309sub moveto {
2221 my ($self, $x, $y) = @_; 3310 my ($self, $x, $y) = @_;
2222 3311
2223 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3312 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2251 glPopMatrix; 3340 glPopMatrix;
2252} 3341}
2253 3342
2254############################################################################# 3343#############################################################################
2255 3344
2256package CFClient::UI::Flopper; 3345package CFPlus::UI::Flopper;
2257 3346
2258our @ISA = CFClient::UI::Button::; 3347our @ISA = CFPlus::UI::Button::;
2259 3348
2260sub new { 3349sub new {
2261 my $class = shift; 3350 my $class = shift;
2262 3351
2263 my $self = $class->SUPER::new ( 3352 my $self = $class->SUPER::new (
2264 state => 0, 3353 state => 0,
2265 connect_activate => \&toggle_flopper, 3354 on_activate => \&toggle_flopper,
2266 @_ 3355 @_
2267 ); 3356 );
2268 3357
2269 if ($self->{state}) {
2270 $self->{state} = 0;
2271 $self->toggle_flopper;
2272 }
2273
2274 $self 3358 $self
2275} 3359}
2276 3360
2277sub toggle_flopper { 3361sub toggle_flopper {
2278 my ($self) = @_; 3362 my ($self) = @_;
2279 3363
2280 # TODO: use animation 3364 $self->{other}->toggle_visibility;
2281 if ($self->{state} = !$self->{state}) {
2282 $CFClient::UI::ROOT->add ($self->{other});
2283 $self->{other}->move ($self->coord2global (0, $self->{h}));
2284 $self->emit ("open");
2285 } else {
2286 $CFClient::UI::ROOT->remove ($self->{other});
2287 $self->emit ("close");
2288 }
2289
2290 $self->emit (changed => $self->{state});
2291} 3365}
2292 3366
2293############################################################################# 3367#############################################################################
2294 3368
2295package CFClient::UI::Tooltip; 3369package CFPlus::UI::Tooltip;
2296 3370
2297our @ISA = CFClient::UI::Bin::; 3371our @ISA = CFPlus::UI::Bin::;
2298 3372
2299use CFClient::OpenGL; 3373use CFPlus::OpenGL;
2300 3374
2301sub new { 3375sub new {
2302 my $class = shift; 3376 my $class = shift;
2303 3377
2304 $class->SUPER::new ( 3378 $class->SUPER::new (
2305 @_, 3379 @_,
2306 can_events => 0, 3380 can_events => 0,
2307 ) 3381 )
2308} 3382}
2309 3383
2310sub set_markup { 3384sub set_tooltip_from {
2311 my ($self, $text) = @_; 3385 my ($self, $widget) = @_;
2312 3386
2313 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 3387 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
2314 $self->{label}->set_markup ($text); 3388 if $widget->{tooltip} =~ /^#(.*)$/;
2315 $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 );
2316} 3410}
2317 3411
2318sub size_request { 3412sub size_request {
2319 my ($self) = @_; 3413 my ($self) = @_;
2320 3414
2321 $self->child->set_max_size ($::WIDTH * 0.3);
2322
2323 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3415 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2324 3416
2325 ($w + 4, $h + 4) 3417 ($w + 4, $h + 4)
2326} 3418}
2327 3419
2328sub size_allocate { 3420sub invoke_size_allocate {
2329 my ($self, $w, $h) = @_; 3421 my ($self, $w, $h) = @_;
2330 3422
2331 $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 });
2332} 3446}
2333 3447
2334sub _draw { 3448sub _draw {
2335 my ($self) = @_; 3449 my ($self) = @_;
2336 3450
2337 glPushMatrix;
2338 glTranslate 0.375, 0.375; 3451 glTranslate 0.375, 0.375;
2339 3452
2340 my ($w, $h) = @$self{qw(w h)}; 3453 my ($w, $h) = @$self{qw(w h)};
2341 3454
2342 glColor 1, 0.8, 0.4; 3455 glColor 1, 0.8, 0.4;
… …
2353 glVertex 0 , $h; 3466 glVertex 0 , $h;
2354 glVertex $w, $h; 3467 glVertex $w, $h;
2355 glVertex $w, 0; 3468 glVertex $w, 0;
2356 glEnd; 3469 glEnd;
2357 3470
2358 glPopMatrix; 3471 glTranslate 2 - 0.375, 2 - 0.375;
2359 3472
2360 glTranslate 2, 2;
2361 $self->SUPER::_draw; 3473 $self->SUPER::_draw;
2362} 3474}
2363 3475
2364############################################################################# 3476#############################################################################
2365 3477
2366package CFClient::UI::Face; 3478package CFPlus::UI::Face;
2367 3479
2368our @ISA = CFClient::UI::Base::; 3480our @ISA = CFPlus::UI::DrawBG::;
2369 3481
2370use CFClient::OpenGL; 3482use CFPlus::OpenGL;
2371 3483
2372sub new { 3484sub new {
2373 my $class = shift; 3485 my $class = shift;
2374 3486
2375 $class->SUPER::new ( 3487 my $self = $class->SUPER::new (
3488 size_w => 32,
3489 size_h => 8,
2376 aspect => 1, 3490 aspect => 1,
3491 can_events => 0,
2377 @_, 3492 @_,
2378 ) 3493 );
3494
3495 if ($self->{anim} && $self->{animspeed}) {
3496 CFPlus::weaken (my $widget = $self);
3497
3498 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3499 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3500 $self->{timer} = Event->timer (
3501 parked => 1,
3502 cb => sub {
3503 return unless $::CONN && $widget;
3504
3505 ++$widget->{frame};
3506 $widget->update_face;
3507 $widget->update;
3508
3509 $widget->update_timer;
3510 },
3511 );
3512
3513 $self->update_face;
3514 $self->update_timer;
3515 }
3516
3517 $self
3518}
3519
3520sub update_timer {
3521 my ($self) = @_;
3522
3523 return unless $self->{timer};
3524
3525 if ($self->{visible}) {
3526 $self->{timer}->at (
3527 $self->{anim_start}
3528 + $self->{animspeed}
3529 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3530 );
3531 $self->{timer}->start;
3532 } else {
3533 $self->{timer}->stop;
3534 }
3535}
3536
3537sub update_face {
3538 my ($self) = @_;
3539
3540 return unless $::CONN;
3541
3542 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3543 if ($anim && @$anim) {
3544 delete $self->{wait_face};
3545 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3546 }
3547 }
2379} 3548}
2380 3549
2381sub size_request { 3550sub size_request {
2382 (32, 8) 3551 my ($self) = @_;
2383}
2384 3552
3553 if ($::CONN) {
3554 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3555 if (my $tex = $::CONN->{texture}[$faceid]) {
3556 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3557 } else {
3558 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3559 $self->realloc;
3560 });
3561 }
3562 }
3563 }
3564
3565 ($self->{size_w} || 8, $self->{size_h} || 8)
3566}
3567
3568sub update {
3569 my ($self) = @_;
3570
3571 return unless $self->{visible};
3572
3573 $self->SUPER::update;
3574}
3575
3576sub invoke_visibility_change {
3577 my ($self) = @_;
3578
3579 $self->update_timer;
3580
3581 0
3582}
3583
2385sub draw { 3584sub _draw {
2386 my ($self) = @_; 3585 my ($self) = @_;
2387 3586
3587 return unless $::CONN;
3588
3589 $self->SUPER::_draw;
3590
3591 my $faceid = $::CONN->{faceid}[$self->{face}]
3592 or return;
3593
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3594 my $tex = $::CONN->{texture}[$faceid];
2389 3595
2390 if ($tex) { 3596 if ($tex) {
2391 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D; 3597 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3598 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2395 glColor 1, 1, 1, 1; 3599 glColor 0, 0, 0, 1;
2396 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 3600 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2397 glDisable GL_TEXTURE_2D; 3601 glDisable GL_TEXTURE_2D;
2398 glDisable GL_BLEND;
2399 } 3602 }
3603}
3604
3605sub destroy {
3606 my ($self) = @_;
3607
3608 (delete $self->{timer})->cancel
3609 if $self->{timer};
3610
3611 $self->SUPER::destroy;
2400} 3612}
2401 3613
2402############################################################################# 3614#############################################################################
2403 3615
2404package CFClient::UI::Root; 3616package CFPlus::UI::Buttonbar;
2405 3617
3618our @ISA = CFPlus::UI::HBox::;
3619
3620# TODO: should actually wrap buttons and other goodies.
3621
3622#############################################################################
3623
3624package CFPlus::UI::Menu;
3625
3626our @ISA = CFPlus::UI::Toplevel::;
3627
3628use CFPlus::OpenGL;
3629
3630sub new {
3631 my $class = shift;
3632
3633 my $self = $class->SUPER::new (
3634 items => [],
3635 z => 100,
3636 @_,
3637 );
3638
3639 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3640
3641 for my $item (@{ $self->{items} }) {
3642 my ($widget, $cb, $tooltip) = @$item;
3643
3644 # handle various types of items, only text for now
3645 if (!ref $widget) {
3646 if ($widget =~ /\t/) {
3647 my ($left, $right) = split /\t/, $widget, 2;
3648
3649 $widget = new CFPlus::UI::HBox
3650 can_hover => 1,
3651 can_events => 1,
3652 tooltip => $tooltip,
3653 children => [
3654 (new CFPlus::UI::Label markup => $left, expand => 1),
3655 (new CFPlus::UI::Label markup => $right, align => +1),
3656 ],
3657 ;
3658
3659 } else {
3660 $widget = new CFPlus::UI::Label
3661 can_hover => 1,
3662 can_events => 1,
3663 markup => $widget,
3664 tooltip => $tooltip;
3665 }
3666 }
3667
3668 $self->{item}{$widget} = $item;
3669
3670 $self->{vbox}->add ($widget);
3671 }
3672
3673 $self
3674}
3675
3676# popup given the event (must be a mouse button down event currently)
3677sub popup {
3678 my ($self, $ev) = @_;
3679
3680 $self->emit ("popdown");
3681
3682 # maybe save $GRAB? must be careful about events...
3683 $GRAB = $self;
3684 $self->{button} = $ev->{button};
3685
3686 $self->show;
3687 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3688}
3689
3690sub invoke_mouse_motion {
3691 my ($self, $ev, $x, $y) = @_;
3692
3693 # TODO: should use vbox->find_widget or so
3694 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3695 $self->{hover} = $self->{item}{$HOVER};
3696
3697 0
3698}
3699
3700sub invoke_button_up {
3701 my ($self, $ev, $x, $y) = @_;
3702
3703 if ($ev->{button} == $self->{button}) {
3704 undef $GRAB;
3705 $self->hide;
3706
3707 $self->emit ("popdown");
3708 $self->{hover}[1]->() if $self->{hover};
3709 } else {
3710 return 0
3711 }
3712
3713 1
3714}
3715
3716#############################################################################
3717
3718package CFPlus::UI::Multiplexer;
3719
2406our @ISA = CFClient::UI::Container::; 3720our @ISA = CFPlus::UI::Container::;
2407 3721
2408use CFClient::OpenGL; 3722sub new {
3723 my $class = shift;
2409 3724
2410sub check_size { 3725 my $self = $class->SUPER::new (
3726 @_,
3727 );
3728
3729 $self->{current} = $self->{children}[0]
3730 if @{ $self->{children} };
3731
3732 $self
3733}
3734
3735sub add {
2411 my ($self) = @_; 3736 my ($self, @widgets) = @_;
2412 3737
2413 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3738 $self->SUPER::add (@widgets);
3739
3740 $self->{current} = $self->{children}[0]
3741 if @{ $self->{children} };
3742}
3743
3744sub get_current_page {
3745 my ($self) = @_;
3746
3747 $self->{current}
3748}
3749
3750sub set_current_page {
3751 my ($self, $page_or_widget) = @_;
3752
3753 my $widget = ref $page_or_widget
3754 ? $page_or_widget
3755 : $self->{children}[$page_or_widget];
3756
3757 $self->{current} = $widget;
3758 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3759
3760 $self->emit (page_changed => $self->{current});
3761
3762 $self->realloc;
3763}
3764
3765sub visible_children {
3766 $_[0]{current}
2414} 3767}
2415 3768
2416sub size_request { 3769sub size_request {
2417 ($::WIDTH, $::HEIGHT) 3770 my ($self) = @_;
2418}
2419 3771
3772 $self->{current}->size_request
3773}
3774
3775sub invoke_size_allocate {
3776 my ($self, $w, $h) = @_;
3777
3778 $self->{current}->configure (0, 0, $w, $h);
3779
3780 1
3781}
3782
3783sub _draw {
3784 my ($self) = @_;
3785
3786 $self->{current}->draw;
3787}
3788
3789#############################################################################
3790
3791package CFPlus::UI::Notebook;
3792
3793our @ISA = CFPlus::UI::VBox::;
3794
3795sub new {
3796 my $class = shift;
3797
3798 my $self = $class->SUPER::new (
3799 buttonbar => (new CFPlus::UI::Buttonbar),
3800 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3801 # filter => # will be put between multiplexer and $self
3802 @_,
3803 );
3804
3805 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3806 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3807
3808 $self
3809}
3810
3811sub add {
3812 my ($self, $title, $widget, $tooltip) = @_;
3813
3814 CFPlus::weaken $self;
3815
3816 $self->{buttonbar}->add (new CFPlus::UI::Button
3817 markup => $title,
3818 tooltip => $tooltip,
3819 on_activate => sub { $self->set_current_page ($widget) },
3820 );
3821
3822 $self->{multiplexer}->add ($widget);
3823}
3824
3825sub get_current_page {
3826 my ($self) = @_;
3827
3828 $self->{multiplexer}->get_current_page
3829}
3830
3831sub set_current_page {
3832 my ($self, $page) = @_;
3833
3834 $self->{multiplexer}->set_current_page ($page);
3835 $self->emit (page_changed => $self->{multiplexer}{current});
3836}
3837
3838#############################################################################
3839
3840package CFPlus::UI::Selector;
3841
3842use utf8;
3843
3844our @ISA = CFPlus::UI::Button::;
3845
3846sub new {
3847 my $class = shift;
3848
3849 my $self = $class->SUPER::new (
3850 options => [], # [value, title, longdesc], ...
3851 value => undef,
3852 @_,
3853 );
3854
3855 $self->_set_value ($self->{value});
3856
3857 $self
3858}
3859
3860sub invoke_button_down {
3861 my ($self, $ev) = @_;
3862
3863 my @menu_items;
3864
3865 for (@{ $self->{options} }) {
3866 my ($value, $title, $tooltip) = @$_;
3867
3868 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3869 }
3870
3871 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3872}
3873
3874sub _set_value {
3875 my ($self, $value) = @_;
3876
3877 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3878 or return;
3879
3880 $self->{value} = $item->[0];
3881 $self->set_markup ("$item->[1] ⇓");
3882 $self->set_tooltip ($item->[2]);
3883}
3884
3885sub set_value {
3886 my ($self, $value) = @_;
3887
3888 return unless $self->{value} ne $value;
3889
3890 $self->_set_value ($value);
3891 $self->emit (changed => $value);
3892}
3893
3894#############################################################################
3895
3896package CFPlus::UI::Statusbox;
3897
3898our @ISA = CFPlus::UI::VBox::;
3899
3900sub new {
3901 my $class = shift;
3902
3903 my $self = $class->SUPER::new (
3904 fontsize => 0.8,
3905 @_,
3906 );
3907
3908 CFPlus::weaken (my $this = $self);
3909
3910 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3911
3912 $self
3913}
3914
3915sub reorder {
3916 my ($self) = @_;
3917 my $NOW = Time::HiRes::time;
3918
3919 # freeze display when hovering over any label
3920 return if $CFPlus::UI::TOOLTIP->{owner}
3921 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3922 values %{ $self->{item} };
3923
3924 while (my ($k, $v) = each %{ $self->{item} }) {
3925 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3926 }
3927
3928 my @widgets;
3929
3930 my @items = sort {
3931 $a->{pri} <=> $b->{pri}
3932 or $b->{id} <=> $a->{id}
3933 } values %{ $self->{item} };
3934
3935 $self->{timer}->interval (1);
3936
3937 my $count = 10 + 1;
3938 for my $item (@items) {
3939 last unless --$count;
3940
3941 my $label = $item->{label} ||= do {
3942 # TODO: doesn't handle markup well (read as: at all)
3943 my $short = $item->{count} > 1
3944 ? "<b>$item->{count} ×</b> $item->{text}"
3945 : $item->{text};
3946
3947 for ($short) {
3948 s/^\s+//;
3949 s/\s+/ /g;
3950 }
3951
3952 new CFPlus::UI::Label
3953 markup => $short,
3954 tooltip => $item->{tooltip},
3955 tooltip_font => $::FONT_PROP,
3956 tooltip_width => 0.67,
3957 fontsize => $item->{fontsize} || $self->{fontsize},
3958 max_w => $::WIDTH * 0.44,
3959 fg => [@{ $item->{fg} }],
3960 can_events => 1,
3961 can_hover => 1
3962 };
3963
3964 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3965 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3966 $label->update;
3967 $label->set_max_size (undef, $label->{req_h} * $diff)
3968 if $diff < 1;
3969 $self->{timer}->interval (1/30);
3970 } else {
3971 $label->{fg}[3] = $item->{fg}[3] || 1;
3972 }
3973
3974 push @widgets, $label;
3975 }
3976
3977 $self->clear;
3978 $self->SUPER::add (reverse @widgets);
3979}
3980
3981sub add {
3982 my ($self, $text, %arg) = @_;
3983
3984 $text =~ s/^\s+//;
3985 $text =~ s/\s+$//;
3986
3987 return unless $text;
3988
3989 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3990
3991 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3992
3993 if (my $item = $self->{item}{$group}) {
3994 if ($item->{text} eq $text) {
3995 $item->{count}++;
3996 } else {
3997 $item->{count} = 1;
3998 $item->{text} = $item->{tooltip} = $text;
3999 }
4000 $item->{id} += 0.2;#d#
4001 $item->{timeout} = $timeout;
4002 delete $item->{label};
4003 } else {
4004 $self->{item}{$group} = {
4005 id => ++$self->{id},
4006 text => $text,
4007 timeout => $timeout,
4008 tooltip => $text,
4009 fg => [0.8, 0.8, 0.8, 0.8],
4010 pri => 0,
4011 count => 1,
4012 %arg,
4013 };
4014 }
4015
4016 $ROOT->on_refresh (reorder => sub {
4017 $self->reorder;
4018 });
4019}
4020
2420sub configure { 4021sub reconfigure {
4022 my ($self) = @_;
4023
4024 delete $_->{label}
4025 for values %{ $self->{item} || {} };
4026
4027 $self->reorder;
4028 $self->SUPER::reconfigure;
4029}
4030
4031sub destroy {
4032 my ($self) = @_;
4033
4034 $self->{timer}->cancel;
4035
4036 $self->SUPER::destroy;
4037}
4038
4039#############################################################################
4040
4041package CFPlus::UI::Root;
4042
4043our @ISA = CFPlus::UI::Container::;
4044
4045use List::Util qw(min max);
4046
4047use CFPlus::OpenGL;
4048
4049sub new {
4050 my $class = shift;
4051
4052 my $self = $class->SUPER::new (
4053 visible => 1,
4054 @_,
4055 );
4056
4057 CFPlus::weaken ($self->{root} = $self);
4058
4059 $self
4060}
4061
4062sub size_request {
4063 my ($self) = @_;
4064
4065 ($self->{w}, $self->{h})
4066}
4067
4068sub _to_pixel {
4069 my ($coord, $size, $max) = @_;
4070
4071 $coord =
4072 $coord eq "center" ? ($max - $size) * 0.5
4073 : $coord eq "max" ? $max
4074 : $coord;
4075
4076 $coord = 0 if $coord < 0;
4077 $coord = $max - $size if $coord > $max - $size;
4078
4079 int $coord + 0.5
4080}
4081
4082sub invoke_size_allocate {
2421 my ($self, $x, $y, $w, $h) = @_; 4083 my ($self, $w, $h) = @_;
2422 4084
2423 $self->SUPER::configure ($x, $y, $w, $h);
2424
2425 for my $child (@{$self->{children}}) { 4085 for my $child ($self->children) {
2426 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4086 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2427 4087
2428 $X = List::Util::max 0, List::Util::min $w - $W, $X; 4088 $X = $child->{force_x} if exists $child->{force_x};
2429 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 4089 $Y = $child->{force_y} if exists $child->{force_y};
4090
4091 $X = _to_pixel $X, $W, $self->{w};
4092 $Y = _to_pixel $Y, $H, $self->{h};
4093
2430 $child->configure ($X, $Y, $W,$H); 4094 $child->configure ($X, $Y, $W, $H);
4095 }
4096
2431 } 4097 1
2432} 4098}
2433 4099
2434sub _topleft { 4100sub coord2local {
2435 my ($self, $x, $y) = @_; 4101 my ($self, $x, $y) = @_;
2436 4102
2437 ($x, $y) 4103 ($x, $y)
2438} 4104}
2439 4105
4106sub coord2global {
4107 my ($self, $x, $y) = @_;
4108
4109 ($x, $y)
4110}
4111
2440sub update { 4112sub update {
2441 my ($self) = @_; 4113 my ($self) = @_;
2442 4114
2443 $self->check_size; 4115 $::WANT_REFRESH++;
2444 ::refresh ();
2445} 4116}
2446 4117
2447sub add { 4118sub add {
2448 my ($self, $child) = @_; 4119 my ($self, @children) = @_;
2449 4120
2450 # integerize window positions 4121 $_->{is_toplevel} = 1
2451 $child->{x} = int $child->{x}; 4122 for @children;
2452 $child->{y} = int $child->{y};
2453 4123
2454 $self->SUPER::add ($child); 4124 $self->SUPER::add (@children);
4125}
4126
4127sub remove {
4128 my ($self, @children) = @_;
4129
4130 $self->SUPER::remove (@children);
4131
4132 delete $self->{is_toplevel}
4133 for @children;
4134
4135 while (@children) {
4136 my $w = pop @children;
4137 push @children, $w->children;
4138 $w->set_invisible;
4139 }
2455} 4140}
2456 4141
2457sub on_refresh { 4142sub on_refresh {
2458 my ($self, $id, $cb) = @_; 4143 my ($self, $id, $cb) = @_;
2459 4144
2460 $self->{refresh_hook}{$id} = $cb; 4145 $self->{refresh_hook}{$id} = $cb;
2461} 4146}
2462 4147
4148sub on_post_alloc {
4149 my ($self, $id, $cb) = @_;
4150
4151 $self->{post_alloc_hook}{$id} = $cb;
4152}
4153
2463sub draw { 4154sub draw {
2464 my ($self) = @_; 4155 my ($self) = @_;
2465 4156
2466 while (my $rcb = delete $self->{refresh_hook}) { 4157 while ($self->{refresh_hook}) {
2467 $_->() for values %$rcb; 4158 $_->()
4159 for values %{delete $self->{refresh_hook}};
2468 } 4160 }
4161
4162 if ($self->{realloc}) {
4163 my %queue;
4164 my @queue;
4165 my $widget;
4166
4167 outer:
4168 while () {
4169 if (my $realloc = delete $self->{realloc}) {
4170 for $widget (values %$realloc) {
4171 $widget->{visible} or next; # do not resize invisible widgets
4172
4173 $queue{$widget+0}++ and next; # duplicates are common
4174
4175 push @{ $queue[$widget->{visible}] }, $widget;
4176 }
4177 }
4178
4179 while () {
4180 @queue or last outer;
4181
4182 $widget = pop @{ $queue[-1] || [] }
4183 and last;
4184
4185 pop @queue;
4186 }
4187
4188 delete $queue{$widget+0};
4189
4190 my ($w, $h) = $widget->size_request;
4191
4192 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
4193 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4194
4195 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4196 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4197
4198 $w = $widget->{force_w} if exists $widget->{force_w};
4199 $h = $widget->{force_h} if exists $widget->{force_h};
4200
4201 if ($widget->{req_w} != $w || $widget->{req_h} != $h
4202 || delete $widget->{force_realloc}) {
4203 $widget->{req_w} = $w;
4204 $widget->{req_h} = $h;
4205
4206 $self->{size_alloc}{$widget+0} = $widget;
4207
4208 if (my $parent = $widget->{parent}) {
4209 $self->{realloc}{$parent+0} = $parent
4210 unless $queue{$parent+0};
4211
4212 $parent->{force_size_alloc} = 1;
4213 $self->{size_alloc}{$parent+0} = $parent;
4214 }
4215 }
4216
4217 delete $self->{realloc}{$widget+0};
4218 }
4219 }
4220
4221 while (my $size_alloc = delete $self->{size_alloc}) {
4222 my @queue = sort { $b->{visible} <=> $a->{visible} }
4223 values %$size_alloc;
4224
4225 while () {
4226 my $widget = pop @queue || last;
4227
4228 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4229
4230 $w = 0 if $w < 0;
4231 $h = 0 if $h < 0;
4232
4233 $w = max $widget->{min_w}, $w;
4234 $h = max $widget->{min_h}, $h;
4235
4236# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4237# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4238
4239 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4240 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4241
4242 $w = int $w + 0.5;
4243 $h = int $h + 0.5;
4244
4245 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4246 $widget->{old_w} = $widget->{w};
4247 $widget->{old_h} = $widget->{h};
4248
4249 $widget->{w} = $w;
4250 $widget->{h} = $h;
4251
4252 $widget->emit (size_allocate => $w, $h);
4253 }
4254 }
4255 }
4256
4257 while ($self->{post_alloc_hook}) {
4258 $_->()
4259 for values %{delete $self->{post_alloc_hook}};
4260 }
4261
2469 4262
2470 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4263 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2471 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4264 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2472 glClear GL_COLOR_BUFFER_BIT; 4265 glClear GL_COLOR_BUFFER_BIT;
2473 4266
2474 glMatrixMode GL_PROJECTION; 4267 glMatrixMode GL_PROJECTION;
2475 glLoadIdentity; 4268 glLoadIdentity;
2476 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4269 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2477 glMatrixMode GL_MODELVIEW; 4270 glMatrixMode GL_MODELVIEW;
2478 glLoadIdentity; 4271 glLoadIdentity;
2479 4272
4273 {
4274 package CFPlus::UI::Base;
4275
4276 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4277 (0, 0, $self->{w}, $self->{h});
4278
2480 $self->_draw; 4279 $self->_draw;
4280 }
2481} 4281}
2482 4282
2483############################################################################# 4283#############################################################################
2484 4284
2485package CFClient::UI; 4285package CFPlus::UI;
2486 4286
2487$ROOT = new CFClient::UI::Root; 4287$ROOT = new CFPlus::UI::Root;
2488$TOOLTIP = new CFClient::UI::Tooltip; 4288$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
2489 4289
24901 42901
2491 4291

Diff Legend

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