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

Diff Legend

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