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

Diff Legend

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