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

Diff Legend

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