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.44 by root, Sun Apr 9 22:17:40 2006 UTC vs.
Revision 1.85 by elmex, Wed Apr 12 12:55:56 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 ();
7
8use CFClient;
9
10our ($FOCUS, $HOVER, $GRAB); # various widgets
11
12our $TOPLEVEL;
13our $BUTTON_STATE;
14
15# class methods for events
16sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS;
18}
19
20sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS;
22}
23
24sub feed_sdl_button_down_event {
25 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27
28 if (!$BUTTON_STATE) {
29 my $widget = $TOPLEVEL->find_widget ($x, $y);
30
31 $GRAB = $widget;
32 $GRAB->update if $GRAB;
33 }
34
35 $BUTTON_STATE |= 1 << ($ev->button - 1);
36
37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
38}
39
40sub feed_sdl_button_up_event {
41 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
45
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
47
48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
49
50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab;
53 $GRAB->update if $GRAB;
54 }
55}
56
57sub feed_sdl_motion_event {
58 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
62
63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget;
65
66 $hover->update if $hover;
67 $HOVER->update if $HOVER;
68 }
69
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
71}
72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
6 78
7use SDL::OpenGL; 79use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9
10use Crossfire::Client;
11
12our $FOCUS; # the widget with current focus
13
14# class methods for events
15sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
16sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
17sub feed_sdl_button_down_event { }
18sub feed_sdl_button_up_event { }
19 80
20sub new { 81sub new {
21 my $class = shift; 82 my $class = shift;
22 83
23 bless { @_ }, $class 84 my $self = bless {
85 x => 0,
86 y => 0,
87 z => 0,
88 w => -1,
89 h => -1,
90 @_
91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
24} 100}
25 101
26sub move { 102sub move {
27 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
28 $self->{x} = $x; 104 $self->{x} = $x;
… …
37sub size_request { 113sub size_request {
38 require Carp; 114 require Carp;
39 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
40} 116}
41 117
42sub size_allocate { 118sub _size_allocate {
43 my ($self, $w, $h) = @_; 119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = $x;
122 $self->{y} = $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
44 125
45 $self->{w} = $w; 126 $self->{w} = $w;
46 $self->{h} = $h; 127 $self->{h} = $h;
128
129 1
130}
131
132sub size_allocate {
133 my ($self, $x, $y, $w, $h) = @_;
134
135 $self->_size_allocate ($x, $y, $w, $h);
136}
137
138# translate global coordinates to local coordinate system
139sub translate {
140 my ($self, $x, $y) = @_;
141
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
47} 143}
48 144
49sub focus_in { 145sub focus_in {
50 my ($widget) = @_; 146 my ($self) = @_;
51 $FOCUS = $widget; 147
148 return if $FOCUS == $self;
149
150 my $focus = $FOCUS; $FOCUS = $self;
151 $focus->update if $focus;
152 $FOCUS->update;
52} 153}
53 154
54sub focus_out { 155sub focus_out {
55 my ($widget) = @_; 156 my ($self) = @_;
56}
57 157
158 return unless $FOCUS == $self;
159
160 my $focus = $FOCUS; undef $FOCUS;
161 $focus->update if $focus; #?
162}
163
164sub mouse_motion { }
165sub button_up { }
58sub key_down { 166sub key_down { }
59 my ($widget, $sdlev) = @_;
60}
61
62sub key_up { 167sub key_up { }
63 my ($widget, $sdlev) = @_;
64}
65 168
66sub button_down { 169sub button_down {
67 my ($widget, $sdlev) = @_; 170 my ($self, $ev, $x, $y) = @_;
68}
69 171
70sub button_up { 172 $self->focus_in;
71 my ($widget, $sdlev) = @_;
72} 173}
73 174
74sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 175sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
75sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 176sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
76sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 177sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
77sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 178sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
78sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 179sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
79 180
80sub draw { 181sub draw {
81 my ($self) = @_; 182 my ($self) = @_;
183
184 return unless $self->{h} && $self->{w};
82 185
83 glPushMatrix; 186 glPushMatrix;
84 glTranslate $self->{x}, $self->{y}, 0; 187 glTranslate $self->{x}, $self->{y}, 0;
85 $self->_draw; 188 $self->_draw;
86 glPopMatrix; 189 glPopMatrix;
190
191 if ($self == $HOVER) {
192 my ($x, $y) = @$self{qw(x y)};
193
194 glColor 0, 0, 1, 0.2;
195 glEnable GL_BLEND;
196 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
197 glBegin GL_QUADS;
198 glVertex $x , $y;
199 glVertex $x + $self->{w}, $y;
200 glVertex $x + $self->{w}, $y + $self->{h};
201 glVertex $x , $y + $self->{h};
202 glEnd;
203 glDisable GL_BLEND;
204 }
87} 205}
88 206
89sub _draw { 207sub _draw {
90 my ($self) = @_; 208 my ($self) = @_;
91 209
92 warn "no draw defined for $self\n"; 210 warn "no draw defined for $self\n";
93}
94
95sub bbox {
96 my ($self) = @_;
97 my ($w, $h) = $self->size_request;
98 (
99 $self->{x},
100 $self->{y},
101 $self->{x} = $w,
102 $self->{y} = $h
103 )
104} 211}
105 212
106sub find_widget { 213sub find_widget {
107 my ($self, $x, $y) = @_; 214 my ($self, $x, $y) = @_;
108 215
… …
111 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 218 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
112 219
113 () 220 ()
114} 221}
115 222
116sub del_parent { $_[0]->{parent} = undef }
117
118sub set_parent { 223sub set_parent {
119 my ($self, $par) = @_; 224 my ($self, $par) = @_;
120 225
121 $self->{parent} = $par; 226 $self->{parent} = $par;
122 Scalar::Util::weaken $self->{parent}; 227 Scalar::Util::weaken $self->{parent};
… …
131 236
132 $self->{parent}->update 237 $self->{parent}->update
133 if $self->{parent}; 238 if $self->{parent};
134} 239}
135 240
241sub connect {
242 my ($self, $signal, $cb) = @_;
243
244 push @{ $self->{cb}{$signal} }, $cb;
245}
246
247sub emit {
248 my ($self, $signal, @args) = @_;
249
250 $_->($self, @args)
251 for @{$self->{cb}{$signal} || []};
252}
253
136sub DESTROY { 254sub DESTROY {
137 my ($self) = @_; 255 my ($self) = @_;
138 256
139 #$self->deactivate; 257 #$self->deactivate;
140} 258}
141 259
142############################################################################# 260#############################################################################
143 261
144package Crossfire::Client::Widget::Container; 262package CFClient::UI::DrawBG;
145 263
146our @ISA = Crossfire::Client::Widget::; 264our @ISA = CFClient::UI::Base::;
265
266use strict;
267use SDL::OpenGL;
147 268
148sub new { 269sub new {
270 my $class = shift;
271
272 # range [value, low, high, page]
273
274 $class->SUPER::new (
275 bg => [0, 0, 0, 0.2],
276 active_bg => [1, 1, 1, 0.5],
277 @_
278 )
279}
280
281sub _draw {
282 my ($self) = @_;
283
284 my ($w, $h) = @$self{qw(w h)};
285
286 glEnable GL_BLEND;
287 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
288 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
289
290 glBegin GL_QUADS;
291 glVertex 0 , 0;
292 glVertex 0 , $h;
293 glVertex $w, $h;
294 glVertex $w, 0;
295 glEnd;
296
297 glDisable GL_BLEND;
298}
299
300#############################################################################
301
302package CFClient::UI::Empty;
303
304our @ISA = CFClient::UI::Base::;
305
306sub size_request {
307 (0, 0)
308}
309
310sub draw { }
311
312#############################################################################
313
314package CFClient::UI::Container;
315
316our @ISA = CFClient::UI::Base::;
317
318sub new {
149 my ($class, @widgets) = @_; 319 my ($class, %arg) = @_;
150 320
321 my $children = delete $arg{children} || [];
322
151 my $self = $class->SUPER::new (children => []); 323 my $self = $class->SUPER::new (children => [], %arg);
152 $self->add ($_) for @widgets; 324 $self->add ($_) for @$children;
153 325
154 $self 326 $self
155} 327}
156 328
157sub add { 329sub add {
158 my ($self, $chld, $expand) = @_; 330 my ($self, $chld) = @_;
159 331
160 $chld->{expand} = $expand;
161 $chld->set_parent ($self); 332 $chld->set_parent ($self);
162 333
163 @{$self->{children}} = 334 $self->{children} = [
164 sort { $a->{z} <=> $b->{z} } 335 sort { $a->{z} <=> $b->{z} }
165 @{$self->{children}}, $chld; 336 @{$self->{children}}, $chld
337 ];
166 338
167 $self->size_allocate ($self->{w}, $self->{h}) 339 $self->{w} = $self->{h} = -1;
168 if $self->{w}; #TODO: check for "realised state" 340 $self->update;
169} 341}
170 342
171sub remove { 343sub remove {
172 my ($self, $widget) = @_; 344 my ($self, $widget) = @_;
173 345
174 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 346 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
175 347
176 $self->size_allocate ($self->{w}, $self->{h}); 348 $self->size_allocate (0, 0, $self->{w}, $self->{h});
177} 349}
178 350
179sub find_widget { 351sub find_widget {
180 my ($self, $x, $y) = @_; 352 my ($self, $x, $y) = @_;
181 353
354 $x -= $self->{x};
355 $y -= $self->{y};
356
182 my $res; 357 my $res;
183 358
184 for (@{ $self->{children} }) { 359 for (reverse @{ $self->{children} }) {
185 $res = $_->find_widget ($x - $self->{x}, $y - $self->{y}) 360 $res = $_->find_widget ($x, $y)
186 and return $res; 361 and return $res;
187 } 362 }
188 363
189 () 364 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
190} 365}
191 366
192sub _draw { 367sub _draw {
193 my ($self) = @_; 368 my ($self) = @_;
194 369
195 $_->draw for @{$self->{children}}; 370 $_->draw for @{$self->{children}};
196} 371}
197 372
198############################################################################# 373#############################################################################
199 374
200package Crossfire::Client::Widget::Bin; 375package CFClient::UI::Bin;
201 376
202our @ISA = Crossfire::Client::Widget::Container::; 377our @ISA = CFClient::UI::Container::;
203 378
204sub child { $_[0]->{children}[0] } 379sub new {
380 my ($class, %arg) = @_;
205 381
206sub size_request { 382 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
207 $_[0]{children}[0]->size_request if $_[0]{children}[0];
208}
209 383
210sub size_allocate { 384 $class->SUPER::new (children => [$child], %arg)
211 my ($self, $w, $h) = @_;
212
213 $self->SUPER::size_allocate ($w, $h);
214 $self->{children}[0]->size_allocate ($w, $h)
215 if $self->{children}[0]
216}
217
218#############################################################################
219
220package Crossfire::Client::Widget::Toplevel;
221
222our @ISA = Crossfire::Client::Widget::Container::;
223
224sub update {
225 my ($self) = @_;
226
227 ::refresh ();
228} 385}
229 386
230sub add { 387sub add {
231 my ($self, $widget) = @_; 388 my ($self, $widget) = @_;
232 389
390 $self->{children} = [];
391
233 $self->SUPER::add ($widget); 392 $self->SUPER::add ($widget);
234
235 $widget->size_allocate ($widget->size_request);
236} 393}
237 394
238############################################################################# 395sub remove {
396 my ($self, $widget) = @_;
239 397
240package Crossfire::Client::Widget::Window; 398 $self->SUPER::remove ($widget);
241 399
242our @ISA = Crossfire::Client::Widget::Bin::; 400 $self->{children} = [new CFClient::UI::Empty]
401 unless @{$self->{children}};
402}
403
404sub child { $_[0]->{children}[0] }
405
406sub size_request {
407 $_[0]{children}[0]->size_request
408}
409
410sub size_allocate {
411 my ($self, $x, $y, $w, $h) = @_;
412
413 $self->_size_allocate ($x, $y, $w, $h) or return;
414
415 $self->{children}[0]->size_allocate (0, 0, $w, $h);
416}
417
418#############################################################################
419
420package CFClient::UI::Window;
421
422our @ISA = CFClient::UI::Bin::;
243 423
244use SDL::OpenGL; 424use SDL::OpenGL;
245 425
246sub new { 426sub new {
247 my ($class, $x, $y, $z, $w, $h) = @_; 427 my ($class, %arg) = @_;
248 428
249 my $self = $class->SUPER::new; 429 my $self = $class->SUPER::new (%arg);
250
251 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
252} 430}
253 431
254sub update { 432sub update {
255 my ($self) = @_; 433 my ($self) = @_;
256 434
435 # we want to do this delayed...
257 $self->render_chld; 436 $self->render_chld;
258 $self->SUPER::update; 437 $self->SUPER::update;
259} 438}
260 439
261sub render_chld { 440sub render_chld {
262 my ($self) = @_; 441 my ($self) = @_;
263 442
264 $self->{texture} = 443 $self->{texture} =
265 Crossfire::Client::Texture->new_from_opengl ( 444 CFClient::Texture->new_from_opengl (
266 $self->{w}, $self->{h}, sub { $self->child->draw } 445 $self->{w}, $self->{h}, sub { $self->child->draw }
267 ); 446 );
268} 447}
269 448
270sub size_allocate { 449sub size_allocate {
271 my ($self, $w, $h) = @_; 450 my ($self, $x, $y, $w, $h) = @_;
272 451
273 $self->{w} = $w; 452 $self->_size_allocate ($x, $y, $w, $h) or return;
274 $self->{h} = $h;
275 453
276 $self->child->size_allocate ($w, $h); 454 $self->child->size_allocate (0, 0, $w, $h);
277 455
278 $self->render_chld; 456 $self->render_chld;
279} 457}
280 458
281sub _draw { 459sub _draw {
… …
285 463
286 my $tex = $self->{texture} 464 my $tex = $self->{texture}
287 or return; 465 or return;
288 466
289 glEnable GL_BLEND; 467 glEnable GL_BLEND;
468 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
290 glEnable GL_TEXTURE_2D; 469 glEnable GL_TEXTURE_2D;
291 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
292 glBindTexture GL_TEXTURE_2D, $tex->{name};
293 471
294 glBegin GL_QUADS; 472 $tex->draw_quad (0, 0, $w, $h);
295 glTexCoord 0, 0; glVertex 0, 0;
296 glTexCoord 0, 1; glVertex 0, $h;
297 glTexCoord 1, 1; glVertex $w, $h;
298 glTexCoord 1, 0; glVertex $w, 0;
299 glEnd;
300 473
301 glDisable GL_BLEND; 474 glDisable GL_BLEND;
302 glDisable GL_TEXTURE_2D; 475 glDisable GL_TEXTURE_2D;
303} 476}
304 477
305############################################################################# 478#############################################################################
306 479
307package Crossfire::Client::Widget::Frame; 480package CFClient::UI::Frame;
308 481
309our @ISA = Crossfire::Client::Widget::Bin::; 482our @ISA = CFClient::UI::Bin::;
310 483
311use SDL::OpenGL; 484use SDL::OpenGL;
312 485
313sub size_request { 486sub size_request {
314 my ($self) = @_; 487 my ($self) = @_;
… …
319 492
320 map { $_ + 4 } $chld->size_request; 493 map { $_ + 4 } $chld->size_request;
321} 494}
322 495
323sub size_allocate { 496sub size_allocate {
324 my ($self, $w, $h) = @_; 497 my ($self, $x, $y, $w, $h) = @_;
325 498
326 $self->{w} = $w; 499 $self->_size_allocate ($x, $y, $w, $h) or return;
327 $self->{h} = $h;
328 500
329 $self->child->size_allocate ($w - 4, $h - 4); 501 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
330 $self->child->move (2, 2);
331} 502}
332 503
333sub _draw { 504sub _draw {
334 my ($self) = @_; 505 my ($self) = @_;
335 506
… …
337 508
338 my ($w, $h) = $chld->size_request; 509 my ($w, $h) = $chld->size_request;
339 510
340 glBegin GL_QUADS; 511 glBegin GL_QUADS;
341 glColor 0, 0, 0; 512 glColor 0, 0, 0;
342 glTexCoord 0, 0; glVertex 0 , 0; 513 glVertex 0 , 0;
343 glTexCoord 0, 1; glVertex 0 , $h + 4; 514 glVertex 0 , $h + 4;
344 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 515 glVertex $w + 4 , $h + 4;
345 glTexCoord 1, 0; glVertex $w + 4 , 0; 516 glVertex $w + 4 , 0;
346 glEnd; 517 glEnd;
347 518
348 $chld->draw; 519 $chld->draw;
349} 520}
350 521
351############################################################################# 522#############################################################################
352 523
353package Crossfire::Client::Widget::FancyFrame; 524package CFClient::UI::FancyFrame;
354 525
355our @ISA = Crossfire::Client::Widget::Bin::; 526our @ISA = CFClient::UI::Bin::;
356 527
357use SDL::OpenGL; 528use SDL::OpenGL;
358 529
359my @tex = 530my @tex =
360 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 531 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
361 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 532 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
362 533
363sub size_request { 534sub size_request {
364 my ($self) = @_; 535 my ($self) = @_;
365 536
537 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538
366 my ($w, $h) = $self->SUPER::size_request; 539 my ($w, $h) = $self->SUPER::size_request;
367 540
368 $h += $tex[1]->{height}; 541 $h += $tex[1]->{h};
369 $h += $tex[4]->{height}; 542 $h += $tex[4]->{h};
370 $w += $tex[2]->{width}; 543 $w += $tex[2]->{w};
371 $w += $tex[3]->{width}; 544 $w += $tex[3]->{w};
372 545
373 ($w, $h) 546 ($w, $h)
374} 547}
375 548
376sub size_allocate { 549sub size_allocate {
377 my ($self, $w, $h) = @_; 550 my ($self, $x, $y, $w, $h) = @_;
378 551
379 $self->SUPER::size_allocate ($w, $h); 552 $self->_size_allocate ($x, $y, $w, $h) or return;
380 553
381 $h -= $tex[1]->{height}; 554 $h -= $tex[1]{h};
382 $h -= $tex[4]->{height}; 555 $h -= $tex[4]{h};
383 $w -= $tex[2]->{width}; 556 $w -= $tex[2]{w};
384 $w -= $tex[3]->{width}; 557 $w -= $tex[3]{w};
385 558
386 $h = $h < 0 ? 0 : $h; 559 $h = $h < 0 ? 0 : $h;
387 $w = $w < 0 ? 0 : $w; 560 $w = $w < 0 ? 0 : $w;
388 561
389 $self->child->size_allocate ($w, $h); 562 my $child = $self->child;
390 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 563
564 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
565}
566
567sub button_down {
568 my ($self, $ev, $x, $y) = @_;
569
570 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}
571 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {
572
573 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574 my ($bw, $bh) = ($self->{w}, $self->{h});
575
576 $self->{motion} = sub {
577 my ($ev, $x, $y) = @_;
578
579 ($x, $y) = ($ev->motion_x, $ev->motion_y);
580
581 $self->{user_w} = $bw + $x - $ox;
582 $self->{user_h} = $bh + $y - $oy;
583 $self->update;
584 };
585
586 } elsif ($x >= 0 && $x < $self->{w}
587 && $y >= 0 && $y < $tex[1]{h}) {
588
589 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590 my ($bx, $by) = ($self->{x}, $self->{y});
591
592 $self->{motion} = sub {
593 my ($ev, $x, $y) = @_;
594
595 ($x, $y) = ($ev->motion_x, $ev->motion_y);
596
597 $self->move ($bx + $x - $ox, $by + $y - $oy);
598 $self->update;
599 };
600 }
601}
602
603sub button_up {
604 my ($self, $ev, $x, $y) = @_;
605
606 delete $self->{motion};
607}
608
609sub mouse_motion {
610 my ($self, $ev, $x, $y) = @_;
611
612 $self->{motion}->($ev, $x, $y) if $self->{motion};
391} 613}
392 614
393sub _draw { 615sub _draw {
394 my ($self) = @_; 616 my ($self) = @_;
395 617
396 my ($w, $h) = ($self->{w}, $self->{h}); 618 my ($w, $h) = ($self->{w}, $self->{h});
397 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 619 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
398 620
399 glEnable GL_BLEND; 621 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
400 glEnable GL_TEXTURE_2D; 623 glEnable GL_TEXTURE_2D;
401 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
402 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
403 625
404 my $top = $tex[1]; 626 my $top = $tex[1];
405 glBindTexture GL_TEXTURE_2D, $top->{name}; 627 $top->draw_quad (0, 0, $w, $top->{h});
406
407 glBegin GL_QUADS;
408 glTexCoord 0, 0; glVertex 0 , 0;
409 glTexCoord 0, 1; glVertex 0 , $top->{height};
410 glTexCoord 1, 1; glVertex $w , $top->{height};
411 glTexCoord 1, 0; glVertex $w , 0;
412 glEnd;
413 628
414 my $left = $tex[3]; 629 my $left = $tex[3];
415 glBindTexture GL_TEXTURE_2D, $left->{name}; 630 $left->draw_quad (0, $top->{h}, $left->{w}, $ch);
416
417 glBegin GL_QUADS;
418 glTexCoord 0, 0; glVertex 0 , $top->{height};
419 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
420 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
421 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
422 glEnd;
423 631
424 my $right = $tex[2]; 632 my $right = $tex[2];
425 glBindTexture GL_TEXTURE_2D, $right->{name}; 633 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
426
427 glBegin GL_QUADS;
428 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
429 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
430 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
431 glTexCoord 1, 0; glVertex $w , $top->{height};
432 glEnd;
433 634
434 my $bottom = $tex[4]; 635 my $bottom = $tex[4];
435 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 636 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
436
437 glBegin GL_QUADS;
438 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
439 glTexCoord 0, 1; glVertex 0 , $h;
440 glTexCoord 1, 1; glVertex $w , $h;
441 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
442 glEnd;
443 637
444 my $bg = $tex[0]; 638 my $bg = $tex[0];
639
445 glBindTexture GL_TEXTURE_2D, $bg->{name}; 640 glBindTexture GL_TEXTURE_2D, $bg->{name};
446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
447 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
448 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
449 642
450 my $rep_x = $cw / $bg->{width}; 643 my $rep_x = $cw / $bg->{w};
451 my $rep_y = $ch / $bg->{height}; 644 my $rep_y = $ch / $bg->{h};
452 645
453 glBegin GL_QUADS; 646 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
454 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
455 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
456 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
457 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
458 glEnd;
459 647
648 glDisable GL_TEXTURE_2D;
460 glDisable GL_BLEND; 649 glDisable GL_BLEND;
461 glDisable GL_TEXTURE_2D;
462 650
463 $self->child->draw; 651 $self->child->draw;
464 652
465} 653}
466 654
467############################################################################# 655#############################################################################
468 656
469package Crossfire::Client::Widget::Table; 657package CFClient::UI::Table;
470 658
471our @ISA = Crossfire::Client::Widget::Bin::; 659our @ISA = CFClient::UI::Base::;
660
661use List::Util qw(max sum);
472 662
473use SDL::OpenGL; 663use SDL::OpenGL;
664
665sub new {
666 my $class = shift;
667
668 $class->SUPER::new (
669 col_expand => [],
670 @_
671 )
672}
474 673
475sub add { 674sub add {
476 my ($self, $x, $y, $chld) = @_; 675 my ($self, $x, $y, $chld) = @_;
477 my $old_chld = $self->{children}[$y][$x];
478 676
479 $self->{children}[$y][$x] = $chld; 677 $self->{children}[$y][$x] = $chld;
480 $chld->set_parent ($self); 678 $chld->set_parent ($self);
679
680 $self->{w} = $self->{h} = -1;
481 $self->update; 681 $self->update;
482} 682}
483 683
484sub max_row_height { 684sub get_wh {
485 my ($self, $row) = @_; 685 my ($self) = @_;
486 686
487 my $hs = 0; 687 my (@w, @h);
488 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 688
689 for my $y (0 .. $#{$self->{children}}) {
489 my $c = $self->{children}->[$row]->[$xi]; 690 my $row = $self->{children}[$y]
490 if ($c) { 691 or next;
692
693 for my $x (0 .. $#$row) {
694 my $widget = $row->[$x]
695 or next;
491 my ($w, $h) = $c->size_request; 696 my ($w, $h) = $widget->size_request;
492 if ($hs < $h) { $hs = $h } 697
698 $w[$x] = max $w[$x], $w;
699 $h[$y] = max $h[$y], $h;
493 } 700 }
494 } 701 }
495 return $hs;
496}
497 702
498sub max_col_width { 703 (\@w, \@h)
704}
705
706sub size_request {
499 my ($self, $col) = @_; 707 my ($self) = @_;
500 708
709 my ($ws, $hs) = $self->get_wh;
710
711 (
712 (sum @$ws),
713 (sum @$hs),
714 )
715}
716
717sub size_allocate {
718 my ($self, $x, $y, $w, $h) = @_;
719
720 $self->_size_allocate ($x, $y, $w, $h) or return;
721
722 my ($ws, $hs) = $self->get_wh;
723
724 my $req_w = sum @$ws;
725 my $req_h = sum @$hs;
726
727 # TODO: nicer code && do row_expand
728 my @col_expand = @{$self->{col_expand}};
729 @col_expand = (1) x @$ws unless @col_expand;
730 my $col_expand = (sum @col_expand) || 1;
731
732 # linearly scale sizes
733 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
734 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
735
736 my $y;
737
738 for my $r (0 .. $#{$self->{children}}) {
739 my $row = $self->{children}[$r]
740 or next;
741
501 my $ws = 0; 742 my $x = 0;
502 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 743 my $row_h = $hs->[$r];
503 my $c = ($self->{children}->[$yi] || [])->[$col]; 744
504 if ($c) { 745 for my $c (0 .. $#$row) {
505 my ($w, $h) = $c->size_request; 746 my $col_w = $ws->[$c];
506 if ($ws < $w) { $ws = $w } 747
748 if (my $widget = $row->[$c]) {
749 $widget->size_allocate ($x, $y, $col_w, $row_h);
750 }
751
752 $x += $col_w;
507 } 753 }
754
755 $y += $row_h;
508 } 756 }
509 return $ws; 757
510} 758}
759
760sub find_widget {
761 my ($self, $x, $y) = @_;
762
763 $x -= $self->{x};
764 $y -= $self->{y};
765
766 my $res;
767
768 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
769 $res = $_->find_widget ($x, $y)
770 and return $res;
771 }
772
773 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
774}
775
776sub _draw {
777 my ($self) = @_;
778
779 for (grep $_, @{$self->{children}}) {
780 $_->draw for grep $_, @$_;
781 }
782}
783
784#############################################################################
785
786package CFClient::UI::HBox;
787
788# TODO: wrap into common Box base class
789
790our @ISA = CFClient::UI::Container::;
511 791
512sub size_request { 792sub size_request {
513 my ($self) = @_; 793 my ($self) = @_;
514 794
795 my @alloc = map [$_->size_request], @{$self->{children}};
796
797 (
798 (List::Util::sum map $_->[0], @alloc),
799 (List::Util::max map $_->[1], @alloc),
800 )
801}
802
803sub size_allocate {
804 my ($self, $x, $y, $w, $h) = @_;
805
806 $self->_size_allocate ($x, $y, $w, $h) or return;
807
808 return unless $self->{w};
809
515 my ($hs, $ws) = (0, 0); 810 ($h, $w) = ($w, $h);
516 811
517 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 812 my $children = $self->{children};
518 $hs += $self->max_row_height ($yi);
519 }
520 813
521 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 814 my @h = map +($_->size_request)[0], @$children;
522 my $wm = 0; 815
523 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 816 my $req_h = List::Util::sum @h;
524 $wm += $self->max_col_width ($xi) 817
818 if ($req_h > $h) {
819 # ah well, not enough space
820 $_ *= $h / $req_h for @h;
821 } else {
822 my $exp = List::Util::sum map $_->{expand}, @$children;
823 $exp ||= 1;
824
825 for (0 .. $#$children) {
826 my $child = $children->[$_];
827
828 my $alloc_h = $h[$_];
829 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
830 $h[$_] = $alloc_h;
525 } 831 }
526 if ($ws < $wm) { $ws = $wm }
527 } 832 }
528
529 return ($ws, $hs);
530}
531
532sub _draw {
533 my ($self) = @_;
534 833
535 my $y = 0; 834 my $y = 0;
536 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 835 for (0 .. $#$children) {
836 my $child = $children->[$_];
537 my $x = 0; 837 my $h = $h[$_];
838 $child->size_allocate ($y, 0, $h, $w);
538 839
539 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 840 $y += $h;
540
541 my $c = $self->{children}->[$yi]->[$xi];
542 if ($c) {
543 $c->move ($x, $y, 0); #TODO: Move to size_request
544 $c->draw if $c;
545 }
546
547 $x += $self->max_col_width ($xi);
548 }
549
550 $y += $self->max_row_height ($yi);
551 } 841 }
552} 842}
553 843
554############################################################################# 844#############################################################################
555 845
556package Crossfire::Client::Widget::VBox; 846package CFClient::UI::VBox;
557 847
848# TODO: wrap into common Box base class
849
558our @ISA = Crossfire::Client::Widget::Container::; 850our @ISA = CFClient::UI::Container::;
559
560use SDL::OpenGL;
561 851
562sub size_request { 852sub size_request {
563 my ($self) = @_; 853 my ($self) = @_;
564 854
565 my @alloc = map [$_->size_request], @{$self->{children}}; 855 my @alloc = map [$_->size_request], @{$self->{children}};
… …
569 (List::Util::sum map $_->[1], @alloc), 859 (List::Util::sum map $_->[1], @alloc),
570 ) 860 )
571} 861}
572 862
573sub size_allocate { 863sub size_allocate {
574 my ($self, $w, $h) = @_; 864 my ($self, $x, $y, $w, $h) = @_;
575 865
576 $self->w ($w); 866 $self->_size_allocate ($x, $y, $w, $h) or return;
577 $self->h ($h);
578 867
579 my $exp; 868 return unless $self->{h};
580 my @oth; 869
581 # find expand widget 870 my $children = $self->{children};
582 for (@{$self->{children}}) { 871
583 if ($_->{expand}) { 872 my @h = map +($_->size_request)[1], @$children;
873
874 my $req_h = List::Util::sum @h;
875
876 if ($req_h > $h) {
877 # ah well, not enough space
878 $_ *= $h / $req_h for @h;
879 } else {
880 my $exp = List::Util::sum map $_->{expand}, @$children;
584 $exp = $_; 881 $exp ||= 1;
585 last; 882
883 for (0 .. $#$children) {
884 my $child = $children->[$_];
885
886 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
586 } 887 }
587 push @oth, $_;
588 }
589
590 my ($ow, $oh);
591
592 # get sizes of other widgets
593 for (@oth) {
594 my ($w, $h) = $_->size_request;
595 $oh += $h;
596 if ($ow < $w) { $ow = $w }
597 } 888 }
598 889
599 my $y = 0; 890 my $y = 0;
600 for (@{$self->{children}}) { 891 for (0 .. $#$children) {
601 $_->move (0, $y); 892 my $child = $children->[$_];
602 893 my $h = $h[$_];
603 if ($_ == $exp) {
604 $_->size_allocate ($w, $h - $oh);
605 $y += $h - $oh;
606 } else {
607 my ($cw, $h) = $_->size_request;
608 $_->size_allocate ($w, $h); 894 $child->size_allocate (0, $y, $w, $h);
895
609 $y += $h; 896 $y += $h;
610 }
611 } 897 }
612} 898}
613 899
614############################################################################# 900#############################################################################
615 901
616package Crossfire::Client::Widget::Label; 902package CFClient::UI::Label;
617 903
618our @ISA = Crossfire::Client::Widget::; 904our @ISA = CFClient::UI::Base::;
619 905
620use SDL::OpenGL; 906use SDL::OpenGL;
621 907
622sub new { 908sub new {
623 my ($class, $x, $y, $z, $height, $text) = @_; 909 my ($class, %arg) = @_;
624 910
625 # TODO: color, and make height, xyz etc. optional 911 my $self = $class->SUPER::new (
626 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 912 fg => [1, 1, 1],
913 height => $::FONTSIZE,
914 text => "",
915 align => -1,
916 padding => 2,
917 layout => new CFClient::Layout,
918 %arg
919 );
627 920
628 $self->set_text ($text); 921 $self->set_text ($self->{text});
629 922
630 $self 923 $self
924}
925
926sub escape_text {
927 local $_ = $_[1];
928
929 s/&/&amp;/g;
930 s/>/&gt;/g;
931 s/</&lt;/g;
932
933 $_[1]
631} 934}
632 935
633sub set_text { 936sub set_text {
634 my ($self, $text) = @_; 937 my ($self, $text) = @_;
635 938
636 $self->{text} = $text; 939 $self->{text} = $text;
637 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 940 $self->{layout}->set_markup ($text);
638 941
942 delete $self->{texture};
943# $self->{w} = $self->{h} = -1;
639 $self->update; 944 $self->update;
640} 945}
641 946
642sub get_text { 947sub get_text {
643 my ($self, $text) = @_; 948 my ($self, $text) = @_;
… …
646} 951}
647 952
648sub size_request { 953sub size_request {
649 my ($self) = @_; 954 my ($self) = @_;
650 955
956 $self->{layout}->set_width;
957 $self->{layout}->set_height ($self->{height});
958 my ($w, $h) = $self->{layout}->size;
959
651 ( 960 (
652 $self->{texture}{width}, 961 $w + $self->{padding} * 2,
653 $self->{texture}{height}, 962 $h + $self->{padding} * 2,
654 ) 963 )
655} 964}
656 965
966sub size_allocate {
967 my ($self, $x, $y, $w, $h) = @_;
968
969 $self->_size_allocate ($x, $y, $w, $h) or return;
970
971 delete $self->{texture};
972}
973
974sub update {
975 my ($self) = @_;
976
977 delete $self->{texture};
978 $self->SUPER::update;
979}
980
657sub _draw { 981sub _draw {
658 my ($self) = @_; 982 my ($self) = @_;
659 983
984 my $tex = $self->{texture} ||= do {
985 $self->{layout}->set_width ($self->{w});
986 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
987 new_from_layout CFClient::Texture $self->{layout}
988 };
989
990 glEnable GL_BLEND;
991 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
992 glEnable GL_TEXTURE_2D;
993 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
994
995 glColor @{$self->{fg}};
996
997 my $x =
998 $self->{align} < 0 ? $self->{padding}
999 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1000 : ($self->{w} - $tex->{w}) * 0.5;
1001
1002 glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;
1003 $tex->draw_quad (0, 0);
1004
1005 glDisable GL_TEXTURE_2D;
1006 glDisable GL_BLEND;
1007}
1008
1009#############################################################################
1010
1011package CFClient::UI::Entry;
1012
1013our @ISA = CFClient::UI::Label::;
1014
1015use SDL;
1016use SDL::OpenGL;
1017
1018sub new {
1019 my $class = shift;
1020
1021 $class->SUPER::new (
1022 fg => [1, 1, 1],
1023 bg => [0, 0, 0, 0.2],
1024 active_bg => [1, 1, 1, 0.5],
1025 active_fg => [0, 0, 0],
1026 @_
1027 )
1028}
1029
1030sub _set_text {
1031 my ($self, $text) = @_;
1032
1033 $self->{last_activity} = $::NOW;
1034
1035 $self->{text} = $text;
1036 $self->{layout}->set_width ($self->{w});
1037 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1038
1039 $text =~ s/./*/g if $self->{hidden};
1040
1041 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1042
1043 $text = substr $text, 0, $self->{cursor};
1044 utf8::encode $text;
1045
1046 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1047}
1048
1049sub size_request {
1050 my ($self) = @_;
1051
1052 my ($w, $h) = $self->SUPER::size_request;
1053
1054 ($w + 1, $h) # add 1 for cursor
1055}
1056
1057sub size_allocate {
1058 my ($self, $x, $y, $w, $h) = @_;
1059
1060 $self->SUPER::size_allocate ($x, $y, $w, $h);
1061
1062 $self->_set_text ($self->{text});
1063}
1064
1065sub set_text {
1066 my ($self, $text) = @_;
1067
1068 $self->{cursor} = length $text;
1069 $self->_set_text ($text);
1070 $self->update;
1071}
1072
1073sub key_down {
1074 my ($self, $ev) = @_;
1075
1076 my $mod = $ev->key_mod;
1077 my $sym = $ev->key_sym;
1078
1079 my $uni = $ev->key_unicode;
1080
1081 my $text = $self->get_text;
1082
1083 if ($sym == SDLK_BACKSPACE) {
1084 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1085 } elsif ($sym == SDLK_DELETE) {
1086 substr $text, $self->{cursor}, 1, "";
1087 } elsif ($sym == SDLK_LEFT) {
1088 --$self->{cursor} if $self->{cursor};
1089 } elsif ($sym == SDLK_RIGHT) {
1090 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1091 } elsif ($sym == SDLK_HOME) {
1092 $self->{cursor} = 0;
1093 } elsif ($sym == SDLK_END) {
1094 $self->{cursor} = length $text;
1095 } elsif ($uni) {
1096 substr $text, $self->{cursor}++, 0, chr $uni;
1097 }
1098
1099 $self->_set_text ($text);
1100 $self->update;
1101}
1102
1103sub focus_in {
1104 my ($self) = @_;
1105
1106 $self->{last_activity} = $::NOW;
1107
1108 $self->SUPER::focus_in;
1109}
1110
1111sub button_down {
1112 my ($self, $ev, $x, $y) = @_;
1113
1114 $self->SUPER::button_down ($ev, $x, $y);
1115
1116 my $idx = $self->{layout}->xy_to_index ($x, $y);
1117
1118 # byte-index to char-index
660 my $tex = $self->{texture}; 1119 my $text = $self->{text};
1120 utf8::encode $text;
1121 $self->{cursor} = length substr $text, 0, $idx;
1122
1123 $self->_set_text ($self->{text});
1124 $self->update;
1125}
1126
1127sub mouse_motion {
1128 my ($self, $ev, $x, $y) = @_;
1129# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1130}
1131
1132sub _draw {
1133 my ($self) = @_;
1134
1135 local $self->{fg} = $self->{fg};
1136
1137 if ($FOCUS == $self) {
1138 glColor @{$self->{active_bg}};
1139 $self->{fg} = $self->{active_fg};
1140 } else {
1141 glColor @{$self->{bg}};
1142 }
1143
1144 glEnable GL_BLEND;
1145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1146 glBegin GL_QUADS;
1147 glVertex 0 , 0;
1148 glVertex 0 , $self->{h};
1149 glVertex $self->{w}, $self->{h};
1150 glVertex $self->{w}, 0;
1151 glEnd;
1152 glDisable GL_BLEND;
1153
1154 $self->SUPER::_draw;
1155
1156 #TODO: force update every cursor change :(
1157 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1158 glColor @{$self->{fg}};
1159 glBegin GL_LINES;
1160 glVertex $self->{cur_x}, $self->{cur_y};
1161 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1162 glEnd;
1163 }
1164}
1165
1166#############################################################################
1167
1168package CFClient::UI::Button;
1169
1170our @ISA = CFClient::UI::Label::;
1171
1172use SDL;
1173use SDL::OpenGL;
1174
1175my @tex =
1176 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1177 qw(b1_button_active.png);
1178
1179sub new {
1180 my $class = shift;
1181
1182 $class->SUPER::new (
1183 padding => 4,
1184 fg => [1, 1, 1],
1185 bg => [1, 1, 1, 0.2],
1186 active_fg => [1, 1, 0],
1187# active_bg => [0, 0, 0, 0.5],
1188# border_fg => [1, 1, 0],
1189 @_
1190 )
1191}
1192
1193sub button_up {
1194 my ($self, $ev, $x, $y) = @_;
1195
1196 if ($x >= 0 && $x < $self->{w}
1197 && $y >= 0 && $y < $self->{h}) {
1198 $self->emit ("activate");
1199 }
1200}
1201
1202sub _draw {
1203 my ($self) = @_;
1204
1205 local $self->{fg} = $self->{fg};
1206 my $tex = $tex[0];
661 1207
662 glEnable GL_BLEND; 1208 glEnable GL_BLEND;
663 glEnable GL_TEXTURE_2D; 1209 glEnable GL_TEXTURE_2D;
664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1210 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1211
1212 if ($GRAB == $self) {
1213 $self->{fg} = $self->{active_fg};
1214 }
1215
666 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1216 glBindTexture GL_TEXTURE_2D, $tex->{name};
1217 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
667 1218
668 glColor 1, 0, 0, 1; # TODO color 1219 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1220
1221 glDisable GL_TEXTURE_2D;
1222 glDisable GL_BLEND;
1223
1224 $self->SUPER::_draw;
1225}
1226
1227#############################################################################
1228
1229package CFClient::UI::Slider;
1230
1231use strict;
1232
1233use SDL::OpenGL;
1234
1235our @ISA = CFClient::UI::DrawBG::;
1236
1237sub new {
1238 my $class = shift;
1239
1240 # range [value, low, high, page]
1241
1242 my $self = $class->SUPER::new (
1243 fg => [1, 1, 1],
1244 active_fg => [0, 0, 0],
1245 range => [0, 0, 100, 10],
1246 req_w => 40,
1247 req_h => 10,
1248 vertical => 0,
1249 @_
1250 );
1251
1252 $self
1253}
1254
1255sub size_request {
1256 my ($self) = @_;
1257
1258 my $w = $self->{req_w};
1259 my $h = $self->{req_h};
1260
1261 $self->{vertical} ? ($h, $w) : ($w, $h)
1262}
1263
1264sub button_down {
1265 my ($self, $ev, $x, $y) = @_;
1266
1267 $self->SUPER::button_down ($ev, $x, $y);
1268 $self->mouse_motion ($ev, $x, $y);
1269}
1270
1271sub mouse_motion {
1272 my ($self, $ev, $x, $y) = @_;
1273
1274 if ($GRAB == $self) {
1275 my ($value, $lo, $hi, $page) = @{$self->{range}};
1276
1277 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1278
1279 $x = $x * ($hi - $lo) / $w + $lo;
1280 $x = $lo if $x < $lo;
1281 $x = $hi - $page if $x > $hi - $page;
1282 $self->{range}[0] = $x;
1283
1284 $self->emit (changed => $x);
1285 $self->update;
1286 }
1287}
1288
1289sub _draw {
1290 my ($self) = @_;
1291
1292 $self->SUPER::_draw ();
1293
1294 my ($w, $h) = @$self{qw(w h)};
1295
1296 if ($self->{vertical}) {
1297 # draw a vertical slider like a rotated horizontal slider
1298
1299 glRotate 90, 0, 0, 1;
1300 glTranslate 0, -$self->{w}, 0;
1301
1302 ($w, $h) = ($h, $w);
1303 }
1304
1305 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1306 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1307
1308 my ($value, $lo, $hi, $page) = @{$self->{range}};
1309
1310 $page = int $page * $w / ($hi - $lo);
1311 $value = int +($value - $lo) * $w / ($hi - $lo);
1312
1313 $w -= $page;
1314 $page &= ~1;
1315 glTranslate $page * 0.5, 0, 0;
1316 $page ||= 2;
1317
1318 glColor @$fg;
1319 glBegin GL_LINES;
1320 glVertex 0, 0; glVertex 0, $h;
1321 glVertex $w - 1, 0; glVertex $w - 1, $h;
1322 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1323 glEnd;
1324
1325 my $knob_a = $value - $page * 0.5;
1326 my $knob_b = $value + $page * 0.5;
669 1327
670 glBegin GL_QUADS; 1328 glBegin GL_QUADS;
671 glTexCoord 0, 0; glVertex 0 , 0; 1329 glColor @$fg;
672 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 1330 glVertex $knob_a, 0;
673 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 1331 glVertex $knob_a, $h;
674 glTexCoord 1, 0; glVertex $tex->{width}, 0; 1332 glVertex $knob_b, $h;
1333 glVertex $knob_b, 0;
1334
1335 if ($knob_a < $knob_b - 2) {
1336 glColor @$bg;
1337 glVertex $knob_a + 1, 1;
1338 glVertex $knob_a + 1, $h - 1;
1339 glVertex $knob_b - 1, $h - 1;
1340 glVertex $knob_b - 1, 1;
1341 }
675 glEnd; 1342 glEnd;
676
677 glDisable GL_BLEND;
678 glDisable GL_TEXTURE_2D;
679} 1343}
680 1344
681############################################################################# 1345#############################################################################
682 1346
683package Crossfire::Client::Widget::TextEntry; 1347package CFClient::UI::MapWidget;
684 1348
685our @ISA = Crossfire::Client::Widget::Label::; 1349use strict;
1350
1351use List::Util qw(min max);
686 1352
687use SDL; 1353use SDL;
688use SDL::OpenGL; 1354use SDL::OpenGL;
689 1355
690sub key_down { 1356our @ISA = CFClient::UI::Base::;
691 my ($self, $ev) = @_;
692 1357
693 my $mod = $ev->key_mod; 1358sub new {
694 my $sym = $ev->key_sym; 1359 my $class = shift;
695 1360
696 $ev->set_unicode (1); 1361 $class->SUPER::new (
697 my $uni = $ev->key_unicode; 1362 z => -1,
698 1363 list => (glGenLists 1),
699 my $text = $self->get_text; 1364 @_
700
701 if ($sym == SDLK_BACKSPACE) {
702 substr $text, -1, 1, '';
703
704 } elsif ($uni) {
705 $text .= chr $uni;
706 } 1365 )
707 $self->set_text ($text);
708} 1366}
709
710#############################################################################
711
712package Crossfire::Client::Widget::MapWidget;
713
714use strict;
715
716use List::Util qw(min max);
717
718use SDL;
719use SDL::OpenGL;
720use SDL::OpenGL::Constants;
721
722our @ISA = Crossfire::Client::Widget::;
723 1367
724sub key_down { 1368sub key_down {
725 print "MAPKEYDOWN\n"; 1369 print "MAPKEYDOWN\n";
726} 1370}
727 1371
728sub key_up { 1372sub key_up {
729} 1373}
730 1374
731sub size_request { 1375sub size_request {
732 1376 (
1377 1 + 32 * int $::WIDTH / 32,
1378 1 + 32 * int $::HEIGHT / 32,
1379 )
733} 1380}
734 1381
735sub size_allocate { 1382sub update {
736} 1383 my ($self) = @_;
737 1384
1385 $self->{need_update} = 1;
1386 $self->SUPER::update;
1387}
1388
738sub _draw { 1389sub draw {
739 my ($self) = @_; 1390 my ($self) = @_;
740 1391
1392 if (delete $self->{need_update}) {
1393 glNewList $self->{list}, GL_COMPILE;
1394
741 my $mx = $::CONN->{mapx}; 1395 my $mx = $::CONN->{mapx};
742 my $my = $::CONN->{mapy}; 1396 my $my = $::CONN->{mapy};
743 1397
744 my $map = $::CONN->{map}; 1398 my $map = $::CONN->{map};
745 1399
746 my ($xofs, $yofs); 1400 my ($xofs, $yofs);
747 1401
748 my $sw = 1 + int $::WIDTH / 32; 1402 my $sw = 1 + int $::WIDTH / 32;
749 my $sh = 1 + int $::HEIGHT / 32; 1403 my $sh = 1 + int $::HEIGHT / 32;
750 1404
751 if ($::CONN->{mapw} > $sw) { 1405 if ($::CONN->{mapw} > $sw) {
752 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1406 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
753 } else { 1407 } else {
754 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1408 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
755 } 1409 }
756 1410
757 if ($::CONN->{maph} > $sh) { 1411 if ($::CONN->{maph} > $sh) {
758 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1412 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
759 } else { 1413 } else {
760 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1414 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
761 } 1415 }
762 1416
763 glEnable GL_TEXTURE_2D; 1417 glEnable GL_TEXTURE_2D;
764 glEnable GL_BLEND; 1418 glEnable GL_BLEND;
1419 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
765 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1420 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
766 1421
767 my $sw4 = ($sw + 3) & ~3; 1422 my $sw4 = ($sw + 3) & ~3;
768 my $lighting = "\x00" x ($sw4 * $sh); 1423 my $darkness = "\x00" x ($sw4 * $sh);
769 1424
770 for my $x (0 .. $sw - 1) { 1425 for my $x (0 .. $sw - 1) {
1426 my $row = $map->[$x + $xofs];
771 for my $y (0 .. $sh - 1) { 1427 for my $y (0 .. $sh - 1) {
772 1428
773 my $cell = $map->[$x + $xofs][$y + $yofs] 1429 my $cell = $row->[$y + $yofs]
774 or next; 1430 or next;
775 1431
776 my $darkness = $cell->[0] * (1 / 255); 1432 my $dark = $cell->[0];
777 if ($darkness < 0) { 1433 if ($dark < 0) {
778 $darkness = 0.15; 1434 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1435 } else {
1436 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
779 } 1437 }
780 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
781 1438
782 for my $num (grep $_, @$cell[1,2,3]) { 1439 for my $num (grep $_, @$cell[1,2,3]) {
783 my $tex = $::CONN->{face}[$num]{texture} || next; 1440 my $tex = $::CONN->{face}[$num]{texture} || next;
1441
1442 my ($w, $h) = @$tex{qw(w h)};
784 1443
785 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1444 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
786
787 my $w = $tex->{width};
788 my $h = $tex->{height};
789
790 my $px = ($x + 1) * 32 - $w;
791 my $py = ($y + 1) * 32 - $h;
792
793 glBegin GL_QUADS;
794 glTexCoord 0, 0; glVertex $px , $py;
795 glTexCoord 0, 1; glVertex $px , $py + $h;
796 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
797 glTexCoord 1, 0; glVertex $px + $w, $py;
798 glEnd; 1445 }
799 } 1446 }
800 } 1447 }
801 }
802 1448
803# if (1) { # higher quality darkness 1449# if (1) { # higher quality darkness
804# $lighting =~ s/(.)/$1$1$1/gs; 1450# $lighting =~ s/(.)/$1$1$1/gs;
805# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 1451# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
806# 1452#
… …
808# 1454#
809# $lighting = $pb->get_pixels; 1455# $lighting = $pb->get_pixels;
810# $lighting =~ s/(.)../$1/gs; 1456# $lighting =~ s/(.)../$1/gs;
811# } 1457# }
812 1458
813 $lighting = new Crossfire::Client::Texture
814 width => $sw4,
815 height => $sh,
816 data => $lighting,
817 internalformat => GL_ALPHA4,
818 format => GL_ALPHA;
819
820 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
821 glColor 0, 0, 0, 0.75;
822 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1459 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
823 glBindTexture GL_TEXTURE_2D, $lighting->{name};
824 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
825 glBegin GL_QUADS;
826 glTexCoord 0, 0; glVertex 0 , 0;
827 glTexCoord 0, 1; glVertex 0 , $sh * 32;
828 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
829 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
830 glEnd;
831 1460
1461 $darkness = new CFClient::Texture
1462 w => $sw4,
1463 h => $sh,
1464 data => $darkness,
1465 internalformat => GL_ALPHA,
1466 format => GL_ALPHA;
1467
1468 glColor 0.45, 0.45, 0.45, 1;
1469 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1470
832 glDisable GL_TEXTURE_2D; 1471 glDisable GL_TEXTURE_2D;
833 glDisable GL_BLEND; 1472 glDisable GL_BLEND;
1473
1474 glEndList;
1475 }
1476
1477 glCallList $self->{list};
834} 1478}
835 1479
836my %DIR = ( 1480my %DIR = (
837 SDLK_KP8, [1, "north"], 1481 SDLK_KP8, [1, "north"],
838 SDLK_KP9, [2, "northeast"], 1482 SDLK_KP9, [2, "northeast"],
… …
855 my $mod = $ev->key_mod; 1499 my $mod = $ev->key_mod;
856 my $sym = $ev->key_sym; 1500 my $sym = $ev->key_sym;
857 1501
858 if ($sym == SDLK_KP5) { 1502 if ($sym == SDLK_KP5) {
859 $::CONN->send ("command stay fire"); 1503 $::CONN->send ("command stay fire");
1504 } elsif ($sym == SDLK_a) {
1505 $::CONN->send ("command apply");
860 } elsif (exists $DIR{$sym}) { 1506 } elsif (exists $DIR{$sym}) {
861 if ($mod & KMOD_SHIFT) { 1507 if ($mod & KMOD_SHIFT) {
862 $self->{shft}++; 1508 $self->{shft}++;
863 $::CONN->send ("command fire $DIR{$sym}[0]"); 1509 $::CONN->send ("command fire $DIR{$sym}[0]");
864 } elsif ($mod & KMOD_CTRL) { 1510 } elsif ($mod & KMOD_CTRL) {
… …
884 } 1530 }
885} 1531}
886 1532
887############################################################################# 1533#############################################################################
888 1534
889package Crossfire::Client::Widget::Animator; 1535package CFClient::UI::Animator;
890 1536
891use SDL::OpenGL; 1537use SDL::OpenGL;
892 1538
893our @ISA = Crossfire::Client::Widget::Bin::; 1539our @ISA = CFClient::UI::Bin::;
894 1540
895sub moveto { 1541sub moveto {
896 my ($self, $x, $y) = @_; 1542 my ($self, $x, $y) = @_;
897 1543
898 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1544 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
899 $self->{speed} = 0.2; 1545 $self->{speed} = 0.001;
900 $self->{time} = 1; 1546 $self->{time} = 1;
901 1547
902 ::animation_start $self; 1548 ::animation_start $self;
903} 1549}
904 1550
… …
919 1565
920sub _draw { 1566sub _draw {
921 my ($self) = @_; 1567 my ($self) = @_;
922 1568
923 glPushMatrix; 1569 glPushMatrix;
924 glRotate $self->{time} * 10000, 0, 1, 0; 1570 glRotate $self->{time} * 1000, 0, 1, 0;
925 $self->{children}[0]->draw; 1571 $self->{children}[0]->draw;
926 glPopMatrix; 1572 glPopMatrix;
927} 1573}
928 1574
9291; 1575#############################################################################
930 1576
1577package CFClient::UI::Toplevel;
1578
1579our @ISA = CFClient::UI::Container::;
1580
1581sub size_request {
1582 ($::WIDTH, $::HEIGHT)
1583}
1584
1585sub size_allocate {
1586 my ($self, $x, $y, $w, $h) = @_;
1587
1588 $self->_size_allocate ($x, $y, $w, $h);
1589
1590 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1591 for @{$self->{children}};
1592}
1593
1594sub translate {
1595 my ($self, $x, $y) = @_;
1596
1597 ($x, $y)
1598}
1599
1600sub update {
1601 my ($self) = @_;
1602
1603 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1604 ::refresh ();
1605}
1606
1607sub add {
1608 my ($self, $widget) = @_;
1609
1610 $self->SUPER::add ($widget);
1611
1612 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1613}
1614
1615sub draw {
1616 my ($self) = @_;
1617
1618 $self->_draw;
1619}
1620
1621#############################################################################
1622
1623package CFClient::UI;
1624
1625$TOPLEVEL = new CFClient::UI::Toplevel;
1626
16271
1628

Diff Legend

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