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

Diff Legend

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