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.228 by root, Wed May 24 03:52:54 2006 UTC vs.
Revision 1.386 by root, Fri Jul 20 16:33:45 2007 UTC

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

Diff Legend

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