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

Diff Legend

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