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.64 by root, Tue Apr 11 13:38:22 2006 UTC vs.
Revision 1.115 by root, Sat Apr 15 19:35:20 2006 UTC

1package CFClient::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6 6use List::Util ();
7use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9 7
10use CFClient; 8use CFClient;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
14our $TOPLEVEL; 12our $ROOT;
15our $BUTTON_STATE; 13our $BUTTON_STATE;
16 14
17# class methods for events 15# class methods for events
18sub feed_sdl_key_down_event { 16sub feed_sdl_key_down_event {
19 $FOCUS->key_down ($_[0]) if $FOCUS; 17 $FOCUS->key_down ($_[0]) if $FOCUS;
26sub feed_sdl_button_down_event { 24sub feed_sdl_button_down_event {
27 my ($ev) = @_; 25 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 26 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29 27
30 if (!$BUTTON_STATE) { 28 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y); 29 my $widget = $ROOT->find_widget ($x, $y);
32 30
33 $GRAB = $widget; 31 $GRAB = $widget;
34 $GRAB->update if $GRAB; 32 $GRAB->update if $GRAB;
35 } 33 }
36 34
37 $BUTTON_STATE |= 1 << ($ev->button - 1); 35 $BUTTON_STATE |= 1 << ($ev->button - 1);
38 36
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
40} 38}
41 39
42sub feed_sdl_button_up_event { 40sub feed_sdl_button_up_event {
43 my ($ev) = @_; 41 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49 47
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
51 49
52 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab; 52 $grab->update if $grab;
55 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
58 56
59sub feed_sdl_motion_event { 57sub feed_sdl_motion_event {
60 my ($ev) = @_; 58 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 59 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62 60
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 61 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
64 62
65 if ($widget != $HOVER) { 63 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget; 64 my $hover = $HOVER; $HOVER = $widget;
67 65
68 $hover->update if $hover; 66 $hover->update if $hover && $hover->{can_hover};
69 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER && $HOVER->{can_hover};
70 } 68 }
71 69
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
73} 71}
72
73# convert position array to integers
74sub harmonize {
75 my ($vals) = @_;
76
77 my $rem = 0;
78
79 for ($vals) {
80 my $i = int $_ + $rem;
81 $rem += $_ - $i;
82 $_ = $i;
83 }
84}
85
86#############################################################################
87
88package CFClient::UI::Base;
89
90use strict;
91
92use SDL::OpenGL;
74 93
75sub new { 94sub new {
76 my $class = shift; 95 my $class = shift;
77 96
78 bless { @_ }, $class 97 my $self = bless {
98 x => 0,
99 y => 0,
100 z => 0,
101 w => -1,
102 h => -1,
103 @_
104 }, $class;
105
106 for (keys %$self) {
107 if (/^connect_(.*)$/) {
108 $self->connect ($1 => delete $self->{$_});
109 }
110 }
111
112 $self
79} 113}
80 114
81sub move { 115sub move {
82 my ($self, $x, $y, $z) = @_; 116 my ($self, $x, $y, $z) = @_;
83 $self->{x} = $x; 117 $self->{x} = $x;
92sub size_request { 126sub size_request {
93 require Carp; 127 require Carp;
94 Carp::confess "size_request is abtract"; 128 Carp::confess "size_request is abtract";
95} 129}
96 130
97sub size_allocate { 131sub _size_allocate {
98 my ($self, $w, $h) = @_; 132 my ($self, $x, $y, $w, $h) = @_;
133
134 $self->{x} = $x;
135 $self->{y} = $y;
136
137 return unless $self->{w} != $w || $self->{h} != $h;
99 138
100 $self->{w} = $w; 139 $self->{w} = $w;
101 $self->{h} = $h; 140 $self->{h} = $h;
102}
103 141
104# translate global koordinates to local coordinate system 142 1
105sub translate { 143}
144
145sub size_allocate {
146 my ($self, $x, $y, $w, $h) = @_;
147
148 $self->_size_allocate ($x, $y, $w, $h);
149}
150
151# return top left coordinates
152sub _topleft {
106 my ($self, $x, $y) = @_; 153 my ($self, $x, $y) = @_;
107 154
108 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 155 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
156}
157
158# translate global coordinates to local coordinate system
159sub coord2local {
160 my ($self, $x, $y) = @_;
161
162 my ($X, $Y) = $self->_topleft;
163 ($x - $X, $y - $Y)
164}
165
166# translate local coordinates to global coordinate system
167sub coord2global {
168 my ($self, $x, $y) = @_;
169
170 my ($X, $Y) = $self->_topleft;
171 ($x + $X, $y + $Y)
109} 172}
110 173
111sub focus_in { 174sub focus_in {
112 my ($self) = @_; 175 my ($self) = @_;
176
177 return if $FOCUS == $self;
178 return unless $self->{can_focus};
113 179
114 my $focus = $FOCUS; $FOCUS = $self; 180 my $focus = $FOCUS; $FOCUS = $self;
115 $focus->update if $focus; 181 $focus->update if $focus;
116 $FOCUS->update; 182 $FOCUS->update;
117} 183}
125 $focus->update if $focus; #? 191 $focus->update if $focus; #?
126} 192}
127 193
128sub mouse_motion { } 194sub mouse_motion { }
129sub button_up { } 195sub button_up { }
130sub button_down { }
131sub key_down { } 196sub key_down { }
132sub key_up { } 197sub key_up { }
198
199sub button_down {
200 my ($self, $ev, $x, $y) = @_;
201
202 $self->focus_in;
203}
133 204
134sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 205sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
135sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 206sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
136sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 207sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
137sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 208sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
138sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 209sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
139 210
140sub draw { 211sub draw {
141 my ($self) = @_; 212 my ($self) = @_;
142 213
214 return unless $self->{h} && $self->{w};
215
143 glPushMatrix; 216 glPushMatrix;
144 glTranslate $self->{x}, $self->{y}, 0; 217 glTranslate $self->{x}, $self->{y}, 0;
145 $self->_draw; 218 $self->_draw;
146 if ($self == $HOVER) { 219 glPopMatrix;
147 glColor 1, 1, 1, 0.4; 220
221 if ($self == $HOVER && $self->{can_hover}) {
222 my ($x, $y) = @$self{qw(x y)};
223
224 glColor 0, 0, 1, 0.2;
148 glEnable GL_BLEND; 225 glEnable GL_BLEND;
226 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
149 glBegin GL_QUADS; 227 glBegin GL_QUADS;
150 glVertex 0 , 0; 228 glVertex $x , $y;
151 glVertex $self->{w}, 0; 229 glVertex $x + $self->{w}, $y;
152 glVertex $self->{w}, $self->{h}; 230 glVertex $x + $self->{w}, $y + $self->{h};
153 glVertex 0 , $self->{h}; 231 glVertex $x , $y + $self->{h};
154 glEnd; 232 glEnd;
155 glDisable GL_BLEND; 233 glDisable GL_BLEND;
156 } 234 }
157 glPopMatrix;
158} 235}
159 236
160sub _draw { 237sub _draw {
161 my ($self) = @_; 238 my ($self) = @_;
162 239
163 warn "no draw defined for $self\n"; 240 warn "no draw defined for $self\n";
164}
165
166sub bbox {
167 my ($self) = @_;
168 my ($w, $h) = $self->size_request;
169 (
170 $self->{x},
171 $self->{y},
172 $self->{x} = $w,
173 $self->{y} = $h
174 )
175} 241}
176 242
177sub find_widget { 243sub find_widget {
178 my ($self, $x, $y) = @_; 244 my ($self, $x, $y) = @_;
179 245
182 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 248 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
183 249
184 () 250 ()
185} 251}
186 252
187sub del_parent { $_[0]->{parent} = undef }
188
189sub set_parent { 253sub set_parent {
190 my ($self, $par) = @_; 254 my ($self, $parent) = @_;
191 255
192 $self->{parent} = $par;
193 Scalar::Util::weaken $self->{parent}; 256 Scalar::Util::weaken ($self->{parent} = $parent);
194}
195
196sub get_parent {
197 $_[0]->{parent}
198} 257}
199 258
200sub update { 259sub update {
201 my ($self) = @_; 260 my ($self) = @_;
202 261
203 $self->{parent}->update 262 $self->{parent}->update
204 if $self->{parent}; 263 if $self->{parent};
205} 264}
206 265
266sub connect {
267 my ($self, $signal, $cb) = @_;
268
269 push @{ $self->{cb}{$signal} }, $cb;
270}
271
272sub emit {
273 my ($self, $signal, @args) = @_;
274
275 $_->($self, @args)
276 for @{$self->{cb}{$signal} || []};
277}
278
207sub DESTROY { 279sub DESTROY {
208 my ($self) = @_; 280 my ($self) = @_;
209 281
210 #$self->deactivate; 282 #$self->deactivate;
211} 283}
212 284
213############################################################################# 285#############################################################################
214 286
287package CFClient::UI::DrawBG;
288
289our @ISA = CFClient::UI::Base::;
290
291use strict;
292use SDL::OpenGL;
293
294sub new {
295 my $class = shift;
296
297 # range [value, low, high, page]
298
299 $class->SUPER::new (
300 bg => [0, 0, 0, 0.2],
301 active_bg => [1, 1, 1, 0.5],
302 @_
303 )
304}
305
306sub _draw {
307 my ($self) = @_;
308
309 my ($w, $h) = @$self{qw(w h)};
310
311 glEnable GL_BLEND;
312 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
313 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
314
315 glBegin GL_QUADS;
316 glVertex 0 , 0;
317 glVertex 0 , $h;
318 glVertex $w, $h;
319 glVertex $w, 0;
320 glEnd;
321
322 glDisable GL_BLEND;
323}
324
325#############################################################################
326
327package CFClient::UI::Empty;
328
329our @ISA = CFClient::UI::Base::;
330
331sub size_request {
332 (0, 0)
333}
334
335sub draw { }
336
337#############################################################################
338
215package CFClient::Widget::Container; 339package CFClient::UI::Container;
216 340
217our @ISA = CFClient::Widget::; 341our @ISA = CFClient::UI::Base::;
218 342
219sub new { 343sub new {
220 my ($class, %arg) = @_; 344 my ($class, %arg) = @_;
221 345
222 my $children = delete $arg{children} || []; 346 my $children = delete $arg{children} || [];
223 347
224 my $self = $class->SUPER::new (children => []); 348 my $self = $class->SUPER::new (children => [], %arg);
225 $self->add ($_) for @$children; 349 $self->add ($_) for @$children;
226 350
227 $self 351 $self
228} 352}
229 353
230sub add { 354sub add {
231 my ($self, $chld, $expand) = @_; 355 my ($self, $child) = @_;
232 356
233 $chld->{expand} = $expand;
234 $chld->set_parent ($self); 357 $child->set_parent ($self);
235 358
359 use sort 'stable';
360
236 @{$self->{children}} = 361 $self->{children} = [
237 sort { $a->{z} <=> $b->{z} } 362 sort { $a->{z} <=> $b->{z} }
238 @{$self->{children}}, $chld; 363 @{$self->{children}}, $child
364 ];
239 365
240 $self->size_allocate ($self->{w}, $self->{h}) 366 $self->{w} = $self->{h} = -1;
241 if $self->{w}; #TODO: check for "realised state" 367 $self->update;
242} 368}
243 369
244sub remove { 370sub remove {
245 my ($self, $widget) = @_; 371 my ($self, $widget) = @_;
246 372
247 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 373 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
248 374
249 $self->size_allocate ($self->{w}, $self->{h}); 375 $self->size_allocate (0, 0, $self->{w}, $self->{h});
250} 376}
251 377
252sub find_widget { 378sub find_widget {
253 my ($self, $x, $y) = @_; 379 my ($self, $x, $y) = @_;
254 380
271 $_->draw for @{$self->{children}}; 397 $_->draw for @{$self->{children}};
272} 398}
273 399
274############################################################################# 400#############################################################################
275 401
276package CFClient::Widget::Bin; 402package CFClient::UI::Bin;
277 403
278our @ISA = CFClient::Widget::Container::; 404our @ISA = CFClient::UI::Container::;
405
406sub new {
407 my ($class, %arg) = @_;
408
409 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
410
411 $class->SUPER::new (children => [$child], %arg)
412}
413
414sub add {
415 my ($self, $widget) = @_;
416
417 $self->{children} = [];
418
419 $self->SUPER::add ($widget);
420}
421
422sub remove {
423 my ($self, $widget) = @_;
424
425 $self->SUPER::remove ($widget);
426
427 $self->{children} = [new CFClient::UI::Empty]
428 unless @{$self->{children}};
429}
279 430
280sub child { $_[0]->{children}[0] } 431sub child { $_[0]->{children}[0] }
281 432
282sub size_request { 433sub size_request {
283 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 434 $_[0]{children}[0]->size_request
284} 435}
285 436
286sub size_allocate { 437sub size_allocate {
287 my ($self, $w, $h) = @_; 438 my ($self, $x, $y, $w, $h) = @_;
288 439
289 $self->SUPER::size_allocate ($w, $h); 440 $self->_size_allocate ($x, $y, $w, $h) or return;
441
290 $self->{children}[0]->size_allocate ($w, $h) 442 $self->{children}[0]->size_allocate (0, 0, $w, $h);
291 if $self->{children}[0]
292} 443}
293 444
294############################################################################# 445#############################################################################
295 446
296package CFClient::Widget::Window; 447package CFClient::UI::Window;
297 448
298our @ISA = CFClient::Widget::Bin::; 449our @ISA = CFClient::UI::Bin::;
299 450
300use SDL::OpenGL; 451use SDL::OpenGL;
301 452
302sub new { 453sub new {
303 my ($class, %arg) = @_; 454 my ($class, %arg) = @_;
314} 465}
315 466
316sub render_chld { 467sub render_chld {
317 my ($self) = @_; 468 my ($self) = @_;
318 469
319 $self->{texture} = 470 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
320 CFClient::Texture->new_from_opengl ( 471 glClearColor 0, 0, 0, 1;
321 $self->{w}, $self->{h}, sub { $self->child->draw } 472 glClear GL_COLOR_BUFFER_BIT;
322 ); 473 $self->child->draw;
474 };
323} 475}
324 476
325sub size_allocate { 477sub size_allocate {
326 my ($self, $w, $h) = @_; 478 my ($self, $x, $y, $w, $h) = @_;
327 479
328 $self->{w} = $w; 480 $self->_size_allocate ($x, $y, $w, $h) or return;
329 $self->{h} = $h;
330 481
331 $self->child->size_allocate ($w, $h); 482 $self->child->size_allocate (0, 0, $w, $h);
332 483
333 $self->render_chld; 484 $self->render_chld;
334} 485}
335 486
336sub _draw { 487sub _draw {
340 491
341 my $tex = $self->{texture} 492 my $tex = $self->{texture}
342 or return; 493 or return;
343 494
344 glEnable GL_BLEND; 495 glEnable GL_BLEND;
496 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
345 glEnable GL_TEXTURE_2D; 497 glEnable GL_TEXTURE_2D;
346 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 498 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
347 499
348 $tex->draw_quad (0, 0, $w, $h); 500 $tex->draw_quad (0, 0, $w, $h);
349 501
351 glDisable GL_TEXTURE_2D; 503 glDisable GL_TEXTURE_2D;
352} 504}
353 505
354############################################################################# 506#############################################################################
355 507
356package CFClient::Widget::Frame; 508package CFClient::UI::Frame;
357 509
358our @ISA = CFClient::Widget::Bin::; 510our @ISA = CFClient::UI::Bin::;
359 511
360use SDL::OpenGL; 512use SDL::OpenGL;
361 513
362sub size_request { 514sub size_request {
363 my ($self) = @_; 515 my ($self) = @_;
368 520
369 map { $_ + 4 } $chld->size_request; 521 map { $_ + 4 } $chld->size_request;
370} 522}
371 523
372sub size_allocate { 524sub size_allocate {
373 my ($self, $w, $h) = @_; 525 my ($self, $x, $y, $w, $h) = @_;
374 526
375 $self->{w} = $w; 527 $self->_size_allocate ($x, $y, $w, $h) or return;
376 $self->{h} = $h;
377 528
378 $self->child->size_allocate ($w - 4, $h - 4); 529 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
379 $self->child->move (2, 2);
380} 530}
381 531
382sub _draw { 532sub _draw {
383 my ($self) = @_; 533 my ($self) = @_;
384 534
397 $chld->draw; 547 $chld->draw;
398} 548}
399 549
400############################################################################# 550#############################################################################
401 551
402package CFClient::Widget::FancyFrame; 552package CFClient::UI::FancyFrame;
403 553
404our @ISA = CFClient::Widget::Bin::; 554our @ISA = CFClient::UI::Bin::;
405 555
406use SDL::OpenGL; 556use SDL::OpenGL;
407 557
408my @tex = 558my @tex =
409 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 559 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
410 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 560 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
411 561
562sub new {
563 my $class = shift;
564
565 # TODO: user_x, user_y, overwrite moveto?
566
567 $class->SUPER::new (
568 bg => [1, 1, 1, 1],
569 border_bg => [1, 1, 1, 1],
570 border => $::FONTSIZE * 0.8,
571 @_
572 )
573}
574
412sub size_request { 575sub size_request {
413 my ($self) = @_; 576 my ($self) = @_;
414 577
578 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
579
415 my ($w, $h) = $self->SUPER::size_request; 580 my ($w, $h) = $self->SUPER::size_request;
416 581
417 $h += $tex[1]->{height}; 582 (
418 $h += $tex[4]->{height}; 583 $w + $self->{border} * 2,
419 $w += $tex[2]->{width}; 584 $h + $self->{border} * 2,
420 $w += $tex[3]->{width}; 585 )
421
422 ($w, $h)
423} 586}
424 587
425sub size_allocate { 588sub size_allocate {
426 my ($self, $w, $h) = @_; 589 my ($self, $x, $y, $w, $h) = @_;
427 590
428 $self->SUPER::size_allocate ($w, $h); 591 $self->_size_allocate ($x, $y, $w, $h) or return;
429 592
430 $h -= $tex[1]->{height}; 593 $h -= List::Util::max 0, $self->{border} * 2;
431 $h -= $tex[4]->{height}; 594 $w -= List::Util::max 0, $self->{border} * 2;
432 $w -= $tex[2]->{width};
433 $w -= $tex[3]->{width};
434 595
435 $h = $h < 0 ? 0 : $h; 596 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
436 $w = $w < 0 ? 0 : $w; 597}
437 598
438 $self->child->size_allocate ($w, $h); 599sub button_down {
439 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 600 my ($self, $ev, $x, $y) = @_;
601
602 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
603 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
604
605 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
606 my ($bw, $bh) = ($self->{w}, $self->{h});
607
608 $self->{motion} = sub {
609 my ($ev, $x, $y) = @_;
610
611 ($x, $y) = ($ev->motion_x, $ev->motion_y);
612
613 $self->{user_w} = $bw + $x - $ox;
614 $self->{user_h} = $bh + $y - $oy;
615 $self->update;
616 };
617
618 } elsif ($x >= 0 && $x < $self->{w}
619 && $y >= 0 && $y < $self->{border}) {
620
621 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
622 my ($bx, $by) = ($self->{x}, $self->{y});
623
624 $self->{motion} = sub {
625 my ($ev, $x, $y) = @_;
626
627 ($x, $y) = ($ev->motion_x, $ev->motion_y);
628
629 $self->move ($bx + $x - $ox, $by + $y - $oy);
630 $self->update;
631 };
632 }
633}
634
635sub button_up {
636 my ($self, $ev, $x, $y) = @_;
637
638 delete $self->{motion};
639}
640
641sub mouse_motion {
642 my ($self, $ev, $x, $y) = @_;
643
644 $self->{motion}->($ev, $x, $y) if $self->{motion};
440} 645}
441 646
442sub _draw { 647sub _draw {
443 my ($self) = @_; 648 my ($self) = @_;
444 649
445 my ($w, $h) = ($self->{w}, $self->{h}); 650 my ($w, $h ) = ($self->{w}, $self->{h});
446 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 651 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
447 652
448 glEnable GL_BLEND; 653 glEnable GL_BLEND;
654 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
449 glEnable GL_TEXTURE_2D; 655 glEnable GL_TEXTURE_2D;
450 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
451 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
452 657
453 my $top = $tex[1]; 658 glColor @{ $self->{border_bg} };
454 $top->draw_quad (0, 0, $w, $top->{height}); 659 $tex[1]->draw_quad (0, 0, $w, $self->{border});
455 660 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
456 my $left = $tex[3]; 661 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
457 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 662 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
458
459 my $right = $tex[2];
460 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
461
462 my $bottom = $tex[4];
463 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
464 663
465 my $bg = $tex[0]; 664 my $bg = $tex[0];
466 glBindTexture GL_TEXTURE_2D, $bg->{name};
467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
469 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
470 665
666 # TODO: repeat texture not scale
471 my $rep_x = $cw / $bg->{width}; 667 my $rep_x = $cw / $bg->{w};
472 my $rep_y = $ch / $bg->{height}; 668 my $rep_y = $ch / $bg->{h};
473 669
670 glColor @{ $self->{bg} };
671
672 $bg->{s} = $rep_x;
673 $bg->{t} = $rep_y;
674 $bg->{wrap_mode} = 1;
474 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 675 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
475 676
677 glDisable GL_TEXTURE_2D;
476 glDisable GL_BLEND; 678 glDisable GL_BLEND;
477 glDisable GL_TEXTURE_2D;
478 679
479 $self->child->draw; 680 $self->child->draw;
480
481} 681}
482 682
483############################################################################# 683#############################################################################
484 684
485package CFClient::Widget::Table; 685package CFClient::UI::Table;
486 686
487our @ISA = CFClient::Widget::Bin::; 687our @ISA = CFClient::UI::Base::;
688
689use List::Util qw(max sum);
488 690
489use SDL::OpenGL; 691use SDL::OpenGL;
490 692
693sub new {
694 my $class = shift;
695
696 $class->SUPER::new (
697 col_expand => [],
698 @_
699 )
700}
701
491sub add { 702sub add {
492 my ($self, $x, $y, $chld) = @_; 703 my ($self, $x, $y, $child) = @_;
493 my $old_chld = $self->{children}[$y][$x];
494 704
705 $child->set_parent ($self);
495 $self->{children}[$y][$x] = $chld; 706 $self->{children}[$y][$x] = $child;
496 $chld->set_parent ($self); 707
708 $self->{w} = $self->{h} = -1;
497 $self->update; 709 $self->update;
498} 710}
499 711
500sub max_row_height { 712# TODO: move to container class maybe? send childs a signal on removal?
713sub clear {
501 my ($self, $row) = @_; 714 my ($self) = @_;
502 715
503 my $hs = 0; 716 delete $self->{children};
504 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 717 $self->update;
718}
719
720sub get_wh {
721 my ($self) = @_;
722
723 my (@w, @h);
724
725 for my $y (0 .. $#{$self->{children}}) {
505 my $c = $self->{children}->[$row]->[$xi]; 726 my $row = $self->{children}[$y]
506 if ($c) { 727 or next;
728
729 for my $x (0 .. $#$row) {
730 my $widget = $row->[$x]
731 or next;
507 my ($w, $h) = $c->size_request; 732 my ($w, $h) = $widget->size_request;
508 if ($hs < $h) { $hs = $h } 733
734 $w[$x] = max $w[$x], $w;
735 $h[$y] = max $h[$y], $h;
509 } 736 }
510 } 737 }
511 return $hs;
512}
513 738
514sub max_col_width { 739 (\@w, \@h)
740}
741
742sub size_request {
515 my ($self, $col) = @_; 743 my ($self) = @_;
516 744
745 my ($ws, $hs) = $self->get_wh;
746
747 (
748 (sum @$ws),
749 (sum @$hs),
750 )
751}
752
753sub size_allocate {
754 my ($self, $x, $y, $w, $h) = @_;
755
756 $self->_size_allocate ($x, $y, $w, $h) or return;
757
758 my ($ws, $hs) = $self->get_wh;
759
760 my $req_w = sum @$ws;
761 my $req_h = sum @$hs;
762
763 # TODO: nicer code && do row_expand
764 my @col_expand = @{$self->{col_expand}};
765 @col_expand = (1) x @$ws unless @col_expand;
766 my $col_expand = (sum @col_expand) || 1;
767
768 # linearly scale sizes
769 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
770 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
771
772 CFClient::UI::harmonize $ws;
773 CFClient::UI::harmonize $hs;
774
775 my $y;
776
777 for my $r (0 .. $#{$self->{children}}) {
778 my $row = $self->{children}[$r]
779 or next;
780
517 my $ws = 0; 781 my $x = 0;
518 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 782 my $row_h = $hs->[$r];
519 my $c = ($self->{children}->[$yi] || [])->[$col]; 783
520 if ($c) { 784 for my $c (0 .. $#$row) {
521 my ($w, $h) = $c->size_request; 785 my $col_w = $ws->[$c];
522 if ($ws < $w) { $ws = $w } 786
787 if (my $widget = $row->[$c]) {
788 $widget->size_allocate ($x, $y, $col_w, $row_h);
789 }
790
791 $x += $col_w;
523 } 792 }
793
794 $y += $row_h;
524 } 795 }
525 return $ws; 796
526} 797}
798
799sub find_widget {
800 my ($self, $x, $y) = @_;
801
802 $x -= $self->{x};
803 $y -= $self->{y};
804
805 my $res;
806
807 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
808 $res = $_->find_widget ($x, $y)
809 and return $res;
810 }
811
812 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
813}
814
815sub _draw {
816 my ($self) = @_;
817
818 for (grep $_, @{$self->{children}}) {
819 $_->draw for grep $_, @$_;
820 }
821}
822
823#############################################################################
824
825package CFClient::UI::HBox;
826
827# TODO: wrap into common Box base class
828
829our @ISA = CFClient::UI::Container::;
527 830
528sub size_request { 831sub size_request {
529 my ($self) = @_; 832 my ($self) = @_;
530 833
834 my @alloc = map [$_->size_request], @{$self->{children}};
835
836 (
837 (List::Util::sum map $_->[0], @alloc),
838 (List::Util::max map $_->[1], @alloc),
839 )
840}
841
842sub size_allocate {
843 my ($self, $x, $y, $w, $h) = @_;
844
845 $self->_size_allocate ($x, $y, $w, $h);
846
531 my ($hs, $ws) = (0, 0); 847 ($h, $w) = ($w, $h);
532 848
533 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 849 my $children = $self->{children};
534 $hs += $self->max_row_height ($yi);
535 }
536 850
537 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 851 my @h = map +($_->size_request)[0], @$children;
538 my $wm = 0; 852
539 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 853 my $req_h = List::Util::sum @h;
540 $wm += $self->max_col_width ($xi) 854
855 if ($req_h > $h) {
856 # ah well, not enough space
857 $_ *= $h / $req_h for @h;
858 } else {
859 my $exp = List::Util::sum map $_->{expand}, @$children;
860 $exp ||= 1;
861
862 for (0 .. $#$children) {
863 my $child = $children->[$_];
864
865 my $alloc_h = $h[$_];
866 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
867 $h[$_] = $alloc_h;
541 } 868 }
542 if ($ws < $wm) { $ws = $wm }
543 } 869 }
544 870
545 return ($ws, $hs); 871 CFClient::UI::harmonize \@h;
546}
547
548sub _draw {
549 my ($self) = @_;
550 872
551 my $y = 0; 873 my $y = 0;
552 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 874 for (0 .. $#$children) {
875 my $child = $children->[$_];
553 my $x = 0; 876 my $h = $h[$_];
877 $child->size_allocate ($y, 0, $h, $w);
554 878
555 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 879 $y += $h;
556
557 my $c = $self->{children}->[$yi]->[$xi];
558 if ($c) {
559 $c->move ($x, $y, 0); #TODO: Move to size_request
560 $c->draw if $c;
561 }
562
563 $x += $self->max_col_width ($xi);
564 }
565
566 $y += $self->max_row_height ($yi);
567 } 880 }
568} 881}
569 882
570############################################################################# 883#############################################################################
571 884
572package CFClient::Widget::VBox; 885package CFClient::UI::VBox;
573 886
887# TODO: wrap into common Box base class
888
574our @ISA = CFClient::Widget::Container::; 889our @ISA = CFClient::UI::Container::;
575
576use SDL::OpenGL;
577 890
578sub size_request { 891sub size_request {
579 my ($self) = @_; 892 my ($self) = @_;
580 893
581 my @alloc = map [$_->size_request], @{$self->{children}}; 894 my @alloc = map [$_->size_request], @{$self->{children}};
585 (List::Util::sum map $_->[1], @alloc), 898 (List::Util::sum map $_->[1], @alloc),
586 ) 899 )
587} 900}
588 901
589sub size_allocate { 902sub size_allocate {
590 my ($self, $w, $h) = @_; 903 my ($self, $x, $y, $w, $h) = @_;
591 904
592 $self->w ($w); 905 $self->_size_allocate ($x, $y, $w, $h);
593 $self->h ($h);
594 906
595 my $exp; 907 my $children = $self->{children};
596 my @oth; 908
597 # find expand widget 909 my @h = map +($_->size_request)[1], @$children;
598 for (@{$self->{children}}) { 910
599 if ($_->{expand}) { 911 my $req_h = List::Util::sum @h;
912
913 if ($req_h > $h) {
914 # ah well, not enough space
915 $_ *= $h / $req_h for @h;
916 } else {
917 my $exp = List::Util::sum map $_->{expand}, @$children;
600 $exp = $_; 918 $exp ||= 1;
601 last; 919
920 for (0 .. $#$children) {
921 my $child = $children->[$_];
922
923 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
602 } 924 }
603 push @oth, $_;
604 } 925 }
605 926
606 my ($ow, $oh); 927 CFClient::UI::harmonize \@h;
607
608 # get sizes of other widgets
609 for (@oth) {
610 my ($w, $h) = $_->size_request;
611 $oh += $h;
612 if ($ow < $w) { $ow = $w }
613 }
614 928
615 my $y = 0; 929 my $y = 0;
616 for (@{$self->{children}}) { 930 for (0 .. $#$children) {
617 $_->move (0, $y); 931 my $child = $children->[$_];
618 932 my $h = $h[$_];
619 if ($_ == $exp) {
620 $_->size_allocate ($w, $h - $oh);
621 $y += $h - $oh;
622 } else {
623 my ($cw, $h) = $_->size_request;
624 $_->size_allocate ($w, $h); 933 $child->size_allocate (0, $y, $w, $h);
934
625 $y += $h; 935 $y += $h;
626 }
627 } 936 }
628} 937}
629 938
630############################################################################# 939#############################################################################
631 940
632package CFClient::Widget::Label; 941package CFClient::UI::Label;
633 942
634our @ISA = CFClient::Widget::; 943our @ISA = CFClient::UI::Base::;
635 944
636use SDL::OpenGL; 945use SDL::OpenGL;
637 946
638sub new { 947sub new {
639 my ($class, %arg) = @_; 948 my ($class, %arg) = @_;
640 949
641 # TODO: color, and make height, xyz etc. optional
642 my $self = $class->SUPER::new ( 950 my $self = $class->SUPER::new (
643 color => [1, 1, 1], 951 fg => [1, 1, 1],
644 height => $::FONTSIZE, 952 fontsize => $::FONTSIZE,
645 text => "", 953 text => "",
954 align => -1,
955 padding => 2,
646 layout => new CFClient::Layout, 956 layout => new CFClient::Layout,
647 %arg 957 %arg
648 ); 958 );
649 959
650 $self->set_text ($self->{text}); 960 $self->set_text ($self->{text});
651 961
652 $self 962 $self
653} 963}
654 964
965sub escape_text {
966 local $_ = $_[1];
967
968 s/&/&amp;/g;
969 s/>/&gt;/g;
970 s/</&lt;/g;
971
972 $_[1]
973}
974
655sub set_text { 975sub set_text {
656 my ($self, $text) = @_; 976 my ($self, $text) = @_;
657 977
658 $self->{text} = $text; 978 $self->{text} = $text;
659 $self->{layout}->set_markup ($text); 979 $self->{layout}->set_markup ($text);
660 980
661 delete $self->{texture}; 981 delete $self->{texture};
982# $self->{w} = $self->{h} = -1;
983 $self->update;
662} 984}
663 985
664sub get_text { 986sub get_text {
665 my ($self, $text) = @_; 987 my ($self, $text) = @_;
666 988
669 991
670sub size_request { 992sub size_request {
671 my ($self) = @_; 993 my ($self) = @_;
672 994
673 $self->{layout}->set_width; 995 $self->{layout}->set_width;
674 $self->{layout}->set_height ($self->{height}); 996 $self->{layout}->set_height ($self->{fontsize});
675 $self->{layout}->size 997 my ($w, $h) = $self->{layout}->size;
676# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 998
677# ( 999 (
678# $self->{texture}{width}, 1000 $w + $self->{padding} * 2,
679# $self->{texture}{height}, 1001 $h + $self->{padding} * 2,
680# ) 1002 )
681# } else {
682# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
683#
684# ($w, $h)
685# }
686} 1003}
687 1004
688sub size_allocate { 1005sub size_allocate {
689 my ($self, $w, $h) = @_; 1006 my ($self, $x, $y, $w, $h) = @_;
690 1007
691 $self->SUPER::size_allocate ($w, $h); 1008 $self->_size_allocate ($x, $y, $w, $h) or return;
1009
692 delete $self->{texture}; 1010 delete $self->{texture};
1011}
1012
1013sub update {
1014 my ($self) = @_;
1015
1016 delete $self->{texture};
1017 $self->SUPER::update;
693} 1018}
694 1019
695sub _draw { 1020sub _draw {
696 my ($self) = @_; 1021 my ($self) = @_;
697 1022
698 my $tex = $self->{texture} ||= do { 1023 my $tex = $self->{texture} ||= do {
699 $self->{layout}->set_width ($self->{w}); 1024 $self->{layout}->set_width ($self->{w});
1025 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
700 new_from_layout CFClient::Texture $self->{layout}; 1026 new_from_layout CFClient::Texture $self->{layout}
701 }; 1027 };
1028
1029 glEnable GL_BLEND;
1030 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1031 glEnable GL_TEXTURE_2D;
1032 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1033
1034 glColor @{$self->{fg}};
1035
1036 my $x =
1037 $self->{align} < 0 ? $self->{padding}
1038 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1039 : ($self->{w} - $tex->{w}) * 0.5;
1040
1041 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
1042
1043 glDisable GL_TEXTURE_2D;
1044 glDisable GL_BLEND;
1045}
1046
1047#############################################################################
1048
1049package CFClient::UI::Entry;
1050
1051our @ISA = CFClient::UI::Label::;
1052
1053use SDL;
1054use SDL::OpenGL;
1055
1056sub new {
1057 my $class = shift;
1058
1059 $class->SUPER::new (
1060 fg => [1, 1, 1],
1061 bg => [0, 0, 0, 0.2],
1062 active_bg => [1, 1, 1, 0.5],
1063 active_fg => [0, 0, 0],
1064 can_hover => 1,
1065 can_focus => 1,
1066 @_
1067 )
1068}
1069
1070sub _set_text {
1071 my ($self, $text) = @_;
1072
1073 my $old_text = $self->{text};
1074
1075 $self->{last_activity} = $::NOW;
1076
1077 $self->{text} = $text;
1078 $self->{layout}->set_width ($self->{w});
1079 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1080
1081 $text =~ s/./*/g if $self->{hidden};
1082
1083 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1084
1085 $text = substr $text, 0, $self->{cursor};
1086 utf8::encode $text;
1087
1088 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1089
1090 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1091 if $old_text ne $self->{text};
1092}
1093
1094sub size_request {
1095 my ($self) = @_;
1096
1097 my ($w, $h) = $self->SUPER::size_request;
1098
1099 ($w + 1, $h) # add 1 for cursor
1100}
1101
1102sub size_allocate {
1103 my ($self, $x, $y, $w, $h) = @_;
1104
1105 $self->SUPER::size_allocate ($x, $y, $w, $h);
1106
1107 $self->_set_text ($self->{text});
1108}
1109
1110sub set_text {
1111 my ($self, $text) = @_;
1112
1113 $self->{cursor} = length $text;
1114 $self->_set_text ($text);
1115 $self->update;
1116}
1117
1118sub key_down {
1119 my ($self, $ev) = @_;
1120
1121 my $mod = $ev->key_mod;
1122 my $sym = $ev->key_sym;
1123
1124 my $uni = $ev->key_unicode;
1125
1126 my $text = $self->get_text;
1127
1128 if ($sym == SDLK_BACKSPACE) {
1129 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1130 } elsif ($sym == SDLK_DELETE) {
1131 substr $text, $self->{cursor}, 1, "";
1132 } elsif ($sym == SDLK_LEFT) {
1133 --$self->{cursor} if $self->{cursor};
1134 } elsif ($sym == SDLK_RIGHT) {
1135 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1136 } elsif ($sym == SDLK_HOME) {
1137 $self->{cursor} = 0;
1138 } elsif ($sym == SDLK_END) {
1139 $self->{cursor} = length $text;
1140 } elsif ($sym == SDLK_ESCAPE) {
1141 $self->emit ('escape');
1142 } elsif ($uni) {
1143 substr $text, $self->{cursor}++, 0, chr $uni;
1144 }
1145
1146 $self->_set_text ($text);
1147 $self->update;
1148}
1149
1150sub focus_in {
1151 my ($self) = @_;
1152
1153 $self->{last_activity} = $::NOW;
1154
1155 $self->SUPER::focus_in;
1156}
1157
1158sub button_down {
1159 my ($self, $ev, $x, $y) = @_;
1160
1161 $self->SUPER::button_down ($ev, $x, $y);
1162
1163 my $idx = $self->{layout}->xy_to_index ($x, $y);
1164
1165 # byte-index to char-index
1166 my $text = $self->{text};
1167 utf8::encode $text;
1168 $self->{cursor} = length substr $text, 0, $idx;
1169
1170 $self->_set_text ($self->{text});
1171 $self->update;
1172}
1173
1174sub mouse_motion {
1175 my ($self, $ev, $x, $y) = @_;
1176# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1177}
1178
1179sub _draw {
1180 my ($self) = @_;
1181
1182 local $self->{fg} = $self->{fg};
1183
1184 if ($FOCUS == $self) {
1185 glColor @{$self->{active_bg}};
1186 $self->{fg} = $self->{active_fg};
1187 } else {
1188 glColor @{$self->{bg}};
1189 }
1190
1191 glEnable GL_BLEND;
1192 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1193 glBegin GL_QUADS;
1194 glVertex 0 , 0;
1195 glVertex 0 , $self->{h};
1196 glVertex $self->{w}, $self->{h};
1197 glVertex $self->{w}, 0;
1198 glEnd;
1199 glDisable GL_BLEND;
1200
1201 $self->SUPER::_draw;
1202
1203 #TODO: force update every cursor change :(
1204 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1205 glColor @{$self->{fg}};
1206 glBegin GL_LINES;
1207 glVertex $self->{cur_x}, $self->{cur_y};
1208 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1209 glEnd;
1210 }
1211}
1212
1213package CFClient::UI::LineEntry;
1214
1215our @ISA = CFClient::UI::Entry::;
1216
1217use SDL;
1218use SDL::OpenGL;
1219
1220sub key_down {
1221 my ($self, $ev) = @_;
1222
1223 my $sym = $ev->key_sym;
1224
1225 if ($sym == SDLK_RETURN) {
1226 $self->emit (activate => $self->get_text);
1227 $self->update;
1228
1229 } else {
1230 $self->SUPER::key_down ($ev);
1231 }
1232
1233}
1234
1235#############################################################################
1236
1237package CFClient::UI::Button;
1238
1239our @ISA = CFClient::UI::Label::;
1240
1241use SDL;
1242use SDL::OpenGL;
1243
1244my @tex =
1245 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1246 qw(b1_button_active.png);
1247
1248sub new {
1249 my $class = shift;
1250
1251 $class->SUPER::new (
1252 padding => 4,
1253 fg => [1, 1, 1],
1254 bg => [1, 1, 1, 0.2],
1255 active_fg => [1, 1, 0],
1256 can_hover => 1,
1257 @_
1258 )
1259}
1260
1261sub button_up {
1262 my ($self, $ev, $x, $y) = @_;
1263
1264 if ($x >= 0 && $x < $self->{w}
1265 && $y >= 0 && $y < $self->{h}) {
1266 $self->emit ("activate");
1267 }
1268}
1269
1270sub _draw {
1271 my ($self) = @_;
1272
1273 local $self->{fg} = $self->{fg};
1274 my $tex = $tex[0];
702 1275
703 glEnable GL_BLEND; 1276 glEnable GL_BLEND;
704 glEnable GL_TEXTURE_2D; 1277 glEnable GL_TEXTURE_2D;
705 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1278 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1279
1280 if ($GRAB == $self) {
1281 $self->{fg} = $self->{active_fg};
1282 }
1283
1284 glBindTexture GL_TEXTURE_2D, $tex->{name};
706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1285 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
707 1286
708 glColor @{$self->{color}}; 1287 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
709 1288
1289 glDisable GL_TEXTURE_2D;
1290 glDisable GL_BLEND;
1291
1292 $self->SUPER::_draw;
1293}
1294
1295#############################################################################
1296
1297package CFClient::UI::CheckBox;
1298
1299our @ISA = CFClient::UI::DrawBG::;
1300
1301my @tex =
1302 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1303 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1304
1305use SDL;
1306use SDL::OpenGL;
1307
1308sub new {
1309 my $class = shift;
1310
1311 $class->SUPER::new (
1312 padding => 2,
1313 fg => [1, 1, 1],
1314 active_fg => [1, 1, 0],
1315 state => 0,
1316 can_hover => 1,
1317 @_
1318 )
1319}
1320
1321sub size_request {
1322 my ($self) = @_;
1323
1324 ($self->{padding} * 2 + 6) x 2
1325}
1326
1327sub size_allocate {
1328 my ($self, $x, $y, $w, $h) = @_;
1329
1330 $self->_size_allocate ($x, $y, $w, $h);
1331}
1332
1333sub button_down {
1334 my ($self, $ev, $x, $y) = @_;
1335
1336 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1337 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1338 $self->{state} = !$self->{state};
1339 $self->emit (changed => $self->{state});
1340 }
1341}
1342
1343sub _draw {
1344 my ($self) = @_;
1345
1346 $self->SUPER::_draw;
1347
1348 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1349
1350 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1351
1352 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1353
1354 glEnable GL_BLEND;
1355 glEnable GL_TEXTURE_2D;
1356 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1357
1358 my $tex = $self->{state} ? $tex[1] : $tex[0];
1359
710 $tex->draw_quad (0, 0); 1360 $tex->draw_quad (0, 0, $s, $s);
1361
1362 glDisable GL_TEXTURE_2D;
1363 glDisable GL_BLEND;
1364}
1365
1366#############################################################################
1367
1368package CFClient::UI::Slider;
1369
1370use strict;
1371
1372use SDL::OpenGL;
1373
1374our @ISA = CFClient::UI::DrawBG::;
1375
1376my @tex =
1377 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1378 qw(s1_slider.png s1_slider_bg.png);
1379
1380sub new {
1381 my $class = shift;
1382
1383 # range [value, low, high, page]
1384
1385 # TODO: 0-width page
1386 # TODO: req_w/h are wrong with vertical
1387 # TODO: calculations are off
1388 my $self = $class->SUPER::new (
1389 fg => [1, 1, 1],
1390 active_fg => [0, 0, 0],
1391 range => [0, 0, 100, 10],
1392 req_w => 40,
1393 req_h => 13,
1394 vertical => 0,
1395 can_hover => 1,
1396 inner_pad => 5,
1397 @_
1398 );
1399
1400 $self
1401}
1402
1403sub size_request {
1404 my ($self) = @_;
1405
1406 my $w = $self->{req_w};
1407 my $h = $self->{req_h};
1408
1409 $self->{vertical} ? ($h, $w) : ($w, $h)
1410}
1411
1412sub button_down {
1413 my ($self, $ev, $x, $y) = @_;
1414
1415 $self->SUPER::button_down ($ev, $x, $y);
1416 $self->mouse_motion ($ev, $x, $y);
1417}
1418
1419sub mouse_motion {
1420 my ($self, $ev, $x, $y) = @_;
1421
1422 if ($GRAB == $self) {
1423 my ($value, $lo, $hi, $page) = @{$self->{range}};
1424
1425 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1426
1427 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1428 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1429
1430 $x -= $inner_pad_px; # substract the padding
1431 $x = $x * ($hi - $lo) / $inner_w + $lo;
1432 $x = $lo if $x < $lo;
1433 $x = $hi - $page if $x > $hi - $page;
1434 $self->{range}[0] = $x;
1435
1436 $self->emit (changed => $x);
1437 $self->update;
1438 }
1439}
1440
1441# the inner_* stuff is for generating a padding for the slider handle,
1442# so that the handle doesn't leave the texture. This calculation isn't 100%
1443# correct propably, but it does the job for now
1444sub _calc_inner_pad_px {
1445 my ($self, $w) = @_;
1446 ($w / 100) * $self->{inner_pad} # % to pixels
1447}
1448
1449sub _draw {
1450 my ($self) = @_;
1451
1452 $self->SUPER::_draw ();
1453
1454 my ($w, $h) = @$self{qw(w h)};
1455
1456 if ($self->{vertical}) {
1457 # draw a vertical slider like a rotated horizontal slider
1458
1459 glRotate 90, 0, 0, 1;
1460 glTranslate 0, -$self->{w}, 0;
1461
1462 ($w, $h) = ($h, $w);
1463 }
1464
1465 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1466 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1467
1468 my ($value, $lo, $hi, $page) = @{$self->{range}};
1469
1470 $hi = $value + 1 if $lo == $hi;
1471
1472 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1473 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1474
1475 $page = int $page * $inner_w / ($hi - $lo);
1476 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1477
1478 $w -= $page;
1479 $page &= ~1;
1480 glTranslate $page * 0.5, 0, 0;
1481 $page ||= 2;
1482
1483 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1484 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1485
1486 glEnable GL_BLEND;
1487 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1488 glEnable GL_TEXTURE_2D;
1489 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1490
1491 # draw background
1492 $tex[1]->draw_quad (0, 0, $w, $h);
1493
1494 # draw handle
1495 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
711 1496
712 glDisable GL_BLEND; 1497 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 1498 glDisable GL_TEXTURE_2D;
714} 1499}
715 1500
716############################################################################# 1501#############################################################################
717 1502
1503package CFClient::UI::TextView;
1504
1505our @ISA = CFClient::UI::HBox::;
1506
1507use SDL::OpenGL;
1508
1509sub new {
1510 my $class = shift;
1511
1512 my $self = $class->SUPER::new (
1513 req_w => $::WIDTH / 6,
1514 req_h => $::HEIGHT / 6,
1515 fontsize => $::FONTSIZE,
1516 @_,
1517
1518 layout => (new CFClient::Layout),
1519 par => [],
1520 height => 0,
1521 children => [
1522 (new CFClient::UI::Empty expand => 1),
1523 (new CFClient::UI::Slider vertical => 1),
1524 ],
1525 );
1526
1527 $self->{children}[1]->connect (changed => sub {
1528 $self->update;
1529 });
1530
1531 $self
1532}
1533
1534sub set_fontsize {
1535 my ($self, $fontsize) = @_;
1536
1537 $self->{fontsize} = $fontsize;
1538 $self->reflow;
1539}
1540
1541sub text_height {
1542 my ($self, $text) = @_;
1543
1544 my $layout = $self->{layout};
1545
1546 $layout->set_height ($self->{fontsize});
1547 $layout->set_width ($self->{w});
1548 $layout->set_text ($text);
1549
1550 ($layout->size)[1]
1551}
1552
1553sub reflow {
1554 my ($self) = @_;
1555
1556 $self->{need_reflow}++;
1557 $self->update;
1558}
1559
1560sub size_request {
1561 my ($self) = @_;
1562
1563 ($self->{req_w}, $self->{req_h})
1564}
1565
1566sub size_allocate {
1567 my ($self, $x, $y, $w, $h) = @_;
1568
1569 $self->SUPER::size_allocate ($x, $y, $w, $h);
1570
1571 $self->{layout}->set_height ($self->{fontsize});
1572 $self->{layout}->set_width ($self->{w});
1573
1574 $self->reflow;
1575}
1576
1577sub add_paragraph {
1578 my ($self, $color, $text) = @_;
1579
1580 #TODO: intelligently "reformat" paragraph
1581
1582 my $height = $self->text_height ($text);
1583
1584 $self->{height} += $height;
1585
1586 push @{$self->{par}}, [$height, $color, $text];
1587
1588 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1589 $self->{children}[1]->update;
1590}
1591
1592sub update {
1593 my ($self) = @_;
1594
1595 $self->SUPER::update;
1596
1597 return unless $self->{h} > 0;
1598
1599 delete $self->{texture};
1600
1601 $ROOT->on_refresh ($self, sub {
1602 if (delete $self->{need_reflow}) {
1603 my $height = 0;
1604
1605 $height += $_->[0] = $self->text_height ($_->[2])
1606 for @{$self->{par}};
1607
1608 $self->{height} = $height;
1609
1610 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1611
1612 delete $self->{texture};
1613 }
1614
1615 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1616 glClearColor 0, 0, 0, 1;
1617 glClear GL_COLOR_BUFFER_BIT;
1618
1619 glEnable GL_BLEND;
1620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621 glEnable GL_TEXTURE_2D;
1622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623
1624 my $top = int $self->{children}[1]{range}[0];
1625
1626 my $y0 = $top;
1627 my $y1 = $top + $self->{h};
1628
1629 my $y = 0;
1630
1631 my $layout = $self->{layout};
1632
1633 for my $par (@{$self->{par}}) {
1634 my $h = $par->[0];
1635
1636 if ($y0 < $y + $h && $y < $y1) {
1637 $layout->set_text ($par->[2]);
1638
1639 glColor @{ $par->[1] };
1640 my ($W, $H) = $layout->size;
1641 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1642 }
1643
1644 $y += $h;
1645 }
1646
1647 glDisable GL_TEXTURE_2D;
1648 glDisable GL_BLEND;
1649 };
1650 });
1651}
1652
1653sub _draw {
1654 my ($self) = @_;
1655
1656 if ($self->{texture}) {
1657 glEnable GL_TEXTURE_2D;
1658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1659 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1660 glDisable GL_TEXTURE_2D;
1661 }
1662
1663 $self->{children}[1]->draw;
1664
1665}
1666
1667#############################################################################
1668
718package CFClient::Widget::Entry; 1669package CFClient::UI::MapWidget;
719 1670
720our @ISA = CFClient::Widget::Label::; 1671use strict;
1672
1673use List::Util qw(min max);
721 1674
722use SDL; 1675use SDL;
723use SDL::OpenGL; 1676use SDL::OpenGL;
724 1677
1678our @ISA = CFClient::UI::Base::;
1679
1680sub new {
1681 my $class = shift;
1682
1683 $class->SUPER::new (
1684 z => -1,
1685 can_focus => 1,
1686 list => (glGenLists 1),
1687 @_
1688 )
1689}
1690
725sub key_down { 1691sub key_down {
726 my ($self, $ev) = @_; 1692 print "MAPKEYDOWN\n";
1693}
727 1694
728 my $mod = $ev->key_mod; 1695sub key_up {
729 my $sym = $ev->key_sym;
730
731 my $uni = $ev->key_unicode;
732
733 my $text = $self->get_text;
734
735 if ($sym == SDLK_BACKSPACE) {
736 substr $text, -1, 1, '';
737 } elsif ($uni) {
738 $text .= chr $uni;
739 }
740
741 $self->set_text ($text);
742} 1696}
743 1697
744sub button_down { 1698sub button_down {
745 my ($self, $ev) = @_; 1699 my ($self, $ev, $x, $y) = @_;
746 1700
747 $self->focus_in; 1701 $self->focus_in;
1702
1703 if ($ev->button == 2) {
1704 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1705 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1706
1707 $self->{motion} = sub {
1708 my ($ev, $x, $y) = @_;
1709
1710 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1711
1712 $::CFG->{map_shift_x} = $bw + $x - $ox;
1713 $::CFG->{map_shift_y} = $bh + $y - $oy;
1714
1715 $self->update;
1716 };
1717 }
1718}
1719
1720sub button_up {
1721 my ($self, $ev, $x, $y) = @_;
1722
1723 delete $self->{motion};
748} 1724}
749 1725
750sub mouse_motion { 1726sub mouse_motion {
751 my ($self, $ev, $x, $y) = @_; 1727 my ($self, $ev, $x, $y) = @_;
752 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
753}
754 1728
755sub _draw { 1729 $self->{motion}->($ev, $x, $y) if $self->{motion};
756 my ($self) = @_;
757
758 if ($FOCUS == $self) {
759 glColor 1, 1, 1;
760 } else {
761 glColor 0.7, 0.7, 0.7;
762 }
763
764 glBegin GL_QUADS;
765 glVertex 0 , 0;
766 glVertex 0 , $self->{h} - 1;
767 glVertex $self->{w} - 1, $self->{h} - 1;
768 glVertex $self->{w} - 1, 0;
769 glEnd;
770
771 $self->SUPER::_draw;
772}
773
774#############################################################################
775
776package CFClient::Widget::MapWidget;
777
778use strict;
779
780use List::Util qw(min max);
781
782use SDL;
783use SDL::OpenGL;
784use SDL::OpenGL::Constants;
785
786our @ISA = CFClient::Widget::;
787
788sub new {
789 my $class = shift;
790
791 $class->SUPER::new (z => -1, @_)
792}
793
794sub key_down {
795 print "MAPKEYDOWN\n";
796}
797
798sub key_up {
799} 1730}
800 1731
801sub size_request { 1732sub size_request {
802 ( 1733 (
803 1 + int $::WIDTH / 32, 1734 1 + 32 * int $::WIDTH / 32,
804 1 + int $::HEIGHT / 32, 1735 1 + 32 * int $::HEIGHT / 32,
805 ) 1736 )
806} 1737}
807 1738
1739sub update {
1740 my ($self) = @_;
1741
1742 $self->{need_update} = 1;
1743 $self->SUPER::update;
1744}
1745
808sub _draw { 1746sub draw {
809 my ($self) = @_; 1747 my ($self) = @_;
810 1748
811 my $mx = $::CONN->{mapx}; 1749 if (delete $self->{need_update}) {
812 my $my = $::CONN->{mapy}; 1750 glNewList $self->{list}, GL_COMPILE;
813 1751
814 my $map = $::CONN->{map}; 1752 if ($::MAP) {
815
816 my ($xofs, $yofs);
817
818 my $sw = 1 + int $::WIDTH / 32; 1753 my $sw = int $::WIDTH / 32;
819 my $sh = 1 + int $::HEIGHT / 32; 1754 my $sh = int $::HEIGHT / 32;
820 1755
821 if ($::CONN->{mapw} > $sw) { 1756 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
822 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1757 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
823 } else {
824 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
825 }
826 1758
827 if ($::CONN->{maph} > $sh) { 1759 glTranslate $sx0 - 32, $sy0 - 32, 0;
828 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
829 } else {
830 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
831 }
832 1760
1761 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1762
1763 if ($::CFG->{fow_enable}) {
1764 if ($::CFG->{fow_smooth}) { # smooth fog of war
1765 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1766 glConvolutionFilter2D
1767 GL_CONVOLUTION_2D,
1768 GL_ALPHA,
1769 3, 3,
1770 GL_ALPHA, GL_FLOAT,
1771 pack "f*",
1772 0.1, 0.1, 0.1,
1773 0.1, 0.2, 0.1,
1774 0.1, 0.1, 0.1,
1775 ;
1776 glEnable GL_CONVOLUTION_2D;
1777 }
1778
1779 my $tex = new CFClient::Texture
1780 w => $w,
1781 h => $h,
1782 data => $data,
1783 internalformat => GL_ALPHA,
1784 format => GL_ALPHA;
1785
1786 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1787
1788 glEnable GL_BLEND;
1789 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
833 glEnable GL_TEXTURE_2D; 1790 glEnable GL_TEXTURE_2D;
834 glEnable GL_BLEND;
835 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1791 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
836 1792
837 my $sw4 = ($sw + 3) & ~3; 1793 glColor +($::CFG->{fow_intensity}) x 3, 1;
838 my $darkness = "\x00" x ($sw4 * $sh); 1794 $tex->draw_quad (0, 0, $w * 32, $h * 32);
839 1795
840 for my $x (0 .. $sw - 1) { 1796 glDisable GL_TEXTURE_2D;
841 my $row = $map->[$x + $xofs]; 1797 glDisable GL_BLEND;
842 for my $y (0 .. $sh - 1) {
843
844 my $cell = $row->[$y + $yofs]
845 or next;
846
847 my $dark = $cell->[0];
848 if ($dark < 0) {
849 substr $darkness, $y * $sw4 + $x, 1, chr 224;
850 } else {
851 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
852 } 1798 }
853 1799
854 for my $num (grep $_, @$cell[1,2,3]) { 1800 # HACK BEGIN
855 my $tex = $::CONN->{face}[$num]{texture} || next;
856 1801 {
857 my $w = $tex->{width}; 1802 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
858 my $h = $tex->{height}; 1803 my ($w, $h) = (250, 250);
859 1804
860 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1805 glEnable GL_BLEND;
1806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1807 glEnable GL_TEXTURE_2D;
1808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1809
1810 CFClient::Texture->new (
1811 w => $w,
1812 h => $h,
1813 data => $::MAP->mapmap ($w, $h),
1814 type => GL_UNSIGNED_INT_8_8_8_8_REV
1815 )->draw_quad (100, 100);
1816
1817 glDisable GL_TEXTURE_2D;
1818 glDisable GL_BLEND;
861 } 1819 }
1820 # HACK END
862 } 1821 }
863 }
864 1822
865# if (1) { # higher quality darkness 1823 glEndList;
866# $lighting =~ s/(.)/$1$1$1/gs;
867# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
868#
869# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
870#
871# $lighting = $pb->get_pixels;
872# $lighting =~ s/(.)../$1/gs;
873# } 1824 }
874 1825
875 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1826 glPushMatrix;
876 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1827 glCallList $self->{list};
1828 glPopMatrix;
877 1829
878 $darkness = new CFClient::Texture 1830 if ($FOCUS != $self) {
879 width => $sw4, 1831 glColor 64/255, 64/255, 64/255;
880 height => $sh, 1832 glLogicOp GL_AND;
881 data => $darkness, 1833 glEnable GL_COLOR_LOGIC_OP;
882 internalformat => GL_ALPHA, 1834 glBegin GL_QUADS;
883 format => GL_ALPHA; 1835 glVertex 0, 0;
884 1836 glVertex 0, $::HEIGHT;
885 glColor 0.45, 0.45, 0.45, 1; 1837 glVertex $::WIDTH, $::HEIGHT;
886 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32); 1838 glVertex $::WIDTH, 0;
887 1839 glEnd;
888 glDisable GL_TEXTURE_2D; 1840 glDisable GL_COLOR_LOGIC_OP;
889 glDisable GL_BLEND; 1841 }
890} 1842}
891 1843
892my %DIR = ( 1844my %DIR = (
893 SDLK_KP8, [1, "north"], 1845 SDLK_KP8, [1, "north"],
894 SDLK_KP9, [2, "northeast"], 1846 SDLK_KP9, [2, "northeast"],
910 1862
911 my $mod = $ev->key_mod; 1863 my $mod = $ev->key_mod;
912 my $sym = $ev->key_sym; 1864 my $sym = $ev->key_sym;
913 1865
914 if ($sym == SDLK_KP5) { 1866 if ($sym == SDLK_KP5) {
915 $::CONN->send ("command stay fire"); 1867 $::CONN->user_send ("command stay fire");
1868 } elsif ($sym == SDLK_a) {
1869 $::CONN->user_send ("command apply");
1870 } elsif ($sym == SDLK_QUOTE) {
1871 $self->emit ('activate_console');
1872 } elsif ($sym == SDLK_SLASH) {
1873 $self->emit ('activate_console' => '/');
916 } elsif (exists $DIR{$sym}) { 1874 } elsif (exists $DIR{$sym}) {
917 if ($mod & KMOD_SHIFT) { 1875 if ($mod & KMOD_SHIFT) {
918 $self->{shft}++; 1876 $self->{shft}++;
919 $::CONN->send ("command fire $DIR{$sym}[0]"); 1877 $::CONN->user_send ("command fire $DIR{$sym}[0]");
920 } elsif ($mod & KMOD_CTRL) { 1878 } elsif ($mod & KMOD_CTRL) {
921 $self->{ctrl}++; 1879 $self->{ctrl}++;
922 $::CONN->send ("command run $DIR{$sym}[0]"); 1880 $::CONN->user_send ("command run $DIR{$sym}[0]");
923 } else { 1881 } else {
924 $::CONN->send ("command $DIR{$sym}[1]"); 1882 $::CONN->user_send ("command $DIR{$sym}[1]");
925 } 1883 }
926 } 1884 }
927} 1885}
928 1886
929sub key_up { 1887sub key_up {
931 1889
932 my $mod = $ev->key_mod; 1890 my $mod = $ev->key_mod;
933 my $sym = $ev->key_sym; 1891 my $sym = $ev->key_sym;
934 1892
935 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1893 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
936 $::CONN->send ("command fire_stop"); 1894 $::CONN->user_send ("command fire_stop");
937 } 1895 }
938 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1896 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
939 $::CONN->send ("command run_stop"); 1897 $::CONN->user_send ("command run_stop");
940 } 1898 }
941} 1899}
942 1900
943############################################################################# 1901#############################################################################
944 1902
945package CFClient::Widget::Animator; 1903package CFClient::UI::Animator;
946 1904
947use SDL::OpenGL; 1905use SDL::OpenGL;
948 1906
949our @ISA = CFClient::Widget::Bin::; 1907our @ISA = CFClient::UI::Bin::;
950 1908
951sub moveto { 1909sub moveto {
952 my ($self, $x, $y) = @_; 1910 my ($self, $x, $y) = @_;
953 1911
954 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1912 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
982 glPopMatrix; 1940 glPopMatrix;
983} 1941}
984 1942
985############################################################################# 1943#############################################################################
986 1944
987package CFClient::Widget::Toplevel; 1945package CFClient::UI::Flopper;
988 1946
1947our @ISA = CFClient::UI::Button::;
1948
1949sub new {
1950 my $class = shift;
1951
1952 my $self = $class->SUPER::new (
1953 state => 0,
1954 connect_activate => \&toggle_flopper,
1955 @_
1956 );
1957
1958 if ($self->{state}) {
1959 $self->{state} = 0;
1960 $self->toggle_flopper;
1961 }
1962
1963 $self
1964}
1965
1966sub toggle_flopper {
1967 my ($self) = @_;
1968
1969 # TODO: use animation
1970 if ($self->{state} = !$self->{state}) {
1971 $CFClient::UI::ROOT->add ($self->{other});
1972 $self->{other}->move ($self->coord2global (0, $self->{h}));
1973 $self->emit ("open");
1974 } else {
1975 $CFClient::UI::ROOT->remove ($self->{other});
1976 $self->emit ("close");
1977 }
1978
1979 $self->emit (changed => $self->{state});
1980}
1981
1982#############################################################################
1983
1984package CFClient::UI::Root;
1985
989our @ISA = CFClient::Widget::Container::; 1986our @ISA = CFClient::UI::Container::;
1987
1988use SDL::OpenGL;
990 1989
991sub size_request { 1990sub size_request {
992 ($::WIDTH, $::HEIGHT) 1991 ($::WIDTH, $::HEIGHT)
993} 1992}
994 1993
995sub size_allocate { 1994sub size_allocate {
996 my ($self, $w, $h) = @_; 1995 my ($self, $x, $y, $w, $h) = @_;
997 1996
998 $self->SUPER::size_allocate ($w, $h); 1997 $self->_size_allocate ($x, $y, $w, $h);
999 1998
1000 $_->size_allocate ($_->size_request) 1999 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1001 for @{$self->{children}}; 2000 for @{$self->{children}};
1002} 2001}
1003 2002
1004sub translate { 2003sub _topleft {
1005 my ($self, $x, $y) = @_; 2004 my ($self, $x, $y) = @_;
1006 2005
1007 ($x, $y) 2006 ($x, $y)
1008} 2007}
1009 2008
1010sub update { 2009sub update {
1011 my ($self) = @_; 2010 my ($self) = @_;
1012 2011
1013 $self->size_allocate ($self->size_request); 2012 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1014 ::refresh (); 2013 ::refresh ();
1015} 2014}
1016 2015
1017sub add { 2016sub add {
1018 my ($self, $widget) = @_; 2017 my ($self, $widget) = @_;
1019 2018
1020 $self->SUPER::add ($widget); 2019 $self->SUPER::add ($widget);
1021 2020
1022 $widget->size_allocate ($widget->size_request); 2021 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
2022}
2023
2024sub on_refresh {
2025 my ($self, $id, $cb) = @_;
2026
2027 $self->{refresh_hook}{$id} = $cb;
1023} 2028}
1024 2029
1025sub draw { 2030sub draw {
1026 my ($self) = @_; 2031 my ($self) = @_;
1027 2032
2033 while (my $rcb = delete $self->{refresh_hook}) {
2034 $_->() for values %$rcb;
2035 }
2036
2037 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2038 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2039 glClear GL_COLOR_BUFFER_BIT;
2040
2041 glMatrixMode GL_PROJECTION;
2042 glLoadIdentity;
2043 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2044 glMatrixMode GL_MODELVIEW;
2045 glLoadIdentity;
2046
1028 $self->_draw; 2047 $self->_draw;
1029} 2048}
1030 2049
1031############################################################################# 2050#############################################################################
1032 2051
1033package CFClient::Widget; 2052package CFClient::UI;
1034 2053
1035$TOPLEVEL = new CFClient::Widget::Toplevel; 2054$ROOT = new CFClient::UI::Root;
1036 2055
10371 20561
1038 2057

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines