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.371 by root, Sun Jul 15 22:07:48 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 vp => (new CFPlus::UI::ViewPort expand => 1),
1067 can_events => 1,
1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
1072 %arg,
1073 );
1074
1075 $self->SUPER::add (0, 0, $self->{vp});
1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078
1079 $self->add ($child) if $child;
1080
1081 $self
1082}
1083
1084#TODO# update range on size_allocate depending on child
1085
1086sub add {
1087 my ($self, $widget) = @_;
1088
1089 $self->{vp}->add ($self->{child} = $widget);
1090}
1091
1092sub invoke_mouse_wheel {
1093 my ($self, $ev) = @_;
1094
1095 return 0 unless $ev->{dy}; # only vertical movements
1096
1097 $self->{vslider}->emit (mouse_wheel => $ev);
1098
1099 1
1100}
1101
1102sub update_slider {
1103 my ($self) = @_;
1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1108 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1109 #$self->{hslider}->set_visibility ($w1 != $w2);
1110
1111 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1112 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1113 #$self->{vslider}->set_visibility ($h1 != $h2);
1114}
1115
1116sub update {
1117 my ($self) = @_;
1118
1119 $self->SUPER::update;
1120 $self->update_slider;
1121}
1122
1123sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_;
1125
1126 $self->update_slider;
1127 $self->SUPER::invoke_size_allocate ($w, $h)
1128}
1129
1130#############################################################################
1131
1132package CFPlus::UI::Frame;
1133
812our @ISA = CFClient::UI::HBox::; 1134our @ISA = CFPlus::UI::Bin::;
1135
1136use CFPlus::OpenGL;
813 1137
814sub new { 1138sub new {
815 my $class = shift; 1139 my $class = shift;
816 1140
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 ( 1141 $class->SUPER::new (
828 vp => (new CFClient::UI::ViewPort), 1142 bg => undef,
829 slider => $slider,
830 @_, 1143 @_,
1144 )
1145}
1146
1147sub _draw {
1148 my ($self) = @_;
1149
1150 if ($self->{bg}) {
1151 my ($w, $h) = @$self{qw(w h)};
1152
1153 glEnable GL_BLEND;
1154 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1155 glColor_premultiply @{ $self->{bg} };
1156
1157 glBegin GL_QUADS;
1158 glVertex 0 , 0;
1159 glVertex 0 , $h;
1160 glVertex $w, $h;
1161 glVertex $w, 0;
1162 glEnd;
1163
1164 glDisable GL_BLEND;
1165 }
1166
1167 $self->SUPER::_draw;
1168}
1169
1170#############################################################################
1171
1172package CFPlus::UI::FancyFrame;
1173
1174our @ISA = CFPlus::UI::Bin::;
1175
1176use CFPlus::OpenGL;
1177
1178sub new {
1179 my ($class, %arg) = @_;
1180
1181 if ((exists $arg{label}) && !ref $arg{label}) {
1182 $arg{label} = new CFPlus::UI::Label
1183 align => 1,
1184 valign => 0,
1185 text => $arg{label},
1186 fontsize => ($arg{border} || 0.8) * 0.75;
1187 }
1188
1189 my $self = $class->SUPER::new (
1190 # label => "",
1191 fg => [0.6, 0.3, 0.1],
1192 border => 0.8,
1193 style => 'single',
1194 %arg,
831 ); 1195 );
832 1196
833 $self->{vp}->add ($self->{scrolled});
834 $self->add ($self->{vp});
835 $self->add ($self->{slider});
836
837 $self 1197 $self
838} 1198}
839 1199
840#TODO# update range on size_allocate depeneing on child 1200sub 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) = @_; 1201 my ($self, @widgets) = @_;
866 1202
867 my ($w, $h) = ($self->{w}, $self->{h}); 1203 $self->SUPER::add (@widgets);
868 1204 $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} 1205}
921 1206
922sub border { 1207sub border {
923 int $_[0]{border} * $::FONTSIZE 1208 int $_[0]{border} * $::FONTSIZE
924} 1209}
925 1210
926sub size_request { 1211sub size_request {
927 my ($self) = @_; 1212 my ($self) = @_;
1213
1214 ($self->{label_w}, undef) = $self->{label}->size_request
1215 if $self->{label};
928 1216
929 my ($w, $h) = $self->SUPER::size_request; 1217 my ($w, $h) = $self->SUPER::size_request;
930 1218
931 ( 1219 (
932 $w + $self->border * 2, 1220 $w + $self->border * 2,
933 $h + $self->border * 2, 1221 $h + $self->border * 2,
934 ) 1222 )
935} 1223}
936 1224
937sub size_allocate { 1225sub invoke_size_allocate {
938 my ($self, $w, $h) = @_; 1226 my ($self, $w, $h) = @_;
939 1227
940 $h -= List::Util::max 0, $self->border * 2; 1228 my $border = $self->border;
1229
941 $w -= List::Util::max 0, $self->border * 2; 1230 $w -= List::Util::max 0, $border * 2;
1231 $h -= List::Util::max 0, $border * 2;
942 1232
943 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1233 if (my $label = $self->{label}) {
944 if $self->{title}; 1234 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1235 $label->{h} = List::Util::min $h, $border;
1236 $label->invoke_size_allocate ($label->{w}, $label->{h});
1237 }
945 1238
946 $self->child->configure ($self->border, $self->border, $w, $h); 1239 $self->child->configure ($border, $border, $w, $h);
947}
948 1240
1241 1
1242}
1243
1244sub _draw {
1245 my ($self) = @_;
1246
1247 my $child = $self->{children}[0];
1248
1249 my $border = $self->border;
1250 my ($w, $h) = ($self->{w}, $self->{h});
1251
1252 $child->draw;
1253
1254 glColor @{$self->{fg}};
1255 glBegin GL_LINE_STRIP;
1256 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1257 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1258 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1259 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1260 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1261 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1262 glEnd;
1263
1264 if ($self->{label}) {
1265 glTranslate $border * 2, 0;
1266 $self->{label}->_draw;
1267 }
1268}
1269
1270#############################################################################
1271
1272package CFPlus::UI::Toplevel;
1273
1274our @ISA = CFPlus::UI::Bin::;
1275
1276use CFPlus::OpenGL;
1277
1278my $bg =
1279 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1280 mipmap => 1, wrap => 1;
1281
1282my @border =
1283 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1284 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1285
1286sub new {
1287 my ($class, %arg) = @_;
1288
1289 my $self = $class->SUPER::new (
1290 bg => [1, 1, 1, 1],
1291 border_bg => [1, 1, 1, 1],
1292 border => 0.6,
1293 can_events => 1,
1294 min_w => 64,
1295 min_h => 32,
1296 %arg,
1297 );
1298
1299 $self->{title_widget} = new CFPlus::UI::Label
1300 align => 0,
1301 valign => 1,
1302 text => $self->{title},
1303 fontsize => $self->{border},
1304 if exists $self->{title};
1305
1306 if ($self->{has_close_button}) {
1307 $self->{close_button} =
1308 new CFPlus::UI::ImageButton
1309 path => 'x1_close.png',
1310 on_activate => sub { $self->emit ("delete") };
1311
1312 $self->CFPlus::UI::Container::add ($self->{close_button});
1313 }
1314
1315 $self
1316}
1317
1318sub add {
1319 my ($self, @widgets) = @_;
1320
1321 $self->SUPER::add (@widgets);
1322 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1323 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1324}
1325
1326sub border {
1327 int $_[0]{border} * $::FONTSIZE
1328}
1329
1330sub size_request {
1331 my ($self) = @_;
1332
1333 $self->{title_widget}->size_request
1334 if $self->{title_widget};
1335
1336 $self->{close_button}->size_request
1337 if $self->{close_button};
1338
1339 my ($w, $h) = $self->SUPER::size_request;
1340
1341 (
1342 $w + $self->border * 2,
1343 $h + $self->border * 2,
1344 )
1345}
1346
1347sub invoke_size_allocate {
1348 my ($self, $w, $h) = @_;
1349
1350 if ($self->{title_widget}) {
1351 $self->{title_widget}{w} = $w;
1352 $self->{title_widget}{h} = $h;
1353 $self->{title_widget}->invoke_size_allocate ($w, $h);
1354 }
1355
1356 my $border = $self->border;
1357
1358 $h -= List::Util::max 0, $border * 2;
1359 $w -= List::Util::max 0, $border * 2;
1360
1361 $self->child->configure ($border, $border, $w, $h);
1362
1363 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1364 if $self->{close_button};
1365
1366 1
1367}
1368
1369sub invoke_delete {
1370 my ($self) = @_;
1371
1372 $self->hide;
1373
1374 1
1375}
1376
949sub button_down { 1377sub invoke_button_down {
950 my ($self, $ev, $x, $y) = @_; 1378 my ($self, $ev, $x, $y) = @_;
951 1379
952 my ($w, $h) = @$self{qw(w h)}; 1380 my ($w, $h) = @$self{qw(w h)};
953 my $border = $self->border; 1381 my $border = $self->border;
954 1382
… …
967 my ($ev, $x, $y) = @_; 1395 my ($ev, $x, $y) = @_;
968 1396
969 my $dx = $ev->{x} - $ox; 1397 my $dx = $ev->{x} - $ox;
970 my $dy = $ev->{y} - $oy; 1398 my $dy = $ev->{y} - $oy;
971 1399
972 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1400 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
973 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1401 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1402
974 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1403 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
975 $self->check_size; 1404 $self->realloc;
976 }; 1405 };
977 1406
978 } elsif ($lr ^ $td) { 1407 } elsif ($lr ^ $td) {
979 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1408 my ($ox, $oy) = ($ev->{x}, $ev->{y});
980 my ($bx, $by) = ($self->{x}, $self->{y}); 1409 my ($bx, $by) = ($self->{x}, $self->{y});
… …
982 $self->{motion} = sub { 1411 $self->{motion} = sub {
983 my ($ev, $x, $y) = @_; 1412 my ($ev, $x, $y) = @_;
984 1413
985 ($x, $y) = ($ev->{x}, $ev->{y}); 1414 ($x, $y) = ($ev->{x}, $ev->{y});
986 1415
987 $self->move ($bx + $x - $ox, $by + $y - $oy); 1416 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
988 $self->update; 1417 # HACK: the next line is required to enforce placement
1418 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
989 }; 1419 };
1420 } else {
1421 return 0;
1422 }
1423
990 } 1424 1
991} 1425}
992 1426
993sub button_up { 1427sub invoke_button_up {
994 my ($self, $ev, $x, $y) = @_; 1428 my ($self, $ev, $x, $y) = @_;
995 1429
996 delete $self->{motion}; 1430 ! ! delete $self->{motion}
997} 1431}
998 1432
999sub mouse_motion { 1433sub invoke_mouse_motion {
1000 my ($self, $ev, $x, $y) = @_; 1434 my ($self, $ev, $x, $y) = @_;
1001 1435
1002 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1436 $self->{motion}->($ev, $x, $y) if $self->{motion};
1437
1438 ! ! $self->{motion}
1439}
1440
1441sub invoke_visibility_change {
1442 my ($self, $visible) = @_;
1443
1444 delete $self->{motion} unless $visible;
1445
1446 0
1003} 1447}
1004 1448
1005sub _draw { 1449sub _draw {
1006 my ($self) = @_; 1450 my ($self) = @_;
1007 1451
1452 my $child = $self->{children}[0];
1453
1008 my ($w, $h ) = ($self->{w}, $self->{h}); 1454 my ($w, $h ) = ($self->{w}, $self->{h});
1009 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1455 my ($cw, $ch) = ($child->{w}, $child->{h});
1010 1456
1011 glEnable GL_BLEND;
1012 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1013 glEnable GL_TEXTURE_2D; 1457 glEnable GL_TEXTURE_2D;
1014 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1015 1459
1016 my $border = $self->border; 1460 my $border = $self->border;
1017 1461
1018 glColor @{ $self->{border_bg} }; 1462 glColor @{ $self->{border_bg} };
1019 $tex[1]->draw_quad (0, 0, $w, $border); 1463 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1020 $tex[3]->draw_quad (0, $border, $border, $ch); 1464 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1021 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1465 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1022 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1466 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1023 1467
1024 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1468 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1025 my $bg = $tex[0]; 1469 glColor @{ $self->{bg} };
1026 1470
1027 # TODO: repeat texture not scale 1471 # TODO: repeat texture not scale
1472 # solve this better(?)
1028 my $rep_x = $cw / $bg->{w}; 1473 $bg->{s} = $cw / $bg->{w};
1029 my $rep_y = $ch / $bg->{h}; 1474 $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); 1475 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1476 }
1037 1477
1038 glDisable GL_TEXTURE_2D; 1478 glDisable GL_TEXTURE_2D;
1039 glDisable GL_BLEND;
1040 }
1041 1479
1042 $self->{title}->draw if $self->{title};
1043
1044 $self->child->draw; 1480 $child->draw;
1481
1482 if ($self->{title_widget}) {
1483 glTranslate 0, $border - $self->{h};
1484 $self->{title_widget}->_draw;
1485
1486 glTranslate 0, - ($border - $self->{h});
1487 }
1488
1489 $self->{close_button}->draw
1490 if $self->{close_button};
1045} 1491}
1046 1492
1047############################################################################# 1493#############################################################################
1048 1494
1049package CFClient::UI::Table; 1495package CFPlus::UI::Table;
1050 1496
1051our @ISA = CFClient::UI::Base::; 1497our @ISA = CFPlus::UI::Base::;
1052 1498
1053use List::Util qw(max sum); 1499use List::Util qw(max sum);
1054 1500
1055use CFClient::OpenGL; 1501use CFPlus::OpenGL;
1056 1502
1057sub new { 1503sub new {
1058 my $class = shift; 1504 my $class = shift;
1059 1505
1060 $class->SUPER::new ( 1506 $class->SUPER::new (
1061 col_expand => [], 1507 col_expand => [],
1508 row_expand => [],
1062 @_ 1509 @_,
1063 ) 1510 )
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} 1511}
1074 1512
1075sub children { 1513sub children {
1076 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1514 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1077} 1515}
1078 1516
1517sub add {
1518 my ($self) = shift;
1519
1520 while (@_) {
1521 my ($x, $y, $child) = splice @_, 0, 3, ();
1522 $child->set_parent ($self);
1523 $self->{children}[$y][$x] = $child;
1524 }
1525
1526 $self->{force_realloc} = 1;
1527 $self->{force_size_alloc} = 1;
1528 $self->realloc;
1529}
1530
1531sub remove {
1532 my ($self, $child) = @_;
1533
1534 # TODO: not yet implemented
1535}
1536
1079# TODO: move to container class maybe? send childs a signal on removal? 1537# TODO: move to container class maybe? send children a signal on removal?
1080sub clear { 1538sub clear {
1081 my ($self) = @_; 1539 my ($self) = @_;
1082 1540
1083 my @children = $self->children; 1541 my @children = $self->children;
1084 delete $self->{children}; 1542 delete $self->{children};
… …
1086 for (@children) { 1544 for (@children) {
1087 delete $_->{parent}; 1545 delete $_->{parent};
1088 $_->hide; 1546 $_->hide;
1089 } 1547 }
1090 1548
1091 $self->update; 1549 $self->realloc;
1092} 1550}
1093 1551
1094sub get_wh { 1552sub get_wh {
1095 my ($self) = @_; 1553 my ($self) = @_;
1096 1554
… …
1122 (sum @$ws), 1580 (sum @$ws),
1123 (sum @$hs), 1581 (sum @$hs),
1124 ) 1582 )
1125} 1583}
1126 1584
1127sub size_allocate { 1585sub invoke_size_allocate {
1128 my ($self, $w, $h) = @_; 1586 my ($self, $w, $h) = @_;
1129 1587
1130 my ($ws, $hs) = $self->get_wh; 1588 my ($ws, $hs) = $self->get_wh;
1131 1589
1132 my $req_w = sum @$ws; 1590 my $req_w = (sum @$ws) || 1;
1133 my $req_h = sum @$hs; 1591 my $req_h = (sum @$hs) || 1;
1134 1592
1135 # TODO: nicer code && do row_expand 1593 # TODO: nicer code
1136 my @col_expand = @{$self->{col_expand}}; 1594 my @col_expand = @{$self->{col_expand}};
1137 @col_expand = (1) x @$ws unless @col_expand; 1595 @col_expand = (1) x @$ws unless @col_expand;
1138 my $col_expand = (sum @col_expand) || 1; 1596 my $col_expand = (sum @col_expand) || 1;
1139 1597
1140 # linearly scale sizes
1141 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1142 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1143 1599
1144 CFClient::UI::harmonize $ws; 1600 CFPlus::UI::harmonize $ws;
1601
1602 my @row_expand = @{$self->{row_expand}};
1603 @row_expand = (1) x @$ws unless @row_expand;
1604 my $row_expand = (sum @row_expand) || 1;
1605
1606 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607
1145 CFClient::UI::harmonize $hs; 1608 CFPlus::UI::harmonize $hs;
1146 1609
1147 my $y; 1610 my $y;
1148 1611
1149 for my $r (0 .. $#{$self->{children}}) { 1612 for my $r (0 .. $#{$self->{children}}) {
1150 my $row = $self->{children}[$r] 1613 my $row = $self->{children}[$r]
… …
1164 } 1627 }
1165 1628
1166 $y += $row_h; 1629 $y += $row_h;
1167 } 1630 }
1168 1631
1632 1
1169} 1633}
1170 1634
1171sub find_widget { 1635sub find_widget {
1172 my ($self, $x, $y) = @_; 1636 my ($self, $x, $y) = @_;
1173 1637
… …
1192 } 1656 }
1193} 1657}
1194 1658
1195############################################################################# 1659#############################################################################
1196 1660
1197package CFClient::UI::HBox; 1661package CFPlus::UI::Box;
1198 1662
1199# TODO: wrap into common Box base class
1200
1201our @ISA = CFClient::UI::Container::; 1663our @ISA = CFPlus::UI::Container::;
1202 1664
1203sub size_request { 1665sub size_request {
1204 my ($self) = @_; 1666 my ($self) = @_;
1205 1667
1206 my @alloc = map [$_->size_request], @{$self->{children}}; 1668 $self->{vertical}
1669 ? (
1670 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1671 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1672 )
1673 : (
1674 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1675 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1676 )
1677}
1207 1678
1679sub invoke_size_allocate {
1680 my ($self, $w, $h) = @_;
1681
1682 my $space = $self->{vertical} ? $h : $w;
1683 my @children = $self->visible_children;
1684
1685 my @req;
1686
1687 if ($self->{homogeneous}) {
1688 @req = ($space / (@children || 1)) x @children;
1689 } else {
1690 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1691 my $req = List::Util::sum @req;
1692
1693 if ($req > $space) {
1694 # ah well, not enough space
1695 $_ *= $space / $req for @req;
1696 } else {
1697 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1698
1699 $space = ($space - $req) / $expand; # remaining space to give away
1700
1701 $req[$_] += $space * $children[$_]{expand}
1702 for 0 .. $#children;
1703 }
1208 ( 1704 }
1209 (List::Util::sum map $_->[0], @alloc), 1705
1210 (List::Util::max map $_->[1], @alloc), 1706 CFPlus::UI::harmonize \@req;
1707
1708 my $pos = 0;
1709 for (0 .. $#children) {
1710 my $alloc = $req[$_];
1711 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1712
1713 $pos += $alloc;
1714 }
1715
1716 1
1717}
1718
1719#############################################################################
1720
1721package CFPlus::UI::HBox;
1722
1723our @ISA = CFPlus::UI::Box::;
1724
1725sub new {
1726 my $class = shift;
1727
1728 $class->SUPER::new (
1729 vertical => 0,
1730 @_,
1211 ) 1731 )
1212} 1732}
1213 1733
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############################################################################# 1734#############################################################################
1256 1735
1257package CFClient::UI::VBox; 1736package CFPlus::UI::VBox;
1258 1737
1259# TODO: wrap into common Box base class 1738our @ISA = CFPlus::UI::Box::;
1260 1739
1261our @ISA = CFClient::UI::Container::; 1740sub new {
1741 my $class = shift;
1262 1742
1263sub size_request { 1743 $class->SUPER::new (
1264 my ($self) = @_; 1744 vertical => 1,
1265 1745 @_,
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 ) 1746 )
1272} 1747}
1273 1748
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############################################################################# 1749#############################################################################
1312 1750
1313package CFClient::UI::Label; 1751package CFPlus::UI::Label;
1314 1752
1315our @ISA = CFClient::UI::Base::; 1753our @ISA = CFPlus::UI::DrawBG::;
1316 1754
1317use CFClient::OpenGL; 1755use CFPlus::OpenGL;
1318 1756
1319sub new { 1757sub new {
1320 my ($class, %arg) = @_; 1758 my ($class, %arg) = @_;
1321 1759
1322 my $self = $class->SUPER::new ( 1760 my $self = $class->SUPER::new (
1323 fg => [1, 1, 1], 1761 fg => [1, 1, 1],
1762 #bg => none
1763 #active_bg => none
1324 #font => default_font 1764 #font => default_font
1765 #text => initial text
1766 #markup => initial narkup
1767 #max_w => maximum pixel width
1768 #style => 0, # render flags
1769 ellipsise => 3, # end
1770 layout => (new CFPlus::Layout),
1325 fontsize => 1, 1771 fontsize => 1,
1326 text => "",
1327 align => -1, 1772 align => -1,
1328 valign => -1, 1773 valign => -1,
1329 padding => 2, 1774 padding_x => 2,
1330 layout => new CFClient::Layout, 1775 padding_y => 2,
1331 can_events => 0, 1776 can_events => 0,
1332 %arg 1777 %arg
1333 ); 1778 );
1334 1779
1335 if (exists $self->{template}) { 1780 if (exists $self->{template}) {
1336 my $layout = new CFClient::Layout; 1781 my $layout = new CFPlus::Layout;
1337 $layout->set_text (delete $self->{template}); 1782 $layout->set_text (delete $self->{template});
1338 $self->{template} = $layout; 1783 $self->{template} = $layout;
1339 } 1784 }
1340 1785
1341 $self->set_text (delete $self->{text}) if exists $self->{text}; 1786 if (exists $self->{markup}) {
1342 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1787 $self->set_markup (delete $self->{markup});
1788 } else {
1789 $self->set_text (delete $self->{text});
1790 }
1343 1791
1344 $self 1792 $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} 1793}
1356 1794
1357sub update { 1795sub update {
1358 my ($self) = @_; 1796 my ($self) = @_;
1359 1797
1360 delete $self->{texture}; 1798 delete $self->{texture};
1361 $self->SUPER::update; 1799 $self->SUPER::update;
1362} 1800}
1363 1801
1802sub realloc {
1803 my ($self) = @_;
1804
1805 delete $self->{ox};
1806 $self->SUPER::realloc;
1807}
1808
1364sub set_text { 1809sub set_text {
1365 my ($self, $text) = @_; 1810 my ($self, $text) = @_;
1366 1811
1367 return if $self->{text} eq "T$text"; 1812 return if $self->{text} eq "T$text";
1368 $self->{text} = "T$text"; 1813 $self->{text} = "T$text";
1369 1814
1370 $self->{layout}->set_text ($text); 1815 $self->{layout}->set_text ($text);
1371 1816
1372 delete $self->{texture}; 1817 delete $self->{size_req};
1818 $self->realloc;
1373 $self->update; 1819 $self->update;
1374 $self->check_size;
1375} 1820}
1376 1821
1377sub set_markup { 1822sub set_markup {
1378 my ($self, $markup) = @_; 1823 my ($self, $markup) = @_;
1379 1824
1380 return if $self->{text} eq "M$markup"; 1825 return if $self->{text} eq "M$markup";
1381 $self->{text} = "M$markup"; 1826 $self->{text} = "M$markup";
1382 1827
1828 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1829
1383 $self->{layout}->set_markup ($markup); 1830 $self->{layout}->set_markup ($markup);
1384 1831
1385 delete $self->{texture}; 1832 delete $self->{size_req};
1833 $self->realloc;
1386 $self->update; 1834 $self->update;
1387 $self->check_size;
1388} 1835}
1389 1836
1390sub size_request { 1837sub size_request {
1391 my ($self) = @_; 1838 my ($self) = @_;
1392 1839
1840 $self->{size_req} ||= do {
1393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1841 $self->{layout}->set_font ($self->{font}) if $self->{font};
1394 $self->{layout}->set_width ($self->{max_w} || -1); 1842 $self->{layout}->set_width ($self->{max_w} || -1);
1843 $self->{layout}->set_ellipsise ($self->{ellipsise});
1844 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1845 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1396 1846
1397 my ($w, $h) = $self->{layout}->size; 1847 my ($w, $h) = $self->{layout}->size;
1398 1848
1399 if (exists $self->{template}) { 1849 if (exists $self->{template}) {
1400 $self->{template}->set_font ($self->{font}) if $self->{font}; 1850 $self->{template}->set_font ($self->{font}) if $self->{font};
1851 $self->{template}->set_width ($self->{max_w} || -1);
1401 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1852 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1402 1853
1403 my ($w2, $h2) = $self->{template}->size; 1854 my ($w2, $h2) = $self->{template}->size;
1404 1855
1405 $w = List::Util::max $w, $w2; 1856 $w = List::Util::max $w, $w2;
1406 $h = List::Util::max $h, $h2; 1857 $h = List::Util::max $h, $h2;
1858 }
1859
1860 [$w, $h]
1407 } 1861 };
1408 1862
1409 ( 1863 @{ $self->{size_req} }
1410 $w + $self->{padding} * 2,
1411 $h + $self->{padding} * 2,
1412 )
1413} 1864}
1414 1865
1866sub baseline_shift {
1867 $_[0]{layout}->descent
1868}
1869
1415sub size_allocate { 1870sub invoke_size_allocate {
1416 my ($self, $w, $h) = @_; 1871 my ($self, $w, $h) = @_;
1417 1872
1873 delete $self->{ox};
1874
1418 delete $self->{texture}; 1875 delete $self->{texture}
1876 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1877
1878 1
1419} 1879}
1420 1880
1421sub set_fontsize { 1881sub set_fontsize {
1422 my ($self, $fontsize) = @_; 1882 my ($self, $fontsize) = @_;
1423 1883
1424 $self->{fontsize} = $fontsize; 1884 $self->{fontsize} = $fontsize;
1885 delete $self->{size_req};
1425 delete $self->{texture}; 1886 delete $self->{texture};
1426 1887
1427 $self->update; 1888 $self->realloc;
1428 $self->check_size; 1889}
1890
1891sub reconfigure {
1892 my ($self) = @_;
1893
1894 delete $self->{size_req};
1895 delete $self->{texture};
1896
1897 $self->SUPER::reconfigure;
1429} 1898}
1430 1899
1431sub _draw { 1900sub _draw {
1432 my ($self) = @_; 1901 my ($self) = @_;
1433 1902
1903 $self->SUPER::_draw; # draw background, if applicable
1904
1434 my $tex = $self->{texture} ||= do { 1905 my $size = $self->{texture} ||= do {
1906 $self->{layout}->set_foreground (@{$self->{fg}});
1435 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1907 $self->{layout}->set_font ($self->{font}) if $self->{font};
1436 $self->{layout}->set_width ($self->{w}); 1908 $self->{layout}->set_width ($self->{w});
1909 $self->{layout}->set_ellipsise ($self->{ellipsise});
1910 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1437 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1911 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1438 new_from_layout CFClient::Texture $self->{layout} 1912
1913 [$self->{layout}->size]
1439 }; 1914 };
1440 1915
1441 glEnable GL_BLEND; 1916 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} 1917 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1918 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1451 : ($self->{w} - $tex->{w}) * 0.5 1919 : ($self->{w} - $size->[0]) * 0.5);
1452 );
1453 1920
1454 $self->{oy} = int (
1455 $self->{valign} < 0 ? $self->{padding} 1921 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1922 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1457 : ($self->{h} - $tex->{h}) * 0.5 1923 : ($self->{h} - $size->[1]) * 0.5);
1458 ); 1924 };
1459 1925
1460 $tex->draw_quad ($self->{ox}, $self->{oy}); 1926 my $w = List::Util::min $self->{w} + 4, $size->[0];
1927 my $h = List::Util::min $self->{h} + 2, $size->[1];
1461 1928
1462 glDisable GL_TEXTURE_2D; 1929 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1463 glDisable GL_BLEND;
1464} 1930}
1465 1931
1466############################################################################# 1932#############################################################################
1467 1933
1468package CFClient::UI::EntryBase; 1934package CFPlus::UI::EntryBase;
1469 1935
1470our @ISA = CFClient::UI::Label::; 1936our @ISA = CFPlus::UI::Label::;
1471 1937
1472use CFClient::OpenGL; 1938use CFPlus::OpenGL;
1473 1939
1474sub new { 1940sub new {
1475 my $class = shift; 1941 my $class = shift;
1476 1942
1477 $class->SUPER::new ( 1943 $class->SUPER::new (
… …
1481 active_fg => [0, 0, 0], 1947 active_fg => [0, 0, 0],
1482 can_hover => 1, 1948 can_hover => 1,
1483 can_focus => 1, 1949 can_focus => 1,
1484 valign => 0, 1950 valign => 0,
1485 can_events => 1, 1951 can_events => 1,
1952 ellipsise => 0,
1953 #text => ...
1954 #hidden => "*",
1486 @_ 1955 @_
1487 ) 1956 )
1488} 1957}
1489 1958
1490sub _set_text { 1959sub _set_text {
… …
1492 1961
1493 delete $self->{cur_h}; 1962 delete $self->{cur_h};
1494 1963
1495 return if $self->{text} eq $text; 1964 return if $self->{text} eq $text;
1496 1965
1497 delete $self->{texture};
1498
1499 $self->{last_activity} = $::NOW; 1966 $self->{last_activity} = $::NOW;
1500 $self->{text} = $text; 1967 $self->{text} = $text;
1501 1968
1502 $text =~ s/./*/g if $self->{hidden}; 1969 $text =~ s/./*/g if $self->{hidden};
1503 $self->{layout}->set_text ("$text "); 1970 $self->{layout}->set_text ("$text ");
1971 delete $self->{size_req};
1504 1972
1505 $self->emit (changed => $self->{text}); 1973 $self->emit (changed => $self->{text});
1974
1975 $self->realloc;
1976 $self->update;
1977}
1978
1979sub set_text {
1980 my ($self, $text) = @_;
1981
1982 $self->{cursor} = length $text;
1983 $self->_set_text ($text);
1506} 1984}
1507 1985
1508sub get_text { 1986sub get_text {
1509 $_[0]{text} 1987 $_[0]{text}
1510} 1988}
… …
1515 my ($w, $h) = $self->SUPER::size_request; 1993 my ($w, $h) = $self->SUPER::size_request;
1516 1994
1517 ($w + 1, $h) # add 1 for cursor 1995 ($w + 1, $h) # add 1 for cursor
1518} 1996}
1519 1997
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 { 1998sub invoke_key_down {
1535 my ($self, $ev) = @_; 1999 my ($self, $ev) = @_;
1536 2000
1537 my $mod = $ev->{mod}; 2001 my $mod = $ev->{mod};
1538 my $sym = $ev->{sym}; 2002 my $sym = $ev->{sym};
1539 my $uni = $ev->{unicode}; 2003 my $uni = $ev->{unicode};
1540 2004
1541 my $text = $self->get_text; 2005 my $text = $self->get_text;
1542 2006
2007 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2008
1543 if ($sym == 8) { 2009 if ($uni == 8) {
1544 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2010 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1545 } elsif ($sym == 127) { 2011 } elsif ($uni == 127) {
1546 substr $text, $self->{cursor}, 1, ""; 2012 substr $text, $self->{cursor}, 1, "";
1547 } elsif ($sym == CFClient::SDLK_LEFT) { 2013 } elsif ($sym == CFPlus::SDLK_LEFT) {
1548 --$self->{cursor} if $self->{cursor}; 2014 --$self->{cursor} if $self->{cursor};
1549 } elsif ($sym == CFClient::SDLK_RIGHT) { 2015 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1550 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2016 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1551 } elsif ($sym == CFClient::SDLK_HOME) { 2017 } elsif ($sym == CFPlus::SDLK_HOME) {
2018 # what a hack
2019 $self->{cursor} =
2020 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2021 ? length $1
2022 : 0;
2023 } elsif ($sym == CFPlus::SDLK_END) {
2024 # uh, again
2025 $self->{cursor} =
2026 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2027 ? $self->{cursor} + length $1
2028 : length $self->{text};
2029 } elsif ($uni == 21) { # ctrl-u
2030 $text = "";
1552 $self->{cursor} = 0; 2031 $self->{cursor} = 0;
1553 } elsif ($sym == CFClient::SDLK_END) {
1554 $self->{cursor} = length $text;
1555 } elsif ($sym == 27) { 2032 } elsif ($uni == 27) {
1556 $self->emit ('escape'); 2033 $self->emit ('escape');
1557 } elsif ($uni) { 2034 } elsif ($uni == 0x0d) {
2035 substr $text, $self->{cursor}++, 0, "\012";
2036 } elsif ($uni >= 0x20) {
1558 substr $text, $self->{cursor}++, 0, chr $uni; 2037 substr $text, $self->{cursor}++, 0, chr $uni;
2038 } else {
2039 return 0;
1559 } 2040 }
1560 2041
1561 $self->_set_text ($text); 2042 $self->_set_text ($text);
2043
2044 $self->realloc;
1562 $self->update; 2045 $self->update;
1563}
1564 2046
2047 1
2048}
2049
1565sub focus_in { 2050sub invoke_focus_in {
1566 my ($self) = @_; 2051 my ($self) = @_;
1567 2052
1568 $self->{last_activity} = $::NOW; 2053 $self->{last_activity} = $::NOW;
1569 2054
1570 $self->SUPER::focus_in; 2055 $self->SUPER::invoke_focus_in
1571} 2056}
1572 2057
1573sub button_down { 2058sub invoke_button_down {
1574 my ($self, $ev, $x, $y) = @_; 2059 my ($self, $ev, $x, $y) = @_;
1575 2060
1576 $self->SUPER::button_down ($ev, $x, $y); 2061 $self->SUPER::invoke_button_down ($ev, $x, $y);
1577 2062
1578 my $idx = $self->{layout}->xy_to_index ($x, $y); 2063 my $idx = $self->{layout}->xy_to_index ($x, $y);
1579 2064
1580 # byte-index to char-index 2065 # byte-index to char-index
1581 my $text = $self->{text}; 2066 my $text = $self->{text};
1582 utf8::encode $text; 2067 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1583 $self->{cursor} = length substr $text, 0, $idx; 2068 $self->{cursor} = length $text;
1584 2069
1585 $self->_set_text ($self->{text}); 2070 $self->_set_text ($self->{text});
1586 $self->update; 2071 $self->update;
2072
2073 1
1587} 2074}
1588 2075
1589sub mouse_motion { 2076sub invoke_mouse_motion {
1590 my ($self, $ev, $x, $y) = @_; 2077 my ($self, $ev, $x, $y) = @_;
1591# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2078# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2079
2080 1
1592} 2081}
1593 2082
1594sub _draw { 2083sub _draw {
1595 my ($self) = @_; 2084 my ($self) = @_;
1596 2085
1597 local $self->{fg} = $self->{fg}; 2086 local $self->{fg} = $self->{fg};
1598 2087
1599 if ($FOCUS == $self) { 2088 if ($FOCUS == $self) {
1600 glColor @{$self->{active_bg}}; 2089 glColor_premultiply @{$self->{active_bg}};
1601 $self->{fg} = $self->{active_fg}; 2090 $self->{fg} = $self->{active_fg};
1602 } else { 2091 } else {
1603 glColor @{$self->{bg}}; 2092 glColor_premultiply @{$self->{bg}};
1604 } 2093 }
1605 2094
1606 glEnable GL_BLEND; 2095 glEnable GL_BLEND;
1607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2096 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1608 glBegin GL_QUADS; 2097 glBegin GL_QUADS;
1609 glVertex 0 , 0; 2098 glVertex 0 , 0;
1610 glVertex 0 , $self->{h}; 2099 glVertex 0 , $self->{h};
1611 glVertex $self->{w}, $self->{h}; 2100 glVertex $self->{w}, $self->{h};
1612 glVertex $self->{w}, 0; 2101 glVertex $self->{w}, 0;
… …
1623 utf8::encode $text; 2112 utf8::encode $text;
1624 2113
1625 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2114 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1626 } 2115 }
1627 2116
1628 glColor @{$self->{fg}};
1629 glBegin GL_LINES; 2117 glBegin GL_LINES;
1630 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2118 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}; 2119 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1632 glEnd; 2120 glEnd;
1633 } 2121 }
1634} 2122}
1635 2123
2124#############################################################################
2125
1636package CFClient::UI::Entry; 2126package CFPlus::UI::Entry;
1637 2127
1638our @ISA = CFClient::UI::EntryBase::; 2128our @ISA = CFPlus::UI::EntryBase::;
1639 2129
1640use CFClient::OpenGL; 2130use CFPlus::OpenGL;
1641 2131
1642sub key_down { 2132sub invoke_key_down {
1643 my ($self, $ev) = @_; 2133 my ($self, $ev) = @_;
1644 2134
1645 my $sym = $ev->{sym}; 2135 my $sym = $ev->{sym};
1646 2136
1647 if ($sym == 13) { 2137 if ($ev->{uni} == 0x0d || $sym == 13) {
1648 unshift @{$self->{history}}, 2138 unshift @{$self->{history}},
1649 my $txt = $self->get_text; 2139 my $txt = $self->get_text;
2140
1650 $self->{history_pointer} = -1; 2141 $self->{history_pointer} = -1;
1651 $self->{history_saveback} = ''; 2142 $self->{history_saveback} = '';
1652 $self->emit (activate => $txt); 2143 $self->emit (activate => $txt);
1653 $self->update; 2144 $self->update;
1654 2145
1655 } elsif ($sym == CFClient::SDLK_UP) { 2146 } elsif ($sym == CFPlus::SDLK_UP) {
1656 if ($self->{history_pointer} < 0) { 2147 if ($self->{history_pointer} < 0) {
1657 $self->{history_saveback} = $self->get_text; 2148 $self->{history_saveback} = $self->get_text;
1658 } 2149 }
1659 if (@{$self->{history} || []} > 0) { 2150 if (@{$self->{history} || []} > 0) {
1660 $self->{history_pointer}++; 2151 $self->{history_pointer}++;
… …
1662 $self->{history_pointer} = @{$self->{history} || []} - 1; 2153 $self->{history_pointer} = @{$self->{history} || []} - 1;
1663 } 2154 }
1664 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2155 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1665 } 2156 }
1666 2157
1667 } elsif ($sym == CFClient::SDLK_DOWN) { 2158 } elsif ($sym == CFPlus::SDLK_DOWN) {
1668 $self->{history_pointer}--; 2159 $self->{history_pointer}--;
1669 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2160 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1670 2161
1671 if ($self->{history_pointer} >= 0) { 2162 if ($self->{history_pointer} >= 0) {
1672 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2163 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1673 } else { 2164 } else {
1674 $self->set_text ($self->{history_saveback}); 2165 $self->set_text ($self->{history_saveback});
1675 } 2166 }
1676 2167
1677 } else { 2168 } else {
1678 $self->SUPER::key_down ($ev); 2169 return $self->SUPER::invoke_key_down ($ev)
2170 }
2171
1679 } 2172 1
1680
1681} 2173}
1682 2174
1683############################################################################# 2175#############################################################################
1684 2176
2177package CFPlus::UI::TextEdit;
2178
2179our @ISA = CFPlus::UI::EntryBase::;
2180
2181use CFPlus::OpenGL;
2182
2183sub move_cursor_ver {
2184 my ($self, $dy) = @_;
2185
2186 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2187
2188 $y += $dy;
2189
2190 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2191 $self->{cursor} = $index;
2192 delete $self->{cur_h};
2193 $self->update;
2194 return;
2195 }
2196}
2197
2198sub invoke_key_down {
2199 my ($self, $ev) = @_;
2200
2201 my $sym = $ev->{sym};
2202
2203 if ($sym == CFPlus::SDLK_UP) {
2204 $self->move_cursor_ver (-1);
2205 } elsif ($sym == CFPlus::SDLK_DOWN) {
2206 $self->move_cursor_ver (+1);
2207 } else {
2208 return $self->SUPER::invoke_key_down ($ev)
2209 }
2210
2211 1
2212}
2213
2214#############################################################################
2215
1685package CFClient::UI::Button; 2216package CFPlus::UI::Button;
1686 2217
1687our @ISA = CFClient::UI::Label::; 2218our @ISA = CFPlus::UI::Label::;
1688 2219
1689use CFClient::OpenGL; 2220use CFPlus::OpenGL;
1690 2221
1691my @tex = 2222my @tex =
1692 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1693 qw(b1_button_active.png); 2224 qw(b1_button_active.png);
1694 2225
1695sub new { 2226sub new {
1696 my $class = shift; 2227 my $class = shift;
1697 2228
1698 $class->SUPER::new ( 2229 $class->SUPER::new (
1699 padding => 4, 2230 padding_x => 4,
2231 padding_y => 4,
1700 fg => [1, 1, 1], 2232 fg => [1, 1, 1],
1701 bg => [1, 1, 1, 0.2],
1702 active_fg => [0, 0, 1], 2233 active_fg => [0, 0, 1],
1703 can_hover => 1, 2234 can_hover => 1,
1704 align => 0, 2235 align => 0,
1705 valign => 0, 2236 valign => 0,
1706 can_events => 1, 2237 can_events => 1,
1707 @_ 2238 @_
1708 ) 2239 )
1709} 2240}
1710 2241
1711sub button_up { 2242sub invoke_button_up {
1712 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
1713 2244
2245 $self->emit ("activate")
1714 if ($x >= 0 && $x < $self->{w} 2246 if $x >= 0 && $x < $self->{w}
1715 && $y >= 0 && $y < $self->{h}) { 2247 && $y >= 0 && $y < $self->{h};
1716 $self->emit ("activate"); 2248
1717 } 2249 1
1718} 2250}
1719 2251
1720sub _draw { 2252sub _draw {
1721 my ($self) = @_; 2253 my ($self) = @_;
1722 2254
1723 local $self->{fg} = $self->{fg}; 2255 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1724 2256
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; 2257 glEnable GL_TEXTURE_2D;
1732 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2258 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1733 glColor 0, 0, 0, 1; 2259 glColor 0, 0, 0, 1;
1734 2260
1735 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 2261 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1736 2262
1737 glDisable GL_TEXTURE_2D; 2263 glDisable GL_TEXTURE_2D;
1738 glDisable GL_BLEND;
1739 2264
1740 $self->SUPER::_draw; 2265 $self->SUPER::_draw;
1741} 2266}
1742 2267
1743############################################################################# 2268#############################################################################
1744 2269
1745package CFClient::UI::CheckBox; 2270package CFPlus::UI::CheckBox;
1746 2271
1747our @ISA = CFClient::UI::DrawBG::; 2272our @ISA = CFPlus::UI::DrawBG::;
1748 2273
1749my @tex = 2274my @tex =
1750 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2275 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1751 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2276 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1752 2277
1753use CFClient::OpenGL; 2278use CFPlus::OpenGL;
1754 2279
1755sub new { 2280sub new {
1756 my $class = shift; 2281 my $class = shift;
1757 2282
1758 $class->SUPER::new ( 2283 $class->SUPER::new (
1759 padding => 2, 2284 padding_x => 2,
2285 padding_y => 2,
1760 fg => [1, 1, 1], 2286 fg => [1, 1, 1],
1761 active_fg => [1, 1, 0], 2287 active_fg => [1, 1, 0],
2288 bg => [0, 0, 0, 0.2],
2289 active_bg => [1, 1, 1, 0.5],
1762 state => 0, 2290 state => 0,
1763 can_hover => 1, 2291 can_hover => 1,
1764 @_ 2292 @_
1765 ) 2293 )
1766} 2294}
1767 2295
1768sub size_request { 2296sub size_request {
1769 my ($self) = @_; 2297 my ($self) = @_;
1770 2298
1771 ($self->{padding} * 2 + 6) x 2 2299 (6) x 2
1772} 2300}
1773 2301
2302sub toggle {
2303 my ($self) = @_;
2304
2305 $self->{state} = !$self->{state};
2306 $self->emit (changed => $self->{state});
2307 $self->update;
2308}
2309
1774sub button_down { 2310sub invoke_button_down {
1775 my ($self, $ev, $x, $y) = @_; 2311 my ($self, $ev, $x, $y) = @_;
1776 2312
1777 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2313 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1778 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2314 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1779 $self->{state} = !$self->{state}; 2315 $self->toggle;
1780 $self->emit (changed => $self->{state}); 2316 } else {
2317 return 0
2318 }
2319
1781 } 2320 1
1782} 2321}
1783 2322
1784sub _draw { 2323sub _draw {
1785 my ($self) = @_; 2324 my ($self) = @_;
1786 2325
1787 $self->SUPER::_draw; 2326 $self->SUPER::_draw;
1788 2327
1789 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2328 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1790 2329
1791 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2330 my ($w, $h) = @$self{qw(w h)};
2331
2332 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1792 2333
1793 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2334 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1794 2335
1795 glEnable GL_BLEND; 2336 my $tex = $self->{state} ? $tex[1] : $tex[0];
2337
1796 glEnable GL_TEXTURE_2D; 2338 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); 2339 $tex->draw_quad_alpha (0, 0, $s, $s);
1802
1803 glDisable GL_TEXTURE_2D; 2340 glDisable GL_TEXTURE_2D;
1804 glDisable GL_BLEND;
1805} 2341}
1806 2342
1807############################################################################# 2343#############################################################################
1808 2344
1809package CFClient::UI::Image; 2345package CFPlus::UI::Image;
1810 2346
1811our @ISA = CFClient::UI::Base::; 2347our @ISA = CFPlus::UI::Base::;
1812 2348
1813use CFClient::OpenGL; 2349use CFPlus::OpenGL;
1814use Carp qw/confess/;
1815 2350
1816our %loaded_images; 2351our %texture_cache;
1817 2352
1818sub new { 2353sub new {
1819 my $class = shift; 2354 my $class = shift;
1820 2355
1821 my $self = $class->SUPER::new (can_events => 0, @_); 2356 my $self = $class->SUPER::new (
2357 can_events => 0,
2358 @_,
2359 );
1822 2360
1823 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2361 $self->{path} || $self->{tex}
2362 or Carp::croak "'path' or 'tex' attributes required";
1824 2363
1825 $loaded_images{$self->{image}} ||= 2364 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1826 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2365 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1827 2366
1828 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2367 CFPlus::weaken $texture_cache{$self->{path}};
1829 2368
1830 Scalar::Util::weaken $loaded_images{$self->{image}}; 2369 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1831
1832 $self->{aspect} = $tex->{w} / $tex->{h};
1833 2370
1834 $self 2371 $self
1835} 2372}
1836 2373
2374sub STORABLE_freeze {
2375 my ($self, $cloning) = @_;
2376
2377 $self->{path}
2378 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2379
2380 $self->{path}
2381}
2382
2383sub STORABLE_attach {
2384 my ($self, $cloning, $path) = @_;
2385
2386 $self->new (path => $path)
2387}
2388
1837sub size_request { 2389sub size_request {
1838 my ($self) = @_; 2390 my ($self) = @_;
1839 2391
1840 ($self->{tex}->{w}, $self->{tex}->{h}) 2392 ($self->{tex}{w}, $self->{tex}{h})
1841} 2393}
1842 2394
1843sub _draw { 2395sub _draw {
1844 my ($self) = @_; 2396 my ($self) = @_;
1845 2397
… …
1852 glTranslate 0, -$self->{w}, 0; 2404 glTranslate 0, -$self->{w}, 0;
1853 2405
1854 ($w, $h) = ($h, $w); 2406 ($w, $h) = ($h, $w);
1855 } 2407 }
1856 2408
1857 glEnable GL_BLEND;
1858 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1859 glEnable GL_TEXTURE_2D; 2409 glEnable GL_TEXTURE_2D;
1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861 2411
1862 $tex->draw_quad (0, 0, $w, $h); 2412 $tex->draw_quad (0, 0, $w, $h);
1863 2413
1864 glDisable GL_BLEND;
1865 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
1866} 2415}
1867 2416
1868############################################################################# 2417#############################################################################
1869 2418
2419package CFPlus::UI::ImageButton;
2420
2421our @ISA = CFPlus::UI::Image::;
2422
2423use CFPlus::OpenGL;
2424
2425my %textures;
2426
2427sub new {
2428 my $class = shift;
2429
2430 my $self = $class->SUPER::new (
2431 padding_x => 4,
2432 padding_y => 4,
2433 fg => [1, 1, 1],
2434 active_fg => [0, 0, 1],
2435 can_hover => 1,
2436 align => 0,
2437 valign => 0,
2438 can_events => 1,
2439 @_
2440 );
2441}
2442
2443sub invoke_button_up {
2444 my ($self, $ev, $x, $y) = @_;
2445
2446 $self->emit ("activate")
2447 if $x >= 0 && $x < $self->{w}
2448 && $y >= 0 && $y < $self->{h};
2449
2450 1
2451}
2452
2453#############################################################################
2454
1870package CFClient::UI::VGauge; 2455package CFPlus::UI::VGauge;
1871 2456
1872our @ISA = CFClient::UI::Base::; 2457our @ISA = CFPlus::UI::Base::;
1873 2458
1874use List::Util qw(min max); 2459use List::Util qw(min max);
1875 2460
1876use CFClient::OpenGL; 2461use CFPlus::OpenGL;
1877 2462
1878my %tex = ( 2463my %tex = (
1879 food => [ 2464 food => [
1880 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2465 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1881 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2466 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1882 ], 2467 ],
1883 grace => [ 2468 grace => [
1884 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2469 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/ 2470 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1886 ], 2471 ],
1887 hp => [ 2472 hp => [
1888 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2473 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1889 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2474 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1890 ], 2475 ],
1891 mana => [ 2476 mana => [
1892 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2477 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/ 2478 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1894 ], 2479 ],
1895); 2480);
1896 2481
1897# eg. VGauge->new (gauge => 'food'), default gauge: food 2482# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
1957 my $ycut1 = max 0, min 1, $ycut; 2542 my $ycut1 = max 0, min 1, $ycut;
1958 my $ycut2 = max 0, min 1, $ycut - 1; 2543 my $ycut2 = max 0, min 1, $ycut - 1;
1959 2544
1960 my $h1 = $self->{h} * (1 - $ycut1); 2545 my $h1 = $self->{h} * (1 - $ycut1);
1961 my $h2 = $self->{h} * (1 - $ycut2); 2546 my $h2 = $self->{h} * (1 - $ycut2);
2547 my $h3 = $self->{h};
2548
2549 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1962 2550
1963 glEnable GL_BLEND; 2551 glEnable GL_BLEND;
1964 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2552 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2553 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1965 glEnable GL_TEXTURE_2D; 2554 glEnable GL_TEXTURE_2D;
1966 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1967 2556
1968 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2557 glBindTexture GL_TEXTURE_2D, $t1->{name};
1969 glBegin GL_QUADS; 2558 glBegin GL_QUADS;
… …
1984 2573
1985 if ($t3) { 2574 if ($t3) {
1986 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2575 glBindTexture GL_TEXTURE_2D, $t3->{name};
1987 glBegin GL_QUADS; 2576 glBegin GL_QUADS;
1988 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2577 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1989 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2578 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1990 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2579 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1991 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2580 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1992 glEnd; 2581 glEnd;
1993 } 2582 }
1994 2583
1995 glDisable GL_BLEND; 2584 glDisable GL_BLEND;
1996 glDisable GL_TEXTURE_2D; 2585 glDisable GL_TEXTURE_2D;
1997} 2586}
1998 2587
1999############################################################################# 2588#############################################################################
2000 2589
2001package CFClient::UI::Gauge; 2590package CFPlus::UI::Gauge;
2002 2591
2003our @ISA = CFClient::UI::VBox::; 2592our @ISA = CFPlus::UI::VBox::;
2004 2593
2005sub new { 2594sub new {
2006 my ($class, %arg) = @_; 2595 my ($class, %arg) = @_;
2007 2596
2008 my $self = $class->SUPER::new ( 2597 my $self = $class->SUPER::new (
… …
2010 can_hover => 1, 2599 can_hover => 1,
2011 can_events => 1, 2600 can_events => 1,
2012 %arg, 2601 %arg,
2013 ); 2602 );
2014 2603
2015 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2604 $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); 2605 $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"); 2606 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2018 2607
2019 $self 2608 $self
2020} 2609}
2021 2610
2022sub set_fontsize { 2611sub set_fontsize {
… …
2043 $self->{value}->set_text ($val); 2632 $self->{value}->set_text ($val);
2044} 2633}
2045 2634
2046############################################################################# 2635#############################################################################
2047 2636
2048package CFClient::UI::Slider; 2637package CFPlus::UI::Slider;
2049 2638
2050use strict; 2639use strict;
2051 2640
2052use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2053 2642
2054our @ISA = CFClient::UI::DrawBG::; 2643our @ISA = CFPlus::UI::DrawBG::;
2055 2644
2056my @tex = 2645my @tex =
2057 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2646 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2058 qw(s1_slider.png s1_slider_bg.png); 2647 qw(s1_slider.png s1_slider_bg.png);
2059 2648
2060sub new { 2649sub new {
2061 my $class = shift; 2650 my $class = shift;
2062 2651
2063 # range [value, low, high, page] 2652 # range [value, low, high, page, unit]
2064 2653
2065 # TODO: 0-width page 2654 # TODO: 0-width page
2066 # TODO: req_w/h are wrong with vertical 2655 # TODO: req_w/h are wrong with vertical
2067 # TODO: calculations are off 2656 # TODO: calculations are off
2068 my $self = $class->SUPER::new ( 2657 my $self = $class->SUPER::new (
2069 fg => [1, 1, 1], 2658 fg => [1, 1, 1],
2070 active_fg => [0, 0, 0], 2659 active_fg => [0, 0, 0],
2660 bg => [0, 0, 0, 0.2],
2661 active_bg => [1, 1, 1, 0.5],
2071 range => [0, 0, 100, 10], 2662 range => [0, 0, 100, 10, 0],
2072 req_w => $::WIDTH / 80, 2663 min_w => $::WIDTH / 80,
2073 req_h => $::WIDTH / 80, 2664 min_h => $::WIDTH / 80,
2074 vertical => 0, 2665 vertical => 0,
2075 can_hover => 1, 2666 can_hover => 1,
2076 inner_pad => 5, 2667 inner_pad => 0.02,
2077 @_ 2668 @_
2078 ); 2669 );
2079 2670
2671 $self->set_value ($self->{range}[0]);
2672 $self->update;
2673
2080 $self 2674 $self
2081} 2675}
2082 2676
2677sub set_range {
2678 my ($self, $range) = @_;
2679
2680 ($range, $self->{range}) = ($self->{range}, $range);
2681
2682 if ("@$range" ne "@{$self->{range}}") {
2683 $self->update;
2684 $self->set_value ($self->{range}[0]);
2685 }
2686}
2687
2688sub set_value {
2689 my ($self, $value) = @_;
2690
2691 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2692
2693 $hi = $lo + 1 if $hi <= $lo;
2694
2695 $page = $hi - $lo if $page > $hi - $lo;
2696
2697 $value = $lo if $value < $lo;
2698 $value = $hi - $page if $value > $hi - $page;
2699
2700 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2701 if $unit;
2702
2703 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2704
2705 if ($value != $old_value) {
2706 $self->emit (changed => $value);
2707 $self->update;
2708 }
2709}
2710
2083sub size_request { 2711sub size_request {
2084 my ($self) = @_; 2712 my ($self) = @_;
2085 2713
2086 my $w = $self->{req_w}; 2714 ($self->{req_w}, $self->{req_h})
2087 my $h = $self->{req_h};
2088
2089 $self->{vertical} ? ($h, $w) : ($w, $h)
2090} 2715}
2091 2716
2092sub button_down { 2717sub invoke_button_down {
2093 my ($self, $ev, $x, $y) = @_; 2718 my ($self, $ev, $x, $y) = @_;
2094 2719
2095 $self->SUPER::button_down ($ev, $x, $y); 2720 $self->SUPER::invoke_button_down ($ev, $x, $y);
2721
2722 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2723
2096 $self->mouse_motion ($ev, $x, $y); 2724 $self->invoke_mouse_motion ($ev, $x, $y)
2097} 2725}
2098 2726
2099sub mouse_motion { 2727sub invoke_mouse_motion {
2100 my ($self, $ev, $x, $y) = @_; 2728 my ($self, $ev, $x, $y) = @_;
2101 2729
2102 if ($GRAB == $self) { 2730 if ($GRAB == $self) {
2731 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2732
2733 my (undef, $lo, $hi, $page) = @{$self->{range}};
2734
2735 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2736
2737 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2738 } else {
2739 return 0;
2740 }
2741
2742 1
2743}
2744
2745sub invoke_mouse_wheel {
2746 my ($self, $ev) = @_;
2747
2748 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2749
2750 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2751
2752 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2753
2754 ! ! $delta
2755}
2756
2757sub update {
2758 my ($self) = @_;
2759
2760 delete $self->{knob_w};
2761 $self->SUPER::update;
2762}
2763
2764sub _draw {
2765 my ($self) = @_;
2766
2767 unless ($self->{knob_w}) {
2768 $self->set_value ($self->{range}[0]);
2769
2103 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2770 my ($value, $lo, $hi, $page) = @{$self->{range}};
2771 my $range = ($hi - $page - $lo) || 1e-100;
2104 2772
2105 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2773 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2106 2774
2107 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2775 $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 2776 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2109 2777
2110 $x -= $inner_pad_px; # substract the padding 2778 $value = ($value - $lo) / $range;
2111 $x = $x * ($hi - $lo) / $inner_w + $lo; 2779 $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 2780
2116 $self->emit (changed => $x); 2781 $self->{knob_x} = $value - $knob_w * 0.5;
2117 $self->update; 2782 $self->{knob_w} = $knob_w;
2118 } 2783 }
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 2784
2132 $self->SUPER::_draw (); 2785 $self->SUPER::_draw ();
2133 2786
2134 my ($w, $h) = @$self{qw(w h)}; 2787 glScale $self->{w}, $self->{h};
2135 2788
2136 if ($self->{vertical}) { 2789 if ($self->{vertical}) {
2137 # draw a vertical slider like a rotated horizontal slider 2790 # draw a vertical slider like a rotated horizontal slider
2138 2791
2792 glTranslate 1, 0, 0;
2139 glRotate 90, 0, 0, 1; 2793 glRotate 90, 0, 0, 1;
2140 glTranslate 0, -$self->{w}, 0;
2141
2142 ($w, $h) = ($h, $w);
2143 } 2794 }
2144 2795
2145 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2796 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2146 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2797 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2147 2798
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; 2799 glEnable GL_TEXTURE_2D;
2169 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170 2801
2171 # draw background 2802 # draw background
2172 $tex[1]->draw_quad (0, 0, $w, $h); 2803 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2173 2804
2174 # draw handle 2805 # draw handle
2175 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2806 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2176 2807
2177 glDisable GL_BLEND;
2178 glDisable GL_TEXTURE_2D; 2808 glDisable GL_TEXTURE_2D;
2179} 2809}
2180 2810
2181############################################################################# 2811#############################################################################
2182 2812
2183package CFClient::UI::TextView; 2813package CFPlus::UI::ValSlider;
2184 2814
2185our @ISA = CFClient::UI::HBox::; 2815our @ISA = CFPlus::UI::HBox::;
2186 2816
2817sub new {
2818 my ($class, %arg) = @_;
2819
2820 my $range = delete $arg{range};
2821
2822 my $self = $class->SUPER::new (
2823 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2824 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2825 to_value => sub { shift },
2826 from_value => sub { shift },
2827 %arg,
2828 );
2829
2830 $self->{slider}->connect (changed => sub {
2831 my ($self, $value) = @_;
2832 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2833 $self->{parent}->emit (changed => $value);
2834 });
2835
2836# $self->{entry}->connect (changed => sub {
2837# my ($self, $value) = @_;
2838# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2839# $self->{parent}->emit (changed => $value);
2840# });
2841
2842 $self->add ($self->{slider}, $self->{entry});
2843
2844 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2845
2846 $self
2847}
2848
2849sub set_range { shift->{slider}->set_range (@_) }
2850sub set_value { shift->{slider}->set_value (@_) }
2851
2852#############################################################################
2853
2854package CFPlus::UI::TextScroller;
2855
2856our @ISA = CFPlus::UI::HBox::;
2857
2187use CFClient::OpenGL; 2858use CFPlus::OpenGL;
2188 2859
2189sub new { 2860sub new {
2190 my $class = shift; 2861 my $class = shift;
2191 2862
2192 my $self = $class->SUPER::new ( 2863 my $self = $class->SUPER::new (
2193 fontsize => 1, 2864 fontsize => 1,
2194 can_events => 0, 2865 can_events => 1,
2866 indent => 0,
2195 #font => default_font 2867 #font => default_font
2196 @_, 2868 @_,
2197 2869
2198 layout => (new CFClient::Layout), 2870 layout => (new CFPlus::Layout),
2199 par => [], 2871 par => [],
2872 max_par => 0,
2200 height => 0, 2873 height => 0,
2201 children => [ 2874 children => [
2202 (new CFClient::UI::Empty expand => 1), 2875 (new CFPlus::UI::Empty expand => 1),
2203 (new CFClient::UI::Slider vertical => 1), 2876 (new CFPlus::UI::Slider vertical => 1),
2204 ], 2877 ],
2205 ); 2878 );
2206 2879
2207 $self->{children}[1]->connect (changed => sub { $self->update }); 2880 $self->{children}[1]->connect (changed => sub { $self->update });
2208 2881
… …
2214 2887
2215 $self->{fontsize} = $fontsize; 2888 $self->{fontsize} = $fontsize;
2216 $self->reflow; 2889 $self->reflow;
2217} 2890}
2218 2891
2219sub text_height { 2892sub size_request {
2893 my ($self) = @_;
2894
2895 my ($empty, $slider) = @{ $self->{children} };
2896
2897 local $self->{children} = [$empty, $slider];
2898 $self->SUPER::size_request
2899}
2900
2901sub invoke_size_allocate {
2902 my ($self, $w, $h) = @_;
2903
2904 my ($empty, $slider, @other) = @{ $self->{children} };
2905 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2906
2907 $self->{layout}->set_font ($self->{font}) if $self->{font};
2908 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2909 $self->{layout}->set_width ($empty->{w});
2910 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2911
2912 $self->reflow;
2913
2914 local $self->{children} = [$empty, $slider];
2915 $self->SUPER::invoke_size_allocate ($w, $h)
2916}
2917
2918sub invoke_mouse_wheel {
2220 my ($self, $text) = @_; 2919 my ($self, $ev) = @_;
2920
2921 return 0 unless $ev->{dy}; # only vertical movements
2922
2923 $self->{children}[1]->emit (mouse_wheel => $ev);
2924
2925 1
2926}
2927
2928sub get_layout {
2929 my ($self, $para) = @_;
2221 2930
2222 my $layout = $self->{layout}; 2931 my $layout = $self->{layout};
2223 2932
2933 $layout->set_font ($self->{font}) if $self->{font};
2934 $layout->set_foreground (@{$para->{fg}});
2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2935 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225 $layout->set_width ($self->{children}[0]{w}); 2936 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2226 $layout->set_text ($text); 2937 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2938 $layout->set_markup ($para->{markup});
2939
2940 $layout->set_shapes (
2941 map
2942 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2943 @{$para->{widget}}
2227 2944 );
2228 ($layout->size)[1] 2945
2946 $layout
2229} 2947}
2230 2948
2231sub reflow { 2949sub reflow {
2232 my ($self) = @_; 2950 my ($self) = @_;
2233 2951
2234 $self->{need_reflow}++; 2952 $self->{need_reflow}++;
2235 $self->update; 2953 $self->update;
2236} 2954}
2237 2955
2238sub size_allocate { 2956sub set_offset {
2957 my ($self, $offset) = @_;
2958
2959 # todo: base offset on lines or so, not on pixels
2960 $self->{children}[1]->set_value ($offset);
2961}
2962
2963sub current_paragraph {
2964 my ($self) = @_;
2965
2966 $self->{top_paragraph} - 1
2967}
2968
2969sub scroll_to {
2239 my ($self, $w, $h) = @_; 2970 my ($self, $para) = @_;
2240 2971
2241 $self->SUPER::size_allocate ($w, $h); 2972 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2242 2973
2243 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2974 $self->{scroll_to} = $para;
2244 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2975 $self->update;
2245 $self->{layout}->set_width ($self->{children}[0]{w}); 2976}
2246 2977
2247 $self->reflow; 2978sub clear {
2979 my ($self) = @_;
2980
2981 my (undef, undef, @other) = @{ $self->{children} };
2982 $self->remove ($_) for @other;
2983
2984 $self->{par} = [];
2985 $self->{height} = 0;
2986 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2248} 2987}
2249 2988
2250sub add_paragraph { 2989sub add_paragraph {
2251 my ($self, $color, $text) = @_; 2990 my $self = shift;
2252 2991
2253 #TODO: intelligently "reformat" paragraph 2992 for my $para (@_) {
2993 $para = {
2994 fg => [1, 1, 1, 1],
2995 indent => 0,
2996 markup => "",
2997 widget => [],
2998 ref $para ? %$para : (markup => $para),
2999 w => 1e10,
3000 wrapped => 1,
3001 };
2254 3002
2255 my $height = $self->text_height ($text); 3003 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3004 push @{$self->{par}}, $para;
3005 }
2256 3006
3007 if (my $max = $self->{max_par}) {
3008 shift @{$self->{par}} while @{$self->{par}} > $max;
3009 }
3010
3011 $self->{need_reflow}++;
3012 $self->update;
3013}
3014
3015sub scroll_to_bottom {
3016 my ($self) = @_;
3017
3018 $self->{scroll_to} = $#{$self->{par}};
3019 $self->update;
3020}
3021
3022sub force_uptodate {
3023 my ($self) = @_;
3024
3025 if (delete $self->{need_reflow}) {
3026 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3027
3028 my $height = 0;
3029
3030 for my $para (@{$self->{par}}) {
3031 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3032 my $layout = $self->get_layout ($para);
3033 my ($w, $h) = $layout->size;
3034
3035 $para->{w} = $w + $para->{indent};
3036 $para->{h} = $h;
3037 $para->{wrapped} = $layout->has_wrapped;
3038 }
3039
3040 $para->{y} = $height;
3041 $height += $para->{h};
3042 }
3043
2257 $self->{height} += $height; 3044 $self->{height} = $height;
3045 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2258 3046
2259 push @{$self->{par}}, [$height, $color, $text]; 3047 delete $self->{texture};
3048 }
2260 3049
2261 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 3050 if (my $paridx = delete $self->{scroll_to}) {
2262 $self->{children}[1]->update; 3051 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3052 }
2263} 3053}
2264 3054
2265sub update { 3055sub update {
2266 my ($self) = @_; 3056 my ($self) = @_;
2267 3057
… …
2269 3059
2270 return unless $self->{h} > 0; 3060 return unless $self->{h} > 0;
2271 3061
2272 delete $self->{texture}; 3062 delete $self->{texture};
2273 3063
2274 $ROOT->on_refresh ($self, sub { 3064 $ROOT->on_post_alloc ($self => sub {
2275 if (delete $self->{need_reflow}) { 3065 $self->force_uptodate;
2276 my $height = 0;
2277 3066
2278 $height += $_->[0] = $self->text_height ($_->[2]) 3067 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2279 for @{$self->{par}};
2280 3068
2281 $self->{height} = $height; 3069 $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; 3070 glClearColor 0, 0, 0, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 3071 glClear GL_COLOR_BUFFER_BIT;
2291 3072
2292 glEnable GL_BLEND; 3073 package CFPlus::UI::Base;
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 3074 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2294 glEnable GL_TEXTURE_2D; 3075 (0, 0, $self->{w}, $self->{h});
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 3076
2297 my $top = int $self->{children}[1]{range}[0]; 3077 my $top = int $self->{children}[1]{range}[0];
2298 3078
3079 my $paridx = 0;
3080 my $top_paragraph;
3081 my $top = int $self->{children}[1]{range}[0];
3082
2299 my $y0 = $top; 3083 my $y0 = $top;
2300 my $y1 = $top + $self->{h}; 3084 my $y1 = $top + $H;
2301 3085
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}}) { 3086 for my $para (@{$self->{par}}) {
2309 my $h = $par->[0]; 3087 my $h = $para->{h};
3088 my $y = $para->{y};
2310 3089
2311 if ($y0 < $y + $h && $y < $y1) { 3090 if ($y0 < $y + $h && $y < $y1) {
2312 $layout->set_text ($par->[2]); 3091 my $layout = $self->get_layout ($para);
2313 3092
2314 glColor @{ $par->[1] }; 3093 $layout->render ($para->{indent}, $y - $y0);
2315 my ($W, $H) = $layout->size; 3094
2316 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 3095 if (my @w = @{ $para->{widget} }) {
3096 my @s = $layout->get_shapes;
3097
3098 for (@w) {
3099 my ($dx, $dy) = splice @s, 0, 2, ();
3100
3101 $_->{x} = $dx + $para->{indent};
3102 $_->{y} = $dy + $y - $y0;
3103
3104 $_->draw;
3105 }
3106 }
2317 } 3107 }
2318 3108
2319 $y += $h; 3109 $paridx++;
3110 $top_paragraph ||= $paridx if $y >= $top;
2320 } 3111 }
2321 3112
2322 glDisable GL_TEXTURE_2D; 3113 $self->{top_paragraph} = $top_paragraph;
2323 glDisable GL_BLEND;
2324 }; 3114 };
2325 }); 3115 });
2326} 3116}
2327 3117
3118sub reconfigure {
3119 my ($self) = @_;
3120
3121 $self->SUPER::reconfigure;
3122
3123 $_->{w} = 1e10 for @{ $self->{par} };
3124 $self->reflow;
3125}
3126
2328sub _draw { 3127sub _draw {
2329 my ($self) = @_; 3128 my ($self) = @_;
2330 3129
2331 glEnable GL_BLEND;
2332 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2333 glEnable GL_TEXTURE_2D; 3130 glEnable GL_TEXTURE_2D;
2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1; 3132 glColor 0, 0, 0, 1;
2336 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3133 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2337 glDisable GL_TEXTURE_2D; 3134 glDisable GL_TEXTURE_2D;
2338 glDisable GL_BLEND;
2339 3135
2340 $self->{children}[1]->draw; 3136 $self->{children}[1]->draw;
2341
2342} 3137}
2343 3138
2344############################################################################# 3139#############################################################################
2345 3140
2346package CFClient::UI::Animator; 3141package CFPlus::UI::Animator;
2347 3142
2348use CFClient::OpenGL; 3143use CFPlus::OpenGL;
2349 3144
2350our @ISA = CFClient::UI::Bin::; 3145our @ISA = CFPlus::UI::Bin::;
2351 3146
2352sub moveto { 3147sub moveto {
2353 my ($self, $x, $y) = @_; 3148 my ($self, $x, $y) = @_;
2354 3149
2355 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3150 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2383 glPopMatrix; 3178 glPopMatrix;
2384} 3179}
2385 3180
2386############################################################################# 3181#############################################################################
2387 3182
2388package CFClient::UI::Flopper; 3183package CFPlus::UI::Flopper;
2389 3184
2390our @ISA = CFClient::UI::Button::; 3185our @ISA = CFPlus::UI::Button::;
2391 3186
2392sub new { 3187sub new {
2393 my $class = shift; 3188 my $class = shift;
2394 3189
2395 my $self = $class->SUPER::new ( 3190 my $self = $class->SUPER::new (
2396 state => 0, 3191 state => 0,
2397 connect_activate => \&toggle_flopper, 3192 on_activate => \&toggle_flopper,
2398 @_ 3193 @_
2399 ); 3194 );
2400 3195
2401 if ($self->{state}) {
2402 $self->{state} = 0;
2403 $self->toggle_flopper;
2404 }
2405
2406 $self 3196 $self
2407} 3197}
2408 3198
2409sub toggle_flopper { 3199sub toggle_flopper {
2410 my ($self) = @_; 3200 my ($self) = @_;
2411 3201
2412 # TODO: use animation 3202 $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} 3203}
2424 3204
2425############################################################################# 3205#############################################################################
2426 3206
2427package CFClient::UI::Tooltip; 3207package CFPlus::UI::Tooltip;
2428 3208
2429our @ISA = CFClient::UI::Bin::; 3209our @ISA = CFPlus::UI::Bin::;
2430 3210
2431use CFClient::OpenGL; 3211use CFPlus::OpenGL;
2432 3212
2433sub new { 3213sub new {
2434 my $class = shift; 3214 my $class = shift;
2435 3215
2436 $class->SUPER::new ( 3216 $class->SUPER::new (
2437 @_, 3217 @_,
2438 can_events => 0, 3218 can_events => 0,
2439 ) 3219 )
2440} 3220}
2441 3221
2442sub set_markup { 3222sub set_tooltip_from {
2443 my ($self, $text) = @_; 3223 my ($self, $widget) = @_;
2444 3224
2445 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 3225 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
2446 $self->{label}->set_markup ($text); 3226 if $widget->{tooltip} =~ /^#(.*)$/;
2447 $self->add ($self->{label}); 3227
3228 my $tooltip = $widget->{tooltip};
3229
3230 if ($ENV{CFPLUS_DEBUG} & 2) {
3231 $tooltip .= "\n\n" . (ref $widget) . "\n"
3232 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3233 . "req $widget->{req_w} $widget->{req_h}\n"
3234 . "visible $widget->{visible}";
3235 }
3236
3237 $tooltip =~ s/^\n+//;
3238 $tooltip =~ s/\n+$//;
3239
3240 $self->add (new CFPlus::UI::Label
3241 markup => $tooltip,
3242 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3243 fontsize => 0.8,
3244 style => 1, # FLAG_INVERSE
3245 ellipsise => 0,
3246 font => ($widget->{tooltip_font} || $::FONT_PROP),
3247 );
2448} 3248}
2449 3249
2450sub size_request { 3250sub size_request {
2451 my ($self) = @_; 3251 my ($self) = @_;
2452 3252
2453 $self->child->set_max_size ($::WIDTH * 0.3);
2454
2455 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3253 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2456 3254
2457 ($w + 4, $h + 4) 3255 ($w + 4, $h + 4)
2458} 3256}
2459 3257
2460sub size_allocate { 3258sub invoke_size_allocate {
2461 my ($self, $w, $h) = @_; 3259 my ($self, $w, $h) = @_;
2462 3260
2463 $self->SUPER::size_allocate ($w - 4, $h - 4); 3261 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3262}
3263
3264sub invoke_visibility_change {
3265 my ($self, $visible) = @_;
3266
3267 return unless $visible;
3268
3269 $self->{root}->on_post_alloc ("move_$self" => sub {
3270 my $widget = $self->{owner}
3271 or return;
3272
3273 if ($widget->{visible}) {
3274 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3275
3276 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3277 if $x + $self->{w} > $self->{root}{w};
3278
3279 $self->move_abs ($x, $y);
3280 } else {
3281 $self->hide;
3282 }
3283 });
2464} 3284}
2465 3285
2466sub _draw { 3286sub _draw {
2467 my ($self) = @_; 3287 my ($self) = @_;
2468 3288
2469 glPushMatrix;
2470 glTranslate 0.375, 0.375; 3289 glTranslate 0.375, 0.375;
2471 3290
2472 my ($w, $h) = @$self{qw(w h)}; 3291 my ($w, $h) = @$self{qw(w h)};
2473 3292
2474 glColor 1, 0.8, 0.4; 3293 glColor 1, 0.8, 0.4;
… …
2485 glVertex 0 , $h; 3304 glVertex 0 , $h;
2486 glVertex $w, $h; 3305 glVertex $w, $h;
2487 glVertex $w, 0; 3306 glVertex $w, 0;
2488 glEnd; 3307 glEnd;
2489 3308
2490 glPopMatrix; 3309 glTranslate 2 - 0.375, 2 - 0.375;
2491 3310
2492 glTranslate 2, 2;
2493 $self->SUPER::_draw; 3311 $self->SUPER::_draw;
2494} 3312}
2495 3313
2496############################################################################# 3314#############################################################################
2497 3315
2498package CFClient::UI::Face; 3316package CFPlus::UI::Face;
2499 3317
2500our @ISA = CFClient::UI::Base::; 3318our @ISA = CFPlus::UI::DrawBG::;
2501 3319
2502use CFClient::OpenGL; 3320use CFPlus::OpenGL;
2503 3321
2504sub new { 3322sub new {
2505 my $class = shift; 3323 my $class = shift;
2506 3324
2507 $class->SUPER::new ( 3325 my $self = $class->SUPER::new (
2508 aspect => 1, 3326 aspect => 1,
3327 can_events => 0,
2509 @_, 3328 @_,
2510 ) 3329 );
3330
3331 if ($self->{anim} && $self->{animspeed}) {
3332 CFPlus::weaken (my $widget = $self);
3333
3334 $self->{timer} = Event->timer (
3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3336 hard => 1,
3337 interval => $self->{animspeed},
3338 cb => sub {
3339 delete $self->{wait_face};
3340 ++$widget->{frame};
3341 $widget->update;
3342 },
3343 );
3344 }
3345
3346 $self
2511} 3347}
2512 3348
2513sub size_request { 3349sub size_request {
2514 (32, 8) 3350 (32, 8)
2515} 3351}
2516 3352
3353sub update {
3354 my ($self) = @_;
3355
3356 return unless $self->{visible};
3357
3358 $self->SUPER::update;
3359}
3360
2517sub _draw { 3361sub _draw {
2518 my ($self) = @_; 3362 my ($self) = @_;
2519 3363
2520 return unless $::CONN;#d# manage and cache textures differently 3364 return unless $::CONN;
3365
3366 $self->SUPER::_draw;
3367
3368 my $face;
3369
3370 if ($self->{frame}) {
3371 my $anim = $::CONN->{anim}[$self->{anim}];
3372
3373 $face = $anim->[ $self->{frame} % @$anim ]
3374 if $anim && @$anim;
3375 }
3376
3377 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3378 or return;
3379
2521 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3380 my $tex = $::CONN->{texture}[$faceid];
2522 3381
2523 # TODO animation
2524 if ($tex) { 3382 if ($tex) {
2525 glEnable GL_BLEND;
2526 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2527 glEnable GL_TEXTURE_2D; 3383 glEnable GL_TEXTURE_2D;
2528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2529 glColor 1, 1, 1, 1; 3385 glColor 0, 0, 0, 1;
2530 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 3386 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2531 glDisable GL_TEXTURE_2D; 3387 glDisable GL_TEXTURE_2D;
2532 glDisable GL_BLEND; 3388 } else {
3389 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390 $self->update;
3391 });
2533 } 3392 }
3393}
3394
3395sub destroy {
3396 my ($self) = @_;
3397
3398 $self->{timer}->cancel
3399 if $self->{timer};
3400
3401 $self->SUPER::destroy;
2534} 3402}
2535 3403
2536############################################################################# 3404#############################################################################
2537 3405
2538package CFClient::UI::InventoryItem; 3406package CFPlus::UI::Buttonbar;
2539 3407
2540our @ISA = CFClient::UI::HBox::; 3408our @ISA = CFPlus::UI::HBox::;
2541 3409
2542sub new { 3410# 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 3411
2598############################################################################# 3412#############################################################################
2599 3413
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; 3414package CFPlus::UI::Menu;
2644 3415
2645our @ISA = CFClient::UI::FancyFrame::; 3416our @ISA = CFPlus::UI::Toplevel::;
2646 3417
2647use CFClient::OpenGL; 3418use CFPlus::OpenGL;
2648 3419
2649sub new { 3420sub new {
2650 my $class = shift; 3421 my $class = shift;
2651 3422
2652 my $self = $class->SUPER::new ( 3423 my $self = $class->SUPER::new (
2653 items => [], 3424 items => [],
2654 z => 100, 3425 z => 100,
2655 @_, 3426 @_,
2656 ); 3427 );
2657 3428
2658 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3429 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2659 3430
2660 for my $item (@{ $self->{items} }) { 3431 for my $item (@{ $self->{items} }) {
2661 my ($widget, $cb) = @$item; 3432 my ($widget, $cb, $tooltip) = @$item;
2662 3433
2663 # handle various types of items, only text for now 3434 # handle various types of items, only text for now
2664 if (!ref $widget) { 3435 if (!ref $widget) {
3436 if ($widget =~ /\t/) {
3437 my ($left, $right) = split /\t/, $widget, 2;
3438
2665 $widget = new CFClient::UI::Label 3439 $widget = new CFPlus::UI::HBox
2666 can_hover => 1, 3440 can_hover => 1,
2667 can_events => 1, 3441 can_events => 1,
3442 tooltip => $tooltip,
3443 children => [
3444 (new CFPlus::UI::Label markup => $left, expand => 1),
3445 (new CFPlus::UI::Label markup => $right, align => +1),
3446 ],
3447 ;
3448
3449 } else {
3450 $widget = new CFPlus::UI::Label
3451 can_hover => 1,
3452 can_events => 1,
2668 text => $widget; 3453 markup => $widget,
3454 tooltip => $tooltip;
3455 }
2669 } 3456 }
2670 3457
2671 $self->{item}{$widget} = $item; 3458 $self->{item}{$widget} = $item;
2672 3459
2673 $self->{vbox}->add ($widget); 3460 $self->{vbox}->add ($widget);
… …
2685 # maybe save $GRAB? must be careful about events... 3472 # maybe save $GRAB? must be careful about events...
2686 $GRAB = $self; 3473 $GRAB = $self;
2687 $self->{button} = $ev->{button}; 3474 $self->{button} = $ev->{button};
2688 3475
2689 $self->show; 3476 $self->show;
2690 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3477 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2691} 3478}
2692 3479
2693sub mouse_motion { 3480sub invoke_mouse_motion {
2694 my ($self, $ev, $x, $y) = @_; 3481 my ($self, $ev, $x, $y) = @_;
2695 3482
2696 # TODO: should use vbox->find_widget or so 3483 # TODO: should use vbox->find_widget or so
2697 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3484 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2698 $self->{hover} = $self->{item}{$HOVER}; 3485 $self->{hover} = $self->{item}{$HOVER};
2699}
2700 3486
3487 0
3488}
3489
2701sub button_up { 3490sub invoke_button_up {
2702 my ($self, $ev, $x, $y) = @_; 3491 my ($self, $ev, $x, $y) = @_;
2703 3492
2704 if ($ev->{button} == $self->{button}) { 3493 if ($ev->{button} == $self->{button}) {
2705 undef $GRAB; 3494 undef $GRAB;
2706 $self->hide; 3495 $self->hide;
2707 3496
2708 $self->emit ("popdown"); 3497 $self->emit ("popdown");
2709 $self->{hover}[1]->() if $self->{hover}; 3498 $self->{hover}[1]->() if $self->{hover};
3499 } else {
3500 return 0
3501 }
3502
2710 } 3503 1
2711} 3504}
2712 3505
2713############################################################################# 3506#############################################################################
2714 3507
2715package CFClient::UI::Root; 3508package CFPlus::UI::Multiplexer;
2716 3509
2717our @ISA = CFClient::UI::Container::; 3510our @ISA = CFPlus::UI::Container::;
2718 3511
2719use CFClient::OpenGL; 3512sub new {
3513 my $class = shift;
2720 3514
2721sub check_size { 3515 my $self = $class->SUPER::new (
3516 @_,
3517 );
3518
3519 $self->{current} = $self->{children}[0]
3520 if @{ $self->{children} };
3521
3522 $self
3523}
3524
3525sub add {
2722 my ($self) = @_; 3526 my ($self, @widgets) = @_;
2723 3527
3528 $self->SUPER::add (@widgets);
3529
3530 $self->{current} = $self->{children}[0]
3531 if @{ $self->{children} };
3532}
3533
3534sub get_current_page {
3535 my ($self) = @_;
3536
3537 $self->{current}
3538}
3539
3540sub set_current_page {
3541 my ($self, $page_or_widget) = @_;
3542
3543 my $widget = ref $page_or_widget
3544 ? $page_or_widget
3545 : $self->{children}[$page_or_widget];
3546
3547 $self->{current} = $widget;
2724 $self->configure (0, 0, $self->{w}, $self->{h}); 3548 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3549
3550 $self->emit (page_changed => $self->{current});
3551
3552 $self->realloc;
3553}
3554
3555sub visible_children {
3556 $_[0]{current}
2725} 3557}
2726 3558
2727sub size_request { 3559sub size_request {
2728 my ($self) = @_; 3560 my ($self) = @_;
2729 3561
3562 $self->{current}->size_request
3563}
3564
3565sub invoke_size_allocate {
3566 my ($self, $w, $h) = @_;
3567
3568 $self->{current}->configure (0, 0, $w, $h);
3569
3570 1
3571}
3572
3573sub _draw {
3574 my ($self) = @_;
3575
3576 $self->{current}->draw;
3577}
3578
3579#############################################################################
3580
3581package CFPlus::UI::Notebook;
3582
3583our @ISA = CFPlus::UI::VBox::;
3584
3585sub new {
3586 my $class = shift;
3587
3588 my $self = $class->SUPER::new (
3589 buttonbar => (new CFPlus::UI::Buttonbar),
3590 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3591 # filter => # will be put between multiplexer and $self
3592 @_,
3593 );
3594
3595 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3596 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3597
3598 $self
3599}
3600
3601sub add {
3602 my ($self, $title, $widget, $tooltip) = @_;
3603
3604 CFPlus::weaken $self;
3605
3606 $self->{buttonbar}->add (new CFPlus::UI::Button
3607 markup => $title,
3608 tooltip => $tooltip,
3609 on_activate => sub { $self->set_current_page ($widget) },
3610 );
3611
3612 $self->{multiplexer}->add ($widget);
3613}
3614
3615sub get_current_page {
3616 my ($self) = @_;
3617
3618 $self->{multiplexer}->get_current_page
3619}
3620
3621sub set_current_page {
3622 my ($self, $page) = @_;
3623
3624 $self->{multiplexer}->set_current_page ($page);
3625 $self->emit (page_changed => $self->{multiplexer}{current});
3626}
3627
3628#############################################################################
3629
3630package CFPlus::UI::Selector;
3631
3632use utf8;
3633
3634our @ISA = CFPlus::UI::Button::;
3635
3636sub new {
3637 my $class = shift;
3638
3639 my $self = $class->SUPER::new (
3640 options => [], # [value, title, longdesc], ...
3641 value => undef,
3642 @_,
3643 );
3644
3645 $self->_set_value ($self->{value});
3646
3647 $self
3648}
3649
3650sub invoke_button_down {
3651 my ($self, $ev) = @_;
3652
3653 my @menu_items;
3654
3655 for (@{ $self->{options} }) {
3656 my ($value, $title, $tooltip) = @$_;
3657
3658 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3659 }
3660
3661 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3662}
3663
3664sub _set_value {
3665 my ($self, $value) = @_;
3666
3667 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3668 or return;
3669
3670 $self->{value} = $item->[0];
3671 $self->set_markup ("$item->[1] ⇓");
3672 $self->set_tooltip ($item->[2]);
3673}
3674
3675sub set_value {
3676 my ($self, $value) = @_;
3677
3678 return unless $self->{value} ne $value;
3679
3680 $self->_set_value ($value);
3681 $self->emit (changed => $value);
3682}
3683
3684#############################################################################
3685
3686package CFPlus::UI::Statusbox;
3687
3688our @ISA = CFPlus::UI::VBox::;
3689
3690sub new {
3691 my $class = shift;
3692
3693 my $self = $class->SUPER::new (
3694 fontsize => 0.8,
3695 @_,
3696 );
3697
3698 CFPlus::weaken (my $this = $self);
3699
3700 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3701
3702 $self
3703}
3704
3705sub reorder {
3706 my ($self) = @_;
3707 my $NOW = Time::HiRes::time;
3708
3709 # freeze display when hovering over any label
3710 return if $CFPlus::UI::TOOLTIP->{owner}
3711 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3712 values %{ $self->{item} };
3713
3714 while (my ($k, $v) = each %{ $self->{item} }) {
3715 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3716 }
3717
3718 my @widgets;
3719
3720 my @items = sort {
3721 $a->{pri} <=> $b->{pri}
3722 or $b->{id} <=> $a->{id}
3723 } values %{ $self->{item} };
3724
3725 $self->{timer}->interval (1);
3726
3727 my $count = 10 + 1;
3728 for my $item (@items) {
3729 last unless --$count;
3730
3731 my $label = $item->{label} ||= do {
3732 # TODO: doesn't handle markup well (read as: at all)
3733 my $short = $item->{count} > 1
3734 ? "<b>$item->{count} ×</b> $item->{text}"
3735 : $item->{text};
3736
3737 for ($short) {
3738 s/^\s+//;
3739 s/\s+/ /g;
3740 }
3741
3742 new CFPlus::UI::Label
3743 markup => $short,
3744 tooltip => $item->{tooltip},
3745 tooltip_font => $::FONT_PROP,
3746 tooltip_width => 0.67,
3747 fontsize => $item->{fontsize} || $self->{fontsize},
3748 max_w => $::WIDTH * 0.44,
3749 fg => [@{ $item->{fg} }],
3750 can_events => 1,
3751 can_hover => 1
3752 };
3753
3754 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3755 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3756 $label->update;
3757 $label->set_max_size (undef, $label->{req_h} * $diff)
3758 if $diff < 1;
3759 $self->{timer}->interval (1/30);
3760 } else {
3761 $label->{fg}[3] = $item->{fg}[3] || 1;
3762 }
3763
3764 push @widgets, $label;
3765 }
3766
3767 $self->clear;
3768 $self->SUPER::add (reverse @widgets);
3769}
3770
3771sub add {
3772 my ($self, $text, %arg) = @_;
3773
3774 $text =~ s/^\s+//;
3775 $text =~ s/\s+$//;
3776
3777 return unless $text;
3778
3779 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3780
3781 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3782
3783 if (my $item = $self->{item}{$group}) {
3784 if ($item->{text} eq $text) {
3785 $item->{count}++;
3786 } else {
3787 $item->{count} = 1;
3788 $item->{text} = $item->{tooltip} = $text;
3789 }
3790 $item->{id} += 0.2;#d#
3791 $item->{timeout} = $timeout;
3792 delete $item->{label};
3793 } else {
3794 $self->{item}{$group} = {
3795 id => ++$self->{id},
3796 text => $text,
3797 timeout => $timeout,
3798 tooltip => $text,
3799 fg => [0.8, 0.8, 0.8, 0.8],
3800 pri => 0,
3801 count => 1,
3802 %arg,
3803 };
3804 }
3805
3806 $ROOT->on_refresh (reorder => sub {
3807 $self->reorder;
3808 });
3809}
3810
3811sub reconfigure {
3812 my ($self) = @_;
3813
3814 delete $_->{label}
3815 for values %{ $self->{item} || {} };
3816
3817 $self->reorder;
3818 $self->SUPER::reconfigure;
3819}
3820
3821sub destroy {
3822 my ($self) = @_;
3823
3824 $self->{timer}->cancel;
3825
3826 $self->SUPER::destroy;
3827}
3828
3829#############################################################################
3830
3831package CFPlus::UI::Root;
3832
3833our @ISA = CFPlus::UI::Container::;
3834
3835use List::Util qw(min max);
3836
3837use CFPlus::OpenGL;
3838
3839sub new {
3840 my $class = shift;
3841
3842 my $self = $class->SUPER::new (
3843 visible => 1,
3844 @_,
3845 );
3846
3847 CFPlus::weaken ($self->{root} = $self);
3848
3849 $self
3850}
3851
3852sub size_request {
3853 my ($self) = @_;
3854
2730 ($self->{w}, $self->{h}) 3855 ($self->{w}, $self->{h})
2731} 3856}
2732 3857
3858sub _to_pixel {
3859 my ($coord, $size, $max) = @_;
3860
3861 $coord =
3862 $coord eq "center" ? ($max - $size) * 0.5
3863 : $coord eq "max" ? $max
3864 : $coord;
3865
3866 $coord = 0 if $coord < 0;
3867 $coord = $max - $size if $coord > $max - $size;
3868
3869 int $coord + 0.5
3870}
3871
2733sub size_allocate { 3872sub invoke_size_allocate {
2734 my ($self, $w, $h) = @_; 3873 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 3874
2761 for my $child ($self->children) { 3875 for my $child ($self->children) {
2762 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3876 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2763 3877
2764 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3878 $X = $child->{force_x} if exists $child->{force_x};
2765 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3879 $Y = $child->{force_y} if exists $child->{force_y};
3880
3881 $X = _to_pixel $X, $W, $self->{w};
3882 $Y = _to_pixel $Y, $H, $self->{h};
3883
2766 $child->configure ($X, $Y, $W, $H); 3884 $child->configure ($X, $Y, $W, $H);
2767 } 3885 }
2768}
2769 3886
2770sub _topleft { 3887 1
3888}
3889
3890sub coord2local {
2771 my ($self, $x, $y) = @_; 3891 my ($self, $x, $y) = @_;
2772 3892
2773 ($x, $y) 3893 ($x, $y)
2774} 3894}
2775 3895
3896sub coord2global {
3897 my ($self, $x, $y) = @_;
3898
3899 ($x, $y)
3900}
3901
2776sub update { 3902sub update {
2777 my ($self) = @_; 3903 my ($self) = @_;
2778 3904
2779 $self->check_size; 3905 $::WANT_REFRESH++;
2780 ::refresh ();
2781} 3906}
2782 3907
2783sub add { 3908sub add {
2784 my ($self, $child) = @_; 3909 my ($self, @children) = @_;
2785 3910
2786 # integerize window positions 3911 $_->{is_toplevel} = 1
2787 $child->{x} = int $child->{x}; 3912 for @children;
2788 $child->{y} = int $child->{y};
2789 3913
2790 $self->SUPER::add ($child); 3914 $self->SUPER::add (@children);
3915}
3916
3917sub remove {
3918 my ($self, @children) = @_;
3919
3920 $self->SUPER::remove (@children);
3921
3922 delete $self->{is_toplevel}
3923 for @children;
3924
3925 while (@children) {
3926 my $w = pop @children;
3927 push @children, $w->children;
3928 $w->set_invisible;
3929 }
2791} 3930}
2792 3931
2793sub on_refresh { 3932sub on_refresh {
2794 my ($self, $id, $cb) = @_; 3933 my ($self, $id, $cb) = @_;
2795 3934
2796 $self->{refresh_hook}{$id} = $cb; 3935 $self->{refresh_hook}{$id} = $cb;
2797} 3936}
2798 3937
3938sub on_post_alloc {
3939 my ($self, $id, $cb) = @_;
3940
3941 $self->{post_alloc_hook}{$id} = $cb;
3942}
3943
2799sub draw { 3944sub draw {
2800 my ($self) = @_; 3945 my ($self) = @_;
2801 3946
2802 while (my $rcb = delete $self->{refresh_hook}) { 3947 while ($self->{refresh_hook}) {
2803 $_->() for values %$rcb; 3948 $_->()
3949 for values %{delete $self->{refresh_hook}};
2804 } 3950 }
3951
3952 if ($self->{realloc}) {
3953 my %queue;
3954 my @queue;
3955 my $widget;
3956
3957 outer:
3958 while () {
3959 if (my $realloc = delete $self->{realloc}) {
3960 for $widget (values %$realloc) {
3961 $widget->{visible} or next; # do not resize invisible widgets
3962
3963 $queue{$widget+0}++ and next; # duplicates are common
3964
3965 push @{ $queue[$widget->{visible}] }, $widget;
3966 }
3967 }
3968
3969 while () {
3970 @queue or last outer;
3971
3972 $widget = pop @{ $queue[-1] || [] }
3973 and last;
3974
3975 pop @queue;
3976 }
3977
3978 delete $queue{$widget+0};
3979
3980 my ($w, $h) = $widget->size_request;
3981
3982 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3983 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3984
3985 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3986 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3987
3988 $w = $widget->{force_w} if exists $widget->{force_w};
3989 $h = $widget->{force_h} if exists $widget->{force_h};
3990
3991 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3992 || delete $widget->{force_realloc}) {
3993 $widget->{req_w} = $w;
3994 $widget->{req_h} = $h;
3995
3996 $self->{size_alloc}{$widget+0} = $widget;
3997
3998 if (my $parent = $widget->{parent}) {
3999 $self->{realloc}{$parent+0} = $parent
4000 unless $queue{$parent+0};
4001
4002 $parent->{force_size_alloc} = 1;
4003 $self->{size_alloc}{$parent+0} = $parent;
4004 }
4005 }
4006
4007 delete $self->{realloc}{$widget+0};
4008 }
4009 }
4010
4011 while (my $size_alloc = delete $self->{size_alloc}) {
4012 my @queue = sort { $b->{visible} <=> $a->{visible} }
4013 values %$size_alloc;
4014
4015 while () {
4016 my $widget = pop @queue || last;
4017
4018 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4019
4020 $w = 0 if $w < 0;
4021 $h = 0 if $h < 0;
4022
4023 $w = max $widget->{min_w}, $w;
4024 $h = max $widget->{min_h}, $h;
4025
4026# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4027# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4028
4029 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4030 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4031
4032 $w = int $w + 0.5;
4033 $h = int $h + 0.5;
4034
4035 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4036 $widget->{old_w} = $widget->{w};
4037 $widget->{old_h} = $widget->{h};
4038
4039 $widget->{w} = $w;
4040 $widget->{h} = $h;
4041
4042 $widget->emit (size_allocate => $w, $h);
4043 }
4044 }
4045 }
4046
4047 while ($self->{post_alloc_hook}) {
4048 $_->()
4049 for values %{delete $self->{post_alloc_hook}};
4050 }
4051
2805 4052
2806 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4053 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2807 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4054 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2808 glClear GL_COLOR_BUFFER_BIT; 4055 glClear GL_COLOR_BUFFER_BIT;
2809 4056
2810 glMatrixMode GL_PROJECTION; 4057 glMatrixMode GL_PROJECTION;
2811 glLoadIdentity; 4058 glLoadIdentity;
2812 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4059 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2813 glMatrixMode GL_MODELVIEW; 4060 glMatrixMode GL_MODELVIEW;
2814 glLoadIdentity; 4061 glLoadIdentity;
2815 4062
4063 {
4064 package CFPlus::UI::Base;
4065
4066 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4067 (0, 0, $self->{w}, $self->{h});
4068
2816 $self->_draw; 4069 $self->_draw;
4070 }
2817} 4071}
2818 4072
2819############################################################################# 4073#############################################################################
2820 4074
2821package CFClient::UI; 4075package CFPlus::UI;
2822 4076
2823$ROOT = new CFClient::UI::Root; 4077$ROOT = new CFPlus::UI::Root;
2824$TOOLTIP = new CFClient::UI::Tooltip; 4078$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
2825 4079
28261 40801
2827 4081

Diff Legend

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