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.229 by root, Wed May 24 21:49:58 2006 UTC vs.
Revision 1.371 by root, Sun Jul 15 22:07:48 2007 UTC

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

Diff Legend

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