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.56 by root, Mon Apr 10 22:16:34 2006 UTC vs.
Revision 1.115 by root, Sat Apr 15 19:35:20 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6use List::Util ();
6 7
7use SDL::OpenGL; 8use CFClient;
8use SDL::OpenGL::Constants;
9
10use Crossfire::Client;
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) 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));
47
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49 49
50 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 52 $grab->update if $grab;
53 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
56 56
57sub feed_sdl_motion_event { 57sub feed_sdl_motion_event {
58 my ($ev) = @_; 58 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 59 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60 60
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 61 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 62
63 if ($widget != $HOVER) { 63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 64 my $hover = $HOVER; $HOVER = $widget;
65 65
66 $hover->update if $hover; 66 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 } 68 }
69 69
70 $HOVER->mouse_motion ($ev) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
71} 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;
72 93
73sub new { 94sub new {
74 my $class = shift; 95 my $class = shift;
75 96
76 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
77} 113}
78 114
79sub move { 115sub move {
80 my ($self, $x, $y, $z) = @_; 116 my ($self, $x, $y, $z) = @_;
81 $self->{x} = $x; 117 $self->{x} = $x;
… …
90sub size_request { 126sub size_request {
91 require Carp; 127 require Carp;
92 Carp::confess "size_request is abtract"; 128 Carp::confess "size_request is abtract";
93} 129}
94 130
95sub size_allocate { 131sub _size_allocate {
96 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;
97 138
98 $self->{w} = $w; 139 $self->{w} = $w;
99 $self->{h} = $h; 140 $self->{h} = $h;
141
142 1
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 {
153 my ($self, $x, $y) = @_;
154
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)
100} 172}
101 173
102sub focus_in { 174sub focus_in {
103 my ($self) = @_; 175 my ($self) = @_;
176
177 return if $FOCUS == $self;
178 return unless $self->{can_focus};
104 179
105 my $focus = $FOCUS; $FOCUS = $self; 180 my $focus = $FOCUS; $FOCUS = $self;
106 $focus->update if $focus; 181 $focus->update if $focus;
107 $FOCUS->update; 182 $FOCUS->update;
108} 183}
… …
116 $focus->update if $focus; #? 191 $focus->update if $focus; #?
117} 192}
118 193
119sub mouse_motion { } 194sub mouse_motion { }
120sub button_up { } 195sub button_up { }
121sub button_down { }
122sub key_down { } 196sub key_down { }
123sub key_up { } 197sub key_up { }
198
199sub button_down {
200 my ($self, $ev, $x, $y) = @_;
201
202 $self->focus_in;
203}
124 204
125sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 205sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
126sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 206sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
127sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 207sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
128sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 208sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
129sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 209sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
130 210
131sub draw { 211sub draw {
132 my ($self) = @_; 212 my ($self) = @_;
133 213
214 return unless $self->{h} && $self->{w};
215
134 glPushMatrix; 216 glPushMatrix;
135 glTranslate $self->{x}, $self->{y}, 0; 217 glTranslate $self->{x}, $self->{y}, 0;
136 $self->_draw; 218 $self->_draw;
137 if ($self == $HOVER) { 219 glPopMatrix;
138 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;
139 glEnable GL_BLEND; 225 glEnable GL_BLEND;
226 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
140 glBegin GL_QUADS; 227 glBegin GL_QUADS;
141 glVertex 0 , 0; 228 glVertex $x , $y;
142 glVertex $self->{w}, 0; 229 glVertex $x + $self->{w}, $y;
143 glVertex $self->{w}, $self->{h}; 230 glVertex $x + $self->{w}, $y + $self->{h};
144 glVertex 0 , $self->{h}; 231 glVertex $x , $y + $self->{h};
145 glEnd; 232 glEnd;
146 glDisable GL_BLEND; 233 glDisable GL_BLEND;
147 } 234 }
148 glPopMatrix;
149} 235}
150 236
151sub _draw { 237sub _draw {
152 my ($self) = @_; 238 my ($self) = @_;
153 239
154 warn "no draw defined for $self\n"; 240 warn "no draw defined for $self\n";
155}
156
157sub bbox {
158 my ($self) = @_;
159 my ($w, $h) = $self->size_request;
160 (
161 $self->{x},
162 $self->{y},
163 $self->{x} = $w,
164 $self->{y} = $h
165 )
166} 241}
167 242
168sub find_widget { 243sub find_widget {
169 my ($self, $x, $y) = @_; 244 my ($self, $x, $y) = @_;
170 245
… …
173 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 248 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
174 249
175 () 250 ()
176} 251}
177 252
178sub del_parent { $_[0]->{parent} = undef }
179
180sub set_parent { 253sub set_parent {
181 my ($self, $par) = @_; 254 my ($self, $parent) = @_;
182 255
183 $self->{parent} = $par;
184 Scalar::Util::weaken $self->{parent}; 256 Scalar::Util::weaken ($self->{parent} = $parent);
185}
186
187sub get_parent {
188 $_[0]->{parent}
189} 257}
190 258
191sub update { 259sub update {
192 my ($self) = @_; 260 my ($self) = @_;
193 261
194 $self->{parent}->update 262 $self->{parent}->update
195 if $self->{parent}; 263 if $self->{parent};
196} 264}
197 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
198sub DESTROY { 279sub DESTROY {
199 my ($self) = @_; 280 my ($self) = @_;
200 281
201 #$self->deactivate; 282 #$self->deactivate;
202} 283}
203 284
204############################################################################# 285#############################################################################
205 286
206package Crossfire::Client::Widget::Container; 287package CFClient::UI::DrawBG;
207 288
208our @ISA = Crossfire::Client::Widget::; 289our @ISA = CFClient::UI::Base::;
290
291use strict;
292use SDL::OpenGL;
209 293
210sub new { 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
339package CFClient::UI::Container;
340
341our @ISA = CFClient::UI::Base::;
342
343sub new {
211 my ($class, @widgets) = @_; 344 my ($class, %arg) = @_;
212 345
346 my $children = delete $arg{children} || [];
347
213 my $self = $class->SUPER::new (children => []); 348 my $self = $class->SUPER::new (children => [], %arg);
214 $self->add ($_) for @widgets; 349 $self->add ($_) for @$children;
215 350
216 $self 351 $self
217} 352}
218 353
219sub add { 354sub add {
220 my ($self, $chld, $expand) = @_; 355 my ($self, $child) = @_;
221 356
222 $chld->{expand} = $expand;
223 $chld->set_parent ($self); 357 $child->set_parent ($self);
224 358
359 use sort 'stable';
360
225 @{$self->{children}} = 361 $self->{children} = [
226 sort { $a->{z} <=> $b->{z} } 362 sort { $a->{z} <=> $b->{z} }
227 @{$self->{children}}, $chld; 363 @{$self->{children}}, $child
364 ];
228 365
229 $self->size_allocate ($self->{w}, $self->{h}) 366 $self->{w} = $self->{h} = -1;
230 if $self->{w}; #TODO: check for "realised state" 367 $self->update;
231} 368}
232 369
233sub remove { 370sub remove {
234 my ($self, $widget) = @_; 371 my ($self, $widget) = @_;
235 372
236 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 373 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
237 374
238 $self->size_allocate ($self->{w}, $self->{h}); 375 $self->size_allocate (0, 0, $self->{w}, $self->{h});
239} 376}
240 377
241sub find_widget { 378sub find_widget {
242 my ($self, $x, $y) = @_; 379 my ($self, $x, $y) = @_;
243 380
… …
260 $_->draw for @{$self->{children}}; 397 $_->draw for @{$self->{children}};
261} 398}
262 399
263############################################################################# 400#############################################################################
264 401
265package Crossfire::Client::Widget::Bin; 402package CFClient::UI::Bin;
266 403
267our @ISA = Crossfire::Client::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}
268 430
269sub child { $_[0]->{children}[0] } 431sub child { $_[0]->{children}[0] }
270 432
271sub size_request { 433sub size_request {
272 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 434 $_[0]{children}[0]->size_request
273} 435}
274 436
275sub size_allocate { 437sub size_allocate {
276 my ($self, $w, $h) = @_; 438 my ($self, $x, $y, $w, $h) = @_;
277 439
278 $self->SUPER::size_allocate ($w, $h); 440 $self->_size_allocate ($x, $y, $w, $h) or return;
441
279 $self->{children}[0]->size_allocate ($w, $h) 442 $self->{children}[0]->size_allocate (0, 0, $w, $h);
280 if $self->{children}[0]
281} 443}
282 444
283############################################################################# 445#############################################################################
284 446
285package Crossfire::Client::Widget::Window; 447package CFClient::UI::Window;
286 448
287our @ISA = Crossfire::Client::Widget::Bin::; 449our @ISA = CFClient::UI::Bin::;
288 450
289use SDL::OpenGL; 451use SDL::OpenGL;
290 452
291sub new { 453sub new {
292 my ($class, $x, $y, $z, $w, $h) = @_; 454 my ($class, %arg) = @_;
293 455
294 my $self = $class->SUPER::new; 456 my $self = $class->SUPER::new (%arg);
295
296 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
297} 457}
298 458
299sub update { 459sub update {
300 my ($self) = @_; 460 my ($self) = @_;
301 461
462 # we want to do this delayed...
302 $self->render_chld; 463 $self->render_chld;
303 $self->SUPER::update; 464 $self->SUPER::update;
304} 465}
305 466
306sub render_chld { 467sub render_chld {
307 my ($self) = @_; 468 my ($self) = @_;
308 469
309 $self->{texture} = 470 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
310 Crossfire::Client::Texture->new_from_opengl ( 471 glClearColor 0, 0, 0, 1;
311 $self->{w}, $self->{h}, sub { $self->child->draw } 472 glClear GL_COLOR_BUFFER_BIT;
312 ); 473 $self->child->draw;
474 };
313} 475}
314 476
315sub size_allocate { 477sub size_allocate {
316 my ($self, $w, $h) = @_; 478 my ($self, $x, $y, $w, $h) = @_;
317 479
318 $self->{w} = $w; 480 $self->_size_allocate ($x, $y, $w, $h) or return;
319 $self->{h} = $h;
320 481
321 $self->child->size_allocate ($w, $h); 482 $self->child->size_allocate (0, 0, $w, $h);
322 483
323 $self->render_chld; 484 $self->render_chld;
324} 485}
325 486
326sub _draw { 487sub _draw {
… …
330 491
331 my $tex = $self->{texture} 492 my $tex = $self->{texture}
332 or return; 493 or return;
333 494
334 glEnable GL_BLEND; 495 glEnable GL_BLEND;
496 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
335 glEnable GL_TEXTURE_2D; 497 glEnable GL_TEXTURE_2D;
336 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 498 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
337 499
338 $tex->draw_quad (0, 0, $w, $h); 500 $tex->draw_quad (0, 0, $w, $h);
339 501
… …
341 glDisable GL_TEXTURE_2D; 503 glDisable GL_TEXTURE_2D;
342} 504}
343 505
344############################################################################# 506#############################################################################
345 507
346package Crossfire::Client::Widget::Frame; 508package CFClient::UI::Frame;
347 509
348our @ISA = Crossfire::Client::Widget::Bin::; 510our @ISA = CFClient::UI::Bin::;
349 511
350use SDL::OpenGL; 512use SDL::OpenGL;
351 513
352sub size_request { 514sub size_request {
353 my ($self) = @_; 515 my ($self) = @_;
… …
358 520
359 map { $_ + 4 } $chld->size_request; 521 map { $_ + 4 } $chld->size_request;
360} 522}
361 523
362sub size_allocate { 524sub size_allocate {
363 my ($self, $w, $h) = @_; 525 my ($self, $x, $y, $w, $h) = @_;
364 526
365 $self->{w} = $w; 527 $self->_size_allocate ($x, $y, $w, $h) or return;
366 $self->{h} = $h;
367 528
368 $self->child->size_allocate ($w - 4, $h - 4); 529 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
369 $self->child->move (2, 2);
370} 530}
371 531
372sub _draw { 532sub _draw {
373 my ($self) = @_; 533 my ($self) = @_;
374 534
… …
387 $chld->draw; 547 $chld->draw;
388} 548}
389 549
390############################################################################# 550#############################################################################
391 551
392package Crossfire::Client::Widget::FancyFrame; 552package CFClient::UI::FancyFrame;
393 553
394our @ISA = Crossfire::Client::Widget::Bin::; 554our @ISA = CFClient::UI::Bin::;
395 555
396use SDL::OpenGL; 556use SDL::OpenGL;
397 557
398my @tex = 558my @tex =
399 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 559 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
400 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);
401 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
402sub size_request { 575sub size_request {
403 my ($self) = @_; 576 my ($self) = @_;
404 577
578 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
579
405 my ($w, $h) = $self->SUPER::size_request; 580 my ($w, $h) = $self->SUPER::size_request;
406 581
407 $h += $tex[1]->{height}; 582 (
408 $h += $tex[4]->{height}; 583 $w + $self->{border} * 2,
409 $w += $tex[2]->{width}; 584 $h + $self->{border} * 2,
410 $w += $tex[3]->{width}; 585 )
411
412 ($w, $h)
413} 586}
414 587
415sub size_allocate { 588sub size_allocate {
416 my ($self, $w, $h) = @_; 589 my ($self, $x, $y, $w, $h) = @_;
417 590
418 $self->SUPER::size_allocate ($w, $h); 591 $self->_size_allocate ($x, $y, $w, $h) or return;
419 592
420 $h -= $tex[1]->{height}; 593 $h -= List::Util::max 0, $self->{border} * 2;
421 $h -= $tex[4]->{height}; 594 $w -= List::Util::max 0, $self->{border} * 2;
422 $w -= $tex[2]->{width};
423 $w -= $tex[3]->{width};
424 595
425 $h = $h < 0 ? 0 : $h; 596 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
426 $w = $w < 0 ? 0 : $w; 597}
427 598
428 $self->child->size_allocate ($w, $h); 599sub button_down {
429 $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};
430} 645}
431 646
432sub _draw { 647sub _draw {
433 my ($self) = @_; 648 my ($self) = @_;
434 649
435 my ($w, $h) = ($self->{w}, $self->{h}); 650 my ($w, $h ) = ($self->{w}, $self->{h});
436 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 651 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
437 652
438 glEnable GL_BLEND; 653 glEnable GL_BLEND;
654 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
439 glEnable GL_TEXTURE_2D; 655 glEnable GL_TEXTURE_2D;
440 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
441 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
442 657
443 my $top = $tex[1]; 658 glColor @{ $self->{border_bg} };
444 $top->draw_quad (0, 0, $w, $top->{height}); 659 $tex[1]->draw_quad (0, 0, $w, $self->{border});
445 660 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
446 my $left = $tex[3]; 661 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
447 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 662 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
448
449 my $right = $tex[2];
450 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
451
452 my $bottom = $tex[4];
453 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
454 663
455 my $bg = $tex[0]; 664 my $bg = $tex[0];
456 glBindTexture GL_TEXTURE_2D, $bg->{name};
457 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
458 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
459 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
460 665
666 # TODO: repeat texture not scale
461 my $rep_x = $cw / $bg->{width}; 667 my $rep_x = $cw / $bg->{w};
462 my $rep_y = $ch / $bg->{height}; 668 my $rep_y = $ch / $bg->{h};
463 669
670 glColor @{ $self->{bg} };
671
672 $bg->{s} = $rep_x;
673 $bg->{t} = $rep_y;
674 $bg->{wrap_mode} = 1;
464 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 675 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
465 676
677 glDisable GL_TEXTURE_2D;
466 glDisable GL_BLEND; 678 glDisable GL_BLEND;
467 glDisable GL_TEXTURE_2D;
468 679
469 $self->child->draw; 680 $self->child->draw;
470
471} 681}
472 682
473############################################################################# 683#############################################################################
474 684
475package Crossfire::Client::Widget::Table; 685package CFClient::UI::Table;
476 686
477our @ISA = Crossfire::Client::Widget::Bin::; 687our @ISA = CFClient::UI::Base::;
688
689use List::Util qw(max sum);
478 690
479use SDL::OpenGL; 691use SDL::OpenGL;
480 692
693sub new {
694 my $class = shift;
695
696 $class->SUPER::new (
697 col_expand => [],
698 @_
699 )
700}
701
481sub add { 702sub add {
482 my ($self, $x, $y, $chld) = @_; 703 my ($self, $x, $y, $child) = @_;
483 my $old_chld = $self->{children}[$y][$x];
484 704
705 $child->set_parent ($self);
485 $self->{children}[$y][$x] = $chld; 706 $self->{children}[$y][$x] = $child;
486 $chld->set_parent ($self); 707
708 $self->{w} = $self->{h} = -1;
487 $self->update; 709 $self->update;
488} 710}
489 711
490sub max_row_height { 712# TODO: move to container class maybe? send childs a signal on removal?
713sub clear {
491 my ($self, $row) = @_; 714 my ($self) = @_;
492 715
493 my $hs = 0; 716 delete $self->{children};
494 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}}) {
495 my $c = $self->{children}->[$row]->[$xi]; 726 my $row = $self->{children}[$y]
496 if ($c) { 727 or next;
728
729 for my $x (0 .. $#$row) {
730 my $widget = $row->[$x]
731 or next;
497 my ($w, $h) = $c->size_request; 732 my ($w, $h) = $widget->size_request;
498 if ($hs < $h) { $hs = $h } 733
734 $w[$x] = max $w[$x], $w;
735 $h[$y] = max $h[$y], $h;
499 } 736 }
500 } 737 }
501 return $hs;
502}
503 738
504sub max_col_width { 739 (\@w, \@h)
740}
741
742sub size_request {
505 my ($self, $col) = @_; 743 my ($self) = @_;
506 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
507 my $ws = 0; 781 my $x = 0;
508 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 782 my $row_h = $hs->[$r];
509 my $c = ($self->{children}->[$yi] || [])->[$col]; 783
510 if ($c) { 784 for my $c (0 .. $#$row) {
511 my ($w, $h) = $c->size_request; 785 my $col_w = $ws->[$c];
512 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;
513 } 792 }
793
794 $y += $row_h;
514 } 795 }
515 return $ws; 796
516} 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::;
517 830
518sub size_request { 831sub size_request {
519 my ($self) = @_; 832 my ($self) = @_;
520 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
521 my ($hs, $ws) = (0, 0); 847 ($h, $w) = ($w, $h);
522 848
523 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 849 my $children = $self->{children};
524 $hs += $self->max_row_height ($yi);
525 }
526 850
527 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 851 my @h = map +($_->size_request)[0], @$children;
528 my $wm = 0; 852
529 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 853 my $req_h = List::Util::sum @h;
530 $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;
531 } 868 }
532 if ($ws < $wm) { $ws = $wm }
533 } 869 }
534 870
535 return ($ws, $hs); 871 CFClient::UI::harmonize \@h;
536}
537
538sub _draw {
539 my ($self) = @_;
540 872
541 my $y = 0; 873 my $y = 0;
542 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 874 for (0 .. $#$children) {
875 my $child = $children->[$_];
543 my $x = 0; 876 my $h = $h[$_];
877 $child->size_allocate ($y, 0, $h, $w);
544 878
545 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 879 $y += $h;
546
547 my $c = $self->{children}->[$yi]->[$xi];
548 if ($c) {
549 $c->move ($x, $y, 0); #TODO: Move to size_request
550 $c->draw if $c;
551 }
552
553 $x += $self->max_col_width ($xi);
554 }
555
556 $y += $self->max_row_height ($yi);
557 } 880 }
558} 881}
559 882
560############################################################################# 883#############################################################################
561 884
562package Crossfire::Client::Widget::VBox; 885package CFClient::UI::VBox;
563 886
887# TODO: wrap into common Box base class
888
564our @ISA = Crossfire::Client::Widget::Container::; 889our @ISA = CFClient::UI::Container::;
565
566use SDL::OpenGL;
567 890
568sub size_request { 891sub size_request {
569 my ($self) = @_; 892 my ($self) = @_;
570 893
571 my @alloc = map [$_->size_request], @{$self->{children}}; 894 my @alloc = map [$_->size_request], @{$self->{children}};
… …
575 (List::Util::sum map $_->[1], @alloc), 898 (List::Util::sum map $_->[1], @alloc),
576 ) 899 )
577} 900}
578 901
579sub size_allocate { 902sub size_allocate {
580 my ($self, $w, $h) = @_; 903 my ($self, $x, $y, $w, $h) = @_;
581 904
582 $self->w ($w); 905 $self->_size_allocate ($x, $y, $w, $h);
583 $self->h ($h);
584 906
585 my $exp; 907 my $children = $self->{children};
586 my @oth; 908
587 # find expand widget 909 my @h = map +($_->size_request)[1], @$children;
588 for (@{$self->{children}}) { 910
589 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;
590 $exp = $_; 918 $exp ||= 1;
591 last; 919
920 for (0 .. $#$children) {
921 my $child = $children->[$_];
922
923 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
592 } 924 }
593 push @oth, $_;
594 } 925 }
595 926
596 my ($ow, $oh); 927 CFClient::UI::harmonize \@h;
597
598 # get sizes of other widgets
599 for (@oth) {
600 my ($w, $h) = $_->size_request;
601 $oh += $h;
602 if ($ow < $w) { $ow = $w }
603 }
604 928
605 my $y = 0; 929 my $y = 0;
606 for (@{$self->{children}}) { 930 for (0 .. $#$children) {
607 $_->move (0, $y); 931 my $child = $children->[$_];
608 932 my $h = $h[$_];
609 if ($_ == $exp) {
610 $_->size_allocate ($w, $h - $oh);
611 $y += $h - $oh;
612 } else {
613 my ($cw, $h) = $_->size_request;
614 $_->size_allocate ($w, $h); 933 $child->size_allocate (0, $y, $w, $h);
934
615 $y += $h; 935 $y += $h;
616 }
617 } 936 }
618} 937}
619 938
620############################################################################# 939#############################################################################
621 940
622package Crossfire::Client::Widget::Label; 941package CFClient::UI::Label;
623 942
624our @ISA = Crossfire::Client::Widget::; 943our @ISA = CFClient::UI::Base::;
625 944
626use SDL::OpenGL; 945use SDL::OpenGL;
627 946
628sub new { 947sub new {
629 my ($class, $x, $y, $z, $height, $text) = @_; 948 my ($class, %arg) = @_;
630 949
631 $height ||= $::FONTSIZE; 950 my $self = $class->SUPER::new (
951 fg => [1, 1, 1],
952 fontsize => $::FONTSIZE,
953 text => "",
954 align => -1,
955 padding => 2,
956 layout => new CFClient::Layout,
957 %arg
958 );
632 959
633 # TODO: color, and make height, xyz etc. optional
634 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
635
636 $self->set_text ($text); 960 $self->set_text ($self->{text});
637 961
638 $self 962 $self
963}
964
965sub escape_text {
966 local $_ = $_[1];
967
968 s/&/&amp;/g;
969 s/>/&gt;/g;
970 s/</&lt;/g;
971
972 $_[1]
639} 973}
640 974
641sub set_text { 975sub set_text {
642 my ($self, $text) = @_; 976 my ($self, $text) = @_;
643 977
644 $self->{text} = $text; 978 $self->{text} = $text;
645 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 979 $self->{layout}->set_markup ($text);
646 980
981 delete $self->{texture};
982# $self->{w} = $self->{h} = -1;
647 $self->update; 983 $self->update;
648} 984}
649 985
650sub get_text { 986sub get_text {
651 my ($self, $text) = @_; 987 my ($self, $text) = @_;
… …
654} 990}
655 991
656sub size_request { 992sub size_request {
657 my ($self) = @_; 993 my ($self) = @_;
658 994
659 if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 995 $self->{layout}->set_width;
996 $self->{layout}->set_height ($self->{fontsize});
997 my ($w, $h) = $self->{layout}->size;
998
999 (
1000 $w + $self->{padding} * 2,
1001 $h + $self->{padding} * 2,
1002 )
1003}
1004
1005sub size_allocate {
1006 my ($self, $x, $y, $w, $h) = @_;
1007
1008 $self->_size_allocate ($x, $y, $w, $h) or return;
1009
1010 delete $self->{texture};
1011}
1012
1013sub update {
1014 my ($self) = @_;
1015
1016 delete $self->{texture};
1017 $self->SUPER::update;
1018}
1019
1020sub _draw {
1021 my ($self) = @_;
1022
1023 my $tex = $self->{texture} ||= do {
1024 $self->{layout}->set_width ($self->{w});
1025 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1026 new_from_layout CFClient::Texture $self->{layout}
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,
660 ( 1066 @_
661 $self->{texture}{width}, 1067 )
662 $self->{texture}{height}, 1068}
663 ) 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};
664 } else { 1187 } else {
665 my ($w, $h, $data) = Crossfire::Client::font_render "Yy", $self->{height}; 1188 glColor @{$self->{bg}};
1189 }
666 1190
667 ($w, $h) 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 @_
668 } 1258 )
1259}
669 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 }
670} 1268}
671 1269
672sub _draw { 1270sub _draw {
673 my ($self) = @_; 1271 my ($self) = @_;
674 1272
675 my $tex = $self->{texture}; 1273 local $self->{fg} = $self->{fg};
1274 my $tex = $tex[0];
676 1275
677 glEnable GL_BLEND; 1276 glEnable GL_BLEND;
678 glEnable GL_TEXTURE_2D; 1277 glEnable GL_TEXTURE_2D;
679 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};
680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1285 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
681 1286
682 glColor 1, 0, 0, 1; # TODO color 1287 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
683 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
684 $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);
685 1496
686 glDisable GL_BLEND; 1497 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 1498 glDisable GL_TEXTURE_2D;
688} 1499}
689 1500
690############################################################################# 1501#############################################################################
691 1502
692package Crossfire::Client::Widget::Entry; 1503package CFClient::UI::TextView;
693 1504
694our @ISA = Crossfire::Client::Widget::Label::; 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
1669package CFClient::UI::MapWidget;
1670
1671use strict;
1672
1673use List::Util qw(min max);
695 1674
696use SDL; 1675use SDL;
697use SDL::OpenGL; 1676use SDL::OpenGL;
698 1677
699sub key_down { 1678our @ISA = CFClient::UI::Base::;
700 my ($self, $ev) = @_;
701 1679
702 my $mod = $ev->key_mod; 1680sub new {
703 my $sym = $ev->key_sym; 1681 my $class = shift;
704 1682
705 my $uni = $ev->key_unicode; 1683 $class->SUPER::new (
706 1684 z => -1,
707 my $text = $self->get_text; 1685 can_focus => 1,
708 1686 list => (glGenLists 1),
709 if ($sym == SDLK_BACKSPACE) { 1687 @_
710 substr $text, -1, 1, '';
711 } elsif ($uni) {
712 $text .= chr $uni;
713 print "$uni <$text>\n";#d#
714 } 1688 )
715
716 $self->set_text ($text);
717} 1689}
718
719sub button_down {
720 my ($self, $ev) = @_;
721
722 $self->focus_in;
723}
724
725sub _draw {
726 my ($self) = @_;
727
728 if ($FOCUS == $self) {
729 glColor 1, 1, 1;
730 } else {
731 glColor 0.7, 0.7, 0.7;
732 }
733
734 glBegin GL_QUADS;
735 glVertex 0 , 0;
736 glVertex 0 , $self->{h} - 1;
737 glVertex $self->{w} - 1, $self->{h} - 1;
738 glVertex $self->{w} - 1, 0;
739 glEnd;
740
741 $self->SUPER::_draw;
742}
743
744#############################################################################
745
746package Crossfire::Client::Widget::MapWidget;
747
748use strict;
749
750use List::Util qw(min max);
751
752use SDL;
753use SDL::OpenGL;
754use SDL::OpenGL::Constants;
755
756our @ISA = Crossfire::Client::Widget::;
757 1690
758sub key_down { 1691sub key_down {
759 print "MAPKEYDOWN\n"; 1692 print "MAPKEYDOWN\n";
760} 1693}
761 1694
762sub key_up { 1695sub key_up {
763} 1696}
764 1697
1698sub button_down {
1699 my ($self, $ev, $x, $y) = @_;
1700
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};
1724}
1725
1726sub mouse_motion {
1727 my ($self, $ev, $x, $y) = @_;
1728
1729 $self->{motion}->($ev, $x, $y) if $self->{motion};
1730}
1731
765sub size_request { 1732sub size_request {
766 ( 1733 (
767 1 + int $::WIDTH / 32, 1734 1 + 32 * int $::WIDTH / 32,
768 1 + int $::HEIGHT / 32, 1735 1 + 32 * int $::HEIGHT / 32,
769 ) 1736 )
770} 1737}
771 1738
1739sub update {
1740 my ($self) = @_;
1741
1742 $self->{need_update} = 1;
1743 $self->SUPER::update;
1744}
1745
772sub _draw { 1746sub draw {
773 my ($self) = @_; 1747 my ($self) = @_;
774 1748
775 my $mx = $::CONN->{mapx}; 1749 if (delete $self->{need_update}) {
776 my $my = $::CONN->{mapy}; 1750 glNewList $self->{list}, GL_COMPILE;
777 1751
778 my $map = $::CONN->{map}; 1752 if ($::MAP) {
779
780 my ($xofs, $yofs);
781
782 my $sw = 1 + int $::WIDTH / 32; 1753 my $sw = int $::WIDTH / 32;
783 my $sh = 1 + int $::HEIGHT / 32; 1754 my $sh = int $::HEIGHT / 32;
784 1755
785 if ($::CONN->{mapw} > $sw) { 1756 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
786 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1757 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
787 } else {
788 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
789 }
790 1758
791 if ($::CONN->{maph} > $sh) { 1759 glTranslate $sx0 - 32, $sy0 - 32, 0;
792 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
793 } else {
794 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
795 }
796 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;
797 glEnable GL_TEXTURE_2D; 1790 glEnable GL_TEXTURE_2D;
798 glEnable GL_BLEND;
799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1791 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
800 1792
801 my $sw4 = ($sw + 3) & ~3; 1793 glColor +($::CFG->{fow_intensity}) x 3, 1;
802 my $lighting = "\x00" x ($sw4 * $sh); 1794 $tex->draw_quad (0, 0, $w * 32, $h * 32);
803 1795
804 for my $x (0 .. $sw - 1) { 1796 glDisable GL_TEXTURE_2D;
805 for my $y (0 .. $sh - 1) { 1797 glDisable GL_BLEND;
806
807 my $cell = $map->[$x + $xofs][$y + $yofs]
808 or next;
809
810 my $darkness = $cell->[0] * (1 / 255);
811 if ($darkness < 0) {
812 $darkness = $cell->[1] ? 0.1 : 0;
813 } 1798 }
814 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
815 1799
816 for my $num (grep $_, @$cell[1,2,3]) { 1800 # HACK BEGIN
817 my $tex = $::CONN->{face}[$num]{texture} || next;
818 1801 {
819 my $w = $tex->{width}; 1802 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
820 my $h = $tex->{height}; 1803 my ($w, $h) = (250, 250);
821 1804
822 my $px = ($x + 1) * 32 - $w; 1805 glEnable GL_BLEND;
823 my $py = ($y + 1) * 32 - $h; 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;
824 1809
825 $tex->draw_quad ($px, $py, $w, $h); 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;
826 } 1819 }
1820 # HACK END
827 } 1821 }
828 }
829 1822
830# if (1) { # higher quality darkness 1823 glEndList;
831# $lighting =~ s/(.)/$1$1$1/gs;
832# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
833#
834# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
835#
836# $lighting = $pb->get_pixels;
837# $lighting =~ s/(.)../$1/gs;
838# } 1824 }
839 1825
840 $lighting = new Crossfire::Client::Texture 1826 glPushMatrix;
841 width => $sw4, 1827 glCallList $self->{list};
842 height => $sh, 1828 glPopMatrix;
843 data => $lighting,
844 internalformat => GL_ALPHA,
845 format => GL_ALPHA;
846 1829
847 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1830 if ($FOCUS != $self) {
848 glColor 0.45, 0.45, 0.45, 1; 1831 glColor 64/255, 64/255, 64/255;
849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1832 glLogicOp GL_AND;
850 glBindTexture GL_TEXTURE_2D, $lighting->{name}; 1833 glEnable GL_COLOR_LOGIC_OP;
851 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 1834 glBegin GL_QUADS;
852 1835 glVertex 0, 0;
853 $lighting->draw_quad (0, 0, $sw4 * 32, $sh * 32); 1836 glVertex 0, $::HEIGHT;
854 1837 glVertex $::WIDTH, $::HEIGHT;
855 glDisable GL_TEXTURE_2D; 1838 glVertex $::WIDTH, 0;
856 glDisable GL_BLEND; 1839 glEnd;
1840 glDisable GL_COLOR_LOGIC_OP;
1841 }
857} 1842}
858 1843
859my %DIR = ( 1844my %DIR = (
860 SDLK_KP8, [1, "north"], 1845 SDLK_KP8, [1, "north"],
861 SDLK_KP9, [2, "northeast"], 1846 SDLK_KP9, [2, "northeast"],
… …
877 1862
878 my $mod = $ev->key_mod; 1863 my $mod = $ev->key_mod;
879 my $sym = $ev->key_sym; 1864 my $sym = $ev->key_sym;
880 1865
881 if ($sym == SDLK_KP5) { 1866 if ($sym == SDLK_KP5) {
882 $::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' => '/');
883 } elsif (exists $DIR{$sym}) { 1874 } elsif (exists $DIR{$sym}) {
884 if ($mod & KMOD_SHIFT) { 1875 if ($mod & KMOD_SHIFT) {
885 $self->{shft}++; 1876 $self->{shft}++;
886 $::CONN->send ("command fire $DIR{$sym}[0]"); 1877 $::CONN->user_send ("command fire $DIR{$sym}[0]");
887 } elsif ($mod & KMOD_CTRL) { 1878 } elsif ($mod & KMOD_CTRL) {
888 $self->{ctrl}++; 1879 $self->{ctrl}++;
889 $::CONN->send ("command run $DIR{$sym}[0]"); 1880 $::CONN->user_send ("command run $DIR{$sym}[0]");
890 } else { 1881 } else {
891 $::CONN->send ("command $DIR{$sym}[1]"); 1882 $::CONN->user_send ("command $DIR{$sym}[1]");
892 } 1883 }
893 } 1884 }
894} 1885}
895 1886
896sub key_up { 1887sub key_up {
… …
898 1889
899 my $mod = $ev->key_mod; 1890 my $mod = $ev->key_mod;
900 my $sym = $ev->key_sym; 1891 my $sym = $ev->key_sym;
901 1892
902 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1893 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
903 $::CONN->send ("command fire_stop"); 1894 $::CONN->user_send ("command fire_stop");
904 } 1895 }
905 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1896 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
906 $::CONN->send ("command run_stop"); 1897 $::CONN->user_send ("command run_stop");
907 } 1898 }
908} 1899}
909 1900
910############################################################################# 1901#############################################################################
911 1902
912package Crossfire::Client::Widget::Animator; 1903package CFClient::UI::Animator;
913 1904
914use SDL::OpenGL; 1905use SDL::OpenGL;
915 1906
916our @ISA = Crossfire::Client::Widget::Bin::; 1907our @ISA = CFClient::UI::Bin::;
917 1908
918sub moveto { 1909sub moveto {
919 my ($self, $x, $y) = @_; 1910 my ($self, $x, $y) = @_;
920 1911
921 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1912 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
926} 1917}
927 1918
928sub animate { 1919sub animate {
929 my ($self, $interval) = @_; 1920 my ($self, $interval) = @_;
930 1921
931 printf "%5.2f\n", 1 / $interval;#d#
932
933 $self->{time} -= $interval * $self->{speed}; 1922 $self->{time} -= $interval * $self->{speed};
934 if ($self->{time} <= 0) { 1923 if ($self->{time} <= 0) {
935 $self->{time} = 0; 1924 $self->{time} = 0;
936 ::animation_stop $self; 1925 ::animation_stop $self;
937 } 1926 }
… …
951 glPopMatrix; 1940 glPopMatrix;
952} 1941}
953 1942
954############################################################################# 1943#############################################################################
955 1944
956package Crossfire::Client::Widget::Toplevel; 1945package CFClient::UI::Flopper;
957 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
958our @ISA = Crossfire::Client::Widget::Container::; 1986our @ISA = CFClient::UI::Container::;
1987
1988use SDL::OpenGL;
959 1989
960sub size_request { 1990sub size_request {
961 ($::WIDTH, $::HEIGHT) 1991 ($::WIDTH, $::HEIGHT)
962} 1992}
963 1993
964sub size_allocate { 1994sub size_allocate {
965 my ($self, $w, $h) = @_; 1995 my ($self, $x, $y, $w, $h) = @_;
966 1996
967 $self->SUPER::size_allocate ($w, $h); 1997 $self->_size_allocate ($x, $y, $w, $h);
968 1998
969 $_->size_allocate ($_->size_request) 1999 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
970 for @{$self->{children}}; 2000 for @{$self->{children}};
971} 2001}
972 2002
2003sub _topleft {
2004 my ($self, $x, $y) = @_;
2005
2006 ($x, $y)
2007}
2008
973sub update { 2009sub update {
974 my ($self) = @_; 2010 my ($self) = @_;
975 2011
976 $self->size_allocate ($self->size_request); 2012 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
977 ::refresh (); 2013 ::refresh ();
978} 2014}
979 2015
980sub add { 2016sub add {
981 my ($self, $widget) = @_; 2017 my ($self, $widget) = @_;
982 2018
983 $self->SUPER::add ($widget); 2019 $self->SUPER::add ($widget);
984 2020
985 $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;
986} 2028}
987 2029
988sub draw { 2030sub draw {
989 my ($self) = @_; 2031 my ($self) = @_;
990 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
991 $self->_draw; 2047 $self->_draw;
992} 2048}
993 2049
994############################################################################# 2050#############################################################################
995 2051
996package Crossfire::Client::Widget; 2052package CFClient::UI;
997 2053
998$TOPLEVEL = new Crossfire::Client::Widget::Toplevel; 2054$ROOT = new CFClient::UI::Root;
999 2055
10001 20561
1001 2057

Diff Legend

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