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.190 by root, Mon May 8 22:17:38 2006 UTC vs.
Revision 1.372 by root, Sun Jul 15 22:13:43 2007 UTC

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

Diff Legend

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