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.179 by elmex, Fri Apr 28 05:17:21 2006 UTC vs.
Revision 1.382 by root, Thu Jul 19 19:58:56 2007 UTC

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

Diff Legend

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