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.183 by elmex, Sun Apr 30 13:10:46 2006 UTC vs.
Revision 1.380 by root, Tue Jul 17 17:39:07 2007 UTC

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

Diff Legend

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